dcpomatic/src/lib/decoder.h, branch v2.14.40DCP-o-matic DCP toolshttps://git.carlh.net/cgit/dcpomatic/atom?h=v2.14.402020-01-09T23:52:20ZGive DCPDecoder its own ::position which just returns its internal2020-01-09T23:52:20ZCarl Hetheringtoncth@carlh.net2020-01-09T23:52:20Zurn:sha1:4285355ff2bec853924647f0523d121860fe64e3
_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.
Put Film pointer into Decoder.2018-11-21T02:45:30ZCarl Hetheringtoncth@carlh.net2018-11-21T02:45:30Zurn:sha1:84012cdd64f451891febd36154b7226ea21a899bTake Film pointer out of Content.2018-11-21T01:59:04ZCarl Hetheringtoncth@carlh.net2018-11-21T01:59:04Zurn:sha1:254b3044d72de6b033d7c584f5abd2b9aa70aad5Tidy up after mass rename.2018-07-23T14:10:11ZCarl Hetheringtoncth@carlh.net2018-07-23T14:10:11Zurn:sha1:a5c629cb9b638b67a0e4c2d26fe9ab2e124bf0ebMore automated renaming.2018-07-23T10:20:12ZCarl Hetheringtoncth@carlh.net2018-07-23T10:20:12Zurn:sha1:df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc
ActiveCaptions -> ActiveText
BitmapCaption -> BitmapText
ContentCaption -> ContentText
ContentTextCaption -> ContentStringText
TextCaptionFileContent -> StringTextFileContent
TextCaptionFileDecoder -> StringTextFileDecoder
TextCaptionFile -> StringTextFile
TextCaption -> StringText
PlayerCaption -> PlayerText
CaptionContent -> TextContent
CaptionDecoder -> TextDecoder
CaptionPanel -> TextPanel
CaptionView -> TextView
CaptionAppearanceDialog -> SubtitleAppearanceDialog
CaptionType -> TextType
Basics of multiple captions per content so that DCPContent can2018-07-21T14:16:18ZCarl Hetheringtoncth@carlh.net2018-07-21T14:16:18Zurn:sha1:cbd4450197a083bf58bda510e626f73ba583cb66
hold subs and closed captions.
Clean up after previous commit.2018-07-19T22:45:23ZCarl Hetheringtoncth@carlh.net2018-07-19T21:44:53Zurn:sha1:27b83475435dda4e84a90cf59a52f150905c4ab1Rename Subtitle -> Text2018-07-19T22:36:56ZCarl Hetheringtoncth@carlh.net2018-06-11T22:50:59Zurn:sha1:d7ac100c0eb1b5efdcfbec59be870fd869252840
sed -i "s/SubtitleContent/TextContent/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc test/*.cc
sed -i "s/SubtitleDecoder/TextDecoder/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc test/*.cc
sed -i "s/subtitle_content/text_content/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc test/*.cc src/lib/wscript src/wx/wscript
sed -i "s/subtitle_decoder/text_decoder/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc test/*.cc src/lib/wscript
mv src/lib/subtitle_decoder.cc src/lib/text_decoder.cc
mv src/lib/subtitle_decoder.h src/lib/text_decoder.h
mv src/lib/subtitle_content.cc src/lib/text_content.cc
mv src/lib/subtitle_content.h src/lib/text_content.h
mv src/lib/dcp_subtitle_decoder.cc src/lib/dcp_text_decoder.cc
mv src/lib/dcp_subtitle_decoder.h src/lib/dcp_text_decoder.h
mv src/lib/dcp_subtitle_content.cc src/lib/dcp_text_content.cc
mv src/lib/dcp_subtitle_content.h src/lib/dcp_text_content.h
mv src/lib/text_subtitle_content.cc src/lib/text_text_content.cc
mv src/lib/text_subtitle_content.h src/lib/text_text_content.h
mv src/lib/text_subtitle_decoder.cc src/lib/text_text_decoder.cc
mv src/lib/text_subtitle_decoder.h src/lib/text_text_decoder.h
mv src/wx/timeline_subtitle_content_view.cc src/wx/timeline_text_content_view.cc
mv src/wx/timeline_subtitle_content_view.h src/wx/timeline_text_content_view.h
No need for position() to be virtual.2018-01-02T20:56:04ZCarl Hetheringtoncth@carlh.net2018-01-02T20:56:04Zurn:sha1:e7adac0f25e0d2a38be56e4477ed78b8b34b8b34Fix merging of audio in various circumstances.2017-04-19T22:04:32ZCarl Hetheringtoncth@carlh.net2017-02-26T01:40:30Zurn:sha1:58dce923b9d438a27ce1cd7e3125370f74d46e3a