Rename video/audio/subtitle part methods.

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

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 07025800822cd6f5860cfc6e097de9abcce60434..ba004d634f4b6c7d2e933ce080e82b9dbfb10df3 100644 (file)
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -24,79 +24,93 @@
  *  as a parameter to the constructor.
  */
 
-#include <iostream>
-#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 "gain.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
-#include "playlist.h"
+#include "player.h"
+#include "job.h"
+#include "writer.h"
+#include "compose.hpp"
+#include "referenced_reel_asset.h"
+#include "subtitle_content.h"
+#include <boost/signals2.hpp>
+#include <boost/foreach.hpp>
+#include <iostream>
 
 using std::string;
+using std::cout;
+using std::list;
 using boost::shared_ptr;
+using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 
-/** Construct a transcoder using a Decoder that we create and a supplied Encoder.
+/** Construct a transcoder.
  *  @param f Film that we are transcoding.
- *  @param j Job that we are running under, or 0.
- *  @param e Encoder to use.
+ *  @param j Job that this transcoder is being used in.
  */
-Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<Job> j)
-       : _job (j)
-       , _playlist (f->playlist ())
-       , _encoder (new Encoder (f, _playlist))
+Transcoder::Transcoder (shared_ptr<const Film> film, shared_ptr<Job> j)
+       : _film (film)
+       , _player (new Player (film, film->playlist ()))
+       , _writer (new Writer (film, j))
+       , _encoder (new Encoder (film, _writer))
+       , _finishing (false)
 {
-       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()));
-       }
 
-       if (_matcher) {
-               _playlist->connect_video (_matcher);
-               _matcher->connect_video (_encoder);
-       } else {
-               _playlist->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);
-       }
 }
 
 void
 Transcoder::go ()
 {
-       _encoder->process_begin ();
-       try {
-               while (1) {
-                       if (_playlist->pass ()) {
-                               break;
+       _writer->start ();
+       _encoder->begin ();
+
+       DCPTime const frame = DCPTime::from_frames (1, _film->video_frame_rate ());
+       DCPTime const length = _film->length ();
+
+       int burnt_subtitles = 0;
+       int non_burnt_subtitles = 0;
+       BOOST_FOREACH (shared_ptr<const Content> c, _film->content ()) {
+               if (c->subtitle && c->subtitle->use()) {
+                       if (c->subtitle->burn()) {
+                               ++burnt_subtitles;
+                       } else {
+                               ++non_burnt_subtitles;
                        }
-                       _playlist->set_progress (_job);
                }
-               
-       } catch (...) {
-               _encoder->process_end ();
-               throw;
        }
-       
-       if (_delay_line) {
-               _delay_line->process_end ();
+
+       if (non_burnt_subtitles) {
+               _writer->write (_player->get_subtitle_fonts ());
        }
-       if (_matcher) {
-               _matcher->process_end ();
+
+       for (DCPTime t; t < length; t += frame) {
+               _encoder->encode (_player->get_video (t, true));
+               _writer->write (_player->get_audio (t, frame, true));
+
+               if (non_burnt_subtitles) {
+                       _writer->write (_player->get_subtitles (t, frame, true, false, true));
+               }
        }
-       if (_gain) {
-               _gain->process_end ();
+
+       BOOST_FOREACH (ReferencedReelAsset i, _player->get_reel_assets ()) {
+               _writer->write (i);
        }
-       _encoder->process_end ();
+
+       _finishing = true;
+       _encoder->end ();
+       _writer->finish ();
+}
+
+float
+Transcoder::current_encoding_rate () const
+{
+       return _encoder->current_encoding_rate ();
+}
+
+int
+Transcoder::video_frames_out () const
+{
+       return _encoder->video_frames_out ();
 }