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

video renderer will always render frames closest to the playhead first

Browse Source 
A few commits ago, the render behavior was changed to only render within a
user-specified range of the playhead. This works well, but it would still
render from the start of the range (usually before the playhead) to the end,
meaning it couldn't keep up with the playhead as well as it should. This
commit prioritizes frames close to the playhead and renders outwards to
address this.
This commit is contained in:
itsmattkc
2020-01-12 01:14:56 +11:00
parent 0823c84fb2
commit 1c5d55012b
3 changed files with 53 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/codec/ffmpeg/ffmpegdecoder.cpp
+8 -4
View File
@@ -202,7 +202,8 @@ FramePtr FFmpegDecoder::RetrieveVideo(const rational &timecode)
DiskManager::instance()->Accessed(compressed_frame.fileName());
// Read data
QByteArray frame_loader = qUncompress(compressed_frame.readAll());
//QByteArray frame_loader = qUncompress(compressed_frame.readAll());
QByteArray frame_loader = compressed_frame.readAll();
// Frame was valid, now we convert it to a native Olive frame
FramePtr frame_container = Frame::Create();
@@ -277,8 +278,11 @@ FramePtr FFmpegDecoder::RetrieveVideo(const rational &timecode)
QFile save_frame(GetIndexFilename().append(QString::number(frame_->pts)));
if (save_frame.open(QFile::WriteOnly)) {
QByteArray compressed = qCompress(reinterpret_cast<const uchar*>(output_frame->data()), output_frame->allocated_size());
save_frame.write(compressed);
// FIXME: This compression is really slow
//QByteArray compressed = qCompress(reinterpret_cast<const uchar*>(output_frame->data()), output_frame->allocated_size());
//save_frame.write(compressed);
save_frame.write(output_frame->data(), output_frame->allocated_size());
save_frame.close();
DiskManager::instance()->CreatedFile(save_frame.fileName(), QByteArray());
@@ -374,7 +378,7 @@ int64_t FFmpegDecoder::GetTimestampFromTime(const rational &time)
return -1;
}
// Convert timecode to AVStream timebase
// Get rough approximation of what the timestamp would be in this timebase
int64_t target_ts = Timecode::time_to_timestamp(time, avstream_->time_base);
// Adjust target by stream's start time