01ecb7172b
This finalizes merging of the work in the patches in ticket #2686. Improvements to twoloop and RC logic are extensive. The non-exhaustive list of twoloop improvments includes: - Tweaks to distortion limits on the RD optimization phase of twoloop - Deeper search in twoloop - PNS information marking to let twoloop decide when to use it (turned out having the decision made separately wasn't working) - Tonal band detection and priorization - Better band energy conservation rules - Strict hole avoidance For rate control: - Use psymodel's bit allocation to allow proper use of the bit reservoir. Don't work against the bit reservoir by moving lambda in the opposite direction when psymodel decides to allocate more/less bits to a frame. - Retry the encode if the effective rate lies outside a reasonable margin of psymodel's allocation or the selected ABR. - Log average lambda at the end. Useful info for everyone, but especially for tuning of the various encoder constants that relate to lambda feedback. Psy: - Do not apply lowpass with a FIR filter, instead just let the coder zero bands above the cutoff. The FIR filter induces group delay, and while zeroing bands causes ripple, it's lost in the quantization noise. - Experimental VBR bit allocation code - Tweak automatic lowpass filter threshold to maximize audio bandwidth at all bitrates while still providing acceptable, stable quality. I/S: - Phase decision fixes. Unrelated to #2686, but the bugs only surfaced when the merge was finalized. Measure I/S band energy accounting for phase, and prevent I/S and M/S from being applied both. PNS: - Avoid marking short bands with PNS when they're part of a window group in which there's a large variation of energy from one window to the next. PNS can't preserve those and the effect is extremely noticeable. M/S: - Implement BMLD protection similar to the specified in ISO-IEC/13818:7-2003, Appendix C Section 6.1. Since M/S decision doesn't conform to section 6.1, a different method had to be implemented, but should provide equivalent protection. - Move the decision logic closer to the method specified in ISO-IEC/13818:7-2003, Appendix C Section 6.1. Specifically, make sure M/S needs less bits than dual stereo. - Don't apply M/S in bands that are using I/S Now, this of course needed adjustments in the compare targets and fuzz factors of the AAC encoder's fate tests, but if wondering why the targets go up (more distortion), consider the previous coder was using too many bits on LF content (far more than required by psy), and thus those signals will now be more distorted, not less. The extra distortion isn't audible though, I carried extensive ABX testing to make sure. A very similar patch was also extensively tested by Kamendo2 in the context of #2686.
282 lines
12 KiB
C
282 lines
12 KiB
C
/*
|
|
* AAC encoder intensity stereo
|
|
* Copyright (C) 2015 Rostislav Pehlivanov
|
|
*
|
|
* 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
|
|
*/
|
|
|
|
/**
|
|
* @file
|
|
* AAC encoder quantizer
|
|
* @author Rostislav Pehlivanov ( atomnuker gmail com )
|
|
*/
|
|
|
|
#ifndef AVCODEC_AACENC_QUANTIZATION_H
|
|
#define AVCODEC_AACENC_QUANTIZATION_H
|
|
|
|
#include "aactab.h"
|
|
#include "aacenc.h"
|
|
#include "aacenctab.h"
|
|
#include "aacenc_utils.h"
|
|
|
|
/**
|
|
* Calculate rate distortion cost for quantizing with given codebook
|
|
*
|
|
* @return quantization distortion
|
|
*/
|
|
static av_always_inline float quantize_and_encode_band_cost_template(
|
|
struct AACEncContext *s,
|
|
PutBitContext *pb, const float *in, float *out,
|
|
const float *scaled, int size, int scale_idx,
|
|
int cb, const float lambda, const float uplim,
|
|
int *bits, float *energy, int BT_ZERO, int BT_UNSIGNED,
|
|
int BT_PAIR, int BT_ESC, int BT_NOISE, int BT_STEREO,
|
|
const float ROUNDING)
|
|
{
|
|
const int q_idx = POW_SF2_ZERO - scale_idx + SCALE_ONE_POS - SCALE_DIV_512;
|
|
const float Q = ff_aac_pow2sf_tab [q_idx];
|
|
const float Q34 = ff_aac_pow34sf_tab[q_idx];
|
|
const float IQ = ff_aac_pow2sf_tab [POW_SF2_ZERO + scale_idx - SCALE_ONE_POS + SCALE_DIV_512];
|
|
const float CLIPPED_ESCAPE = 165140.0f*IQ;
|
|
int i, j;
|
|
float cost = 0;
|
|
float qenergy = 0;
|
|
const int dim = BT_PAIR ? 2 : 4;
|
|
int resbits = 0;
|
|
int off;
|
|
|
|
if (BT_ZERO || BT_NOISE || BT_STEREO) {
|
|
for (i = 0; i < size; i++)
|
|
cost += in[i]*in[i];
|
|
if (bits)
|
|
*bits = 0;
|
|
if (energy)
|
|
*energy = qenergy;
|
|
if (out) {
|
|
for (i = 0; i < size; i += dim)
|
|
for (j = 0; j < dim; j++)
|
|
out[i+j] = 0.0f;
|
|
}
|
|
return cost * lambda;
|
|
}
|
|
if (!scaled) {
|
|
abs_pow34_v(s->scoefs, in, size);
|
|
scaled = s->scoefs;
|
|
}
|
|
quantize_bands(s->qcoefs, in, scaled, size, Q34, !BT_UNSIGNED, aac_cb_maxval[cb], ROUNDING);
|
|
if (BT_UNSIGNED) {
|
|
off = 0;
|
|
} else {
|
|
off = aac_cb_maxval[cb];
|
|
}
|
|
for (i = 0; i < size; i += dim) {
|
|
const float *vec;
|
|
int *quants = s->qcoefs + i;
|
|
int curidx = 0;
|
|
int curbits;
|
|
float quantized, rd = 0.0f;
|
|
for (j = 0; j < dim; j++) {
|
|
curidx *= aac_cb_range[cb];
|
|
curidx += quants[j] + off;
|
|
}
|
|
curbits = ff_aac_spectral_bits[cb-1][curidx];
|
|
vec = &ff_aac_codebook_vectors[cb-1][curidx*dim];
|
|
if (BT_UNSIGNED) {
|
|
for (j = 0; j < dim; j++) {
|
|
float t = fabsf(in[i+j]);
|
|
float di;
|
|
if (BT_ESC && vec[j] == 64.0f) { //FIXME: slow
|
|
if (t >= CLIPPED_ESCAPE) {
|
|
quantized = CLIPPED_ESCAPE;
|
|
curbits += 21;
|
|
} else {
|
|
int c = av_clip_uintp2(quant(t, Q, ROUNDING), 13);
|
|
quantized = c*cbrtf(c)*IQ;
|
|
curbits += av_log2(c)*2 - 4 + 1;
|
|
}
|
|
} else {
|
|
quantized = vec[j]*IQ;
|
|
}
|
|
di = t - quantized;
|
|
if (out)
|
|
out[i+j] = in[i+j] >= 0 ? quantized : -quantized;
|
|
if (vec[j] != 0.0f)
|
|
curbits++;
|
|
qenergy += quantized*quantized;
|
|
rd += di*di;
|
|
}
|
|
} else {
|
|
for (j = 0; j < dim; j++) {
|
|
quantized = vec[j]*IQ;
|
|
qenergy += quantized*quantized;
|
|
if (out)
|
|
out[i+j] = quantized;
|
|
rd += (in[i+j] - quantized)*(in[i+j] - quantized);
|
|
}
|
|
}
|
|
cost += rd * lambda + curbits;
|
|
resbits += curbits;
|
|
if (cost >= uplim)
|
|
return uplim;
|
|
if (pb) {
|
|
put_bits(pb, ff_aac_spectral_bits[cb-1][curidx], ff_aac_spectral_codes[cb-1][curidx]);
|
|
if (BT_UNSIGNED)
|
|
for (j = 0; j < dim; j++)
|
|
if (ff_aac_codebook_vectors[cb-1][curidx*dim+j] != 0.0f)
|
|
put_bits(pb, 1, in[i+j] < 0.0f);
|
|
if (BT_ESC) {
|
|
for (j = 0; j < 2; j++) {
|
|
if (ff_aac_codebook_vectors[cb-1][curidx*2+j] == 64.0f) {
|
|
int coef = av_clip_uintp2(quant(fabsf(in[i+j]), Q, ROUNDING), 13);
|
|
int len = av_log2(coef);
|
|
|
|
put_bits(pb, len - 4 + 1, (1 << (len - 4 + 1)) - 2);
|
|
put_sbits(pb, len, coef);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if (bits)
|
|
*bits = resbits;
|
|
if (energy)
|
|
*energy = qenergy;
|
|
return cost;
|
|
}
|
|
|
|
static inline float quantize_and_encode_band_cost_NONE(struct AACEncContext *s, PutBitContext *pb,
|
|
const float *in, float *quant, const float *scaled,
|
|
int size, int scale_idx, int cb,
|
|
const float lambda, const float uplim,
|
|
int *bits, float *energy) {
|
|
av_assert0(0);
|
|
return 0.0f;
|
|
}
|
|
|
|
#define QUANTIZE_AND_ENCODE_BAND_COST_FUNC(NAME, BT_ZERO, BT_UNSIGNED, BT_PAIR, BT_ESC, BT_NOISE, BT_STEREO, ROUNDING) \
|
|
static float quantize_and_encode_band_cost_ ## NAME( \
|
|
struct AACEncContext *s, \
|
|
PutBitContext *pb, const float *in, float *quant, \
|
|
const float *scaled, int size, int scale_idx, \
|
|
int cb, const float lambda, const float uplim, \
|
|
int *bits, float *energy) { \
|
|
return quantize_and_encode_band_cost_template( \
|
|
s, pb, in, quant, scaled, size, scale_idx, \
|
|
BT_ESC ? ESC_BT : cb, lambda, uplim, bits, energy, \
|
|
BT_ZERO, BT_UNSIGNED, BT_PAIR, BT_ESC, BT_NOISE, BT_STEREO, \
|
|
ROUNDING); \
|
|
}
|
|
|
|
QUANTIZE_AND_ENCODE_BAND_COST_FUNC(ZERO, 1, 0, 0, 0, 0, 0, ROUND_STANDARD)
|
|
QUANTIZE_AND_ENCODE_BAND_COST_FUNC(SQUAD, 0, 0, 0, 0, 0, 0, ROUND_STANDARD)
|
|
QUANTIZE_AND_ENCODE_BAND_COST_FUNC(UQUAD, 0, 1, 0, 0, 0, 0, ROUND_STANDARD)
|
|
QUANTIZE_AND_ENCODE_BAND_COST_FUNC(SPAIR, 0, 0, 1, 0, 0, 0, ROUND_STANDARD)
|
|
QUANTIZE_AND_ENCODE_BAND_COST_FUNC(UPAIR, 0, 1, 1, 0, 0, 0, ROUND_STANDARD)
|
|
QUANTIZE_AND_ENCODE_BAND_COST_FUNC(ESC, 0, 1, 1, 1, 0, 0, ROUND_STANDARD)
|
|
QUANTIZE_AND_ENCODE_BAND_COST_FUNC(ESC_RTZ, 0, 1, 1, 1, 0, 0, ROUND_TO_ZERO)
|
|
QUANTIZE_AND_ENCODE_BAND_COST_FUNC(NOISE, 0, 0, 0, 0, 1, 0, ROUND_STANDARD)
|
|
QUANTIZE_AND_ENCODE_BAND_COST_FUNC(STEREO,0, 0, 0, 0, 0, 1, ROUND_STANDARD)
|
|
|
|
static float (*const quantize_and_encode_band_cost_arr[])(
|
|
struct AACEncContext *s,
|
|
PutBitContext *pb, const float *in, float *quant,
|
|
const float *scaled, int size, int scale_idx,
|
|
int cb, const float lambda, const float uplim,
|
|
int *bits, float *energy) = {
|
|
quantize_and_encode_band_cost_ZERO,
|
|
quantize_and_encode_band_cost_SQUAD,
|
|
quantize_and_encode_band_cost_SQUAD,
|
|
quantize_and_encode_band_cost_UQUAD,
|
|
quantize_and_encode_band_cost_UQUAD,
|
|
quantize_and_encode_band_cost_SPAIR,
|
|
quantize_and_encode_band_cost_SPAIR,
|
|
quantize_and_encode_band_cost_UPAIR,
|
|
quantize_and_encode_band_cost_UPAIR,
|
|
quantize_and_encode_band_cost_UPAIR,
|
|
quantize_and_encode_band_cost_UPAIR,
|
|
quantize_and_encode_band_cost_ESC,
|
|
quantize_and_encode_band_cost_NONE, /* CB 12 doesn't exist */
|
|
quantize_and_encode_band_cost_NOISE,
|
|
quantize_and_encode_band_cost_STEREO,
|
|
quantize_and_encode_band_cost_STEREO,
|
|
};
|
|
|
|
static float (*const quantize_and_encode_band_cost_rtz_arr[])(
|
|
struct AACEncContext *s,
|
|
PutBitContext *pb, const float *in, float *quant,
|
|
const float *scaled, int size, int scale_idx,
|
|
int cb, const float lambda, const float uplim,
|
|
int *bits, float *energy) = {
|
|
quantize_and_encode_band_cost_ZERO,
|
|
quantize_and_encode_band_cost_SQUAD,
|
|
quantize_and_encode_band_cost_SQUAD,
|
|
quantize_and_encode_band_cost_UQUAD,
|
|
quantize_and_encode_band_cost_UQUAD,
|
|
quantize_and_encode_band_cost_SPAIR,
|
|
quantize_and_encode_band_cost_SPAIR,
|
|
quantize_and_encode_band_cost_UPAIR,
|
|
quantize_and_encode_band_cost_UPAIR,
|
|
quantize_and_encode_band_cost_UPAIR,
|
|
quantize_and_encode_band_cost_UPAIR,
|
|
quantize_and_encode_band_cost_ESC_RTZ,
|
|
quantize_and_encode_band_cost_NONE, /* CB 12 doesn't exist */
|
|
quantize_and_encode_band_cost_NOISE,
|
|
quantize_and_encode_band_cost_STEREO,
|
|
quantize_and_encode_band_cost_STEREO,
|
|
};
|
|
|
|
#define quantize_and_encode_band_cost( \
|
|
s, pb, in, quant, scaled, size, scale_idx, cb, \
|
|
lambda, uplim, bits, energy, rtz) \
|
|
((rtz) ? quantize_and_encode_band_cost_rtz_arr : quantize_and_encode_band_cost_arr)[cb]( \
|
|
s, pb, in, quant, scaled, size, scale_idx, cb, \
|
|
lambda, uplim, bits, energy)
|
|
|
|
static inline float quantize_band_cost(struct AACEncContext *s, const float *in,
|
|
const float *scaled, int size, int scale_idx,
|
|
int cb, const float lambda, const float uplim,
|
|
int *bits, float *energy, int rtz)
|
|
{
|
|
return quantize_and_encode_band_cost(s, NULL, in, NULL, scaled, size, scale_idx,
|
|
cb, lambda, uplim, bits, energy, rtz);
|
|
}
|
|
|
|
static inline int quantize_band_cost_bits(struct AACEncContext *s, const float *in,
|
|
const float *scaled, int size, int scale_idx,
|
|
int cb, const float lambda, const float uplim,
|
|
int *bits, float *energy, int rtz)
|
|
{
|
|
int auxbits;
|
|
quantize_and_encode_band_cost(s, NULL, in, NULL, scaled, size, scale_idx,
|
|
cb, 0.0f, uplim, &auxbits, energy, rtz);
|
|
if (bits) {
|
|
*bits = auxbits;
|
|
}
|
|
return auxbits;
|
|
}
|
|
|
|
static inline void quantize_and_encode_band(struct AACEncContext *s, PutBitContext *pb,
|
|
const float *in, float *out, int size, int scale_idx,
|
|
int cb, const float lambda, int rtz)
|
|
{
|
|
quantize_and_encode_band_cost(s, pb, in, out, NULL, size, scale_idx, cb, lambda,
|
|
INFINITY, NULL, NULL, rtz);
|
|
}
|
|
|
|
#endif /* AVCODEC_AACENC_QUANTIZATION_H */
|