dcpomatic/src/lib/subtitle_decoder.h, branch v2.10.4 DCP-o-matic DCP tools https://git.carlh.net/cgit/dcpomatic/atom?h=v2.10.4 2016-10-07T23:45:22Z Fix overlapping burnt-in subtitles in some cases (#959). 2016-10-07T23:45:22Z Carl Hetherington cth@carlh.net 2016-10-07T23:45:22Z urn:sha1:37494990bbe81f41f581de8258dc7353b82d662d Firstly, when finding subtitles that exist during a period, only return those which overlap more than half the period. This means that, in a fight over a frame, the longest-running subtitle in that frame will win. Secondly, make SubtitleDecoder::get pick the wanted subtitles from the cache simply by comparing their periods to those that were requested. I think this is nicer than what was there before (basically reevaulating 'what subtitle(s) for this period') and also makes the first part of this commit effective. Make the preview respond to changes in subtitle line spacing. 2016-07-01T00:05:06Z Carl Hetherington cth@carlh.net 2016-06-29T23:20:49Z urn:sha1:9b7e3d7d992f64da4bc78bc99d1eb706f181b798 Fix some code duplication and crashes when decoding FFmpeg-embedded ASS subtitles along the way. 2016-06-09T22:28:41Z Carl Hetherington cth@carlh.net 2016-06-09T22:28:41Z urn:sha1:31a33018f113cb7b631dd7bb4d0ed2a7de914cd8 No-op; fix GPL address and use the explicit-program-name version. 2016-05-25T19:56:58Z Carl Hetherington cth@carlh.net 2016-05-25T19:56:58Z urn:sha1:3828baf56467224f5d44049bf1e7a7ed11f43a05 Rename some methods. 2016-05-18T10:50:29Z Carl Hetherington cth@carlh.net 2016-05-10T13:37:57Z urn:sha1:0758d834992f0adb8aa8d4d9908a64ce8708f05c Basics of splitting up Decoder tree like Content. 2016-05-18T10:50:29Z Carl Hetherington cth@carlh.net 2016-05-10T13:29:14Z urn:sha1:504c63b3d62038bc486ca8a09e77fbb403907edd Add appearance dialog for SubRip subtitles. 2015-11-08T15:00:58Z Carl Hetherington cth@carlh.net 2015-11-08T15:00:58Z urn:sha1:3b932abd0c7634483911e1d5361e12b2d094ae6f Reinstate subtitle speed-up patch 526fd6de4c80a7ac9614a1cb0209efff7b171cd5 but only for preview. 2015-10-26T09:37:29Z Carl Hetherington cth@carlh.net 2015-10-26T09:37:29Z urn:sha1:2e62b2c0de47fc8e5bcb5466b2876f9b23d2ae84 Rest of src/lib/*.h tidying. 2015-08-26T18:26:41Z Carl Hetherington cth@carlh.net 2015-08-26T18:26:41Z urn:sha1:dd8a7d1bbb8f2afb1b98d2be856ff0a9920e180d Fix missing subtitles in some cases. 2015-06-26T21:02:00Z Carl Hetherington cth@carlh.net 2015-06-26T21:02:00Z urn:sha1:c8ff422a42eac30517a7acde57ab84e55449f4e4 We were passing subtitles back from decoders to SubtitleDecoder using dcp::SubtitleStrings and relying on their storage of time to know when the subtitles were. These times are quantised (by the use of dcp::SubtitleString) and then compared with unquantised times (kept as ContentTime) in the main checking loop in SubtitleDecoder::get(). Fix this by storing periods as ContentTimePeriod as well as in the dcp::SubtitleStrings.