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

updates to video render backend to speed up single frame previews

Browse Source 
Allows single frame previews and improves communication with receiving
viewer classes.
This commit is contained in:
itsmattkc
2019-12-27 05:11:21 +11:00
parent fe3c155b98
commit 549427353d
2 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/render/backend/videorenderbackend.cpp
+32 -16
View File
@@ -59,6 +59,11 @@ void VideoRenderBackend::InvalidateCache(const rational &start_range, const rati
int64_t timestamp = Timecode::time_to_timestamp(start_range_adj, params_.time_base());
rational true_start = Timecode::timestamp_to_time(timestamp, params_.time_base());
if (true_start == end_range_adj) {
// Ensure that a single frame is always rendered
end_range_adj += params_.time_base();
}
for (rational r=true_start;r<end_range_adj;r+=params_.time_base()) {
// Try to order the queue from closest to the playhead to furthest
rational last_time = last_time_requested_;
@@ -248,18 +253,16 @@ void VideoRenderBackend::ThreadCompletedFrame(NodeDependency path, QByteArray ha
QVariant texture = table.Get(NodeParam::kTexture);
// Check if this frame has changed once again, in which case we may not want to draw it (it'll look jittery to the user)
if (!TimeIsQueued(TimeRange(path.in(), path.in()))) {
if (last_time_requested_ == path.in() || export_mode_) {
EmitCachedFrameReady(path.in(), texture);
if (export_mode_) {
QList<rational> times_with_this_hash = frame_cache()->DeferredMapsWithHash(hash);
foreach (const rational& t, times_with_this_hash) {
EmitCachedFrameReady(t, texture);
}
}
}
if (!export_mode_) {
if (export_mode_) {
QList<rational> times_with_this_hash = frame_cache()->DeferredMapsWithHash(hash);
foreach (const rational& t, times_with_this_hash) {
EmitCachedFrameReady(t, texture);
}
} else {
if (texture.isNull()) {
// No frame received, we set hash to an empty
frame_cache()->RemoveHash(path.in(), hash);
@@ -285,15 +288,11 @@ void VideoRenderBackend::ThreadCompletedFrame(NodeDependency path, QByteArray ha
void VideoRenderBackend::ThreadCompletedDownload(NodeDependency dep, QByteArray hash)
{
// Set hash, but DON'T signal time because it's most likely this frame has been signalled in ThreadCompletedFrame()
frame_cache()->SetHash(dep.in(), hash);
emit CachedTimeReady(dep.in());
// Emit for each frame that has this hash (some may have been added in ThreadSkippedFrame)
QList<rational> times_with_this_hash = frame_cache()->DeferredMapsWithHash(hash);
foreach (const rational& t, times_with_this_hash) {
frame_cache()->SetHash(t, hash);
emit CachedTimeReady(t);
}
DumpDeferredMappings(frame_cache()->DeferredMapsWithHash(hash), hash);
}
void VideoRenderBackend::ThreadSkippedFrame(NodeDependency dep, QByteArray hash)
@@ -306,7 +305,12 @@ void VideoRenderBackend::ThreadSkippedFrame(NodeDependency dep, QByteArray hash)
void VideoRenderBackend::ThreadHashAlreadyExists(NodeDependency dep, QByteArray hash)
{
ThreadCompletedDownload(dep, hash);
// Emit for each frame that has this hash (some may have been added in ThreadSkippedFrame)
QList<rational> times_with_this_hash = frame_cache()->DeferredMapsWithHash(hash);
times_with_this_hash.append(dep.in());
DumpDeferredMappings(times_with_this_hash, hash);
//ThreadCompletedDownload(dep, hash);
SetWorkerBusyState(static_cast<RenderWorker*>(sender()), false);
// Queue up a new frame for this worker
@@ -317,3 +321,15 @@ bool VideoRenderBackend::TimeIsQueued(const TimeRange &time)
{
return cache_queue_.contains(time);
}
void VideoRenderBackend::DumpDeferredMappings(const QList<rational>& times_with_this_hash, const QByteArray& hash)
{
foreach (const rational& t, times_with_this_hash) {
if (frame_cache()->TimeToHash(t) != hash) {
frame_cache()->SetHash(t, hash);
if (last_time_requested_ == t && !TimeIsQueued(TimeRange(t, t))) {
emit CachedTimeReady(t);
}
}
}
}
app/render/backend/videorenderbackend.h
+2
View File
@@ -108,6 +108,8 @@ signals:
private:
bool TimeIsQueued(const TimeRange &time);
void DumpDeferredMappings(const QList<rational> &times_with_this_hash, const QByteArray &hash);
VideoRenderingParams params_;
QByteArray cache_frame_load_buffer_;