FFmpeg

Commit Graph

Author	SHA1	Message	Date
Marton Balint	b96325e023	ass: move text_event_to_ass from textdec.c to ass.c and export it Signed-off-by: Marton Balint <cus@passwd.hu>	11 years ago
Marton Balint	0f0a8d9859	ass: fix error handling in ff_ass_add_subrect Signed-off-by: Marton Balint <cus@passwd.hu>	11 years ago
Marton Balint	f148954b0a	ass: factor out ff_ass_bprint_dialog Signed-off-by: Marton Balint <cus@passwd.hu>	11 years ago
Diego Biurrun	088f38a4f9	avcodec: Drop unnecessary ff_ name prefixes from static functions	12 years ago
Clément Bœsch	7c1a002c78	subtitles: introduce ASS codec id and use it. Currently, we have a AV_CODEC_ID_SSA, which matches the way the ASS/SSA markup is muxed in a standalone .ass/.ssa file. This means the AVPacket data starts with a "Dialogue:" string, followed by a timing information (start and end of the event as string) and a trailing CRLF after each line. One packet can contain several lines. We'll refer to this layout as "SSA" or "SSA lines". In matroska, this markup is not stored as such: it has no "Dialogue:" prefix, it contains a ReadOrder field, the timing information is not in the payload, and it doesn't contain the trailing CRLF. See [1] for more info. We'll refer to this layout as "ASS". Since we have only one common codec for both formats, the matroska demuxer is constructing an AVPacket following the "SSA lines" format. This causes several problems, so it was decided to change this into clean ASS packets. Some insight about what is changed or unchanged in this commit: CODECS ------ - the decoding process still writes "SSA lines" markup inside the ass fields of the subtitles rectangles (sub->rects[n]->ass), which is still the current common way of representing decoded subtitles markup. It is meant to change later. - new ASS codec id: AV_CODEC_ID_ASS (which is different from the legacy AV_CODEC_ID_SSA) - lavc/assdec: the "ass" decoder is renamed into "ssa" (instead of "ass") for consistency with the codec id and allows to add a real ass decoder. This ass decoder receives clean ASS lines (so it starts with a ReadOrder, is followed by the Layer, etc). We make sure this is decoded properly in a new ass-line rectangle of the decoded subtitles (the ssa decoder OTOH is doing a simple straightforward copy). Using the packet timing instead of data string makes sure the ass-line now contains the appropriate timing. - lavc/assenc: just like the ass decoder, the "ssa" encoder is renamed into "ssa" (instead of "ass") for consistency with the codec id, and allows to add a real "ass" encoder. One important thing about this encoder is that it only supports one ass rectangle: we could have put several dialogue events in the AVPacket (separated by a \0 for instance) but this would have cause trouble for the muxer which needs not only the start time, but also the duration: typically, you have merged events with the same start time (stored in the AVPacket->pts) but a different duration. At the moment, only the matroska do the merge with the SSA-line codec. We will need to make sure all the decoders in the future can't add more than one rectangle (and only one Dialogue line in it obviously). FORMATS ------- - lavf/assenc: the .ass/.ssa muxer can take both SSA and ASS packets. In the case of ASS packets as input, it adds the timing based on the AVPacket pts and duration, and mux it with "Dialogue:", trailing CRLF, etc. - lavf/assdec: unchanged; it currently still only outputs SSA-lines packets. - lavf/mkv: the demuxer can now output ASS packets without the need of any "SSA-lines" reconstruction hack. It will become the default at next libavformat bump, and the SSA support will be dropped from the demuxer. The muxer can take ASS packets since it's muxed normally, and still supports the old SSA packets. All the SSA support and hacks in Matroska code will be dropped at next lavf bump. [1]: http://www.matroska.org/technical/specs/subtitles/ssa.html	12 years ago
Clément Bœsch	1043cb8e80	lavc/ass: use bprint API in ff_ass_add_rect().	12 years ago
Michael Niedermayer	9fea619f19	ass: assert that the timsstamps fitted in the buffers Failure of the assert would cause various problems later if we continue. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Martin Storsjö	1d9c2dc89a	Don't include common.h from avutil.h Signed-off-by: Martin Storsjö <martin@martin.st>	12 years ago
Clément Bœsch	0e7782c08e	lavc/ass: honor Default style. The "Default" style written in the header is ignored unless you explicit it in the Dialogue events (it was valid, just ignored). This requires an update of the SubRip test since the ASS output obviously changes.	13 years ago
Lou Logan	6851130fd6	cosmetics: minor libavcodec spelling errors Also update some common misspelled words in patcheck Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	13 years ago
Clément Bœsch	d51e08bb89	lavc: switch from ts_end to duration in ff_ass_add_rect. Make possible a end-to-presentation duration.	13 years ago
Clément Bœsch	7c0d30b57b	ass: use av_asprintf() instead of a temporary stack buffer.	13 years ago
Alex Converse	1a5e4fd8c5	Replace strncpy() with av_strlcpy().	14 years ago
Aurelien Jacobs	3ee8ca9b08	add avcodec_get_subtitle_defaults() to initialize AVSubtitle struct Call this new function before decode() to replace the custom and inconsistant initialization in various decoders. This function is equivalent to avcodec_get_frame_defaults() for AVFrame. Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>	14 years ago
Mans Rullgard	2912e87a6c	Replace FFmpeg with Libav in licence headers Signed-off-by: Mans Rullgard <mans@mansr.com>	14 years ago
Diego Elio Pettenò	cf1d794a49	Make ff_ass_subtitle_header static to ass.c Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>	14 years ago
Aurelien Jacobs	2c77c90684	add SubRip decoder Originally committed as revision 26119 to svn://svn.ffmpeg.org/ffmpeg/trunk	14 years ago
Aurelien Jacobs	4ab4d65f35	ensure the ASS string in AVSubtitleRect is 0 terminated Originally committed as revision 25832 to svn://svn.ffmpeg.org/ffmpeg/trunk	14 years ago
Aurelien Jacobs	5952be07dc	add missing files in previous commit (ASS encoder and decoder) Originally committed as revision 25747 to svn://svn.ffmpeg.org/ffmpeg/trunk	14 years ago

22 Commits (26e70fd5ba50443fde738a606322d3fba0cc4985)