From bcb746a19d5cc5377eacb33b73b59549a7372487 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 27 Jul 2013 21:10:45 +0100 Subject: [PATCH] Adjust AudioMerger to non-signalling API. --- src/lib/audio_merger.h | 63 +++++++++++++++++++++------------------ src/lib/player.cc | 26 +++++++++------- src/lib/player.h | 1 - src/lib/types.h | 17 +++++++++++ test/audio_merger_test.cc | 62 +++++++++++++------------------------- 5 files changed, 86 insertions(+), 83 deletions(-) diff --git a/src/lib/audio_merger.h b/src/lib/audio_merger.h index 126325a9d..afb21871b 100644 --- a/src/lib/audio_merger.h +++ b/src/lib/audio_merger.h @@ -18,6 +18,7 @@ */ #include "audio_buffers.h" +#include "util.h" template class AudioMerger @@ -25,47 +26,50 @@ class AudioMerger public: AudioMerger (int channels, boost::function t_to_f, boost::function f_to_t) : _buffers (new AudioBuffers (channels, 0)) - , _next_emission (0) + , _next_out (0) , _t_to_f (t_to_f) , _f_to_t (f_to_t) {} - void push (boost::shared_ptr audio, T time) + TimedAudioBuffers + push (boost::shared_ptr audio, T time) { - if (time > _next_emission) { - /* We can emit some audio from our buffer; this is how many frames - we are going to emit. - */ - F const to_emit = _t_to_f (time - _next_emission); - boost::shared_ptr emit (new AudioBuffers (_buffers->channels(), to_emit)); + assert (time >= _next_out); + TimedAudioBuffers out; + + if (time > _next_out) { + /* We can return some audio from our buffer; this is how many frames + we are going to return. + */ + F const to_return = _t_to_f (time - _next_out); + out.audio.reset (new AudioBuffers (_buffers->channels(), to_return)); /* And this is how many we will get from our buffer */ - F const to_emit_from_buffers = min (to_emit, _buffers->frames ()); - - /* Copy the data that we have to the back end of `emit' */ - emit->copy_from (_buffers.get(), to_emit_from_buffers, 0, to_emit - to_emit_from_buffers); + F const to_return_from_buffers = min (to_return, _buffers->frames ()); + /* Copy the data that we have to the back end of the return buffer */ + out.audio->copy_from (_buffers.get(), to_return_from_buffers, 0, to_return - to_return_from_buffers); /* Silence any gap at the start */ - emit->make_silent (0, to_emit - to_emit_from_buffers); + out.audio->make_silent (0, to_return - to_return_from_buffers); - /* Emit that */ - Audio (emit, _next_emission); + out.time = _next_out; + _next_out += _f_to_t (to_return); - _next_emission += _f_to_t (to_emit); - - /* And remove the data we've emitted from our buffers */ - if (_buffers->frames() > to_emit_from_buffers) { - _buffers->move (to_emit_from_buffers, 0, _buffers->frames() - to_emit_from_buffers); + /* And remove the data we're returning from our buffers */ + if (_buffers->frames() > to_return_from_buffers) { + _buffers->move (to_return_from_buffers, 0, _buffers->frames() - to_return_from_buffers); } - _buffers->set_frames (_buffers->frames() - to_emit_from_buffers); + _buffers->set_frames (_buffers->frames() - to_return_from_buffers); } /* Now accumulate the new audio into our buffers */ F frame = _t_to_f (time); - F after = max (_buffers->frames(), frame + audio->frames() - _t_to_f (_next_emission)); + F after = max (_buffers->frames(), frame + audio->frames() - _t_to_f (_next_out)); _buffers->ensure_size (after); - _buffers->accumulate_frames (audio.get(), 0, frame - _t_to_f (_next_emission), audio->frames ()); + _buffers->accumulate_frames (audio.get(), 0, frame - _t_to_f (_next_out), audio->frames ()); _buffers->set_frames (after); + + return out; } F min (F a, int b) @@ -86,18 +90,19 @@ public: return b; } - void flush () + TimedAudioBuffers + flush () { - if (_buffers->frames() > 0) { - Audio (_buffers, _next_emission); + if (_buffers->frames() == 0) { + return TimedAudioBuffers (); } + + return TimedAudioBuffers (_buffers, _next_out); } - boost::signals2::signal, T)> Audio; - private: boost::shared_ptr _buffers; - T _next_emission; + T _next_out; boost::function _t_to_f; boost::function _f_to_t; }; diff --git a/src/lib/player.cc b/src/lib/player.cc index dbc78b8d0..e2f23e6e3 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -48,7 +48,7 @@ using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; -//#define DEBUG_PLAYER 1 +#define DEBUG_PLAYER 1 class Piece { @@ -102,7 +102,6 @@ Player::Player (shared_ptr f, shared_ptr p) _playlist->Changed.connect (bind (&Player::playlist_changed, this)); _playlist->ContentChanged.connect (bind (&Player::content_changed, this, _1, _2, _3)); _film->Changed.connect (bind (&Player::film_changed, this, _1)); - _audio_merger.Audio.connect (bind (&Player::merger_process_audio, this, _1, _2)); set_video_container_size (_film->container()->size (_film->full_frame ())); } @@ -319,20 +318,25 @@ Player::process_audio (weak_ptr weak_piece, shared_ptr audio, Time time) -{ - Audio (audio, time); - _audio_position += _film->audio_frames_to_time (audio->frames ()); + cout << "push " << audio->frames() << " @ " << time << " from " << content->path() << "\n"; + TimedAudioBuffers