2011-03-14 21:58:13 +01:00
|
|
|
/*
|
2011-04-17 23:57:50 +02:00
|
|
|
* This file is part of FFmpeg.
|
2011-03-14 21:58:13 +01:00
|
|
|
*
|
2011-04-17 23:57:50 +02:00
|
|
|
* FFmpeg is free software; you can redistribute it and/or
|
2011-03-14 21:58:13 +01:00
|
|
|
* 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.
|
|
|
|
|
*
|
2011-04-17 23:57:50 +02:00
|
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
2011-03-14 21:58:13 +01:00
|
|
|
* 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
|
2011-04-17 23:57:50 +02:00
|
|
|
* License along with FFmpeg; if not, write to the Free Software
|
2011-03-14 21:58:13 +01:00
|
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#ifndef AVCODEC_VERSION_H
|
|
|
|
|
#define AVCODEC_VERSION_H
|
|
|
|
|
|
2012-04-08 14:08:05 +02:00
|
|
|
/**
|
|
|
|
|
* @file
|
|
|
|
|
* @ingroup libavc
|
|
|
|
|
* Libavcodec version macros.
|
|
|
|
|
*/
|
|
|
|
|
|
2013-12-25 17:16:05 +01:00
|
|
|
#include "libavutil/version.h"
|
2012-09-27 04:35:29 -03:00
|
|
|
|
2017-10-21 14:57:53 -03:00
|
|
|
#define LIBAVCODEC_VERSION_MAJOR 58
|
ac3enc_fixed: convert to 32-bit sample format
The AC3 encoder used to be a separate library called "Aften", which
got merged into libavcodec (literally, SVN commits and all).
The merge preserved as much features from the library as possible.
The code had two versions - a fixed point version and a floating
point version. FFmpeg had floating point DSP code used by other
codecs, the AC3 decoder including, so the floating-point DSP was
simply replaced with FFmpeg's own functions.
However, FFmpeg had no fixed-point audio code at that point. So
the encoder brought along its own fixed-point DSP functions,
including a fixed-point MDCT.
The fixed-point MDCT itself is trivially just a float MDCT with a
different type and each multiply being a fixed-point multiply.
So over time, it got refactored, and the FFT used for all other codecs
was templated.
Due to design decisions at the time, the fixed-point version of the
encoder operates at 16-bits of precision. Although convenient, this,
even at the time, was inadequate and inefficient. The encoder is noisy,
does not produce output comparable to the float encoder, and even
rings at higher frequencies due to the badly approximated winow function.
Enter MIPS (owned by Imagination Technologies at the time). They wanted
quick fixed-point decoding on their FPUless cores. So they contributed
patches to template the AC3 decoder so it had both a fixed-point
and a floating-point version. They also did the same for the AAC decoder.
They however, used 32-bit samples. Not 16-bits. And we did not have
32-bit fixed-point DSP functions, including an MDCT. But instead of
templating our MDCT to output 3 versions (float, 32-bit fixed and 16-bit fixed),
they simply copy-pasted their own MDCT into ours, and completely
ifdeffed our own MDCT code out if a 32-bit fixed point MDCT was selected.
This is also the status quo nowadays - 2 separate MDCTs, one which
produces floating point and 16-bit fixed point versions, and one
sort-of integrated which produces 32-bit MDCT.
MIPS weren't all that interested in encoding, so they left the encoder
as-is, and they didn't care much about the ifdeffery, mess or quality - it's
not their problem.
So the MDCT/FFT code has always been a thorn in anyone looking to clean up
code's eye.
Backstory over. Internally AC3 operates on 25-bit fixed-point coefficients.
So for the floating point version, the encoder simply runs the float MDCT,
and converts the resulting coefficients to 25-bit fixed-point, as AC3 is inherently
a fixed-point codec. For the fixed-point version, the input is 16-bit samples,
so to maximize precision the frame samples are analyzed and the highest set
bit is detected via ac3_max_msb_abs_int16(), and the coefficients are then
scaled up via ac3_lshift_int16(), so the input for the FFT is always at least 14 bits,
computed in normalize_samples(). After FFT, the coefficients are scaled up to 25 bits.
This patch simply changes the encoder to accept 32-bit samples, reusing
the already well-optimized 32-bit MDCT code, allowing us to clean up and drop
a large part of a very messy code of ours, as well as prepare for the future lavu/tx
conversion. The coefficients are simply scaled down to 25 bits during windowing,
skipping 2 separate scalings, as the hacks to extend precision are simply no longer
necessary. There's no point in running the MDCT always at 32 bits when you're
going to drop 6 bits off anyway, the headroom is plenty, and the MDCT rounds
properly.
This also makes the encoder even slightly more accurate over the float version,
as there's no coefficient conversion step necessary.
SIZE SAVINGS:
ARM32:
HARDCODED TABLES:
BASE - 10709590
DROP DSP - 10702872 - diff: -6.56KiB
DROP MDCT - 10667932 - diff: -34.12KiB - both: -40.68KiB
DROP FFT - 10336652 - diff: -323.52KiB - all: -364.20KiB
SOFTCODED TABLES:
BASE - 9685096
DROP DSP - 9678378 - diff: -6.56KiB
DROP MDCT - 9643466 - diff: -34.09KiB - both: -40.65KiB
DROP FFT - 9573918 - diff: -67.92KiB - all: -108.57KiB
ARM64:
HARDCODED TABLES:
BASE - 14641112
DROP DSP - 14633806 - diff: -7.13KiB
DROP MDCT - 14604812 - diff: -28.31KiB - both: -35.45KiB
DROP FFT - 14286826 - diff: -310.53KiB - all: -345.98KiB
SOFTCODED TABLES:
BASE - 13636238
DROP DSP - 13628932 - diff: -7.13KiB
DROP MDCT - 13599866 - diff: -28.38KiB - both: -35.52KiB
DROP FFT - 13542080 - diff: -56.43KiB - all: -91.95KiB
x86:
HARDCODED TABLES:
BASE - 12367336
DROP DSP - 12354698 - diff: -12.34KiB
DROP MDCT - 12331024 - diff: -23.12KiB - both: -35.46KiB
DROP FFT - 12029788 - diff: -294.18KiB - all: -329.64KiB
SOFTCODED TABLES:
BASE - 11358094
DROP DSP - 11345456 - diff: -12.34KiB
DROP MDCT - 11321742 - diff: -23.16KiB - both: -35.50KiB
DROP FFT - 11276946 - diff: -43.75KiB - all: -79.25KiB
PERFORMANCE (10min random s32le):
ARM32 - before - 39.9x - 0m15.046s
ARM32 - after - 28.2x - 0m21.525s
Speed: -30%
ARM64 - before - 36.1x - 0m16.637s
ARM64 - after - 36.0x - 0m16.727s
Speed: -0.5%
x86 - before - 184x - 0m3.277s
x86 - after - 190x - 0m3.187s
Speed: +3%
2021-01-09 01:51:52 +01:00
|
|
|
#define LIBAVCODEC_VERSION_MINOR 117
|
2021-01-08 15:33:29 -08:00
|
|
|
#define LIBAVCODEC_VERSION_MICRO 101
|
2011-03-14 21:58:13 +01:00
|
|
|
|
|
|
|
|
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
|
|
|
|
|
LIBAVCODEC_VERSION_MINOR, \
|
|
|
|
|
LIBAVCODEC_VERSION_MICRO)
|
|
|
|
|
#define LIBAVCODEC_VERSION AV_VERSION(LIBAVCODEC_VERSION_MAJOR, \
|
|
|
|
|
LIBAVCODEC_VERSION_MINOR, \
|
|
|
|
|
LIBAVCODEC_VERSION_MICRO)
|
|
|
|
|
#define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT
|
|
|
|
|
|
|
|
|
|
#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
|
|
|
|
|
|
|
|
|
|
/**
|
2012-07-03 22:42:42 +02:00
|
|
|
* 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.
|
2015-08-18 12:28:17 +02:00
|
|
|
*
|
2015-08-22 00:24:18 +02:00
|
|
|
* @note, when bumping the major version it is recommended to manually
|
2015-08-18 12:28:17 +02:00
|
|
|
* disable each FF_API_* in its own commit instead of disabling them all
|
2015-08-22 00:24:18 +02:00
|
|
|
* at once through the bump. This improves the git bisect-ability of the change.
|
2011-03-14 21:58:13 +01:00
|
|
|
*/
|
2012-07-03 22:42:42 +02:00
|
|
|
|
2013-04-30 12:17:33 +02:00
|
|
|
#ifndef FF_API_LOWRES
|
2017-10-21 14:57:53 -03:00
|
|
|
#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 59)
|
2013-04-30 12:17:33 +02:00
|
|
|
#endif
|
2013-10-27 11:19:52 +01:00
|
|
|
#ifndef FF_API_DEBUG_MV
|
2015-07-28 14:30:35 +01:00
|
|
|
#define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 58)
|
2013-10-27 11:19:52 +01:00
|
|
|
#endif
|
2014-04-04 12:47:44 +02:00
|
|
|
#ifndef FF_API_AVCTX_TIMEBASE
|
|
|
|
|
#define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
2015-07-15 18:41:22 +01:00
|
|
|
#ifndef FF_API_CODED_FRAME
|
|
|
|
|
#define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
2015-09-11 17:47:29 +02:00
|
|
|
#ifndef FF_API_SIDEDATA_ONLY_PKT
|
|
|
|
|
#define FF_API_SIDEDATA_ONLY_PKT (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
2015-09-27 13:49:09 +03:00
|
|
|
#ifndef FF_API_VDPAU_PROFILE
|
|
|
|
|
#define FF_API_VDPAU_PROFILE (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
2015-09-26 18:13:55 +02:00
|
|
|
#ifndef FF_API_CONVERGENCE_DURATION
|
|
|
|
|
#define FF_API_CONVERGENCE_DURATION (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
2015-10-14 11:33:25 +02:00
|
|
|
#ifndef FF_API_AVPICTURE
|
|
|
|
|
#define FF_API_AVPICTURE (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
2015-10-23 11:11:31 +02:00
|
|
|
#ifndef FF_API_AVPACKET_OLD_API
|
|
|
|
|
#define FF_API_AVPACKET_OLD_API (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
lavc: Deprecate avctx.rtp_callback field
This function returns the encoded data of a frame, one slice at a time
directly when that slice is encoded, instead of waiting for the full
frame to be done. However this field has a debatable usefulness, since
it looks like it is just a convoluted way to get data at lowest
possible latency, or a somewhat hacky way to store h263 in RFC-2190
rtp encapsulation.
Moreover when multi-threading is enabled (which is by default) the order
of returned slices is not deterministic at all, making the use of this
function not reliable at all (or at the very least, more complicated
than it should be).
So, for the reasons stated above, and being used by only a single encoder
family (mpegvideo), this field is deemed unnecessary, overcomplicated,
and not really belonging to libavcodec. Libavformat features a complete
implementation of RFC-2190, for any other case.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-11-19 09:45:01 +01:00
|
|
|
#ifndef FF_API_RTP_CALLBACK
|
|
|
|
|
#define FF_API_RTP_CALLBACK (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
2015-10-04 12:19:26 +02:00
|
|
|
#ifndef FF_API_VBV_DELAY
|
|
|
|
|
#define FF_API_VBV_DELAY (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
2015-11-30 12:17:31 -05:00
|
|
|
#ifndef FF_API_CODER_TYPE
|
|
|
|
|
#define FF_API_CODER_TYPE (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
2015-11-30 12:19:36 -05:00
|
|
|
#ifndef FF_API_STAT_BITS
|
|
|
|
|
#define FF_API_STAT_BITS (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
2015-09-09 04:18:26 +02:00
|
|
|
#ifndef FF_API_PRIVATE_OPT
|
|
|
|
|
#define FF_API_PRIVATE_OPT (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
2016-02-21 12:58:36 +01:00
|
|
|
#ifndef FF_API_ASS_TIMING
|
|
|
|
|
#define FF_API_ASS_TIMING (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
2013-11-23 11:43:13 +01:00
|
|
|
#ifndef FF_API_OLD_BSF
|
|
|
|
|
#define FF_API_OLD_BSF (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
2016-05-21 11:46:44 +02:00
|
|
|
#ifndef FF_API_COPY_CONTEXT
|
|
|
|
|
#define FF_API_COPY_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
2016-05-21 11:57:28 +02:00
|
|
|
#ifndef FF_API_GET_CONTEXT_DEFAULTS
|
|
|
|
|
#define FF_API_GET_CONTEXT_DEFAULTS (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
2016-06-25 22:24:13 +02:00
|
|
|
#ifndef FF_API_NVENC_OLD_NAME
|
|
|
|
|
#define FF_API_NVENC_OLD_NAME (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
2016-08-24 23:30:29 +01:00
|
|
|
#ifndef FF_API_STRUCT_VAAPI_CONTEXT
|
|
|
|
|
#define FF_API_STRUCT_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
avcodec, avformat: deprecate anything related to side data merging
This patch deprecates anything that has to do with merging/splitting
side data. Automatic side data merging (and splitting), as well as all
API symbols involved in it, are removed completely.
Two FF_API_ defines are dedicated to deprecating API symbols related to
this: FF_API_MERGE_SD_API removes av_packet_split/merge_side_data in
libavcodec, and FF_API_LAVF_KEEPSIDE_FLAG deprecates
AVFMT_FLAG_KEEP_SIDE_DATA in libavformat.
Since it was claimed that changing the default from merging side data to
not doing it is an ABI change, there are two additional FF_API_ defines,
which stop using the side data merging/splitting by default (and remove
any code in avformat/avcodec doing this): FF_API_MERGE_SD in libavcodec,
and FF_API_LAVF_MERGE_SD in libavformat.
It is very much intended that FF_API_MERGE_SD and FF_API_LAVF_MERGE_SD
are quickly defined to 0 in the next ABI bump, while the API symbols are
retained for a longer time for the sake of compatibility.
AVFMT_FLAG_KEEP_SIDE_DATA will (very much intentionally) do nothing for
most of the time it will still be defined. Keep in mind that no code
exists that actually tries to unset this flag for any reason, nor does
such code need to exist. Code setting this flag explicitly will work as
before. Thus it's ok for AVFMT_FLAG_KEEP_SIDE_DATA to do nothing once
side data merging has been removed from libavformat.
In order to avoid that anyone in the future does this incorrectly, here
is a small guide how to update the internal code on bumps:
- next ABI bump (probably soon):
- define FF_API_LAVF_MERGE_SD to 0, and remove all code covered by it
- define FF_API_MERGE_SD to 0, and remove all code covered by it
- next API bump (typically two years in the future or so):
- define FF_API_LAVF_KEEPSIDE_FLAG to 0, and remove all code covered
by it
- define FF_API_MERGE_SD_API to 0, and remove all code covered by it
This forces anyone who actually wants packet side data to temporarily
use deprecated API to get it all. If you ask me, this is batshit fucked
up crazy, but it's how we roll. Making AVFMT_FLAG_KEEP_SIDE_DATA to be
set by default was rejected as an ABI change, so I'm going all the way
to get rid of this once and for all.
Reviewed-by: James Almer <jamrial@gmail.com>
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-16 04:52:55 +01:00
|
|
|
#ifndef FF_API_MERGE_SD_API
|
|
|
|
|
#define FF_API_MERGE_SD_API (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
2017-03-27 01:11:41 +02:00
|
|
|
#ifndef FF_API_TAG_STRING
|
|
|
|
|
#define FF_API_TAG_STRING (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
2017-08-25 12:09:26 -03:00
|
|
|
#ifndef FF_API_GETCHROMA
|
|
|
|
|
#define FF_API_GETCHROMA (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
2017-11-12 23:57:38 -03:00
|
|
|
#ifndef FF_API_CODEC_GET_SET
|
|
|
|
|
#define FF_API_CODEC_GET_SET (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
2017-10-26 00:18:44 +01:00
|
|
|
#ifndef FF_API_USER_VISIBLE_AVHWACCEL
|
|
|
|
|
#define FF_API_USER_VISIBLE_AVHWACCEL (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
2017-12-21 22:39:24 +01:00
|
|
|
#ifndef FF_API_LOCKMGR
|
|
|
|
|
#define FF_API_LOCKMGR (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
2017-12-22 22:17:00 +00:00
|
|
|
#ifndef FF_API_NEXT
|
|
|
|
|
#define FF_API_NEXT (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
2019-01-10 22:23:39 +01:00
|
|
|
#ifndef FF_API_UNSANITIZED_BITRATES
|
|
|
|
|
#define FF_API_UNSANITIZED_BITRATES (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
2020-04-29 11:00:50 +08:00
|
|
|
#ifndef FF_API_OPENH264_SLICE_MODE
|
|
|
|
|
#define FF_API_OPENH264_SLICE_MODE (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
2020-05-06 21:47:52 +08:00
|
|
|
#ifndef FF_API_OPENH264_CABAC
|
|
|
|
|
#define FF_API_OPENH264_CABAC (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
2020-05-21 12:20:11 -03:00
|
|
|
#ifndef FF_API_UNUSED_CODEC_CAPS
|
|
|
|
|
#define FF_API_UNUSED_CODEC_CAPS (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
2020-10-26 13:36:06 +01:00
|
|
|
#ifndef FF_API_AVPRIV_PUT_BITS
|
|
|
|
|
#define FF_API_AVPRIV_PUT_BITS (LIBAVCODEC_VERSION_MAJOR < 59)
|
|
|
|
|
#endif
|
2020-05-22 15:59:46 +02:00
|
|
|
#ifndef FF_API_THREAD_SAFE_CALLBACKS
|
|
|
|
|
#define FF_API_THREAD_SAFE_CALLBACKS (LIBAVCODEC_VERSION_MAJOR < 60)
|
|
|
|
|
#endif
|
2011-03-14 21:58:13 +01:00
|
|
|
|
|
|
|
|
#endif /* AVCODEC_VERSION_H */
|