openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a race condition in video playback thread! Also, added new method to get the average magnitude of a range of audio samples.

Browse Source
This commit is contained in:
Jonathan Thomas
2016-04-22 02:43:06 -05:00
parent 179d091005
commit 37f1894300
4 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/FFmpegReader.cpp
View File

@@ -537,7 +537,7 @@ tr1::shared_ptr<Frame> FFmpegReader::ReadStream(long int requested_frame)
ZmqLogger::Instance()->AppendDebugMethod("FFmpegReader::ReadStream (GetNextPacket)", "requested_frame", requested_frame, "processing_video_frames.size()", processing_video_frames.size(), "processing_audio_frames.size()", processing_audio_frames.size(), "minimum_packets", minimum_packets, "packets_processed", packets_processed, "", -1);
// Video packet
if (packet->stream_index == videoStream)
if (info.has_video && packet->stream_index == videoStream)
{
// Reset this counter, since we have a video packet
num_packets_since_video_frame = 0;
@@ -572,7 +572,7 @@ tr1::shared_ptr<Frame> FFmpegReader::ReadStream(long int requested_frame)
}
// Audio packet
else if (packet->stream_index == audioStream)
else if (info.has_audio && packet->stream_index == audioStream)
{
// Increment this (to track # of packets since the last video packet)
num_packets_since_video_frame++;