summaryrefslogtreecommitdiff
path: root/src/lib/encoder.h
AgeCommit message (Collapse)Author
2018-07-23More automated renaming.Carl Hetherington
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
2018-07-19Reword again: Text -> Caption and Plain -> Text.Carl Hetherington
sed -i "s/ActiveText/ActiveCaptions/g" src/lib/*.{cc,h} sed -i "s/active_text.h/active_captions.h/g" src/lib/*.{cc,h} sed -i "s/active_text.cc/active_captions.cc/g" src/lib/wscript mv src/lib/active_text.cc src/lib/active_captions.cc mv src/lib/active_text.h src/lib/active_captions.h sed -i "s/PlainTextFileContent/TextCaptionFileContent/g" src/lib/*.{cc,h} src/wx/*.cc sed -i "s/PlainTextFile/TextCaptionFile/g" src/lib/*.{cc,h} src/wx/*.cc sed -i "s/plain_text_file_content/text_caption_file_content/g" src/lib/*.{cc,h} src/lib/wscript src/wx/*.{cc,h} test/*.cc mv src/lib/plain_text_file_content.cc src/lib/text_caption_file_content.cc mv src/lib/plain_text_file_content.h src/lib/text_caption_file_content.h sed -i "s/PlainTextFileDecoder/TextCaptionFileDecoder/g" src/lib/*.{cc,h} sed -i "s/plain_text_file_decoder/text_caption_file_decoder/g" src/lib/*.{cc,h} src/lib/wscript src/wx/*.{cc,h} mv src/lib/plain_text_file_decoder.cc src/lib/text_caption_file_decoder.cc mv src/lib/plain_text_file_decoder.h src/lib/text_caption_file_decoder.h sed -i "s/PlayerText/PlayerCaption/g" src/lib/*.{cc,h} sed -i "s/player_text.cc/player_caption.cc/g" src/lib/wscript sed -i "s/player_text.h/player_caption.h/g" src/lib/*.{cc,h} mv src/lib/player_text.cc src/lib/player_caption.cc mv src/lib/player_text.h src/lib/player_caption.h sed -i "s/ContentPlainText/ContentTextCaption/g" src/lib/*.{cc,h} src/wx/*.{cc,h} sed -i "s/ContentBitmapText/ContentBitmapCaption/g" src/lib/*.{cc,h} src/wx/*.{cc,h} sed -i "s/PlainText/TextCaption/g" src/lib/*.{cc,h} test/*.cc sed -i "s/plain_text.h/text_caption.h/g" src/lib/*.{cc,h} mv src/lib/plain_text.h src/lib/text_caption.h
2018-07-19Partial conversion of PlayerSubtitles -> PlayerText and SubtitleString -> ↵Carl Hetherington
PlainText.
2017-07-26Basic multithread of DCP decryption during export.Carl Hetherington
2017-05-23Try to stop crashes when tests are torn down.Carl Hetherington
2017-05-10Rename some classes.Carl Hetherington
2017-05-09Basic GUI for export.Carl Hetherington
2017-04-19Various Doxygen fixes.Carl Hetherington
2017-04-19Attempt to tidy up internal APIs slightly.Carl Hetherington
2016-06-20Encoder shutdown fixes.Carl Hetherington
Two fixes here; prevent the servers-list-changed callback being called when Encoder is being destroyed, and stop ~Encoder throwing exceptions. I'm not sure if the catch (...) in ~Encoder will hide problems that we should be handling, but I think by the time ~Encoder is happening we'll already have seen any exceptions that we need to report.
2016-06-14Clean up of 3D->2D conversion.Carl Hetherington
It makes slightly more sense to discard 2D in the Transcoder rather than the Encoder. Unfortunately this requires quite invasive changes, mainly to remove Encoder::_position and instead derive this information from the PlayerVideo that is being handled. This is also nicer than before, I think. A notable change is that in player.cc; using time rather than content_video_to_dcp(). This means we are assuming that the decoder returns video at the time we ask it to, rather than checking what it has returned. I can't think of a problem with this (yet).
2016-06-07Remove some flawed condition manipulation.Carl Hetherington
I think this stuff is unnecessary as wait() is interruptible by boost::thread::interrupt. Hence instead of setting a flag then signalling the condition we can just do interrupt(), the exception will be thrown and that's that.
2016-05-25No-op; fix GPL address and use the explicit-program-name version.Carl Hetherington
2015-12-11Rename Server -> EncodeServer, ServerFinder -> EncodeServerFinder, ↵Carl Hetherington
ServerDescription -> EncodeServerDescription.
2015-12-09Remove unused variable.Carl Hetherington
2015-10-22Various multi-reel fixes.Carl Hetherington
* _video_frames_enqueued -> _position * some int -> Frame replacements * Call Writer::ref_write when there is nothing to encode / write for one frame. * Assume Encoder::encode is called once per output video frame. * Possibly correct some off-by-1 overlap bugs. * Don't reset _last_written on FAKE write as I believe there is no need.
2015-09-02Don't share _terminate.Carl Hetherington
_terminate was being shared between enqueue() and the encoding threads so that when terminating and recreating the encoding threads any pending enqueue() was dropped (#683).
2015-09-01Hack to remove boost atomic dependency.Carl Hetherington
2015-09-01Try to fix build.Carl Hetherington
2015-09-01Protect _threads with a mutex since it may be updated fromCarl Hetherington
the GUI thread (via ServersChanged) or from the job thread (via end ()).
2015-08-26Separate ExceptionStore.Carl Hetherington
2015-08-26Include tidying src/lib/a-j*.hCarl Hetherington
2015-08-19Fix loss of host's encoding threads when servers list changes.Carl Hetherington
2015-08-18Include trimming.Carl Hetherington
2015-07-14Port 65514eea7705fb12985cef448f08ceb47db6acab from 1.x; failure to handle ↵Carl Hetherington
separate-eye 3D when R comes before L in the playlist.
2015-07-06Better updating of servers list when things change.Carl Hetherington
2015-06-21No-op: remove all trailing whitespace.Carl Hetherington
2015-06-19No-op; variable renaming.Carl Hetherington
2015-06-10Resurrect neater repeat-write handling.Carl Hetherington
2015-06-10Rename EncodedData -> Data and trim it a bit.Carl Hetherington
2015-03-16Hand-apply 33b76b675d747fd828aba91d9d857227cb8a8244 from master; make sure ↵Carl Hetherington
signals are disconnected in the right places.
2015-02-03Comment fix.Carl Hetherington
2014-12-05Some include tidying.Carl Hetherington
2014-07-02Clarify that Encoder really just manages video encoding.Carl Hetherington
2014-07-01DCPVideoFrame -> DCPVideo and PlayerVideoFrame -> PlayerVideo.Carl Hetherington
2014-06-26Merge master.Carl Hetherington
2014-06-26Use full/empty conditions rather than just a single condition for the server ↵Carl Hetherington
and encoder.
2014-06-20Merge master; fix destruction of Server; some test cleanups.Carl Hetherington
2014-05-20Merge master.Carl Hetherington
2014-05-14Move Eyes and ColourConversion into PlayerVideoFrame.Carl Hetherington
2014-05-14Rename PlayerImage to PlayerVideoFrame and give it its own file.Carl Hetherington
2014-03-25It builds.Carl Hetherington
2014-03-03Try to prevent OS X from sleeping during DCP encode.Carl Hetherington
2013-12-30Catch exceptions from Encoder threads.Carl Hetherington
2013-12-04Suspend scale / crop / window / subtitle overlay until we decide that a ↵Carl Hetherington
frame is going to be used.
2013-11-09Fix a few memory leaks.Carl Hetherington
2013-11-06Various bits of server tidying up.Carl Hetherington
2013-11-06Add some missing test stuff; split server discovery off into ServerFinder.Carl Hetherington
2013-11-05Add multiple threads for servers with multiple processing threads.Carl Hetherington
2013-11-05Various work on server discovery; works on localhost.Carl Hetherington