# Use distro-provided FFmpeg on Arch
deps = []
- deps.append(('libdcp', 'v1.8.65'))
+ deps.append(('libdcp', 'v1.8.66'))
deps.append(('libsub', 'v1.6.44'))
deps.append(('leqm-nrt', '4560105773c66ac9216b62313a24093bb0a027ae'))
deps.append(('rtaudio', 'f619b76'))
#include "audio_mapping.h"
#include "compose.hpp"
#include "config.h"
+#include "constants.h"
#include "cross.h"
#include "dcp_content_type.h"
#include "dcp_video.h"
field = dcp::MCASoundField::SEVEN_POINT_ONE;
}
- dcp::MainSoundConfiguration msc (field, film()->audio_channels());
+ dcp::MainSoundConfiguration msc(field, MAX_DCP_AUDIO_CHANNELS);
for (auto i: film()->mapped_audio_channels()) {
- if (static_cast<int>(i) < film()->audio_channels()) {
- msc.set_mapping (i, static_cast<dcp::Channel>(i));
- }
+ msc.set_mapping(i, static_cast<dcp::Channel>(i));
}
- cpl->set_main_sound_configuration (msc.to_string());
+ cpl->set_main_sound_configuration(msc);
cpl->set_main_sound_sample_rate (film()->audio_frame_rate());
cpl->set_main_picture_stored_area (film()->frame_size());
case dcp::VerificationNote::Code::INVALID_SUBTITLE_ISSUE_DATE:
add(i, _("<IssueDate> has an invalid value %n"));
break;
+ case dcp::VerificationNote::Code::MISMATCHED_SOUND_CHANNEL_COUNTS:
+ add(i, _("Sound assets do not all have the same channel count."));
+ break;
+ case dcp::VerificationNote::Code::INVALID_MAIN_SOUND_CONFIGURATION:
+ add(i, _("<MainSoundConfiguration> describes incorrect number of channels (%n)"));
+ break;
}
}
from waflib import Logs, Context
APPNAME = 'dcpomatic'
-libdcp_version = '1.8.55'
+libdcp_version = '1.8.66'
libsub_version = '1.6.42'
this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0]