projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small callgrind-informed optimisation.
[libdcp.git]
/
test
/
recovery_test.cc
diff --git
a/test/recovery_test.cc
b/test/recovery_test.cc
index b67c54f719134ad931fc6a57b8a1292eb1821ef4..8af49b93a249be943d25f023c6aa70f7f2687e67 100644
(file)
--- a/
test/recovery_test.cc
+++ b/
test/recovery_test.cc
@@
-1,35
+1,35
@@
/*
Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of libdcp.
+
+ libdcp is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
libdcp
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+ along with libdcp. If not, see <http://www.gnu.org/licenses/>.
*/
#include <boost/test/unit_test.hpp>
#include <boost/filesystem.hpp>
*/
#include <boost/test/unit_test.hpp>
#include <boost/filesystem.hpp>
-#include "mono_picture_
mxf
_writer.h"
-#include "mono_picture_
mxf
.h"
+#include "mono_picture_
asset
_writer.h"
+#include "mono_picture_
asset
.h"
#include "KM_util.h"
using std::string;
using boost::shared_ptr;
#include "KM_util.h"
using std::string;
using boost::shared_ptr;
-/* Check that recovery from a partially-written MXF works */
+/*
*
Check that recovery from a partially-written MXF works */
BOOST_AUTO_TEST_CASE (recovery)
{
BOOST_AUTO_TEST_CASE (recovery)
{
- Kumu::
libdcp
_test = true;
+ Kumu::
cth
_test = true;
string const picture = "test/data/32x32_red_square.j2c";
int const size = boost::filesystem::file_size (picture);
string const picture = "test/data/32x32_red_square.j2c";
int const size = boost::filesystem::file_size (picture);
@@
-44,13
+44,12
@@
BOOST_AUTO_TEST_CASE (recovery)
#ifdef LIBDCP_POSIX
/* XXX: fix this posix-only stuff */
Kumu::ResetTestRNG ();
#ifdef LIBDCP_POSIX
/* XXX: fix this posix-only stuff */
Kumu::ResetTestRNG ();
-#endif
-
+#endif
+
boost::filesystem::remove_all ("build/test/baz");
boost::filesystem::create_directories ("build/test/baz");
boost::filesystem::remove_all ("build/test/baz");
boost::filesystem::create_directories ("build/test/baz");
- shared_ptr<dcp::MonoPictureMXF> mp (new dcp::MonoPictureMXF (24));
- mp->set_size (dcp::Size (32, 32));
- shared_ptr<dcp::PictureMXFWriter> writer = mp->start_write ("build/test/baz/video1.mxf", false);
+ shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1)));
+ shared_ptr<dcp::PictureAssetWriter> writer = mp->start_write ("build/test/baz/video1.mxf", dcp::SMPTE, false);
int written_size = 0;
for (int i = 0; i < 24; ++i) {
int written_size = 0;
for (int i = 0; i < 24; ++i) {
@@
-65,7
+64,7
@@
BOOST_AUTO_TEST_CASE (recovery)
boost::filesystem::resize_file ("build/test/baz/video2.mxf", 16384 + 353 * 11);
{
boost::filesystem::resize_file ("build/test/baz/video2.mxf", 16384 + 353 * 11);
{
- FILE* f = fopen ("build/test/baz/video2.mxf", "r+");
+ FILE* f = fopen ("build/test/baz/video2.mxf", "r
b
+");
rewind (f);
char zeros[256];
memset (zeros, 0, 256);
rewind (f);
char zeros[256];
memset (zeros, 0, 256);
@@
-73,13
+72,12
@@
BOOST_AUTO_TEST_CASE (recovery)
fclose (f);
}
fclose (f);
}
-#ifdef LIBDCP_POSIX
+#ifdef LIBDCP_POSIX
Kumu::ResetTestRNG ();
Kumu::ResetTestRNG ();
-#endif
+#endif
- mp.reset (new dcp::MonoPictureMXF (24));
- mp->set_size (dcp::Size (32, 32));
- writer = mp->start_write ("build/test/baz/video2.mxf", true);
+ mp.reset (new dcp::MonoPictureAsset (dcp::Fraction (24, 1)));
+ writer = mp->start_write ("build/test/baz/video2.mxf", dcp::SMPTE, true);
writer->write (data, size);
writer->write (data, size);
@@
-90,6
+88,6
@@
BOOST_AUTO_TEST_CASE (recovery)
for (int i = 4; i < 24; ++i) {
writer->write (data, size);
}
for (int i = 4; i < 24; ++i) {
writer->write (data, size);
}
-
+
writer->finalize ();
}
writer->finalize ();
}