From: Carl Hetherington Date: Mon, 15 Jul 2019 00:31:20 +0000 (+0100) Subject: swaroop: beginnings of DCP -> ecinema support. X-Git-Tag: v2.15.12 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=4d11fe7cea71b0564df9a21a3cc706509d12b0d1 swaroop: beginnings of DCP -> ecinema support. --- diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc index e29d37cec..7c641f5ab 100644 --- a/src/lib/ffmpeg_encoder.cc +++ b/src/lib/ffmpeg_encoder.cc @@ -41,8 +41,10 @@ using std::map; using boost::shared_ptr; using boost::bind; using boost::weak_ptr; +using boost::optional; using namespace dcpomatic; +/** @param key Key to use to encrypt MP4 outputs */ FFmpegEncoder::FFmpegEncoder ( shared_ptr film, weak_ptr job, @@ -51,6 +53,10 @@ FFmpegEncoder::FFmpegEncoder ( bool mixdown_to_stereo, bool split_reels, int x264_crf +#ifdef DCPOMATIC_VARIANT_SWAROOP + , optional key + , optional id +#endif ) : Encoder (film, job) , _history (1000) @@ -79,6 +85,10 @@ FFmpegEncoder::FFmpegEncoder ( _film->three_d(), filename, extension +#ifdef DCPOMATIC_VARIANT_SWAROOP + , key + , id +#endif ) ); } @@ -196,20 +206,36 @@ FFmpegEncoder::FileEncoderSet::FileEncoderSet ( bool three_d, boost::filesystem::path output, string extension +#ifdef DCPOMATIC_VARIANT_SWAROOP + , optional key + , optional id +#endif ) { if (three_d) { /// TRANSLATORS: L here is an abbreviation for "left", to indicate the left-eye part of a 3D export _encoders[EYES_LEFT] = shared_ptr( - new FFmpegFileEncoder(video_frame_size, video_frame_rate, audio_frame_rate, channels, format, x264_crf, String::compose("%1_%2%3", output.string(), _("L"), extension)) + new FFmpegFileEncoder(video_frame_size, video_frame_rate, audio_frame_rate, channels, format, x264_crf, String::compose("%1_%2%3", output.string(), _("L"), extension) +#ifdef DCPOMATIC_VARIANT_SWAROOP + , key, id +#endif + ) ); /// TRANSLATORS: R here is an abbreviation for "right", to indicate the right-eye part of a 3D export _encoders[EYES_RIGHT] = shared_ptr( - new FFmpegFileEncoder(video_frame_size, video_frame_rate, audio_frame_rate, channels, format, x264_crf, String::compose("%1_%2%3", output.string(), _("R"), extension)) + new FFmpegFileEncoder(video_frame_size, video_frame_rate, audio_frame_rate, channels, format, x264_crf, String::compose("%1_%2%3", output.string(), _("R"), extension) +#ifdef DCPOMATIC_VARIANT_SWAROOP + , key, id +#endif + ) ); } else { _encoders[EYES_BOTH] = shared_ptr( - new FFmpegFileEncoder(video_frame_size, video_frame_rate, audio_frame_rate, channels, format, x264_crf, String::compose("%1%2", output.string(), extension)) + new FFmpegFileEncoder(video_frame_size, video_frame_rate, audio_frame_rate, channels, format, x264_crf, String::compose("%1%2", output.string(), extension) +#ifdef DCPOMATIC_VARIANT_SWAROOP + , key, id +#endif + ) ); } } diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h index 687d2981e..d8ffd2c6b 100644 --- a/src/lib/ffmpeg_encoder.h +++ b/src/lib/ffmpeg_encoder.h @@ -39,6 +39,10 @@ public: bool mixdown_to_stereo, bool split_reels, int x264_crf +#ifdef DCPOMATIC_VARIANT_SWAROOP + , boost::optional key + , boost::optional id +#endif ); void go (); @@ -64,6 +68,10 @@ private: bool three_d, boost::filesystem::path output, std::string extension +#ifdef DCPOMATIC_VARIANT_SWAROOP + , boost::optional key + , boost::optional id +#endif ); boost::shared_ptr get (Eyes eyes) const; diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc index eb7036429..af6066bfd 100644 --- a/src/lib/ffmpeg_file_encoder.cc +++ b/src/lib/ffmpeg_file_encoder.cc @@ -38,6 +38,7 @@ using std::pair; using boost::shared_ptr; using boost::bind; using boost::weak_ptr; +using boost::optional; using namespace dcpomatic; int FFmpegFileEncoder::_video_stream_index = 0; @@ -51,6 +52,10 @@ FFmpegFileEncoder::FFmpegFileEncoder ( ExportFormat format, int x264_crf, boost::filesystem::path output +#ifdef DCPOMATIC_VARIANT_SWAROOP + , optional key + , optional id +#endif ) : _video_options (0) , _audio_channels (channels) @@ -80,7 +85,11 @@ FFmpegFileEncoder::FFmpegFileEncoder ( setup_video (); setup_audio (); +#ifdef DCPOMATIC_VARIANT_SWAROOP + int r = avformat_alloc_output_context2 (&_format_context, av_guess_format("mp4", 0, 0), 0, 0); +#else int r = avformat_alloc_output_context2 (&_format_context, 0, 0, _output.string().c_str()); +#endif if (!_format_context) { throw runtime_error (String::compose("could not allocate FFmpeg format context (%1)", r)); } @@ -116,6 +125,22 @@ FFmpegFileEncoder::FFmpegFileEncoder ( throw runtime_error ("could not open FFmpeg output file"); } +#ifdef DCPOMATIC_VARIANT_SWAROOP + if (key) { + AVDictionary* options = 0; + av_dict_set (&options, "encryption_key", key->hex().c_str(), 0); + /* XXX: is this OK? */ + av_dict_set (&options, "encryption_kid", "00000000000000000000000000000000", 0); + av_dict_set (&options, "encryption_scheme", "cenc-aes-ctr", 0); + } + + if (id) { + if (av_dict_set(&_format_context->metadata, SWAROOP_ID_TAG, id->c_str(), 0) < 0) { + throw runtime_error ("Could not write ID to output"); + } + } +#endif + if (avformat_write_header (_format_context, 0) < 0) { throw runtime_error ("could not write header to FFmpeg output file"); } diff --git a/src/lib/ffmpeg_file_encoder.h b/src/lib/ffmpeg_file_encoder.h index 5308947e6..d763c7eaf 100644 --- a/src/lib/ffmpeg_file_encoder.h +++ b/src/lib/ffmpeg_file_encoder.h @@ -25,6 +25,7 @@ #include "event_history.h" #include "audio_mapping.h" #include "log.h" +#include extern "C" { #include #include @@ -41,6 +42,10 @@ public: ExportFormat, int x264_crf, boost::filesystem::path output +#ifdef DCPOMATIC_VARIANT_SWAROOP + , boost::optional key + , boost::optional id +#endif ); void video (boost::shared_ptr, dcpomatic::DCPTime); diff --git a/src/lib/util.cc b/src/lib/util.cc index 1f6fba963..3b6be6dcc 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -44,6 +44,7 @@ #include "ffmpeg_image_proxy.h" #include "image.h" #include "text_decoder.h" +#include "job_manager.h" #include #include #include @@ -945,6 +946,70 @@ emit_subtitle_image (ContentTimePeriod period, dcp::SubtitleImage sub, dcp::Size decoder->emit_bitmap (period, image, rect); } +bool +show_jobs_on_console (bool progress) +{ + bool should_stop = false; + bool first = true; + bool error = false; + while (!should_stop) { + + dcpomatic_sleep (5); + + list > jobs = JobManager::instance()->get(); + + if (!first && progress) { + for (size_t i = 0; i < jobs.size(); ++i) { + cout << "\033[1A\033[2K"; + } + cout.flush (); + } + + first = false; + + int unfinished = 0; + int finished_in_error = 0; + + BOOST_FOREACH (shared_ptr i, jobs) { + if (progress) { + cout << i->name(); + if (!i->sub_name().empty()) { + cout << "; " << i->sub_name(); + } + cout << ": "; + + if (i->progress ()) { + cout << i->status() << " \n"; + } else { + cout << ": Running \n"; + } + } + + if (!i->finished ()) { + ++unfinished; + } + + if (i->finished_in_error ()) { + ++finished_in_error; + error = true; + } + + if (!progress && i->finished_in_error ()) { + /* We won't see this error if we haven't been showing progress, + so show it now. + */ + cout << i->status() << "\n"; + } + } + + if (unfinished == 0 || finished_in_error != 0) { + should_stop = true; + } + } + + return error; +} + #ifdef DCPOMATIC_VARIANT_SWAROOP /* Make up a key from the machine UUID */ diff --git a/src/lib/util.h b/src/lib/util.h index f5218653d..d90053cdc 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -110,6 +110,7 @@ extern void checked_fwrite (void const * ptr, size_t size, FILE* stream, boost:: extern size_t utf8_strlen (std::string s); extern std::string day_of_week_to_string (boost::gregorian::greg_weekday d); extern void emit_subtitle_image (dcpomatic::ContentTimePeriod period, dcp::SubtitleImage sub, dcp::Size size, boost::shared_ptr decoder); +extern bool show_jobs_on_console (bool progress); #ifdef DCPOMATIC_VARIANT_SWAROOP extern boost::shared_ptr read_swaroop_chain (boost::filesystem::path path); extern void write_swaroop_chain (boost::shared_ptr chain, boost::filesystem::path output); diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 96770914d..5b2e1870b 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -913,7 +913,11 @@ private: shared_ptr job (new TranscodeJob (_film)); job->set_encoder ( shared_ptr ( - new FFmpegEncoder (_film, job, d->path(), d->format(), d->mixdown_to_stereo(), d->split_reels(), d->x264_crf()) + new FFmpegEncoder (_film, job, d->path(), d->format(), d->mixdown_to_stereo(), d->split_reels(), d->x264_crf() +#ifdef DCPOMATIC_VARIANT_SWAROOP + , optional(), optional() +#endif + ) ) ); JobManager::instance()->add (job); diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc index f049c0c91..9388112f6 100644 --- a/src/tools/dcpomatic_cli.cc +++ b/src/tools/dcpomatic_cli.cc @@ -350,64 +350,7 @@ main (int argc, char* argv[]) } film->make_dcp (); - - bool should_stop = false; - bool first = true; - bool error = false; - while (!should_stop) { - - dcpomatic_sleep (5); - - list > jobs = JobManager::instance()->get (); - - if (!first && progress) { - for (size_t i = 0; i < jobs.size(); ++i) { - cout << "\033[1A\033[2K"; - } - cout.flush (); - } - - first = false; - - int unfinished = 0; - int finished_in_error = 0; - - BOOST_FOREACH (shared_ptr i, jobs) { - if (progress) { - cout << i->name(); - if (!i->sub_name().empty()) { - cout << "; " << i->sub_name(); - } - cout << ": "; - - if (i->progress ()) { - cout << i->status() << " \n"; - } else { - cout << ": Running \n"; - } - } - - if (!i->finished ()) { - ++unfinished; - } - - if (i->finished_in_error ()) { - ++finished_in_error; - error = true; - } - - if (!progress && i->finished_in_error ()) { - /* We won't see this error if we haven't been showing progress, - so show it now. - */ - cout << i->status() << "\n"; - } - } - - if (unfinished == 0 || finished_in_error != 0) { - should_stop = true; - } - } + bool const error = show_jobs_on_console (progress); if (keep_going) { while (true) { diff --git a/src/tools/dcpomatic_ecinema.cc b/src/tools/dcpomatic_ecinema.cc index f0ba80b35..f91dbb584 100644 --- a/src/tools/dcpomatic_ecinema.cc +++ b/src/tools/dcpomatic_ecinema.cc @@ -22,6 +22,13 @@ #include "lib/decrypted_ecinema_kdm.h" #include "lib/config.h" #include "lib/util.h" +#include "lib/film.h" +#include "lib/dcp_content.h" +#include "lib/job_manager.h" +#include "lib/cross.h" +#include "lib/transcode_job.h" +#include "lib/ffmpeg_encoder.h" +#include "lib/signal_manager.h" #include extern "C" { #include @@ -41,6 +48,11 @@ using std::cerr; using std::cout; using std::ofstream; using boost::optional; +using boost::shared_ptr; + +static void convert_dcp (boost::filesystem::path input, boost::filesystem::path output_file, boost::optional kdm, int crf); +static void convert_ffmpeg (boost::filesystem::path input, boost::filesystem::path output_file, string format, boost::optional kdm); +static void write_kdm (string id, string name, dcp::Key key, optional kdm); static void help (string n) @@ -51,6 +63,7 @@ help (string n) << " -o, --output output directory\n" << " -f, --format output format (mov or mp4; defaults to mov)\n" << " -k, --kdm KDM output filename (defaults to stdout)\n" + << " -c, --crf quality (CRF) when transcoding from DCP (0 is best, 51 is worst, defaults to 23)\n" << "\n" << " is the unencrypted .mp4 file.\n"; } @@ -59,8 +72,9 @@ int main (int argc, char* argv[]) { optional output; - optional format; + optional format; optional kdm; + int crf = 23; int option_index = 0; while (true) { @@ -70,9 +84,10 @@ main (int argc, char* argv[]) { "output", required_argument, 0, 'o' }, { "format", required_argument, 0, 'f' }, { "kdm", required_argument, 0, 'k' }, + { "crf", required_argument, 0, 'c' }, }; - int c = getopt_long (argc, argv, "vho:f:k:", long_options, &option_index); + int c = getopt_long (argc, argv, "vho:f:k:c:", long_options, &option_index); if (c == -1) { break; @@ -94,6 +109,9 @@ main (int argc, char* argv[]) case 'k': kdm = optarg; break; + case 'c': + crf = atoi(optarg); + break; } } @@ -116,8 +134,17 @@ main (int argc, char* argv[]) exit (EXIT_FAILURE); } + dcpomatic_setup_path_encoding (); + dcpomatic_setup (); + signal_manager = new SignalManager (); + boost::filesystem::path input = argv[optind]; - boost::filesystem::path output_file = *output / (input.filename().string() + ".ecinema"); + boost::filesystem::path output_file; + if (boost::filesystem::is_directory(input)) { + output_file = *output / (input.parent_path().filename().string() + ".ecinema"); + } else { + output_file = *output / (input.filename().string() + ".ecinema"); + } if (!boost::filesystem::is_directory(*output)) { boost::filesystem::create_directory (*output); @@ -125,6 +152,17 @@ main (int argc, char* argv[]) av_register_all (); + if (boost::filesystem::is_directory(input)) { + /* Assume input is a DCP */ + convert_dcp (input, output_file, kdm, crf); + } else { + convert_ffmpeg (input, output_file, *format, kdm); + } +} + +static void +convert_ffmpeg (boost::filesystem::path input, boost::filesystem::path output_file, string format, optional kdm) +{ AVFormatContext* input_fc = avformat_alloc_context (); if (avformat_open_input(&input_fc, input.string().c_str(), 0, 0) < 0) { cerr << "Could not open input file\n"; @@ -137,7 +175,7 @@ main (int argc, char* argv[]) } AVFormatContext* output_fc; - avformat_alloc_output_context2 (&output_fc, av_guess_format(format->c_str(), 0, 0), 0, 0); + avformat_alloc_output_context2 (&output_fc, av_guess_format(format.c_str(), 0, 0), 0, 0); for (uint32_t i = 0; i < input_fc->nb_streams; ++i) { AVStream* is = input_fc->streams[i]; @@ -217,7 +255,13 @@ main (int argc, char* argv[]) avformat_free_context (input_fc); avformat_free_context (output_fc); - DecryptedECinemaKDM decrypted_kdm (id, output_file.filename().string(), key, optional(), optional()); + write_kdm (id, output_file.filename().string(), key, kdm); +} + +static void +write_kdm (string id, string name, dcp::Key key, optional kdm) +{ + DecryptedECinemaKDM decrypted_kdm (id, name, key, optional(), optional()); EncryptedECinemaKDM encrypted_kdm = decrypted_kdm.encrypt (Config::instance()->decryption_chain()->leaf()); if (kdm) { @@ -227,3 +271,32 @@ main (int argc, char* argv[]) cout << encrypted_kdm.as_xml() << "\n"; } } + +static void +convert_dcp (boost::filesystem::path input, boost::filesystem::path output_file, optional kdm, int crf) +{ + shared_ptr film (new Film(boost::optional())); + shared_ptr dcp (new DCPContent(input)); + film->examine_and_add_content (dcp); + + JobManager* jm = JobManager::instance (); + while (jm->work_to_do ()) { + while (signal_manager->ui_idle ()) {} + dcpomatic_sleep (1); + } + DCPOMATIC_ASSERT (!jm->errors()); + + string id = dcp::make_uuid (); + dcp::Key key (AES_CTR_KEY_SIZE); + + shared_ptr job (new TranscodeJob(film)); + job->set_encoder ( + shared_ptr( + new FFmpegEncoder(film, job, output_file, EXPORT_FORMAT_H264, false, false, crf, key, id) + ) + ); + jm->add (job); + show_jobs_on_console (true); + + write_kdm (id, output_file.filename().string(), key, kdm); +} diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc index dd10bd4a1..877e39d49 100644 --- a/test/ffmpeg_encoder_test.cc +++ b/test/ffmpeg_encoder_test.cc @@ -36,6 +36,7 @@ using std::string; using boost::shared_ptr; +using boost::optional; using namespace dcpomatic; static void @@ -67,7 +68,11 @@ ffmpeg_content_test (int number, boost::filesystem::path content, ExportFormat f film->write_metadata (); shared_ptr job (new TranscodeJob (film)); - FFmpegEncoder encoder (film, job, String::compose("build/test/%1.%2", name, extension), format, false, false, 23); + FFmpegEncoder encoder (film, job, String::compose("build/test/%1.%2", name, extension), format, false, false, 23 +#ifdef DCPOMATIC_VARIANT_SWAROOP + , optional(), optional() +#endif + ); encoder.go (); } @@ -111,7 +116,11 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test5) film->write_metadata (); shared_ptr job (new TranscodeJob (film)); - FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test5.mov", EXPORT_FORMAT_PRORES, false, false, 23); + FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test5.mov", EXPORT_FORMAT_PRORES, false, false, 23 +#ifdef DCPOMATIC_VARIANT_SWAROOP + , optional(), optional() +#endif + ); encoder.go (); } @@ -132,7 +141,11 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test6) film->write_metadata(); shared_ptr job (new TranscodeJob (film)); - FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test6.mov", EXPORT_FORMAT_PRORES, false, false, 23); + FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test6.mov", EXPORT_FORMAT_PRORES, false, false, 23 +#ifdef DCPOMATIC_VARIANT_SWAROOP + , optional(), optional() +#endif + ); encoder.go (); } @@ -156,7 +169,11 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test7) s->only_text()->set_effect_colour (dcp::Colour (0, 255, 255)); shared_ptr job (new TranscodeJob (film)); - FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test7.mov", EXPORT_FORMAT_PRORES, false, false, 23); + FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test7.mov", EXPORT_FORMAT_PRORES, false, false, 23 +#ifdef DCPOMATIC_VARIANT_SWAROOP + , optional(), optional() +#endif + ); encoder.go (); } @@ -183,7 +200,11 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test2) film->write_metadata(); shared_ptr job (new TranscodeJob (film)); - FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test2.mp4", EXPORT_FORMAT_H264, false, false, 23); + FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test2.mp4", EXPORT_FORMAT_H264, false, false, 23 +#ifdef DCPOMATIC_VARIANT_SWAROOP + , optional(), optional() +#endif + ); encoder.go (); } @@ -208,7 +229,11 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test3) film->write_metadata(); shared_ptr job (new TranscodeJob (film)); - FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test3.mp4", EXPORT_FORMAT_H264, false, false, 23); + FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test3.mp4", EXPORT_FORMAT_H264, false, false, 23 +#ifdef DCPOMATIC_VARIANT_SWAROOP + , optional(), optional() +#endif + ); encoder.go (); } @@ -222,7 +247,11 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test4) film->set_container(Ratio::from_id("185")); shared_ptr job(new TranscodeJob(film)); - FFmpegEncoder encoder(film, job, "build/test/ffmpeg_encoder_h264_test4.mp4", EXPORT_FORMAT_H264, false, false, 23); + FFmpegEncoder encoder(film, job, "build/test/ffmpeg_encoder_h264_test4.mp4", EXPORT_FORMAT_H264, false, false, 23 +#ifdef DCPOMATIC_VARIANT_SWAROOP + , optional(), optional() +#endif + ); encoder.go(); } @@ -276,7 +305,11 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test5) Rs->audio->set_mapping (map); shared_ptr job (new TranscodeJob (film)); - FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test5.mp4", EXPORT_FORMAT_H264, true, false, 23); + FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test5.mp4", EXPORT_FORMAT_H264, true, false, 23 +#ifdef DCPOMATIC_VARIANT_SWAROOP + , optional(), optional() +#endif + ); encoder.go (); check_ffmpeg ("build/test/ffmpeg_encoder_h264_test5.mp4", "test/data/ffmpeg_encoder_h264_test5.mp4", 1); @@ -304,6 +337,10 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test6) } shared_ptr job (new TranscodeJob (film2)); - FFmpegEncoder encoder (film2, job, "build/test/ffmpeg_encoder_h264_test6_vf.mp4", EXPORT_FORMAT_H264, true, false, 23); + FFmpegEncoder encoder (film2, job, "build/test/ffmpeg_encoder_h264_test6_vf.mp4", EXPORT_FORMAT_H264, true, false, 23 +#ifdef DCPOMATIC_VARIANT_SWAROOP + , optional(), optional() +#endif + ); encoder.go (); }