Untested merge of master.

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

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 19d06714996d442d18f2fd5b30da0475bf134d3b..ea3f27ad8f94f10175e1b6e81237b5e1d6059c12 100644 (file)
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -28,15 +28,13 @@
 #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 "playlist.h"
+#include "player.h"
 
 using std::string;
 using boost::shared_ptr;
@@ -44,61 +42,57 @@ 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 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, shared_ptr<Job> j)
+Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<Job> j)
        : _job (j)
-       , _playlist (f->playlist ())
-       , _encoder (new Encoder (f, _playlist))
+       , _player (f->player ())
+       , _encoder (new Encoder (f))
 {
-       if (_playlist->has_audio ()) {
-               _matcher.reset (new Matcher (f->log(), _playlist->audio_frame_rate(), _playlist->video_frame_rate()));
-               _delay_line.reset (new DelayLine (f->log(), _playlist->audio_channels(), f->audio_delay() * _playlist->audio_frame_rate() / 1000));
-               _gain.reset (new Gain (f->log(), f->audio_gain()));
-       }
+       _matcher.reset (new Matcher (f->log(), f->audio_frame_rate(), f->video_frame_rate()));
+       _delay_line.reset (new DelayLine (f->log(), f->audio_delay() * f->audio_frame_rate() / 1000));
+       _gain.reset (new Gain (f->log(), f->audio_gain()));
 
-       if (_matcher) {
-               _playlist->connect_video (_matcher);
-               _matcher->connect_video (_encoder);
-       } else {
-               _playlist->connect_video (_encoder);
+       if (!f->with_subtitles ()) {
+               _player->disable_subtitles ();
        }
+
+       _player->connect_video (_delay_line);
+       _delay_line->connect_video (_matcher);
+       _matcher->connect_video (_encoder);
        
-       if (_matcher && _delay_line && _playlist->has_audio ()) {
-               _playlist->connect_audio (_delay_line);
-               _delay_line->connect_audio (_matcher);
-               _matcher->connect_audio (_gain);
-               _gain->connect_audio (_encoder);
-       }
+       _player->connect_audio (_delay_line);
+       _delay_line->connect_audio (_matcher);
+       _matcher->connect_audio (_gain);
+       _gain->connect_audio (_encoder);
 }
 
 void
 Transcoder::go ()
 {
        _encoder->process_begin ();
-       try {
-               while (1) {
-                       if (_playlist->pass ()) {
-                               break;
-                       }
-                       _playlist->set_progress (_job);
+       while (1) {
+               if (_player->pass ()) {
+                       break;
                }
-               
-       } catch (...) {
-               _encoder->process_end ();
-               throw;
-       }
-       
-       if (_delay_line) {
-               _delay_line->process_end ();
-       }
-       if (_matcher) {
-               _matcher->process_end ();
-       }
-       if (_gain) {
-               _gain->process_end ();
+               _player->set_progress (_job);
        }
+
+       _delay_line->process_end ();
+       _matcher->process_end ();
+       _gain->process_end ();
        _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 ();
+}