dcpomatic/src/lib/dcp_decoder.h, branch split DCP-o-matic DCP tools https://git.carlh.net/cgit/dcpomatic/atom?h=split 2023-12-05T00:59:44Z Account for split branch in libdcp. 2023-12-05T00:59:44Z Carl Hetherington cth@carlh.net 2023-12-05T00:59:44Z urn:sha1:751379da4be48f9b911a91cf17686330dd999d0c Fix DCP content font ID allocation to cope with DCPs that have multiple fonts 2023-10-15T07:10:18Z Carl Hetherington cth@carlh.net 2023-10-14T19:48:25Z urn:sha1:3c802dd6d1451c2c8a7e188f8379738d72e907eb with the same name in the same reel (#2600). Previously we had this id_for_font_in_reel() which would give an ID of N_font-ID. This means we got duplicate font IDs. Here we replace that method with FontAllocator, which gives an ID of N_font-ID for the first font and M_font-ID, where M is a number higher than the highest reel index. The idea is to support the required new IDs without breaking exisiting projects. There is some documentation of how it works in doc/design/fonts Rearrange subtitle font management. 2022-06-07T15:01:06Z Carl Hetherington cth@carlh.net 2022-06-01T11:03:38Z urn:sha1:5a820bb8fae34591be5ac6d19a73461b9dab532a With this change each subtitle coming out of the player has a reference to a dcpomatic::Font that belongs to the TextContent. This hopefully solves a few problems which all basically stemmed from the fact that previously the decoders/player were deciding what the font ID in the output DCP would be - they can't do that properly. Remove DCP class and replace its functionality with a plain method in libdcp. 2022-04-20T19:17:54Z Carl Hetherington cth@carlh.net 2022-04-20T19:17:54Z urn:sha1:86eb90b563efb7ef093d5b17a5d6db0fc330e301 C++11 tidying. 2021-04-29T18:53:49Z Carl Hetherington cth@carlh.net 2021-04-29T07:14:20Z urn:sha1:39fb8198febde1937019db1c300ec363aab5aa56 Bump libdcp for better verification, and make API adjustments. 2021-01-20T22:42:28Z Carl Hetherington cth@carlh.net 2021-01-20T22:42:28Z urn:sha1:cb6729aa79b555b219974207fbe2ff0510f9d3ea std::shared_ptr 2021-01-07T21:48:29Z Carl Hetherington cth@carlh.net 2021-01-04T20:16:53Z urn:sha1:dd9be86db6cde0afa5da0d1d1ac43b42e05dca26 Pass fonts from content around as FontData. 2020-12-22T01:37:53Z Carl Hetherington cth@carlh.net 2020-12-20T22:41:52Z urn:sha1:ddcd4f3ba0af3e9d49dbb68127317cd0d871a248 i.e. as a block of memory rather than a file. Also, get the fonts from the decoder rather than the content. Together, these changes allow us to use fonts from SMPTE DCPs added as content. Before, fonts would be messed up in those cases (#1885). Make Atmos content work more like other content. Now its MXFs 2020-06-19T13:07:30Z Carl Hetherington cth@carlh.net 2020-06-19T11:30:02Z urn:sha1:ca981c8cfa23111e92be329f1c2dfbe3a07b4247 are re-written, meaning that they can be encrypted. This (along with the libdcp update) also fixes assorted Atmos bugs. Give DCPDecoder its own ::position which just returns its internal 2020-01-10T00:01:03Z Carl Hetherington cth@carlh.net 2020-01-09T23:52:20Z urn:sha1:efc3486f2acf36bd0dc7b5528e7b3110ea8c4afe _next time. This is important because Decoder::position does the wrong thing with DCPs in the following case. 1. DCPDecoder emits a subtitle event (start/stop) at time t. 2. There follows a long time T with no subtitle events. During this time the DCPDecoder's position is reported as t (since TextDecoder notes its position as the time of the last thing it emitted --- which is all it reasonably can do, I think). 3. During this T the DCPDecoder may be incorrectly pass()ed because its position is reported as earlier than it really is; this results in video/audio being emitted by the DCPDecoder but other contemporary sources may not be pass()ed. The upshot of this can be that no audio is emitted, as a contemporary audio source is not pass()ed and hence the merger is waiting for audio that will take a long time to come. When the butler is running this can result in audio underruns as the video buffers overflow with no sign of any audio. It is also simpler this way; DCPDecoder was already maintaining the required information.