#include "compose.hpp"
#include "cpl.h"
#include "dcp.h"
-#include "file.h"
#include "interop_subtitle_asset.h"
#include "mono_picture_asset.h"
#include "picture_asset_writer.h"
#include "reel_asset.h"
#include "test.h"
#include "util.h"
+#include "reel_markers_asset.h"
#include <asdcp/KM_util.h>
#include <asdcp/KM_prng.h>
#include <sndfile.h>
using std::string;
using std::min;
-using std::list;
using std::vector;
using std::shared_ptr;
+using std::make_shared;
using boost::optional;
};
void
-check_xml (xmlpp::Element* ref, xmlpp::Element* test, list<string> ignore_tags, bool ignore_whitespace)
+check_xml (xmlpp::Element* ref, xmlpp::Element* test, vector<string> ignore_tags, bool ignore_whitespace)
{
BOOST_CHECK_EQUAL (ref->get_name (), test->get_name ());
BOOST_CHECK_EQUAL (ref->get_namespace_prefix (), test->get_namespace_prefix ());
}
void
-check_xml (string ref, string test, list<string> ignore, bool ignore_whitespace)
+check_xml (string ref, string test, vector<string> ignore, bool ignore_whitespace)
{
xmlpp::DomParser* ref_parser = new xmlpp::DomParser ();
ref_parser->parse_memory (ref);
void
check_file (boost::filesystem::path ref, boost::filesystem::path check)
{
- uintmax_t N = boost::filesystem::file_size (ref);
- BOOST_CHECK_EQUAL (N, boost::filesystem::file_size (check));
+ uintmax_t size = boost::filesystem::file_size (ref);
+ BOOST_CHECK_EQUAL (size, boost::filesystem::file_size(check));
FILE* ref_file = dcp::fopen_boost (ref, "rb");
BOOST_REQUIRE (ref_file);
FILE* check_file = dcp::fopen_boost (check, "rb");
uint8_t* ref_buffer = new uint8_t[buffer_size];
uint8_t* check_buffer = new uint8_t[buffer_size];
- string error;
- error = "File " + check.string() + " differs from reference " + ref.string();
+ uintmax_t pos = 0;
- while (N) {
- uintmax_t this_time = min (uintmax_t (buffer_size), N);
+ while (pos < size) {
+ uintmax_t this_time = min (uintmax_t(buffer_size), size - pos);
size_t r = fread (ref_buffer, 1, this_time, ref_file);
BOOST_CHECK_EQUAL (r, this_time);
r = fread (check_buffer, 1, this_time, check_file);
BOOST_CHECK_EQUAL (r, this_time);
- BOOST_CHECK_MESSAGE (memcmp (ref_buffer, check_buffer, this_time) == 0, error);
- if (memcmp (ref_buffer, check_buffer, this_time)) {
+ if (memcmp(ref_buffer, check_buffer, this_time) != 0) {
+ for (int i = 0; i < buffer_size; ++i) {
+ if (ref_buffer[i] != check_buffer[i]) {
+ BOOST_CHECK_MESSAGE (
+ false,
+ dcp::String::compose("File %1 differs from reference %2 at offset %3", check, ref, pos + i)
+ );
+ break;
+ }
+ }
break;
}
- N -= this_time;
+ pos += this_time;
}
delete[] ref_buffer;
shared_ptr<dcp::MonoPictureAsset>
-simple_picture (boost::filesystem::path path, string suffix)
+simple_picture (boost::filesystem::path path, string suffix, int frames)
{
dcp::MXFMetadata mxf_meta;
mxf_meta.company_name = "OpenDCP";
shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE));
mp->set_metadata (mxf_meta);
shared_ptr<dcp::PictureAssetWriter> picture_writer = mp->start_write (path / dcp::String::compose("video%1.mxf", suffix), false);
- dcp::File j2c ("test/data/flat_red.j2c");
- for (int i = 0; i < 24; ++i) {
+ dcp::ArrayData j2c ("test/data/flat_red.j2c");
+ for (int i = 0; i < frames; ++i) {
picture_writer->write (j2c.data (), j2c.size ());
}
picture_writer->finalize ();
shared_ptr<dcp::SoundAsset>
-simple_sound (boost::filesystem::path path, string suffix, dcp::MXFMetadata mxf_meta, string language)
+simple_sound (boost::filesystem::path path, string suffix, dcp::MXFMetadata mxf_meta, string language, int frames, int sample_rate)
{
+ int const channels = 6;
+
/* Set a valid language, then overwrite it, so that the language parameter can be badly formed */
- shared_ptr<dcp::SoundAsset> ms (new dcp::SoundAsset(dcp::Fraction(24, 1), 48000, 1, dcp::LanguageTag("en-US"), dcp::SMPTE));
+ shared_ptr<dcp::SoundAsset> ms (new dcp::SoundAsset(dcp::Fraction(24, 1), sample_rate, channels, dcp::LanguageTag("en-US"), dcp::SMPTE));
ms->_language = language;
ms->set_metadata (mxf_meta);
vector<dcp::Channel> active_channels;
active_channels.push_back (dcp::LEFT);
shared_ptr<dcp::SoundAssetWriter> sound_writer = ms->start_write (path / dcp::String::compose("audio%1.mxf", suffix), active_channels);
- SF_INFO info;
- info.format = 0;
- SNDFILE* sndfile = sf_open ("test/data/1s_24-bit_48k_silence.wav", SFM_READ, &info);
- BOOST_CHECK (sndfile);
- float buffer[4096*6];
- float* channels[1];
- channels[0] = buffer;
- while (true) {
- sf_count_t N = sf_readf_float (sndfile, buffer, 4096);
- sound_writer->write (channels, N);
- if (N < 4096) {
- break;
- }
+ int const samples_per_frame = sample_rate / 24;
+
+ float* silence[channels];
+ for (auto i = 0; i < channels; ++i) {
+ silence[i] = new float[samples_per_frame];
+ memset (silence[i], 0, samples_per_frame * sizeof(float));
+ }
+
+ for (auto i = 0; i < frames; ++i) {
+ sound_writer->write (silence, samples_per_frame);
}
sound_writer->finalize ();
+ for (auto i = 0; i < channels; ++i) {
+ delete[] silence[i];
+ }
+
return ms;
}
shared_ptr<dcp::DCP>
-make_simple (boost::filesystem::path path, int reels)
+make_simple (boost::filesystem::path path, int reels, int frames)
{
/* Some known metadata */
dcp::MXFMetadata mxf_meta;
boost::filesystem::remove_all (path);
boost::filesystem::create_directories (path);
shared_ptr<dcp::DCP> d (new dcp::DCP (path));
- shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE));
+ shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::TRAILER));
cpl->set_annotation_text ("A Test DCP");
cpl->set_issuer ("OpenDCP 0.0.25");
cpl->set_creator ("OpenDCP 0.0.25");
cpl->set_content_version (
dcp::ContentVersion("urn:uuid:75ac29aa-42ac-1234-ecae-49251abefd11", "content-version-label-text")
);
+ cpl->set_main_sound_configuration("51/L,R,C,LFE,Ls,Rs");
+ 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(1998, 1080));
+ cpl->set_version_number(1);
for (int i = 0; i < reels; ++i) {
string suffix = reels == 1 ? "" : dcp::String::compose("%1", i);
- shared_ptr<dcp::MonoPictureAsset> mp = simple_picture (path, suffix);
- shared_ptr<dcp::SoundAsset> ms = simple_sound (path, suffix, mxf_meta, "en-US");
+ shared_ptr<dcp::MonoPictureAsset> mp = simple_picture (path, suffix, frames);
+ shared_ptr<dcp::SoundAsset> ms = simple_sound (path, suffix, mxf_meta, "en-US", frames);
+
+ auto reel = make_shared<dcp::Reel>(
+ shared_ptr<dcp::ReelMonoPictureAsset>(new dcp::ReelMonoPictureAsset(mp, 0)),
+ shared_ptr<dcp::ReelSoundAsset>(new dcp::ReelSoundAsset(ms, 0))
+ );
- cpl->add (shared_ptr<dcp::Reel> (
- new dcp::Reel (
- shared_ptr<dcp::ReelMonoPictureAsset>(new dcp::ReelMonoPictureAsset(mp, 0)),
- shared_ptr<dcp::ReelSoundAsset>(new dcp::ReelSoundAsset(ms, 0))
- )
- ));
+ auto markers = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), frames, 0);
+ if (i == 0) {
+ markers->set (dcp::Marker::FFOC, dcp::Time(0, 0, 0, 1, 24));
+ }
+ if (i == reels - 1) {
+ markers->set (dcp::Marker::LFOC, dcp::Time(0, 0, 0, frames - 1, 24));
+ }
+ reel->add (markers);
+
+ cpl->add (reel);
}
d->add (cpl);
}
+shared_ptr<dcp::ReelMarkersAsset>
+simple_markers (int frames)
+{
+ auto markers = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), frames, 0);
+ markers->set (dcp::Marker::FFOC, dcp::Time(1, 24, 24));
+ markers->set (dcp::Marker::LFOC, dcp::Time(frames - 1, 24, 24));
+ return markers;
+}
+
+
shared_ptr<dcp::DCP>
make_simple_with_interop_subs (boost::filesystem::path path)
{
shared_ptr<dcp::DCP>
make_simple_with_smpte_subs (boost::filesystem::path path)
{
- shared_ptr<dcp::DCP> dcp = make_simple (path);
+ shared_ptr<dcp::DCP> dcp = make_simple (path, 1, 240);
shared_ptr<dcp::SMPTESubtitleAsset> subs(new dcp::SMPTESubtitleAsset());
+ subs->set_language (dcp::LanguageTag("de-DE"));
+ subs->set_start_time (dcp::Time());
subs->add (simple_subtitle());
- dcp::ArrayData data(4096);
subs->write (path / "subs.mxf");
shared_ptr<dcp::ReelSubtitleAsset> reel_subs(new dcp::ReelSubtitleAsset(subs, dcp::Fraction(24, 1), 240, 0));
shared_ptr<dcp::DCP>
make_simple_with_smpte_ccaps (boost::filesystem::path path)
{
- shared_ptr<dcp::DCP> dcp = make_simple (path);
+ shared_ptr<dcp::DCP> dcp = make_simple (path, 1, 240);
shared_ptr<dcp::SMPTESubtitleAsset> subs(new dcp::SMPTESubtitleAsset());
+ subs->set_language (dcp::LanguageTag("de-DE"));
+ subs->set_start_time (dcp::Time());
subs->add (simple_subtitle());
subs->write (path / "ccap.mxf");
shared_ptr<dcp::OpenJPEGImage>
-black_image ()
+black_image (dcp::Size size)
{
- shared_ptr<dcp::OpenJPEGImage> image(new dcp::OpenJPEGImage(dcp::Size(1998, 1080)));
- int const pixels = 1998 * 1080;
+ shared_ptr<dcp::OpenJPEGImage> image(new dcp::OpenJPEGImage(size));
+ int const pixels = size.width * size.height;
for (int i = 0; i < 3; ++i) {
memset (image->data(i), 0, pixels * sizeof(int));
}
BOOST_REQUIRE (frame.size() < 230000000 / (24 * 8));
shared_ptr<dcp::MonoPictureAsset> asset(new dcp::MonoPictureAsset(dcp::Fraction(24, 1), dcp::SMPTE));
+ asset->set_metadata (dcp::MXFMetadata("libdcp", "libdcp", "1.6.4devel"));
boost::filesystem::create_directories (dir);
shared_ptr<dcp::PictureAssetWriter> writer = asset->start_write (dir / "pic.mxf", true);
for (int i = 0; i < frames; ++i) {