diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-06-12 21:44:53 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-06-12 21:44:53 +0200 |
| commit | 59209af1e2d73334ff7dfe6c7da465293dc24c0b (patch) | |
| tree | d82ac343b7ca27cb493d1458dda85bb15d6c4e23 /src/lib | |
| parent | 407b3f5a4696d1c2f77e6167bca10f880b168f9c (diff) | |
Rename PRORES -> PRORES_HQ
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/export_config.cc | 6 | ||||
| -rw-r--r-- | src/lib/ffmpeg_file_encoder.cc | 4 | ||||
| -rw-r--r-- | src/lib/ffmpeg_file_encoder.h | 2 |
3 files changed, 6 insertions, 6 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 }; |