summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-05-21 21:23:55 +0100
committerCarl Hetherington <cth@carlh.net>2019-05-21 21:24:30 +0100
commitc6d187747222c980e28a6e50196a85ee570990a7 (patch)
tree22f549c228b2e09bdbb18f0a27a54c67ee1ff5db
parent399e2adaf4023a541d4b3792c8fde0a923c55ab1 (diff)
Increase header size when writing SMPTE subtitle MXFs; fixes problems when writing lots of subs (DCP-o-matic bug #1561).v1.6.8
This is a backport of b7c7e14463d91608b080a5a63fcfb4d330ced863 from master.
-rw-r--r--src/smpte_subtitle_asset.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/smpte_subtitle_asset.cc b/src/smpte_subtitle_asset.cc
index ae473071..27f486da 100644
--- a/src/smpte_subtitle_asset.cc
+++ b/src/smpte_subtitle_asset.cc
@@ -393,7 +393,10 @@ SMPTESubtitleAsset::write (boost::filesystem::path p) const
descriptor.ContainerDuration = _intrinsic_duration;
ASDCP::TimedText::MXFWriter writer;
- ASDCP::Result_t r = writer.OpenWrite (p.string().c_str(), writer_info, descriptor);
+ /* This header size is a guess. Empirically it seems that each subtitle reference is 90 bytes, and we need some extra.
+ The defualt size is not enough for some feature-length PNG sub projects (see DCP-o-matic #1561).
+ */
+ ASDCP::Result_t r = writer.OpenWrite (p.string().c_str(), writer_info, descriptor, _subtitles.size() * 90 + 16384);
if (ASDCP_FAILURE (r)) {
boost::throw_exception (FileError ("could not open subtitle MXF for writing", p.string(), r));
}