projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stop using static initialisation so that dcpomatic::write() can be called more than...
[dcpomatic.git]
/
src
/
lib
/
dcp_examiner.cc
diff --git
a/src/lib/dcp_examiner.cc
b/src/lib/dcp_examiner.cc
index e290a966a9b4f58e3c115bea9bed222153d91200..f2ec68bddd8786a9a73f6258dc8d757c8600b50b 100644
(file)
--- a/
src/lib/dcp_examiner.cc
+++ b/
src/lib/dcp_examiner.cc
@@
-19,32
+19,34
@@
*/
*/
-#include "
dcp_examiner
.h"
+#include "
config
.h"
#include "dcp_content.h"
#include "dcp_content.h"
+#include "dcp_examiner.h"
+#include "dcpomatic_log.h"
#include "exceptions.h"
#include "image.h"
#include "exceptions.h"
#include "image.h"
-#include "config.h"
#include "util.h"
#include "util.h"
+#include <dcp/cpl.h>
#include <dcp/dcp.h>
#include <dcp/decrypted_kdm.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/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_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_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/search.h>
+#include <dcp/sound_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"
#include <iostream>
#include "i18n.h"
@@
-58,7
+60,6
@@
using boost::optional;
DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
- : DCP (content, tolerant)
{
shared_ptr<dcp::CPL> cpl;
{
shared_ptr<dcp::CPL> cpl;
@@
-66,9
+67,11
@@
DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
_text_count[i] = 0;
}
_text_count[i] = 0;
}
+ auto cpls = dcp::find_and_resolve_cpls (content->directories(), tolerant);
+
if (content->cpl ()) {
/* Use the CPL that the content was using before */
if (content->cpl ()) {
/* Use the CPL that the content was using before */
- for (auto i: cpls
()
) {
+ for (auto i: cpls) {
if (i->id() == content->cpl().get()) {
cpl = i;
}
if (i->id() == content->cpl().get()) {
cpl = i;
}
@@
-78,7
+81,7
@@
DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
int least_unsatisfied = INT_MAX;
int least_unsatisfied = INT_MAX;
- for (auto i: cpls
()
) {
+ for (auto i: cpls) {
int unsatisfied = 0;
for (auto j: i->reels()) {
if (j->main_picture() && !j->main_picture()->asset_ref().resolved()) {
int unsatisfied = 0;
for (auto j: i->reels()) {
if (j->main_picture() && !j->main_picture()->asset_ref().resolved()) {
@@
-106,10
+109,16
@@
DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
throw DCPError ("No CPLs found in DCP");
}
throw DCPError ("No CPLs found in DCP");
}
+ if (content->kdm()) {
+ cpl->add (decrypt_kdm_with_helpful_error(content->kdm().get()));
+ }
+
_cpl = cpl->id ();
_name = cpl->content_title_text ();
_content_kind = cpl->content_kind ();
_cpl = cpl->id ();
_name = cpl->content_title_text ();
_content_kind = cpl->content_kind ();
+ LOG_GENERAL ("Selected CPL %1", _cpl);
+
auto try_to_parse_language = [](optional<string> lang) -> boost::optional<dcp::LanguageTag> {
try {
if (lang) {
auto try_to_parse_language = [](optional<string> lang) -> boost::optional<dcp::LanguageTag> {
try {
if (lang) {
@@
-119,15
+128,21
@@
DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
return boost::none;
};
return boost::none;
};
+ LOG_GENERAL ("Looking at %1 reels", cpl->reels().size());
+
for (auto i: cpl->reels()) {
for (auto i: cpl->reels()) {
+ LOG_GENERAL ("Reel %1", i->id());
if (i->main_picture ()) {
if (!i->main_picture()->asset_ref().resolved()) {
/* We are missing this asset so we can't continue; examination will be repeated later */
_needs_assets = true;
if (i->main_picture ()) {
if (!i->main_picture()->asset_ref().resolved()) {
/* We are missing this asset so we can't continue; examination will be repeated later */
_needs_assets = true;
+ LOG_GENERAL ("Main picture %1 of reel %2 is missing", i->main_picture()->id(), i->id());
return;
}
return;
}
+ LOG_GENERAL ("Main picture %1 of reel %2 found", i->main_picture()->id(), i->id());
+
auto const frac = i->main_picture()->edit_rate ();
float const fr = float(frac.numerator) / frac.denominator;
if (!_video_frame_rate) {
auto const frac = i->main_picture()->edit_rate ();
float const fr = float(frac.numerator) / frac.denominator;
if (!_video_frame_rate) {
@@
-151,9
+166,12
@@
DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
if (!i->main_sound()->asset_ref().resolved()) {
/* We are missing this asset so we can't continue; examination will be repeated later */
_needs_assets = true;
if (!i->main_sound()->asset_ref().resolved()) {
/* We are missing this asset so we can't continue; examination will be repeated later */
_needs_assets = true;
+ LOG_GENERAL ("Main sound %1 of reel %2 is missing", i->main_sound()->id(), i->id());
return;
}
return;
}
+ LOG_GENERAL ("Main sound %1 of reel %2 found", i->main_sound()->id(), i->id());
+
_has_audio = true;
auto asset = i->main_sound()->asset();
_has_audio = true;
auto asset = i->main_sound()->asset();
@@
-177,9
+195,12
@@
DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
if (!i->main_subtitle()->asset_ref().resolved()) {
/* We are missing this asset so we can't continue; examination will be repeated later */
_needs_assets = true;
if (!i->main_subtitle()->asset_ref().resolved()) {
/* We are missing this asset so we can't continue; examination will be repeated later */
_needs_assets = true;
+ LOG_GENERAL ("Main subtitle %1 of reel %2 is missing", i->main_subtitle()->id(), i->id());
return;
}
return;
}
+ LOG_GENERAL ("Main subtitle %1 of reel %2 found", i->main_subtitle()->id(), i->id());
+
_text_count[static_cast<int>(TextType::OPEN_SUBTITLE)] = 1;
_open_subtitle_language = try_to_parse_language (i->main_subtitle()->language());
}
_text_count[static_cast<int>(TextType::OPEN_SUBTITLE)] = 1;
_open_subtitle_language = try_to_parse_language (i->main_subtitle()->language());
}
@@
-188,11
+209,14
@@
DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
if (!j->asset_ref().resolved()) {
/* We are missing this asset so we can't continue; examination will be repeated later */
_needs_assets = true;
if (!j->asset_ref().resolved()) {
/* We are missing this asset so we can't continue; examination will be repeated later */
_needs_assets = true;
+ LOG_GENERAL ("Closed caption %1 of reel %2 is missing", j->id(), i->id());
return;
}
return;
}
+ LOG_GENERAL ("Closed caption %1 of reel %2 found", j->id(), i->id());
+
_text_count[static_cast<int>(TextType::CLOSED_CAPTION)]++;
_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 ()) {
}
if (i->main_markers ()) {
@@
-225,6
+249,8
@@
DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
_encrypted = cpl->any_encrypted ();
_kdm_valid = true;
_encrypted = cpl->any_encrypted ();
_kdm_valid = true;
+ LOG_GENERAL_NC ("Check that everything encrypted has a key");
+
/* Check first that anything encrypted has a key. We must do this, as if we try to
* read encrypted data with asdcplib without even offering a key it will just return
* the encrypted data. Secondly, check that we can read the first thing from each
/* Check first that anything encrypted has a key. We must do this, as if we try to
* read encrypted data with asdcplib without even offering a key it will just return
* the encrypted data. Secondly, check that we can read the first thing from each
@@
-232,9
+258,12
@@
DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
*/
try {
for (auto i: cpl->reels()) {
*/
try {
for (auto i: cpl->reels()) {
+ LOG_GENERAL ("Reel %1", i->id());
auto pic = i->main_picture()->asset();
if (pic->encrypted() && !pic->key()) {
_kdm_valid = false;
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 mono = dynamic_pointer_cast<dcp::MonoPictureAsset>(pic);
auto stereo = dynamic_pointer_cast<dcp::StereoPictureAsset>(pic);
@@
-253,6
+282,8
@@
DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
auto sound = i->main_sound()->asset ();
if (sound->encrypted() && !sound->key()) {
_kdm_valid = false;
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 reader = i->main_sound()->asset()->start_read();
reader->set_check_hmac (false);
@@
-264,6
+295,8
@@
DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
auto mxf_sub = dynamic_pointer_cast<dcp::MXF>(sub);
if (mxf_sub && mxf_sub->encrypted() && !mxf_sub->key()) {
_kdm_valid = 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 ();
}
}
sub->subtitles ();
}
@@
-272,6
+305,8
@@
DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
auto atmos = i->atmos()->asset();
if (atmos->encrypted() && !atmos->key()) {
_kdm_valid = false;
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);
}
auto reader = atmos->start_read();
reader->set_check_hmac (false);
@@
-280,8
+315,10
@@
DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
}
} catch (dcp::ReadError& e) {
_kdm_valid = false;
}
} catch (dcp::ReadError& e) {
_kdm_valid = false;
+ LOG_GENERAL ("KDM is invalid: %1", e.what());
} catch (dcp::MiscError& e) {
_kdm_valid = false;
} catch (dcp::MiscError& e) {
_kdm_valid = false;
+ LOG_GENERAL ("KDM is invalid: %1", e.what());
}
_standard = cpl->standard();
}
_standard = cpl->standard();