|
|
|
|
/*
|
|
|
|
|
* Version macros.
|
|
|
|
|
*
|
|
|
|
|
* This file is part of FFmpeg.
|
|
|
|
|
*
|
|
|
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
|
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#ifndef AVFORMAT_VERSION_H
|
|
|
|
|
#define AVFORMAT_VERSION_H
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @file
|
|
|
|
|
* @ingroup libavf
|
|
|
|
|
* Libavformat version macros
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include "libavutil/avutil.h"
|
|
|
|
|
|
|
|
|
|
#define LIBAVFORMAT_VERSION_MAJOR 55
|
|
|
|
|
#define LIBAVFORMAT_VERSION_MINOR 13
|
|
|
|
|
#define LIBAVFORMAT_VERSION_MICRO 102
|
|
|
|
|
|
|
|
|
|
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
|
|
|
|
|
LIBAVFORMAT_VERSION_MINOR, \
|
|
|
|
|
LIBAVFORMAT_VERSION_MICRO)
|
|
|
|
|
#define LIBAVFORMAT_VERSION AV_VERSION(LIBAVFORMAT_VERSION_MAJOR, \
|
|
|
|
|
LIBAVFORMAT_VERSION_MINOR, \
|
|
|
|
|
LIBAVFORMAT_VERSION_MICRO)
|
|
|
|
|
#define LIBAVFORMAT_BUILD LIBAVFORMAT_VERSION_INT
|
|
|
|
|
|
|
|
|
|
#define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* FF_API_* defines may be placed below to indicate public API that will be
|
|
|
|
|
* dropped at a future version bump. The defines themselves are not part of
|
|
|
|
|
* the public API and may change, break or disappear at any time.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#ifndef FF_API_OLD_AVIO
|
|
|
|
|
#define FF_API_OLD_AVIO (LIBAVFORMAT_VERSION_MAJOR < 55)
|
|
|
|
|
#endif
|
|
|
|
|
#ifndef FF_API_PKT_DUMP
|
|
|
|
|
#define FF_API_PKT_DUMP (LIBAVFORMAT_VERSION_MAJOR < 54)
|
|
|
|
|
#endif
|
|
|
|
|
#ifndef FF_API_ALLOC_OUTPUT_CONTEXT
|
|
|
|
|
#define FF_API_ALLOC_OUTPUT_CONTEXT (LIBAVFORMAT_VERSION_MAJOR < 56)
|
|
|
|
|
#endif
|
|
|
|
|
#ifndef FF_API_FORMAT_PARAMETERS
|
|
|
|
|
#define FF_API_FORMAT_PARAMETERS (LIBAVFORMAT_VERSION_MAJOR < 56)
|
|
|
|
|
#endif
|
|
|
|
|
#ifndef FF_API_NEW_STREAM
|
|
|
|
|
#define FF_API_NEW_STREAM (LIBAVFORMAT_VERSION_MAJOR < 56)
|
|
|
|
|
#endif
|
|
|
|
|
#ifndef FF_API_SET_PTS_INFO
|
|
|
|
|
#define FF_API_SET_PTS_INFO (LIBAVFORMAT_VERSION_MAJOR < 56)
|
|
|
|
|
#endif
|
|
|
|
|
#ifndef FF_API_CLOSE_INPUT_FILE
|
|
|
|
|
#define FF_API_CLOSE_INPUT_FILE (LIBAVFORMAT_VERSION_MAJOR < 56)
|
|
|
|
|
#endif
|
|
|
|
|
#ifndef FF_API_READ_PACKET
|
|
|
|
|
#define FF_API_READ_PACKET (LIBAVFORMAT_VERSION_MAJOR < 56)
|
|
|
|
|
#endif
|
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
|
|
|
#ifndef FF_API_ASS_SSA
|
|
|
|
|
#define FF_API_ASS_SSA (LIBAVFORMAT_VERSION_MAJOR < 56)
|
|
|
|
|
#endif
|
|
|
|
|
#ifndef FF_API_R_FRAME_RATE
|
|
|
|
|
#define FF_API_R_FRAME_RATE 1
|
|
|
|
|
#endif
|
|
|
|
|
#endif /* AVFORMAT_VERSION_H */
|
