Merge master.

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

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 3d71b68f5a32423912fbf15ea6a4f806a4ab35fe..a4cd36a4fb509f17ba6f58eae2729e0bb2901060 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
@@ -18,55 +18,71 @@
 */
 
 /** @file  src/transcoder.cc
- *  @brief A class which takes a FilmState and some Options, then uses those to transcode a Film.
+ *  @brief A class which takes a Film and some Options, then uses those to transcode the film.
  *
  *  A decoder is selected according to the content type, and the encoder can be specified
  *  as a parameter to the constructor.
  */
 
 #include <iostream>
-#include <sigc++/signal.h>
+#include <boost/signals2.hpp>
 #include "transcoder.h"
 #include "encoder.h"
-#include "decoder_factory.h"
+#include "film.h"
+#include "video_decoder.h"
+#include "audio_decoder.h"
+#include "player.h"
+#include "job.h"
 
-using namespace std;
-using namespace boost;
+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.
- *  @param s FilmState of Film that we are transcoding.
- *  @param o Options.
- *  @param j Job that we are running under, or 0.
- *  @param l Log that we can write to.
+ *  @param f Film that we are transcoding.
  *  @param e Encoder to use.
  */
-Transcoder::Transcoder (shared_ptr<const FilmState> s, shared_ptr<const Options> o, Job* j, Log* l, shared_ptr<Encoder> e)
-       : _job (j)
-       , _encoder (e)
-       , _decoder (decoder_factory (s, o, j, l))
+Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
+       : _film (f)
+       , _player (f->make_player ())
+       , _encoder (new Encoder (f, j))
+       , _finishing (false)
 {
-       assert (_encoder);
-       
-       _decoder->Video.connect (sigc::mem_fun (*e, &Encoder::process_video));
-       _decoder->Audio.connect (sigc::mem_fun (*e, &Encoder::process_audio));
+
 }
 
-/** 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 {
-               _decoder->go ();
-       } catch (...) {
-               /* process_end() is important as the decoder may have worker
-                  threads that need to be cleaned up.
-               */
-               _encoder->process_end ();
-               throw;
+
+       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);
+               }
+               _encoder->process_audio (_player->get_audio (t, frame, true));
        }
 
+       _finishing = true;
        _encoder->process_end ();
+
+       _player->statistics().dump (_film->log ());
 }
+
+float
+Transcoder::current_encoding_rate () const
+{
+       return _encoder->current_encoding_rate ();
+}
+
+int
+Transcoder::video_frames_out () const
+{
+       return _encoder->video_frames_out ();
+}
+