projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix video scaling when the video needs rotation (#2791).
[dcpomatic.git]
/
src
/
lib
/
export_config.cc
diff --git
a/src/lib/export_config.cc
b/src/lib/export_config.cc
index 6c98079353e68ff6bdc103aa4d2a234d2030dccd..e030b98e26ceeed3c8d6c2fc6fd7c02e57048cb7 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;
@@
-63,8
+63,10
@@
ExportConfig::read(cxml::ConstNodePtr node)
_format = ExportFormat::SUBTITLES_DCP;
} else if (format == "h264-aac") {
_format = ExportFormat::H264_AAC;
_format = ExportFormat::SUBTITLES_DCP;
} else if (format == "h264-aac") {
_format = ExportFormat::H264_AAC;
+ } else if (format == "prores-4444") {
+ _format = ExportFormat::PRORES_4444;
} else {
} else {
- _format = ExportFormat::PRORES;
+ _format = ExportFormat::PRORES
_HQ
;
}
_mixdown_to_stereo = node->bool_child("MixdownToStereo");
}
_mixdown_to_stereo = node->bool_child("MixdownToStereo");
@@
-80,8
+82,12
@@
ExportConfig::write(xmlpp::Element* node) const
string name;
switch (_format) {
string name;
switch (_format) {
- case ExportFormat::PRORES:
- name = "prores";
+ case ExportFormat::PRORES_4444:
+ name = "prores-4444";
+ break;
+ case ExportFormat::PRORES_HQ:
+ /* Write this but we also accept 'prores' for backwards compatibility */
+ name = "prores-hq";
break;
case ExportFormat::H264_AAC:
name = "h264-aac";
break;
case ExportFormat::H264_AAC:
name = "h264-aac";