Added 4 new clip keyframes (channel mapping, channel filter, has_video, and has_audio). These are a bit different though, as they are evaluated as boolean (-1 = ignored, 0 = disabled, 1 = enabled). Also fixed some issues with video playback (where it gets stuck in fast forward), and fixed some race conditions when opening FFmpegReader. Also added more debug output.

This commit is contained in:
Jonathan Thomas
2016-04-24 15:37:47 -05:00
parent 37f1894300
commit 4808be25ff
8 changed files with 137 additions and 33 deletions

View File

@@ -89,9 +89,12 @@ namespace openshot
// Only cache up till the max_frames amount... then sleep
try
{
if (reader)
if (reader) {
ZmqLogger::Instance()->AppendDebugMethod("VideoCacheThread::run (cache frame)", "position", position, "current_display_frame", current_display_frame, "max_frames", max_frames, "needed_frames", (position - current_display_frame), "", -1, "", -1);
// Force the frame to be generated
reader->GetFrame(position);
}
}
catch (const OutOfBoundsFrame & e)