X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscoder.cc;h=c77bf7724c12a6b12472d0d3d41ad1450d00de18;hb=7f40b703e8a83f07a1c8bffb45cd40ebcc238418;hp=ba4d3b040baa432812cfe85e972ea9f6c9d052c1;hpb=a4c19a34244aeaf183c25878933b570fc5c0ee34;p=dcpomatic.git

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index ba4d3b040..c77bf7724 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012 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,74 +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 boost::shared_ptr;
-using boost::weak_ptr;
-using boost::dynamic_pointer_cast;
 
-static void
-video_proxy (weak_ptr<Encoder> encoder, shared_ptr<PlayerImage> image, Eyes eyes, ColourConversion conversion, bool same)
-{
-	shared_ptr<Encoder> e = encoder.lock ();
-	if (e) {
-		e->process_video (image, eyes, conversion, same);
-	}
-}
+#include "i18n.h"
 
-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);
-	}
-}
+using boost::weak_ptr;
+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)
-{
-	_player->Video.connect (bind (video_proxy, _encoder, _1, _2, _3, _4));
-	_player->Audio.connect (bind (audio_proxy, _encoder, _1));
-}
-
-void
-Transcoder::go ()
+Transcoder::Transcoder (shared_ptr<const Film> film, weak_ptr<Job> job)
+	: _film (film)
+	, _job (job)
+	, _player (new Player (film, film->playlist ()))
 {
-	_encoder->process_begin ();
-	while (!_player->pass ()) {}
-
-	_finishing = true;
-	_encoder->process_end ();
-
-	_player->statistics().dump (_film->log ());
+	_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));
 }
-
-float
-Transcoder::current_encoding_rate () const
-{
-	return _encoder->current_encoding_rate ();
-}
-
-int
-Transcoder::video_frames_out () const
-{
-	return _encoder->video_frames_out ();
-}
-