diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/verify.cc | 7 | ||||
| -rw-r--r-- | src/verify.h | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/verify.cc b/src/verify.cc index 432d5b1f..0c993fd5 100644 --- a/src/verify.cc +++ b/src/verify.cc @@ -1670,10 +1670,7 @@ verify_cpl(Context& context, shared_ptr<const CPL> cpl) } if (main_picture_active_area && active_area_ok) { - context.add_note( - VerificationNote::Code::VALID_MAIN_PICTURE_ACTIVE_AREA, String::compose("%1x%2", main_picture_active_area->width, main_picture_active_area->height), - cpl->file().get() - ); + context.add_note(VerificationNote(VerificationNote::Code::VALID_MAIN_PICTURE_ACTIVE_AREA, cpl->file().get()).set_size_in_pixels(*main_picture_active_area)); } int64_t frame = 0; @@ -2180,7 +2177,7 @@ dcp::note_to_string(VerificationNote note, function<string (string)> process_str case VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA: return compose("<MainPictureActiveaArea> has an invalid value: %1", *note.error()); case VerificationNote::Code::VALID_MAIN_PICTURE_ACTIVE_AREA: - return compose("<MainPictureActiveaArea> %1 is valid", note.note().get()); + return compose("<MainPictureActiveaArea> %1x%2 is valid", note.size_in_pixels()->width, note.size_in_pixels()->height); case VerificationNote::Code::DUPLICATE_ASSET_ID_IN_PKL: return compose("The PKL %1 has more than one asset with the same ID.", note.note().get()); case VerificationNote::Code::DUPLICATE_ASSET_ID_IN_ASSETMAP: diff --git a/src/verify.h b/src/verify.h index 4425a0c2..6d93384a 100644 --- a/src/verify.h +++ b/src/verify.h @@ -505,7 +505,9 @@ public: * reel_index contains the reel index (starting from 0) */ INVALID_MAIN_PICTURE_ACTIVE_AREA, - /** A valid _<MainPictureActiveArea>_ was seen */ + /** A valid _<MainPictureActiveArea>_ was seen + * size_in_pixels contains the valid active area + */ VALID_MAIN_PICTURE_ACTIVE_AREA, /** A PKL has more than one asset with the same ID * note contains the PKL ID |