From 59209af1e2d73334ff7dfe6c7da465293dc24c0b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 12 Jun 2022 21:44:53 +0200 Subject: [PATCH] Rename PRORES -> PRORES_HQ --- src/lib/export_config.cc | 6 +++--- src/lib/ffmpeg_file_encoder.cc | 4 ++-- src/lib/ffmpeg_file_encoder.h | 2 +- src/tools/dcpomatic_cli.cc | 2 +- src/wx/export_video_file_dialog.cc | 2 +- test/ffmpeg_encoder_test.cc | 22 +++++++++++----------- test/video_level_test.cc | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/lib/export_config.cc b/src/lib/export_config.cc index 6c9807935..66c5e3d66 100644 --- a/src/lib/export_config.cc +++ b/src/lib/export_config.cc @@ -41,7 +41,7 @@ ExportConfig::ExportConfig(Config* parent) void ExportConfig::set_defaults() { - _format = ExportFormat::PRORES; + _format = ExportFormat::PRORES_HQ; _mixdown_to_stereo = false; _split_reels = false; _split_streams = false; @@ -64,7 +64,7 @@ ExportConfig::read(cxml::ConstNodePtr node) } else if (format == "h264-aac") { _format = ExportFormat::H264_AAC; } else { - _format = ExportFormat::PRORES; + _format = ExportFormat::PRORES_HQ; } _mixdown_to_stereo = node->bool_child("MixdownToStereo"); @@ -80,7 +80,7 @@ ExportConfig::write(xmlpp::Element* node) const string name; switch (_format) { - case ExportFormat::PRORES: + case ExportFormat::PRORES_HQ: name = "prores"; break; case ExportFormat::H264_AAC: diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc index d645c4c6b..17f6f55cb 100644 --- a/src/lib/ffmpeg_file_encoder.cc +++ b/src/lib/ffmpeg_file_encoder.cc @@ -228,7 +228,7 @@ FFmpegFileEncoder::FFmpegFileEncoder ( _pixel_format = pixel_format (format); switch (format) { - case ExportFormat::PRORES: + case ExportFormat::PRORES_HQ: _sample_format = AV_SAMPLE_FMT_S16; _video_codec_name = "prores_ks"; _audio_codec_name = "pcm_s16le"; @@ -281,7 +281,7 @@ AVPixelFormat FFmpegFileEncoder::pixel_format (ExportFormat format) { switch (format) { - case ExportFormat::PRORES: + case ExportFormat::PRORES_HQ: return AV_PIX_FMT_YUV422P10; case ExportFormat::H264_AAC: return AV_PIX_FMT_YUV420P; diff --git a/src/lib/ffmpeg_file_encoder.h b/src/lib/ffmpeg_file_encoder.h index ec68839a0..fd716d47c 100644 --- a/src/lib/ffmpeg_file_encoder.h +++ b/src/lib/ffmpeg_file_encoder.h @@ -43,7 +43,7 @@ class ExportAudioStream; enum class ExportFormat { - PRORES, + PRORES_HQ, H264_AAC, SUBTITLES_DCP }; diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc index 9c1d072d8..be5345f9e 100644 --- a/src/tools/dcpomatic_cli.cc +++ b/src/tools/dcpomatic_cli.cc @@ -399,7 +399,7 @@ main (int argc, char* argv[]) auto job = std::make_shared(film, behaviour); job->set_encoder ( std::make_shared ( - film, job, *export_filename, *export_format == "mp4" ? ExportFormat::H264_AAC : ExportFormat::PRORES, false, false, false, 23 + film, job, *export_filename, *export_format == "mp4" ? ExportFormat::H264_AAC : ExportFormat::PRORES_HQ, false, false, false, 23 ) ); JobManager::instance()->add (job); diff --git a/src/wx/export_video_file_dialog.cc b/src/wx/export_video_file_dialog.cc index 2dc452622..5e5e9c4ff 100644 --- a/src/wx/export_video_file_dialog.cc +++ b/src/wx/export_video_file_dialog.cc @@ -54,7 +54,7 @@ wxString format_extensions[] = { }; ExportFormat formats[] = { - ExportFormat::PRORES, + ExportFormat::PRORES_HQ, ExportFormat::H264_AAC, }; diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc index 097ef86e7..ff730ad53 100644 --- a/test/ffmpeg_encoder_test.cc +++ b/test/ffmpeg_encoder_test.cc @@ -57,7 +57,7 @@ ffmpeg_content_test (int number, boost::filesystem::path content, ExportFormat f name += "h264"; extension = "mp4"; break; - case ExportFormat::PRORES: + case ExportFormat::PRORES_HQ: name += "prores"; extension = "mov"; break; @@ -86,28 +86,28 @@ ffmpeg_content_test (int number, boost::filesystem::path content, ExportFormat f /** Red / green / blue MP4 -> Prores */ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test1) { - ffmpeg_content_test (1, "test/data/test.mp4", ExportFormat::PRORES); + ffmpeg_content_test (1, "test/data/test.mp4", ExportFormat::PRORES_HQ); } /** Dolby Aurora trailer VOB -> Prores */ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test2) { - ffmpeg_content_test (2, TestPaths::private_data() / "dolby_aurora.vob", ExportFormat::PRORES); + ffmpeg_content_test (2, TestPaths::private_data() / "dolby_aurora.vob", ExportFormat::PRORES_HQ); } /** Sintel trailer -> Prores */ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test3) { - ffmpeg_content_test (3, TestPaths::private_data() / "Sintel_Trailer1.480p.DivX_Plus_HD.mkv", ExportFormat::PRORES); + ffmpeg_content_test (3, TestPaths::private_data() / "Sintel_Trailer1.480p.DivX_Plus_HD.mkv", ExportFormat::PRORES_HQ); } /** Big Buck Bunny trailer -> Prores */ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test4) { - ffmpeg_content_test (4, TestPaths::private_data() / "big_buck_bunny_trailer_480p.mov", ExportFormat::PRORES); + ffmpeg_content_test (4, TestPaths::private_data() / "big_buck_bunny_trailer_480p.mov", ExportFormat::PRORES_HQ); } @@ -127,7 +127,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test5) film->write_metadata (); auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); - FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test5.mov", ExportFormat::PRORES, false, false, false, 23); + FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test5.mov", ExportFormat::PRORES_HQ, false, false, false, 23); encoder.go (); } @@ -149,7 +149,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test6) film->write_metadata(); auto job = make_shared (film, TranscodeJob::ChangedBehaviour::IGNORE); - FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test6.mov", ExportFormat::PRORES, false, false, false, 23); + FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test6.mov", ExportFormat::PRORES_HQ, false, false, false, 23); encoder.go (); } @@ -174,7 +174,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test7) s->only_text()->set_effect_colour (dcp::Colour (0, 255, 255)); auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); - FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test7.mov", ExportFormat::PRORES, false, false, false, 23); + FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test7.mov", ExportFormat::PRORES_HQ, false, false, false, 23); encoder.go (); } @@ -410,7 +410,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_from_dcp_with_crop) film->write_metadata (); auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); - FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_from_dcp_with_crop.mov", ExportFormat::PRORES, false, false, false, 23); + FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_from_dcp_with_crop.mov", ExportFormat::PRORES_HQ, false, false, false, 23); encoder.go (); } @@ -463,7 +463,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_regression_1) auto film = new_test_film2 ("ffmpeg_encoder_prores_regression_1", { content }); auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); - FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_regression_1.mov", ExportFormat::PRORES, false, true, false, 23); + FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_regression_1.mov", ExportFormat::PRORES_HQ, false, true, false, 23); encoder.go (); } @@ -478,7 +478,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_regression_2) auto film = new_test_film2 ("ffmpeg_encoder_prores_regression_2", { content }); auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); - FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_regression_2.mov", ExportFormat::PRORES, false, true, false, 23); + FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_regression_2.mov", ExportFormat::PRORES_HQ, false, true, false, 23); encoder.go (); dcpomatic_log->set_types(logs); diff --git a/test/video_level_test.cc b/test/video_level_test.cc index 4483e22d5..fd2214684 100644 --- a/test/video_level_test.cc +++ b/test/video_level_test.cc @@ -408,7 +408,7 @@ V_movie_range (shared_ptr film) { auto job = make_shared(film, TranscodeJob::ChangedBehaviour::IGNORE); job->set_encoder ( - make_shared(film, job, film->file("export.mov"), ExportFormat::PRORES, true, false, false, 23) + make_shared(film, job, film->file("export.mov"), ExportFormat::PRORES_HQ, true, false, false, 23) ); JobManager::instance()->add (job); BOOST_REQUIRE (!wait_for_jobs()); -- 2.30.2