oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

oiiodecoder: updated to handle frame linesizes

Browse Source
This commit is contained in:
itsmattkc
2020-04-22 16:57:18 +10:00
parent c9e797abdf
commit 0f825cbc44
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/codec/oiio/oiiodecoder.cpp
+14 -5
View File
@@ -191,13 +191,22 @@ FramePtr OIIODecoder::RetrieveVideo(const rational &timecode, const int& divider
frame->allocate(); frame->allocate();
if (divider == 1) { if (divider == 1) {
memcpy(frame->data(), buffer_->localpixels(), frame->allocated_size());
// Just a simple copy
buffer_->get_pixels(OIIO::ROI(), buffer_->spec().format, frame->data(), OIIO::AutoStride, frame->linesize_bytes());
} else { } else {
OIIO::ImageBuf dst(OIIO::ImageSpec(frame->width(), frame->height(), buffer_->spec().nchannels, buffer_->spec().format), frame->data());
// Will need to resize the image
OIIO::ImageBuf dst(OIIO::ImageSpec(frame->width(), frame->height(), buffer_->spec().nchannels, buffer_->spec().format));
if (!OIIO::ImageBufAlgo::resample(dst, *buffer_)) { if (!OIIO::ImageBufAlgo::resample(dst, *buffer_)) {
qWarning() << "OIIO resize failed"; qWarning() << "OIIO resize failed";
} }
// Just a simple copy
dst.get_pixels(OIIO::ROI(), dst.spec().format, frame->data(), OIIO::AutoStride, frame->linesize_bytes());
} }
if (stream()->type() == Stream::kVideo) { if (stream()->type() == Stream::kVideo) {
@@ -322,14 +331,14 @@ bool OIIODecoder::OpenImageHandler(const QString &fn)
} }
// FIXME: Many OIIO pixel formats are not handled here // FIXME: Many OIIO pixel formats are not handled here
type_ = PixelFormat::GetOIIOTypeDesc(pix_fmt_); OIIO::TypeDesc type = PixelFormat::GetOIIOTypeDesc(pix_fmt_);
#if OIIO_VERSION < 20100 #if OIIO_VERSION < 20100
buffer_ = new OIIO::ImageBuf(OIIO::ImageSpec(spec.width, spec.height, spec.nchannels, type_)); buffer_ = new OIIO::ImageBuf(OIIO::ImageSpec(spec.width, spec.height, spec.nchannels, type_));
#else #else
buffer_ = new OIIO::ImageBuf(OIIO::ImageSpec(spec.width, spec.height, spec.nchannels, type_), OIIO::InitializePixels::No); buffer_ = new OIIO::ImageBuf(OIIO::ImageSpec(spec.width, spec.height, spec.nchannels, type), OIIO::InitializePixels::No);
#endif #endif
image_->read_image(type_, buffer_->localpixels()); image_->read_image(type, buffer_->localpixels());
return true; return true;
} }
app/codec/oiio/oiiodecoder.h
-2
View File
@@ -68,8 +68,6 @@ private:
PixelFormat::Format pix_fmt_; PixelFormat::Format pix_fmt_;
OIIO::TypeDesc type_;
bool is_rgba_; bool is_rgba_;
bool is_sequence_; bool is_sequence_;