Merge master.

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

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 537b9b66452d6f4b8e30dbe4f824b9983166fb0b..6744e9193ce9d415d1ad36eeceedd9f52f25ac83 100644 (file)
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -28,84 +28,59 @@
 #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"
 
 using std::string;
-using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 
 /** Construct a transcoder using a Decoder that we create and a supplied Encoder.
  *  @param f Film that we are transcoding.
- *  @param o Options.
  *  @param j Job that we are running under, or 0.
  *  @param e Encoder to use.
  */
-Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<const Options> o, Job* j, shared_ptr<Encoder> e)
+Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<Job> j)
        : _job (j)
-       , _encoder (e)
-       , _decoders (decoder_factory (f, o, j))
+       , _player (f->player ())
+       , _encoder (new Encoder (f))
 {
-       assert (_encoder);
-
-       if (f->audio_stream()) {
-               shared_ptr<AudioStream> st = f->audio_stream();
-               _matcher.reset (new Matcher (f->log(), st->sample_rate(), f->frames_per_second()));
-               _delay_line.reset (new DelayLine (f->log(), st->channels(), f->audio_delay() * st->sample_rate() / 1000));
+       if (f->has_audio ()) {
+               _matcher.reset (new Matcher (f->log(), f->audio_frame_rate(), f->video_frame_rate()));
+               _delay_line.reset (new DelayLine (f->log(), f->audio_channels(), f->audio_delay() * f->audio_frame_rate() / 1000));
                _gain.reset (new Gain (f->log(), f->audio_gain()));
        }
 
-       /* Set up the decoder to use the film's set streams */
-       _decoders.first->set_subtitle_stream (f->subtitle_stream ());
-       _decoders.second->set_audio_stream (f->audio_stream ());
-
        if (_matcher) {
-               _decoders.first->connect_video (_matcher);
+               _player->connect_video (_matcher);
                _matcher->connect_video (_encoder);
        } else {
-               _decoders.first->connect_video (_encoder);
+               _player->connect_video (_encoder);
        }
        
-       if (_matcher && _delay_line) {
-               _decoders.second->connect_audio (_delay_line);
+       if (_matcher && _delay_line && f->has_audio ()) {
+               _player->connect_audio (_delay_line);
                _delay_line->connect_audio (_matcher);
                _matcher->connect_audio (_gain);
                _gain->connect_audio (_encoder);
        }
 }
 
-/** 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.first->pass ();
-                               _decoders.first->set_progress ();
-                       }
-
-                       if (!done[1] && dynamic_pointer_cast<Decoder> (_decoders.second) != dynamic_pointer_cast<Decoder> (_decoders.first)) {
-                               done[1] = _decoders.second->pass ();
-                       } else {
-                               done[1] = true;
-                       }
-
-                       if (done[0] && done[1]) {
+                       if (_player->pass ()) {
                                break;
                        }
+                       _player->set_progress (_job);
                }
                
        } catch (...) {
@@ -124,3 +99,15 @@ Transcoder::go ()
        }
        _encoder->process_end ();
 }
+
+float
+Transcoder::current_encoding_rate () const
+{
+       return _encoder->current_encoding_rate ();
+}
+
+int
+Transcoder::video_frames_out () const
+{
+       return _encoder->video_frames_out ();
+}