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 more audio issues, and a regression where removing the video channel (with just an audio channel remaining) caused the FPS to be incorrect.

Browse Source
This commit is contained in:
Jonathan Thomas
2012-11-21 16:57:21 -06:00
parent 495ca9dc9e
commit afd9b1d6d3
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/FFmpegReader.cpp
View File

@@ -286,10 +286,10 @@ void FFmpegReader::UpdateVideoInfo()
if (info.fps.ToFloat() > 120.0f)
{
// Set a few important default video settings (so audio can be divided into frames)
info.fps.num = 30;
info.fps.num = 24;
info.fps.den = 1;
info.video_timebase.num = 1;
info.video_timebase.den = 30;
info.video_timebase.den = 24;
}
}
@@ -739,7 +739,7 @@ void FFmpegReader::ProcessAudioPacket(int requested_frame, int target_frame, int
}
// Estimate the # of samples and the end of this packet's location (to prevent GAPS for the next timestamp)
int pts_remaining_samples = round(packet_samples / info.channels);
int pts_remaining_samples = round(packet_samples / info.channels) - 1; // Adjust for zero based array
while (pts_remaining_samples)
{
// Get Samples per frame (for this frame number)