FFmpeg

Commit Graph

Author	SHA1	Message	Date
Paul B Mahol	001748b326	avcodec/ccaption_dec: add support for background colors	4 years ago
Paul B Mahol	00842b3a0d	avcodec/ccaption_dec: use uint8_t type for prev_cmd array Commands are unsigned so be consistent.	4 years ago
Paul B Mahol	bd1b78e91a	avcodec/ccaption_dec: do not modify packet data in case of parity error To dissallow similar errors in future, make pointers const.	4 years ago
Paul B Mahol	bbd0be04d0	avcodec/ccaption_dec: allow selection of second field captions	4 years ago
Paul B Mahol	c6791a32b4	avcodec/ccaption_dec: rework non-real-time mode with pop-on captions by delaying So it give similar output as visual output of real-time mode.	4 years ago
Paul B Mahol	c0974355c7	avcodec/ccaption_dec: do not modify pkt data and stop removing parity bit twice	4 years ago
Paul B Mahol	9887bcc6c6	avcodec/ccaption_dec: remove usage of extra buffer	4 years ago
Paul B Mahol	d5b1760665	avcodec/ccaption_dec: fix some small style issues	4 years ago
Paul B Mahol	3615b58693	avcodec/ccaption_dec: remove pts parameter from handle_char()	4 years ago
Paul B Mahol	cb98483ea0	avcodec/ccaption_dec: add support for colors	4 years ago
Paul B Mahol	0c2623d3aa	avcodec/ccaption_dec: switch active screen in end of caption early Fixes dropping of last caption.	4 years ago
Paul B Mahol	847d0b99de	avcodec/ccaption_dec: remove unused arguments from function	4 years ago
Paul B Mahol	6995ea3506	avcodec/ccaption_dec: check for error codes	4 years ago
Michael Niedermayer	f17e8e90bb	avcodec/ccaption_dec: Add a blank like at the end to avoid rollup reading 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>	6 years ago
Paul B Mahol	b4a13d442a	avcodecc/ccaption_dec: remove extra word from long codec description Signed-off-by: Paul B Mahol <onemda@gmail.com>	8 years ago
Michael Niedermayer	752e6dfa3e	avcodec/ccaption_dec: Use simple array instead of AVBuffer 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>	8 years ago
Aman Gupta	a49ed9e32d	avcodec/ccaption_dec: default rollup to row 10 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>	8 years ago
Aman Gupta	9ca9671458	avcodec/ccaption_dec: implement positioning for closed captions 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>	8 years ago
Aman Gupta	309322ef65	avcodec/ccaption_dec: change write_char() to void as return value is unused Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	8 years ago
Michael Niedermayer	6cc4c42226	avcodec/ccaption_dec: Fix mixed declaration and statement. Found-by: ubitux Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	9 years ago
Aman Gupta	4448f16ef5	avcodec/ccaption_dec: implement tab offset commands Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	9 years ago
Clément Bœsch	d8620158c7	lavc/ccaption_dec: remove usage of avctx->time_base 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".	9 years ago
Clément Bœsch	30e7685360	lavc/options: add ass_ro_flush_noop to flags2	9 years ago
Clément Bœsch	2941282124	lavc: allow subtitle text format to be ASS without timing	9 years ago
Aman Gupta	5f5467e749	lavc/ccaption_dec: implement special and extended character sets character sets implemented as defined in https://en.wikipedia.org/wiki/EIA-608#Characters	9 years ago
Aman Gupta	2f26b67d55	lavc/ccaption_dec: do not ignore repeated character commands 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.	9 years ago
Michael Niedermayer	22f64c2324	avcodec/ccaption_dec: Fix mixed declarations and code Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	9 years ago
Aman Gupta	3a0e5cfcee	lavc/ccaption_dec: clear all unused rows during rollup 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.	9 years ago
Aman Gupta	9027806e3c	lavc/ccaption_dec: clean up whitespace	9 years ago
Aman Gupta	5c041e2ccc	lavc/ccaption_dec: implement real_time option 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.	9 years ago
Aman Gupta	260e368717	lavc/ccaption_dec: flush context on seek	9 years ago
Clément Bœsch	6d32628bf3	lavc/ccaption_dec: improve default style Use monospaced font, and a black box outline.	9 years ago
Clément Bœsch	a43deea861	lavc/ccaption_dec: fix ASS tags	9 years ago
Clément Bœsch	0948e0f553	lavc/ccaption_dec: simplify rollup cases	9 years ago
Clément Bœsch	22765140fa	lavc/ccaption_dec: check for bprint completeness outside the loop	9 years ago
Clément Bœsch	31bff21d2c	lavc/ccaption_dec: mark row and font as const in capture_screen()	9 years ago
Clément Bœsch	d587fbb676	lavc/ccaption_dec: fix mixed declarations and code warning	9 years ago
Clément Bœsch	5ae07914d0	lavc/ccaption_dec: check for bprint completeness only at the end	9 years ago
Aman Gupta	b7e64be8fb	lavc/ccaption_dec: implement font styles	9 years ago
Aman Gupta	086093c77c	lavc/ccaption_dec: simplify by incrementing cursor_column inside write_char()	9 years ago
Aman Gupta	811ce8f9c5	lavc/ccaption_dec: simplify by passing screen into write_char()	9 years ago
Aman Gupta	080de371d8	lavc/ccaption_dec: extract capture_screen() for future use 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.	9 years ago
Aman Gupta	e521a32af2	lavc/ccaption_dec: clear buffer before populating with screen contents	9 years ago
Aman Gupta	7def844be8	lavc/ccaption_dec: centralize buffer_changed=1 into reap_screen	9 years ago
Aman Gupta	c75b869516	lavc/ccaption_dec: rename screen_changed to buffer_changed	9 years ago
Aman Gupta	8fd7f03c56	lavc/ccaption_dec: extract ass time base into constant	9 years ago
Aman Gupta	6049b15c0a	lavc/ccaption_dec: combine ROLLUP modes as they are identical	9 years ago
Aman Gupta	2693275c02	Revert "lavc/ccaption_dec: reap_screen() is responsible for clearing output buffer and signaling screen_changed" This reverts commit `53ee84f811`.	9 years ago
Aman Gupta	578b911b5e	Revert "lavc/ccaption_dec: implement "erase non displayed memory"" This reverts commit `26abdd61a3`.	9 years ago
Aman Gupta	23a50c8ab9	Revert "lavc/ccaption_dec: reap_screen is not necessary when clearing screen or buffer" This reverts commit `fe225b113b`.	9 years ago

1 2

74 Commits (f4e6aa609d7e8738c172aab2c0608e20ba3f779c)