summaryrefslogtreecommitdiffstats
path: root/libavcodec/ass.h
Commit message (Collapse)AuthorAgeFilesLines
* lavc: allow subtitle text format to be ASS without timingClément Bœsch2016-02-261-42/+14
|
* lavc/ccaption_dec: improve default styleClément Bœsch2016-01-101-1/+2
| | | | Use monospaced font, and a black box outline.
* avcodec/ass: fix doxygen typowm42015-10-081-1/+1
|
* avcodec/ass: make default playback resolution available to decodersClément Bœsch2015-05-141-0/+3
|
* avcodec/ass: add ASS trailing \r\n in one single placeClément Bœsch2014-10-191-1/+1
|
* avcodec/ass: assume raw=0 in ff_ass_add_rect_bprintClément Bœsch2014-10-191-2/+2
|
* avcodec/ass: add ff_ass_add_rect_bprint() helperClément Bœsch2014-09-211-0/+7
|
* ass: move text_event_to_ass from textdec.c to ass.c and export itMarton Balint2013-11-101-0/+12
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* ass: factor out ff_ass_bprint_dialogMarton Balint2013-11-101-0/+23
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* subtitles: introduce ASS codec id and use it.Clément Bœsch2013-04-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* cosmetics: minor libavcodec spelling errorsLou Logan2012-06-291-1/+1
| | | | | | Also update some common misspelled words in patcheck Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavc: switch from ts_end to duration in ff_ass_add_rect.Clément Bœsch2012-05-291-2/+3
| | | | Make possible a end-to-presentation duration.
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-031-2/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ARM: ac3: update ff_ac3_extract_exponents_neon per 8b7b2d6 ARM: NEON optimised vector_clip_int32() swscale: disable full_chroma_int when converting to non-24/32bpp RGB. suggest to use av_get_bytes_per_sample() in av_get_bits_per_sample_format() doxy ffmpeg: use av_get_bytes_per_sample() in place of av_get_bits_per_sample_fmt() put_bits: remove ALT_BITSTREAM_WRITER put_bits: always use intreadwrite.h macros libavformat: Add an example how to use the metadata API doxygen: Prefer member groups over grouping into modules doxygen: be more permissive when searching for API examples avformat: doxify the Metadata API lavf: restore old behavior for custom AVIOContex with an AVFMT_NOFILE format. lavf: use the correct pointer in av_open_input_stream(). avidec: infer absolute vs relative index from first packet Conflicts: libavformat/Makefile libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doxygen: Prefer member groups over grouping into modulesReinhard Tartler2011-07-021-2/+1
| | | | | | | | | | | | | | | | | | Before this, almost all module groups have been used for grouping functions and fields in structures semantically. This causes them to not appear properly in the file documentation and needlessly clutters up the "Modules" index. Additionally, this commit streamlines some spelling and appearances.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Make ff_ass_subtitle_header static to ass.cDiego Elio Pettenò2011-01-251-21/+0
| | | | | | | | Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
* | add avcodec_get_subtitle_defaults() to initialize AVSubtitle structAurelien Jacobs2011-04-111-7/+0
|/ | | | | | | | 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>
* add SubRip decoderAurelien Jacobs2010-12-281-0/+45
| | | | Originally committed as revision 26119 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add missing files in previous commit (ASS encoder and decoder)Aurelien Jacobs2010-11-131-0/+53
Originally committed as revision 25747 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud