mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 20:19:55 +00:00
e8576dc8df
This commit implements intensity stereo coding support to the native aac encoder. This is a way to increase the efficiency of the encoder by zeroing the right channel's spectral coefficients (in a channel pair) and rederiving them in the decoder using information from the scalefactor indices of special band types. This commit confomrs to the official ISO 13818-7 specifications, although due to their ambiguity certain deviations have been taken to ensure maximum sound quality. This commit has been extensively tested and has shown to not result in audiable audio artifacts unless in extreme cases. This commit also adds an option, aac_is, which has the value of 0 by default. Intensity Stereo is part of the scalable aac profile and is thus non-default. The way IS coding works is that it rederives the right channel's spectral coefficients from the left channel via the scalefactor index values left in the right channel. Since an entire band's spectral coefficients do not need to be coded, the encoder's efficiency jumps up and it unzeroes some high frequency values which it previously did not have enough bits to encode. That way less information is lost than the information lost by rederiving the spectral coefficients with some error. This is why the filesize of files encoded with IS do not decrease significantly. Users wishing that IS coding should reduce filesize are expected to reduce their encoding bitrates appropriately. This is V2 of the commit. The old version did not mark ms_mask as 0 since M/S and IS coding are incompactible, which resulted in distortions with M/S coding enabled. This version also improves phase detection by measuring it for every spectral coefficient in the band and using a simple majority rule to determine whether the coefficients are in or out of phase. Also, the energy values per spectral coefficient were changed as to reflect the official specifications. Reviewed-by: Claudio Freire <klaussfreire@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
103 lines
3.6 KiB
C
103 lines
3.6 KiB
C
/*
|
|
* 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
|
|
*/
|
|
|
|
#ifndef AVCODEC_AACENC_H
|
|
#define AVCODEC_AACENC_H
|
|
|
|
#include "libavutil/float_dsp.h"
|
|
#include "avcodec.h"
|
|
#include "put_bits.h"
|
|
|
|
#include "aac.h"
|
|
#include "audio_frame_queue.h"
|
|
#include "psymodel.h"
|
|
|
|
typedef enum AACCoder {
|
|
AAC_CODER_FAAC = 0,
|
|
AAC_CODER_ANMR,
|
|
AAC_CODER_TWOLOOP,
|
|
AAC_CODER_FAST,
|
|
|
|
AAC_CODER_NB,
|
|
}AACCoder;
|
|
|
|
typedef struct AACEncOptions {
|
|
int stereo_mode;
|
|
int aac_coder;
|
|
int pns;
|
|
int intensity_stereo;
|
|
} AACEncOptions;
|
|
|
|
struct AACEncContext;
|
|
|
|
typedef struct AACCoefficientsEncoder {
|
|
void (*search_for_quantizers)(AVCodecContext *avctx, struct AACEncContext *s,
|
|
SingleChannelElement *sce, const float lambda);
|
|
void (*encode_window_bands_info)(struct AACEncContext *s, SingleChannelElement *sce,
|
|
int win, int group_len, const float lambda);
|
|
void (*quantize_and_encode_band)(struct AACEncContext *s, PutBitContext *pb, const float *in, int size,
|
|
int scale_idx, int cb, const float lambda);
|
|
void (*set_special_band_scalefactors)(struct AACEncContext *s, SingleChannelElement *sce);
|
|
void (*search_for_pns)(struct AACEncContext *s, AVCodecContext *avctx, SingleChannelElement *sce, const float lambda);
|
|
void (*search_for_ms)(struct AACEncContext *s, ChannelElement *cpe, const float lambda);
|
|
void (*search_for_is)(struct AACEncContext *s, AVCodecContext *avctx, ChannelElement *cpe, const float lambda);
|
|
} AACCoefficientsEncoder;
|
|
|
|
extern AACCoefficientsEncoder ff_aac_coders[];
|
|
|
|
/**
|
|
* AAC encoder context
|
|
*/
|
|
typedef struct AACEncContext {
|
|
AVClass *av_class;
|
|
AACEncOptions options; ///< encoding options
|
|
PutBitContext pb;
|
|
FFTContext mdct1024; ///< long (1024 samples) frame transform context
|
|
FFTContext mdct128; ///< short (128 samples) frame transform context
|
|
AVFloatDSPContext *fdsp;
|
|
float *planar_samples[6]; ///< saved preprocessed input
|
|
|
|
int samplerate_index; ///< MPEG-4 samplerate index
|
|
int channels; ///< channel count
|
|
const uint8_t *chan_map; ///< channel configuration map
|
|
|
|
ChannelElement *cpe; ///< channel elements
|
|
FFPsyContext psy;
|
|
struct FFPsyPreprocessContext* psypp;
|
|
AACCoefficientsEncoder *coder;
|
|
int cur_channel;
|
|
int last_frame;
|
|
float lambda;
|
|
AudioFrameQueue afq;
|
|
DECLARE_ALIGNED(16, int, qcoefs)[96]; ///< quantized coefficients
|
|
DECLARE_ALIGNED(32, float, scoefs)[1024]; ///< scaled coefficients
|
|
|
|
struct {
|
|
float *samples;
|
|
} buffer;
|
|
} AACEncContext;
|
|
|
|
extern float ff_aac_pow34sf_tab[428];
|
|
|
|
void ff_aac_coder_init_mips(AACEncContext *c);
|
|
|
|
#endif /* AVCODEC_AACENC_H */
|