X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=29952d0f2e8f57fe6e10a7920af1fbce42940338;hp=4084ca59c1700ec2d5ecae874b8eb5b0732b62b5;hb=d5e6fa029f1fb7b7dccd32dd2906a0858a876cae;hpb=e68386830c8812f80cb4b3af9871170226b916b4 diff --git a/src/lib/film.cc b/src/lib/film.cc index 4084ca59c..29952d0f2 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -156,7 +156,7 @@ Film::Film (optional dir) : _playlist (new Playlist) , _use_isdcf_name (Config::instance()->use_isdcf_name_by_default()) , _dcp_content_type (Config::instance()->default_dcp_content_type ()) - , _container (Config::instance()->default_container ()) + , _container(Ratio::from_id("185")) , _resolution (Resolution::TWO_K) , _encrypted (false) , _context_id (dcp::make_uuid ()) @@ -174,8 +174,10 @@ Film::Film (optional dir) , _user_explicit_container (false) , _user_explicit_resolution (false) , _name_language (dcp::LanguageTag("en-US")) + , _release_territory(Config::instance()->default_territory()) , _version_number (1) , _status (dcp::Status::FINAL) + , _audio_language(Config::instance()->default_audio_language()) , _state_version (current_state_version) , _dirty (false) , _tolerant (false) @@ -803,7 +805,7 @@ Film::subtitle_languages () const string Film::isdcf_name (bool if_created_now) const { - string d; + string isdcf_name; auto raw_name = name (); @@ -842,14 +844,12 @@ Film::isdcf_name (bool if_created_now) const } } - if (fixed_name.length() > 14) { - fixed_name = fixed_name.substr (0, 14); - } + fixed_name = fixed_name.substr(0, 14); - d += fixed_name; + isdcf_name += fixed_name; if (dcp_content_type()) { - d += "_" + dcp_content_type()->isdcf_name(); + isdcf_name += "_" + dcp_content_type()->isdcf_name(); string version = "1"; if (_interop) { if (!_content_versions.empty()) { @@ -861,46 +861,46 @@ Film::isdcf_name (bool if_created_now) const } else { version = dcp::raw_convert(_version_number); } - d += "-" + version; + isdcf_name += "-" + version; } if (_temp_version) { - d += "-Temp"; + isdcf_name += "-Temp"; } if (_pre_release) { - d += "-Pre"; + isdcf_name += "-Pre"; } if (_red_band) { - d += "-RedBand"; + isdcf_name += "-RedBand"; } if (_chain && !_chain->empty()) { - d += "-" + *_chain; + isdcf_name += "-" + *_chain; } if (three_d ()) { - d += "-3D"; + isdcf_name += "-3D"; } if (_two_d_version_of_three_d) { - d += "-2D"; + isdcf_name += "-2D"; } if (_luminance) { auto fl = _luminance->value_in_foot_lamberts(); char buffer[64]; snprintf (buffer, sizeof(buffer), "%.1f", fl); - d += String::compose("-%1fl", buffer); + isdcf_name += String::compose("-%1fl", buffer); } if (video_frame_rate() != 24) { - d += "-" + raw_convert(video_frame_rate()); + isdcf_name += "-" + raw_convert(video_frame_rate()); } if (container()) { - d += "_" + container()->isdcf_name(); + isdcf_name += "_" + container()->isdcf_name(); } /* XXX: this uses the first bit of content only */ @@ -913,7 +913,7 @@ Film::isdcf_name (bool if_created_now) const auto first_ratio = lrintf((*first_video)->video->scaled_size(frame_size()).ratio() * 100); auto container_ratio = lrintf(container()->ratio() * 100); if (first_ratio != container_ratio) { - d += "-" + dcp::raw_convert(first_ratio); + isdcf_name += "-" + dcp::raw_convert(first_ratio); } } } @@ -931,7 +931,7 @@ Film::isdcf_name (bool if_created_now) const auto audio_language = _audio_language ? entry_for_language(*_audio_language) : "XX"; - d += "_" + to_upper (audio_language); + isdcf_name += "_" + to_upper (audio_language); /* I'm not clear on the precise details of the convention for CCAP labelling; for now I'm just appending -CCAP if we have any closed captions. @@ -958,22 +958,23 @@ Film::isdcf_name (bool if_created_now) const lang = to_upper (lang); } - d += "-" + lang; + isdcf_name += "-" + lang; if (ccap) { - d += "-CCAP"; + isdcf_name += "-CCAP"; } } else { /* No subtitles */ - d += "-XX"; + isdcf_name += "-XX"; } if (_release_territory) { auto territory = _release_territory->subtag(); - d += "_" + to_upper (territory); - if (_ratings.empty ()) { - d += "-NR"; - } else { - d += "-" + _ratings[0].label; + isdcf_name += "_" + to_upper (territory); + if (!_ratings.empty()) { + auto label = _ratings[0].label; + boost::erase_all(label, "+"); + boost::erase_all(label, "-"); + isdcf_name += "-" + label; } } @@ -983,42 +984,42 @@ Film::isdcf_name (bool if_created_now) const auto ch = audio_channel_types (mapped, audio_channels()); if (!ch.first && !ch.second) { - d += "_MOS"; + isdcf_name += "_MOS"; } else if (ch.first) { - d += String::compose("_%1%2", ch.first, ch.second); + isdcf_name += String::compose("_%1%2", ch.first, ch.second); } if (audio_channels() > static_cast(dcp::Channel::HI) && find(mapped.begin(), mapped.end(), static_cast(dcp::Channel::HI)) != mapped.end()) { - d += "-HI"; + isdcf_name += "-HI"; } if (audio_channels() > static_cast(dcp::Channel::VI) && find(mapped.begin(), mapped.end(), static_cast(dcp::Channel::VI)) != mapped.end()) { - d += "-VI"; + isdcf_name += "-VI"; } - d += "_" + resolution_to_string (_resolution); + isdcf_name += "_" + resolution_to_string (_resolution); if (_studio && _studio->length() >= 2) { - d += "_" + to_upper (_studio->substr(0, 4)); + isdcf_name += "_" + to_upper (_studio->substr(0, 4)); } if (if_created_now) { - d += "_" + boost::gregorian::to_iso_string (boost::gregorian::day_clock::local_day ()); + isdcf_name += "_" + boost::gregorian::to_iso_string (boost::gregorian::day_clock::local_day ()); } else { - d += "_" + boost::gregorian::to_iso_string (_isdcf_date); + isdcf_name += "_" + boost::gregorian::to_iso_string (_isdcf_date); } if (_facility && _facility->length() >= 3) { - d += "_" + to_upper(_facility->substr(0, 3)); + isdcf_name += "_" + to_upper(_facility->substr(0, 3)); } if (_interop) { - d += "_IOP"; + isdcf_name += "_IOP"; } else { - d += "_SMPTE"; + isdcf_name += "_SMPTE"; } if (three_d ()) { - d += "-3D"; + isdcf_name += "-3D"; } auto vf = false; @@ -1040,12 +1041,12 @@ Film::isdcf_name (bool if_created_now) const } if (vf) { - d += "_VF"; + isdcf_name += "_VF"; } else { - d += "_OV"; + isdcf_name += "_OV"; } - return d; + return isdcf_name; } /** @return name to give the DCP */ @@ -1755,7 +1756,7 @@ Film::audio_output_names () const vector n; for (int i = 0; i < audio_channels(); ++i) { - if (i != 8 && i != 9 && i != 15) { + if (Config::instance()->use_all_audio_channels() || (i != 8 && i != 9 && i != 15)) { n.push_back (NamedChannel(short_audio_channel_name(i), i)); } }