Merge master.

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

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 3002ef61c9c0f776d3b714bf326cb14ff7073d97..1012c45442b69320e9b4bd7aac14143167755065 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-2014 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
@@ -33,50 +33,51 @@
 #include "audio_decoder.h"
 #include "player.h"
 #include "job.h"
+#include "writer.h"
 
 using std::string;
+using std::cout;
+using std::list;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 
-static void
-video_proxy (weak_ptr<Encoder> encoder, shared_ptr<const Image> image, Eyes eyes, bool same)
-{
-       shared_ptr<Encoder> e = encoder.lock ();
-       if (e) {
-               e->process_video (image, eyes, 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 j Job that we are running under, or 0.
  *  @param e Encoder to use.
  */
 Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
-       : _job (j)
+       : _film (f)
        , _player (f->make_player ())
-       , _encoder (new Encoder (f, j))
+       , _writer (new Writer (f, j))
+       , _encoder (new Encoder (f, j, _writer))
+       , _finishing (false)
 {
-       _player->Video.connect (bind (video_proxy, _encoder, _1, _2, _3));
-       _player->Audio.connect (bind (audio_proxy, _encoder, _1));
+
 }
 
 void
 Transcoder::go ()
 {
-       _encoder->process_begin ();
-       while (!_player->pass ()) {}
-       _encoder->process_end ();
+       _encoder->begin ();
+
+       DCPTime const frame = DCPTime::from_frames (1, _film->video_frame_rate ());
+       for (DCPTime t; t < _film->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));
+               }
+       }
+
+       _finishing = true;
+       _encoder->end ();
+       _writer->finish ();
+
+       _player->statistics().dump (_film->log ());
 }
 
 float
@@ -90,3 +91,4 @@ Transcoder::video_frames_out () const
 {
        return _encoder->video_frames_out ();
 }
+