Add H.264 export.

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

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 810606391b18381883f0117829d802dbbc2590f1..c77bf7724c12a6b12472d0d3d41ad1450d00de18 100644 (file)
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -24,61 +25,24 @@
  *  as a parameter to the constructor.
  */
 
-#include <iostream>
-#include <boost/signals2.hpp>
 #include "transcoder.h"
-#include "encoder.h"
-#include "film.h"
-#include "video_decoder.h"
-#include "audio_decoder.h"
 #include "player.h"
-#include "job.h"
 
-using std::string;
-using std::cout;
-using boost::shared_ptr;
+#include "i18n.h"
+
 using boost::weak_ptr;
-using boost::dynamic_pointer_cast;
+using boost::shared_ptr;
 
-/** Construct a transcoder using a Decoder that we create and a supplied Encoder.
- *  @param f Film that we are transcoding.
- *  @param e Encoder to use.
+/** Construct a transcoder.
+ *  @param film Film that we are transcoding.
+ *  @param job 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))
-       , _finishing (false)
-{
-
-}
-
-void
-Transcoder::go ()
-{
-       _encoder->process_begin ();
-
-       DCPTime const frame = DCPTime::from_frames (1, _film->video_frame_rate ());
-       for (DCPTime t; t < _film->length(); t += frame) {
-               _encoder->process_video (_player->get_video (t, true));
-               _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
+Transcoder::Transcoder (shared_ptr<const Film> film, weak_ptr<Job> job)
+       : _film (film)
+       , _job (job)
+       , _player (new Player (film, film->playlist ()))
 {
-       return _encoder->current_encoding_rate ();
+       _player->Video.connect (bind (&Transcoder::video, this, _1, _2));
+       _player->Audio.connect (bind (&Transcoder::audio, this, _1, _2));
+       _player->Subtitle.connect (bind (&Transcoder::subtitle, this, _1, _2));
 }
-
-int
-Transcoder::video_frames_out () const
-{
-       return _encoder->video_frames_out ();
-}
-