Merge master.

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

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 23fb5b7880731789fdb82976fa7cc35c40e0f3bb..ba4d3b040baa432812cfe85e972ea9f6c9d052c1 100644 (file)
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -28,87 +28,70 @@
 #include <boost/signals2.hpp>
 #include "transcoder.h"
 #include "encoder.h"
-#include "decoder_factory.h"
 #include "film.h"
-#include "matcher.h"
-#include "delay_line.h"
-#include "options.h"
-#include "gain.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
+#include "player.h"
+#include "job.h"
 
 using std::string;
 using boost::shared_ptr;
+using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 
+static void
+video_proxy (weak_ptr<Encoder> encoder, shared_ptr<PlayerImage> image, Eyes eyes, ColourConversion conversion, bool same)
+{
+       shared_ptr<Encoder> e = encoder.lock ();
+       if (e) {
+               e->process_video (image, eyes, conversion, same);
+       }
+}
+
+static void
+audio_proxy (weak_ptr<Encoder> encoder, shared_ptr<const AudioBuffers> audio)
+{
+       shared_ptr<Encoder> e = encoder.lock ();
+       if (e) {
+               e->process_audio (audio);
+       }
+}
+
 /** Construct a transcoder using a Decoder that we create and a supplied Encoder.
  *  @param f Film that we are transcoding.
- *  @param o Decode options.
- *  @param j Job that we are running under, or 0.
  *  @param e Encoder to use.
  */
-Transcoder::Transcoder (shared_ptr<Film> f, DecodeOptions o, Job* j, shared_ptr<Encoder> e)
-       : _job (j)
-       , _encoder (e)
-       , _decoders (decoder_factory (f, o))
+Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
+       : _film (f)
+       , _player (f->make_player ())
+       , _encoder (new Encoder (f, j))
+       , _finishing (false)
 {
-       assert (_encoder);
-
-       shared_ptr<AudioStream> st = f->audio_stream();
-       _matcher.reset (new Matcher (f->log(), st->sample_rate(), f->source_frame_rate()));
-       _delay_line.reset (new DelayLine (f->log(), f->audio_delay() / 1000.0f));
-       _gain.reset (new Gain (f->log(), f->audio_gain()));
-
-       /* Set up the decoder to use the film's set streams */
-       _decoders.video->set_subtitle_stream (f->subtitle_stream ());
-       _decoders.audio->set_audio_stream (f->audio_stream ());
-
-       _decoders.video->connect_video (_delay_line);
-       _delay_line->connect_video (_matcher);
-       _matcher->connect_video (_encoder);
-       
-       _decoders.audio->connect_audio (_delay_line);
-       _delay_line->connect_audio (_matcher);
-       _matcher->connect_audio (_gain);
-       _gain->connect_audio (_encoder);
+       _player->Video.connect (bind (video_proxy, _encoder, _1, _2, _3, _4));
+       _player->Audio.connect (bind (audio_proxy, _encoder, _1));
 }
 
-/** Run the decoder, passing its output to the encoder, until the decoder
- *  has no more data to present.
- */
 void
 Transcoder::go ()
 {
        _encoder->process_begin ();
-       try {
-               bool done[2] = { false, false };
-               
-               while (1) {
-                       if (!done[0]) {
-                               done[0] = _decoders.video->pass ();
-                               if (_job) {
-                                       _decoders.video->set_progress (_job);
-                               }
-                       }
-
-                       if (!done[1] && _decoders.audio && dynamic_pointer_cast<Decoder> (_decoders.audio) != dynamic_pointer_cast<Decoder> (_decoders.video)) {
-                               done[1] = _decoders.audio->pass ();
-                       } else {
-                               done[1] = true;
-                       }
-
-                       if (done[0] && done[1]) {
-                               break;
-                       }
-               }
-               
-       } catch (...) {
-               _encoder->process_end ();
-               throw;
-       }
-       
-       _delay_line->process_end ();
-       _matcher->process_end ();
-       _gain->process_end ();
+       while (!_player->pass ()) {}
+
+       _finishing = true;
        _encoder->process_end ();
+
+       _player->statistics().dump (_film->log ());
+}
+
+float
+Transcoder::current_encoding_rate () const
+{
+       return _encoder->current_encoding_rate ();
 }
+
+int
+Transcoder::video_frames_out () const
+{
+       return _encoder->video_frames_out ();
+}
+