Fix merging of audio in various circumstances.

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

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index 32453cc13c974d58218cf5dae9eb4eb6da5047d2..31f713fda3a3b743ec42b90133563af4d1192b38 100644 (file)
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -1,84 +1,79 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include "audio_decoder.h"
 #include "audio_buffers.h"
-#include "exceptions.h"
+#include "audio_content.h"
 #include "log.h"
-#include "resampler.h"
-#include "util.h"
+#include "compose.hpp"
+#include <boost/foreach.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
-using std::stringstream;
-using std::list;
-using std::pair;
 using std::cout;
-using boost::optional;
+using std::map;
 using boost::shared_ptr;
+using boost::optional;
 
-AudioDecoder::AudioDecoder (shared_ptr<const AudioContent> content)
-       : _audio_content (content)
+AudioDecoder::AudioDecoder (Decoder* parent, shared_ptr<const AudioContent> content, shared_ptr<Log> log)
+       : DecoderPart (parent, log)
 {
-       if (content->output_audio_frame_rate() != content->content_audio_frame_rate() && content->audio_channels ()) {
-               _resampler.reset (new Resampler (content->content_audio_frame_rate(), content->output_audio_frame_rate(), content->audio_channels ()));
+       BOOST_FOREACH (AudioStreamPtr i, content->streams ()) {
+               _positions[i] = 0;
        }
 }
 
-/** Audio timestamping is made hard by many factors, but the final nail in the coffin is resampling.
- *  We have to assume that we are feeding continuous data into the resampler, and so we get continuous
- *  data out.  Hence we do the timestamping here, post-resampler, just by counting samples.
- *
- *  The time is passed in here so that after a seek we can set up our _audio_position.  The
- *  time is ignored once this has been done.
- */
 void
-AudioDecoder::audio (shared_ptr<const AudioBuffers> data, ContentTime time)
+AudioDecoder::emit (AudioStreamPtr stream, shared_ptr<const AudioBuffers> data, ContentTime time)
 {
-       if (_resampler) {
-               data = _resampler->run (data);
+       if (ignore ()) {
+               return;
        }
 
-       if (!_audio_position) {
-               _audio_position = time;
+       if (_positions[stream] == 0) {
+               _positions[stream] = time.frames_round (stream->frame_rate ());
        }
 
-       _pending.push_back (shared_ptr<DecodedAudio> (new DecodedAudio (_audio_position.get (), data)));
-       _audio_position = _audio_position.get() + ContentTime (data->frames (), _audio_content->output_audio_frame_rate ());
+       Data (stream, ContentAudio (data, _positions[stream]));
+       _positions[stream] += data->frames();
 }
 
-void
-AudioDecoder::flush ()
+ContentTime
+AudioDecoder::position () const
 {
-       if (!_resampler) {
-               return;
+       optional<ContentTime> p;
+       for (map<AudioStreamPtr, Frame>::const_iterator i = _positions.begin(); i != _positions.end(); ++i) {
+               ContentTime const ct = ContentTime::from_frames (i->second, i->first->frame_rate ());
+               if (!p || ct < *p) {
+                       p = ct;
+               }
        }
 
-       shared_ptr<const AudioBuffers> b = _resampler->flush ();
-       if (b) {
-               _pending.push_back (shared_ptr<DecodedAudio> (new DecodedAudio (_audio_position.get (), b)));
-               _audio_position = _audio_position.get() + ContentTime (b->frames (), _audio_content->output_audio_frame_rate ());
-       }
+       return p.get_value_or(ContentTime());
 }
 
 void
-AudioDecoder::seek (ContentTime, bool)
+AudioDecoder::seek ()
 {
-       _audio_position.reset ();
+       for (map<AudioStreamPtr, Frame>::iterator i = _positions.begin(); i != _positions.end(); ++i) {
+               i->second = 0;
+       }
 }