Merge master; fix crash on new film.
[dcpomatic.git] / src / lib / ab_transcoder.cc
index 95492a9d8ddb5268af22be30487b4eef8aa60d5c..2e0d41e7de08f24c4bc83b6fb615cecf9cf9a0de 100644 (file)
 
 #include <iostream>
 #include <boost/shared_ptr.hpp>
-#include <sigc++/bind.h>
 #include "ab_transcoder.h"
 #include "film.h"
-#include "decoder.h"
 #include "encoder.h"
 #include "job.h"
-#include "film_state.h"
-#include "options.h"
 #include "image.h"
-#include "decoder_factory.h"
+#include "player.h"
+#include "matcher.h"
+#include "delay_line.h"
+#include "gain.h"
+#include "combiner.h"
+#include "trimmer.h"
 
 /** @file src/ab_transcoder.cc
- *  @brief A transcoder which uses one FilmState for the left half of the screen, and a different one
+ *  @brief A transcoder which uses one Film for the left half of the screen, and a different one
  *  for the right half (to facilitate A/B comparisons of settings)
  */
 
-using namespace std;
-using namespace boost;
+using std::string;
+using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
 
-/** @param a FilmState to use for the left half of the screen.
- *  @param b FilmState to use for the right half of the screen.
- *  @param o Options.
+/** @param a Film to use for the left half of the screen.
+ *  @param b Film to use for the right half of the screen.
+ *  @param o Decoder options.
  *  @param j Job that we are associated with.
- *  @param l Log.
  *  @param e Encoder to use.
  */
 
-ABTranscoder::ABTranscoder (
-       shared_ptr<const FilmState> a, shared_ptr<const FilmState> b, shared_ptr<const Options> o, Job* j, Log* l, shared_ptr<Encoder> e)
-       : _fs_a (a)
-       , _fs_b (b)
-       , _opt (o)
+ABTranscoder::ABTranscoder (shared_ptr<Film> a, shared_ptr<Film> b, shared_ptr<Job> j)
+       : _film_a (a)
+       , _film_b (b)
+       , _player_a (_film_a->player ())
+       , _player_b (_film_b->player ())
        , _job (j)
-       , _log (l)
-       , _encoder (e)
-       , _last_frame (0)
+       , _encoder (new Encoder (_film_a))
+       , _combiner (new Combiner (a->log()))
 {
-       _da = decoder_factory (_fs_a, o, j, _log);
-       _db = decoder_factory (_fs_b, o, j, _log);
-
-       _da->Video.connect (sigc::bind (sigc::mem_fun (*this, &ABTranscoder::process_video), 0));
-       _db->Video.connect (sigc::bind (sigc::mem_fun (*this, &ABTranscoder::process_video), 1));
-       _da->Audio.connect (sigc::mem_fun (*e, &Encoder::process_audio));
-}
-
-ABTranscoder::~ABTranscoder ()
-{
-
-}
+       _matcher.reset (new Matcher (_film_a->log(), _film_a->audio_frame_rate(), _film_a->video_frame_rate()));
+       _delay_line.reset (new DelayLine (_film_a->log(), _film_a->audio_delay() * _film_a->audio_frame_rate() / 1000));
+       _gain.reset (new Gain (_film_a->log(), _film_a->audio_gain()));
+
+       _player_a->Video.connect (bind (&Combiner::process_video, _combiner, _1, _2, _3, _4));
+       _player_b->Video.connect (bind (&Combiner::process_video_b, _combiner, _1, _2, _3, _4));
+
+       int const trim_start = _film_a->trim_type() == Film::ENCODE ? _film_a->trim_start() : 0;
+       int const trim_end = _film_a->trim_type() == Film::ENCODE ? _film_a->trim_end() : 0;
+       _trimmer.reset (new Trimmer (
+                               _film_a->log(), trim_start, trim_end, _film_a->content_length(),
+                               _film_a->audio_frame_rate(), _film_a->video_frame_rate(), _film_a->dcp_frame_rate()
+                               ));
+       
 
-void
-ABTranscoder::process_video (shared_ptr<Image> yuv, int frame, int index)
-{
-       if (index == 0) {
-               /* Keep this image around until we get the other half */
-               _image = yuv;
-       } else {
-               /* Copy the right half of yuv into _image */
-               for (int i = 0; i < yuv->components(); ++i) {
-                       int const line_size = yuv->line_size()[i];
-                       int const half_line_size = line_size / 2;
-
-                       uint8_t* p = _image->data()[i];
-                       uint8_t* q = yuv->data()[i];
-                       
-                       for (int j = 0; j < yuv->lines (i); ++j) {
-                               memcpy (p + half_line_size, q + half_line_size, half_line_size);
-                               p += line_size;
-                               q += line_size;
-                       }
-               }
-                       
-               /* And pass it to the encoder */
-               _encoder->process_video (_image, frame);
-               _image.reset ();
-       }
+       _combiner->connect_video (_delay_line);
+       _delay_line->connect_video (_matcher);
+       _matcher->connect_video (_trimmer);
+       _trimmer->connect_video (_encoder);
        
-       _last_frame = frame;
+       _player_a->connect_audio (_delay_line);
+       _delay_line->connect_audio (_matcher);
+       _matcher->connect_audio (_gain);
+       _gain->connect_audio (_trimmer);
+       _trimmer->connect_audio (_encoder);
 }
 
-
 void
 ABTranscoder::go ()
 {
-       _encoder->process_begin (_da->audio_channel_layout(), _da->audio_sample_format());
-       _da->process_begin ();
-       _db->process_begin ();
+       _encoder->process_begin ();
+
+       bool done[2] = { false, false };
        
        while (1) {
-               bool const a = _da->pass ();
-               bool const b = _db->pass ();
+               done[0] = _player_a->pass ();
+               done[1] = _player_b->pass ();
 
                if (_job) {
-                       _job->set_progress (float (_last_frame) / _da->decoding_frames ());
+                       _player_a->set_progress (_job);
                }
-               
-               if (a && b) {
+
+               if (done[0] && done[1]) {
                        break;
                }
        }
-
+               
+       _delay_line->process_end ();
+       _matcher->process_end ();
+       _gain->process_end ();
+       _trimmer->process_end ();
        _encoder->process_end ();
-       _da->process_end ();
-       _db->process_end ();
 }