virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

AAC: Reduce depth of vlc_spectral tables to 2

Browse Source 
Up to 6% faster overall on i7, no change on A8.

Originally committed as revision 21191 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård
2010-01-13 16:46:39 +00:00
parent 95dff4aced
commit 2ef21b9179
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
libavcodec/aac.c
View File

@@ -508,17 +508,17 @@ static av_cold int aac_decode_init(AVCodecContext *avccontext)
avccontext->sample_fmt = SAMPLE_FMT_S16; avccontext->sample_fmt = SAMPLE_FMT_S16;
avccontext->frame_size = 1024; avccontext->frame_size = 1024;
AAC_INIT_VLC_STATIC( 0, 144); AAC_INIT_VLC_STATIC( 0, 304);
AAC_INIT_VLC_STATIC( 1, 114); AAC_INIT_VLC_STATIC( 1, 270);
AAC_INIT_VLC_STATIC( 2, 188); AAC_INIT_VLC_STATIC( 2, 550);
AAC_INIT_VLC_STATIC( 3, 180); AAC_INIT_VLC_STATIC( 3, 300);
AAC_INIT_VLC_STATIC( 4, 172); AAC_INIT_VLC_STATIC( 4, 328);
AAC_INIT_VLC_STATIC( 5, 140); AAC_INIT_VLC_STATIC( 5, 294);
AAC_INIT_VLC_STATIC( 6, 168); AAC_INIT_VLC_STATIC( 6, 306);
AAC_INIT_VLC_STATIC( 7, 114); AAC_INIT_VLC_STATIC( 7, 268);
AAC_INIT_VLC_STATIC( 8, 262); AAC_INIT_VLC_STATIC( 8, 510);
AAC_INIT_VLC_STATIC( 9, 248); AAC_INIT_VLC_STATIC( 9, 366);
AAC_INIT_VLC_STATIC(10, 384); AAC_INIT_VLC_STATIC(10, 462);
dsputil_init(&ac->dsp, avccontext); dsputil_init(&ac->dsp, avccontext);
@@ -989,7 +989,7 @@ static int decode_spectrum_and_dequant(AACContext *ac, float coef[1024],
int len = off_len; int len = off_len;
do { do {
const int index = get_vlc2(gb, vlc_tab, 6, 3); const int index = get_vlc2(gb, vlc_tab, 8, 2);
unsigned cb_idx; unsigned cb_idx;
if (index >= cb_size) { if (index >= cb_size) {
@@ -1009,7 +1009,7 @@ static int decode_spectrum_and_dequant(AACContext *ac, float coef[1024],
int len = off_len; int len = off_len;
do { do {
const int index = get_vlc2(gb, vlc_tab, 6, 3); const int index = get_vlc2(gb, vlc_tab, 8, 2);
unsigned nnz; unsigned nnz;
unsigned cb_idx; unsigned cb_idx;
uint32_t bits; uint32_t bits;
@@ -1033,7 +1033,7 @@ static int decode_spectrum_and_dequant(AACContext *ac, float coef[1024],
int len = off_len; int len = off_len;
do { do {
const int index = get_vlc2(gb, vlc_tab, 6, 3); const int index = get_vlc2(gb, vlc_tab, 8, 2);
unsigned cb_idx; unsigned cb_idx;
if (index >= cb_size) { if (index >= cb_size) {
@@ -1054,7 +1054,7 @@ static int decode_spectrum_and_dequant(AACContext *ac, float coef[1024],
int len = off_len; int len = off_len;
do { do {
const int index = get_vlc2(gb, vlc_tab, 6, 3); const int index = get_vlc2(gb, vlc_tab, 8, 2);
unsigned nnz; unsigned nnz;
unsigned cb_idx; unsigned cb_idx;
unsigned sign; unsigned sign;
@@ -1079,7 +1079,7 @@ static int decode_spectrum_and_dequant(AACContext *ac, float coef[1024],
int len = off_len; int len = off_len;
do { do {
const int index = get_vlc2(gb, vlc_tab, 6, 3); const int index = get_vlc2(gb, vlc_tab, 8, 2);
unsigned nzt, nnz; unsigned nzt, nnz;
unsigned cb_idx; unsigned cb_idx;
uint32_t bits; uint32_t bits;

2
libavcodec/aac.h
View File

@@ -37,7 +37,7 @@
#include <stdint.h> #include <stdint.h>
#define AAC_INIT_VLC_STATIC(num, size) \ #define AAC_INIT_VLC_STATIC(num, size) \
INIT_VLC_STATIC(&vlc_spectral[num], 6, ff_aac_spectral_sizes[num], \ INIT_VLC_STATIC(&vlc_spectral[num], 8, ff_aac_spectral_sizes[num], \
ff_aac_spectral_bits[num], sizeof( ff_aac_spectral_bits[num][0]), sizeof( ff_aac_spectral_bits[num][0]), \ ff_aac_spectral_bits[num], sizeof( ff_aac_spectral_bits[num][0]), sizeof( ff_aac_spectral_bits[num][0]), \
ff_aac_spectral_codes[num], sizeof(ff_aac_spectral_codes[num][0]), sizeof(ff_aac_spectral_codes[num][0]), \ ff_aac_spectral_codes[num], sizeof(ff_aac_spectral_codes[num][0]), sizeof(ff_aac_spectral_codes[num][0]), \
size); size);