#include "j2k.h"
#include "reel.h"
#include "reel_mono_picture_asset.h"
+#include "reel_sound_asset.h"
#include "cpl.h"
#include "dcp.h"
#include "openjpeg_image.h"
#include "mono_picture_asset.h"
+#include "stereo_picture_asset.h"
#include "mono_picture_asset_writer.h"
#include "interop_subtitle_asset.h"
#include "smpte_subtitle_asset.h"
+#include "reel_closed_caption_asset.h"
+#include "reel_stereo_picture_asset.h"
#include "reel_subtitle_asset.h"
#include "compose.hpp"
#include "test.h"
using std::vector;
using std::make_pair;
using boost::optional;
-using boost::shared_ptr;
+using std::shared_ptr;
static list<pair<string, optional<boost::filesystem::path> > > stages;
}
+static void
+prepare_directory (boost::filesystem::path path)
+{
+ using namespace boost::filesystem;
+ remove_all (path);
+ create_directories (path);
+}
+
+
static vector<boost::filesystem::path>
setup (int reference_number, int verify_test_number)
{
- boost::filesystem::remove_all (dcp::String::compose("build/test/verify_test%1", verify_test_number));
- boost::filesystem::create_directory (dcp::String::compose("build/test/verify_test%1", verify_test_number));
+ prepare_directory (dcp::String::compose("build/test/verify_test%1", verify_test_number));
for (boost::filesystem::directory_iterator i(dcp::String::compose("test/ref/DCP/dcp_test%1", reference_number)); i != boost::filesystem::directory_iterator(); ++i) {
boost::filesystem::copy_file (i->path(), dcp::String::compose("build/test/verify_test%1", verify_test_number) / i->path().filename());
}
std::string _content;
};
+
static
void
dump_notes (list<dcp::VerificationNote> const & notes)
list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, xsd_test);
boost::filesystem::path const cpl_file = "build/test/verify_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml";
- boost::filesystem::path const pkl_file = "build/test/verify_test1/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml";
+ boost::filesystem::path const pkl_file = "build/test/verify_test1/pkl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml";
boost::filesystem::path const assetmap_file = "build/test/verify_test1/ASSETMAP.xml";
list<pair<string, optional<boost::filesystem::path> > >::const_iterator st = stages.begin();
BOOST_REQUIRE (st->second);
BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test1/audio.mxf"));
++st;
+ BOOST_CHECK_EQUAL (st->first, "Checking sound asset metadata");
+ BOOST_REQUIRE (st->second);
+ BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test1/audio.mxf"));
+ ++st;
BOOST_CHECK_EQUAL (st->first, "Checking PKL");
BOOST_REQUIRE (st->second);
BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(pkl_file));
++st;
BOOST_REQUIRE (st == stages.end());
- dump_notes (notes);
-
BOOST_CHECK_EQUAL (notes.size(), 0);
}
mod = fopen("build/test/verify_test2/audio.mxf", "r+b");
BOOST_REQUIRE (mod);
- fseek (mod, 4096, SEEK_SET);
+ BOOST_REQUIRE_EQUAL (fseek(mod, -64, SEEK_END), 0);
BOOST_REQUIRE (fwrite (&x, sizeof(x), 1, mod) == 1);
fclose (mod);
- list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, xsd_test);
+ list<dcp::VerificationNote> notes;
+ {
+ dcp::ASDCPErrorSuspender sus;
+ notes = dcp::verify (directories, &stage, &progress, xsd_test);
+ }
BOOST_REQUIRE_EQUAL (notes.size(), 2);
BOOST_CHECK_EQUAL (notes.front().type(), dcp::VerificationNote::VERIFY_ERROR);
vector<boost::filesystem::path> directories = setup (1, 3);
{
- Editor e ("build/test/verify_test3/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml");
+ Editor e ("build/test/verify_test3/pkl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml");
e.replace ("<Hash>", "<Hash>x");
}
list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, xsd_test);
- dump_notes (notes);
-
BOOST_REQUIRE_EQUAL (notes.size(), 6);
list<dcp::VerificationNote>::const_iterator i = notes.begin();
BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_ERROR);
BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::CPL_HASH_INCORRECT);
++i;
BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_ERROR);
- BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::PKL_CPL_PICTURE_HASHES_DISAGREE);
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::PKL_CPL_PICTURE_HASHES_DIFFER);
++i;
BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_ERROR);
- BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::PKL_CPL_SOUND_HASHES_DISAGREE);
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::PKL_CPL_SOUND_HASHES_DIFFER);
++i;
BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_ERROR);
BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::XML_VALIDATION_ERROR);
boost::filesystem::path
pkl (int n)
{
- return dcp::String::compose("build/test/verify_test%1/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml", n);
+ return dcp::String::compose("build/test/verify_test%1/pkl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml", n);
}
static
list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, xsd_test);
- dump_notes (notes);
-
BOOST_REQUIRE_EQUAL (notes.size(), 1);
BOOST_CHECK_EQUAL (notes.front().code(), code1);
}
list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, xsd_test);
- dump_notes (notes);
-
BOOST_REQUIRE_EQUAL (notes.size(), 2);
BOOST_CHECK_EQUAL (notes.front().code(), code1);
BOOST_CHECK_EQUAL (notes.back().code(), code2);
list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, xsd_test);
- dump_notes (notes);
-
BOOST_REQUIRE_EQUAL (notes.size(), 3);
list<dcp::VerificationNote>::const_iterator i = notes.begin ();
BOOST_CHECK_EQUAL (i->code(), code1);
{
check_after_replace (
11, &pkl,
- "<Id>urn:uuid:18b", "<Id>urn:uuid:x8b",
+ "<Id>urn:uuid:cd4", "<Id>urn:uuid:xd4",
dcp::VerificationNote::XML_VALIDATION_ERROR
);
}
{
check_after_replace (
12, &asset_map,
- "<Id>urn:uuid:ae8", "<Id>urn:uuid:xe8",
+ "<Id>urn:uuid:63c", "<Id>urn:uuid:x3c",
dcp::VerificationNote::XML_VALIDATION_ERROR
);
}
BOOST_REQUIRE (st->second);
BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test13/pcm_69cf9eaf-9a99-4776-b022-6902208626c3.mxf"));
++st;
+ BOOST_CHECK_EQUAL (st->first, "Checking sound asset metadata");
+ BOOST_REQUIRE (st->second);
+ BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test13/pcm_69cf9eaf-9a99-4776-b022-6902208626c3.mxf"));
+ ++st;
BOOST_CHECK_EQUAL (st->first, "Checking PKL");
BOOST_REQUIRE (st->second);
BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(pkl_file));
++st;
BOOST_REQUIRE (st == stages.end());
- dump_notes (notes);
-
- BOOST_CHECK_EQUAL (notes.size(), 0);
+ BOOST_REQUIRE_EQUAL (notes.size(), 1U);
+ list<dcp::VerificationNote>::const_iterator i = notes.begin ();
+ BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_BV21_ERROR);
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::NOT_SMPTE);
}
/* DCP with a short asset */
vector<boost::filesystem::path> directories = setup (8, 14);
list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, xsd_test);
- dump_notes (notes);
-
- BOOST_REQUIRE_EQUAL (notes.size(), 4);
+ BOOST_REQUIRE_EQUAL (notes.size(), 5);
list<dcp::VerificationNote>::const_iterator i = notes.begin ();
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::NOT_SMPTE);
+ ++i;
BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::DURATION_TOO_SMALL);
++i;
BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::INTRINSIC_DURATION_TOO_SMALL);
}
-static
-shared_ptr<dcp::OpenJPEGImage>
-black_image ()
-{
- shared_ptr<dcp::OpenJPEGImage> image(new dcp::OpenJPEGImage(dcp::Size(1998, 1080)));
- int const pixels = 1998 * 1080;
- for (int i = 0; i < 3; ++i) {
- memset (image->data(i), 0, pixels * sizeof(int));
- }
- return image;
-}
-
-
static
void
-dcp_from_frame (dcp::Data const& frame, boost::filesystem::path dir)
+dcp_from_frame (dcp::ArrayData const& frame, boost::filesystem::path dir)
{
shared_ptr<dcp::MonoPictureAsset> asset(new dcp::MonoPictureAsset(dcp::Fraction(24, 1), dcp::SMPTE));
boost::filesystem::create_directories (dir);
shared_ptr<dcp::PictureAssetWriter> writer = asset->start_write (dir / "pic.mxf", true);
for (int i = 0; i < 24; ++i) {
- writer->write (frame.data().get(), frame.size());
+ writer->write (frame.data(), frame.size());
}
writer->finalize ();
/* Compress a black image */
shared_ptr<dcp::OpenJPEGImage> image = black_image ();
- dcp::Data frame = dcp::compress_j2k (image, 100000000, 24, false, false);
+ dcp::ArrayData frame = dcp::compress_j2k (image, 100000000, 24, false, false);
BOOST_REQUIRE (frame.size() < too_big);
/* Place it in a bigger block with some zero padding at the end */
- dcp::Data oversized_frame(too_big);
- memcpy (oversized_frame.data().get(), frame.data().get(), frame.size());
- memset (oversized_frame.data().get() + frame.size(), 0, too_big - frame.size());
+ dcp::ArrayData oversized_frame(too_big);
+ memcpy (oversized_frame.data(), frame.data(), frame.size());
+ memset (oversized_frame.data() + frame.size(), 0, too_big - frame.size());
boost::filesystem::path const dir("build/test/verify_test15");
boost::filesystem::remove_all (dir);
dirs.push_back (dir);
list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
BOOST_REQUIRE_EQUAL (notes.size(), 1);
- BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::PICTURE_FRAME_TOO_LARGE);
+ BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::PICTURE_FRAME_TOO_LARGE_IN_BYTES);
}
/* Compress a black image */
shared_ptr<dcp::OpenJPEGImage> image = black_image ();
- dcp::Data frame = dcp::compress_j2k (image, 100000000, 24, false, false);
+ dcp::ArrayData frame = dcp::compress_j2k (image, 100000000, 24, false, false);
BOOST_REQUIRE (frame.size() < nearly_too_big);
/* Place it in a bigger block with some zero padding at the end */
- dcp::Data oversized_frame(nearly_too_big);
- memcpy (oversized_frame.data().get(), frame.data().get(), frame.size());
- memset (oversized_frame.data().get() + frame.size(), 0, nearly_too_big - frame.size());
+ dcp::ArrayData oversized_frame(nearly_too_big);
+ memcpy (oversized_frame.data(), frame.data(), frame.size());
+ memset (oversized_frame.data() + frame.size(), 0, nearly_too_big - frame.size());
boost::filesystem::path const dir("build/test/verify_test16");
boost::filesystem::remove_all (dir);
dirs.push_back (dir);
list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
BOOST_REQUIRE_EQUAL (notes.size(), 1);
- BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::PICTURE_FRAME_NEARLY_TOO_LARGE);
+ BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::PICTURE_FRAME_NEARLY_TOO_LARGE_IN_BYTES);
}
{
/* Compress a black image */
shared_ptr<dcp::OpenJPEGImage> image = black_image ();
- dcp::Data frame = dcp::compress_j2k (image, 100000000, 24, false, false);
+ dcp::ArrayData frame = dcp::compress_j2k (image, 100000000, 24, false, false);
BOOST_REQUIRE (frame.size() < 230000000 / (24 * 8));
boost::filesystem::path const dir("build/test/verify_test17");
BOOST_AUTO_TEST_CASE (verify_test18)
{
boost::filesystem::path const dir("build/test/verify_test18");
- boost::filesystem::remove_all (dir);
- boost::filesystem::create_directories (dir);
+ prepare_directory (dir);
boost::filesystem::copy_file ("test/data/subs1.xml", dir / "subs.xml");
shared_ptr<dcp::InteropSubtitleAsset> asset(new dcp::InteropSubtitleAsset(dir / "subs.xml"));
shared_ptr<dcp::ReelAsset> reel_asset(new dcp::ReelSubtitleAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0));
vector<boost::filesystem::path> dirs;
dirs.push_back (dir);
list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
- BOOST_REQUIRE_EQUAL (notes.size(), 0);
+ BOOST_REQUIRE_EQUAL (notes.size(), 1U);
+ list<dcp::VerificationNote>::const_iterator i = notes.begin ();
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::NOT_SMPTE);
}
BOOST_AUTO_TEST_CASE (verify_test19)
{
boost::filesystem::path const dir("build/test/verify_test19");
- boost::filesystem::remove_all (dir);
- boost::filesystem::create_directories (dir);
+ prepare_directory (dir);
boost::filesystem::copy_file ("test/data/subs1.xml", dir / "subs.xml");
shared_ptr<dcp::InteropSubtitleAsset> asset(new dcp::InteropSubtitleAsset(dir / "subs.xml"));
shared_ptr<dcp::ReelAsset> reel_asset(new dcp::ReelSubtitleAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0));
vector<boost::filesystem::path> dirs;
dirs.push_back (dir);
list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
- dump_notes(notes);
- BOOST_REQUIRE_EQUAL (notes.size(), 2);
- BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::XML_VALIDATION_ERROR);
- BOOST_CHECK_EQUAL (notes.back().code(), dcp::VerificationNote::XML_VALIDATION_ERROR);
+ BOOST_REQUIRE_EQUAL (notes.size(), 3);
+ list<dcp::VerificationNote>::const_iterator i = notes.begin ();
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::NOT_SMPTE);
+ ++i;
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::XML_VALIDATION_ERROR);
+ ++i;
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::XML_VALIDATION_ERROR);
+ ++i;
}
BOOST_AUTO_TEST_CASE (verify_test20)
{
boost::filesystem::path const dir("build/test/verify_test20");
- boost::filesystem::remove_all (dir);
- boost::filesystem::create_directories (dir);
+ prepare_directory (dir);
boost::filesystem::copy_file ("test/data/subs.mxf", dir / "subs.mxf");
shared_ptr<dcp::SMPTESubtitleAsset> asset(new dcp::SMPTESubtitleAsset(dir / "subs.mxf"));
shared_ptr<dcp::ReelAsset> reel_asset(new dcp::ReelSubtitleAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0));
BOOST_AUTO_TEST_CASE (verify_test21)
{
boost::filesystem::path const dir("build/test/verify_test21");
- boost::filesystem::remove_all (dir);
- boost::filesystem::create_directories (dir);
+ prepare_directory (dir);
boost::filesystem::copy_file ("test/data/broken_smpte.mxf", dir / "subs.mxf");
shared_ptr<dcp::SMPTESubtitleAsset> asset(new dcp::SMPTESubtitleAsset(dir / "subs.mxf"));
shared_ptr<dcp::ReelAsset> reel_asset(new dcp::ReelSubtitleAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0));
vector<boost::filesystem::path> dirs;
dirs.push_back (dir);
list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
- dump_notes (notes);
BOOST_REQUIRE_EQUAL (notes.size(), 2);
BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::XML_VALIDATION_ERROR);
BOOST_CHECK_EQUAL (notes.back().code(), dcp::VerificationNote::XML_VALIDATION_ERROR);
BOOST_AUTO_TEST_CASE (verify_test22)
{
boost::filesystem::path const ov_dir("build/test/verify_test22_ov");
- boost::filesystem::remove_all (ov_dir);
- boost::filesystem::create_directories (ov_dir);
+ prepare_directory (ov_dir);
shared_ptr<dcp::OpenJPEGImage> image = black_image ();
- dcp::Data frame = dcp::compress_j2k (image, 100000000, 24, false, false);
+ dcp::ArrayData frame = dcp::compress_j2k (image, 100000000, 24, false, false);
BOOST_REQUIRE (frame.size() < 230000000 / (24 * 8));
dcp_from_frame (frame, ov_dir);
ov.read ();
boost::filesystem::path const vf_dir("build/test/verify_test22_vf");
- boost::filesystem::remove_all (vf_dir);
- boost::filesystem::create_directories (vf_dir);
+ prepare_directory (vf_dir);
shared_ptr<dcp::Reel> reel(new dcp::Reel());
reel->add (ov.cpls().front()->reels().front()->main_picture());
vector<boost::filesystem::path> dirs;
dirs.push_back (vf_dir);
list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
- dump_notes (notes);
BOOST_REQUIRE_EQUAL (notes.size(), 1);
BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::EXTERNAL_ASSET);
}
+/* DCP with valid CompositionMetadataAsset */
+BOOST_AUTO_TEST_CASE (verify_test23)
+{
+ boost::filesystem::path const dir("build/test/verify_test23");
+ prepare_directory (dir);
+
+ boost::filesystem::copy_file ("test/data/subs.mxf", dir / "subs.mxf");
+ shared_ptr<dcp::SMPTESubtitleAsset> asset(new dcp::SMPTESubtitleAsset(dir / "subs.mxf"));
+ shared_ptr<dcp::ReelAsset> reel_asset(new dcp::ReelSubtitleAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0));
+
+ shared_ptr<dcp::Reel> reel(new dcp::Reel());
+ reel->add (reel_asset);
+ shared_ptr<dcp::CPL> cpl(new dcp::CPL("hello", dcp::FEATURE));
+ cpl->add (reel);
+ cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
+ cpl->set_main_sound_sample_rate (48000);
+ cpl->set_main_picture_stored_area (dcp::Size(1998, 1080));
+ cpl->set_main_picture_active_area (dcp::Size(1440, 1080));
+
+ dcp::DCP dcp (dir);
+ dcp.add (cpl);
+ dcp.write_xml (dcp::SMPTE);
+
+ vector<boost::filesystem::path> dirs;
+ dirs.push_back (dir);
+ list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
+}
+
+
+boost::filesystem::path find_cpl (boost::filesystem::path dir)
+{
+ for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator(dir); i != boost::filesystem::directory_iterator(); i++) {
+ if (boost::starts_with(i->path().filename().string(), "cpl_")) {
+ return i->path();
+ }
+ }
+
+ BOOST_REQUIRE (false);
+ return boost::filesystem::path();
+}
+
+
+/* DCP with invalid CompositionMetadataAsset */
+BOOST_AUTO_TEST_CASE (verify_test24)
+{
+ boost::filesystem::path const dir("build/test/verify_test24");
+ prepare_directory (dir);
+
+ shared_ptr<dcp::Reel> reel(new dcp::Reel());
+ reel->add (black_picture_asset(dir));
+ shared_ptr<dcp::CPL> cpl(new dcp::CPL("hello", dcp::FEATURE));
+ cpl->add (reel);
+ cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
+ cpl->set_main_sound_sample_rate (48000);
+ cpl->set_main_picture_stored_area (dcp::Size(1998, 1080));
+ cpl->set_main_picture_active_area (dcp::Size(1440, 1080));
+
+ dcp::DCP dcp (dir);
+ dcp.add (cpl);
+ dcp.write_xml (dcp::SMPTE);
+
+ {
+ Editor e (find_cpl("build/test/verify_test24"));
+ e.replace ("MainSound", "MainSoundX");
+ }
+
+ vector<boost::filesystem::path> dirs;
+ dirs.push_back (dir);
+ list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
+ BOOST_REQUIRE_EQUAL (notes.size(), 4);
+
+ list<dcp::VerificationNote>::const_iterator i = notes.begin ();
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::XML_VALIDATION_ERROR);
+ ++i;
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::XML_VALIDATION_ERROR);
+ ++i;
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::XML_VALIDATION_ERROR);
+ ++i;
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::CPL_HASH_INCORRECT);
+ ++i;
+}
+
+
+/* DCP with invalid CompositionMetadataAsset */
+BOOST_AUTO_TEST_CASE (verify_test25)
+{
+ boost::filesystem::path const dir("build/test/verify_test25");
+ prepare_directory (dir);
+
+ boost::filesystem::copy_file ("test/data/subs.mxf", dir / "subs.mxf");
+ shared_ptr<dcp::SMPTESubtitleAsset> asset(new dcp::SMPTESubtitleAsset(dir / "subs.mxf"));
+ shared_ptr<dcp::ReelAsset> reel_asset(new dcp::ReelSubtitleAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0));
+
+ shared_ptr<dcp::Reel> reel(new dcp::Reel());
+ reel->add (reel_asset);
+ shared_ptr<dcp::CPL> cpl(new dcp::CPL("hello", dcp::FEATURE));
+ cpl->add (reel);
+ cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
+ cpl->set_main_sound_sample_rate (48000);
+ cpl->set_main_picture_stored_area (dcp::Size(1998, 1080));
+ cpl->set_main_picture_active_area (dcp::Size(1440, 1080));
+
+ dcp::DCP dcp (dir);
+ dcp.add (cpl);
+ dcp.write_xml (dcp::SMPTE);
+
+ {
+ Editor e (find_cpl("build/test/verify_test25"));
+ e.replace ("</MainPictureActiveArea>", "</MainPictureActiveArea><BadTag></BadTag>");
+ }
+
+ vector<boost::filesystem::path> dirs;
+ dirs.push_back (dir);
+ list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
+}
+
+
+/* SMPTE DCP with invalid <Language> in the MainSubtitle reel and also in the XML within the MXF */
+BOOST_AUTO_TEST_CASE (verify_test26)
+{
+ boost::filesystem::path const dir("build/test/verify_test26");
+ prepare_directory (dir);
+ boost::filesystem::copy_file ("test/data/subs.mxf", dir / "subs.mxf");
+ shared_ptr<dcp::SMPTESubtitleAsset> asset(new dcp::SMPTESubtitleAsset(dir / "subs.mxf"));
+ asset->_language = "wrong-andbad";
+ asset->write (dir / "subs.mxf");
+ shared_ptr<dcp::ReelSubtitleAsset> reel_asset(new dcp::ReelSubtitleAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0));
+ reel_asset->_language = "badlang";
+ shared_ptr<dcp::Reel> reel(new dcp::Reel());
+ reel->add (reel_asset);
+ shared_ptr<dcp::CPL> cpl(new dcp::CPL("hello", dcp::FEATURE));
+ cpl->add (reel);
+ shared_ptr<dcp::DCP> dcp(new dcp::DCP(dir));
+ dcp->add (cpl);
+ dcp->write_xml (dcp::SMPTE);
+
+ vector<boost::filesystem::path> dirs;
+ dirs.push_back (dir);
+ list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
+ BOOST_REQUIRE_EQUAL (notes.size(), 2U);
+ list<dcp::VerificationNote>::const_iterator i = notes.begin ();
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::BAD_LANGUAGE);
+ BOOST_REQUIRE (i->note());
+ BOOST_CHECK_EQUAL (*i->note(), "badlang");
+ i++;
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::BAD_LANGUAGE);
+ BOOST_REQUIRE (i->note());
+ BOOST_CHECK_EQUAL (*i->note(), "wrong-andbad");
+}
+
+
+/* SMPTE DCP with invalid <Language> in the MainClosedCaption reel and also in the XML within the MXF */
+BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_languages)
+{
+ boost::filesystem::path const dir("build/test/verify_invalid_closed_caption_languages");
+ prepare_directory (dir);
+ boost::filesystem::copy_file ("test/data/subs.mxf", dir / "subs.mxf");
+ shared_ptr<dcp::SMPTESubtitleAsset> asset(new dcp::SMPTESubtitleAsset(dir / "subs.mxf"));
+ asset->_language = "wrong-andbad";
+ asset->write (dir / "subs.mxf");
+ shared_ptr<dcp::ReelClosedCaptionAsset> reel_asset(new dcp::ReelClosedCaptionAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0));
+ reel_asset->_language = "badlang";
+ shared_ptr<dcp::Reel> reel(new dcp::Reel());
+ reel->add (reel_asset);
+ shared_ptr<dcp::CPL> cpl(new dcp::CPL("hello", dcp::FEATURE));
+ cpl->add (reel);
+ shared_ptr<dcp::DCP> dcp(new dcp::DCP(dir));
+ dcp->add (cpl);
+ dcp->write_xml (dcp::SMPTE);
+
+ vector<boost::filesystem::path> dirs;
+ dirs.push_back (dir);
+ list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
+ BOOST_REQUIRE_EQUAL (notes.size(), 2U);
+ list<dcp::VerificationNote>::const_iterator i = notes.begin ();
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::BAD_LANGUAGE);
+ BOOST_REQUIRE (i->note());
+ BOOST_CHECK_EQUAL (*i->note(), "badlang");
+ i++;
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::BAD_LANGUAGE);
+ BOOST_REQUIRE (i->note());
+ BOOST_CHECK_EQUAL (*i->note(), "wrong-andbad");
+}
+
+
+/* SMPTE DCP with invalid <Language> in the MainSound reel, the CPL additional subtitles languages and
+ * the release territory.
+ */
+BOOST_AUTO_TEST_CASE (verify_various_invalid_languages)
+{
+ boost::filesystem::path const dir("build/test/verify_various_invalid_languages");
+ prepare_directory (dir);
+
+ shared_ptr<dcp::MonoPictureAsset> picture = simple_picture (dir, "foo");
+ shared_ptr<dcp::ReelPictureAsset> reel_picture(new dcp::ReelMonoPictureAsset(picture, 0));
+ shared_ptr<dcp::Reel> reel(new dcp::Reel());
+ reel->add (reel_picture);
+ shared_ptr<dcp::SoundAsset> sound = simple_sound (dir, "foo", dcp::MXFMetadata(), "frobozz");
+ shared_ptr<dcp::ReelSoundAsset> reel_sound(new dcp::ReelSoundAsset(sound, 0));
+ reel->add (reel_sound);
+ shared_ptr<dcp::CPL> cpl(new dcp::CPL("hello", dcp::FEATURE));
+ cpl->add (reel);
+ cpl->_additional_subtitle_languages.push_back("this-is-wrong");
+ cpl->_additional_subtitle_languages.push_back("andso-is-this");
+ cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-");
+ cpl->set_main_sound_sample_rate (48000);
+ cpl->set_main_picture_stored_area (dcp::Size(1998, 1080));
+ cpl->set_main_picture_active_area (dcp::Size(1440, 1080));
+ cpl->_release_territory = "fred-jim";
+ shared_ptr<dcp::DCP> dcp(new dcp::DCP(dir));
+ dcp->add (cpl);
+ dcp->write_xml (dcp::SMPTE);
+
+ vector<boost::filesystem::path> dirs;
+ dirs.push_back (dir);
+ list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
+ BOOST_REQUIRE_EQUAL (notes.size(), 4U);
+ list<dcp::VerificationNote>::const_iterator i = notes.begin ();
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::BAD_LANGUAGE);
+ BOOST_REQUIRE (i->note());
+ BOOST_CHECK_EQUAL (*i->note(), "this-is-wrong");
+ ++i;
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::BAD_LANGUAGE);
+ BOOST_REQUIRE (i->note());
+ BOOST_CHECK_EQUAL (*i->note(), "andso-is-this");
+ ++i;
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::BAD_LANGUAGE);
+ BOOST_REQUIRE (i->note());
+ BOOST_CHECK_EQUAL (*i->note(), "fred-jim");
+ ++i;
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::BAD_LANGUAGE);
+ BOOST_REQUIRE (i->note());
+ BOOST_CHECK_EQUAL (*i->note(), "frobozz");
+ ++i;
+}
+
+
+static
+list<dcp::VerificationNote>
+check_picture_size (int width, int height, int frame_rate, bool three_d)
+{
+ using namespace boost::filesystem;
+
+ path dcp_path = "build/test/verify_picture_test";
+ remove_all (dcp_path);
+ create_directories (dcp_path);
+
+ shared_ptr<dcp::PictureAsset> mp;
+ if (three_d) {
+ mp.reset (new dcp::StereoPictureAsset(dcp::Fraction(frame_rate, 1), dcp::SMPTE));
+ } else {
+ mp.reset (new dcp::MonoPictureAsset(dcp::Fraction(frame_rate, 1), dcp::SMPTE));
+ }
+ shared_ptr<dcp::PictureAssetWriter> picture_writer = mp->start_write (dcp_path / "video.mxf", false);
+
+ shared_ptr<dcp::OpenJPEGImage> image = black_image (dcp::Size(width, height));
+ dcp::ArrayData j2c = dcp::compress_j2k (image, 100000000, frame_rate, three_d, width > 2048);
+ int const length = three_d ? frame_rate * 2 : frame_rate;
+ for (int i = 0; i < length; ++i) {
+ picture_writer->write (j2c.data(), j2c.size());
+ }
+ picture_writer->finalize ();
+
+ shared_ptr<dcp::DCP> d (new dcp::DCP(dcp_path));
+ shared_ptr<dcp::CPL> cpl (new dcp::CPL("A Test DCP", dcp::FEATURE));
+ cpl->set_annotation_text ("A Test DCP");
+ cpl->set_issue_date ("2012-07-17T04:45:18+00:00");
+
+ shared_ptr<dcp::Reel> reel(new dcp::Reel());
+
+ if (three_d) {
+ reel->add (
+ shared_ptr<dcp::ReelPictureAsset>(
+ new dcp::ReelStereoPictureAsset(
+ std::dynamic_pointer_cast<dcp::StereoPictureAsset>(mp),
+ 0)
+ )
+ );
+ } else {
+ reel->add (
+ shared_ptr<dcp::ReelPictureAsset>(
+ new dcp::ReelMonoPictureAsset(
+ std::dynamic_pointer_cast<dcp::MonoPictureAsset>(mp),
+ 0)
+ )
+ );
+ }
+
+ cpl->add (reel);
+
+ d->add (cpl);
+ d->write_xml (dcp::SMPTE);
+
+ vector<boost::filesystem::path> dirs;
+ dirs.push_back (dcp_path);
+ return dcp::verify (dirs, &stage, &progress, xsd_test);
+}
+
+
+static
+void
+check_picture_size_ok (int width, int height, int frame_rate, bool three_d)
+{
+ list<dcp::VerificationNote> notes = check_picture_size(width, height, frame_rate, three_d);
+ dump_notes (notes);
+ BOOST_CHECK_EQUAL (notes.size(), 0U);
+}
+
+
+static
+void
+check_picture_size_bad_frame_size (int width, int height, int frame_rate, bool three_d)
+{
+ list<dcp::VerificationNote> notes = check_picture_size(width, height, frame_rate, three_d);
+ BOOST_REQUIRE_EQUAL (notes.size(), 1U);
+ BOOST_CHECK_EQUAL (notes.front().type(), dcp::VerificationNote::VERIFY_BV21_ERROR);
+ BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::PICTURE_ASSET_INVALID_SIZE_IN_PIXELS);
+}
+
+
+static
+void
+check_picture_size_bad_2k_frame_rate (int width, int height, int frame_rate, bool three_d)
+{
+ list<dcp::VerificationNote> notes = check_picture_size(width, height, frame_rate, three_d);
+ BOOST_REQUIRE_EQUAL (notes.size(), 2U);
+ BOOST_CHECK_EQUAL (notes.back().type(), dcp::VerificationNote::VERIFY_BV21_ERROR);
+ BOOST_CHECK_EQUAL (notes.back().code(), dcp::VerificationNote::PICTURE_ASSET_INVALID_FRAME_RATE_FOR_2K);
+}
+
+
+static
+void
+check_picture_size_bad_4k_frame_rate (int width, int height, int frame_rate, bool three_d)
+{
+ list<dcp::VerificationNote> notes = check_picture_size(width, height, frame_rate, three_d);
+ BOOST_REQUIRE_EQUAL (notes.size(), 1U);
+ BOOST_CHECK_EQUAL (notes.front().type(), dcp::VerificationNote::VERIFY_BV21_ERROR);
+ BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::PICTURE_ASSET_INVALID_FRAME_RATE_FOR_4K);
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_picture_size)
+{
+ using namespace boost::filesystem;
+
+ /* 2K scope */
+ check_picture_size_ok (2048, 858, 24, false);
+ check_picture_size_ok (2048, 858, 25, false);
+ check_picture_size_ok (2048, 858, 48, false);
+ check_picture_size_ok (2048, 858, 24, true);
+ check_picture_size_ok (2048, 858, 25, true);
+ check_picture_size_ok (2048, 858, 48, true);
+
+ /* 2K flat */
+ check_picture_size_ok (1998, 1080, 24, false);
+ check_picture_size_ok (1998, 1080, 25, false);
+ check_picture_size_ok (1998, 1080, 48, false);
+ check_picture_size_ok (1998, 1080, 24, true);
+ check_picture_size_ok (1998, 1080, 25, true);
+ check_picture_size_ok (1998, 1080, 48, true);
+
+ /* 4K scope */
+ check_picture_size_ok (4096, 1716, 24, false);
+
+ /* 4K flat */
+ check_picture_size_ok (3996, 2160, 24, false);
+
+ /* Bad frame size */
+ check_picture_size_bad_frame_size (2050, 858, 24, false);
+ check_picture_size_bad_frame_size (2048, 658, 25, false);
+ check_picture_size_bad_frame_size (1920, 1080, 48, true);
+ check_picture_size_bad_frame_size (4000, 3000, 24, true);
+
+ /* Bad 2K frame rate */
+ check_picture_size_bad_2k_frame_rate (2048, 858, 26, false);
+ check_picture_size_bad_2k_frame_rate (2048, 858, 31, false);
+ check_picture_size_bad_2k_frame_rate (1998, 1080, 50, true);
+
+ /* Bad 4K frame rate */
+ check_picture_size_bad_4k_frame_rate (3996, 2160, 25, false);
+ check_picture_size_bad_4k_frame_rate (3996, 2160, 48, false);
+
+ /* No 4K 3D */
+ list<dcp::VerificationNote> notes = check_picture_size(3996, 2160, 24, true);
+ BOOST_REQUIRE_EQUAL (notes.size(), 1U);
+ BOOST_CHECK_EQUAL (notes.front().type(), dcp::VerificationNote::VERIFY_BV21_ERROR);
+ BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::PICTURE_ASSET_4K_3D);
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_closed_caption_xml_too_large)
+{
+ boost::filesystem::path const dir("build/test/verify_closed_caption_xml_too_large");
+ prepare_directory (dir);
+
+ shared_ptr<dcp::SMPTESubtitleAsset> asset(new dcp::SMPTESubtitleAsset());
+ for (int i = 0; i < 2048; ++i) {
+ asset->add (
+ shared_ptr<dcp::Subtitle>(
+ new dcp::SubtitleString(
+ optional<string>(),
+ false,
+ false,
+ false,
+ dcp::Colour(),
+ 42,
+ 1,
+ dcp::Time(i * 24, 24, 24),
+ dcp::Time(i * 24 + 20, 24, 24),
+ 0,
+ dcp::HALIGN_CENTER,
+ 0,
+ dcp::VALIGN_CENTER,
+ dcp::DIRECTION_LTR,
+ "Hello",
+ dcp::NONE,
+ dcp::Colour(),
+ dcp::Time(),
+ dcp::Time()
+ )
+ )
+ );
+ }
+ asset->set_language (dcp::LanguageTag("de-DE"));
+ asset->write (dir / "subs.mxf");
+ shared_ptr<dcp::ReelClosedCaptionAsset> reel_asset(new dcp::ReelClosedCaptionAsset(asset, dcp::Fraction(24, 1), 16 * 24, 0));
+ shared_ptr<dcp::Reel> reel(new dcp::Reel());
+ reel->add (reel_asset);
+ shared_ptr<dcp::CPL> cpl(new dcp::CPL("hello", dcp::FEATURE));
+ cpl->add (reel);
+ shared_ptr<dcp::DCP> dcp(new dcp::DCP(dir));
+ dcp->add (cpl);
+ dcp->write_xml (dcp::SMPTE);
+
+ vector<boost::filesystem::path> dirs;
+ dirs.push_back (dir);
+ list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
+ BOOST_REQUIRE_EQUAL (notes.size(), 1U);
+ BOOST_CHECK_EQUAL (notes.front().type(), dcp::VerificationNote::VERIFY_BV21_ERROR);
+ BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::CLOSED_CAPTION_XML_TOO_LARGE_IN_BYTES);
+}
+
+
+static
+shared_ptr<dcp::SMPTESubtitleAsset>
+make_large_subtitle_asset (boost::filesystem::path font_file)
+{
+ shared_ptr<dcp::SMPTESubtitleAsset> asset(new dcp::SMPTESubtitleAsset());
+ dcp::ArrayData big_fake_font(1024 * 1024);
+ big_fake_font.write (font_file);
+ for (int i = 0; i < 116; ++i) {
+ asset->add_font (dcp::String::compose("big%1", i), big_fake_font);
+ }
+ return asset;
+}
+
+
+template <class T>
+void
+verify_timed_text_asset_too_large (string name)
+{
+ boost::filesystem::path const dir = boost::filesystem::path("build/test") / name;
+ prepare_directory (dir);
+ shared_ptr<dcp::SMPTESubtitleAsset> asset = make_large_subtitle_asset (dir / "font.ttf");
+ asset->add (
+ shared_ptr<dcp::Subtitle>(
+ new dcp::SubtitleString(
+ optional<string>(),
+ false,
+ false,
+ false,
+ dcp::Colour(),
+ 42,
+ 1,
+ dcp::Time(0, 24, 24),
+ dcp::Time(20, 24, 24),
+ 0,
+ dcp::HALIGN_CENTER,
+ 0,
+ dcp::VALIGN_CENTER,
+ dcp::DIRECTION_LTR,
+ "Hello",
+ dcp::NONE,
+ dcp::Colour(),
+ dcp::Time(),
+ dcp::Time()
+ )
+ )
+ );
+ asset->set_language (dcp::LanguageTag("de-DE"));
+ asset->write (dir / "subs.mxf");
+
+ shared_ptr<T> reel_asset(new T(asset, dcp::Fraction(24, 1), 16 * 24, 0));
+ shared_ptr<dcp::Reel> reel(new dcp::Reel());
+ reel->add (reel_asset);
+ shared_ptr<dcp::CPL> cpl(new dcp::CPL("hello", dcp::FEATURE));
+ cpl->add (reel);
+ shared_ptr<dcp::DCP> dcp(new dcp::DCP(dir));
+ dcp->add (cpl);
+ dcp->write_xml (dcp::SMPTE);
+
+ vector<boost::filesystem::path> dirs;
+ dirs.push_back (dir);
+ list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
+ BOOST_REQUIRE_EQUAL (notes.size(), 2U);
+ list<dcp::VerificationNote>::const_iterator i = notes.begin();
+ BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_BV21_ERROR);
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::TIMED_TEXT_ASSET_TOO_LARGE_IN_BYTES);
+ ++i;
+ BOOST_CHECK_EQUAL (i->type(), dcp::VerificationNote::VERIFY_BV21_ERROR);
+ BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::TIMED_TEXT_FONTS_TOO_LARGE_IN_BYTES);
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_subtitle_asset_too_large)
+{
+ verify_timed_text_asset_too_large<dcp::ReelSubtitleAsset>("verify_subtitle_asset_too_large");
+ verify_timed_text_asset_too_large<dcp::ReelClosedCaptionAsset>("verify_closed_caption_asset_too_large");
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_missing_language_tag_in_subtitle_xml)
+{
+ boost::filesystem::path dir = "build/test/verify_missing_language_tag_in_subtitle_xml";
+ prepare_directory (dir);
+ shared_ptr<dcp::DCP> dcp = make_simple (dir, 1);
+
+ string const xml =
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ "<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/schema\">"
+ "<Id>urn:uuid:e6a8ae03-ebbf-41ed-9def-913a87d1493a</Id>"
+ "<ContentTitleText>Content</ContentTitleText>"
+ "<AnnotationText>Annotation</AnnotationText>"
+ "<IssueDate>2018-10-02T12:25:14+02:00</IssueDate>"
+ "<ReelNumber>1</ReelNumber>"
+ "<EditRate>25 1</EditRate>"
+ "<TimeCodeRate>25</TimeCodeRate>"
+ "<StartTime>00:00:00:00</StartTime>"
+ "<LoadFont ID=\"arial\">urn:uuid:e4f0ff0a-9eba-49e0-92ee-d89a88a575f6</LoadFont>"
+ "<SubtitleList>"
+ "<Font ID=\"arial\" Color=\"FFFEFEFE\" Weight=\"normal\" Size=\"42\" Effect=\"border\" EffectColor=\"FF181818\" AspectAdjust=\"1.00\">"
+ "<Subtitle SpotNumber=\"1\" TimeIn=\"00:00:03:00\" TimeOut=\"00:00:04:10\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">"
+ "<Text Hposition=\"0.0\" Halign=\"center\" Valign=\"bottom\" Vposition=\"13.5\" Direction=\"ltr\">Hello world</Text>"
+ "</Subtitle>"
+ "</Font>"
+ "</SubtitleList>"
+ "</SubtitleReel>";
+
+ FILE* xml_file = dcp::fopen_boost (dir / "subs.xml", "w");
+ BOOST_REQUIRE (xml_file);
+ fwrite (xml.c_str(), xml.size(), 1, xml_file);
+ fclose (xml_file);
+ shared_ptr<dcp::SMPTESubtitleAsset> subs (new dcp::SMPTESubtitleAsset(dir / "subs.xml"));
+ subs->write (dir / "subs.mxf");
+
+ shared_ptr<dcp::ReelSubtitleAsset> reel_subs (new dcp::ReelSubtitleAsset(subs, dcp::Fraction(24, 1), 100, 0));
+ dcp->cpls().front()->reels().front()->add (reel_subs);
+ dcp->write_xml (dcp::SMPTE);
+
+ vector<boost::filesystem::path> dirs;
+ dirs.push_back (dir);
+ list<dcp::VerificationNote> notes = dcp::verify (dirs, &stage, &progress, xsd_test);
+ BOOST_REQUIRE_EQUAL (notes.size(), 1U);
+ BOOST_CHECK_EQUAL (notes.front().type(), dcp::VerificationNote::VERIFY_BV21_ERROR);
+ BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::MISSING_SUBTITLE_LANGUAGE);
+}
projects / libdcp.git / blobdiff