Basics of doing trim using asset entry point / duration.

[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 4605d17247e14c1e6f038c57f632016698df1ce3..3603298d9085e0c52a0f98458e081cb6034281dc 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>
@@ -35,16 +36,17 @@ extern "C" {
 #include "options.h"
 #include "imagemagick_decoder.h"
 #include "film.h"
+#include "format.h"
 
 using std::string;
+using std::cout;
 using boost::shared_ptr;
 
 /** @param f Film we are making the DCP for.
  *  @param o Options.
  */
-MakeDCPJob::MakeDCPJob (shared_ptr<Film> f, shared_ptr<const EncodeOptions> o, shared_ptr<Job> req)
+MakeDCPJob::MakeDCPJob (shared_ptr<Film> f, shared_ptr<Job> req)
        : Job (f, req)
-       , _opt (o)
 {
        
 }
@@ -57,16 +59,18 @@ MakeDCPJob::name () const
 
 /** @param f DCP frame index */
 string
-MakeDCPJob::j2c_path (int f) const
+MakeDCPJob::j2c_path (int f, int offset) const
 {
-       SourceFrame const s = (f * dcp_frame_rate(_film->frames_per_second()).skip) + _film->dcp_trim_start();
-       return _opt->frame_out_path (s, false);
+       DCPFrameRate dfr (_film->frames_per_second());
+       int const mult = dfr.skip ? 2 : 1;
+       SourceFrame const s = ((f + offset) * mult) + _film->trim_start();
+       return _film->frame_out_path (s, false);
 }
 
 string
 MakeDCPJob::wav_path (libdcp::Channel c) const
 {
-       return _opt->multichannel_audio_out_path (int (c), false);
+       return _film->multichannel_audio_out_path (int (c), false);
 }
 
 void
@@ -75,19 +79,24 @@ MakeDCPJob::run ()
        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 */
        boost::filesystem::remove_all (dcp_path);
 
-       DCPFrameRate const dfr = dcp_frame_rate (_film->frames_per_second ());
+       DCPFrameRate const dfr (_film->frames_per_second ());
 
        int frames = 0;
        switch (_film->content_type ()) {
        case VIDEO:
                /* Source frames -> DCP frames */
-               frames = _film->dcp_length().get() / dfr.skip;
+               frames = _film->dcp_length().get();
+               if (dfr.skip) {
+                       frames /= 2;
+               }
                break;
        case STILL:
                frames = _film->still_duration() * 24;
@@ -103,45 +112,81 @@ MakeDCPJob::run ()
        
        dcp.add_cpl (cpl);
 
-       descend (0.8);
-       shared_ptr<libdcp::MonoPictureAsset> pa (
-               new libdcp::MonoPictureAsset (
-                       boost::bind (&MakeDCPJob::j2c_path, this, _1),
-                       _film->dir (_film->dcp_name()),
-                       "video.mxf",
-                       &dcp.Progress,
-                       dfr.frames_per_second,
-                       frames,
-                       _opt->out_size.width,
-                       _opt->out_size.height
-                       )
-               );
-       
-       ascend ();
+       int frames_per_reel = 0;
+       if (_film->reel_size()) {
+               frames_per_reel = (_film->reel_size().get() / (_film->j2k_bandwidth() / 8)) * dfr.frames_per_second;
+       } else {
+               frames_per_reel = frames;
+       }
 
-       shared_ptr<libdcp::SoundAsset> sa;
+       int frames_done = 0;
+       int reel = 0;
 
-       if (_film->audio_channels() > 0) {
-               descend (0.1);
-               sa.reset (
-                       new libdcp::SoundAsset (
-                               boost::bind (&MakeDCPJob::wav_path, this, _1),
+       while (frames_done < frames) {
+
+               descend (float (frames_per_reel) / frames);
+
+               int this_time = std::min (frames_per_reel, (frames - frames_done));
+
+               descend (0.8);
+
+               shared_ptr<libdcp::MonoPictureAsset> pa (
+                       new libdcp::MonoPictureAsset (
+                               boost::bind (&MakeDCPJob::j2c_path, this, _1, frames_done),
                                _film->dir (_film->dcp_name()),
-                               "audio.mxf",
+                               String::compose ("video_%1.mxf", reel),
                                &dcp.Progress,
                                dfr.frames_per_second,
-                               frames,
-                               _film->audio_channels()
+                               this_time,
+                               _film->format()->dcp_size().width,
+                               _film->format()->dcp_size().height
                                )
                        );
+
+               pa->set_entry_point (_film->trim_start ());
+               pa->set_duration (_film->duration ());
+       
+               ascend ();
+               
+               shared_ptr<libdcp::SoundAsset> sa;
+               
+               if (_film->audio_channels() > 0) {
+                       descend (0.1);
+                       sa.reset (
+                               new libdcp::SoundAsset (
+                                       boost::bind (&MakeDCPJob::wav_path, this, _1),
+                                       _film->dir (_film->dcp_name()),
+                                       String::compose ("audio_%1.mxf", reel),
+                                       &dcp.Progress,
+                                       dfr.frames_per_second,
+                                       this_time,
+                                       frames_done,
+                                       dcp_audio_channels (_film->audio_channels())
+                                       )
+                               );
+
+                       sa->set_entry_point (_film->trim_start ());
+                       sa->set_duration (_film->duration ());
+                       
+                       ascend ();
+               }
+
+               descend (0.1);
+               cpl->add_reel (shared_ptr<libdcp::Reel> (new libdcp::Reel (pa, sa, shared_ptr<libdcp::SubtitleAsset> ())));
+               ascend ();
+               
+               frames_done += frames_per_reel;
+               ++reel;
+
                ascend ();
        }
 
+       ascend ();
+
        descend (0.1);
-       cpl->add_reel (shared_ptr<libdcp::Reel> (new libdcp::Reel (pa, sa, shared_ptr<libdcp::SubtitleAsset> ())));
        dcp.write_xml ();
        ascend ();
-
+               
        set_progress (1);
        set_state (FINISHED_OK);
 }