Remove multi-reel, for now, and sort out Size vs libdcp::Size.

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

diff --git a/src/lib/make_dcp_job.cc b/src/lib/make_dcp_job.cc
index fcfce4b07bccc6ada73799e79e2f68e8dc6064db..70552162611d3563ffd1e6597bccfb24b3f53b1d 100644 (file)
--- a/src/lib/make_dcp_job.cc
+++ b/src/lib/make_dcp_job.cc
@@ -21,6 +21,7 @@
  *  @brief A job to create DCPs.
  */
 
+#include <iostream>
 #include <boost/filesystem.hpp>
 #include <libdcp/dcp.h>
 #include <libdcp/picture_asset.h>
@@ -30,21 +31,21 @@ extern "C" {
 #include <libavutil/pixdesc.h>
 }
 #include "make_dcp_job.h"
-#include "film_state.h"
 #include "dcp_content_type.h"
 #include "exceptions.h"
 #include "options.h"
 #include "imagemagick_decoder.h"
+#include "film.h"
 
-using namespace std;
-using namespace boost;
+using std::string;
+using std::cout;
+using boost::shared_ptr;
 
-/** @param s FilmState of the Film we are making the DCP for.
+/** @param f Film we are making the DCP for.
  *  @param o Options.
- *  @param l Log.
  */
-MakeDCPJob::MakeDCPJob (shared_ptr<const FilmState> s, shared_ptr<const Options> o, Log* l, shared_ptr<Job> req)
-       : Job (s, l, req)
+MakeDCPJob::MakeDCPJob (shared_ptr<Film> f, shared_ptr<const EncodeOptions> o, shared_ptr<Job> req)
+       : Job (f, req)
        , _opt (o)
 {
        
@@ -53,13 +54,15 @@ MakeDCPJob::MakeDCPJob (shared_ptr<const FilmState> s, shared_ptr<const Options>
 string
 MakeDCPJob::name () const
 {
-       return String::compose ("Make DCP for %1", _fs->name());
+       return String::compose ("Make DCP for %1", _film->name());
 }
 
+/** @param f DCP frame index */
 string
 MakeDCPJob::j2c_path (int f) const
 {
-       return _opt->frame_out_path (f, false);
+       SourceFrame const s = (f * dcp_frame_rate(_film->frames_per_second()).skip) + _film->dcp_trim_start();
+       return _opt->frame_out_path (s, false);
 }
 
 string
@@ -71,67 +74,81 @@ MakeDCPJob::wav_path (libdcp::Channel c) const
 void
 MakeDCPJob::run ()
 {
-       string const dcp_path = _fs->dir (_fs->dcp_name());
+       if (!_film->dcp_length()) {
+               throw EncodeError ("cannot make a DCP when the source length is not known");
+       }
+
+       descend (0.9);
+       
+       string const dcp_path = _film->dir (_film->dcp_name());
 
        /* Remove any old DCP */
-       filesystem::remove_all (dcp_path);
+       boost::filesystem::remove_all (dcp_path);
+
+       DCPFrameRate const dfr = dcp_frame_rate (_film->frames_per_second ());
 
        int frames = 0;
-       switch (_fs->content_type ()) {
+       switch (_film->content_type ()) {
        case VIDEO:
-               frames = _fs->dcp_length ();
+               /* Source frames -> DCP frames */
+               frames = _film->dcp_length().get() / dfr.skip;
                break;
        case STILL:
-               frames = _fs->still_duration() * ImageMagickDecoder::static_frames_per_second ();
+               frames = _film->still_duration() * 24;
                break;
        }
-       
-       libdcp::DCP dcp (_fs->dir (_fs->dcp_name()));
-       dcp.Progress.connect (sigc::mem_fun (*this, &MakeDCPJob::dcp_progress));
+
+       libdcp::DCP dcp (_film->dir (_film->dcp_name()));
+       dcp.Progress.connect (boost::bind (&MakeDCPJob::dcp_progress, this, _1));
 
        shared_ptr<libdcp::CPL> cpl (
-               new libdcp::CPL (_fs->dir (_fs->dcp_name()), _fs->dcp_name(), _fs->dcp_content_type()->libdcp_kind (), frames, rint (_fs->frames_per_second()))
+               new libdcp::CPL (_film->dir (_film->dcp_name()), _film->dcp_name(), _film->dcp_content_type()->libdcp_kind (), frames, dfr.frames_per_second)
                );
        
        dcp.add_cpl (cpl);
 
-       descend (0.9);
+       descend (0.8);
+
        shared_ptr<libdcp::MonoPictureAsset> pa (
                new libdcp::MonoPictureAsset (
-                       sigc::mem_fun (*this, &MakeDCPJob::j2c_path),
-                       _fs->dir (_fs->dcp_name()),
+                       boost::bind (&MakeDCPJob::j2c_path, this, _1),
+                       _film->dir (_film->dcp_name()),
                        "video.mxf",
                        &dcp.Progress,
-                       rint (_fs->frames_per_second()),
+                       dfr.frames_per_second,
                        frames,
-                       _opt->out_size.width,
-                       _opt->out_size.height
+                       _opt->out_size
                        )
                );
        
        ascend ();
-
+       
        shared_ptr<libdcp::SoundAsset> sa;
-
-       if (_fs->audio_channels() > 0) {
+       
+       if (_film->audio_channels() > 0) {
                descend (0.1);
                sa.reset (
                        new libdcp::SoundAsset (
-                               sigc::mem_fun (*this, &MakeDCPJob::wav_path),
-                               _fs->dir (_fs->dcp_name()),
+                               boost::bind (&MakeDCPJob::wav_path, this, _1),
+                               _film->dir (_film->dcp_name()),
                                "audio.mxf",
                                &dcp.Progress,
-                               rint (_fs->frames_per_second()),
+                               dfr.frames_per_second,
                                frames,
-                               _fs->audio_channels()
+                               dcp_audio_channels (_film->audio_channels())
                                )
                        );
                ascend ();
        }
 
+       descend (0.05);
        cpl->add_reel (shared_ptr<libdcp::Reel> (new libdcp::Reel (pa, sa, shared_ptr<libdcp::SubtitleAsset> ())));
+       ascend ();
+               
+       descend (0.05);
        dcp.write_xml ();
-
+       ascend ();
+               
        set_progress (1);
        set_state (FINISHED_OK);
 }