summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-06-12 21:44:53 +0200
committerCarl Hetherington <cth@carlh.net>2022-06-12 21:44:53 +0200
commit59209af1e2d73334ff7dfe6c7da465293dc24c0b (patch)
treed82ac343b7ca27cb493d1458dda85bb15d6c4e23 /src
parent407b3f5a4696d1c2f77e6167bca10f880b168f9c (diff)
Rename PRORES -> PRORES_HQ
Diffstat (limited to 'src')
-rw-r--r--src/lib/export_config.cc6
-rw-r--r--src/lib/ffmpeg_file_encoder.cc4
-rw-r--r--src/lib/ffmpeg_file_encoder.h2
-rw-r--r--src/tools/dcpomatic_cli.cc2
-rw-r--r--src/wx/export_video_file_dialog.cc2
5 files changed, 8 insertions, 8 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<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);
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,
};