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

Replaced the FrameMapper's omp task with omp for ordered, and it now runs fully multi-threaded... while still keeping the resampling calls in order.

Browse Source
This commit is contained in:
Jonathan Thomas
2015-03-09 15:17:56 -05:00
parent 820e8a2095
commit 5a9ca1909a
2 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/FrameMapper.cpp
View File

@@ -322,19 +322,14 @@ tr1::shared_ptr<Frame> FrameMapper::GetFrame(int requested_frame) throw(ReaderCl
#pragma omp parallel
{
#pragma omp single
// Debug output
#pragma omp critical (debug_output)
AppendDebugMethod("FrameMapper::GetFrame (Loop through frames)", "requested_frame", requested_frame, "minimum_frames", minimum_frames, "", -1, "", -1, "", -1, "", -1);
// Loop through all requested frames, each frame gets it's own thread
#pragma omp for ordered
for (int frame_number = requested_frame; frame_number < requested_frame + minimum_frames; frame_number++)
{
// Debug output
#pragma omp critical (debug_output)
AppendDebugMethod("FrameMapper::GetFrame (Loop through frames)", "requested_frame", requested_frame, "minimum_frames", minimum_frames, "", -1, "", -1, "", -1, "", -1);
// Loop through all requested frames
for (int frame_number = requested_frame; frame_number < requested_frame + minimum_frames; frame_number++)
{
#pragma omp task firstprivate(frame_number)
{
// Get the mapped frame
MappedFrame mapped = GetMappedFrame(frame_number);
tr1::shared_ptr<Frame> mapped_frame = reader->GetFrameSafe(mapped.Odd.Frame);
@@ -414,24 +409,16 @@ tr1::shared_ptr<Frame> FrameMapper::GetFrame(int requested_frame) throw(ReaderCl
if (info.sample_rate != frame->SampleRate() || info.channels != frame->GetAudioChannelsCount() ||
info.channel_layout != frame->ChannelsLayout())
// Resample audio and correct # of channels if needed
#pragma ordered
ResampleMappedAudio(frame, mapped.Odd.Frame);
// Add frame to final cache
#pragma omp critical (openshot_cache)
final_cache.Add(frame->number, frame);
} // omp task
// TODO: Fix this bug. Wait on the task to complete. This is not ideal, but solves an issue with the
// audio_frame being modified by the next call to this method. I think this is a scope issue with OpenMP.
#pragma omp taskwait
} // for loop
} // omp single
} // omp parallel
// Return processed 'frame'
// Return processed openshot::Frame
return final_cache.GetFrame(requested_frame);
}
@@ -600,7 +587,7 @@ void FrameMapper::ResampleMappedAudio(tr1::shared_ptr<Frame> frame, int original
ChannelLayout channel_layout_in_frame = frame->ChannelsLayout();
#pragma omp critical (debug_output)
AppendDebugMethod("FrameMapper::ResampleMappedAudio", "frame->number", frame->number, "channels_in_frame", channels_in_frame, "samples_in_frame", samples_in_frame, "sample_rate_in_frame", sample_rate_in_frame, "", -1, "", -1);
AppendDebugMethod("FrameMapper::ResampleMappedAudio", "frame->number", frame->number, "original_frame_number", original_frame_number, "channels_in_frame", channels_in_frame, "samples_in_frame", samples_in_frame, "sample_rate_in_frame", sample_rate_in_frame, "", -1);
// Get audio sample array
float* frame_samples_float = NULL;
@@ -618,6 +605,7 @@ void FrameMapper::ResampleMappedAudio(tr1::shared_ptr<Frame> frame, int original
// Translate sample value and copy into buffer
frame_samples[s] = int(frame_samples_float[s] * (1 << 15));
// Deallocate float array
delete[] frame_samples_float;
frame_samples_float = NULL;
@@ -642,7 +630,6 @@ void FrameMapper::ResampleMappedAudio(tr1::shared_ptr<Frame> frame, int original
}
// Update total samples & input frame size (due to bigger or smaller data types)
//total_frame_samples = round((float)total_frame_samples * (float(info.sample_rate) / sample_rate_in_frame) * (float(info.channels) / channels_in_frame)) + 1; // adjust for different byte sizes and channels
total_frame_samples = Frame::GetSamplesPerFrame(original_frame_number, target, info.sample_rate, info.channels);
#pragma omp critical (debug_output)
@@ -658,7 +645,9 @@ void FrameMapper::ResampleMappedAudio(tr1::shared_ptr<Frame> frame, int original
AppendDebugMethod("FrameMapper::ResampleMappedAudio (preparing for resample)", "in_sample_fmt", AV_SAMPLE_FMT_S16, "out_sample_fmt", AV_SAMPLE_FMT_S16, "in_sample_rate", sample_rate_in_frame, "out_sample_rate", info.sample_rate, "in_channels", channels_in_frame, "out_channels", info.channels);
int nb_samples = 0;
#pragma omp critical (openshot_audio_resample)
// Force the audio resampling to happen in order (1st thread to last thread), so the waveform
// is smooth and continuous.
#pragma omp ordered
{
// setup resample context
if (!avr) {

6
src/examples/Example.cpp
View File

@@ -48,7 +48,7 @@ int main(int argc, char* argv[])
r9.debug = false;
// Mapper
FrameMapper map(&r9, Fraction(30,1), PULLDOWN_NONE, 48000, 2, LAYOUT_STEREO);
FrameMapper map(&r9, Fraction(24,1), PULLDOWN_NONE, 48000, 2, LAYOUT_STEREO);
map.DisplayInfo();
map.debug = true;
map.Open();
@@ -85,7 +85,7 @@ int main(int argc, char* argv[])
// 147000 frames, 28100 frames
//for (int frame = 1; frame <= (r9.info.video_length - 1); frame++)
//for (int z = 0; z < 2; z++)
for (int frame = 1; frame <= 1000; frame++)
for (int frame = 1; frame <= 300; frame++)
//int frame = 1;
//while (true)
{
@@ -96,7 +96,7 @@ int main(int argc, char* argv[])
tr1::shared_ptr<Frame> f = map.GetFrame(frame_number);
cout << "display it (" << f->number << ", " << f << ")" << endl;
//r9.GetFrame(frame_number)->DisplayWaveform();
//if (frame == 49)
//if (frame >= 65)
// f->DisplayWaveform();
//f->AddColor(r9.info.width, r9.info.height, "blue");
w9.WriteFrame(f);