2008-08-14 08:52:29 +03:00
|
|
|
/*
|
|
|
|
* AAC encoder
|
|
|
|
* Copyright (C) 2008 Konstantin Shishkov
|
|
|
|
*
|
|
|
|
* 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
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
2010-04-20 17:45:34 +03:00
|
|
|
* @file
|
2008-08-14 08:52:29 +03:00
|
|
|
* AAC encoder
|
|
|
|
*/
|
|
|
|
|
|
|
|
/***********************************
|
|
|
|
* TODOs:
|
2008-08-16 08:47:18 +03:00
|
|
|
* add sane pulse detection
|
2008-08-14 08:52:29 +03:00
|
|
|
***********************************/
|
|
|
|
|
2012-05-21 19:58:41 +03:00
|
|
|
#include "libavutil/float_dsp.h"
|
2011-06-01 08:38:09 +03:00
|
|
|
#include "libavutil/opt.h"
|
2008-08-14 08:52:29 +03:00
|
|
|
#include "avcodec.h"
|
2009-07-08 23:01:31 +03:00
|
|
|
#include "put_bits.h"
|
2012-01-28 20:28:01 +03:00
|
|
|
#include "internal.h"
|
2008-08-14 08:52:29 +03:00
|
|
|
#include "mpeg4audio.h"
|
2011-03-19 19:19:04 +02:00
|
|
|
#include "kbdwin.h"
|
2011-03-20 01:44:00 +02:00
|
|
|
#include "sinewin.h"
|
2008-08-14 08:52:29 +03:00
|
|
|
|
|
|
|
#include "aac.h"
|
|
|
|
#include "aactab.h"
|
2009-07-08 23:01:31 +03:00
|
|
|
#include "aacenc.h"
|
2015-07-29 06:44:26 +02:00
|
|
|
#include "aacenctab.h"
|
2015-07-29 06:44:27 +02:00
|
|
|
#include "aacenc_utils.h"
|
2009-07-08 23:01:31 +03:00
|
|
|
|
|
|
|
#include "psymodel.h"
|
2008-08-14 08:52:29 +03:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Make AAC audio config object.
|
|
|
|
* @see 1.6.2.1 "Syntax - AudioSpecificConfig"
|
|
|
|
*/
|
|
|
|
static void put_audio_specific_config(AVCodecContext *avctx)
|
|
|
|
{
|
|
|
|
PutBitContext pb;
|
|
|
|
AACEncContext *s = avctx->priv_data;
|
2015-10-12 16:53:17 +02:00
|
|
|
int channels = s->channels - (s->channels == 8 ? 1 : 0);
|
2008-08-14 08:52:29 +03:00
|
|
|
|
2015-02-26 20:17:01 +02:00
|
|
|
init_put_bits(&pb, avctx->extradata, avctx->extradata_size);
|
2015-08-21 20:20:22 +02:00
|
|
|
put_bits(&pb, 5, s->profile+1); //profile
|
2008-08-14 08:52:29 +03:00
|
|
|
put_bits(&pb, 4, s->samplerate_index); //sample rate index
|
2015-10-12 16:53:17 +02:00
|
|
|
put_bits(&pb, 4, channels);
|
2008-08-14 08:52:29 +03:00
|
|
|
//GASpecificConfig
|
|
|
|
put_bits(&pb, 1, 0); //frame length - 1024 samples
|
|
|
|
put_bits(&pb, 1, 0); //does not depend on core coder
|
|
|
|
put_bits(&pb, 1, 0); //is not extension
|
2011-01-22 07:23:43 +02:00
|
|
|
|
|
|
|
//Explicitly Mark SBR absent
|
2011-01-23 16:45:19 +02:00
|
|
|
put_bits(&pb, 11, 0x2b7); //sync extension
|
2011-01-22 07:23:43 +02:00
|
|
|
put_bits(&pb, 5, AOT_SBR);
|
|
|
|
put_bits(&pb, 1, 0);
|
2008-08-14 08:52:29 +03:00
|
|
|
flush_put_bits(&pb);
|
|
|
|
}
|
|
|
|
|
2015-10-12 08:56:22 +02:00
|
|
|
void ff_quantize_band_cost_cache_init(struct AACEncContext *s)
|
|
|
|
{
|
|
|
|
int sf, g;
|
|
|
|
for (sf = 0; sf < 256; sf++) {
|
|
|
|
for (g = 0; g < 128; g++) {
|
|
|
|
s->quantize_band_cost_cache[sf][g].bits = -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-12-24 03:36:15 +03:00
|
|
|
#define WINDOW_FUNC(type) \
|
2013-01-21 00:20:30 +03:00
|
|
|
static void apply_ ##type ##_window(AVFloatDSPContext *fdsp, \
|
2012-05-21 19:58:41 +03:00
|
|
|
SingleChannelElement *sce, \
|
|
|
|
const float *audio)
|
2008-08-14 08:52:29 +03:00
|
|
|
|
2011-12-24 03:36:15 +03:00
|
|
|
WINDOW_FUNC(only_long)
|
|
|
|
{
|
|
|
|
const float *lwindow = sce->ics.use_kb_window[0] ? ff_aac_kbd_long_1024 : ff_sine_1024;
|
|
|
|
const float *pwindow = sce->ics.use_kb_window[1] ? ff_aac_kbd_long_1024 : ff_sine_1024;
|
2012-11-26 17:15:02 +03:00
|
|
|
float *out = sce->ret_buf;
|
2009-07-08 23:01:31 +03:00
|
|
|
|
2013-01-21 00:20:30 +03:00
|
|
|
fdsp->vector_fmul (out, audio, lwindow, 1024);
|
|
|
|
fdsp->vector_fmul_reverse(out + 1024, audio + 1024, pwindow, 1024);
|
2011-12-24 03:36:15 +03:00
|
|
|
}
|
2009-07-08 23:01:31 +03:00
|
|
|
|
2011-12-24 03:36:15 +03:00
|
|
|
WINDOW_FUNC(long_start)
|
|
|
|
{
|
|
|
|
const float *lwindow = sce->ics.use_kb_window[1] ? ff_aac_kbd_long_1024 : ff_sine_1024;
|
|
|
|
const float *swindow = sce->ics.use_kb_window[0] ? ff_aac_kbd_short_128 : ff_sine_128;
|
2012-11-26 17:15:02 +03:00
|
|
|
float *out = sce->ret_buf;
|
2011-12-24 03:36:15 +03:00
|
|
|
|
2012-05-21 19:58:41 +03:00
|
|
|
fdsp->vector_fmul(out, audio, lwindow, 1024);
|
2012-01-28 08:23:41 +03:00
|
|
|
memcpy(out + 1024, audio + 1024, sizeof(out[0]) * 448);
|
2013-01-21 00:20:30 +03:00
|
|
|
fdsp->vector_fmul_reverse(out + 1024 + 448, audio + 1024 + 448, swindow, 128);
|
2011-12-24 03:36:15 +03:00
|
|
|
memset(out + 1024 + 576, 0, sizeof(out[0]) * 448);
|
|
|
|
}
|
2010-06-23 22:30:01 +03:00
|
|
|
|
2011-12-24 03:36:15 +03:00
|
|
|
WINDOW_FUNC(long_stop)
|
|
|
|
{
|
|
|
|
const float *lwindow = sce->ics.use_kb_window[0] ? ff_aac_kbd_long_1024 : ff_sine_1024;
|
|
|
|
const float *swindow = sce->ics.use_kb_window[1] ? ff_aac_kbd_short_128 : ff_sine_128;
|
2012-11-26 17:15:02 +03:00
|
|
|
float *out = sce->ret_buf;
|
2011-12-24 03:36:15 +03:00
|
|
|
|
|
|
|
memset(out, 0, sizeof(out[0]) * 448);
|
2012-05-21 19:58:41 +03:00
|
|
|
fdsp->vector_fmul(out + 448, audio + 448, swindow, 128);
|
2011-12-24 03:36:15 +03:00
|
|
|
memcpy(out + 576, audio + 576, sizeof(out[0]) * 448);
|
2013-01-21 00:20:30 +03:00
|
|
|
fdsp->vector_fmul_reverse(out + 1024, audio + 1024, lwindow, 1024);
|
2011-12-24 03:36:15 +03:00
|
|
|
}
|
2009-07-08 23:01:31 +03:00
|
|
|
|
2011-12-24 03:36:15 +03:00
|
|
|
WINDOW_FUNC(eight_short)
|
|
|
|
{
|
|
|
|
const float *swindow = sce->ics.use_kb_window[0] ? ff_aac_kbd_short_128 : ff_sine_128;
|
|
|
|
const float *pwindow = sce->ics.use_kb_window[1] ? ff_aac_kbd_short_128 : ff_sine_128;
|
|
|
|
const float *in = audio + 448;
|
2012-11-26 17:15:02 +03:00
|
|
|
float *out = sce->ret_buf;
|
2012-01-29 23:55:10 +03:00
|
|
|
int w;
|
2011-12-24 03:36:15 +03:00
|
|
|
|
2012-01-29 23:55:10 +03:00
|
|
|
for (w = 0; w < 8; w++) {
|
2013-01-21 00:20:30 +03:00
|
|
|
fdsp->vector_fmul (out, in, w ? pwindow : swindow, 128);
|
2011-12-24 03:36:15 +03:00
|
|
|
out += 128;
|
|
|
|
in += 128;
|
2013-01-21 00:20:30 +03:00
|
|
|
fdsp->vector_fmul_reverse(out, in, swindow, 128);
|
2011-12-24 03:36:15 +03:00
|
|
|
out += 128;
|
|
|
|
}
|
2008-08-14 08:52:29 +03:00
|
|
|
}
|
|
|
|
|
2013-01-21 00:20:30 +03:00
|
|
|
static void (*const apply_window[4])(AVFloatDSPContext *fdsp,
|
2012-05-21 19:58:41 +03:00
|
|
|
SingleChannelElement *sce,
|
|
|
|
const float *audio) = {
|
2011-12-24 03:36:15 +03:00
|
|
|
[ONLY_LONG_SEQUENCE] = apply_only_long_window,
|
|
|
|
[LONG_START_SEQUENCE] = apply_long_start_window,
|
|
|
|
[EIGHT_SHORT_SEQUENCE] = apply_eight_short_window,
|
|
|
|
[LONG_STOP_SEQUENCE] = apply_long_stop_window
|
|
|
|
};
|
|
|
|
|
2011-12-08 01:20:10 +03:00
|
|
|
static void apply_window_and_mdct(AACEncContext *s, SingleChannelElement *sce,
|
|
|
|
float *audio)
|
2009-07-08 23:01:31 +03:00
|
|
|
{
|
2011-12-24 03:36:15 +03:00
|
|
|
int i;
|
2012-11-26 17:15:02 +03:00
|
|
|
float *output = sce->ret_buf;
|
2009-07-08 23:01:31 +03:00
|
|
|
|
2014-11-29 19:58:13 +02:00
|
|
|
apply_window[sce->ics.window_sequence[0]](s->fdsp, sce, audio);
|
2011-12-24 03:36:15 +03:00
|
|
|
|
|
|
|
if (sce->ics.window_sequence[0] != EIGHT_SHORT_SEQUENCE)
|
2011-03-19 17:14:17 +02:00
|
|
|
s->mdct1024.mdct_calc(&s->mdct1024, sce->coeffs, output);
|
2011-12-24 03:36:15 +03:00
|
|
|
else
|
|
|
|
for (i = 0; i < 1024; i += 128)
|
2015-08-21 19:30:51 +02:00
|
|
|
s->mdct128.mdct_calc(&s->mdct128, &sce->coeffs[i], output + i*2);
|
2011-12-24 03:36:15 +03:00
|
|
|
memcpy(audio, audio + 1024, sizeof(audio[0]) * 1024);
|
2015-03-03 08:43:06 +02:00
|
|
|
memcpy(sce->pcoeffs, sce->coeffs, sizeof(sce->pcoeffs));
|
2009-07-08 23:01:31 +03:00
|
|
|
}
|
|
|
|
|
2008-08-14 08:52:29 +03:00
|
|
|
/**
|
|
|
|
* Encode ics_info element.
|
|
|
|
* @see Table 4.6 (syntax of ics_info)
|
|
|
|
*/
|
2008-08-24 08:56:23 +03:00
|
|
|
static void put_ics_info(AACEncContext *s, IndividualChannelStream *info)
|
2008-08-14 08:52:29 +03:00
|
|
|
{
|
2009-07-08 23:01:31 +03:00
|
|
|
int w;
|
2008-08-14 08:52:29 +03:00
|
|
|
|
|
|
|
put_bits(&s->pb, 1, 0); // ics_reserved bit
|
|
|
|
put_bits(&s->pb, 2, info->window_sequence[0]);
|
|
|
|
put_bits(&s->pb, 1, info->use_kb_window[0]);
|
2009-07-08 23:36:45 +03:00
|
|
|
if (info->window_sequence[0] != EIGHT_SHORT_SEQUENCE) {
|
2008-08-14 08:52:29 +03:00
|
|
|
put_bits(&s->pb, 6, info->max_sfb);
|
2015-08-21 20:38:05 +02:00
|
|
|
put_bits(&s->pb, 1, !!info->predictor_present);
|
2009-07-08 23:36:45 +03:00
|
|
|
} else {
|
2008-08-14 08:52:29 +03:00
|
|
|
put_bits(&s->pb, 4, info->max_sfb);
|
2009-07-09 00:36:33 +03:00
|
|
|
for (w = 1; w < 8; w++)
|
2009-07-08 23:01:31 +03:00
|
|
|
put_bits(&s->pb, 1, !info->group_len[w]);
|
2008-08-14 08:52:29 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-08-24 08:56:23 +03:00
|
|
|
/**
|
2009-07-08 23:01:31 +03:00
|
|
|
* Encode MS data.
|
|
|
|
* @see 4.6.8.1 "Joint Coding - M/S Stereo"
|
2008-08-24 08:56:23 +03:00
|
|
|
*/
|
2009-07-08 23:01:31 +03:00
|
|
|
static void encode_ms_info(PutBitContext *pb, ChannelElement *cpe)
|
2008-08-24 08:56:23 +03:00
|
|
|
{
|
|
|
|
int i, w;
|
2009-07-08 23:01:31 +03:00
|
|
|
|
|
|
|
put_bits(pb, 2, cpe->ms_mode);
|
2009-07-09 00:36:33 +03:00
|
|
|
if (cpe->ms_mode == 1)
|
|
|
|
for (w = 0; w < cpe->ch[0].ics.num_windows; w += cpe->ch[0].ics.group_len[w])
|
2009-07-08 23:36:45 +03:00
|
|
|
for (i = 0; i < cpe->ch[0].ics.max_sfb; i++)
|
2009-07-08 23:01:31 +03:00
|
|
|
put_bits(pb, 1, cpe->ms_mask[w*16 + i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Produce integer coefficients from scalefactors provided by the model.
|
|
|
|
*/
|
2012-10-24 20:16:08 +03:00
|
|
|
static void adjust_frame_information(ChannelElement *cpe, int chans)
|
2009-07-08 23:01:31 +03:00
|
|
|
{
|
|
|
|
int i, w, w2, g, ch;
|
2015-07-02 20:13:06 +02:00
|
|
|
int maxsfb, cmaxsfb;
|
|
|
|
|
|
|
|
for (ch = 0; ch < chans; ch++) {
|
|
|
|
IndividualChannelStream *ics = &cpe->ch[ch].ics;
|
|
|
|
maxsfb = 0;
|
|
|
|
cpe->ch[ch].pulse.num_pulse = 0;
|
|
|
|
for (w = 0; w < ics->num_windows; w += ics->group_len[w]) {
|
|
|
|
for (w2 = 0; w2 < ics->group_len[w]; w2++) {
|
2015-03-03 08:43:06 +02:00
|
|
|
for (cmaxsfb = ics->num_swb; cmaxsfb > 0 && cpe->ch[ch].zeroes[w*16+cmaxsfb-1]; cmaxsfb--)
|
|
|
|
;
|
|
|
|
maxsfb = FFMAX(maxsfb, cmaxsfb);
|
2009-07-08 23:01:31 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
ics->max_sfb = maxsfb;
|
|
|
|
|
|
|
|
//adjust zero bands for window groups
|
2009-07-08 23:36:45 +03:00
|
|
|
for (w = 0; w < ics->num_windows; w += ics->group_len[w]) {
|
|
|
|
for (g = 0; g < ics->max_sfb; g++) {
|
2009-07-08 23:01:31 +03:00
|
|
|
i = 1;
|
2009-07-08 23:36:45 +03:00
|
|
|
for (w2 = w; w2 < w + ics->group_len[w]; w2++) {
|
|
|
|
if (!cpe->ch[ch].zeroes[w2*16 + g]) {
|
2009-07-08 23:01:31 +03:00
|
|
|
i = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
cpe->ch[ch].zeroes[w*16 + g] = i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-07-08 23:36:45 +03:00
|
|
|
if (chans > 1 && cpe->common_window) {
|
2009-07-08 23:01:31 +03:00
|
|
|
IndividualChannelStream *ics0 = &cpe->ch[0].ics;
|
|
|
|
IndividualChannelStream *ics1 = &cpe->ch[1].ics;
|
|
|
|
int msc = 0;
|
|
|
|
ics0->max_sfb = FFMAX(ics0->max_sfb, ics1->max_sfb);
|
|
|
|
ics1->max_sfb = ics0->max_sfb;
|
2009-07-08 23:36:45 +03:00
|
|
|
for (w = 0; w < ics0->num_windows*16; w += 16)
|
|
|
|
for (i = 0; i < ics0->max_sfb; i++)
|
2009-07-09 00:36:33 +03:00
|
|
|
if (cpe->ms_mask[w+i])
|
|
|
|
msc++;
|
2009-07-09 00:16:06 +03:00
|
|
|
if (msc == 0 || ics0->max_sfb == 0)
|
|
|
|
cpe->ms_mode = 0;
|
|
|
|
else
|
2011-06-29 06:11:39 +03:00
|
|
|
cpe->ms_mode = msc < ics0->max_sfb * ics0->num_windows ? 1 : 2;
|
2009-07-08 23:01:31 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-09-02 07:26:45 +02:00
|
|
|
static void apply_intensity_stereo(ChannelElement *cpe)
|
|
|
|
{
|
|
|
|
int w, w2, g, i;
|
|
|
|
IndividualChannelStream *ics = &cpe->ch[0].ics;
|
|
|
|
if (!cpe->common_window)
|
|
|
|
return;
|
|
|
|
for (w = 0; w < ics->num_windows; w += ics->group_len[w]) {
|
|
|
|
for (w2 = 0; w2 < ics->group_len[w]; w2++) {
|
|
|
|
int start = (w+w2) * 128;
|
|
|
|
for (g = 0; g < ics->num_swb; g++) {
|
|
|
|
int p = -1 + 2 * (cpe->ch[1].band_type[w*16+g] - 14);
|
|
|
|
float scale = cpe->ch[0].is_ener[w*16+g];
|
|
|
|
if (!cpe->is_mask[w*16 + g]) {
|
|
|
|
start += ics->swb_sizes[g];
|
|
|
|
continue;
|
|
|
|
}
|
AAC encoder: Extensive improvements
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.
2015-10-11 22:29:50 +02:00
|
|
|
if (cpe->ms_mask[w*16 + g])
|
|
|
|
p *= -1;
|
2015-09-02 07:26:45 +02:00
|
|
|
for (i = 0; i < ics->swb_sizes[g]; i++) {
|
|
|
|
float sum = (cpe->ch[0].coeffs[start+i] + p*cpe->ch[1].coeffs[start+i])*scale;
|
|
|
|
cpe->ch[0].coeffs[start+i] = sum;
|
|
|
|
cpe->ch[1].coeffs[start+i] = 0.0f;
|
|
|
|
}
|
|
|
|
start += ics->swb_sizes[g];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void apply_mid_side_stereo(ChannelElement *cpe)
|
|
|
|
{
|
|
|
|
int w, w2, g, i;
|
|
|
|
IndividualChannelStream *ics = &cpe->ch[0].ics;
|
|
|
|
if (!cpe->common_window)
|
|
|
|
return;
|
|
|
|
for (w = 0; w < ics->num_windows; w += ics->group_len[w]) {
|
|
|
|
for (w2 = 0; w2 < ics->group_len[w]; w2++) {
|
|
|
|
int start = (w+w2) * 128;
|
|
|
|
for (g = 0; g < ics->num_swb; g++) {
|
AAC encoder: Extensive improvements
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.
2015-10-11 22:29:50 +02:00
|
|
|
if (!cpe->ms_mask[w*16 + g] && !cpe->is_mask[w*16 + g]) {
|
2015-09-02 07:26:45 +02:00
|
|
|
start += ics->swb_sizes[g];
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
for (i = 0; i < ics->swb_sizes[g]; i++) {
|
|
|
|
float L = (cpe->ch[0].coeffs[start+i] + cpe->ch[1].coeffs[start+i]) * 0.5f;
|
|
|
|
float R = L - cpe->ch[1].coeffs[start+i];
|
|
|
|
cpe->ch[0].coeffs[start+i] = L;
|
|
|
|
cpe->ch[1].coeffs[start+i] = R;
|
|
|
|
}
|
|
|
|
start += ics->swb_sizes[g];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-07-08 23:01:31 +03:00
|
|
|
/**
|
|
|
|
* Encode scalefactor band coding type.
|
|
|
|
*/
|
|
|
|
static void encode_band_info(AACEncContext *s, SingleChannelElement *sce)
|
|
|
|
{
|
|
|
|
int w;
|
|
|
|
|
2015-09-02 07:26:45 +02:00
|
|
|
if (s->coder->set_special_band_scalefactors)
|
|
|
|
s->coder->set_special_band_scalefactors(s, sce);
|
|
|
|
|
2009-07-09 00:36:33 +03:00
|
|
|
for (w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w])
|
2009-07-08 23:01:31 +03:00
|
|
|
s->coder->encode_window_bands_info(s, sce, w, sce->ics.group_len[w], s->lambda);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Encode scalefactors.
|
|
|
|
*/
|
2009-07-09 00:16:06 +03:00
|
|
|
static void encode_scale_factors(AVCodecContext *avctx, AACEncContext *s,
|
|
|
|
SingleChannelElement *sce)
|
2009-07-08 23:01:31 +03:00
|
|
|
{
|
2015-04-14 01:33:51 +02:00
|
|
|
int diff, off_sf = sce->sf_idx[0], off_pns = sce->sf_idx[0] - NOISE_OFFSET;
|
2015-06-26 22:16:34 +02:00
|
|
|
int off_is = 0, noise_flag = 1;
|
2009-07-08 23:01:31 +03:00
|
|
|
int i, w;
|
|
|
|
|
2009-07-08 23:36:45 +03:00
|
|
|
for (w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]) {
|
|
|
|
for (i = 0; i < sce->ics.max_sfb; i++) {
|
|
|
|
if (!sce->zeroes[w*16 + i]) {
|
2015-04-12 06:50:34 +02:00
|
|
|
if (sce->band_type[w*16 + i] == NOISE_BT) {
|
|
|
|
diff = sce->sf_idx[w*16 + i] - off_pns;
|
|
|
|
off_pns = sce->sf_idx[w*16 + i];
|
|
|
|
if (noise_flag-- > 0) {
|
|
|
|
put_bits(&s->pb, NOISE_PRE_BITS, diff + NOISE_PRE);
|
|
|
|
continue;
|
|
|
|
}
|
2015-06-26 22:16:34 +02:00
|
|
|
} else if (sce->band_type[w*16 + i] == INTENSITY_BT ||
|
|
|
|
sce->band_type[w*16 + i] == INTENSITY_BT2) {
|
|
|
|
diff = sce->sf_idx[w*16 + i] - off_is;
|
|
|
|
off_is = sce->sf_idx[w*16 + i];
|
2015-04-12 06:50:34 +02:00
|
|
|
} else {
|
|
|
|
diff = sce->sf_idx[w*16 + i] - off_sf;
|
|
|
|
off_sf = sce->sf_idx[w*16 + i];
|
|
|
|
}
|
|
|
|
diff += SCALE_DIFF_ZERO;
|
2012-10-26 03:11:20 +03:00
|
|
|
av_assert0(diff >= 0 && diff <= 120);
|
2009-07-08 23:01:31 +03:00
|
|
|
put_bits(&s->pb, ff_aac_scalefactor_bits[diff], ff_aac_scalefactor_code[diff]);
|
|
|
|
}
|
2008-08-24 08:56:23 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-08-16 08:47:18 +03:00
|
|
|
/**
|
|
|
|
* Encode pulse data.
|
|
|
|
*/
|
2008-08-23 18:25:57 +03:00
|
|
|
static void encode_pulses(AACEncContext *s, Pulse *pulse)
|
2008-08-16 08:47:18 +03:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
put_bits(&s->pb, 1, !!pulse->num_pulse);
|
2009-07-09 00:16:06 +03:00
|
|
|
if (!pulse->num_pulse)
|
|
|
|
return;
|
2008-08-16 08:47:18 +03:00
|
|
|
|
|
|
|
put_bits(&s->pb, 2, pulse->num_pulse - 1);
|
|
|
|
put_bits(&s->pb, 6, pulse->start);
|
2009-07-08 23:36:45 +03:00
|
|
|
for (i = 0; i < pulse->num_pulse; i++) {
|
2008-08-16 14:59:36 +03:00
|
|
|
put_bits(&s->pb, 5, pulse->pos[i]);
|
2008-08-16 08:47:18 +03:00
|
|
|
put_bits(&s->pb, 4, pulse->amp[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Encode spectral coefficients processed by psychoacoustic model.
|
|
|
|
*/
|
2008-08-23 18:25:57 +03:00
|
|
|
static void encode_spectral_coeffs(AACEncContext *s, SingleChannelElement *sce)
|
2008-08-16 08:47:18 +03:00
|
|
|
{
|
2009-07-08 23:01:31 +03:00
|
|
|
int start, i, w, w2;
|
2008-08-16 08:47:18 +03:00
|
|
|
|
2009-07-08 23:36:45 +03:00
|
|
|
for (w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]) {
|
2008-08-16 08:47:18 +03:00
|
|
|
start = 0;
|
2009-07-08 23:36:45 +03:00
|
|
|
for (i = 0; i < sce->ics.max_sfb; i++) {
|
|
|
|
if (sce->zeroes[w*16 + i]) {
|
2008-08-23 18:25:57 +03:00
|
|
|
start += sce->ics.swb_sizes[i];
|
2008-08-16 08:47:18 +03:00
|
|
|
continue;
|
|
|
|
}
|
2015-08-29 07:34:08 +02:00
|
|
|
for (w2 = w; w2 < w + sce->ics.group_len[w]; w2++) {
|
2015-08-21 19:53:14 +02:00
|
|
|
s->coder->quantize_and_encode_band(s, &s->pb,
|
|
|
|
&sce->coeffs[start + w2*128],
|
2015-08-29 07:34:08 +02:00
|
|
|
NULL, sce->ics.swb_sizes[i],
|
2009-07-09 00:16:06 +03:00
|
|
|
sce->sf_idx[w*16 + i],
|
|
|
|
sce->band_type[w*16 + i],
|
2015-08-21 19:53:14 +02:00
|
|
|
s->lambda,
|
|
|
|
sce->ics.window_clipping[w]);
|
2015-08-29 07:34:08 +02:00
|
|
|
}
|
2008-08-23 18:25:57 +03:00
|
|
|
start += sce->ics.swb_sizes[i];
|
2008-08-16 08:47:18 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-07-21 03:53:24 +02:00
|
|
|
/**
|
|
|
|
* Downscale spectral coefficients for near-clipping windows to avoid artifacts
|
|
|
|
*/
|
|
|
|
static void avoid_clipping(AACEncContext *s, SingleChannelElement *sce)
|
|
|
|
{
|
|
|
|
int start, i, j, w;
|
|
|
|
|
|
|
|
if (sce->ics.clip_avoidance_factor < 1.0f) {
|
|
|
|
for (w = 0; w < sce->ics.num_windows; w++) {
|
|
|
|
start = 0;
|
|
|
|
for (i = 0; i < sce->ics.max_sfb; i++) {
|
2015-08-21 19:30:51 +02:00
|
|
|
float *swb_coeffs = &sce->coeffs[start + w*128];
|
2015-07-21 03:53:24 +02:00
|
|
|
for (j = 0; j < sce->ics.swb_sizes[i]; j++)
|
|
|
|
swb_coeffs[j] *= sce->ics.clip_avoidance_factor;
|
|
|
|
start += sce->ics.swb_sizes[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-07-08 23:01:31 +03:00
|
|
|
/**
|
|
|
|
* Encode one channel of audio data.
|
|
|
|
*/
|
2009-07-09 00:16:06 +03:00
|
|
|
static int encode_individual_channel(AVCodecContext *avctx, AACEncContext *s,
|
|
|
|
SingleChannelElement *sce,
|
|
|
|
int common_window)
|
2009-07-08 23:01:31 +03:00
|
|
|
{
|
|
|
|
put_bits(&s->pb, 8, sce->sf_idx[0]);
|
2015-08-21 20:38:05 +02:00
|
|
|
if (!common_window) {
|
2009-07-09 00:16:06 +03:00
|
|
|
put_ics_info(s, &sce->ics);
|
2015-08-21 20:38:05 +02:00
|
|
|
if (s->coder->encode_main_pred)
|
|
|
|
s->coder->encode_main_pred(s, sce);
|
2015-10-17 03:22:51 +02:00
|
|
|
if (s->coder->encode_ltp_info)
|
|
|
|
s->coder->encode_ltp_info(s, sce, 0);
|
2015-08-21 20:38:05 +02:00
|
|
|
}
|
2009-07-08 23:01:31 +03:00
|
|
|
encode_band_info(s, sce);
|
|
|
|
encode_scale_factors(avctx, s, sce);
|
|
|
|
encode_pulses(s, &sce->pulse);
|
2015-08-29 07:47:31 +02:00
|
|
|
put_bits(&s->pb, 1, !!sce->tns.present);
|
2015-08-21 20:27:38 +02:00
|
|
|
if (s->coder->encode_tns_info)
|
|
|
|
s->coder->encode_tns_info(s, sce);
|
2009-07-08 23:01:31 +03:00
|
|
|
put_bits(&s->pb, 1, 0); //ssr
|
|
|
|
encode_spectral_coeffs(s, sce);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-08-14 08:52:29 +03:00
|
|
|
/**
|
|
|
|
* Write some auxiliary information about the created AAC file.
|
|
|
|
*/
|
2012-10-24 20:16:08 +03:00
|
|
|
static void put_bitstream_info(AACEncContext *s, const char *name)
|
2008-08-14 08:52:29 +03:00
|
|
|
{
|
|
|
|
int i, namelen, padbits;
|
|
|
|
|
|
|
|
namelen = strlen(name) + 2;
|
2008-08-16 14:59:36 +03:00
|
|
|
put_bits(&s->pb, 3, TYPE_FIL);
|
2008-08-14 08:52:29 +03:00
|
|
|
put_bits(&s->pb, 4, FFMIN(namelen, 15));
|
2009-07-08 23:36:45 +03:00
|
|
|
if (namelen >= 15)
|
2012-01-22 03:40:10 +03:00
|
|
|
put_bits(&s->pb, 8, namelen - 14);
|
2008-08-14 08:52:29 +03:00
|
|
|
put_bits(&s->pb, 4, 0); //extension type - filler
|
2012-01-24 00:08:32 +03:00
|
|
|
padbits = -put_bits_count(&s->pb) & 7;
|
2011-10-17 11:10:42 +03:00
|
|
|
avpriv_align_put_bits(&s->pb);
|
2009-07-08 23:36:45 +03:00
|
|
|
for (i = 0; i < namelen - 2; i++)
|
2008-08-14 08:52:29 +03:00
|
|
|
put_bits(&s->pb, 8, name[i]);
|
|
|
|
put_bits(&s->pb, 12 - padbits, 0);
|
|
|
|
}
|
|
|
|
|
2011-12-15 05:43:56 +03:00
|
|
|
/*
|
2012-08-25 20:04:33 +03:00
|
|
|
* Copy input samples.
|
2012-02-01 05:46:11 +03:00
|
|
|
* Channels are reordered from libavcodec's default order to AAC order.
|
2011-12-15 05:43:56 +03:00
|
|
|
*/
|
2012-08-25 20:04:33 +03:00
|
|
|
static void copy_input_samples(AACEncContext *s, const AVFrame *frame)
|
2011-12-15 05:43:56 +03:00
|
|
|
{
|
2012-08-25 20:04:33 +03:00
|
|
|
int ch;
|
|
|
|
int end = 2048 + (frame ? frame->nb_samples : 0);
|
|
|
|
const uint8_t *channel_map = aac_chan_maps[s->channels - 1];
|
2011-12-15 05:43:56 +03:00
|
|
|
|
2012-08-25 20:04:33 +03:00
|
|
|
/* copy and remap input samples */
|
|
|
|
for (ch = 0; ch < s->channels; ch++) {
|
2011-12-15 05:43:56 +03:00
|
|
|
/* copy last 1024 samples of previous frame to the start of the current frame */
|
2012-01-28 08:23:40 +03:00
|
|
|
memcpy(&s->planar_samples[ch][1024], &s->planar_samples[ch][2048], 1024 * sizeof(s->planar_samples[0][0]));
|
2011-12-15 05:43:56 +03:00
|
|
|
|
2012-08-25 20:04:33 +03:00
|
|
|
/* copy new samples and zero any remaining samples */
|
2012-01-28 20:28:01 +03:00
|
|
|
if (frame) {
|
2012-08-25 20:04:33 +03:00
|
|
|
memcpy(&s->planar_samples[ch][2048],
|
|
|
|
frame->extended_data[channel_map[ch]],
|
|
|
|
frame->nb_samples * sizeof(s->planar_samples[0][0]));
|
2011-12-15 05:43:56 +03:00
|
|
|
}
|
2012-08-25 20:04:33 +03:00
|
|
|
memset(&s->planar_samples[ch][end], 0,
|
|
|
|
(3072 - end) * sizeof(s->planar_samples[0][0]));
|
2011-12-15 05:43:56 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-01-28 20:28:01 +03:00
|
|
|
static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
|
|
|
|
const AVFrame *frame, int *got_packet_ptr)
|
2009-07-08 23:01:31 +03:00
|
|
|
{
|
|
|
|
AACEncContext *s = avctx->priv_data;
|
2011-12-25 01:24:16 +03:00
|
|
|
float **samples = s->planar_samples, *samples2, *la, *overlap;
|
2009-07-08 23:01:31 +03:00
|
|
|
ChannelElement *cpe;
|
2015-08-21 20:13:26 +02:00
|
|
|
SingleChannelElement *sce;
|
2015-10-17 03:13:00 +02:00
|
|
|
IndividualChannelStream *ics;
|
2015-09-23 07:13:56 +02:00
|
|
|
int i, its, ch, w, chans, tag, start_ch, ret, frame_bits;
|
AAC encoder: Extensive improvements
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.
2015-10-11 22:29:50 +02:00
|
|
|
int target_bits, rate_bits, too_many_bits, too_few_bits;
|
2015-08-21 20:13:26 +02:00
|
|
|
int ms_mode = 0, is_mode = 0, tns_mode = 0, pred_mode = 0;
|
2009-07-08 23:01:31 +03:00
|
|
|
int chan_el_counter[4];
|
2010-07-06 03:06:15 +03:00
|
|
|
FFPsyWindowInfo windows[AAC_MAX_CHANNELS];
|
2009-07-08 23:01:31 +03:00
|
|
|
|
2012-01-29 01:51:22 +03:00
|
|
|
if (s->last_frame == 2)
|
2009-07-08 23:01:31 +03:00
|
|
|
return 0;
|
2011-12-15 05:43:56 +03:00
|
|
|
|
2012-01-28 20:28:01 +03:00
|
|
|
/* add current frame to queue */
|
|
|
|
if (frame) {
|
2013-01-14 02:02:50 +03:00
|
|
|
if ((ret = ff_af_queue_add(&s->afq, frame)) < 0)
|
2012-01-28 20:28:01 +03:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2012-08-25 20:04:33 +03:00
|
|
|
copy_input_samples(s, frame);
|
2012-01-29 01:51:22 +03:00
|
|
|
if (s->psypp)
|
|
|
|
ff_psy_preprocess(s->psypp, s->planar_samples, s->channels);
|
2011-12-15 05:43:56 +03:00
|
|
|
|
|
|
|
if (!avctx->frame_number)
|
2009-07-08 23:01:31 +03:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
start_ch = 0;
|
2011-06-20 07:29:37 +03:00
|
|
|
for (i = 0; i < s->chan_map[0]; i++) {
|
2009-07-09 02:10:13 +03:00
|
|
|
FFPsyWindowInfo* wi = windows + start_ch;
|
2011-06-20 07:29:37 +03:00
|
|
|
tag = s->chan_map[i+1];
|
2009-07-09 00:16:06 +03:00
|
|
|
chans = tag == TYPE_CPE ? 2 : 1;
|
|
|
|
cpe = &s->cpe[i];
|
2011-05-06 10:19:51 +03:00
|
|
|
for (ch = 0; ch < chans; ch++) {
|
2015-10-17 13:40:04 +02:00
|
|
|
float clip_avoidance_factor;
|
2015-10-17 03:13:00 +02:00
|
|
|
sce = &cpe->ch[ch];
|
|
|
|
ics = &sce->ics;
|
|
|
|
s->cur_channel = start_ch + ch;
|
|
|
|
overlap = &samples[s->cur_channel][0];
|
2011-12-25 01:24:16 +03:00
|
|
|
samples2 = overlap + 1024;
|
2011-12-15 05:43:56 +03:00
|
|
|
la = samples2 + (448+64);
|
2012-01-28 20:28:01 +03:00
|
|
|
if (!frame)
|
2010-07-19 21:22:44 +03:00
|
|
|
la = NULL;
|
2010-07-08 00:48:51 +03:00
|
|
|
if (tag == TYPE_LFE) {
|
2011-05-06 10:19:51 +03:00
|
|
|
wi[ch].window_type[0] = ONLY_LONG_SEQUENCE;
|
|
|
|
wi[ch].window_shape = 0;
|
|
|
|
wi[ch].num_windows = 1;
|
|
|
|
wi[ch].grouping[0] = 1;
|
2011-07-29 23:49:04 +03:00
|
|
|
|
|
|
|
/* Only the lowest 12 coefficients are used in a LFE channel.
|
|
|
|
* The expression below results in only the bottom 8 coefficients
|
|
|
|
* being used for 11.025kHz to 16kHz sample rates.
|
|
|
|
*/
|
|
|
|
ics->num_swb = s->samplerate_index >= 8 ? 1 : 3;
|
2010-07-08 00:48:51 +03:00
|
|
|
} else {
|
2015-10-17 03:13:00 +02:00
|
|
|
wi[ch] = s->psy.model->window(&s->psy, samples2, la, s->cur_channel,
|
2010-07-08 00:50:50 +03:00
|
|
|
ics->window_sequence[0]);
|
2010-07-08 00:48:51 +03:00
|
|
|
}
|
2009-07-08 23:01:31 +03:00
|
|
|
ics->window_sequence[1] = ics->window_sequence[0];
|
2011-05-06 10:19:51 +03:00
|
|
|
ics->window_sequence[0] = wi[ch].window_type[0];
|
2009-07-08 23:01:31 +03:00
|
|
|
ics->use_kb_window[1] = ics->use_kb_window[0];
|
2011-05-06 10:19:51 +03:00
|
|
|
ics->use_kb_window[0] = wi[ch].window_shape;
|
|
|
|
ics->num_windows = wi[ch].num_windows;
|
2009-07-08 23:01:31 +03:00
|
|
|
ics->swb_sizes = s->psy.bands [ics->num_windows == 8];
|
2011-07-29 23:49:04 +03:00
|
|
|
ics->num_swb = tag == TYPE_LFE ? ics->num_swb : s->psy.num_bands[ics->num_windows == 8];
|
2015-08-21 19:40:44 +02:00
|
|
|
ics->swb_offset = wi[ch].window_type[0] == EIGHT_SHORT_SEQUENCE ?
|
|
|
|
ff_swb_offset_128 [s->samplerate_index]:
|
|
|
|
ff_swb_offset_1024[s->samplerate_index];
|
2015-09-01 07:20:24 +02:00
|
|
|
ics->tns_max_bands = wi[ch].window_type[0] == EIGHT_SHORT_SEQUENCE ?
|
|
|
|
ff_tns_max_bands_128 [s->samplerate_index]:
|
|
|
|
ff_tns_max_bands_1024[s->samplerate_index];
|
2015-07-21 03:53:24 +02:00
|
|
|
clip_avoidance_factor = 0.0f;
|
2011-05-06 10:19:51 +03:00
|
|
|
for (w = 0; w < ics->num_windows; w++)
|
|
|
|
ics->group_len[w] = wi[ch].grouping[w];
|
2015-07-21 03:53:24 +02:00
|
|
|
for (w = 0; w < ics->num_windows; w++) {
|
|
|
|
if (wi[ch].clipping[w] > CLIP_AVOIDANCE_FACTOR) {
|
|
|
|
ics->window_clipping[w] = 1;
|
|
|
|
clip_avoidance_factor = FFMAX(clip_avoidance_factor, wi[ch].clipping[w]);
|
|
|
|
} else {
|
|
|
|
ics->window_clipping[w] = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (clip_avoidance_factor > CLIP_AVOIDANCE_FACTOR) {
|
|
|
|
ics->clip_avoidance_factor = CLIP_AVOIDANCE_FACTOR / clip_avoidance_factor;
|
|
|
|
} else {
|
|
|
|
ics->clip_avoidance_factor = 1.0f;
|
|
|
|
}
|
2009-07-08 23:01:31 +03:00
|
|
|
|
2015-10-17 03:13:00 +02:00
|
|
|
apply_window_and_mdct(s, sce, overlap);
|
2015-10-17 03:22:51 +02:00
|
|
|
|
|
|
|
if (s->options.ltp && s->coder->update_ltp) {
|
|
|
|
s->coder->update_ltp(s, sce);
|
|
|
|
apply_window[sce->ics.window_sequence[0]](s->fdsp, sce, &sce->ltp_state[0]);
|
|
|
|
s->mdct1024.mdct_calc(&s->mdct1024, sce->lcoeffs, sce->ret_buf);
|
|
|
|
}
|
|
|
|
|
2014-11-09 00:32:39 +02:00
|
|
|
if (isnan(cpe->ch->coeffs[0])) {
|
|
|
|
av_log(avctx, AV_LOG_ERROR, "Input contains NaN\n");
|
|
|
|
return AVERROR(EINVAL);
|
|
|
|
}
|
2015-10-17 03:13:00 +02:00
|
|
|
avoid_clipping(s, sce);
|
2009-07-09 02:10:13 +03:00
|
|
|
}
|
|
|
|
start_ch += chans;
|
|
|
|
}
|
2015-07-27 19:36:16 +02:00
|
|
|
if ((ret = ff_alloc_packet2(avctx, avpkt, 8192 * s->channels, 0)) < 0)
|
2012-04-06 16:25:05 +03:00
|
|
|
return ret;
|
2015-09-23 07:13:56 +02:00
|
|
|
frame_bits = its = 0;
|
2009-07-09 02:12:53 +03:00
|
|
|
do {
|
2012-01-28 20:28:01 +03:00
|
|
|
init_put_bits(&s->pb, avpkt->data, avpkt->size);
|
|
|
|
|
2015-06-29 21:59:37 +02:00
|
|
|
if ((avctx->frame_number & 0xFF)==1 && !(avctx->flags & AV_CODEC_FLAG_BITEXACT))
|
2012-10-24 20:16:08 +03:00
|
|
|
put_bitstream_info(s, LIBAVCODEC_IDENT);
|
2009-07-09 02:14:47 +03:00
|
|
|
start_ch = 0;
|
2015-09-23 07:13:56 +02:00
|
|
|
target_bits = 0;
|
2009-07-09 02:14:47 +03:00
|
|
|
memset(chan_el_counter, 0, sizeof(chan_el_counter));
|
2011-06-20 07:29:37 +03:00
|
|
|
for (i = 0; i < s->chan_map[0]; i++) {
|
2009-07-09 02:14:47 +03:00
|
|
|
FFPsyWindowInfo* wi = windows + start_ch;
|
2011-05-19 08:14:59 +03:00
|
|
|
const float *coeffs[2];
|
2011-06-20 07:29:37 +03:00
|
|
|
tag = s->chan_map[i+1];
|
2009-07-09 02:14:47 +03:00
|
|
|
chans = tag == TYPE_CPE ? 2 : 1;
|
|
|
|
cpe = &s->cpe[i];
|
2015-09-01 08:00:10 +02:00
|
|
|
cpe->common_window = 0;
|
2015-07-02 20:13:03 +02:00
|
|
|
memset(cpe->is_mask, 0, sizeof(cpe->is_mask));
|
|
|
|
memset(cpe->ms_mask, 0, sizeof(cpe->ms_mask));
|
2010-08-31 02:52:03 +03:00
|
|
|
put_bits(&s->pb, 3, tag);
|
|
|
|
put_bits(&s->pb, 4, chan_el_counter[tag]++);
|
2015-08-21 19:36:09 +02:00
|
|
|
for (ch = 0; ch < chans; ch++) {
|
|
|
|
sce = &cpe->ch[ch];
|
|
|
|
coeffs[ch] = sce->coeffs;
|
2015-08-21 20:38:05 +02:00
|
|
|
sce->ics.predictor_present = 0;
|
2015-10-17 03:22:51 +02:00
|
|
|
sce->ics.ltp.present = 0;
|
|
|
|
memset(sce->ics.ltp.used, 0, sizeof(sce->ics.ltp.used));
|
2015-10-17 03:14:10 +02:00
|
|
|
memset(sce->ics.prediction_used, 0, sizeof(sce->ics.prediction_used));
|
2015-08-21 20:27:38 +02:00
|
|
|
memset(&sce->tns, 0, sizeof(TemporalNoiseShaping));
|
2015-08-21 19:36:09 +02:00
|
|
|
for (w = 0; w < 128; w++)
|
|
|
|
if (sce->band_type[w] > RESERVED_BT)
|
|
|
|
sce->band_type[w] = 0;
|
|
|
|
}
|
2015-09-23 07:13:56 +02:00
|
|
|
s->psy.bitres.alloc = -1;
|
|
|
|
s->psy.bitres.bits = avctx->frame_bits / s->channels;
|
2011-05-19 08:23:22 +03:00
|
|
|
s->psy.model->analyze(&s->psy, start_ch, coeffs, wi);
|
2015-09-23 07:13:56 +02:00
|
|
|
if (s->psy.bitres.alloc > 0) {
|
|
|
|
/* Lambda unused here on purpose, we need to take psy's unscaled allocation */
|
AAC encoder: Extensive improvements
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.
2015-10-11 22:29:50 +02:00
|
|
|
target_bits += s->psy.bitres.alloc
|
|
|
|
* (s->lambda / (avctx->global_quality ? avctx->global_quality : 120));
|
2015-09-23 07:13:56 +02:00
|
|
|
s->psy.bitres.alloc /= chans;
|
|
|
|
}
|
|
|
|
s->cur_type = tag;
|
2011-05-06 10:19:51 +03:00
|
|
|
for (ch = 0; ch < chans; ch++) {
|
2013-05-12 10:38:40 +03:00
|
|
|
s->cur_channel = start_ch + ch;
|
AAC encoder: Extensive improvements
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.
2015-10-11 22:29:50 +02:00
|
|
|
if (s->options.pns && s->coder->mark_pns)
|
|
|
|
s->coder->mark_pns(s, avctx, &cpe->ch[ch]);
|
2011-05-06 10:19:51 +03:00
|
|
|
s->coder->search_for_quantizers(avctx, s, &cpe->ch[ch], s->lambda);
|
2009-07-09 02:14:47 +03:00
|
|
|
}
|
|
|
|
if (chans > 1
|
|
|
|
&& wi[0].window_type[0] == wi[1].window_type[0]
|
|
|
|
&& wi[0].window_shape == wi[1].window_shape) {
|
|
|
|
|
|
|
|
cpe->common_window = 1;
|
2011-05-06 10:19:51 +03:00
|
|
|
for (w = 0; w < wi[0].num_windows; w++) {
|
|
|
|
if (wi[0].grouping[w] != wi[1].grouping[w]) {
|
2009-07-09 02:14:47 +03:00
|
|
|
cpe->common_window = 0;
|
|
|
|
break;
|
|
|
|
}
|
2009-07-08 23:01:31 +03:00
|
|
|
}
|
|
|
|
}
|
2015-09-02 07:26:45 +02:00
|
|
|
for (ch = 0; ch < chans; ch++) { /* TNS and PNS */
|
2015-08-21 20:27:38 +02:00
|
|
|
sce = &cpe->ch[ch];
|
|
|
|
s->cur_channel = start_ch + ch;
|
|
|
|
if (s->options.pns && s->coder->search_for_pns)
|
|
|
|
s->coder->search_for_pns(s, avctx, sce);
|
|
|
|
if (s->options.tns && s->coder->search_for_tns)
|
|
|
|
s->coder->search_for_tns(s, sce);
|
2015-08-29 07:47:31 +02:00
|
|
|
if (s->options.tns && s->coder->apply_tns_filt)
|
2015-09-01 07:44:07 +02:00
|
|
|
s->coder->apply_tns_filt(s, sce);
|
2015-08-21 20:27:38 +02:00
|
|
|
if (sce->tns.present)
|
|
|
|
tns_mode = 1;
|
2015-07-02 20:13:05 +02:00
|
|
|
}
|
2013-05-12 10:38:40 +03:00
|
|
|
s->cur_channel = start_ch;
|
2015-09-02 07:26:45 +02:00
|
|
|
if (s->options.intensity_stereo) { /* Intensity Stereo */
|
|
|
|
if (s->coder->search_for_is)
|
|
|
|
s->coder->search_for_is(s, avctx, cpe);
|
2015-07-02 20:13:07 +02:00
|
|
|
if (cpe->is_mode) is_mode = 1;
|
2015-09-02 07:26:45 +02:00
|
|
|
apply_intensity_stereo(cpe);
|
2015-07-02 20:13:07 +02:00
|
|
|
}
|
2015-09-02 07:26:45 +02:00
|
|
|
if (s->options.pred) { /* Prediction */
|
|
|
|
for (ch = 0; ch < chans; ch++) {
|
|
|
|
sce = &cpe->ch[ch];
|
|
|
|
s->cur_channel = start_ch + ch;
|
|
|
|
if (s->options.pred && s->coder->search_for_pred)
|
|
|
|
s->coder->search_for_pred(s, sce);
|
|
|
|
if (cpe->ch[ch].ics.predictor_present) pred_mode = 1;
|
|
|
|
}
|
2015-10-13 00:33:07 +02:00
|
|
|
if (s->coder->adjust_common_pred)
|
|
|
|
s->coder->adjust_common_pred(s, cpe);
|
2015-09-02 07:26:45 +02:00
|
|
|
for (ch = 0; ch < chans; ch++) {
|
|
|
|
sce = &cpe->ch[ch];
|
|
|
|
s->cur_channel = start_ch + ch;
|
|
|
|
if (s->options.pred && s->coder->apply_main_pred)
|
|
|
|
s->coder->apply_main_pred(s, sce);
|
|
|
|
}
|
|
|
|
s->cur_channel = start_ch;
|
2015-08-29 07:34:08 +02:00
|
|
|
}
|
2015-10-12 17:50:10 +02:00
|
|
|
if (s->options.mid_side) { /* Mid/Side stereo */
|
|
|
|
if (s->options.mid_side == -1 && s->coder->search_for_ms)
|
2015-09-02 07:26:45 +02:00
|
|
|
s->coder->search_for_ms(s, cpe);
|
|
|
|
else if (cpe->common_window)
|
|
|
|
memset(cpe->ms_mask, 1, sizeof(cpe->ms_mask));
|
|
|
|
apply_mid_side_stereo(cpe);
|
2015-08-29 07:34:08 +02:00
|
|
|
}
|
2015-09-02 07:26:45 +02:00
|
|
|
adjust_frame_information(cpe, chans);
|
2015-10-17 03:22:51 +02:00
|
|
|
if (s->options.ltp) { /* LTP */
|
|
|
|
for (ch = 0; ch < chans; ch++) {
|
|
|
|
sce = &cpe->ch[ch];
|
|
|
|
s->cur_channel = start_ch + ch;
|
|
|
|
if (s->coder->search_for_ltp)
|
|
|
|
s->coder->search_for_ltp(s, sce, cpe->common_window);
|
|
|
|
if (sce->ics.ltp.present) pred_mode = 1;
|
|
|
|
}
|
|
|
|
s->cur_channel = start_ch;
|
|
|
|
if (s->coder->adjust_common_ltp)
|
|
|
|
s->coder->adjust_common_ltp(s, cpe);
|
|
|
|
}
|
2009-07-09 02:14:47 +03:00
|
|
|
if (chans == 2) {
|
|
|
|
put_bits(&s->pb, 1, cpe->common_window);
|
|
|
|
if (cpe->common_window) {
|
|
|
|
put_ics_info(s, &cpe->ch[0].ics);
|
2015-08-21 20:38:05 +02:00
|
|
|
if (s->coder->encode_main_pred)
|
|
|
|
s->coder->encode_main_pred(s, &cpe->ch[0]);
|
2015-10-17 03:22:51 +02:00
|
|
|
if (s->coder->encode_ltp_info)
|
|
|
|
s->coder->encode_ltp_info(s, &cpe->ch[0], 1);
|
2009-07-09 02:14:47 +03:00
|
|
|
encode_ms_info(&s->pb, cpe);
|
2015-03-03 08:43:06 +02:00
|
|
|
if (cpe->ms_mode) ms_mode = 1;
|
2009-07-09 02:14:47 +03:00
|
|
|
}
|
2009-07-08 23:01:31 +03:00
|
|
|
}
|
2011-05-06 10:19:51 +03:00
|
|
|
for (ch = 0; ch < chans; ch++) {
|
|
|
|
s->cur_channel = start_ch + ch;
|
|
|
|
encode_individual_channel(avctx, s, &cpe->ch[ch], cpe->common_window);
|
2009-07-09 02:14:47 +03:00
|
|
|
}
|
|
|
|
start_ch += chans;
|
2009-07-08 23:01:31 +03:00
|
|
|
}
|
|
|
|
|
2015-09-23 07:13:56 +02:00
|
|
|
if (avctx->flags & CODEC_FLAG_QSCALE) {
|
|
|
|
/* When using a constant Q-scale, don't mess with lambda */
|
2009-07-09 02:12:53 +03:00
|
|
|
break;
|
2011-01-05 10:32:16 +02:00
|
|
|
}
|
2009-07-09 02:12:53 +03:00
|
|
|
|
2015-09-23 07:13:56 +02:00
|
|
|
/* rate control stuff
|
AAC encoder: Extensive improvements
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.
2015-10-11 22:29:50 +02:00
|
|
|
* allow between the nominal bitrate, and what psy's bit reservoir says to target
|
|
|
|
* but drift towards the nominal bitrate always
|
2015-09-23 07:13:56 +02:00
|
|
|
*/
|
|
|
|
frame_bits = put_bits_count(&s->pb);
|
AAC encoder: Extensive improvements
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.
2015-10-11 22:29:50 +02:00
|
|
|
rate_bits = avctx->bit_rate * 1024 / avctx->sample_rate;
|
|
|
|
rate_bits = FFMIN(rate_bits, 6144 * s->channels - 3);
|
|
|
|
too_many_bits = FFMAX(target_bits, rate_bits);
|
|
|
|
too_many_bits = FFMIN(too_many_bits, 6144 * s->channels - 3);
|
|
|
|
too_few_bits = FFMIN(FFMAX(rate_bits - rate_bits/4, target_bits), too_many_bits);
|
2015-09-23 07:13:56 +02:00
|
|
|
|
|
|
|
/* When using ABR, be strict (but only for increasing) */
|
AAC encoder: Extensive improvements
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.
2015-10-11 22:29:50 +02:00
|
|
|
too_few_bits = too_few_bits - too_few_bits/8;
|
|
|
|
too_many_bits = too_many_bits + too_many_bits/2;
|
2015-09-23 07:13:56 +02:00
|
|
|
|
|
|
|
if ( its == 0 /* for steady-state Q-scale tracking */
|
|
|
|
|| (its < 5 && (frame_bits < too_few_bits || frame_bits > too_many_bits))
|
|
|
|
|| frame_bits >= 6144 * s->channels - 3 )
|
|
|
|
{
|
AAC encoder: Extensive improvements
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.
2015-10-11 22:29:50 +02:00
|
|
|
float ratio = ((float)rate_bits) / frame_bits;
|
2015-09-23 07:13:56 +02:00
|
|
|
|
|
|
|
if (frame_bits >= too_few_bits && frame_bits <= too_many_bits) {
|
|
|
|
/*
|
|
|
|
* This path is for steady-state Q-scale tracking
|
|
|
|
* When frame bits fall within the stable range, we still need to adjust
|
|
|
|
* lambda to maintain it like so in a stable fashion (large jumps in lambda
|
|
|
|
* create artifacts and should be avoided), but slowly
|
|
|
|
*/
|
|
|
|
ratio = sqrtf(sqrtf(ratio));
|
|
|
|
ratio = av_clipf(ratio, 0.9f, 1.1f);
|
|
|
|
} else {
|
|
|
|
/* Not so fast though */
|
|
|
|
ratio = sqrtf(ratio);
|
|
|
|
}
|
|
|
|
s->lambda = FFMIN(s->lambda * ratio, 65536.f);
|
2009-07-09 02:12:53 +03:00
|
|
|
|
2015-09-23 07:13:56 +02:00
|
|
|
/* Keep iterating if we must reduce and lambda is in the sky */
|
AAC encoder: Extensive improvements
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.
2015-10-11 22:29:50 +02:00
|
|
|
if ((s->lambda < 300.f || ratio > 0.9f) && (s->lambda > 10.f || ratio < 1.1f)) {
|
2015-09-23 07:13:56 +02:00
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
if (is_mode || ms_mode || tns_mode || pred_mode) {
|
|
|
|
for (i = 0; i < s->chan_map[0]; i++) {
|
|
|
|
// Must restore coeffs
|
|
|
|
chans = tag == TYPE_CPE ? 2 : 1;
|
|
|
|
cpe = &s->cpe[i];
|
|
|
|
for (ch = 0; ch < chans; ch++)
|
|
|
|
memcpy(cpe->ch[ch].coeffs, cpe->ch[ch].pcoeffs, sizeof(cpe->ch[ch].coeffs));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
its++;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
break;
|
|
|
|
}
|
2009-07-09 02:12:53 +03:00
|
|
|
} while (1);
|
|
|
|
|
2015-10-17 03:22:51 +02:00
|
|
|
if (s->options.ltp && s->coder->ltp_insert_new_frame)
|
|
|
|
s->coder->ltp_insert_new_frame(s);
|
|
|
|
|
2009-07-08 23:01:31 +03:00
|
|
|
put_bits(&s->pb, 3, TYPE_END);
|
|
|
|
flush_put_bits(&s->pb);
|
|
|
|
avctx->frame_bits = put_bits_count(&s->pb);
|
AAC encoder: Extensive improvements
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.
2015-10-11 22:29:50 +02:00
|
|
|
s->lambda_sum += s->lambda;
|
|
|
|
s->lambda_count++;
|
2009-07-08 23:01:31 +03:00
|
|
|
|
2012-01-28 20:28:01 +03:00
|
|
|
if (!frame)
|
2012-01-29 01:51:22 +03:00
|
|
|
s->last_frame++;
|
2011-12-15 05:43:56 +03:00
|
|
|
|
2012-01-28 20:28:01 +03:00
|
|
|
ff_af_queue_remove(&s->afq, avctx->frame_size, &avpkt->pts,
|
|
|
|
&avpkt->duration);
|
|
|
|
|
|
|
|
avpkt->size = put_bits_count(&s->pb) >> 3;
|
|
|
|
*got_packet_ptr = 1;
|
|
|
|
return 0;
|
2009-07-08 23:01:31 +03:00
|
|
|
}
|
|
|
|
|
2008-08-14 08:52:29 +03:00
|
|
|
static av_cold int aac_encode_end(AVCodecContext *avctx)
|
|
|
|
{
|
|
|
|
AACEncContext *s = avctx->priv_data;
|
|
|
|
|
AAC encoder: Extensive improvements
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.
2015-10-11 22:29:50 +02:00
|
|
|
av_log(avctx, AV_LOG_INFO, "Qavg: %.3f\n", s->lambda_sum / s->lambda_count);
|
|
|
|
|
2008-08-14 08:52:29 +03:00
|
|
|
ff_mdct_end(&s->mdct1024);
|
|
|
|
ff_mdct_end(&s->mdct128);
|
2009-07-08 23:01:31 +03:00
|
|
|
ff_psy_end(&s->psy);
|
2015-08-21 19:43:09 +02:00
|
|
|
ff_lpc_end(&s->lpc);
|
2011-12-15 05:50:23 +03:00
|
|
|
if (s->psypp)
|
|
|
|
ff_psy_preprocess_end(s->psypp);
|
2011-12-15 05:43:56 +03:00
|
|
|
av_freep(&s->buffer.samples);
|
2008-08-14 08:52:29 +03:00
|
|
|
av_freep(&s->cpe);
|
2014-11-29 19:58:13 +02:00
|
|
|
av_freep(&s->fdsp);
|
2012-01-28 20:28:01 +03:00
|
|
|
ff_af_queue_close(&s->afq);
|
2008-08-14 08:52:29 +03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-12-15 05:50:23 +03:00
|
|
|
static av_cold int dsp_init(AVCodecContext *avctx, AACEncContext *s)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
|
2015-07-27 21:14:31 +02:00
|
|
|
s->fdsp = avpriv_float_dsp_alloc(avctx->flags & AV_CODEC_FLAG_BITEXACT);
|
2014-11-29 19:58:13 +02:00
|
|
|
if (!s->fdsp)
|
|
|
|
return AVERROR(ENOMEM);
|
2011-12-15 05:50:23 +03:00
|
|
|
|
|
|
|
// window init
|
|
|
|
ff_kbd_window_init(ff_aac_kbd_long_1024, 4.0, 1024);
|
|
|
|
ff_kbd_window_init(ff_aac_kbd_short_128, 6.0, 128);
|
|
|
|
ff_init_ff_sine_windows(10);
|
|
|
|
ff_init_ff_sine_windows(7);
|
|
|
|
|
2015-05-16 19:07:31 +02:00
|
|
|
if ((ret = ff_mdct_init(&s->mdct1024, 11, 0, 32768.0)) < 0)
|
2011-12-15 05:50:23 +03:00
|
|
|
return ret;
|
2015-05-16 19:07:31 +02:00
|
|
|
if ((ret = ff_mdct_init(&s->mdct128, 8, 0, 32768.0)) < 0)
|
2011-12-15 05:50:23 +03:00
|
|
|
return ret;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static av_cold int alloc_buffers(AVCodecContext *avctx, AACEncContext *s)
|
|
|
|
{
|
2012-01-29 23:55:10 +03:00
|
|
|
int ch;
|
2014-09-10 16:06:44 +03:00
|
|
|
FF_ALLOCZ_ARRAY_OR_GOTO(avctx, s->buffer.samples, s->channels, 3 * 1024 * sizeof(s->buffer.samples[0]), alloc_fail);
|
|
|
|
FF_ALLOCZ_ARRAY_OR_GOTO(avctx, s->cpe, s->chan_map[0], sizeof(ChannelElement), alloc_fail);
|
2015-06-29 23:48:34 +02:00
|
|
|
FF_ALLOCZ_OR_GOTO(avctx, avctx->extradata, 5 + AV_INPUT_BUFFER_PADDING_SIZE, alloc_fail);
|
2011-12-15 05:50:23 +03:00
|
|
|
|
2012-01-29 23:55:10 +03:00
|
|
|
for(ch = 0; ch < s->channels; ch++)
|
2011-12-25 01:24:16 +03:00
|
|
|
s->planar_samples[ch] = s->buffer.samples + 3 * 1024 * ch;
|
2011-12-15 05:43:56 +03:00
|
|
|
|
2011-12-15 05:50:23 +03:00
|
|
|
return 0;
|
|
|
|
alloc_fail:
|
|
|
|
return AVERROR(ENOMEM);
|
|
|
|
}
|
|
|
|
|
|
|
|
static av_cold int aac_encode_init(AVCodecContext *avctx)
|
|
|
|
{
|
|
|
|
AACEncContext *s = avctx->priv_data;
|
|
|
|
int i, ret = 0;
|
|
|
|
const uint8_t *sizes[2];
|
|
|
|
uint8_t grouping[AAC_MAX_CHANNELS];
|
|
|
|
int lengths[2];
|
|
|
|
|
2015-10-12 17:50:10 +02:00
|
|
|
s->channels = avctx->channels;
|
|
|
|
s->chan_map = aac_chan_configs[s->channels-1];
|
|
|
|
s->random_state = 0x1f2e3d4c;
|
|
|
|
s->lambda = avctx->global_quality > 0 ? avctx->global_quality : 120;
|
|
|
|
avctx->extradata_size = 5;
|
2011-12-15 05:50:23 +03:00
|
|
|
avctx->frame_size = 1024;
|
2015-10-12 17:50:10 +02:00
|
|
|
avctx->initial_padding = 1024;
|
|
|
|
avctx->bit_rate = (int)FFMIN(
|
|
|
|
6144 * s->channels / 1024.0 * avctx->sample_rate,
|
|
|
|
avctx->bit_rate);
|
|
|
|
avctx->profile = avctx->profile == FF_PROFILE_UNKNOWN ? FF_PROFILE_AAC_LOW :
|
|
|
|
avctx->profile;
|
2011-12-15 05:50:23 +03:00
|
|
|
|
|
|
|
for (i = 0; i < 16; i++)
|
|
|
|
if (avctx->sample_rate == avpriv_mpeg4audio_sample_rates[i])
|
|
|
|
break;
|
2015-10-12 17:50:10 +02:00
|
|
|
s->samplerate_index = i;
|
2011-12-15 05:50:23 +03:00
|
|
|
|
2015-10-12 17:50:10 +02:00
|
|
|
ERROR_IF(s->samplerate_index == 16 ||
|
|
|
|
s->samplerate_index >= ff_aac_swb_size_1024_len ||
|
|
|
|
s->samplerate_index >= ff_aac_swb_size_128_len,
|
2011-12-15 05:50:23 +03:00
|
|
|
"Unsupported sample rate %d\n", avctx->sample_rate);
|
2015-10-12 16:53:17 +02:00
|
|
|
ERROR_IF(s->channels > AAC_MAX_CHANNELS || s->channels == 7,
|
2011-12-08 01:20:10 +03:00
|
|
|
"Unsupported number of channels: %d\n", s->channels);
|
2015-03-06 09:05:32 +02:00
|
|
|
WARN_IF(1024.0 * avctx->bit_rate / avctx->sample_rate > 6144 * s->channels,
|
|
|
|
"Too many bits per frame requested, clamping to max\n");
|
2015-10-12 17:50:10 +02:00
|
|
|
|
2015-10-17 04:15:44 +02:00
|
|
|
for (i = 0; i < FF_ARRAY_ELEMS(aacenc_profiles); i++)
|
|
|
|
if (avctx->profile == aacenc_profiles[i])
|
2015-10-12 17:50:10 +02:00
|
|
|
break;
|
2015-10-17 04:15:44 +02:00
|
|
|
ERROR_IF(i == FF_ARRAY_ELEMS(aacenc_profiles),
|
|
|
|
"Unsupported encoding profile: %d\n", avctx->profile);
|
|
|
|
if (avctx->profile == FF_PROFILE_MPEG2_AAC_LOW) {
|
|
|
|
avctx->profile = FF_PROFILE_AAC_LOW;
|
|
|
|
ERROR_IF(s->options.pred,
|
|
|
|
"Main prediction unavailable in the \"mpeg2_aac_low\" profile\n");
|
|
|
|
ERROR_IF(s->options.ltp,
|
|
|
|
"LTP prediction unavailable in the \"mpeg2_aac_low\" profile\n");
|
|
|
|
WARN_IF(s->options.pns,
|
|
|
|
"PNS unavailable in the \"mpeg2_aac_low\" profile, turning off\n");
|
|
|
|
s->options.pns = 0;
|
|
|
|
} else if (avctx->profile == FF_PROFILE_AAC_LTP) {
|
|
|
|
s->options.ltp = 1;
|
|
|
|
ERROR_IF(s->options.pred,
|
|
|
|
"Main prediction unavailable in the \"aac_ltp\" profile\n");
|
|
|
|
} else if (avctx->profile == FF_PROFILE_AAC_MAIN) {
|
|
|
|
s->options.pred = 1;
|
|
|
|
ERROR_IF(s->options.ltp,
|
|
|
|
"LTP prediction unavailable in the \"aac_main\" profile\n");
|
|
|
|
} else if (s->options.ltp) {
|
|
|
|
avctx->profile = FF_PROFILE_AAC_LTP;
|
|
|
|
WARN_IF(1,
|
|
|
|
"Chainging profile to \"aac_ltp\"\n");
|
|
|
|
ERROR_IF(s->options.pred,
|
|
|
|
"Main prediction unavailable in the \"aac_ltp\" profile\n");
|
|
|
|
} else if (s->options.pred) {
|
|
|
|
avctx->profile = FF_PROFILE_AAC_MAIN;
|
|
|
|
WARN_IF(1,
|
|
|
|
"Chainging profile to \"aac_main\"\n");
|
|
|
|
ERROR_IF(s->options.pred,
|
|
|
|
"LTP prediction unavailable in the \"aac_main\" profile\n");
|
2015-08-21 20:20:22 +02:00
|
|
|
}
|
2015-10-17 04:15:44 +02:00
|
|
|
s->profile = avctx->profile;
|
2015-10-12 17:50:10 +02:00
|
|
|
s->coder = &ff_aac_coders[s->options.coder];
|
2015-03-06 09:05:32 +02:00
|
|
|
|
2015-10-12 17:50:10 +02:00
|
|
|
if (s->options.coder != AAC_CODER_TWOLOOP) {
|
2015-09-01 13:07:00 +02:00
|
|
|
s->options.intensity_stereo = 0;
|
|
|
|
s->options.pns = 0;
|
|
|
|
}
|
|
|
|
|
2014-12-17 15:53:43 +02:00
|
|
|
if ((ret = dsp_init(avctx, s)) < 0)
|
2011-12-15 05:50:23 +03:00
|
|
|
goto fail;
|
|
|
|
|
2014-12-17 15:53:43 +02:00
|
|
|
if ((ret = alloc_buffers(avctx, s)) < 0)
|
2011-12-15 05:50:23 +03:00
|
|
|
goto fail;
|
|
|
|
|
|
|
|
put_audio_specific_config(avctx);
|
|
|
|
|
2015-10-12 17:50:10 +02:00
|
|
|
sizes[0] = ff_aac_swb_size_1024[s->samplerate_index];
|
|
|
|
sizes[1] = ff_aac_swb_size_128[s->samplerate_index];
|
|
|
|
lengths[0] = ff_aac_num_swb_1024[s->samplerate_index];
|
|
|
|
lengths[1] = ff_aac_num_swb_128[s->samplerate_index];
|
2011-12-15 05:50:23 +03:00
|
|
|
for (i = 0; i < s->chan_map[0]; i++)
|
|
|
|
grouping[i] = s->chan_map[i + 1] == TYPE_CPE;
|
2014-12-17 15:53:43 +02:00
|
|
|
if ((ret = ff_psy_init(&s->psy, avctx, 2, sizes, lengths,
|
|
|
|
s->chan_map[0], grouping)) < 0)
|
2011-12-15 05:50:23 +03:00
|
|
|
goto fail;
|
|
|
|
s->psypp = ff_psy_preprocess_init(avctx);
|
2015-09-01 07:40:12 +02:00
|
|
|
ff_lpc_init(&s->lpc, 2*avctx->frame_size, TNS_MAX_ORDER, FF_LPC_TYPE_LEVINSON);
|
2011-12-15 05:50:23 +03:00
|
|
|
|
2013-03-06 16:55:05 +03:00
|
|
|
if (HAVE_MIPSDSPR1)
|
|
|
|
ff_aac_coder_init_mips(s);
|
|
|
|
|
2011-12-15 05:50:23 +03:00
|
|
|
ff_aac_tableinit();
|
|
|
|
|
2012-01-28 20:28:01 +03:00
|
|
|
ff_af_queue_init(avctx, &s->afq);
|
|
|
|
|
2011-12-15 05:50:23 +03:00
|
|
|
return 0;
|
|
|
|
fail:
|
|
|
|
aac_encode_end(avctx);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-06-01 08:38:09 +03:00
|
|
|
#define AACENC_FLAGS AV_OPT_FLAG_ENCODING_PARAM | AV_OPT_FLAG_AUDIO_PARAM
|
|
|
|
static const AVOption aacenc_options[] = {
|
2015-10-12 17:50:10 +02:00
|
|
|
{"aac_coder", "Coding algorithm", offsetof(AACEncContext, options.coder), AV_OPT_TYPE_INT, {.i64 = AAC_CODER_TWOLOOP}, -1, AAC_CODER_NB-1, AACENC_FLAGS, "coder"},
|
|
|
|
{"faac", "FAAC-inspired method", 0, AV_OPT_TYPE_CONST, {.i64 = AAC_CODER_FAAC}, INT_MIN, INT_MAX, AACENC_FLAGS, "coder"},
|
|
|
|
{"anmr", "ANMR method", 0, AV_OPT_TYPE_CONST, {.i64 = AAC_CODER_ANMR}, INT_MIN, INT_MAX, AACENC_FLAGS, "coder"},
|
|
|
|
{"twoloop", "Two loop searching method", 0, AV_OPT_TYPE_CONST, {.i64 = AAC_CODER_TWOLOOP}, INT_MIN, INT_MAX, AACENC_FLAGS, "coder"},
|
|
|
|
{"fast", "Constant quantizer", 0, AV_OPT_TYPE_CONST, {.i64 = AAC_CODER_FAST}, INT_MIN, INT_MAX, AACENC_FLAGS, "coder"},
|
2015-10-17 03:20:13 +02:00
|
|
|
{"aac_ms", "Force M/S stereo coding", offsetof(AACEncContext, options.mid_side), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, AACENC_FLAGS},
|
2015-10-17 04:15:44 +02:00
|
|
|
{"aac_is", "Intensity stereo coding", offsetof(AACEncContext, options.intensity_stereo), AV_OPT_TYPE_BOOL, {.i64 = 1}, -1, 1, AACENC_FLAGS},
|
|
|
|
{"aac_pns", "Perceptual noise substitution", offsetof(AACEncContext, options.pns), AV_OPT_TYPE_BOOL, {.i64 = 1}, -1, 1, AACENC_FLAGS},
|
2015-10-17 12:06:05 +02:00
|
|
|
{"aac_tns", "Temporal noise shaping", offsetof(AACEncContext, options.tns), AV_OPT_TYPE_BOOL, {.i64 = 1}, -1, 1, AACENC_FLAGS},
|
2015-10-17 04:15:44 +02:00
|
|
|
{"aac_ltp", "Long term prediction", offsetof(AACEncContext, options.ltp), AV_OPT_TYPE_BOOL, {.i64 = 0}, -1, 1, AACENC_FLAGS},
|
|
|
|
{"aac_pred", "AAC-Main prediction", offsetof(AACEncContext, options.pred), AV_OPT_TYPE_BOOL, {.i64 = 0}, -1, 1, AACENC_FLAGS},
|
2011-06-01 08:38:09 +03:00
|
|
|
{NULL}
|
|
|
|
};
|
|
|
|
|
|
|
|
static const AVClass aacenc_class = {
|
|
|
|
"AAC encoder",
|
|
|
|
av_default_item_name,
|
|
|
|
aacenc_options,
|
|
|
|
LIBAVUTIL_VERSION_INT,
|
|
|
|
};
|
|
|
|
|
2011-01-25 23:40:11 +02:00
|
|
|
AVCodec ff_aac_encoder = {
|
2011-07-17 13:54:31 +03:00
|
|
|
.name = "aac",
|
2013-10-03 23:57:53 +03:00
|
|
|
.long_name = NULL_IF_CONFIG_SMALL("AAC (Advanced Audio Coding)"),
|
2011-07-17 13:54:31 +03:00
|
|
|
.type = AVMEDIA_TYPE_AUDIO,
|
2012-08-05 12:11:04 +03:00
|
|
|
.id = AV_CODEC_ID_AAC,
|
2011-07-17 13:54:31 +03:00
|
|
|
.priv_data_size = sizeof(AACEncContext),
|
|
|
|
.init = aac_encode_init,
|
2012-01-28 20:28:01 +03:00
|
|
|
.encode2 = aac_encode_frame,
|
2011-07-17 13:54:31 +03:00
|
|
|
.close = aac_encode_end,
|
2012-11-09 02:09:30 +03:00
|
|
|
.supported_samplerates = mpeg4audio_sample_rates,
|
2015-07-07 02:41:27 +02:00
|
|
|
.capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME | AV_CODEC_CAP_DELAY |
|
|
|
|
AV_CODEC_CAP_EXPERIMENTAL,
|
2012-08-25 20:04:33 +03:00
|
|
|
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP,
|
2012-04-06 19:19:39 +03:00
|
|
|
AV_SAMPLE_FMT_NONE },
|
|
|
|
.priv_class = &aacenc_class,
|
2008-08-14 08:52:29 +03:00
|
|
|
};
|