FFmpeg

Commit Graph

Author	SHA1	Message	Date
Andreas Rheinhardt	7001ff74ba	avformat/aviobuf: Add ffio_init_(read\|write)_context() Most users of ffio_init_context() simply want to wrap a buffer into an AVIOContext; they do not provide function pointers at all. Therefore this commit adds shortcuts for these two common operations. This also allows to accept const data when reading (i.e. the const is now cast away at a central place in ffio_init_read_context() instead of at several callers). This also allows to constify the data in ff_text_init_buf(). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>	1 year ago
Reimar Döffinger	c0f867bf50	libavformat: fix incorrect handling of incomplete AVBPrint. Change some internal APIs a bit to make it harder to make such mistakes. In particular, have the read chunk functions return an error when the result is incomplete. This might be less flexible, but since there has been no use-case for that so far, avoiding coding mistakes seems better. Add a function to queue a AVBPrint directly (ff_subtitles_queue_insert_bprint). Also fixes a leak in lrcdec when ff_subtitles_queue_insert fails. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>	1 year ago
Andreas Rheinhardt	45bfe8b838	avformat/avio: Move internal AVIOContext fields to avio_internal.h Currently AVIOContext's private fields are all over AVIOContext. This commit moves them into a new structure in avio_internal.h instead. Said structure contains the public AVIOContext as its first element in order to avoid having to allocate a separate AVIOContextInternal which is costly for those use cases where one just wants to access an already existing buffer via the AVIOContext-API. For these cases ffio_init_context() can't fail and always returned zero, which was typically not checked. Therefore it has been made to not return anything. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>	3 years ago
Andreas Rheinhardt	ea5bdc8893	avformat/subtitles: Deduplicate subtitles' read_(packet\|seek\|close) Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>	3 years ago
James Almer	98a776b5e3	avformat/subtitles: use av_packet_alloc() to allocate packets Signed-off-by: James Almer <jamrial@gmail.com>	4 years ago
Paul B Mahol	6347146e3d	avformat/subtitles: ignore extra '\r' at line endings	6 years ago
wm4	c216324a7f	avformat/subtitles: make dropping duplicate events optional	9 years ago
Clément Bœsch	342ead4491	avformat/subtitles: improve ff_subtitles_queue_finalize() doxy	9 years ago
Clément Bœsch	af924fd9e4	avformat/subtitles: forward log context in ff_subtitles_queue_finalize() for logging	9 years ago
Michael Niedermayer	a633928d47	avformat/subtitles: Use size_t for len string length could theoretically be larger than int Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	10 years ago
Carl Eugen Hoyos	19a6431ec2	Print a warning if a subtitle demuxer changes utf16 to utf8. This does not fix anything but gives users a chance to know that they must not pass -sub_charenc UTF-16 to ffmpeg. Fixes ticket #4059.	10 years ago
wm4	b7f641dc9b	avformat/realtextdec: UTF-16 support Also remove ff_smil_extract_next_chunk - this was the last user of it.	10 years ago
wm4	231a514dd3	avformat/samidec: UTF-16 support ff_smil_extract_next_chunk() is still used by RealText.	10 years ago
wm4	d658ef18e3	avformat/srtdec: UTF-16 support	10 years ago
wm4	3e8426170c	avformat/assdec: UTF-16 support Use the UTF-16 BOM to detect UTF-16 encoding. Convert the file contents to UTF-8 on the fly using FFTextReader, which acts as converting wrapper around AVIOContext. It also can work on a static buffer, needed for format probing. The FFTextReader wrapper now also takes care of skipping the UTF-8 BOM. Fix Ticket #3496.	10 years ago
Clément Bœsch	dbfe61100b	avformat/vobsub: fix several issues. Here is an extract of fate-samples/sub/vobsub.idx, with an additional text at the end of each line to better identify each bitmap: timestamp: 00:04:55:445, filepos: 00001b000 Ace! timestamp: 00:05:00:049, filepos: 00001b800 Wake up, honey! timestamp: 00:05:02:018, filepos: 00001c800 I gotta go to work. timestamp: 00:05:02:035, filepos: 00001d000 <???> timestamp: 00:05:04:203, filepos: 00001d800 Look after Clayton, okay? timestamp: 00:05:05:947, filepos: 00001e800 I'll be back tonight. timestamp: 00:05:07:957, filepos: 00001f800 Bye! Love you. timestamp: 00:05:21:295, filepos: 000020800 Hey, Ace! What's up? timestamp: 00:05:23:356, filepos: 000021800 Hey, how's it going? timestamp: 00:05:24:640, filepos: 000022800 Remember what today is? The 3rd! timestamp: 00:05:27:193, filepos: 000023800 Look over there! timestamp: 00:05:28:369, filepos: 000024800 Where are they going? timestamp: 00:05:28:361, filepos: 000025000 <???> timestamp: 00:05:29:946, filepos: 000025800 Let's go see. timestamp: 00:05:31:230, filepos: 000026000 I can't, man. I got Clayton. Note the two "<???>": they are basically split subtitles (with the previous one), which the dvdsub decoder is now supposed to reconstruct with a previous commit. But also note that while the first chunk has increasing timestamps, timestamp: 00:05:02:018, filepos: 00001c800 timestamp: 00:05:02:035, filepos: 00001d000 ...it's not the case of the second one (and this is not an exception in the original file): timestamp: 00:05:28:369, filepos: 000024800 timestamp: 00:05:28:361, filepos: 000025000 For the dvdsub decoder, they need to be "filepos'ed" ordered, but the FFDemuxSubtitlesQueue is timestamps ordered, which is the reason of the introduction of a sub sort method in the context, to allow giving priority to the position, and then the timestamps. With that change, the dvdsub decoder get fed with ordered packets. Now the packet size estimation was also broken: the filepos differences in the vobsub index defines the full data read between two subtitles chunks, and it is necessary to take into account what is read by the mpegps_read_pes_header() function since the length returned by that function doesn't count the size of the data it reads. This is fixed with the introduction of total_read, and {old,new}_pos. By doing this change, we can drop the unreliable len16 heuristic and simplify the whole loop. Note that mpegps_read_pes_header() often read more than one PES packet (typically in one call it can read 0x1ba and 0x1be chunk along with the relevant 0x1bd packet), which triggers the "total_read + pkt_size > psize" check. This is an expected behaviour, which could be avoided by having a more chunked version of mpegps_read_pes_header(). The latest change is the extraction of each stream into its own subtitles queue. If we don't do this, the maximum size for a subtitle chunk is broken, and the previous changes can not work. Having each stream in a different queue requires some little adjustments in the seek code of the demuxer. This commit is only meaningful as a whole change and can not be easily split. The FATE test changes because it uses the vobsub demuxer.	11 years ago
Alexander Strasser	069010ffae	lavf/subtitles: Make comment less arrogant Signed-off-by: Alexander Strasser <eclipse7@gmx.net>	11 years ago
Clément Bœsch	378a830e7b	avformat/subtitles: support standalone CR (MacOS). Recent .srt files with CR only were found in the wild.	11 years ago
Clément Bœsch	90fc00a623	avformat/subtitles: add a next line jumper and use it. This fixes a bunch of possible overread in avformat with the idiom p += strcspn(p, "\n") + 1 (strcspn() can focus on the trailing '\0' if no '\n' is found, so the +1 leads to an overread). Note on lavf/matroskaenc: no extra subtitles.o Makefile dependency is added because only the header is required for ff_subtitles_next_line(). Note on lavf/mpsubdec: code gets slightly complex to avoid an infinite loop in the probing since there is no more forced increment.	11 years ago
Clément Bœsch	949506191a	lavf/subtitles: fix CLRF/CRLF typo.	12 years ago
Clément Bœsch	d9ac8d2967	lavf: move srtdec:read_chunk() to subtitles utils. This function can be useful for various other subtitles formats.	12 years ago
Clément Bœsch	ff3624b1ad	lavf/subtitles: add ff_subtitles_queue_seek(). This function is almost identical to lavf/assdec:read_seek2(). It performs a generic seek for text subtitles demuxers for the new seeking API. The only difference with assdec:read_seek2 is the ts_diff being unsigned to avoid overflows. The seek callback in the ASS demuxer will be removed when it is redesigned to use FFDemuxSubtitlesQueue.	12 years ago
Clément Bœsch	d948893dbd	lavf/subtitles: add some SMIL helpers. This is needed for SAMI and RealText demuxers.	13 years ago
Clément Bœsch	7c9f9685ae	lavf: add internal demuxer helpers for subtitles.	13 years ago

24 Commits (8661b5e8f9e63d2775978f2aa3ee6fae4d515c53)