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

Reworked the cache object to use a double sided queue, so I can iterate through it to find the smallest frame, and remove specific frames from the cache. Also, fixed some additional audio bugs, and I finally have the audio being correctly distributed between frame objects.

Browse Source
This commit is contained in:
Jonathan Thomas
2011-10-26 00:34:48 -05:00
parent fa62b307c3
commit e4f95d8a99
5 changed files with 85 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/FFmpegReader.cpp
View File

@@ -290,7 +290,8 @@ Frame FFmpegReader::ReadStream(int requested_frame)
av_free(pFrame);
// End of stream? Mark the any other working frames as 'finished'
CheckWorkingFrames(true);
if (end_of_stream)
CheckWorkingFrames(end_of_stream);
// Return requested frame (if found)
if (final_cache.Exists(requested_frame))
@@ -428,16 +429,12 @@ void FFmpegReader::ProcessAudioPacket(int requested_frame, int target_frame, int
packet.size -= used;
}
cout << "Samples Added to Frame " << target_frame << ": " << packet_samples << " (starting at sample: " << starting_sample << ")" << endl;
for (int channel_filter = 0; channel_filter < info.channels; channel_filter++)
{
// Array of floats (to hold samples for each channel)
int starting_frame_number = target_frame;
int channel_buffer_size = (packet_samples / info.channels) + 1;
float *channel_buffer = new float[channel_buffer_size];
int position = 0;
// Init buffer array
for (int z = 0; z < channel_buffer_size; z++)
@@ -446,7 +443,7 @@ void FFmpegReader::ProcessAudioPacket(int requested_frame, int target_frame, int
// Loop through all samples and add them to our Frame based on channel.
// Toggle through each channel number, since channel data is stored like (left right left right)
int channel = 0;
int position = 0;
for (int sample = 0; sample < packet_samples; sample++)
{
// Only add samples for current channel
@@ -460,7 +457,7 @@ void FFmpegReader::ProcessAudioPacket(int requested_frame, int target_frame, int
}
// increment channel (if needed)
if (channel < info.channels)
if ((channel + 1) < info.channels)
// move to next channel
channel ++;
else
@@ -468,13 +465,6 @@ void FFmpegReader::ProcessAudioPacket(int requested_frame, int target_frame, int
channel = 0;
}
// Add channel buffer to Frame object
// if (packet_samples > 0) // DEBUG to prevent overwriting samples with multiple audio packets
// {
// //cout << " *** ADDED AUDIO FOR FRAME " << current_frame << " *** (" << channel_buffer_size << " samples)" << endl;
// new_frame.AddAudio(channel_filter, audio_position, channel_buffer, channel_buffer_size, 1.0f);
// }
// Get Samples per frame
int samples_per_frame = GetSamplesPerFrame();
@@ -769,7 +759,7 @@ void FFmpegReader::CheckWorkingFrames(bool end_of_stream)
break;
// Get the front frame of working cache
Frame f = working_cache.GetFront();
Frame f = working_cache.GetSmallestFrame();
// Check if working frame is final
if ((!end_of_stream && f.number <= last_video_frame && f.number < last_audio_frame) || end_of_stream)
@@ -778,7 +768,7 @@ void FFmpegReader::CheckWorkingFrames(bool end_of_stream)
final_cache.Add(f.number, f);
// Remove frame from working cache
working_cache.Pop();
working_cache.Remove(f.number);
}
else
// Stop looping