Various fixes to push audio vaguely in the right direction.

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

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index 18f4b890d6b8878cc58eabc6a2aba5930eec6838..5a33716f4fe775622e2864a7ce97192c281ed84a 100644 (file)
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -1,57 +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 "compose.hpp"
+#include <boost/foreach.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
-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 Film> film, shared_ptr<const AudioContent> content)
-       : Decoder (film)
-       , _audio_content (content)
-       , _audio_position (0)
+AudioDecoder::AudioDecoder (Decoder* parent, shared_ptr<AudioContent> content, shared_ptr<Log> log)
+       : DecoderPart (parent, log)
 {
-
+       BOOST_FOREACH (AudioStreamPtr i, content->streams ()) {
+               _positions[i] = 0;
+       }
 }
 
 void
-AudioDecoder::audio (shared_ptr<const AudioBuffers> data, AudioContent::Frame frame)
+AudioDecoder::emit (AudioStreamPtr stream, shared_ptr<const AudioBuffers> data, ContentTime time)
 {
-       Audio (data, frame);
-       _audio_position = frame + data->frames ();
+       if (ignore ()) {
+               return;
+       }
+
+       if (_positions[stream] == 0) {
+               _positions[stream] = time.frames_round (stream->frame_rate ());
+       }
+
+       Data (stream, ContentAudio (data, _positions[stream]));
+       _positions[stream] += data->frames();
 }
 
-/** This is a bit odd, but necessary when we have (e.g.) FFmpegDecoders with no audio.
- *  The player needs to know that there is no audio otherwise it will keep trying to
- *  pass() the decoder to get it to emit audio.
- */
-bool
-AudioDecoder::has_audio () const
+ContentTime
+AudioDecoder::position () const
+{
+       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;
+               }
+       }
+
+       return p.get_value_or(ContentTime());
+}
+
+void
+AudioDecoder::seek ()
 {
-       return _audio_content->audio_channels () > 0;
+       for (map<AudioStreamPtr, Frame>::iterator i = _positions.begin(); i != _positions.end(); ++i) {
+               i->second = 0;
+       }
 }