*/
-#include "dcp_examiner.h"
+#include "config.h"
#include "dcp_content.h"
+#include "dcp_examiner.h"
#include "dcpomatic_log.h"
#include "exceptions.h"
#include "image.h"
-#include "config.h"
#include "util.h"
+#include <dcp/cpl.h>
#include <dcp/dcp.h>
#include <dcp/decrypted_kdm.h>
-#include <dcp/cpl.h>
-#include <dcp/reel.h>
-#include <dcp/reel_picture_asset.h>
-#include <dcp/reel_sound_asset.h>
#include <dcp/mono_picture_asset.h>
#include <dcp/mono_picture_asset_reader.h>
#include <dcp/mono_picture_frame.h>
-#include <dcp/stereo_picture_asset.h>
-#include <dcp/stereo_picture_asset_reader.h>
-#include <dcp/stereo_picture_frame.h>
-#include <dcp/sound_asset.h>
-#include <dcp/sound_asset_reader.h>
-#include <dcp/subtitle_asset.h>
+#include <dcp/reel.h>
#include <dcp/reel_atmos_asset.h>
-#include <dcp/reel_subtitle_asset.h>
#include <dcp/reel_closed_caption_asset.h>
#include <dcp/reel_markers_asset.h>
+#include <dcp/reel_picture_asset.h>
+#include <dcp/reel_sound_asset.h>
+#include <dcp/reel_subtitle_asset.h>
#include <dcp/sound_asset.h>
+#include <dcp/sound_asset.h>
+#include <dcp/sound_asset_reader.h>
+#include <dcp/stereo_picture_asset.h>
+#include <dcp/stereo_picture_asset_reader.h>
+#include <dcp/stereo_picture_frame.h>
+#include <dcp/subtitle_asset.h>
#include <iostream>
#include "i18n.h"
LOG_GENERAL ("Closed caption %1 of reel %2 found", j->id(), i->id());
_text_count[static_cast<int>(TextType::CLOSED_CAPTION)]++;
- _dcp_text_tracks.push_back (DCPTextTrack(j->annotation_text(), try_to_parse_language(j->language())));
+ _dcp_text_tracks.push_back (DCPTextTrack(j->annotation_text().get_value_or(""), try_to_parse_language(j->language())));
}
if (i->main_markers ()) {
auto pic = i->main_picture()->asset();
if (pic->encrypted() && !pic->key()) {
_kdm_valid = false;
+ LOG_GENERAL_NC ("Picture has no key");
+ break;
}
auto mono = dynamic_pointer_cast<dcp::MonoPictureAsset>(pic);
auto stereo = dynamic_pointer_cast<dcp::StereoPictureAsset>(pic);
auto sound = i->main_sound()->asset ();
if (sound->encrypted() && !sound->key()) {
_kdm_valid = false;
+ LOG_GENERAL_NC ("Sound has no key");
+ break;
}
auto reader = i->main_sound()->asset()->start_read();
reader->set_check_hmac (false);
auto mxf_sub = dynamic_pointer_cast<dcp::MXF>(sub);
if (mxf_sub && mxf_sub->encrypted() && !mxf_sub->key()) {
_kdm_valid = false;
+ LOG_GENERAL_NC ("Subtitle has no key");
+ break;
}
sub->subtitles ();
}
auto atmos = i->atmos()->asset();
if (atmos->encrypted() && !atmos->key()) {
_kdm_valid = false;
+ LOG_GENERAL_NC ("ATMOS sound has no key");
+ break;
}
auto reader = atmos->start_read();
reader->set_check_hmac (false);
}
} catch (dcp::ReadError& e) {
_kdm_valid = false;
+ LOG_GENERAL ("KDM is invalid: %1", e.what());
} catch (dcp::MiscError& e) {
_kdm_valid = false;
+ LOG_GENERAL ("KDM is invalid: %1", e.what());
}
_standard = cpl->standard();