Various fixes to push audio vaguely in the right direction.

[dcpomatic.git] / src / lib / audio_merger.cc

diff --git a/src/lib/audio_merger.cc b/src/lib/audio_merger.cc
index d50420c31d5343dcabe0b25eb13b8b704599d37f..49cdea6a354ebe6c4c4b45503c3122795d2e1198 100644 (file)
--- a/src/lib/audio_merger.cc
+++ b/src/lib/audio_merger.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,76 +17,62 @@
 
 */
 
-#include "audio_buffers.h"
 #include "audio_merger.h"
+#include "dcpomatic_time.h"
+#include <iostream>
 
+using std::pair;
 using std::min;
 using std::max;
+using std::make_pair;
 using boost::shared_ptr;
 
 AudioMerger::AudioMerger (int channels, int frame_rate)
        : _buffers (new AudioBuffers (channels, 0))
-       , _frame_rate (frame_rate)
        , _last_pull (0)
+       , _frame_rate (frame_rate)
 {
 
 }
 
-
-TimedAudioBuffers<DCPTime>
+/** Pull audio up to a given time; after this call, no more data can be pushed
+ *  before the specified time.
+ */
+pair<shared_ptr<AudioBuffers>, DCPTime>
 AudioMerger::pull (DCPTime time)
 {
-       assert (time >= _last_pull);
-       
-       TimedAudioBuffers<DCPTime> out;
-       
-       int64_t const to_return = DCPTime (time - _last_pull).frames (_frame_rate);
-       out.audio.reset (new AudioBuffers (_buffers->channels(), to_return));
+       /* Number of frames to return */
+       Frame const to_return = time.frames_floor (_frame_rate) - _last_pull.frames_floor (_frame_rate);
+       shared_ptr<AudioBuffers> out (new AudioBuffers (_buffers->channels(), to_return));
+
        /* And this is how many we will get from our buffer */
-       int64_t const to_return_from_buffers = min (to_return, int64_t (_buffers->frames ()));
-       
+       Frame const to_return_from_buffers = min (to_return, Frame (_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);
+       out->copy_from (_buffers.get(), to_return_from_buffers, 0, to_return - to_return_from_buffers);
        /* Silence any gap at the start */
-       out.audio->make_silent (0, to_return - to_return_from_buffers);
-       
-       out.time = _last_pull;
+       out->make_silent (0, to_return - to_return_from_buffers);
+
+       DCPTime out_time = _last_pull;
        _last_pull = time;
-       
+
        /* 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_return_from_buffers);
-       
-       return out;
+
+       return make_pair (out, out_time);
 }
 
 void
-AudioMerger::push (shared_ptr<const AudioBuffers> audio, DCPTime time)
+AudioMerger::push (boost::shared_ptr<const AudioBuffers> audio, DCPTime time)
 {
-       assert (time >= _last_pull);
-       
-       int64_t frame = time.frames (_frame_rate);
-       int64_t after = max (int64_t (_buffers->frames()), frame + audio->frames() - _last_pull.frames (_frame_rate));
+       DCPOMATIC_ASSERT (time >= _last_pull);
+
+       Frame const frame = time.frames_floor (_frame_rate);
+       Frame after = max (Frame (_buffers->frames()), frame + audio->frames() - _last_pull.frames_floor (_frame_rate));
        _buffers->ensure_size (after);
-       _buffers->accumulate_frames (audio.get(), 0, frame - _last_pull.frames (_frame_rate), audio->frames ());
+       _buffers->accumulate_frames (audio.get(), 0, frame - _last_pull.frames_floor (_frame_rate), audio->frames ());
        _buffers->set_frames (after);
 }
-
-TimedAudioBuffers<DCPTime>
-AudioMerger::flush ()
-{
-       if (_buffers->frames() == 0) {
-               return TimedAudioBuffers<DCPTime> ();
-       }
-       
-       return TimedAudioBuffers<DCPTime> (_buffers, _last_pull);
-}
-
-void
-AudioMerger::clear (DCPTime t)
-{
-       _last_pull = t;
-       _buffers.reset (new AudioBuffers (_buffers->channels(), 0));
-}