X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=3f92100802ade784a839bef4a790a939fa547a2b;hb=a605b22381ee47d2737307e0b61e3423b020547b;hp=cacd307643363657b180ef348c0b37bc9a7b0682;hpb=752bba7eb39d6f775a3ecb3ca3e19d7884626a4e;p=dcpomatic.git diff --git a/src/lib/film.cc b/src/lib/film.cc index cacd30764..3f9210080 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -40,7 +40,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,6 +51,9 @@ #include "check_hashes_job.h" #include "version.h" #include "ui_signaller.h" +#include "video_decoder.h" +#include "audio_decoder.h" +#include "external_audio_decoder.h" using std::string; using std::stringstream; @@ -63,11 +65,16 @@ 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 @@ -78,23 +85,20 @@ using boost::starts_with; */ 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_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) - , _audio_sample_rate (0) - , _has_subtitles (false) , _frames_per_second (0) , _dirty (false) { @@ -126,6 +130,8 @@ Film::Film (string d, bool must_exist) } } + _external_audio_stream = ExternalAudioStream::create (); + read_metadata (); _log = new FileLog (file ("log")); @@ -146,7 +152,9 @@ Film::Film (Film const & o) , _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) @@ -164,10 +172,9 @@ Film::Film (Film const & o) , _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) @@ -257,6 +264,16 @@ Film::make_dcp (bool transcode) o->out_size = format()->dcp_size (); o->padding = format()->dcp_padding (shared_from_this ()); o->ratio = format()->ratio_as_float (shared_from_this ()); + if (dcp_length ()) { + o->video_decode_range = make_pair (dcp_trim_start(), dcp_trim_start() + dcp_length().get()); + if (audio_stream()) { + o->audio_decode_range = make_pair ( + video_frames_to_audio_frames (o->video_decode_range.get().first, audio_stream()->sample_rate(), frames_per_second()), + video_frames_to_audio_frames (o->video_decode_range.get().second, audio_stream()->sample_rate(), frames_per_second()) + ); + } + + } o->decode_subtitles = with_subtitles (); o->decode_video_skip = dcp_frame_rate (frames_per_second()).skip; @@ -319,13 +336,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 ())); - JobManager::instance()->add (j); -} - /** Count the number of frames that have been encoded for this film. * @return frame count. */ @@ -388,6 +398,8 @@ Film::write_metadata () const throw CreateFileError (m); } + f << "version " << state_version << "\n"; + /* User stuff */ f << "name " << _name << "\n"; f << "use_dci_name " << _use_dci_name << "\n"; @@ -409,11 +421,19 @@ Film::write_metadata () const 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"; @@ -434,16 +454,16 @@ Film::write_metadata () const f << "width " << _size.width << "\n"; f << "height " << _size.height << "\n"; f << "length " << _length.get_value_or(0) << "\n"; - f << "audio_sample_rate " << _audio_sample_rate << "\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"; @@ -456,13 +476,36 @@ void Film::read_metadata () { boost::mutex::scoped_lock lm (_state_mutex); + + _external_audio.clear (); + _thumbs.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 ("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; @@ -492,8 +535,16 @@ Film::read_metadata () _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") { @@ -501,7 +552,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") { @@ -540,20 +595,37 @@ Film::read_metadata () if (vv) { _length = vv; } - } else if (k == "audio_sample_rate") { - _audio_sample_rate = atoi (v.c_str ()); } 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 ()); } } + + 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()); + } + } + + /* 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()]; + } + + /* 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()]; + } + } _dirty = false; } @@ -666,15 +738,12 @@ Film::content_path () const ContentType Film::content_type () const { -#if BOOST_FILESYSTEM_VERSION == 3 - string ext = boost::filesystem::path(_content).extension().string(); -#else - string ext = boost::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; } @@ -685,8 +754,12 @@ 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 ()); @@ -714,11 +787,9 @@ Film::dcp_length () const 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] = '-'; @@ -732,18 +803,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"; } @@ -751,15 +822,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; @@ -776,18 +847,18 @@ Film::dci_name () const d << "2K_"; - if (!_studio.empty ()) { - d << _studio << "_"; + if (!studio().empty ()) { + d << studio() << "_"; } 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 (); @@ -869,6 +940,10 @@ Film::set_content (string c) _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. */ @@ -877,16 +952,21 @@ Film::set_content (string c) shared_ptr o (new Options ("", "", "")); o->out_size = Size (1024, 1024); - shared_ptr d = decoder_factory (shared_from_this(), o, 0, 0); + pair, shared_ptr > d = decoder_factory (shared_from_this(), o, 0); + + set_size (d.first->native_size ()); + set_frames_per_second (d.first->frames_per_second ()); + set_subtitle_streams (d.first->subtitle_streams ()); + set_content_audio_streams (d.second->audio_streams ()); + + /* Start off with the first audio and subtitle streams */ + if (!d.second->audio_streams().empty()) { + set_content_audio_stream (d.second->audio_streams().front()); + } - 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); + if (!d.first->subtitle_streams().empty()) { + set_subtitle_stream (d.first->subtitle_streams().front()); + } { boost::mutex::scoped_lock lm (_state_mutex); @@ -1046,13 +1126,42 @@ 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 Options ("", "", "")); + o->decode_audio = true; + 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 @@ -1086,7 +1195,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); @@ -1235,16 +1344,6 @@ Film::unset_length () signal_changed (LENGTH); } -void -Film::set_audio_sample_rate (int r) -{ - { - boost::mutex::scoped_lock lm (_state_mutex); - _audio_sample_rate = r; - } - signal_changed (AUDIO_SAMPLE_RATE); -} - void Film::set_content_digest (string d) { @@ -1256,33 +1355,23 @@ Film::set_content_digest (string d) } void -Film::set_has_subtitles (bool s) +Film::set_content_audio_streams (vector > s) { { boost::mutex::scoped_lock lm (_state_mutex); - _has_subtitles = s; + _content_audio_streams = s; } - signal_changed (HAS_SUBTITLES); + signal_changed (CONTENT_AUDIO_STREAMS); } void -Film::set_audio_streams (vector s) -{ - { - boost::mutex::scoped_lock lm (_state_mutex); - _audio_streams = s; - } - _dirty = true; -} - -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 @@ -1311,12 +1400,12 @@ Film::signal_changed (Property 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 @@ -1324,3 +1413,13 @@ 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; +}