dcpomatic/src/lib/player.cc, branch v2.13.2 DCP-o-matic DCP tools https://git.carlh.net/cgit/dcpomatic/atom?h=v2.13.2 2018-03-24T23:57:22Z Fix crash when changing DCP audio channel count. 2018-03-24T23:57:22Z Carl Hetherington cth@carlh.net 2018-03-24T23:55:56Z urn:sha1:800c0b9f95f422af66b6166fb4d13c1b89d04844 Without this we ask the AudioMerger to merge new buffers with N channels with old buffers with M channels, which it can't do. I'm not convinced this is the best solution but I think it will do for now. Speed some operations by re-using the last PlayerVideo but with 2018-02-24T23:35:11Z Carl Hetherington cth@carlh.net 2018-02-24T01:05:14Z urn:sha1:14cccb179fff7bbbf422e13f9d2e3264239c93c7 updated metadata (where possible). Helps with #1194. Another subtitle fix. 2018-02-23T19:55:42Z Carl Hetherington cth@carlh.net 2018-02-23T19:55:23Z urn:sha1:0b6eeca6d34e646e3722b975fe76433500dc62bb Fix thinko in previous. 2018-02-23T01:21:22Z Carl Hetherington cth@carlh.net 2018-02-23T01:21:12Z urn:sha1:b20ad09b6645c1fdd8b5ed36797208af9409da1b Fix implementation of delay in 7758260; it needs to apply to 2018-02-23T00:58:08Z Carl Hetherington cth@carlh.net 2018-02-23T00:57:04Z urn:sha1:24ba224ab4871e453df50fde94b5b32649a3d47b anything passed to emit_video(), not just things that come from decoders. Add a 2-frame `delay' on content arriving at the player to give 2018-02-20T23:37:24Z Carl Hetherington cth@carlh.net 2018-02-20T23:34:59Z urn:sha1:a0eff2446835a2a29d751a4810fe182c486a2eb6 subtitle content the chance to catch up. Fixes problems observed when overlaying a DCP subtitle onto an existing DCP and then seeking into the first subtitle. After the seek the decoder positions were: DCP: 0. subtitle: first subtitle time. This causes the DCP decoder to be pass()ed first and so the subtitle for the video frame has not arrived yet. I hope this does not cause unpredicted side effects... Add log for assertion failure. 2018-02-16T23:52:39Z Carl Hetherington cth@carlh.net 2018-02-16T23:52:39Z urn:sha1:ccd8399ff4937434c0d936a44f5db6ca1a93b237 Fix ignore/referencing logic. 2018-02-07T20:14:19Z Carl Hetherington cth@carlh.net 2018-02-07T20:14:19Z urn:sha1:8bfe295dcc4e1753ee1c89310108bc6bc034cd61 Whitespace. 2018-02-02T23:58:33Z Carl Hetherington cth@carlh.net 2018-02-02T23:58:33Z urn:sha1:a13c66be5c55a81fd9a57131cf25b2760e31f38e Prior to 2537a2d Decoder::position() was not updated if a decoder emitted 2018-02-02T23:47:46Z Carl Hetherington cth@carlh.net 2018-02-02T23:47:46Z urn:sha1:518be532a480173dfac962d5aca347a2388bb072 data which were ignored by the Player. 2537a2d changed this so that Decoder::position() is always updated, as it could not see the point of the previous behaviour. It now seems that the behaviour prior to 2537a2d fixed problems with cases like remake_with_subtitle_test. With this test the FFmpeg content happens to emit a final frame just after its end point with a gap before it. Code prior to 2537a2d handled this by making sure that FFmpegDecoder::flush() filled the gap (it reads VideoDecoder::position and fills the gap at the end of content accordingly). This no longer works if VideoDecoder::position is updated to take into account the emitted (and ignored) frame just after the end of the content. This commit re-fixes that problem by a different means; Player::video now fills the gaps in this case by more careful handling of received data which is off the end of the content.