projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
407b3f5
)
Rename PRORES -> PRORES_HQ
author
Carl Hetherington
<cth@carlh.net>
Sun, 12 Jun 2022 19:44:53 +0000
(21:44 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Sun, 12 Jun 2022 19:44:53 +0000
(21:44 +0200)
src/lib/export_config.cc
patch
|
blob
|
history
src/lib/ffmpeg_file_encoder.cc
patch
|
blob
|
history
src/lib/ffmpeg_file_encoder.h
patch
|
blob
|
history
src/tools/dcpomatic_cli.cc
patch
|
blob
|
history
src/wx/export_video_file_dialog.cc
patch
|
blob
|
history
test/ffmpeg_encoder_test.cc
patch
|
blob
|
history
test/video_level_test.cc
patch
|
blob
|
history
diff --git
a/src/lib/export_config.cc
b/src/lib/export_config.cc
index 6c98079353e68ff6bdc103aa4d2a234d2030dccd..66c5e3d664075c067ee44fa42db277290fc5688e 100644
(file)
--- a/
src/lib/export_config.cc
+++ b/
src/lib/export_config.cc
@@
-41,7
+41,7
@@
ExportConfig::ExportConfig(Config* parent)
void
ExportConfig::set_defaults()
{
void
ExportConfig::set_defaults()
{
- _format = ExportFormat::PRORES;
+ _format = ExportFormat::PRORES
_HQ
;
_mixdown_to_stereo = false;
_split_reels = false;
_split_streams = false;
_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 {
} else if (format == "h264-aac") {
_format = ExportFormat::H264_AAC;
} else {
- _format = ExportFormat::PRORES;
+ _format = ExportFormat::PRORES
_HQ
;
}
_mixdown_to_stereo = node->bool_child("MixdownToStereo");
}
_mixdown_to_stereo = node->bool_child("MixdownToStereo");
@@
-80,7
+80,7
@@
ExportConfig::write(xmlpp::Element* node) const
string name;
switch (_format) {
string name;
switch (_format) {
- case ExportFormat::PRORES:
+ case ExportFormat::PRORES
_HQ
:
name = "prores";
break;
case ExportFormat::H264_AAC:
name = "prores";
break;
case ExportFormat::H264_AAC:
diff --git
a/src/lib/ffmpeg_file_encoder.cc
b/src/lib/ffmpeg_file_encoder.cc
index d645c4c6b854eb56df0b3bb2ef01b3afaa7b5186..17f6f55cb01413ddebdda3b52df944ce95f8c092 100644
(file)
--- 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) {
_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";
_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) {
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;
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 ec68839a0766d3f4adb725d9a05d0b478df5702c..fd716d47c4a3f980b7cc7d057b41e29c65bdafd8 100644
(file)
--- a/
src/lib/ffmpeg_file_encoder.h
+++ b/
src/lib/ffmpeg_file_encoder.h
@@
-43,7
+43,7
@@
class ExportAudioStream;
enum class ExportFormat
{
enum class ExportFormat
{
- PRORES,
+ PRORES
_HQ
,
H264_AAC,
SUBTITLES_DCP
};
H264_AAC,
SUBTITLES_DCP
};
diff --git
a/src/tools/dcpomatic_cli.cc
b/src/tools/dcpomatic_cli.cc
index 9c1d072d8438afb3f1d573048a457bafb1bab1da..be5345f9ee5f5a07f110c1fbb7bae4e2ee078bce 100644
(file)
--- 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<TranscodeJob>(film, behaviour);
job->set_encoder (
std::make_shared<FFmpegEncoder> (
auto job = std::make_shared<TranscodeJob>(film, behaviour);
job->set_encoder (
std::make_shared<FFmpegEncoder> (
- 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);
)
);
JobManager::instance()->add (job);
diff --git
a/src/wx/export_video_file_dialog.cc
b/src/wx/export_video_file_dialog.cc
index 2dc452622e3f34c8206c23bada3886a7a5783c1e..5e5e9c4ff441aaf3dfd3b2943c1f787dd5897b4d 100644
(file)
--- 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 formats[] = {
- ExportFormat::PRORES,
+ ExportFormat::PRORES
_HQ
,
ExportFormat::H264_AAC,
};
ExportFormat::H264_AAC,
};
diff --git
a/test/ffmpeg_encoder_test.cc
b/test/ffmpeg_encoder_test.cc
index 097ef86e720f9f9762efe03834ba1885a2bc6a9b..ff730ad53354a904a8aabf9894a8bf48e16500a1 100644
(file)
--- 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;
name += "h264";
extension = "mp4";
break;
- case ExportFormat::PRORES:
+ case ExportFormat::PRORES
_HQ
:
name += "prores";
extension = "mov";
break;
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)
{
/** 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)
{
}
/** 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)
{
}
/** 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)
{
}
/** 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<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
film->write_metadata ();
auto job = make_shared<TranscodeJob>(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 ();
}
encoder.go ();
}
@@
-149,7
+149,7
@@
BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test6)
film->write_metadata();
auto job = make_shared<TranscodeJob> (film, TranscodeJob::ChangedBehaviour::IGNORE);
film->write_metadata();
auto job = make_shared<TranscodeJob> (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 ();
}
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<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
s->only_text()->set_effect_colour (dcp::Colour (0, 255, 255));
auto job = make_shared<TranscodeJob>(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 ();
}
encoder.go ();
}
@@
-410,7
+410,7
@@
BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_from_dcp_with_crop)
film->write_metadata ();
auto job = make_shared<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
film->write_metadata ();
auto job = make_shared<TranscodeJob>(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 ();
}
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<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
auto film = new_test_film2 ("ffmpeg_encoder_prores_regression_1", { content });
auto job = make_shared<TranscodeJob>(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 ();
}
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<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
auto film = new_test_film2 ("ffmpeg_encoder_prores_regression_2", { content });
auto job = make_shared<TranscodeJob>(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);
encoder.go ();
dcpomatic_log->set_types(logs);
diff --git
a/test/video_level_test.cc
b/test/video_level_test.cc
index 4483e22d529b7b672f5ea6c0f6c7480e375e2303..fd221468499728646f6cafc6d4ebf8f2e0bc536e 100644
(file)
--- a/
test/video_level_test.cc
+++ b/
test/video_level_test.cc
@@
-408,7
+408,7
@@
V_movie_range (shared_ptr<Film> film)
{
auto job = make_shared<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
job->set_encoder (
{
auto job = make_shared<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
job->set_encoder (
- make_shared<FFmpegEncoder>(film, job, film->file("export.mov"), ExportFormat::PRORES, true, false, false, 23)
+ make_shared<FFmpegEncoder>(film, job, film->file("export.mov"), ExportFormat::PRORES
_HQ
, true, false, false, 23)
);
JobManager::instance()->add (job);
BOOST_REQUIRE (!wait_for_jobs());
);
JobManager::instance()->add (job);
BOOST_REQUIRE (!wait_for_jobs());