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

proxy: improved progress signalling

Browse Source 
Signals once cache to disk is fully complete (rather than signalling on decode
and then sitting at 100% for ages until the disk saving is done).
This commit is contained in:
itsmattkc
2020-05-04 01:53:47 +10:00
parent b458bfa542
commit 22bfff2c62
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/codec/ffmpeg/ffmpegdecoder.cpp
+17 -5
View File
@@ -152,7 +152,7 @@ FramePtr FFmpegDecoder::RetrieveVideo(const rational &timecode, const int &divid
VideoStreamPtr vs = std::static_pointer_cast<VideoStream>(stream()); VideoStreamPtr vs = std::static_pointer_cast<VideoStream>(stream());
if (vs->using_proxy()) { if (use_proxies && vs->using_proxy()) {
QString proxy_fn = GetProxyFilename(vs->using_proxy()); QString proxy_fn = GetProxyFilename(vs->using_proxy());
int64_t index_ts = vs->get_closest_timestamp_in_frame_index(target_ts); int64_t index_ts = vs->get_closest_timestamp_in_frame_index(target_ts);
@@ -636,7 +636,8 @@ void FFmpegDecoder::Error(const QString &s)
} }
QMutex scaler_lock; QMutex scaler_lock;
void SaveCacheFrame(SwsContext* scaler, void SaveCacheFrame(FFmpegDecoder* decoder,
SwsContext* scaler,
AVFrame* frame, AVFrame* frame,
VideoRenderingParams params, VideoRenderingParams params,
QString dst_fn) QString dst_fn)
@@ -719,6 +720,7 @@ bool FFmpegDecoder::ProxyVideo(const QAtomicInt *cancelled, int divider)
AVPacket* pkt = av_packet_alloc(); AVPacket* pkt = av_packet_alloc();
QVector<int64_t> frame_index; QVector<int64_t> frame_index;
QVector< QFuture<void> > futures; QVector< QFuture<void> > futures;
int finished_futures = 0;
VideoRenderingParams converted_params(divided_width, VideoRenderingParams converted_params(divided_width,
divided_height, divided_height,
@@ -750,19 +752,29 @@ bool FFmpegDecoder::ProxyVideo(const QAtomicInt *cancelled, int divider)
} }
frame_index.append(frame->pts); frame_index.append(frame->pts);
SignalProcessingProgress(frame->pts);
QFuture<void> future = QtConcurrent::run(SaveCacheFrame, QFuture<void> future = QtConcurrent::run(SaveCacheFrame,
this,
scaler, scaler,
frame, frame,
converted_params, converted_params,
GetProxyFrameFilename(frame->pts, divider)); GetProxyFrameFilename(frame->pts, divider));
futures.append(future); futures.append(future);
while (finished_futures < futures.size()) {
if (!futures.at(finished_futures).isFinished()) {
SignalProcessingProgress(frame_index.at(finished_futures));
break;
}
finished_futures++;
}
} }
// Wait for all conversions to finish // Wait for all conversions to finish
for (int i=0;i<futures.size();i++) { for ( ; finished_futures<futures.size(); finished_futures++) {
futures[i].waitForFinished(); futures[finished_futures].waitForFinished();
SignalProcessingProgress(frame_index.at(finished_futures));
} }
// If succeeded, update the video stream's proxy state // If succeeded, update the video stream's proxy state