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

Changed / Refactored many enums and structs, to better standardize the naming of everything. Improved some more descriptions and briefs.

Browse Source
This commit is contained in:
Jonathan Thomas
2013-09-10 12:59:06 -05:00
parent 234201743a
commit cbed47ea5f
26 changed files with 74 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/FFmpegReader.cpp
View File

@@ -67,7 +67,7 @@ void FFmpegReader::InitScalers()
}
// This struct holds the associated video frame and starting sample # for an audio packet.
int audio_packet_location::is_near(audio_packet_location location, int samples_per_frame, int amount)
int AudioLocation::is_near(AudioLocation location, int samples_per_frame, int amount)
{
// Is frame even close to this one?
if (abs(location.frame - frame) >= 2)
@@ -523,7 +523,7 @@ tr1::shared_ptr<Frame> FFmpegReader::ReadStream(int requested_frame)
UpdatePTSOffset(false);
// Determine related video frame and starting sample # from audio PTS
audio_packet_location location = GetAudioPTSLocation(packet->pts);
AudioLocation location = GetAudioPTSLocation(packet->pts);
// Process Audio Packet
ProcessAudioPacket(requested_frame, location.frame, location.sample_start);
@@ -1197,7 +1197,7 @@ int FFmpegReader::ConvertFrameToAudioPTS(int frame_number)
}
// Calculate Starting video frame and sample # for an audio PTS
audio_packet_location FFmpegReader::GetAudioPTSLocation(int pts)
AudioLocation FFmpegReader::GetAudioPTSLocation(int pts)
{
// Apply PTS offset
pts = pts + audio_pts_offset;
@@ -1229,7 +1229,7 @@ audio_packet_location FFmpegReader::GetAudioPTSLocation(int pts)
sample_start = 0;
// Prepare final audio packet location
audio_packet_location location = {whole_frame, sample_start};
AudioLocation location = {whole_frame, sample_start};
// Compare to previous audio packet (and fix small gaps due to varying PTS timestamps)
if (previous_packet_location.frame != -1 && location.is_near(previous_packet_location, samples_per_frame, samples_per_frame))