summaryrefslogtreecommitdiff
path: root/libavcodec/ccaption_dec.c
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/ccaption_dec: Make real-time latency configurablePavel Koshevoy2021-06-181-1/+3
| | | | | | | | | | | Un-hardcode the 200ms minimum latency between emitting subtitle events so that those that wish to receive a subtitle event for every screen change could do so. The problem with delaying realtime output by any amount is that it is unknown when the next byte pair that would trigger output will happen. It may be within 200ms, or it may be several seconds later -- that's not realtime at all.
* avcodec: Mark ff_ass_subtitle_header based decoders as init-threadsafeAndreas Rheinhardt2021-05-021-0/+2
| | | | | | | ff_ass_subtitle_header_full() just uses av_asprintf() and is therefore thread-safe itself. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avcodec: Constify AVCodecsAndreas Rheinhardt2021-04-271-1/+1
| | | | | | | | | | Given that the AVCodec.next pointer has now been removed, most of the AVCodecs are not modified at all any more and can therefore be made const (as this patch does); the only exceptions are the very few codecs for external libraries that have a init_static_data callback. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec/ccaption_dec: add support for background colorsPaul B Mahol2020-06-231-4/+64
|
* avcodec/ccaption_dec: use uint8_t type for prev_cmd arrayPaul B Mahol2020-06-201-1/+1
| | | | Commands are unsigned so be consistent.
* avcodec/ccaption_dec: do not modify packet data in case of parity errorPaul B Mahol2020-06-201-8/+8
| | | | To dissallow similar errors in future, make pointers const.
* avcodec/ccaption_dec: allow selection of second field captionsPaul B Mahol2020-06-201-3/+12
|
* avcodec/ccaption_dec: rework non-real-time mode with pop-on captions by delayingPaul B Mahol2020-06-201-49/+68
| | | | So it give similar output as visual output of real-time mode.
* avcodec/ccaption_dec: do not modify pkt data and stop removing parity bit twicePaul B Mahol2020-06-171-6/+1
|
* avcodec/ccaption_dec: remove usage of extra bufferPaul B Mahol2020-06-161-12/+1
|
* avcodec/ccaption_dec: fix some small style issuesPaul B Mahol2020-06-161-6/+5
|
* avcodec/ccaption_dec: remove pts parameter from handle_char()Paul B Mahol2020-06-161-4/+4
|
* avcodec/ccaption_dec: add support for colorsPaul B Mahol2020-06-151-8/+35
|
* avcodec/ccaption_dec: switch active screen in end of caption earlyPaul B Mahol2020-06-131-1/+2
| | | | Fixes dropping of last caption.
* avcodec/ccaption_dec: remove unused arguments from functionPaul B Mahol2020-06-131-2/+2
|
* avcodec/ccaption_dec: check for error codesPaul B Mahol2020-06-131-12/+25
|
* avcodec/ccaption_dec: Add a blank like at the end to avoid rollup reading ↵Michael Niedermayer2019-04-211-4/+4
| | | | | | | | | | | from outside Fixes: index 20 out of bounds for type 'const char *[4][128]' Fixes: 14367/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CCAPTION_fuzzer-5718819672162304 Reviewed-by: Paul B Mahol <onemda@gmail.com> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodecc/ccaption_dec: remove extra word from long codec descriptionPaul B Mahol2017-01-251-1/+1
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avcodec/ccaption_dec: Use simple array instead of AVBufferMichael Niedermayer2016-09-091-16/+11
| | | | | | | | | | This is simpler and fixes an out of array read, fixing it with AVBuffers would be more complex Fixes: e00d9e6e50e5495cc93fea41147b97bb/asan_heap-oob_12dcdbb_8798_b32a97ea722dd37bb5066812cc674552.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/ccaption_dec: default rollup to row 10Aman Gupta2016-07-181-1/+2
| | | | | | | | | This ensures that captions are written towards the bottom of the screen when tuning into mid-stream. The row will be reset on the receipt of the next PAC command. Row 10 was chosen as it corresponds to the value of "0" in a PAC (see row_map in handle_pac()). Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/ccaption_dec: implement positioning for closed captionsAman Gupta2016-07-181-3/+26
| | | | | | Positioning math is based on the guidelines in https://dvcs.w3.org/hg/text-tracks/raw-file/default/608toVTT/608toVTT.html#positioning-in-cea-608 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/ccaption_dec: change write_char() to void as return value is unusedAman Gupta2016-07-171-4/+4
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/ccaption_dec: Fix mixed declaration and statement.Michael Niedermayer2016-06-281-1/+2
| | | | | Found-by: ubitux Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/ccaption_dec: implement tab offset commandsAman Gupta2016-06-281-0/+5
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavc/ccaption_dec: remove usage of avctx->time_baseClément Bœsch2016-04-021-7/+8
| | | | | | | | | | lavc/utils already rescales avpkt->pts to sub->pts in AV_TIME_BASE_Q before calling the decode callback. This prevents from rescaling again into the decoder, and avoid the use of avctx->time_base which will disappear in the incoming codecpar merge. This commit also replaces the use of "20 centisecond" (ass time base) with "200 ms".
* lavc/options: add ass_ro_flush_noop to flags2Clément Bœsch2016-02-261-1/+2
|
* lavc: allow subtitle text format to be ASS without timingClément Bœsch2016-02-261-13/+11
|
* lavc/ccaption_dec: implement special and extended character setsAman Gupta2016-02-171-3/+149
| | | | character sets implemented as defined in https://en.wikipedia.org/wiki/EIA-608#Characters
* lavc/ccaption_dec: do not ignore repeated character commandsAman Gupta2016-02-171-9/+10
| | | | | | | | | | | control codes in a cc stream can be repeated, and must be ignored. however, repeated characters must not be ignored. the code attempted to wipe prev_cmd in handle_char to allow repeated characters to be processed, but prev_cmd would previously get reset _after_ handle_char() i also moved the prev_cmd reset out from handle_char() so it can be re-used for special character sets, which _must_ be ignored when repeated.
* avcodec/ccaption_dec: Fix mixed declarations and codeMichael Niedermayer2016-01-191-1/+2
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavc/ccaption_dec: clear all unused rows during rollupAman Gupta2016-01-141-1/+4
| | | | | | Sometimes rollup captions can move around the screen. This fixes "ghost" captions from below the current rollup area from continuing to be captured when a rollup moves higher up on the screen.
* lavc/ccaption_dec: clean up whitespaceAman Gupta2016-01-141-2/+1
|
* lavc/ccaption_dec: implement real_time optionAman Gupta2016-01-141-8/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new mode is useful for realtime decoding of closed captions so they can be display along with mpeg2 frames. Closed caption streams contain two major types of captions: - POPON captions, which are buffered off-screen and displayed only after EOC (end of caption, aka display buffer) - PAINTON/ROLLUP captions, which are written to the display as soon as they arrive. In a typical real-time eia608 decoder, commands like EOC (end of caption; display buffer), EDM (erase display memory) and EBM (erase buffered memory) perform their expected functions as soon as the commands are processed. This is implemented in the real_time branches added in this commit. Before this commit, and in the !real_time branches after this commit, the decoder cleverly implements its own version of the decoder which is specifically geared towards buffered decoding. It does so by actively ignoring commands like EBM (erase buffered memory), and then re-using the non-display buffer to hold the previous caption while the new one is received. This is the opposite of the real-time decoder, which uses the non-display buffer to hold the new caption while the display buffer is still showing the current caption. In addition to ignoring EBM, the buffered decoder also has custom implementations for EDM and EOC. An EDM (erase display memory) command flushes the existing contents before clearing the screen, and EOC similarly always flushes the active buffer (the previous subtitle) before flipping buffers.
* lavc/ccaption_dec: flush context on seekAman Gupta2016-01-141-0/+19
|
* lavc/ccaption_dec: improve default styleClément Bœsch2016-01-101-1/+9
| | | | Use monospaced font, and a black box outline.
* lavc/ccaption_dec: fix ASS tagsClément Bœsch2016-01-101-6/+6
|
* lavc/ccaption_dec: simplify rollup casesClément Bœsch2016-01-091-7/+1
|
* lavc/ccaption_dec: check for bprint completeness outside the loopClément Bœsch2016-01-091-10/+3
|
* lavc/ccaption_dec: mark row and font as const in capture_screen()Clément Bœsch2016-01-091-2/+2
|
* lavc/ccaption_dec: fix mixed declarations and code warningClément Bœsch2016-01-091-1/+2
|
* lavc/ccaption_dec: check for bprint completeness only at the endClément Bœsch2016-01-091-5/+0
|
* lavc/ccaption_dec: implement font stylesAman Gupta2016-01-091-5/+50
|
* lavc/ccaption_dec: simplify by incrementing cursor_column inside write_char()Aman Gupta2016-01-091-15/+6
|
* lavc/ccaption_dec: simplify by passing screen into write_char()Aman Gupta2016-01-091-13/+11
|
* lavc/ccaption_dec: extract capture_screen() for future useAman Gupta2016-01-091-3/+8
| | | | | | unlike reap_screen(), capture_screen() can be used to populate buffer without touching the timestamps. this is useful for upcoming commits which implement a real time caption stream.
* lavc/ccaption_dec: clear buffer before populating with screen contentsAman Gupta2016-01-091-1/+1
|
* lavc/ccaption_dec: centralize buffer_changed=1 into reap_screenAman Gupta2016-01-091-2/+1
|
* lavc/ccaption_dec: rename screen_changed to buffer_changedAman Gupta2016-01-091-5/+5
|
* lavc/ccaption_dec: extract ass time base into constantAman Gupta2016-01-091-2/+4
|
* lavc/ccaption_dec: combine ROLLUP modes as they are identicalAman Gupta2016-01-091-10/+6
|
View Lorry Controller Status