FFmpeg

Commit Graph

Author	SHA1	Message	Date
Vittorio Giovara	111ed1b16b	ac3: convert to new channel layout API Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: James Almer <jamrial@gmail.com>	3 years ago
Andreas Rheinhardt	1cc64146e3	avcodec/options_table: Treat (request_)channel_layout as channel layout Also adapt some FATE tests to already cover this. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>	3 years ago
Lynne	2d85e6e723	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%	4 years ago
Nicolas George	f08e024ac7	fate: disable automatic conversions on many tests. Explicitly insert the scale or aresample filter where it would have been inserted by the negotiation. Re-enable conversions if it cannot be done easily. If a conversion is needed in a test, we want to know about it. If the negotiation changes and makes new conversion necessary, we want to know about it even more.	4 years ago
James Almer	53937c4371	fate: add test for eac3 dependant stream Signed-off-by: James Almer <jamrial@gmail.com>	7 years ago
Paul B Mahol	9b22417de6	fate: add eac3_core bitstream filter test Signed-off-by: Paul B Mahol <onemda@gmail.com>	7 years ago
James Almer	53f1d6a8ee	fate: add tests for ac3_fixed 5.1 downmix Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>	8 years ago
Andreas Cadhalpun	805f38b4d6	fate: replace deprecated request_channels with request_channel_layout This fixes fate with FF_API_REQUEST_CHANNELS disabled. Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>	9 years ago
Vittorio Giovara	3ad678a85b	fate: Update ac3 test to the new request_channel_layout option	10 years ago
Timothy Gu	591d9a072d	tests: Add ac3_fixed decoder test Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Martin Storsjö	ba13606ca6	fate: Add a --target-samples path parameter This allows having the samples accessible via different paths on the target and on the host. Signed-off-by: Martin Storsjö <martin@martin.st>	12 years ago
Diego Biurrun	7c00e9d8ae	x86: ac3dsp: Remove 3dnow version of ff_ac3_extract_exponents The function requires increasing the fuzz factor for the ac3/eac3 encode tests and even so makes fate fail. It only provides a slight encoding speedup for legacy CPUs that do not support SS2. Thus its benefit is not worth the trouble it creates and fixing it would be a waste of time.	12 years ago
Michael Niedermayer	fbdb0313f5	ac3dec: fix non-optimal dithering of zero bit mantissas Use a noise range of -0.707 to 0.707 instead of -0.5 to 0.5 Based on patch by: Mathias Rauen <madshi@gmail.com> and commit by Justin Ruggles (`04ea5491`) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Mathias Rauen	04ea5491a8	ac3dec: fix non-optimal dithering of zero bit mantissas Use a noise range of -0.707 to 0.707 instead of -0.5 to 0.5 Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>	12 years ago
Janne Grunau	6b07830a77	fate: add ac3/eac3 tests to FATE_SAMPLES_AVCONV Fixes typo in `2cbdd7c929`.	12 years ago
Michael Niedermayer	2f84f13806	fate: remove typo, reenable AC3 tests Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Diego Biurrun	381dc1a5ec	fate: ac3: Place E-AC-3 tests and AC-3 tests in different groups	12 years ago
Diego Biurrun	2cbdd7c929	fate: ac3: Add dependencies	12 years ago
Diego Biurrun	096a5d76a5	fate: Refactor setting of environment variables for groups of tests	12 years ago
Mans Rullgard	07e87858d4	fate: ac3: add 4.0 and downmix tests Signed-off-by: Mans Rullgard <mans@mansr.com>	12 years ago
Michael Niedermayer	636dbe2678	fate: increase fuzzyness for ac3 encode for 3dnow Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	13 years ago
Michael Niedermayer	0fcf3013c4	fate: Fix fate-ac3-fixed-encode for pre-ssse3 x86 machines The default mmxext and sse implementations of apply_window_int16 aren't bitexact. Signed-off-by: Martin Storsjö <martin@martin.st>	13 years ago
Michael Niedermayer	607461e50d	fate: add bitexact flag to ac3-fixed cant hurt, and should be there for all tests Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	13 years ago
Mans Rullgard	0857e46dd5	fate: add missing $(TARGET_PATH) to ac3-fixed-encode Signed-off-by: Mans Rullgard <mans@mansr.com>	13 years ago
Mans Rullgard	7263cd5544	fate: convert codec-regression.sh to makefile rules Signed-off-by: Mans Rullgard <mans@mansr.com>	13 years ago
Mans Rullgard	63dcd16d56	fate: fix dependencies on SAMPLES being set This allows fate to run without errors with or without SAMPLES being set. Signed-off-by: Mans Rullgard <mans@mansr.com>	13 years ago
Diego Biurrun	4cc8e15371	fate: Set FUZZ factor of (e)ac3-encode test to 3. This is necessary to account for different rounding done in the 3DNow! Assembly optimizations.	13 years ago
Mans Rullgard	f7c2dca0d9	fate: improve dependencies This makes only tests actually using avconv depend on it. The remaining tests already depend on what they need. Signed-off-by: Mans Rullgard <mans@mansr.com>	13 years ago
Justin Ruggles	9cc338b1de	FATE: pass the decoded output format and audio source file to enc_dec_pcm This will allow decoding to md5 and doing a diff comparison to a reference checksum instead of a fuzzy stddev or oneoff comparison. Signed-off-by: Mans Rullgard <mans@mansr.com>	13 years ago
Justin Ruggles	a4cf4ef256	FATE: add AC-3 and E-AC-3 encode/decode tests with fuzzy comparison	13 years ago
Diego Biurrun	e5903e2972	fate: add some shorthands to run groups of tests	13 years ago
Clément Bœsch	2ffee0f450	fate: add generic rules for most of the tests/fate/*.mak files.	13 years ago
Diego Biurrun	bf6923577e	fate: split off AC-3 codec FATE tests into their own file	13 years ago

41 Commits (814f806e0630e5338ad0d04e24777daceafa862b)