X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=e7f47c462c550c4bb8bc9fedb97cad1871bdd1ed;hb=1f2bc4d8f3601ad1e12b94f37b3889fcd003509b;hp=8afa1e245969b1a7d95856c1b2ddaeebd8f5b9f0;hpb=baf6bc63df6577d6efdc12ae605aa94754b73882;p=dcpomatic.git diff --git a/src/lib/film.cc b/src/lib/film.cc index 8afa1e245..e7f47c462 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -31,7 +31,6 @@ #include #include "film.h" #include "format.h" -#include "imagemagick_encoder.h" #include "job.h" #include "filter.h" #include "transcoder.h" @@ -40,7 +39,6 @@ #include "ab_transcode_job.h" #include "transcode_job.h" #include "scp_dcp_job.h" -#include "copy_from_dvd_job.h" #include "make_dcp_job.h" #include "log.h" #include "options.h" @@ -52,37 +50,54 @@ #include "check_hashes_job.h" #include "version.h" #include "ui_signaller.h" - -using namespace std; -using namespace boost; +#include "video_decoder.h" +#include "audio_decoder.h" +#include "external_audio_decoder.h" + +using std::string; +using std::stringstream; +using std::multimap; +using std::pair; +using std::map; +using std::vector; +using std::ifstream; +using std::ofstream; +using std::setfill; +using std::min; +using std::make_pair; +using std::cout; +using boost::shared_ptr; +using boost::lexical_cast; +using boost::to_upper_copy; +using boost::ends_with; +using boost::starts_with; +using boost::optional; + +int const Film::state_version = 1; /** Construct a Film object in a given directory, reading any metadata * file that exists in that directory. An exception will be thrown if - * must_exist is true, and the specified directory does not exist. + * must_exist is true and the specified directory does not exist. * * @param d Film directory. * @param must_exist true to throw an exception if does not exist. */ Film::Film (string d, bool must_exist) - : _use_dci_name (false) + : _use_dci_name (true) , _dcp_content_type (0) , _format (0) , _scaler (Scaler::from_id ("bicubic")) - , _dcp_frames (0) - , _dcp_trim_action (CUT) + , _dcp_trim_start (0) + , _dcp_trim_end (0) , _dcp_ab (false) - , _audio_stream (-1) + , _use_content_audio (true) , _audio_gain (0) , _audio_delay (0) , _still_duration (10) - , _subtitle_stream (-1) , _with_subtitles (false) , _subtitle_offset (0) , _subtitle_scale (1) - , _length (0) - , _audio_sample_rate (0) - , _has_subtitles (false) , _frames_per_second (0) , _dirty (false) { @@ -90,11 +105,11 @@ Film::Film (string d, bool must_exist) (Code swiped from Adam Bowen on stackoverflow) */ - filesystem::path p (filesystem::system_complete (d)); - filesystem::path result; - for (filesystem::path::iterator i = p.begin(); i != p.end(); ++i) { + boost::filesystem::path p (boost::filesystem::system_complete (d)); + boost::filesystem::path result; + for (boost::filesystem::path::iterator i = p.begin(); i != p.end(); ++i) { if (*i == "..") { - if (filesystem::is_symlink (result) || result.filename() == "..") { + if (boost::filesystem::is_symlink (result) || result.filename() == "..") { result /= *i; } else { result = result.parent_path (); @@ -106,17 +121,20 @@ Film::Film (string d, bool must_exist) set_directory (result.string ()); - if (!filesystem::exists (directory())) { + if (!boost::filesystem::exists (directory())) { if (must_exist) { throw OpenFileError (directory()); } else { - filesystem::create_directory (directory()); + boost::filesystem::create_directory (directory()); } } + _external_audio_stream = ExternalAudioStream::create (); + read_metadata (); _log = new FileLog (file ("log")); + set_dci_date_today (); } Film::Film (Film const & o) @@ -130,10 +148,12 @@ Film::Film (Film const & o) , _crop (o._crop) , _filters (o._filters) , _scaler (o._scaler) - , _dcp_frames (o._dcp_frames) - , _dcp_trim_action (o._dcp_trim_action) + , _dcp_trim_start (o._dcp_trim_start) + , _dcp_trim_end (o._dcp_trim_end) , _dcp_ab (o._dcp_ab) - , _audio_stream (o._audio_stream) + , _content_audio_stream (o._content_audio_stream) + , _external_audio (o._external_audio) + , _use_content_audio (o._use_content_audio) , _audio_gain (o._audio_gain) , _audio_delay (o._audio_delay) , _still_duration (o._still_duration) @@ -148,13 +168,11 @@ Film::Film (Film const & o) , _studio (o._studio) , _facility (o._facility) , _package_type (o._package_type) - , _thumbs (o._thumbs) , _size (o._size) , _length (o._length) - , _audio_sample_rate (o._audio_sample_rate) , _content_digest (o._content_digest) - , _has_subtitles (o._has_subtitles) - , _audio_streams (o._audio_streams) + , _content_audio_streams (o._content_audio_streams) + , _external_audio_stream (o._external_audio_stream) , _subtitle_streams (o._subtitle_streams) , _frames_per_second (o._frames_per_second) , _dirty (o._dirty) @@ -173,7 +191,7 @@ Film::j2k_dir () const { assert (format()); - filesystem::path p; + boost::filesystem::path p; /* Start with j2c */ p /= "j2c"; @@ -210,6 +228,8 @@ Film::j2k_dir () const void Film::make_dcp (bool transcode) { + set_dci_date_today (); + if (dcp_name().find ("/") != string::npos) { throw BadSettingError ("name", "cannot contain slashes"); } @@ -238,62 +258,37 @@ Film::make_dcp (bool transcode) throw MissingSettingError ("name"); } - shared_ptr o (new Options (j2k_dir(), ".j2c", dir ("wavs"))); - o->out_size = format()->dcp_size (); - if (dcp_frames() == 0) { - /* Decode the whole film, no blacking */ - o->black_after = 0; - } else { - switch (dcp_trim_action()) { - case CUT: - /* Decode only part of the film, no blacking */ - o->black_after = 0; - break; - case BLACK_OUT: - /* Decode the whole film, but black some frames out */ - o->black_after = dcp_frames (); + shared_ptr oe (new EncodeOptions (j2k_dir(), ".j2c", dir ("wavs"))); + oe->out_size = format()->dcp_size (); + oe->padding = format()->dcp_padding (shared_from_this ()); + if (dcp_length ()) { + oe->video_range = make_pair (dcp_trim_start(), dcp_trim_start() + dcp_length().get()); + if (audio_stream()) { + oe->audio_range = make_pair ( + video_frames_to_audio_frames (oe->video_range.get().first, audio_stream()->sample_rate(), frames_per_second()), + video_frames_to_audio_frames (oe->video_range.get().second, audio_stream()->sample_rate(), frames_per_second()) + ); } + } - o->padding = format()->dcp_padding (this); - o->ratio = format()->ratio_as_float (this); - o->decode_subtitles = with_subtitles (); + oe->video_skip = dcp_frame_rate (frames_per_second()).skip; + + shared_ptr od (new DecodeOptions); + od->decode_subtitles = with_subtitles (); shared_ptr r; if (transcode) { if (dcp_ab()) { - r = JobManager::instance()->add (shared_ptr (new ABTranscodeJob (shared_from_this(), o, shared_ptr ()))); + r = JobManager::instance()->add (shared_ptr (new ABTranscodeJob (shared_from_this(), od, oe, shared_ptr ()))); } else { - r = JobManager::instance()->add (shared_ptr (new TranscodeJob (shared_from_this(), o, shared_ptr ()))); + r = JobManager::instance()->add (shared_ptr (new TranscodeJob (shared_from_this(), od, oe, shared_ptr ()))); } } - r = JobManager::instance()->add (shared_ptr (new CheckHashesJob (shared_from_this(), o, r))); - JobManager::instance()->add (shared_ptr (new MakeDCPJob (shared_from_this(), o, r))); -} - -void -Film::copy_from_dvd_post_gui () -{ - const string dvd_dir = dir ("dvd"); - - string largest_file; - uintmax_t largest_size = 0; - for (filesystem::directory_iterator i = filesystem::directory_iterator (dvd_dir); i != filesystem::directory_iterator(); ++i) { - uintmax_t const s = filesystem::file_size (*i); - if (s > largest_size) { - -#if BOOST_FILESYSTEM_VERSION == 3 - largest_file = filesystem::path(*i).generic_string(); -#else - largest_file = i->string (); -#endif - largest_size = s; - } - } - - set_content (largest_file); + r = JobManager::instance()->add (shared_ptr (new CheckHashesJob (shared_from_this(), od, oe, r))); + JobManager::instance()->add (shared_ptr (new MakeDCPJob (shared_from_this(), oe, r))); } /** Start a job to examine our content file */ @@ -304,53 +299,23 @@ Film::examine_content () return; } - set_thumbs (vector ()); - filesystem::remove_all (dir ("thumbs")); - - /* This call will recreate the directory */ - dir ("thumbs"); - _examine_content_job.reset (new ExamineContentJob (shared_from_this(), shared_ptr ())); - _examine_content_job->Finished.connect (sigc::mem_fun (*this, &Film::examine_content_post_gui)); + _examine_content_job->Finished.connect (bind (&Film::examine_content_finished, this)); JobManager::instance()->add (_examine_content_job); } void -Film::examine_content_post_gui () +Film::examine_content_finished () { - set_length (_examine_content_job->last_video_frame ()); _examine_content_job.reset (); - - string const tdir = dir ("thumbs"); - vector thumbs; - - for (filesystem::directory_iterator i = filesystem::directory_iterator (tdir); i != filesystem::directory_iterator(); ++i) { - - /* Aah, the sweet smell of progress */ -#if BOOST_FILESYSTEM_VERSION == 3 - string const l = filesystem::path(*i).leaf().generic_string(); -#else - string const l = i->leaf (); -#endif - - size_t const d = l.find (".png"); - size_t const t = l.find (".tmp"); - if (d != string::npos && t == string::npos) { - thumbs.push_back (atoi (l.substr (0, d).c_str())); - } - } - - sort (thumbs.begin(), thumbs.end()); - set_thumbs (thumbs); } - /** @return full paths to any audio files that this Film has */ vector Film::audio_files () const { vector f; - for (filesystem::directory_iterator i = filesystem::directory_iterator (dir("wavs")); i != filesystem::directory_iterator(); ++i) { + for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (dir("wavs")); i != boost::filesystem::directory_iterator(); ++i) { f.push_back (i->path().string ()); } @@ -365,14 +330,6 @@ Film::send_dcp_to_tms () JobManager::instance()->add (j); } -void -Film::copy_from_dvd () -{ - shared_ptr j (new CopyFromDVDJob (shared_from_this(), shared_ptr ())); - j->Finished.connect (sigc::mem_fun (*this, &Film::copy_from_dvd_post_gui)); - JobManager::instance()->add (j); -} - /** Count the number of frames that have been encoded for this film. * @return frame count. */ @@ -384,57 +341,30 @@ Film::encoded_frames () const } int N = 0; - for (filesystem::directory_iterator i = filesystem::directory_iterator (j2k_dir ()); i != filesystem::directory_iterator(); ++i) { + for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (j2k_dir ()); i != boost::filesystem::directory_iterator(); ++i) { ++N; - this_thread::interruption_point (); + boost::this_thread::interruption_point (); } return N; } -/** Return the filename of a subtitle image if one exists for a given thumb index. - * @param Thumbnail index. - * @return Position of the image within the source frame, and the image filename, if one exists. - * Otherwise the filename will be empty. - */ -pair -Film::thumb_subtitle (int n) const -{ - string sub_file = thumb_base(n) + ".sub"; - if (!filesystem::exists (sub_file)) { - return pair (); - } - - pair sub; - - ifstream f (sub_file.c_str ()); - multimap kv = read_key_value (f); - for (map::const_iterator i = kv.begin(); i != kv.end(); ++i) { - if (i->first == "x") { - sub.first.x = lexical_cast (i->second); - } else if (i->first == "y") { - sub.first.y = lexical_cast (i->second); - sub.second = String::compose ("%1.sub.png", thumb_base(n)); - } - } - - return sub; -} - /** Write state to our `metadata' file */ void Film::write_metadata () const { boost::mutex::scoped_lock lm (_state_mutex); - - filesystem::create_directories (directory()); - string const m = file_locked ("metadata"); + boost::filesystem::create_directories (directory()); + + string const m = file ("metadata"); ofstream f (m.c_str ()); if (!f.good ()) { throw CreateFileError (m); } + f << "version " << state_version << "\n"; + /* User stuff */ f << "name " << _name << "\n"; f << "use_dci_name " << _use_dci_name << "\n"; @@ -453,24 +383,22 @@ Film::write_metadata () const f << "filter " << (*i)->id () << "\n"; } f << "scaler " << _scaler->id () << "\n"; - f << "dcp_frames " << _dcp_frames << "\n"; - - f << "dcp_trim_action "; - switch (_dcp_trim_action) { - case CUT: - f << "cut\n"; - break; - case BLACK_OUT: - f << "black_out\n"; - break; - } - + f << "dcp_trim_start " << _dcp_trim_start << "\n"; + f << "dcp_trim_end " << _dcp_trim_end << "\n"; f << "dcp_ab " << (_dcp_ab ? "1" : "0") << "\n"; - f << "selected_audio_stream " << _audio_stream << "\n"; + if (_content_audio_stream) { + f << "selected_content_audio_stream " << _content_audio_stream->to_string() << "\n"; + } + for (vector::const_iterator i = _external_audio.begin(); i != _external_audio.end(); ++i) { + f << "external_audio " << *i << "\n"; + } + f << "use_content_audio " << (_use_content_audio ? "1" : "0") << "\n"; f << "audio_gain " << _audio_gain << "\n"; f << "audio_delay " << _audio_delay << "\n"; f << "still_duration " << _still_duration << "\n"; - f << "selected_subtitle_stream " << _subtitle_stream << "\n"; + if (_subtitle_stream) { + f << "selected_subtitle_stream " << _subtitle_stream->to_string() << "\n"; + } f << "with_subtitles " << _with_subtitles << "\n"; f << "subtitle_offset " << _subtitle_offset << "\n"; f << "subtitle_scale " << _subtitle_scale << "\n"; @@ -482,25 +410,19 @@ Film::write_metadata () const f << "facility " << _facility << "\n"; f << "package_type " << _package_type << "\n"; - /* Cached stuff; this is information about our content; we could - look it up each time, but that's slow. - */ - for (vector::const_iterator i = _thumbs.begin(); i != _thumbs.end(); ++i) { - f << "thumb " << *i << "\n"; - } f << "width " << _size.width << "\n"; f << "height " << _size.height << "\n"; - f << "length " << _length << "\n"; - f << "audio_sample_rate " << _audio_sample_rate << "\n"; + f << "length " << _length.get_value_or(0) << "\n"; f << "content_digest " << _content_digest << "\n"; - f << "has_subtitles " << _has_subtitles << "\n"; - for (vector::const_iterator i = _audio_streams.begin(); i != _audio_streams.end(); ++i) { - f << "audio_stream " << i->to_string () << "\n"; + for (vector >::const_iterator i = _content_audio_streams.begin(); i != _content_audio_streams.end(); ++i) { + f << "content_audio_stream " << (*i)->to_string () << "\n"; } - for (vector::const_iterator i = _subtitle_streams.begin(); i != _subtitle_streams.end(); ++i) { - f << "subtitle_stream " << i->to_string () << "\n"; + f << "external_audio_stream " << _external_audio_stream->to_string() << "\n"; + + for (vector >::const_iterator i = _subtitle_streams.begin(); i != _subtitle_streams.end(); ++i) { + f << "subtitle_stream " << (*i)->to_string () << "\n"; } f << "frames_per_second " << _frames_per_second << "\n"; @@ -513,13 +435,35 @@ void Film::read_metadata () { boost::mutex::scoped_lock lm (_state_mutex); + + _external_audio.clear (); + _content_audio_streams.clear (); + _subtitle_streams.clear (); + + boost::optional version; + + /* Backward compatibility things */ + boost::optional audio_sample_rate; + boost::optional audio_stream_index; + boost::optional subtitle_stream_index; - ifstream f (file_locked("metadata").c_str()); + ifstream f (file ("metadata").c_str()); multimap kv = read_key_value (f); + + /* We need version before anything else */ + multimap::iterator v = kv.find ("version"); + if (v != kv.end ()) { + version = atoi (v->second.c_str()); + } + for (multimap::const_iterator i = kv.begin(); i != kv.end(); ++i) { string const k = i->first; string const v = i->second; + if (k == "audio_sample_rate") { + audio_sample_rate = atoi (v.c_str()); + } + /* User-specified stuff */ if (k == "name") { _name = v; @@ -543,18 +487,22 @@ Film::read_metadata () _filters.push_back (Filter::from_id (v)); } else if (k == "scaler") { _scaler = Scaler::from_id (v); - } else if (k == "dcp_frames") { - _dcp_frames = atoi (v.c_str ()); - } else if (k == "dcp_trim_action") { - if (v == "cut") { - _dcp_trim_action = CUT; - } else if (v == "black_out") { - _dcp_trim_action = BLACK_OUT; - } + } else if (k == "dcp_trim_start") { + _dcp_trim_start = atoi (v.c_str ()); + } else if (k == "dcp_trim_end") { + _dcp_trim_end = atoi (v.c_str ()); } else if (k == "dcp_ab") { _dcp_ab = (v == "1"); - } else if (k == "selected_audio_stream") { - _audio_stream = atoi (v.c_str ()); + } else if (k == "selected_content_audio_stream" || (!version && k == "selected_audio_stream")) { + if (!version) { + audio_stream_index = atoi (v.c_str ()); + } else { + _content_audio_stream = audio_stream_factory (v, version); + } + } else if (k == "external_audio") { + _external_audio.push_back (v); + } else if (k == "use_content_audio") { + _use_content_audio = (v == "1"); } else if (k == "audio_gain") { _audio_gain = atof (v.c_str ()); } else if (k == "audio_delay") { @@ -562,7 +510,11 @@ Film::read_metadata () } else if (k == "still_duration") { _still_duration = atoi (v.c_str ()); } else if (k == "selected_subtitle_stream") { - _subtitle_stream = atoi (v.c_str ()); + if (!version) { + subtitle_stream_index = atoi (v.c_str ()); + } else { + _subtitle_stream = subtitle_stream_factory (v, version); + } } else if (k == "with_subtitles") { _with_subtitles = (v == "1"); } else if (k == "subtitle_offset") { @@ -586,85 +538,48 @@ Film::read_metadata () } /* Cached stuff */ - if (k == "thumb") { - int const n = atoi (v.c_str ()); - /* Only add it to the list if it still exists */ - if (filesystem::exists (thumb_file_for_frame (n))) { - _thumbs.push_back (n); - } - } else if (k == "width") { + if (k == "width") { _size.width = atoi (v.c_str ()); } else if (k == "height") { _size.height = atoi (v.c_str ()); } else if (k == "length") { - _length = atof (v.c_str ()); - } else if (k == "audio_sample_rate") { - _audio_sample_rate = atoi (v.c_str ()); + int const vv = atoi (v.c_str ()); + if (vv) { + _length = vv; + } } else if (k == "content_digest") { _content_digest = v; - } else if (k == "has_subtitles") { - _has_subtitles = (v == "1"); - } else if (k == "audio_stream") { - _audio_streams.push_back (AudioStream (v)); + } else if (k == "content_audio_stream" || (!version && k == "audio_stream")) { + _content_audio_streams.push_back (audio_stream_factory (v, version)); + } else if (k == "external_audio_stream") { + _external_audio_stream = audio_stream_factory (v, version); } else if (k == "subtitle_stream") { - _subtitle_streams.push_back (SubtitleStream (v)); + _subtitle_streams.push_back (subtitle_stream_factory (v, version)); } else if (k == "frames_per_second") { _frames_per_second = atof (v.c_str ()); } } - - _dirty = false; -} -/** @param n A thumb index. - * @return The path to the thumb's image file. - */ -string -Film::thumb_file (int n) const -{ - return thumb_file_for_frame (thumb_frame (n)); -} - -/** @param n A frame index within the Film. - * @return The path to the thumb's image file for this frame; - * we assume that it exists. - */ -string -Film::thumb_file_for_frame (int n) const -{ - return thumb_base_for_frame(n) + ".png"; -} + if (!version) { + if (audio_sample_rate) { + /* version < 1 didn't specify sample rate in the audio streams, so fill it in here */ + for (vector >::iterator i = _content_audio_streams.begin(); i != _content_audio_streams.end(); ++i) { + (*i)->set_sample_rate (audio_sample_rate.get()); + } + } -string -Film::thumb_base (int n) const -{ - return thumb_base_for_frame (thumb_frame (n)); -} + /* also the selected stream was specified as an index */ + if (audio_stream_index && audio_stream_index.get() >= 0 && audio_stream_index.get() < (int) _content_audio_streams.size()) { + _content_audio_stream = _content_audio_streams[audio_stream_index.get()]; + } -string -Film::thumb_base_for_frame (int n) const -{ - stringstream s; - s.width (8); - s << setfill('0') << n; - - filesystem::path p; - p /= dir ("thumbs"); - p /= s.str (); + /* similarly the subtitle */ + if (subtitle_stream_index && subtitle_stream_index.get() >= 0 && subtitle_stream_index.get() < (int) _subtitle_streams.size()) { + _subtitle_stream = _subtitle_streams[subtitle_stream_index.get()]; + } + } - return p.string (); -} - - -/** @param n A thumb index. - * @return The frame within the Film that it is for. - */ -int -Film::thumb_frame (int n) const -{ - boost::mutex::scoped_lock lm (_state_mutex); - assert (n < int (_thumbs.size ())); - return _thumbs[n]; + _dirty = false; } Size @@ -682,26 +597,22 @@ Film::cropped_size (Size s) const string Film::dir (string d) const { - boost::mutex::scoped_lock lm (_state_mutex); - filesystem::path p; + boost::mutex::scoped_lock lm (_directory_mutex); + boost::filesystem::path p; p /= _directory; p /= d; - filesystem::create_directories (p); + boost::filesystem::create_directories (p); return p.string (); } -/** Given a file or directory name, return its full path within the Film's directory */ +/** Given a file or directory name, return its full path within the Film's directory. + * _directory_mutex must not be locked on entry. + */ string Film::file (string f) const { - boost::mutex::scoped_lock lm (_state_mutex); - return file_locked (f); -} - -string -Film::file_locked (string f) const -{ - filesystem::path p; + boost::mutex::scoped_lock lm (_directory_mutex); + boost::filesystem::path p; p /= _directory; p /= f; return p.string (); @@ -714,25 +625,22 @@ string Film::content_path () const { boost::mutex::scoped_lock lm (_state_mutex); - if (filesystem::path(_content).has_root_directory ()) { + if (boost::filesystem::path(_content).has_root_directory ()) { return _content; } - return file_locked (_content); + return file (_content); } ContentType Film::content_type () const { -#if BOOST_FILESYSTEM_VERSION == 3 - string ext = filesystem::path(_content).extension().string(); -#else - string ext = filesystem::path(_content).extension(); -#endif + if (boost::filesystem::is_directory (_content)) { + /* Directory of images, we assume */ + return VIDEO; + } - transform (ext.begin(), ext.end(), ext.begin(), ::tolower); - - if (ext == ".tif" || ext == ".tiff" || ext == ".jpg" || ext == ".jpeg" || ext == ".png") { + if (still_image_file (_content)) { return STILL; } @@ -743,38 +651,42 @@ Film::content_type () const int Film::target_audio_sample_rate () const { + if (!audio_stream()) { + return 0; + } + /* Resample to a DCI-approved sample rate */ - double t = dcp_audio_sample_rate (audio_sample_rate()); + double t = dcp_audio_sample_rate (audio_stream()->sample_rate()); + + DCPFrameRate dfr = dcp_frame_rate (frames_per_second ()); /* Compensate for the fact that video will be rounded to the nearest integer number of frames per second. */ - if (rint (frames_per_second()) != frames_per_second()) { - t *= _frames_per_second / rint (frames_per_second()); + if (dfr.run_fast) { + t *= _frames_per_second * dfr.skip / dfr.frames_per_second; } return rint (t); } -int +boost::optional Film::dcp_length () const { - if (dcp_frames()) { - return dcp_frames(); + if (!length()) { + return boost::optional (); } - return length(); + return length().get() - dcp_trim_start() - dcp_trim_end(); } /** @return a DCI-compliant name for a DCP of this film */ string Film::dci_name () const { - boost::mutex::scoped_lock lm (_state_mutex); - stringstream d; - string fixed_name = to_upper_copy (_name); + string fixed_name = to_upper_copy (name()); for (size_t i = 0; i < fixed_name.length(); ++i) { if (fixed_name[i] == ' ') { fixed_name[i] = '-'; @@ -788,18 +700,18 @@ Film::dci_name () const d << fixed_name << "_"; - if (_dcp_content_type) { - d << _dcp_content_type->dci_name() << "_"; + if (dcp_content_type()) { + d << dcp_content_type()->dci_name() << "_"; } - if (_format) { - d << _format->dci_name() << "_"; + if (format()) { + d << format()->dci_name() << "_"; } - if (!_audio_language.empty ()) { - d << _audio_language; - if (!_subtitle_language.empty() && _with_subtitles) { - d << "-" << _subtitle_language; + if (!audio_language().empty ()) { + d << audio_language(); + if (!subtitle_language().empty() && with_subtitles()) { + d << "-" << subtitle_language(); } else { d << "-XX"; } @@ -807,15 +719,15 @@ Film::dci_name () const d << "_"; } - if (!_territory.empty ()) { - d << _territory; - if (!_rating.empty ()) { - d << "-" << _rating; + if (!territory().empty ()) { + d << territory(); + if (!rating().empty ()) { + d << "-" << rating(); } d << "_"; } - switch (_audio_streams[_audio_stream].channels()) { + switch (audio_channels()) { case 1: d << "10_"; break; @@ -832,19 +744,18 @@ Film::dci_name () const d << "2K_"; - if (!_studio.empty ()) { - d << _studio << "_"; + if (!studio().empty ()) { + d << studio() << "_"; } - gregorian::date today = gregorian::day_clock::local_day (); - d << gregorian::to_iso_string (today) << "_"; + d << boost::gregorian::to_iso_string (_dci_date) << "_"; - if (!_facility.empty ()) { - d << _facility << "_"; + if (!facility().empty ()) { + d << facility() << "_"; } - if (!_package_type.empty ()) { - d << _package_type; + if (!package_type().empty ()) { + d << package_type(); } return d.str (); @@ -896,7 +807,7 @@ Film::set_content (string c) string check = directory (); #if BOOST_FILESYSTEM_VERSION == 3 - filesystem::path slash ("/"); + boost::filesystem::path slash ("/"); string platform_slash = slash.make_preferred().string (); #else #ifdef DVDOMATIC_WINDOWS @@ -910,41 +821,66 @@ Film::set_content (string c) check += platform_slash; } - if (filesystem::path(c).has_root_directory () && starts_with (c, check)) { + if (boost::filesystem::path(c).has_root_directory () && starts_with (c, check)) { c = c.substr (_directory.length() + 1); } + string old_content; + { boost::mutex::scoped_lock lm (_state_mutex); if (c == _content) { return; } + old_content = _content; _content = c; } - + + /* Reset streams here in case the new content doesn't have one or the other */ + _content_audio_stream = shared_ptr (); + _subtitle_stream = shared_ptr (); + /* Create a temporary decoder so that we can get information about the content. */ - - shared_ptr o (new Options ("", "", "")); - o->out_size = Size (1024, 1024); - - shared_ptr d = decoder_factory (shared_from_this(), o, 0, 0); - - set_size (d->native_size ()); - set_frames_per_second (d->frames_per_second ()); - set_audio_sample_rate (d->audio_sample_rate ()); - set_has_subtitles (d->has_subtitles ()); - set_audio_streams (d->audio_streams ()); - set_subtitle_streams (d->subtitle_streams ()); - set_audio_stream (audio_streams().empty() ? -1 : 0); - set_subtitle_stream (subtitle_streams().empty() ? -1 : 0); - - signal_changed (CONTENT); + try { + shared_ptr o (new DecodeOptions); + Decoders d = decoder_factory (shared_from_this(), o, 0); + + set_size (d.video->native_size ()); + set_frames_per_second (d.video->frames_per_second ()); + set_subtitle_streams (d.video->subtitle_streams ()); + set_content_audio_streams (d.audio->audio_streams ()); + + /* Start off with the first audio and subtitle streams */ + if (!d.audio->audio_streams().empty()) { + set_content_audio_stream (d.audio->audio_streams().front()); + } + + if (!d.video->subtitle_streams().empty()) { + set_subtitle_stream (d.video->subtitle_streams().front()); + } + + { + boost::mutex::scoped_lock lm (_state_mutex); + _content = c; + } + + signal_changed (CONTENT); + + set_content_digest (md5_digest (content_path ())); + + examine_content (); + + } catch (...) { + + boost::mutex::scoped_lock lm (_state_mutex); + _content = old_content; + throw; - set_content_digest (md5_digest (content_path ())); + } } void @@ -1055,23 +991,23 @@ Film::set_scaler (Scaler const * s) } void -Film::set_dcp_frames (int f) +Film::set_dcp_trim_start (int t) { { boost::mutex::scoped_lock lm (_state_mutex); - _dcp_frames = f; + _dcp_trim_start = t; } - signal_changed (DCP_FRAMES); + signal_changed (DCP_TRIM_START); } void -Film::set_dcp_trim_action (TrimAction a) +Film::set_dcp_trim_end (int t) { { boost::mutex::scoped_lock lm (_state_mutex); - _dcp_trim_action = a; + _dcp_trim_end = t; } - signal_changed (DCP_TRIM_ACTION); + signal_changed (DCP_TRIM_END); } void @@ -1085,13 +1021,41 @@ Film::set_dcp_ab (bool a) } void -Film::set_audio_stream (int s) +Film::set_content_audio_stream (shared_ptr s) { { boost::mutex::scoped_lock lm (_state_mutex); - _audio_stream = s; + _content_audio_stream = s; } - signal_changed (AUDIO_STREAM); + signal_changed (CONTENT_AUDIO_STREAM); +} + +void +Film::set_external_audio (vector a) +{ + { + boost::mutex::scoped_lock lm (_state_mutex); + _external_audio = a; + } + + shared_ptr o (new DecodeOptions); + shared_ptr decoder (new ExternalAudioDecoder (shared_from_this(), o, 0)); + if (decoder->audio_stream()) { + _external_audio_stream = decoder->audio_stream (); + } + + signal_changed (EXTERNAL_AUDIO); +} + +void +Film::set_use_content_audio (bool e) +{ + { + boost::mutex::scoped_lock lm (_state_mutex); + _use_content_audio = e; + } + + signal_changed (USE_CONTENT_AUDIO); } void @@ -1125,7 +1089,7 @@ Film::set_still_duration (int d) } void -Film::set_subtitle_stream (int s) +Film::set_subtitle_stream (shared_ptr s) { { boost::mutex::scoped_lock lm (_state_mutex); @@ -1234,16 +1198,6 @@ Film::set_package_type (string p) signal_changed (DCI_METADATA); } -void -Film::set_thumbs (vector t) -{ - { - boost::mutex::scoped_lock lm (_state_mutex); - _thumbs = t; - } - signal_changed (THUMBS); -} - void Film::set_size (Size s) { @@ -1255,7 +1209,7 @@ Film::set_size (Size s) } void -Film::set_length (int l) +Film::set_length (SourceFrame l) { { boost::mutex::scoped_lock lm (_state_mutex); @@ -1265,14 +1219,14 @@ Film::set_length (int l) } void -Film::set_audio_sample_rate (int r) +Film::unset_length () { { boost::mutex::scoped_lock lm (_state_mutex); - _audio_sample_rate = r; + _length = boost::none; } - signal_changed (AUDIO_SAMPLE_RATE); -} + signal_changed (LENGTH); +} void Film::set_content_digest (string d) @@ -1285,33 +1239,23 @@ Film::set_content_digest (string d) } void -Film::set_has_subtitles (bool s) -{ - { - boost::mutex::scoped_lock lm (_state_mutex); - _has_subtitles = s; - } - signal_changed (HAS_SUBTITLES); -} - -void -Film::set_audio_streams (vector s) +Film::set_content_audio_streams (vector > s) { { boost::mutex::scoped_lock lm (_state_mutex); - _audio_streams = s; + _content_audio_streams = s; } - _dirty = true; + signal_changed (CONTENT_AUDIO_STREAMS); } void -Film::set_subtitle_streams (vector s) +Film::set_subtitle_streams (vector > s) { { boost::mutex::scoped_lock lm (_state_mutex); _subtitle_streams = s; } - _dirty = true; + signal_changed (SUBTITLE_STREAMS); } void @@ -1331,16 +1275,35 @@ Film::signal_changed (Property p) boost::mutex::scoped_lock lm (_state_mutex); _dirty = true; } - ui_signaller->emit (boost::bind (boost::ref (Changed), p)); + + if (ui_signaller) { + ui_signaller->emit (boost::bind (boost::ref (Changed), p)); + } } int Film::audio_channels () const { - boost::mutex::scoped_lock lm (_state_mutex); - if (_audio_stream == -1) { + shared_ptr s = audio_stream (); + if (!s) { return 0; } - - return _audio_streams[_audio_stream].channels (); + + return s->channels (); +} + +void +Film::set_dci_date_today () +{ + _dci_date = boost::gregorian::day_clock::local_day (); +} + +boost::shared_ptr +Film::audio_stream () const +{ + if (use_content_audio()) { + return _content_audio_stream; + } + + return _external_audio_stream; }