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

oiiodecoder: various improvements

Browse Source 
Use start_time in VideoStream to determine the starting number of an image
sequence and use ImageBufAlgo::resample instead of ImageBufAlgo::resize for
faster image processing (since the quality with a divider is always expected
to be draft quality).
This commit is contained in:
itsmattkc
2020-03-02 14:32:36 +11:00
parent de5955b403
commit d7f5584374
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/codec/oiio/oiiodecoder.cpp
+12 -10
View File
@@ -85,6 +85,9 @@ bool OIIODecoder::Probe(Footage *f, const QAtomicInt *cancelled)
video_stream->set_timebase(default_timebase);
video_stream->set_frame_rate(default_timebase.flipped());
// FIXME: Get actual start number
video_stream->set_start_time(1);
// FIXME: Get actual duration
video_stream->set_duration(200);
} else {
@@ -152,12 +155,9 @@ FramePtr OIIODecoder::RetrieveVideo(const rational &timecode, const int& divider
if (stream()->type() == Stream::kVideo) {
int64_t ts = Timecode::time_to_timestamp(timecode, stream()->timebase());
// FIXME: Many sequences start at 1 but not all
ts++;
ts += static_cast<VideoStream*>(stream().get())->start_time();
OpenImageHandler(TransformImageSequenceFileName(stream()->footage()->filename(), ts));
if (!image_) {
if (!OpenImageHandler(TransformImageSequenceFileName(stream()->footage()->filename(), ts))) {
return nullptr;
}
}
@@ -169,12 +169,14 @@ FramePtr OIIODecoder::RetrieveVideo(const rational &timecode, const int& divider
frame->set_format(pix_fmt_);
frame->allocate();
OIIO::ImageBuf dst(OIIO::ImageSpec(frame->width(), frame->height(), buffer_->spec().nchannels, buffer_->spec().format), frame->data());
if (divider == 1) {
memcpy(frame->data(), buffer_->localpixels(), frame->allocated_size());
} else {
OIIO::ImageBuf dst(OIIO::ImageSpec(frame->width(), frame->height(), buffer_->spec().nchannels, buffer_->spec().format), frame->data());
// FIXME: This function is really slow, but is necessary to do. Is there a faster way to do it since it only needs to
// be draft quality?
if (!OIIO::ImageBufAlgo::resize(dst, *buffer_)) {
qWarning() << "OIIO resize failed";
if (!OIIO::ImageBufAlgo::resample(dst, *buffer_)) {
qWarning() << "OIIO resize failed";
}
}
if (stream()->type() == Stream::kVideo) {