summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-03-24 22:18:28 +0100
committerCarl Hetherington <cth@carlh.net>2024-04-18 12:11:43 +0200
commit0fbfe3d2dd5de9eab299f2ff569bff29cc6f8e19 (patch)
treec4dac0b23dd0c45b875721180c0bc5a18d019b6f /src
parent7c5bd17891b2ea087db6b876112a2c1f69d6215e (diff)
Pass full J2KFrameInfo into fake_write() for consistency with a forthcoming commit.
Diffstat (limited to 'src')
-rw-r--r--src/j2k_picture_asset_writer.h2
-rw-r--r--src/mono_j2k_picture_asset_writer.cc4
-rw-r--r--src/mono_j2k_picture_asset_writer.h2
-rw-r--r--src/stereo_j2k_picture_asset_writer.cc4
-rw-r--r--src/stereo_j2k_picture_asset_writer.h2
5 files changed, 7 insertions, 7 deletions
diff --git a/src/j2k_picture_asset_writer.h b/src/j2k_picture_asset_writer.h
index 0cfcbdf5..0077b3e0 100644
--- a/src/j2k_picture_asset_writer.h
+++ b/src/j2k_picture_asset_writer.h
@@ -63,8 +63,8 @@ class J2KPictureAsset;
class J2KPictureAssetWriter : public AssetWriter
{
public:
- virtual void fake_write (int) = 0;
virtual J2KFrameInfo write(uint8_t const *, int) = 0;
+ virtual void fake_write(J2KFrameInfo const& info) = 0;
J2KFrameInfo write(Data const& data);
diff --git a/src/mono_j2k_picture_asset_writer.cc b/src/mono_j2k_picture_asset_writer.cc
index 807b4081..08639955 100644
--- a/src/mono_j2k_picture_asset_writer.cc
+++ b/src/mono_j2k_picture_asset_writer.cc
@@ -122,12 +122,12 @@ MonoJ2KPictureAssetWriter::write (uint8_t const * data, int size)
void
-MonoJ2KPictureAssetWriter::fake_write (int size)
+MonoJ2KPictureAssetWriter::fake_write(J2KFrameInfo const& info)
{
DCP_ASSERT (_started);
DCP_ASSERT (!_finalized);
- auto r = _state->mxf_writer.FakeWriteFrame (size);
+ auto r = _state->mxf_writer.FakeWriteFrame(info.size);
if (ASDCP_FAILURE(r)) {
boost::throw_exception (MXFFileError("error in writing video MXF", _file.string(), r));
}
diff --git a/src/mono_j2k_picture_asset_writer.h b/src/mono_j2k_picture_asset_writer.h
index 25dfbb2b..b3f57191 100644
--- a/src/mono_j2k_picture_asset_writer.h
+++ b/src/mono_j2k_picture_asset_writer.h
@@ -66,8 +66,8 @@ class MonoJ2KPictureAssetWriter : public J2KPictureAssetWriter
public:
~MonoJ2KPictureAssetWriter();
- void fake_write (int size) override;
J2KFrameInfo write(uint8_t const *, int) override;
+ void fake_write(J2KFrameInfo const& info) override;
bool finalize () override;
private:
diff --git a/src/stereo_j2k_picture_asset_writer.cc b/src/stereo_j2k_picture_asset_writer.cc
index b5263b7d..8a655fbc 100644
--- a/src/stereo_j2k_picture_asset_writer.cc
+++ b/src/stereo_j2k_picture_asset_writer.cc
@@ -128,12 +128,12 @@ StereoJ2KPictureAssetWriter::write (uint8_t const * data, int size)
void
-StereoJ2KPictureAssetWriter::fake_write (int size)
+StereoJ2KPictureAssetWriter::fake_write(J2KFrameInfo const& info)
{
DCP_ASSERT (_started);
DCP_ASSERT (!_finalized);
- auto r = _state->mxf_writer.FakeWriteFrame (size, _next_eye == Eye::LEFT ? ASDCP::JP2K::SP_LEFT : ASDCP::JP2K::SP_RIGHT);
+ auto r = _state->mxf_writer.FakeWriteFrame(info.size, _next_eye == Eye::LEFT ? ASDCP::JP2K::SP_LEFT : ASDCP::JP2K::SP_RIGHT);
if (ASDCP_FAILURE(r)) {
boost::throw_exception (MXFFileError("error in writing video MXF", _file.string(), r));
}
diff --git a/src/stereo_j2k_picture_asset_writer.h b/src/stereo_j2k_picture_asset_writer.h
index 98d112f6..e3f39a0b 100644
--- a/src/stereo_j2k_picture_asset_writer.h
+++ b/src/stereo_j2k_picture_asset_writer.h
@@ -65,8 +65,8 @@ public:
* @param data JPEG2000 data.
* @param size Size of data.
*/
- void fake_write (int size) override;
J2KFrameInfo write(uint8_t const * data, int size) override;
+ void fake_write(J2KFrameInfo const& info) override;
bool finalize () override;
private: