No-op: remove all trailing whitespace.

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

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index a4cd36a4fb509f17ba6f58eae2729e0bb2901060..3ecc3a064bb2b476ab41016e6c4d7083e1cfd72d 100644 (file)
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -33,6 +33,7 @@
 #include "audio_decoder.h"
 #include "player.h"
 #include "job.h"
+#include "writer.h"
 
 using std::string;
 using std::cout;
@@ -41,14 +42,15 @@ 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 e Encoder to use.
+ *  @param j Job that this transcoder is being used in.
  */
-Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
-       : _film (f)
-       , _player (f->make_player ())
-       , _encoder (new Encoder (f, j))
+Transcoder::Transcoder (shared_ptr<const Film> film, shared_ptr<Job> j)
+       : _film (film)
+       , _player (new Player (film))
+       , _writer (new Writer (film, j))
+       , _encoder (new Encoder (film, j, _writer))
        , _finishing (false)
 {
 
@@ -57,19 +59,29 @@ Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
 void
 Transcoder::go ()
 {
-       _encoder->process_begin ();
+       _encoder->begin ();
 
        DCPTime const frame = DCPTime::from_frames (1, _film->video_frame_rate ());
-       for (DCPTime t; t < _film->length(); t += frame) {
-               list<shared_ptr<PlayerVideoFrame> > v = _player->get_video (t, true);
-               for (list<shared_ptr<PlayerVideoFrame> >::const_iterator i = v.begin(); i != v.end(); ++i) {
-                       _encoder->process_video (*i);
+       DCPTime const length = _film->length ();
+
+       if (!_film->burn_subtitles ()) {
+               _writer->write (_player->get_subtitle_fonts ());
+       }
+
+       for (DCPTime t; t < length; t += frame) {
+               list<shared_ptr<PlayerVideo> > v = _player->get_video (t, true);
+               for (list<shared_ptr<PlayerVideo> >::const_iterator i = v.begin(); i != v.end(); ++i) {
+                       _encoder->enqueue (*i);
+               }
+               _writer->write (_player->get_audio (t, frame, true));
+               if (!_film->burn_subtitles ()) {
+                       _writer->write (_player->get_subtitles (t, frame, true));
                }
-               _encoder->process_audio (_player->get_audio (t, frame, true));
        }
 
        _finishing = true;
-       _encoder->process_end ();
+       _encoder->end ();
+       _writer->finish ();
 
        _player->statistics().dump (_film->log ());
 }