Skip to content

F
ffmpeg.wasm-core
Commit a7adcf29 authored by Diego Biurrun's avatar Diego Biurrun
Browse files
Options

whitespace cosmetics, prettyprinting, K&R coding style 

Originally committed as revision 20080 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent badce93d
Show whitespace changes
Inline Side-by-side
Showing with 3194 additions and 3190 deletions
libavcodec/vorbis.c
View file @ a7adcf29
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @file libavcodec/vorbis.c * @file libavcodec/vorbis.c
* Common code for Vorbis I encoder and decoder * Common code for Vorbis I encoder and decoder
* @author Denes Balatoni ( dbalatoni programozo hu ) * @author Denes Balatoni ( dbalatoni programozo hu )
*
* This file is part of FFmpeg. * This file is part of FFmpeg.
* *
* FFmpeg is free software; you can redistribute it and/or * FFmpeg is free software; you can redistribute it and/or
...@@ -35,13 +35,13 @@ ...@@ -35,13 +35,13 @@
// x^(1/n) // x^(1/n)
unsigned int ff_vorbis_nth_root(unsigned int x, unsigned int n) unsigned int ff_vorbis_nth_root(unsigned int x, unsigned int n)
{ {
unsigned int ret=0, i, j; unsigned int ret = 0, i, j;
do { do {
++ret; ++ret;
for(i=0,j=ret;i<n-1;i++) for (i = 0, j = ret; i < n - 1; i++)
j*=ret; j *= ret;
} while (j<=x); } while (j <= x);
return ret - 1; return ret - 1;
} }
...@@ -53,61 +53,62 @@ unsigned int ff_vorbis_nth_root(unsigned int x, unsigned int n) ...@@ -53,61 +53,62 @@ unsigned int ff_vorbis_nth_root(unsigned int x, unsigned int n)
// reasonable to check redundantly. // reasonable to check redundantly.
int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, uint_fast32_t num) int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, uint_fast32_t num)
{ {
uint_fast32_t exit_at_level[33]={404,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, uint_fast32_t exit_at_level[33] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; 404, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
uint_fast8_t i,j; uint_fast8_t i, j;
uint_fast32_t code,p; uint_fast32_t code, p;
#ifdef V_DEBUG #ifdef V_DEBUG
GetBitContext gb; GetBitContext gb;
#endif #endif
for(p=0;(bits[p]==0) && (p<num);++p) for (p = 0; (bits[p] == 0) && (p < num); ++p)
; ;
if (p==num) { if (p == num) {
// av_log(vc->avccontext, AV_LOG_INFO, "An empty codebook. Heh?! \n"); // av_log(vc->avccontext, AV_LOG_INFO, "An empty codebook. Heh?! \n");
return 0; return 0;
} }
codes[p]=0; codes[p] = 0;
if (bits[p] > 32) if (bits[p] > 32)
return 1; return 1;
for(i=0;i<bits[p];++i) for (i = 0; i < bits[p]; ++i)
exit_at_level[i+1]=1<<i; exit_at_level[i+1] = 1 << i;
#ifdef V_DEBUG #ifdef V_DEBUG
av_log(NULL, AV_LOG_INFO, " %d. of %d code len %d code %d - ", p, num, bits[p], codes[p]); av_log(NULL, AV_LOG_INFO, " %d. of %d code len %d code %d - ", p, num, bits[p], codes[p]);
init_get_bits(&gb, (uint_fast8_t *)&codes[p], bits[p]); init_get_bits(&gb, (uint_fast8_t *)&codes[p], bits[p]);
for(i=0;i<bits[p];++i) for (i = 0; i < bits[p]; ++i)
av_log(NULL, AV_LOG_INFO, "%s", get_bits1(&gb) ? "1" : "0"); av_log(NULL, AV_LOG_INFO, "%s", get_bits1(&gb) ? "1" : "0");
av_log(NULL, AV_LOG_INFO, "\n"); av_log(NULL, AV_LOG_INFO, "\n");
#endif #endif
++p; ++p;
for(;p<num;++p) { for (; p < num; ++p) {
if (bits[p] > 32) if (bits[p] > 32)
return 1; return 1;
if (bits[p]==0) if (bits[p] == 0)
continue; continue;
// find corresponding exit(node which the tree can grow further from) // find corresponding exit(node which the tree can grow further from)
for(i=bits[p];i>0;--i) for (i = bits[p]; i > 0; --i)
if (exit_at_level[i]) if (exit_at_level[i])
break; break;
if (!i) // overspecified tree if (!i) // overspecified tree
return 1; return 1;
code=exit_at_level[i]; code = exit_at_level[i];
exit_at_level[i]=0; exit_at_level[i] = 0;
// construct code (append 0s to end) and introduce new exits // construct code (append 0s to end) and introduce new exits
for(j=i+1;j<=bits[p];++j) for (j = i + 1 ;j <= bits[p]; ++j)
exit_at_level[j]=code+(1<<(j-1)); exit_at_level[j] = code + (1 << (j - 1));
codes[p]=code; codes[p] = code;
#ifdef V_DEBUG #ifdef V_DEBUG
av_log(NULL, AV_LOG_INFO, " %d. code len %d code %d - ", p, bits[p], codes[p]); av_log(NULL, AV_LOG_INFO, " %d. code len %d code %d - ", p, bits[p], codes[p]);
init_get_bits(&gb, (uint_fast8_t *)&codes[p], bits[p]); init_get_bits(&gb, (uint_fast8_t *)&codes[p], bits[p]);
for(i=0;i<bits[p];++i) for (i = 0; i < bits[p]; ++i)
av_log(NULL, AV_LOG_INFO, "%s", get_bits1(&gb) ? "1" : "0"); av_log(NULL, AV_LOG_INFO, "%s", get_bits1(&gb) ? "1" : "0");
av_log(NULL, AV_LOG_INFO, "\n"); av_log(NULL, AV_LOG_INFO, "\n");
#endif #endif
...@@ -115,7 +116,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, uint_fast32_t num) ...@@ -115,7 +116,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, uint_fast32_t num)
} }
//no exits should be left (underspecified tree - ie. unused valid vlcs - not allowed by SPEC) //no exits should be left (underspecified tree - ie. unused valid vlcs - not allowed by SPEC)
for (p=1; p<33; p++) for (p = 1; p < 33; p++)
if (exit_at_level[p]) if (exit_at_level[p])
return 1; return 1;
...@@ -157,11 +158,11 @@ void ff_vorbis_ready_floor1_list(vorbis_floor1_entry * list, int values) ...@@ -157,11 +158,11 @@ void ff_vorbis_ready_floor1_list(vorbis_floor1_entry * list, int values)
static inline void render_line_unrolled(intptr_t x, intptr_t y, int x1, static inline void render_line_unrolled(intptr_t x, intptr_t y, int x1,
intptr_t sy, int ady, int adx, intptr_t sy, int ady, int adx,
float * buf) float *buf)
{ {
int err = -adx; int err = -adx;
x -= x1-1; x -= x1 - 1;
buf += x1-1; buf += x1 - 1;
while (++x < 0) { while (++x < 0) {
err += ady; err += ady;
if (err >= 0) { if (err >= 0) {
...@@ -178,14 +179,14 @@ static inline void render_line_unrolled(intptr_t x, intptr_t y, int x1, ...@@ -178,14 +179,14 @@ static inline void render_line_unrolled(intptr_t x, intptr_t y, int x1,
} }
} }
static void render_line(int x0, int y0, int x1, int y1, float * buf) static void render_line(int x0, int y0, int x1, int y1, float *buf)
{ {
int dy = y1 - y0; int dy = y1 - y0;
int adx = x1 - x0; int adx = x1 - x0;
int ady = FFABS(dy); int ady = FFABS(dy);
int sy = dy<0 ? -1 : 1; int sy = dy < 0 ? -1 : 1;
buf[x0] = ff_vorbis_floor1_inverse_db_table[y0]; buf[x0] = ff_vorbis_floor1_inverse_db_table[y0];
if(ady*2<=adx) { // optimized common case if (ady*2 <= adx) { // optimized common case
render_line_unrolled(x0, y0, x1, sy, ady, adx, buf); render_line_unrolled(x0, y0, x1, sy, ady, adx, buf);
} else { } else {
int base = dy / adx; int base = dy / adx;
...@@ -206,8 +207,8 @@ static void render_line(int x0, int y0, int x1, int y1, float * buf) ...@@ -206,8 +207,8 @@ static void render_line(int x0, int y0, int x1, int y1, float * buf)
} }
void ff_vorbis_floor1_render_list(vorbis_floor1_entry * list, int values, void ff_vorbis_floor1_render_list(vorbis_floor1_entry * list, int values,
uint_fast16_t * y_list, int * flag, uint_fast16_t *y_list, int *flag,
int multiplier, float * out, int samples) int multiplier, float *out, int samples)
{ {
int lx, ly, i; int lx, ly, i;
lx = 0; lx = 0;
......
libavcodec/vorbis_data.c
View file @ a7adcf29
...@@ -2156,4 +2156,3 @@ const float * const ff_vorbis_vwin[8] = { ...@@ -2156,4 +2156,3 @@ const float * const ff_vorbis_vwin[8] = {
vwin64, vwin128, vwin256, vwin512, vwin64, vwin128, vwin256, vwin512,
vwin1024, vwin2048, vwin4096, vwin8192 vwin1024, vwin2048, vwin4096, vwin8192
}; };
libavcodec/vorbis_dec.c
View file @ a7adcf29
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @file libavcodec/vorbis_dec.c * @file libavcodec/vorbis_dec.c
* Vorbis I decoder * Vorbis I decoder
* @author Denes Balatoni ( dbalatoni programozo hu ) * @author Denes Balatoni ( dbalatoni programozo hu )
*
* This file is part of FFmpeg. * This file is part of FFmpeg.
* *
* FFmpeg is free software; you can redistribute it and/or * FFmpeg is free software; you can redistribute it and/or
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
#define V_NB_BITS 8 #define V_NB_BITS 8
#define V_NB_BITS2 11 #define V_NB_BITS2 11
#define V_MAX_VLCS (1<<16) #define V_MAX_VLCS (1 << 16)
#define V_MAX_PARTITIONS (1<<20) #define V_MAX_PARTITIONS (1 << 20)
#ifndef V_DEBUG #ifndef V_DEBUG
#define AV_DEBUG(...) #define AV_DEBUG(...)
...@@ -70,13 +70,13 @@ typedef struct { ...@@ -70,13 +70,13 @@ typedef struct {
uint_fast8_t order; uint_fast8_t order;
uint_fast16_t rate; uint_fast16_t rate;
uint_fast16_t bark_map_size; uint_fast16_t bark_map_size;
int_fast32_t * map[2]; int_fast32_t *map[2];
uint_fast32_t map_size[2]; uint_fast32_t map_size[2];
uint_fast8_t amplitude_bits; uint_fast8_t amplitude_bits;
uint_fast8_t amplitude_offset; uint_fast8_t amplitude_offset;
uint_fast8_t num_books; uint_fast8_t num_books;
uint_fast8_t * book_list; uint_fast8_t *book_list;
float * lsp; float *lsp;
} t0; } t0;
struct vorbis_floor1_s { struct vorbis_floor1_s {
uint_fast8_t partitions; uint_fast8_t partitions;
...@@ -88,7 +88,7 @@ typedef struct { ...@@ -88,7 +88,7 @@ typedef struct {
int_fast16_t subclass_books[16][8]; int_fast16_t subclass_books[16][8];
uint_fast8_t multiplier; uint_fast8_t multiplier;
uint_fast16_t x_list_dim; uint_fast16_t x_list_dim;
vorbis_floor1_entry * list; vorbis_floor1_entry *list;
} t1; } t1;
} data; } data;
} vorbis_floor; } vorbis_floor;
...@@ -135,7 +135,7 @@ typedef struct vorbis_context_s { ...@@ -135,7 +135,7 @@ typedef struct vorbis_context_s {
uint_fast32_t bitrate_nominal; uint_fast32_t bitrate_nominal;
uint_fast32_t bitrate_minimum; uint_fast32_t bitrate_minimum;
uint_fast32_t blocksize[2]; uint_fast32_t blocksize[2];
const float * win[2]; const float *win[2];
uint_fast16_t codebook_count; uint_fast16_t codebook_count;
vorbis_codebook *codebooks; vorbis_codebook *codebooks;
uint_fast8_t floor_count; uint_fast8_t floor_count;
...@@ -158,14 +158,14 @@ typedef struct vorbis_context_s { ...@@ -158,14 +158,14 @@ typedef struct vorbis_context_s {
/* Helper functions */ /* Helper functions */
#define BARK(x) \ #define BARK(x) \
(13.1f*atan(0.00074f*(x))+2.24f*atan(1.85e-8f*(x)*(x))+1e-4f*(x)) (13.1f * atan(0.00074f * (x)) + 2.24f * atan(1.85e-8f * (x) * (x)) + 1e-4f * (x))
static float vorbisfloat2float(uint_fast32_t val) static float vorbisfloat2float(uint_fast32_t val)
{ {
double mant=val&0x1fffff; double mant = val & 0x1fffff;
long exp=(val&0x7fe00000L)>>21; long exp = (val & 0x7fe00000L) >> 21;
if (val&0x80000000) if (val & 0x80000000)
mant=-mant; mant = -mant;
return ldexp(mant, exp - 20 - 768); return ldexp(mant, exp - 20 - 768);
} }
...@@ -186,14 +186,14 @@ static void vorbis_free(vorbis_context *vc) ...@@ -186,14 +186,14 @@ static void vorbis_free(vorbis_context *vc)
ff_mdct_end(&vc->mdct[0]); ff_mdct_end(&vc->mdct[0]);
ff_mdct_end(&vc->mdct[1]); ff_mdct_end(&vc->mdct[1]);
for(i=0;i<vc->codebook_count;++i) { for (i = 0; i < vc->codebook_count; ++i) {
av_free(vc->codebooks[i].codevectors); av_free(vc->codebooks[i].codevectors);
free_vlc(&vc->codebooks[i].vlc); free_vlc(&vc->codebooks[i].vlc);
} }
av_freep(&vc->codebooks); av_freep(&vc->codebooks);
for(i=0;i<vc->floor_count;++i) { for (i = 0; i < vc->floor_count; ++i) {
if(vc->floors[i].floor_type==0) { if (vc->floors[i].floor_type == 0) {
av_free(vc->floors[i].data.t0.map[0]); av_free(vc->floors[i].data.t0.map[0]);
av_free(vc->floors[i].data.t0.map[1]); av_free(vc->floors[i].data.t0.map[1]);
av_free(vc->floors[i].data.t0.book_list); av_free(vc->floors[i].data.t0.book_list);
...@@ -204,7 +204,7 @@ static void vorbis_free(vorbis_context *vc) ...@@ -204,7 +204,7 @@ static void vorbis_free(vorbis_context *vc)
} }
av_freep(&vc->floors); av_freep(&vc->floors);
for(i=0;i<vc->mapping_count;++i) { for (i = 0; i < vc->mapping_count; ++i) {
av_free(vc->mappings[i].magnitude); av_free(vc->mappings[i].magnitude);
av_free(vc->mappings[i].angle); av_free(vc->mappings[i].angle);
av_free(vc->mappings[i].mux); av_free(vc->mappings[i].mux);
...@@ -221,89 +221,89 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc) ...@@ -221,89 +221,89 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc)
uint_fast16_t cb; uint_fast16_t cb;
uint8_t *tmp_vlc_bits; uint8_t *tmp_vlc_bits;
uint32_t *tmp_vlc_codes; uint32_t *tmp_vlc_codes;
GetBitContext *gb=&vc->gb; GetBitContext *gb = &vc->gb;
vc->codebook_count=get_bits(gb,8)+1; vc->codebook_count = get_bits(gb, 8) + 1;
AV_DEBUG(" Codebooks: %d \n", vc->codebook_count); AV_DEBUG(" Codebooks: %d \n", vc->codebook_count);
vc->codebooks=av_mallocz(vc->codebook_count * sizeof(vorbis_codebook)); vc->codebooks = av_mallocz(vc->codebook_count * sizeof(vorbis_codebook));
tmp_vlc_bits =av_mallocz(V_MAX_VLCS * sizeof(uint8_t)); tmp_vlc_bits = av_mallocz(V_MAX_VLCS * sizeof(uint8_t));
tmp_vlc_codes=av_mallocz(V_MAX_VLCS * sizeof(uint32_t)); tmp_vlc_codes = av_mallocz(V_MAX_VLCS * sizeof(uint32_t));
for(cb=0;cb<vc->codebook_count;++cb) { for (cb = 0; cb < vc->codebook_count; ++cb) {
vorbis_codebook *codebook_setup=&vc->codebooks[cb]; vorbis_codebook *codebook_setup = &vc->codebooks[cb];
uint_fast8_t ordered; uint_fast8_t ordered;
uint_fast32_t t, used_entries=0; uint_fast32_t t, used_entries = 0;
uint_fast32_t entries; uint_fast32_t entries;
AV_DEBUG(" %d. Codebook \n", cb); AV_DEBUG(" %d. Codebook \n", cb);
if (get_bits(gb, 24)!=0x564342) { if (get_bits(gb, 24) != 0x564342) {
av_log(vc->avccontext, AV_LOG_ERROR, " %"PRIdFAST16". Codebook setup data corrupt. \n", cb); av_log(vc->avccontext, AV_LOG_ERROR, " %"PRIdFAST16". Codebook setup data corrupt. \n", cb);
goto error; goto error;
} }
codebook_setup->dimensions=get_bits(gb, 16); codebook_setup->dimensions=get_bits(gb, 16);
if (codebook_setup->dimensions>16||codebook_setup->dimensions==0) { if (codebook_setup->dimensions > 16 || codebook_setup->dimensions == 0) {
av_log(vc->avccontext, AV_LOG_ERROR, " %"PRIdFAST16". Codebook's dimension is invalid (%d). \n", cb, codebook_setup->dimensions); av_log(vc->avccontext, AV_LOG_ERROR, " %"PRIdFAST16". Codebook's dimension is invalid (%d). \n", cb, codebook_setup->dimensions);
goto error; goto error;
} }
entries=get_bits(gb, 24); entries = get_bits(gb, 24);
if (entries>V_MAX_VLCS) { if (entries > V_MAX_VLCS) {
av_log(vc->avccontext, AV_LOG_ERROR, " %"PRIdFAST16". Codebook has too many entries (%"PRIdFAST32"). \n", cb, entries); av_log(vc->avccontext, AV_LOG_ERROR, " %"PRIdFAST16". Codebook has too many entries (%"PRIdFAST32"). \n", cb, entries);
goto error; goto error;
} }
ordered=get_bits1(gb); ordered = get_bits1(gb);
AV_DEBUG(" codebook_dimensions %d, codebook_entries %d \n", codebook_setup->dimensions, entries); AV_DEBUG(" codebook_dimensions %d, codebook_entries %d \n", codebook_setup->dimensions, entries);
if (!ordered) { if (!ordered) {
uint_fast16_t ce; uint_fast16_t ce;
uint_fast8_t flag; uint_fast8_t flag;
uint_fast8_t sparse=get_bits1(gb); uint_fast8_t sparse = get_bits1(gb);
AV_DEBUG(" not ordered \n"); AV_DEBUG(" not ordered \n");
if (sparse) { if (sparse) {
AV_DEBUG(" sparse \n"); AV_DEBUG(" sparse \n");
used_entries=0; used_entries = 0;
for(ce=0;ce<entries;++ce) { for (ce = 0; ce < entries; ++ce) {
flag=get_bits1(gb); flag = get_bits1(gb);
if (flag) { if (flag) {
tmp_vlc_bits[ce]=get_bits(gb, 5)+1; tmp_vlc_bits[ce] = get_bits(gb, 5) + 1;
++used_entries; ++used_entries;
} else } else
tmp_vlc_bits[ce]=0; tmp_vlc_bits[ce] = 0;
} }
} else { } else {
AV_DEBUG(" not sparse \n"); AV_DEBUG(" not sparse \n");
used_entries=entries; used_entries = entries;
for(ce=0;ce<entries;++ce) for (ce = 0; ce < entries; ++ce)
tmp_vlc_bits[ce]=get_bits(gb, 5)+1; tmp_vlc_bits[ce] = get_bits(gb, 5) + 1;
} }
} else { } else {
uint_fast16_t current_entry=0; uint_fast16_t current_entry = 0;
uint_fast8_t current_length=get_bits(gb, 5)+1; uint_fast8_t current_length = get_bits(gb, 5)+1;
AV_DEBUG(" ordered, current length: %d \n", current_length); //FIXME AV_DEBUG(" ordered, current length: %d \n", current_length); //FIXME
used_entries=entries; used_entries = entries;
for(;current_entry<used_entries && current_length <= 32;++current_length) { for (; current_entry < used_entries && current_length <= 32; ++current_length) {
uint_fast16_t i, number; uint_fast16_t i, number;
AV_DEBUG(" number bits: %d ", ilog(entries - current_entry)); AV_DEBUG(" number bits: %d ", ilog(entries - current_entry));
number=get_bits(gb, ilog(entries - current_entry)); number = get_bits(gb, ilog(entries - current_entry));
AV_DEBUG(" number: %d \n", number); AV_DEBUG(" number: %d \n", number);
for(i=current_entry;i<number+current_entry;++i) for (i = current_entry; i < number+current_entry; ++i)
if (i<used_entries) if (i < used_entries)
tmp_vlc_bits[i]=current_length; tmp_vlc_bits[i] = current_length;
current_entry+=number; current_entry+=number;
} }
...@@ -313,70 +313,70 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc) ...@@ -313,70 +313,70 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc)
} }
} }
codebook_setup->lookup_type=get_bits(gb, 4); codebook_setup->lookup_type = get_bits(gb, 4);
AV_DEBUG(" lookup type: %d : %s \n", codebook_setup->lookup_type, codebook_setup->lookup_type ? "vq" : "no lookup" ); AV_DEBUG(" lookup type: %d : %s \n", codebook_setup->lookup_type, codebook_setup->lookup_type ? "vq" : "no lookup");
// If the codebook is used for (inverse) VQ, calculate codevectors. // If the codebook is used for (inverse) VQ, calculate codevectors.
if (codebook_setup->lookup_type==1) { if (codebook_setup->lookup_type == 1) {
uint_fast16_t i, j, k; uint_fast16_t i, j, k;
uint_fast16_t codebook_lookup_values=ff_vorbis_nth_root(entries, codebook_setup->dimensions); uint_fast16_t codebook_lookup_values = ff_vorbis_nth_root(entries, codebook_setup->dimensions);
uint_fast16_t codebook_multiplicands[codebook_lookup_values]; uint_fast16_t codebook_multiplicands[codebook_lookup_values];
float codebook_minimum_value=vorbisfloat2float(get_bits_long(gb, 32)); float codebook_minimum_value = vorbisfloat2float(get_bits_long(gb, 32));
float codebook_delta_value=vorbisfloat2float(get_bits_long(gb, 32)); float codebook_delta_value = vorbisfloat2float(get_bits_long(gb, 32));
uint_fast8_t codebook_value_bits=get_bits(gb, 4)+1; uint_fast8_t codebook_value_bits = get_bits(gb, 4)+1;
uint_fast8_t codebook_sequence_p=get_bits1(gb); uint_fast8_t codebook_sequence_p = get_bits1(gb);
AV_DEBUG(" We expect %d numbers for building the codevectors. \n", codebook_lookup_values); AV_DEBUG(" We expect %d numbers for building the codevectors. \n", codebook_lookup_values);
AV_DEBUG(" delta %f minmum %f \n", codebook_delta_value, codebook_minimum_value); AV_DEBUG(" delta %f minmum %f \n", codebook_delta_value, codebook_minimum_value);
for(i=0;i<codebook_lookup_values;++i) { for (i = 0; i < codebook_lookup_values; ++i) {
codebook_multiplicands[i]=get_bits(gb, codebook_value_bits); codebook_multiplicands[i] = get_bits(gb, codebook_value_bits);
AV_DEBUG(" multiplicands*delta+minmum : %e \n", (float)codebook_multiplicands[i]*codebook_delta_value+codebook_minimum_value); AV_DEBUG(" multiplicands*delta+minmum : %e \n", (float)codebook_multiplicands[i]*codebook_delta_value+codebook_minimum_value);
AV_DEBUG(" multiplicand %d \n", codebook_multiplicands[i]); AV_DEBUG(" multiplicand %d \n", codebook_multiplicands[i]);
} }
// Weed out unused vlcs and build codevector vector // Weed out unused vlcs and build codevector vector
codebook_setup->codevectors=used_entries ? av_mallocz(used_entries*codebook_setup->dimensions * sizeof(float)) : NULL; codebook_setup->codevectors = used_entries ? av_mallocz(used_entries*codebook_setup->dimensions * sizeof(float)) : NULL;
for(j=0, i=0;i<entries;++i) { for (j = 0, i = 0; i < entries; ++i) {
uint_fast8_t dim=codebook_setup->dimensions; uint_fast8_t dim = codebook_setup->dimensions;
if (tmp_vlc_bits[i]) { if (tmp_vlc_bits[i]) {
float last=0.0; float last = 0.0;
uint_fast32_t lookup_offset=i; uint_fast32_t lookup_offset = i;
#ifdef V_DEBUG #ifdef V_DEBUG
av_log(vc->avccontext, AV_LOG_INFO, "Lookup offset %d ,", i); av_log(vc->avccontext, AV_LOG_INFO, "Lookup offset %d ,", i);
#endif #endif
for(k=0;k<dim;++k) { for (k = 0; k < dim; ++k) {
uint_fast32_t multiplicand_offset = lookup_offset % codebook_lookup_values; uint_fast32_t multiplicand_offset = lookup_offset % codebook_lookup_values;
codebook_setup->codevectors[j*dim+k]=codebook_multiplicands[multiplicand_offset]*codebook_delta_value+codebook_minimum_value+last; codebook_setup->codevectors[j * dim + k] = codebook_multiplicands[multiplicand_offset] * codebook_delta_value + codebook_minimum_value + last;
if (codebook_sequence_p) if (codebook_sequence_p)
last=codebook_setup->codevectors[j*dim+k]; last = codebook_setup->codevectors[j * dim + k];
lookup_offset/=codebook_lookup_values; lookup_offset/=codebook_lookup_values;
} }
tmp_vlc_bits[j]=tmp_vlc_bits[i]; tmp_vlc_bits[j] = tmp_vlc_bits[i];
#ifdef V_DEBUG #ifdef V_DEBUG
av_log(vc->avccontext, AV_LOG_INFO, "real lookup offset %d, vector: ", j); av_log(vc->avccontext, AV_LOG_INFO, "real lookup offset %d, vector: ", j);
for(k=0;k<dim;++k) for (k = 0; k < dim; ++k)
av_log(vc->avccontext, AV_LOG_INFO, " %f ", codebook_setup->codevectors[j*dim+k]); av_log(vc->avccontext, AV_LOG_INFO, " %f ", codebook_setup->codevectors[j * dim + k]);
av_log(vc->avccontext, AV_LOG_INFO, "\n"); av_log(vc->avccontext, AV_LOG_INFO, "\n");
#endif #endif
++j; ++j;
} }
} }
if (j!=used_entries) { if (j != used_entries) {
av_log(vc->avccontext, AV_LOG_ERROR, "Bug in codevector vector building code. \n"); av_log(vc->avccontext, AV_LOG_ERROR, "Bug in codevector vector building code. \n");
goto error; goto error;
} }
entries=used_entries; entries = used_entries;
} else if (codebook_setup->lookup_type>=2) { } else if (codebook_setup->lookup_type >= 2) {
av_log(vc->avccontext, AV_LOG_ERROR, "Codebook lookup type not supported. \n"); av_log(vc->avccontext, AV_LOG_ERROR, "Codebook lookup type not supported. \n");
goto error; goto error;
} }
...@@ -386,17 +386,17 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc) ...@@ -386,17 +386,17 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc)
av_log(vc->avccontext, AV_LOG_ERROR, " Invalid code lengths while generating vlcs. \n"); av_log(vc->avccontext, AV_LOG_ERROR, " Invalid code lengths while generating vlcs. \n");
goto error; goto error;
} }
codebook_setup->maxdepth=0; codebook_setup->maxdepth = 0;
for(t=0;t<entries;++t) for (t = 0; t < entries; ++t)
if (tmp_vlc_bits[t]>=codebook_setup->maxdepth) if (tmp_vlc_bits[t] >= codebook_setup->maxdepth)
codebook_setup->maxdepth=tmp_vlc_bits[t]; codebook_setup->maxdepth = tmp_vlc_bits[t];
if(codebook_setup->maxdepth > 3*V_NB_BITS) if (codebook_setup->maxdepth > 3 * V_NB_BITS)
codebook_setup->nb_bits=V_NB_BITS2; codebook_setup->nb_bits = V_NB_BITS2;
else else
codebook_setup->nb_bits=V_NB_BITS; codebook_setup->nb_bits = V_NB_BITS;
codebook_setup->maxdepth=(codebook_setup->maxdepth+codebook_setup->nb_bits-1)/codebook_setup->nb_bits; codebook_setup->maxdepth = (codebook_setup->maxdepth+codebook_setup->nb_bits - 1) / codebook_setup->nb_bits;
if (init_vlc(&codebook_setup->vlc, codebook_setup->nb_bits, entries, tmp_vlc_bits, sizeof(*tmp_vlc_bits), sizeof(*tmp_vlc_bits), tmp_vlc_codes, sizeof(*tmp_vlc_codes), sizeof(*tmp_vlc_codes), INIT_VLC_LE)) { if (init_vlc(&codebook_setup->vlc, codebook_setup->nb_bits, entries, tmp_vlc_bits, sizeof(*tmp_vlc_bits), sizeof(*tmp_vlc_bits), tmp_vlc_codes, sizeof(*tmp_vlc_codes), sizeof(*tmp_vlc_codes), INIT_VLC_LE)) {
av_log(vc->avccontext, AV_LOG_ERROR, " Error generating vlc tables. \n"); av_log(vc->avccontext, AV_LOG_ERROR, " Error generating vlc tables. \n");
...@@ -419,12 +419,12 @@ error: ...@@ -419,12 +419,12 @@ error:
static int vorbis_parse_setup_hdr_tdtransforms(vorbis_context *vc) static int vorbis_parse_setup_hdr_tdtransforms(vorbis_context *vc)
{ {
GetBitContext *gb=&vc->gb; GetBitContext *gb = &vc->gb;
uint_fast8_t i; uint_fast8_t i;
uint_fast8_t vorbis_time_count=get_bits(gb, 6)+1; uint_fast8_t vorbis_time_count = get_bits(gb, 6) + 1;
for(i=0;i<vorbis_time_count;++i) { for (i = 0; i < vorbis_time_count; ++i) {
uint_fast16_t vorbis_tdtransform=get_bits(gb, 16); uint_fast16_t vorbis_tdtransform = get_bits(gb, 16);
AV_DEBUG(" Vorbis time domain transform %d: %d \n", vorbis_time_count, vorbis_tdtransform); AV_DEBUG(" Vorbis time domain transform %d: %d \n", vorbis_time_count, vorbis_tdtransform);
...@@ -440,40 +440,40 @@ static int vorbis_parse_setup_hdr_tdtransforms(vorbis_context *vc) ...@@ -440,40 +440,40 @@ static int vorbis_parse_setup_hdr_tdtransforms(vorbis_context *vc)
static uint_fast8_t vorbis_floor0_decode(vorbis_context *vc, static uint_fast8_t vorbis_floor0_decode(vorbis_context *vc,
vorbis_floor_data *vfu, float *vec); vorbis_floor_data *vfu, float *vec);
static void create_map( vorbis_context * vc, uint_fast8_t floor_number ); static void create_map(vorbis_context *vc, uint_fast8_t floor_number);
static uint_fast8_t vorbis_floor1_decode(vorbis_context *vc, static uint_fast8_t vorbis_floor1_decode(vorbis_context *vc,
vorbis_floor_data *vfu, float *vec); vorbis_floor_data *vfu, float *vec);
static int vorbis_parse_setup_hdr_floors(vorbis_context *vc) static int vorbis_parse_setup_hdr_floors(vorbis_context *vc)
{ {
GetBitContext *gb=&vc->gb; GetBitContext *gb = &vc->gb;
uint_fast16_t i,j,k; uint_fast16_t i,j,k;
vc->floor_count=get_bits(gb, 6)+1; vc->floor_count = get_bits(gb, 6) + 1;
vc->floors=av_mallocz(vc->floor_count * sizeof(vorbis_floor)); vc->floors = av_mallocz(vc->floor_count * sizeof(vorbis_floor));
for (i=0;i<vc->floor_count;++i) { for (i = 0; i < vc->floor_count; ++i) {
vorbis_floor *floor_setup=&vc->floors[i]; vorbis_floor *floor_setup = &vc->floors[i];
floor_setup->floor_type=get_bits(gb, 16); floor_setup->floor_type = get_bits(gb, 16);
AV_DEBUG(" %d. floor type %d \n", i, floor_setup->floor_type); AV_DEBUG(" %d. floor type %d \n", i, floor_setup->floor_type);
if (floor_setup->floor_type==1) { if (floor_setup->floor_type == 1) {
uint_fast8_t maximum_class=0; uint_fast8_t maximum_class = 0;
uint_fast8_t rangebits; uint_fast8_t rangebits;
uint_fast16_t floor1_values=2; uint_fast16_t floor1_values = 2;
floor_setup->decode=vorbis_floor1_decode; floor_setup->decode = vorbis_floor1_decode;
floor_setup->data.t1.partitions=get_bits(gb, 5); floor_setup->data.t1.partitions = get_bits(gb, 5);
AV_DEBUG(" %d.floor: %d partitions \n", i, floor_setup->data.t1.partitions); AV_DEBUG(" %d.floor: %d partitions \n", i, floor_setup->data.t1.partitions);
for(j=0;j<floor_setup->data.t1.partitions;++j) { for (j = 0; j < floor_setup->data.t1.partitions; ++j) {
floor_setup->data.t1.partition_class[j]=get_bits(gb, 4); floor_setup->data.t1.partition_class[j] = get_bits(gb, 4);
if (floor_setup->data.t1.partition_class[j]>maximum_class) if (floor_setup->data.t1.partition_class[j] > maximum_class)
maximum_class=floor_setup->data.t1.partition_class[j]; maximum_class = floor_setup->data.t1.partition_class[j];
AV_DEBUG(" %d. floor %d partition class %d \n", i, j, floor_setup->data.t1.partition_class[j]); AV_DEBUG(" %d. floor %d partition class %d \n", i, j, floor_setup->data.t1.partition_class[j]);
...@@ -481,53 +481,53 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc) ...@@ -481,53 +481,53 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc)
AV_DEBUG(" maximum class %d \n", maximum_class); AV_DEBUG(" maximum class %d \n", maximum_class);
floor_setup->data.t1.maximum_class=maximum_class; floor_setup->data.t1.maximum_class = maximum_class;
for(j=0;j<=maximum_class;++j) { for (j = 0; j <= maximum_class; ++j) {
floor_setup->data.t1.class_dimensions[j]=get_bits(gb, 3)+1; floor_setup->data.t1.class_dimensions[j] = get_bits(gb, 3) + 1;
floor_setup->data.t1.class_subclasses[j]=get_bits(gb, 2); floor_setup->data.t1.class_subclasses[j] = get_bits(gb, 2);
AV_DEBUG(" %d floor %d class dim: %d subclasses %d \n", i, j, floor_setup->data.t1.class_dimensions[j], floor_setup->data.t1.class_subclasses[j]); AV_DEBUG(" %d floor %d class dim: %d subclasses %d \n", i, j, floor_setup->data.t1.class_dimensions[j], floor_setup->data.t1.class_subclasses[j]);
if (floor_setup->data.t1.class_subclasses[j]) { if (floor_setup->data.t1.class_subclasses[j]) {
int bits=get_bits(gb, 8); int bits = get_bits(gb, 8);
if (bits>=vc->codebook_count) { if (bits >= vc->codebook_count) {
av_log(vc->avccontext, AV_LOG_ERROR, "Masterbook index %d is out of range.\n", bits); av_log(vc->avccontext, AV_LOG_ERROR, "Masterbook index %d is out of range.\n", bits);
return -1; return -1;
} }
floor_setup->data.t1.class_masterbook[j]=bits; floor_setup->data.t1.class_masterbook[j] = bits;
AV_DEBUG(" masterbook: %d \n", floor_setup->data.t1.class_masterbook[j]); AV_DEBUG(" masterbook: %d \n", floor_setup->data.t1.class_masterbook[j]);
} }
for(k=0;k<(1<<floor_setup->data.t1.class_subclasses[j]);++k) { for (k = 0; k < (1 << floor_setup->data.t1.class_subclasses[j]); ++k) {
int16_t bits=get_bits(gb, 8)-1; int16_t bits = get_bits(gb, 8) - 1;
if (bits!=-1 && bits>=vc->codebook_count) { if (bits != -1 && bits >= vc->codebook_count) {
av_log(vc->avccontext, AV_LOG_ERROR, "Subclass book index %d is out of range.\n", bits); av_log(vc->avccontext, AV_LOG_ERROR, "Subclass book index %d is out of range.\n", bits);
return -1; return -1;
} }
floor_setup->data.t1.subclass_books[j][k]=bits; floor_setup->data.t1.subclass_books[j][k] = bits;
AV_DEBUG(" book %d. : %d \n", k, floor_setup->data.t1.subclass_books[j][k]); AV_DEBUG(" book %d. : %d \n", k, floor_setup->data.t1.subclass_books[j][k]);
} }
} }
floor_setup->data.t1.multiplier=get_bits(gb, 2)+1; floor_setup->data.t1.multiplier = get_bits(gb, 2) + 1;
floor_setup->data.t1.x_list_dim=2; floor_setup->data.t1.x_list_dim = 2;
for(j=0;j<floor_setup->data.t1.partitions;++j) for (j = 0; j < floor_setup->data.t1.partitions; ++j)
floor_setup->data.t1.x_list_dim+=floor_setup->data.t1.class_dimensions[floor_setup->data.t1.partition_class[j]]; floor_setup->data.t1.x_list_dim+=floor_setup->data.t1.class_dimensions[floor_setup->data.t1.partition_class[j]];
floor_setup->data.t1.list=av_mallocz(floor_setup->data.t1.x_list_dim * sizeof(vorbis_floor1_entry)); floor_setup->data.t1.list = av_mallocz(floor_setup->data.t1.x_list_dim * sizeof(vorbis_floor1_entry));
rangebits=get_bits(gb, 4); rangebits = get_bits(gb, 4);
floor_setup->data.t1.list[0].x = 0; floor_setup->data.t1.list[0].x = 0;
floor_setup->data.t1.list[1].x = (1<<rangebits); floor_setup->data.t1.list[1].x = (1 << rangebits);
for(j=0;j<floor_setup->data.t1.partitions;++j) { for (j = 0; j < floor_setup->data.t1.partitions; ++j) {
for(k=0;k<floor_setup->data.t1.class_dimensions[floor_setup->data.t1.partition_class[j]];++k,++floor1_values) { for (k = 0; k < floor_setup->data.t1.class_dimensions[floor_setup->data.t1.partition_class[j]]; ++k, ++floor1_values) {
floor_setup->data.t1.list[floor1_values].x=get_bits(gb, rangebits); floor_setup->data.t1.list[floor1_values].x = get_bits(gb, rangebits);
AV_DEBUG(" %d. floor1 Y coord. %d \n", floor1_values, floor_setup->data.t1.list[floor1_values].x); AV_DEBUG(" %d. floor1 Y coord. %d \n", floor1_values, floor_setup->data.t1.list[floor1_values].x);
} }
...@@ -535,15 +535,15 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc) ...@@ -535,15 +535,15 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc)
// Precalculate order of x coordinates - needed for decode // Precalculate order of x coordinates - needed for decode
ff_vorbis_ready_floor1_list(floor_setup->data.t1.list, floor_setup->data.t1.x_list_dim); ff_vorbis_ready_floor1_list(floor_setup->data.t1.list, floor_setup->data.t1.x_list_dim);
} else if(floor_setup->floor_type==0) { } else if (floor_setup->floor_type == 0) {
uint_fast8_t max_codebook_dim=0; uint_fast8_t max_codebook_dim = 0;
floor_setup->decode=vorbis_floor0_decode; floor_setup->decode = vorbis_floor0_decode;
floor_setup->data.t0.order=get_bits(gb, 8); floor_setup->data.t0.order = get_bits(gb, 8);
floor_setup->data.t0.rate=get_bits(gb, 16); floor_setup->data.t0.rate = get_bits(gb, 16);
floor_setup->data.t0.bark_map_size=get_bits(gb, 16); floor_setup->data.t0.bark_map_size = get_bits(gb, 16);
floor_setup->data.t0.amplitude_bits=get_bits(gb, 6); floor_setup->data.t0.amplitude_bits = get_bits(gb, 6);
/* zero would result in a div by zero later * /* zero would result in a div by zero later *
* 2^0 - 1 == 0 */ * 2^0 - 1 == 0 */
if (floor_setup->data.t0.amplitude_bits == 0) { if (floor_setup->data.t0.amplitude_bits == 0) {
...@@ -551,38 +551,38 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc) ...@@ -551,38 +551,38 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc)
"Floor 0 amplitude bits is 0.\n"); "Floor 0 amplitude bits is 0.\n");
return -1; return -1;
} }
floor_setup->data.t0.amplitude_offset=get_bits(gb, 8); floor_setup->data.t0.amplitude_offset = get_bits(gb, 8);
floor_setup->data.t0.num_books=get_bits(gb, 4)+1; floor_setup->data.t0.num_books = get_bits(gb, 4) + 1;
/* allocate mem for booklist */ /* allocate mem for booklist */
floor_setup->data.t0.book_list= floor_setup->data.t0.book_list =
av_malloc(floor_setup->data.t0.num_books); av_malloc(floor_setup->data.t0.num_books);
if(!floor_setup->data.t0.book_list) if (!floor_setup->data.t0.book_list)
return -1; return -1;
/* read book indexes */ /* read book indexes */
{ {
int idx; int idx;
uint_fast8_t book_idx; uint_fast8_t book_idx;
for (idx=0;idx<floor_setup->data.t0.num_books;++idx) { for (idx = 0; idx < floor_setup->data.t0.num_books; ++idx) {
book_idx=get_bits(gb, 8); book_idx = get_bits(gb, 8);
if (book_idx>=vc->codebook_count) if (book_idx >= vc->codebook_count)
return -1; return -1;
floor_setup->data.t0.book_list[idx]=book_idx; floor_setup->data.t0.book_list[idx] = book_idx;
if (vc->codebooks[book_idx].dimensions > max_codebook_dim) if (vc->codebooks[book_idx].dimensions > max_codebook_dim)
max_codebook_dim=vc->codebooks[book_idx].dimensions; max_codebook_dim = vc->codebooks[book_idx].dimensions;
} }
} }
create_map( vc, i ); create_map(vc, i);
/* allocate mem for lsp coefficients */ /* allocate mem for lsp coefficients */
{ {
/* codebook dim is for padding if codebook dim doesn't * /* codebook dim is for padding if codebook dim doesn't *
* divide order+1 then we need to read more data */ * divide order+1 then we need to read more data */
floor_setup->data.t0.lsp= floor_setup->data.t0.lsp =
av_malloc((floor_setup->data.t0.order+1 + max_codebook_dim) av_malloc((floor_setup->data.t0.order+1 + max_codebook_dim)
* sizeof(float)); * sizeof(float));
if(!floor_setup->data.t0.lsp) if (!floor_setup->data.t0.lsp)
return -1; return -1;
} }
...@@ -601,10 +601,10 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc) ...@@ -601,10 +601,10 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc)
floor_setup->data.t0.book_list); floor_setup->data.t0.book_list);
{ {
int idx; int idx;
for (idx=0;idx<floor_setup->data.t0.num_books;++idx) { for (idx = 0; idx < floor_setup->data.t0.num_books; ++idx) {
AV_DEBUG( " Book %d: %u\n", AV_DEBUG(" Book %d: %u\n",
idx+1, idx+1,
floor_setup->data.t0.book_list[idx] ); floor_setup->data.t0.book_list[idx]);
} }
} }
#endif #endif
...@@ -620,38 +620,38 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc) ...@@ -620,38 +620,38 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc)
static int vorbis_parse_setup_hdr_residues(vorbis_context *vc) static int vorbis_parse_setup_hdr_residues(vorbis_context *vc)
{ {
GetBitContext *gb=&vc->gb; GetBitContext *gb = &vc->gb;
uint_fast8_t i, j, k; uint_fast8_t i, j, k;
vc->residue_count=get_bits(gb, 6)+1; vc->residue_count = get_bits(gb, 6)+1;
vc->residues=av_mallocz(vc->residue_count * sizeof(vorbis_residue)); vc->residues = av_mallocz(vc->residue_count * sizeof(vorbis_residue));
AV_DEBUG(" There are %d residues. \n", vc->residue_count); AV_DEBUG(" There are %d residues. \n", vc->residue_count);
for(i=0;i<vc->residue_count;++i) { for (i = 0; i < vc->residue_count; ++i) {
vorbis_residue *res_setup=&vc->residues[i]; vorbis_residue *res_setup = &vc->residues[i];
uint_fast8_t cascade[64]; uint_fast8_t cascade[64];
uint_fast8_t high_bits; uint_fast8_t high_bits;
uint_fast8_t low_bits; uint_fast8_t low_bits;
res_setup->type=get_bits(gb, 16); res_setup->type = get_bits(gb, 16);
AV_DEBUG(" %d. residue type %d \n", i, res_setup->type); AV_DEBUG(" %d. residue type %d \n", i, res_setup->type);
res_setup->begin=get_bits(gb, 24); res_setup->begin = get_bits(gb, 24);
res_setup->end=get_bits(gb, 24); res_setup->end = get_bits(gb, 24);
res_setup->partition_size=get_bits(gb, 24)+1; res_setup->partition_size = get_bits(gb, 24) + 1;
/* Validations to prevent a buffer overflow later. */ /* Validations to prevent a buffer overflow later. */
if (res_setup->begin>res_setup->end if (res_setup->begin>res_setup->end ||
|| res_setup->end>vc->blocksize[1]/(res_setup->type==2?1:2) res_setup->end>vc->blocksize[1] / (res_setup->type == 2 ? 1 : 2) ||
|| (res_setup->end-res_setup->begin)/res_setup->partition_size>V_MAX_PARTITIONS) { (res_setup->end-res_setup->begin) / res_setup->partition_size > V_MAX_PARTITIONS) {
av_log(vc->avccontext, AV_LOG_ERROR, "partition out of bounds: type, begin, end, size, blocksize: %"PRIdFAST16", %"PRIdFAST32", %"PRIdFAST32", %"PRIdFAST32", %"PRIdFAST32"\n", res_setup->type, res_setup->begin, res_setup->end, res_setup->partition_size, vc->blocksize[1]/2); av_log(vc->avccontext, AV_LOG_ERROR, "partition out of bounds: type, begin, end, size, blocksize: %"PRIdFAST16", %"PRIdFAST32", %"PRIdFAST32", %"PRIdFAST32", %"PRIdFAST32"\n", res_setup->type, res_setup->begin, res_setup->end, res_setup->partition_size, vc->blocksize[1] / 2);
return -1; return -1;
} }
res_setup->classifications=get_bits(gb, 6)+1; res_setup->classifications = get_bits(gb, 6) + 1;
res_setup->classbook=get_bits(gb, 8); res_setup->classbook = get_bits(gb, 8);
if (res_setup->classbook>=vc->codebook_count) { if (res_setup->classbook >= vc->codebook_count) {
av_log(vc->avccontext, AV_LOG_ERROR, "classbook value %d out of range. \n", res_setup->classbook); av_log(vc->avccontext, AV_LOG_ERROR, "classbook value %d out of range. \n", res_setup->classbook);
return -1; return -1;
} }
...@@ -659,33 +659,33 @@ static int vorbis_parse_setup_hdr_residues(vorbis_context *vc) ...@@ -659,33 +659,33 @@ static int vorbis_parse_setup_hdr_residues(vorbis_context *vc)
AV_DEBUG(" begin %d end %d part.size %d classif.s %d classbook %d \n", res_setup->begin, res_setup->end, res_setup->partition_size, AV_DEBUG(" begin %d end %d part.size %d classif.s %d classbook %d \n", res_setup->begin, res_setup->end, res_setup->partition_size,
res_setup->classifications, res_setup->classbook); res_setup->classifications, res_setup->classbook);
for(j=0;j<res_setup->classifications;++j) { for (j = 0; j < res_setup->classifications; ++j) {
high_bits=0; high_bits = 0;
low_bits=get_bits(gb, 3); low_bits = get_bits(gb, 3);
if (get_bits1(gb)) if (get_bits1(gb))
high_bits=get_bits(gb, 5); high_bits = get_bits(gb, 5);
cascade[j]=(high_bits<<3)+low_bits; cascade[j] = (high_bits << 3) + low_bits;
AV_DEBUG(" %d class casscade depth: %d \n", j, ilog(cascade[j])); AV_DEBUG(" %d class casscade depth: %d \n", j, ilog(cascade[j]));
} }
res_setup->maxpass=0; res_setup->maxpass = 0;
for(j=0;j<res_setup->classifications;++j) { for (j = 0; j < res_setup->classifications; ++j) {
for(k=0;k<8;++k) { for (k = 0; k < 8; ++k) {
if (cascade[j]&(1<<k)) { if (cascade[j]&(1 << k)) {
int bits=get_bits(gb, 8); int bits = get_bits(gb, 8);
if (bits>=vc->codebook_count) { if (bits >= vc->codebook_count) {
av_log(vc->avccontext, AV_LOG_ERROR, "book value %d out of range. \n", bits); av_log(vc->avccontext, AV_LOG_ERROR, "book value %d out of range. \n", bits);
return -1; return -1;
} }
res_setup->books[j][k]=bits; res_setup->books[j][k] = bits;
AV_DEBUG(" %d class casscade depth %d book: %d \n", j, k, res_setup->books[j][k]); AV_DEBUG(" %d class casscade depth %d book: %d \n", j, k, res_setup->books[j][k]);
if (k>res_setup->maxpass) if (k>res_setup->maxpass)
res_setup->maxpass=k; res_setup->maxpass = k;
} else { } else {
res_setup->books[j][k]=-1; res_setup->books[j][k] = -1;
} }
} }
} }
...@@ -697,75 +697,75 @@ static int vorbis_parse_setup_hdr_residues(vorbis_context *vc) ...@@ -697,75 +697,75 @@ static int vorbis_parse_setup_hdr_residues(vorbis_context *vc)
static int vorbis_parse_setup_hdr_mappings(vorbis_context *vc) static int vorbis_parse_setup_hdr_mappings(vorbis_context *vc)
{ {
GetBitContext *gb=&vc->gb; GetBitContext *gb = &vc->gb;
uint_fast8_t i, j; uint_fast8_t i, j;
vc->mapping_count=get_bits(gb, 6)+1; vc->mapping_count = get_bits(gb, 6)+1;
vc->mappings=av_mallocz(vc->mapping_count * sizeof(vorbis_mapping)); vc->mappings = av_mallocz(vc->mapping_count * sizeof(vorbis_mapping));
AV_DEBUG(" There are %d mappings. \n", vc->mapping_count); AV_DEBUG(" There are %d mappings. \n", vc->mapping_count);
for(i=0;i<vc->mapping_count;++i) { for (i = 0; i < vc->mapping_count; ++i) {
vorbis_mapping *mapping_setup=&vc->mappings[i]; vorbis_mapping *mapping_setup = &vc->mappings[i];
if (get_bits(gb, 16)) { if (get_bits(gb, 16)) {
av_log(vc->avccontext, AV_LOG_ERROR, "Other mappings than type 0 are not compliant with the Vorbis I specification. \n"); av_log(vc->avccontext, AV_LOG_ERROR, "Other mappings than type 0 are not compliant with the Vorbis I specification. \n");
return -1; return -1;
} }
if (get_bits1(gb)) { if (get_bits1(gb)) {
mapping_setup->submaps=get_bits(gb, 4)+1; mapping_setup->submaps = get_bits(gb, 4) + 1;
} else { } else {
mapping_setup->submaps=1; mapping_setup->submaps = 1;
} }
if (get_bits1(gb)) { if (get_bits1(gb)) {
mapping_setup->coupling_steps=get_bits(gb, 8)+1; mapping_setup->coupling_steps = get_bits(gb, 8) + 1;
mapping_setup->magnitude=av_mallocz(mapping_setup->coupling_steps * sizeof(uint_fast8_t)); mapping_setup->magnitude = av_mallocz(mapping_setup->coupling_steps * sizeof(uint_fast8_t));
mapping_setup->angle =av_mallocz(mapping_setup->coupling_steps * sizeof(uint_fast8_t)); mapping_setup->angle = av_mallocz(mapping_setup->coupling_steps * sizeof(uint_fast8_t));
for(j=0;j<mapping_setup->coupling_steps;++j) { for (j = 0; j < mapping_setup->coupling_steps; ++j) {
mapping_setup->magnitude[j]=get_bits(gb, ilog(vc->audio_channels-1)); mapping_setup->magnitude[j] = get_bits(gb, ilog(vc->audio_channels - 1));
mapping_setup->angle[j]=get_bits(gb, ilog(vc->audio_channels-1)); mapping_setup->angle[j] = get_bits(gb, ilog(vc->audio_channels - 1));
if (mapping_setup->magnitude[j]>=vc->audio_channels) { if (mapping_setup->magnitude[j] >= vc->audio_channels) {
av_log(vc->avccontext, AV_LOG_ERROR, "magnitude channel %d out of range. \n", mapping_setup->magnitude[j]); av_log(vc->avccontext, AV_LOG_ERROR, "magnitude channel %d out of range. \n", mapping_setup->magnitude[j]);
return -1; return -1;
} }
if (mapping_setup->angle[j]>=vc->audio_channels) { if (mapping_setup->angle[j] >= vc->audio_channels) {
av_log(vc->avccontext, AV_LOG_ERROR, "angle channel %d out of range. \n", mapping_setup->angle[j]); av_log(vc->avccontext, AV_LOG_ERROR, "angle channel %d out of range. \n", mapping_setup->angle[j]);
return -1; return -1;
} }
} }
} else { } else {
mapping_setup->coupling_steps=0; mapping_setup->coupling_steps = 0;
} }
AV_DEBUG(" %d mapping coupling steps: %d \n", i, mapping_setup->coupling_steps); AV_DEBUG(" %d mapping coupling steps: %d \n", i, mapping_setup->coupling_steps);
if(get_bits(gb, 2)) { if (get_bits(gb, 2)) {
av_log(vc->avccontext, AV_LOG_ERROR, "%d. mapping setup data invalid. \n", i); av_log(vc->avccontext, AV_LOG_ERROR, "%d. mapping setup data invalid. \n", i);
return -1; // following spec. return -1; // following spec.
} }
if (mapping_setup->submaps>1) { if (mapping_setup->submaps>1) {
mapping_setup->mux=av_mallocz(vc->audio_channels * sizeof(uint_fast8_t)); mapping_setup->mux = av_mallocz(vc->audio_channels * sizeof(uint_fast8_t));
for(j=0;j<vc->audio_channels;++j) for (j = 0; j < vc->audio_channels; ++j)
mapping_setup->mux[j]=get_bits(gb, 4); mapping_setup->mux[j] = get_bits(gb, 4);
} }
for(j=0;j<mapping_setup->submaps;++j) { for (j = 0; j < mapping_setup->submaps; ++j) {
int bits; int bits;
skip_bits(gb, 8); // FIXME check? skip_bits(gb, 8); // FIXME check?
bits=get_bits(gb, 8); bits = get_bits(gb, 8);
if (bits>=vc->floor_count) { if (bits >= vc->floor_count) {
av_log(vc->avccontext, AV_LOG_ERROR, "submap floor value %d out of range. \n", bits); av_log(vc->avccontext, AV_LOG_ERROR, "submap floor value %d out of range. \n", bits);
return -1; return -1;
} }
mapping_setup->submap_floor[j]=bits; mapping_setup->submap_floor[j] = bits;
bits=get_bits(gb, 8); bits = get_bits(gb, 8);
if (bits>=vc->residue_count) { if (bits >= vc->residue_count) {
av_log(vc->avccontext, AV_LOG_ERROR, "submap residue value %d out of range. \n", bits); av_log(vc->avccontext, AV_LOG_ERROR, "submap residue value %d out of range. \n", bits);
return -1; return -1;
} }
mapping_setup->submap_residue[j]=bits; mapping_setup->submap_residue[j] = bits;
AV_DEBUG(" %d mapping %d submap : floor %d, residue %d \n", i, j, mapping_setup->submap_floor[j], mapping_setup->submap_residue[j]); AV_DEBUG(" %d mapping %d submap : floor %d, residue %d \n", i, j, mapping_setup->submap_floor[j], mapping_setup->submap_residue[j]);
} }
...@@ -775,36 +775,36 @@ static int vorbis_parse_setup_hdr_mappings(vorbis_context *vc) ...@@ -775,36 +775,36 @@ static int vorbis_parse_setup_hdr_mappings(vorbis_context *vc)
// Process modes part // Process modes part
static void create_map( vorbis_context * vc, uint_fast8_t floor_number ) static void create_map(vorbis_context *vc, uint_fast8_t floor_number)
{ {
vorbis_floor * floors=vc->floors; vorbis_floor *floors = vc->floors;
vorbis_floor0 * vf; vorbis_floor0 *vf;
int idx; int idx;
int_fast8_t blockflag; int_fast8_t blockflag;
int_fast32_t * map; int_fast32_t *map;
int_fast32_t n; //TODO: could theoretically be smaller? int_fast32_t n; //TODO: could theoretically be smaller?
for (blockflag=0;blockflag<2;++blockflag) { for (blockflag = 0; blockflag < 2; ++blockflag) {
n=vc->blocksize[blockflag]/2; n = vc->blocksize[blockflag] / 2;
floors[floor_number].data.t0.map[blockflag]= floors[floor_number].data.t0.map[blockflag] =
av_malloc((n+1) * sizeof(int_fast32_t)); // n+sentinel av_malloc((n+1) * sizeof(int_fast32_t)); // n + sentinel
map=floors[floor_number].data.t0.map[blockflag]; map = floors[floor_number].data.t0.map[blockflag];
vf=&floors[floor_number].data.t0; vf = &floors[floor_number].data.t0;
for (idx=0; idx<n;++idx) { for (idx = 0; idx < n; ++idx) {
map[idx]=floor( BARK((vf->rate*idx)/(2.0f*n)) * map[idx] = floor(BARK((vf->rate * idx) / (2.0f * n)) *
((vf->bark_map_size)/ ((vf->bark_map_size) /
BARK(vf->rate/2.0f )) ); BARK(vf->rate / 2.0f)));
if (vf->bark_map_size-1 < map[idx]) if (vf->bark_map_size-1 < map[idx])
map[idx]=vf->bark_map_size-1; map[idx] = vf->bark_map_size - 1;
} }
map[n]=-1; map[n] = -1;
vf->map_size[blockflag]=n; vf->map_size[blockflag] = n;
} }
# ifdef V_DEBUG # ifdef V_DEBUG
for(idx=0;idx<=n;++idx) { for (idx = 0; idx <= n; ++idx) {
AV_DEBUG("floor0 map: map at pos %d is %d\n", AV_DEBUG("floor0 map: map at pos %d is %d\n",
idx, map[idx]); idx, map[idx]);
} }
...@@ -813,22 +813,22 @@ static void create_map( vorbis_context * vc, uint_fast8_t floor_number ) ...@@ -813,22 +813,22 @@ static void create_map( vorbis_context * vc, uint_fast8_t floor_number )
static int vorbis_parse_setup_hdr_modes(vorbis_context *vc) static int vorbis_parse_setup_hdr_modes(vorbis_context *vc)
{ {
GetBitContext *gb=&vc->gb; GetBitContext *gb = &vc->gb;
uint_fast8_t i; uint_fast8_t i;
vc->mode_count=get_bits(gb, 6)+1; vc->mode_count = get_bits(gb, 6) + 1;
vc->modes=av_mallocz(vc->mode_count * sizeof(vorbis_mode)); vc->modes = av_mallocz(vc->mode_count * sizeof(vorbis_mode));
AV_DEBUG(" There are %d modes.\n", vc->mode_count); AV_DEBUG(" There are %d modes.\n", vc->mode_count);
for(i=0;i<vc->mode_count;++i) { for (i = 0; i < vc->mode_count; ++i) {
vorbis_mode *mode_setup=&vc->modes[i]; vorbis_mode *mode_setup = &vc->modes[i];
mode_setup->blockflag=get_bits1(gb); mode_setup->blockflag = get_bits1(gb);
mode_setup->windowtype=get_bits(gb, 16); //FIXME check mode_setup->windowtype = get_bits(gb, 16); //FIXME check
mode_setup->transformtype=get_bits(gb, 16); //FIXME check mode_setup->transformtype = get_bits(gb, 16); //FIXME check
mode_setup->mapping=get_bits(gb, 8); mode_setup->mapping = get_bits(gb, 8);
if (mode_setup->mapping>=vc->mapping_count) { if (mode_setup->mapping >= vc->mapping_count) {
av_log(vc->avccontext, AV_LOG_ERROR, "mode mapping value %d out of range. \n", mode_setup->mapping); av_log(vc->avccontext, AV_LOG_ERROR, "mode mapping value %d out of range. \n", mode_setup->mapping);
return -1; return -1;
} }
...@@ -842,11 +842,11 @@ static int vorbis_parse_setup_hdr_modes(vorbis_context *vc) ...@@ -842,11 +842,11 @@ static int vorbis_parse_setup_hdr_modes(vorbis_context *vc)
static int vorbis_parse_setup_hdr(vorbis_context *vc) static int vorbis_parse_setup_hdr(vorbis_context *vc)
{ {
GetBitContext *gb=&vc->gb; GetBitContext *gb = &vc->gb;
if ((get_bits(gb, 8)!='v') || (get_bits(gb, 8)!='o') || if ((get_bits(gb, 8) != 'v') || (get_bits(gb, 8) != 'o') ||
(get_bits(gb, 8)!='r') || (get_bits(gb, 8)!='b') || (get_bits(gb, 8) != 'r') || (get_bits(gb, 8) != 'b') ||
(get_bits(gb, 8)!='i') || (get_bits(gb, 8)!='s')) { (get_bits(gb, 8) != 'i') || (get_bits(gb, 8) != 's')) {
av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis setup header packet corrupt (no vorbis signature). \n"); av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis setup header packet corrupt (no vorbis signature). \n");
return -1; return -1;
} }
...@@ -887,68 +887,67 @@ static int vorbis_parse_setup_hdr(vorbis_context *vc) ...@@ -887,68 +887,67 @@ static int vorbis_parse_setup_hdr(vorbis_context *vc)
static int vorbis_parse_id_hdr(vorbis_context *vc) static int vorbis_parse_id_hdr(vorbis_context *vc)
{ {
GetBitContext *gb=&vc->gb; GetBitContext *gb = &vc->gb;
uint_fast8_t bl0, bl1; uint_fast8_t bl0, bl1;
if ((get_bits(gb, 8)!='v') || (get_bits(gb, 8)!='o') || if ((get_bits(gb, 8) != 'v') || (get_bits(gb, 8) != 'o') ||
(get_bits(gb, 8)!='r') || (get_bits(gb, 8)!='b') || (get_bits(gb, 8) != 'r') || (get_bits(gb, 8) != 'b') ||
(get_bits(gb, 8)!='i') || (get_bits(gb, 8)!='s')) { (get_bits(gb, 8) != 'i') || (get_bits(gb, 8) != 's')) {
av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis id header packet corrupt (no vorbis signature). \n"); av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis id header packet corrupt (no vorbis signature). \n");
return -1; return -1;
} }
vc->version=get_bits_long(gb, 32); //FIXME check 0 vc->version = get_bits_long(gb, 32); //FIXME check 0
vc->audio_channels=get_bits(gb, 8); vc->audio_channels = get_bits(gb, 8);
if(vc->audio_channels <= 0){ if (vc->audio_channels <= 0) {
av_log(vc->avccontext, AV_LOG_ERROR, "Invalid number of channels\n"); av_log(vc->avccontext, AV_LOG_ERROR, "Invalid number of channels\n");
return -1; return -1;
} }
vc->audio_samplerate=get_bits_long(gb, 32); vc->audio_samplerate = get_bits_long(gb, 32);
if(vc->audio_samplerate <= 0){ if (vc->audio_samplerate <= 0) {
av_log(vc->avccontext, AV_LOG_ERROR, "Invalid samplerate\n"); av_log(vc->avccontext, AV_LOG_ERROR, "Invalid samplerate\n");
return -1; return -1;
} }
vc->bitrate_maximum=get_bits_long(gb, 32); vc->bitrate_maximum = get_bits_long(gb, 32);
vc->bitrate_nominal=get_bits_long(gb, 32); vc->bitrate_nominal = get_bits_long(gb, 32);
vc->bitrate_minimum=get_bits_long(gb, 32); vc->bitrate_minimum = get_bits_long(gb, 32);
bl0=get_bits(gb, 4); bl0 = get_bits(gb, 4);
bl1=get_bits(gb, 4); bl1 = get_bits(gb, 4);
vc->blocksize[0]=(1<<bl0); vc->blocksize[0] = (1 << bl0);
vc->blocksize[1]=(1<<bl1); vc->blocksize[1] = (1 << bl1);
if (bl0>13 || bl0<6 || bl1>13 || bl1<6 || bl1<bl0) { if (bl0 > 13 || bl0 < 6 || bl1 > 13 || bl1 < 6 || bl1 < bl0) {
av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis id header packet corrupt (illegal blocksize). \n"); av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis id header packet corrupt (illegal blocksize). \n");
return -3; return -3;
} }
// output format int16 // output format int16
if (vc->blocksize[1]/2 * vc->audio_channels * 2 > if (vc->blocksize[1] / 2 * vc->audio_channels * 2 > AVCODEC_MAX_AUDIO_FRAME_SIZE) {
AVCODEC_MAX_AUDIO_FRAME_SIZE) {
av_log(vc->avccontext, AV_LOG_ERROR, "Vorbis channel count makes " av_log(vc->avccontext, AV_LOG_ERROR, "Vorbis channel count makes "
"output packets too large.\n"); "output packets too large.\n");
return -4; return -4;
} }
vc->win[0]=ff_vorbis_vwin[bl0-6]; vc->win[0] = ff_vorbis_vwin[bl0 - 6];
vc->win[1]=ff_vorbis_vwin[bl1-6]; vc->win[1] = ff_vorbis_vwin[bl1 - 6];
if ((get_bits1(gb)) == 0) { if ((get_bits1(gb)) == 0) {
av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis id header packet corrupt (framing flag not set). \n"); av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis id header packet corrupt (framing flag not set). \n");
return -2; return -2;
} }
vc->channel_residues= av_malloc((vc->blocksize[1]/2)*vc->audio_channels * sizeof(float)); vc->channel_residues = av_malloc((vc->blocksize[1] / 2) * vc->audio_channels * sizeof(float));
vc->channel_floors = av_malloc((vc->blocksize[1]/2)*vc->audio_channels * sizeof(float)); vc->channel_floors = av_malloc((vc->blocksize[1] / 2) * vc->audio_channels * sizeof(float));
vc->saved = av_mallocz((vc->blocksize[1]/4)*vc->audio_channels * sizeof(float)); vc->saved = av_mallocz((vc->blocksize[1] / 4) * vc->audio_channels * sizeof(float));
vc->previous_window=0; vc->previous_window = 0;
ff_mdct_init(&vc->mdct[0], bl0, 1, vc->exp_bias ? -(1<<15) : -1.0); ff_mdct_init(&vc->mdct[0], bl0, 1, vc->exp_bias ? -(1 << 15) : -1.0);
ff_mdct_init(&vc->mdct[1], bl1, 1, vc->exp_bias ? -(1<<15) : -1.0); ff_mdct_init(&vc->mdct[1], bl1, 1, vc->exp_bias ? -(1 << 15) : -1.0);
AV_DEBUG(" vorbis version %d \n audio_channels %d \n audio_samplerate %d \n bitrate_max %d \n bitrate_nom %d \n bitrate_min %d \n blk_0 %d blk_1 %d \n ", AV_DEBUG(" vorbis version %d \n audio_channels %d \n audio_samplerate %d \n bitrate_max %d \n bitrate_nom %d \n bitrate_min %d \n blk_0 %d blk_1 %d \n ",
vc->version, vc->audio_channels, vc->audio_samplerate, vc->bitrate_maximum, vc->bitrate_nominal, vc->bitrate_minimum, vc->blocksize[0], vc->blocksize[1]); vc->version, vc->audio_channels, vc->audio_samplerate, vc->bitrate_maximum, vc->bitrate_nominal, vc->bitrate_minimum, vc->blocksize[0], vc->blocksize[1]);
/* /*
BLK=vc->blocksize[0]; BLK = vc->blocksize[0];
for(i=0;i<BLK/2;++i) { for (i = 0; i < BLK / 2; ++i) {
vc->win[0][i]=sin(0.5*3.14159265358*(sin(((float)i+0.5)/(float)BLK*3.14159265358))*(sin(((float)i+0.5)/(float)BLK*3.14159265358))); vc->win[0][i] = sin(0.5*3.14159265358*(sin(((float)i + 0.5) / (float)BLK*3.14159265358))*(sin(((float)i + 0.5) / (float)BLK*3.14159265358)));
} }
*/ */
...@@ -961,7 +960,7 @@ static av_cold int vorbis_decode_init(AVCodecContext *avccontext) ...@@ -961,7 +960,7 @@ static av_cold int vorbis_decode_init(AVCodecContext *avccontext)
{ {
vorbis_context *vc = avccontext->priv_data ; vorbis_context *vc = avccontext->priv_data ;
uint8_t *headers = avccontext->extradata; uint8_t *headers = avccontext->extradata;
int headers_len=avccontext->extradata_size; int headers_len = avccontext->extradata_size;
uint8_t *header_start[3]; uint8_t *header_start[3];
int header_len[3]; int header_len[3];
GetBitContext *gb = &(vc->gb); GetBitContext *gb = &(vc->gb);
...@@ -970,12 +969,12 @@ static av_cold int vorbis_decode_init(AVCodecContext *avccontext) ...@@ -970,12 +969,12 @@ static av_cold int vorbis_decode_init(AVCodecContext *avccontext)
vc->avccontext = avccontext; vc->avccontext = avccontext;
dsputil_init(&vc->dsp, avccontext); dsputil_init(&vc->dsp, avccontext);
if(vc->dsp.float_to_int16_interleave == ff_float_to_int16_interleave_c) { if (vc->dsp.float_to_int16_interleave == ff_float_to_int16_interleave_c) {
vc->add_bias = 385; vc->add_bias = 385;
vc->exp_bias = 0; vc->exp_bias = 0;
} else { } else {
vc->add_bias = 0; vc->add_bias = 0;
vc->exp_bias = 15<<23; vc->exp_bias = 15 << 23;
} }
if (!headers_len) { if (!headers_len) {
...@@ -989,8 +988,8 @@ static av_cold int vorbis_decode_init(AVCodecContext *avccontext) ...@@ -989,8 +988,8 @@ static av_cold int vorbis_decode_init(AVCodecContext *avccontext)
} }
init_get_bits(gb, header_start[0], header_len[0]*8); init_get_bits(gb, header_start[0], header_len[0]*8);
hdr_type=get_bits(gb, 8); hdr_type = get_bits(gb, 8);
if (hdr_type!=1) { if (hdr_type != 1) {
av_log(avccontext, AV_LOG_ERROR, "First header is not the id header.\n"); av_log(avccontext, AV_LOG_ERROR, "First header is not the id header.\n");
return -1; return -1;
} }
...@@ -1001,8 +1000,8 @@ static av_cold int vorbis_decode_init(AVCodecContext *avccontext) ...@@ -1001,8 +1000,8 @@ static av_cold int vorbis_decode_init(AVCodecContext *avccontext)
} }
init_get_bits(gb, header_start[2], header_len[2]*8); init_get_bits(gb, header_start[2], header_len[2]*8);
hdr_type=get_bits(gb, 8); hdr_type = get_bits(gb, 8);
if (hdr_type!=5) { if (hdr_type != 5) {
av_log(avccontext, AV_LOG_ERROR, "Third header is not the setup header.\n"); av_log(avccontext, AV_LOG_ERROR, "Third header is not the setup header.\n");
vorbis_free(vc); vorbis_free(vc);
return -1; return -1;
...@@ -1015,7 +1014,7 @@ static av_cold int vorbis_decode_init(AVCodecContext *avccontext) ...@@ -1015,7 +1014,7 @@ static av_cold int vorbis_decode_init(AVCodecContext *avccontext)
avccontext->channels = vc->audio_channels; avccontext->channels = vc->audio_channels;
avccontext->sample_rate = vc->audio_samplerate; avccontext->sample_rate = vc->audio_samplerate;
avccontext->frame_size = FFMIN(vc->blocksize[0], vc->blocksize[1])>>2; avccontext->frame_size = FFMIN(vc->blocksize[0], vc->blocksize[1]) >> 2;
avccontext->sample_fmt = SAMPLE_FMT_S16; avccontext->sample_fmt = SAMPLE_FMT_S16;
return 0 ; return 0 ;
...@@ -1028,45 +1027,43 @@ static av_cold int vorbis_decode_init(AVCodecContext *avccontext) ...@@ -1028,45 +1027,43 @@ static av_cold int vorbis_decode_init(AVCodecContext *avccontext)
static uint_fast8_t vorbis_floor0_decode(vorbis_context *vc, static uint_fast8_t vorbis_floor0_decode(vorbis_context *vc,
vorbis_floor_data *vfu, float *vec) vorbis_floor_data *vfu, float *vec)
{ {
vorbis_floor0 * vf=&vfu->t0; vorbis_floor0 *vf = &vfu->t0;
float * lsp=vf->lsp; float *lsp = vf->lsp;
uint_fast32_t amplitude; uint_fast32_t amplitude;
uint_fast32_t book_idx; uint_fast32_t book_idx;
uint_fast8_t blockflag=vc->modes[vc->mode_number].blockflag; uint_fast8_t blockflag = vc->modes[vc->mode_number].blockflag;
amplitude=get_bits(&vc->gb, vf->amplitude_bits); amplitude = get_bits(&vc->gb, vf->amplitude_bits);
if (amplitude>0) { if (amplitude > 0) {
float last = 0; float last = 0;
uint_fast16_t lsp_len = 0; uint_fast16_t lsp_len = 0;
uint_fast16_t idx; uint_fast16_t idx;
vorbis_codebook codebook; vorbis_codebook codebook;
book_idx=get_bits(&vc->gb, ilog(vf->num_books)); book_idx = get_bits(&vc->gb, ilog(vf->num_books));
if ( book_idx >= vf->num_books ) { if (book_idx >= vf->num_books) {
av_log( vc->avccontext, AV_LOG_ERROR, av_log(vc->avccontext, AV_LOG_ERROR,
"floor0 dec: booknumber too high!\n" ); "floor0 dec: booknumber too high!\n");
book_idx= 0; book_idx = 0;
//FIXME: look above //FIXME: look above
} }
AV_DEBUG( "floor0 dec: booknumber: %u\n", book_idx ); AV_DEBUG("floor0 dec: booknumber: %u\n", book_idx);
codebook=vc->codebooks[vf->book_list[book_idx]]; codebook = vc->codebooks[vf->book_list[book_idx]];
while (lsp_len<vf->order) { while (lsp_len<vf->order) {
int vec_off; int vec_off;
AV_DEBUG( "floor0 dec: book dimension: %d\n", codebook.dimensions ); AV_DEBUG("floor0 dec: book dimension: %d\n", codebook.dimensions);
AV_DEBUG( "floor0 dec: maximum depth: %d\n", codebook.maxdepth ); AV_DEBUG("floor0 dec: maximum depth: %d\n", codebook.maxdepth);
/* read temp vector */ /* read temp vector */
vec_off=get_vlc2(&vc->gb, vec_off = get_vlc2(&vc->gb, codebook.vlc.table,
codebook.vlc.table, codebook.nb_bits, codebook.maxdepth)
codebook.nb_bits, * codebook.dimensions;
codebook.maxdepth ) * AV_DEBUG("floor0 dec: vector offset: %d\n", vec_off);
codebook.dimensions;
AV_DEBUG( "floor0 dec: vector offset: %d\n", vec_off );
/* copy each vector component and add last to it */ /* copy each vector component and add last to it */
for (idx=0; idx<codebook.dimensions; ++idx) for (idx = 0; idx < codebook.dimensions; ++idx)
lsp[lsp_len+idx]=codebook.codevectors[vec_off+idx]+last; lsp[lsp_len+idx] = codebook.codevectors[vec_off+idx] + last;
last=lsp[lsp_len+idx-1]; /* set last to last vector component */ last = lsp[lsp_len+idx-1]; /* set last to last vector component */
lsp_len += codebook.dimensions; lsp_len += codebook.dimensions;
} }
...@@ -1074,59 +1071,57 @@ static uint_fast8_t vorbis_floor0_decode(vorbis_context *vc, ...@@ -1074,59 +1071,57 @@ static uint_fast8_t vorbis_floor0_decode(vorbis_context *vc,
/* DEBUG: output lsp coeffs */ /* DEBUG: output lsp coeffs */
{ {
int idx; int idx;
for ( idx = 0; idx < lsp_len; ++idx ) for (idx = 0; idx < lsp_len; ++idx)
AV_DEBUG("floor0 dec: coeff at %d is %f\n", idx, lsp[idx] ); AV_DEBUG("floor0 dec: coeff at %d is %f\n", idx, lsp[idx]);
} }
#endif #endif
/* synthesize floor output vector */ /* synthesize floor output vector */
{ {
int i; int i;
int order=vf->order; int order = vf->order;
float wstep=M_PI/vf->bark_map_size; float wstep = M_PI / vf->bark_map_size;
for(i=0;i<order;i++) for (i = 0; i < order; i++)
lsp[i]=2.0f*cos(lsp[i]); lsp[i] = 2.0f * cos(lsp[i]);
AV_DEBUG("floor0 synth: map_size=%d; m=%d; wstep=%f\n", AV_DEBUG("floor0 synth: map_size = %d; m = %d; wstep = %f\n",
vf->map_size, order, wstep); vf->map_size, order, wstep);
i=0; i = 0;
while(i<vf->map_size[blockflag]) { while (i < vf->map_size[blockflag]) {
int j, iter_cond=vf->map[blockflag][i]; int j, iter_cond = vf->map[blockflag][i];
float p=0.5f; float p = 0.5f;
float q=0.5f; float q = 0.5f;
float two_cos_w=2.0f*cos(wstep*iter_cond); // needed all times float two_cos_w = 2.0f * cos(wstep * iter_cond); // needed all times
/* similar part for the q and p products */ /* similar part for the q and p products */
for(j=0;j+1<order;j+=2) { for (j = 0; j + 1 < order; j += 2) {
q *= lsp[j] -two_cos_w; q *= lsp[j] - two_cos_w;
p *= lsp[j+1]-two_cos_w; p *= lsp[j + 1] - two_cos_w;
} }
if(j==order) { // even order if (j == order) { // even order
p *= p*(2.0f-two_cos_w); p *= p * (2.0f - two_cos_w);
q *= q*(2.0f+two_cos_w); q *= q * (2.0f + two_cos_w);
} else { // odd order } else { // odd order
q *= two_cos_w-lsp[j]; // one more time for q q *= two_cos_w-lsp[j]; // one more time for q
/* final step and square */ /* final step and square */
p *= p*(4.f-two_cos_w*two_cos_w); p *= p * (4.f - two_cos_w * two_cos_w);
q *= q; q *= q;
} }
/* calculate linear floor value */ /* calculate linear floor value */
{ {
q=exp( ( q = exp((((amplitude*vf->amplitude_offset) /
( (amplitude*vf->amplitude_offset)/ (((1 << vf->amplitude_bits) - 1) * sqrt(p + q)))
(((1<<vf->amplitude_bits)-1) * sqrt(p+q)) ) - vf->amplitude_offset) * .11512925f);
- vf->amplitude_offset ) * .11512925f
);
} }
/* fill vector */ /* fill vector */
do { do {
vec[i]=q; ++i; vec[i] = q; ++i;
} while (vf->map[blockflag][i]==iter_cond); } while (vf->map[blockflag][i] == iter_cond);
} }
} }
} else { } else {
...@@ -1142,10 +1137,10 @@ static uint_fast8_t vorbis_floor0_decode(vorbis_context *vc, ...@@ -1142,10 +1137,10 @@ static uint_fast8_t vorbis_floor0_decode(vorbis_context *vc,
static uint_fast8_t vorbis_floor1_decode(vorbis_context *vc, static uint_fast8_t vorbis_floor1_decode(vorbis_context *vc,
vorbis_floor_data *vfu, float *vec) vorbis_floor_data *vfu, float *vec)
{ {
vorbis_floor1 * vf=&vfu->t1; vorbis_floor1 *vf = &vfu->t1;
GetBitContext *gb=&vc->gb; GetBitContext *gb = &vc->gb;
uint_fast16_t range_v[4]={ 256, 128, 86, 64 }; uint_fast16_t range_v[4] = { 256, 128, 86, 64 };
uint_fast16_t range=range_v[vf->multiplier-1]; uint_fast16_t range = range_v[vf->multiplier-1];
uint_fast16_t floor1_Y[vf->x_list_dim]; uint_fast16_t floor1_Y[vf->x_list_dim];
uint_fast16_t floor1_Y_final[vf->x_list_dim]; uint_fast16_t floor1_Y_final[vf->x_list_dim];
int floor1_flag[vf->x_list_dim]; int floor1_flag[vf->x_list_dim];
...@@ -1157,7 +1152,7 @@ static uint_fast8_t vorbis_floor1_decode(vorbis_context *vc, ...@@ -1157,7 +1152,7 @@ static uint_fast8_t vorbis_floor1_decode(vorbis_context *vc,
int_fast16_t book; int_fast16_t book;
uint_fast16_t offset; uint_fast16_t offset;
uint_fast16_t i,j; uint_fast16_t i,j;
/*u*/int_fast16_t adx, ady, off, predicted; // WTF ? dy/adx= (unsigned)dy/adx ? /*u*/int_fast16_t adx, ady, off, predicted; // WTF ? dy/adx = (unsigned)dy/adx ?
int_fast16_t dy, err; int_fast16_t dy, err;
...@@ -1166,36 +1161,36 @@ static uint_fast8_t vorbis_floor1_decode(vorbis_context *vc, ...@@ -1166,36 +1161,36 @@ static uint_fast8_t vorbis_floor1_decode(vorbis_context *vc,
// Read values (or differences) for the floor's points // Read values (or differences) for the floor's points
floor1_Y[0]=get_bits(gb, ilog(range-1)); floor1_Y[0] = get_bits(gb, ilog(range - 1));
floor1_Y[1]=get_bits(gb, ilog(range-1)); floor1_Y[1] = get_bits(gb, ilog(range - 1));
AV_DEBUG("floor 0 Y %d floor 1 Y %d \n", floor1_Y[0], floor1_Y[1]); AV_DEBUG("floor 0 Y %d floor 1 Y %d \n", floor1_Y[0], floor1_Y[1]);
offset=2; offset = 2;
for(i=0;i<vf->partitions;++i) { for (i = 0; i < vf->partitions; ++i) {
class_=vf->partition_class[i]; class_ = vf->partition_class[i];
cdim=vf->class_dimensions[class_]; cdim = vf->class_dimensions[class_];
cbits=vf->class_subclasses[class_]; cbits = vf->class_subclasses[class_];
csub=(1<<cbits)-1; csub = (1 << cbits) - 1;
cval=0; cval = 0;
AV_DEBUG("Cbits %d \n", cbits); AV_DEBUG("Cbits %d \n", cbits);
if (cbits) // this reads all subclasses for this partition's class if (cbits) // this reads all subclasses for this partition's class
cval=get_vlc2(gb, vc->codebooks[vf->class_masterbook[class_]].vlc.table, cval = get_vlc2(gb, vc->codebooks[vf->class_masterbook[class_]].vlc.table,
vc->codebooks[vf->class_masterbook[class_]].nb_bits, 3); vc->codebooks[vf->class_masterbook[class_]].nb_bits, 3);
for(j=0;j<cdim;++j) { for (j = 0; j < cdim; ++j) {
book=vf->subclass_books[class_][cval & csub]; book = vf->subclass_books[class_][cval & csub];
AV_DEBUG("book %d Cbits %d cval %d bits:%d \n", book, cbits, cval, get_bits_count(gb)); AV_DEBUG("book %d Cbits %d cval %d bits:%d \n", book, cbits, cval, get_bits_count(gb));
cval=cval>>cbits; cval = cval >> cbits;
if (book>-1) { if (book > -1) {
floor1_Y[offset+j]=get_vlc2(gb, vc->codebooks[book].vlc.table, floor1_Y[offset+j] = get_vlc2(gb, vc->codebooks[book].vlc.table,
vc->codebooks[book].nb_bits, 3); vc->codebooks[book].nb_bits, 3);
} else { } else {
floor1_Y[offset+j]=0; floor1_Y[offset+j] = 0;
} }
AV_DEBUG(" floor(%d) = %d \n", vf->list[offset+j].x, floor1_Y[offset+j]); AV_DEBUG(" floor(%d) = %d \n", vf->list[offset+j].x, floor1_Y[offset+j]);
...@@ -1205,57 +1200,57 @@ static uint_fast8_t vorbis_floor1_decode(vorbis_context *vc, ...@@ -1205,57 +1200,57 @@ static uint_fast8_t vorbis_floor1_decode(vorbis_context *vc,
// Amplitude calculation from the differences // Amplitude calculation from the differences
floor1_flag[0]=1; floor1_flag[0] = 1;
floor1_flag[1]=1; floor1_flag[1] = 1;
floor1_Y_final[0]=floor1_Y[0]; floor1_Y_final[0] = floor1_Y[0];
floor1_Y_final[1]=floor1_Y[1]; floor1_Y_final[1] = floor1_Y[1];
for(i=2;i<vf->x_list_dim;++i) { for (i = 2; i < vf->x_list_dim; ++i) {
uint_fast16_t val, highroom, lowroom, room; uint_fast16_t val, highroom, lowroom, room;
uint_fast16_t high_neigh_offs; uint_fast16_t high_neigh_offs;
uint_fast16_t low_neigh_offs; uint_fast16_t low_neigh_offs;
low_neigh_offs=vf->list[i].low; low_neigh_offs = vf->list[i].low;
high_neigh_offs=vf->list[i].high; high_neigh_offs = vf->list[i].high;
dy=floor1_Y_final[high_neigh_offs]-floor1_Y_final[low_neigh_offs]; // render_point begin dy = floor1_Y_final[high_neigh_offs] - floor1_Y_final[low_neigh_offs]; // render_point begin
adx=vf->list[high_neigh_offs].x-vf->list[low_neigh_offs].x; adx = vf->list[high_neigh_offs].x - vf->list[low_neigh_offs].x;
ady= FFABS(dy); ady = FFABS(dy);
err=ady*(vf->list[i].x-vf->list[low_neigh_offs].x); err = ady * (vf->list[i].x - vf->list[low_neigh_offs].x);
off=(int16_t)err/(int16_t)adx; off = (int16_t)err / (int16_t)adx;
if (dy<0) { if (dy < 0) {
predicted=floor1_Y_final[low_neigh_offs]-off; predicted = floor1_Y_final[low_neigh_offs] - off;
} else { } else {
predicted=floor1_Y_final[low_neigh_offs]+off; predicted = floor1_Y_final[low_neigh_offs] + off;
} // render_point end } // render_point end
val=floor1_Y[i]; val = floor1_Y[i];
highroom=range-predicted; highroom = range-predicted;
lowroom=predicted; lowroom = predicted;
if (highroom < lowroom) { if (highroom < lowroom) {
room=highroom*2; room = highroom * 2;
} else { } else {
room=lowroom*2; // SPEC mispelling room = lowroom * 2; // SPEC mispelling
} }
if (val) { if (val) {
floor1_flag[low_neigh_offs]=1; floor1_flag[low_neigh_offs] = 1;
floor1_flag[high_neigh_offs]=1; floor1_flag[high_neigh_offs] = 1;
floor1_flag[i]=1; floor1_flag[i] = 1;
if (val>=room) { if (val >= room) {
if (highroom > lowroom) { if (highroom > lowroom) {
floor1_Y_final[i]=val-lowroom+predicted; floor1_Y_final[i] = val - lowroom + predicted;
} else { } else {
floor1_Y_final[i]=predicted-val+highroom-1; floor1_Y_final[i] = predicted - val + highroom - 1;
} }
} else { } else {
if (val & 1) { if (val & 1) {
floor1_Y_final[i]=predicted-(val+1)/2; floor1_Y_final[i] = predicted - (val + 1) / 2;
} else { } else {
floor1_Y_final[i]=predicted+val/2; floor1_Y_final[i] = predicted + val / 2;
} }
} }
} else { } else {
floor1_flag[i]=0; floor1_flag[i] = 0;
floor1_Y_final[i]=predicted; floor1_Y_final[i] = predicted;
} }
AV_DEBUG(" Decoded floor(%d) = %d / val %d \n", vf->list[i].x, floor1_Y_final[i], val); AV_DEBUG(" Decoded floor(%d) = %d / val %d \n", vf->list[i].x, floor1_Y_final[i], val);
...@@ -1277,139 +1272,139 @@ static av_always_inline int vorbis_residue_decode_internal(vorbis_context *vc, ...@@ -1277,139 +1272,139 @@ static av_always_inline int vorbis_residue_decode_internal(vorbis_context *vc,
uint_fast8_t ch, uint_fast8_t ch,
uint_fast8_t *do_not_decode, uint_fast8_t *do_not_decode,
float *vec, float *vec,
uint_fast16_t uint_fast16_t vlen,
vlen, int vr_type) int vr_type)
{ {
GetBitContext *gb=&vc->gb; GetBitContext *gb = &vc->gb;
uint_fast8_t c_p_c=vc->codebooks[vr->classbook].dimensions; uint_fast8_t c_p_c = vc->codebooks[vr->classbook].dimensions;
uint_fast16_t n_to_read=vr->end-vr->begin; uint_fast16_t n_to_read = vr->end-vr->begin;
uint_fast16_t ptns_to_read=n_to_read/vr->partition_size; uint_fast16_t ptns_to_read = n_to_read/vr->partition_size;
uint_fast8_t classifs[ptns_to_read*vc->audio_channels]; uint_fast8_t classifs[ptns_to_read*vc->audio_channels];
uint_fast8_t pass; uint_fast8_t pass;
uint_fast8_t ch_used; uint_fast8_t ch_used;
uint_fast8_t i,j,l; uint_fast8_t i,j,l;
uint_fast16_t k; uint_fast16_t k;
if (vr_type==2) { if (vr_type == 2) {
for(j=1;j<ch;++j) for (j = 1; j < ch; ++j)
do_not_decode[0]&=do_not_decode[j]; // FIXME - clobbering input do_not_decode[0] &= do_not_decode[j]; // FIXME - clobbering input
if (do_not_decode[0]) if (do_not_decode[0])
return 0; return 0;
ch_used=1; ch_used = 1;
} else { } else {
ch_used=ch; ch_used = ch;
} }
AV_DEBUG(" residue type 0/1/2 decode begin, ch: %d cpc %d \n", ch, c_p_c); AV_DEBUG(" residue type 0/1/2 decode begin, ch: %d cpc %d \n", ch, c_p_c);
for(pass=0;pass<=vr->maxpass;++pass) { // FIXME OPTIMIZE? for (pass = 0; pass <= vr->maxpass; ++pass) { // FIXME OPTIMIZE?
uint_fast16_t voffset; uint_fast16_t voffset;
uint_fast16_t partition_count; uint_fast16_t partition_count;
uint_fast16_t j_times_ptns_to_read; uint_fast16_t j_times_ptns_to_read;
voffset=vr->begin; voffset = vr->begin;
for(partition_count=0;partition_count<ptns_to_read;) { // SPEC error for (partition_count = 0; partition_count < ptns_to_read;) { // SPEC error
if (!pass) { if (!pass) {
uint_fast32_t inverse_class = ff_inverse[vr->classifications]; uint_fast32_t inverse_class = ff_inverse[vr->classifications];
for(j_times_ptns_to_read=0, j=0;j<ch_used;++j) { for (j_times_ptns_to_read = 0, j = 0; j < ch_used; ++j) {
if (!do_not_decode[j]) { if (!do_not_decode[j]) {
uint_fast32_t temp=get_vlc2(gb, vc->codebooks[vr->classbook].vlc.table, uint_fast32_t temp = get_vlc2(gb, vc->codebooks[vr->classbook].vlc.table,
vc->codebooks[vr->classbook].nb_bits, 3); vc->codebooks[vr->classbook].nb_bits, 3);
AV_DEBUG("Classword: %d \n", temp); AV_DEBUG("Classword: %d \n", temp);
assert(vr->classifications > 1 && temp<=65536); //needed for inverse[] assert(vr->classifications > 1 && temp <= 65536); //needed for inverse[]
for(i=0;i<c_p_c;++i) { for (i = 0; i < c_p_c; ++i) {
uint_fast32_t temp2; uint_fast32_t temp2;
temp2=(((uint_fast64_t)temp) * inverse_class)>>32; temp2 = (((uint_fast64_t)temp) * inverse_class) >> 32;
if (partition_count+c_p_c-1-i < ptns_to_read) if (partition_count + c_p_c - 1 - i < ptns_to_read)
classifs[j_times_ptns_to_read+partition_count+c_p_c-1-i]=temp-temp2*vr->classifications; classifs[j_times_ptns_to_read + partition_count + c_p_c - 1 - i] = temp - temp2 * vr->classifications;
temp=temp2; temp = temp2;
} }
} }
j_times_ptns_to_read+=ptns_to_read; j_times_ptns_to_read += ptns_to_read;
} }
} }
for(i=0;(i<c_p_c) && (partition_count<ptns_to_read);++i) { for (i = 0; (i < c_p_c) && (partition_count < ptns_to_read); ++i) {
for(j_times_ptns_to_read=0, j=0;j<ch_used;++j) { for (j_times_ptns_to_read = 0, j = 0; j < ch_used; ++j) {
uint_fast16_t voffs; uint_fast16_t voffs;
if (!do_not_decode[j]) { if (!do_not_decode[j]) {
uint_fast8_t vqclass=classifs[j_times_ptns_to_read+partition_count]; uint_fast8_t vqclass = classifs[j_times_ptns_to_read+partition_count];
int_fast16_t vqbook=vr->books[vqclass][pass]; int_fast16_t vqbook = vr->books[vqclass][pass];
if (vqbook>=0 && vc->codebooks[vqbook].codevectors) { if (vqbook >= 0 && vc->codebooks[vqbook].codevectors) {
uint_fast16_t coffs; uint_fast16_t coffs;
unsigned dim= vc->codebooks[vqbook].dimensions; // not uint_fast8_t: 64bit is slower here on amd64 unsigned dim = vc->codebooks[vqbook].dimensions; // not uint_fast8_t: 64bit is slower here on amd64
uint_fast16_t step= dim==1 ? vr->partition_size uint_fast16_t step = dim == 1 ? vr->partition_size
: FASTDIV(vr->partition_size, dim); : FASTDIV(vr->partition_size, dim);
vorbis_codebook codebook= vc->codebooks[vqbook]; vorbis_codebook codebook = vc->codebooks[vqbook];
if (vr_type==0) { if (vr_type == 0) {
voffs=voffset+j*vlen; voffs = voffset+j*vlen;
for(k=0;k<step;++k) { for (k = 0; k < step; ++k) {
coffs=get_vlc2(gb, codebook.vlc.table, codebook.nb_bits, 3) * dim; coffs = get_vlc2(gb, codebook.vlc.table, codebook.nb_bits, 3) * dim;
for(l=0;l<dim;++l) for (l = 0; l < dim; ++l)
vec[voffs+k+l*step]+=codebook.codevectors[coffs+l]; // FPMATH vec[voffs + k + l * step] += codebook.codevectors[coffs + l]; // FPMATH
} }
} else if (vr_type==1) { } else if (vr_type == 1) {
voffs=voffset+j*vlen; voffs = voffset + j * vlen;
for(k=0;k<step;++k) { for (k = 0; k < step; ++k) {
coffs=get_vlc2(gb, codebook.vlc.table, codebook.nb_bits, 3) * dim; coffs = get_vlc2(gb, codebook.vlc.table, codebook.nb_bits, 3) * dim;
for(l=0;l<dim;++l, ++voffs) { for (l = 0; l < dim; ++l, ++voffs) {
vec[voffs]+=codebook.codevectors[coffs+l]; // FPMATH vec[voffs]+=codebook.codevectors[coffs+l]; // FPMATH
AV_DEBUG(" pass %d offs: %d curr: %f change: %f cv offs.: %d \n", pass, voffs, vec[voffs], codebook.codevectors[coffs+l], coffs); AV_DEBUG(" pass %d offs: %d curr: %f change: %f cv offs.: %d \n", pass, voffs, vec[voffs], codebook.codevectors[coffs+l], coffs);
} }
} }
} else if (vr_type==2 && ch==2 && (voffset&1)==0 && (dim&1)==0) { // most frequent case optimized } else if (vr_type == 2 && ch == 2 && (voffset & 1) == 0 && (dim & 1) == 0) { // most frequent case optimized
voffs=voffset>>1; voffs = voffset >> 1;
if(dim==2) { if (dim == 2) {
for(k=0;k<step;++k) { for (k = 0; k < step; ++k) {
coffs=get_vlc2(gb, codebook.vlc.table, codebook.nb_bits, 3) * 2; coffs = get_vlc2(gb, codebook.vlc.table, codebook.nb_bits, 3) * 2;
vec[voffs+k ]+=codebook.codevectors[coffs ]; // FPMATH vec[voffs + k ] += codebook.codevectors[coffs ]; // FPMATH
vec[voffs+k+vlen]+=codebook.codevectors[coffs+1]; // FPMATH vec[voffs + k + vlen] += codebook.codevectors[coffs + 1]; // FPMATH
} }
} else if(dim==4) { } else if (dim == 4) {
for(k=0;k<step;++k, voffs+=2) { for (k = 0; k < step; ++k, voffs += 2) {
coffs=get_vlc2(gb, codebook.vlc.table, codebook.nb_bits, 3) * 4; coffs = get_vlc2(gb, codebook.vlc.table, codebook.nb_bits, 3) * 4;
vec[voffs ]+=codebook.codevectors[coffs ]; // FPMATH vec[voffs ] += codebook.codevectors[coffs ]; // FPMATH
vec[voffs+1 ]+=codebook.codevectors[coffs+2]; // FPMATH vec[voffs + 1 ] += codebook.codevectors[coffs + 2]; // FPMATH
vec[voffs+vlen ]+=codebook.codevectors[coffs+1]; // FPMATH vec[voffs + vlen ] += codebook.codevectors[coffs + 1]; // FPMATH
vec[voffs+vlen+1]+=codebook.codevectors[coffs+3]; // FPMATH vec[voffs + vlen + 1] += codebook.codevectors[coffs + 3]; // FPMATH
} }
} else } else
for(k=0;k<step;++k) { for (k = 0; k < step; ++k) {
coffs=get_vlc2(gb, codebook.vlc.table, codebook.nb_bits, 3) * dim; coffs = get_vlc2(gb, codebook.vlc.table, codebook.nb_bits, 3) * dim;
for(l=0;l<dim;l+=2, voffs++) { for (l = 0; l < dim; l += 2, voffs++) {
vec[voffs ]+=codebook.codevectors[coffs+l ]; // FPMATH vec[voffs ] += codebook.codevectors[coffs + l ]; // FPMATH
vec[voffs+vlen]+=codebook.codevectors[coffs+l+1]; // FPMATH vec[voffs + vlen] += codebook.codevectors[coffs + l + 1]; // FPMATH
AV_DEBUG(" pass %d offs: %d curr: %f change: %f cv offs.: %d+%d \n", pass, voffset/ch+(voffs%ch)*vlen, vec[voffset/ch+(voffs%ch)*vlen], codebook.codevectors[coffs+l], coffs, l); AV_DEBUG(" pass %d offs: %d curr: %f change: %f cv offs.: %d+%d \n", pass, voffset / ch + (voffs % ch) * vlen, vec[voffset / ch + (voffs % ch) * vlen], codebook.codevectors[coffs + l], coffs, l);
} }
} }
} else if (vr_type==2) { } else if (vr_type == 2) {
voffs=voffset; voffs = voffset;
for(k=0;k<step;++k) { for (k = 0; k < step; ++k) {
coffs=get_vlc2(gb, codebook.vlc.table, codebook.nb_bits, 3) * dim; coffs = get_vlc2(gb, codebook.vlc.table, codebook.nb_bits, 3) * dim;
for(l=0;l<dim;++l, ++voffs) { for (l = 0; l < dim; ++l, ++voffs) {
vec[voffs/ch+(voffs%ch)*vlen]+=codebook.codevectors[coffs+l]; // FPMATH FIXME use if and counter instead of / and % vec[voffs / ch + (voffs % ch) * vlen] += codebook.codevectors[coffs + l]; // FPMATH FIXME use if and counter instead of / and %
AV_DEBUG(" pass %d offs: %d curr: %f change: %f cv offs.: %d+%d \n", pass, voffset/ch+(voffs%ch)*vlen, vec[voffset/ch+(voffs%ch)*vlen], codebook.codevectors[coffs+l], coffs, l); AV_DEBUG(" pass %d offs: %d curr: %f change: %f cv offs.: %d+%d \n", pass, voffset / ch + (voffs % ch) * vlen, vec[voffset / ch + (voffs % ch) * vlen], codebook.codevectors[coffs + l], coffs, l);
} }
} }
} }
} }
} }
j_times_ptns_to_read+=ptns_to_read; j_times_ptns_to_read += ptns_to_read;
} }
++partition_count; ++partition_count;
voffset+=vr->partition_size; voffset += vr->partition_size;
} }
} }
} }
...@@ -1421,11 +1416,11 @@ static inline int vorbis_residue_decode(vorbis_context *vc, vorbis_residue *vr, ...@@ -1421,11 +1416,11 @@ static inline int vorbis_residue_decode(vorbis_context *vc, vorbis_residue *vr,
uint_fast8_t *do_not_decode, uint_fast8_t *do_not_decode,
float *vec, uint_fast16_t vlen) float *vec, uint_fast16_t vlen)
{ {
if (vr->type==2) if (vr->type == 2)
return vorbis_residue_decode_internal(vc, vr, ch, do_not_decode, vec, vlen, 2); return vorbis_residue_decode_internal(vc, vr, ch, do_not_decode, vec, vlen, 2);
else if (vr->type==1) else if (vr->type == 1)
return vorbis_residue_decode_internal(vc, vr, ch, do_not_decode, vec, vlen, 1); return vorbis_residue_decode_internal(vc, vr, ch, do_not_decode, vec, vlen, 1);
else if (vr->type==0) else if (vr->type == 0)
return vorbis_residue_decode_internal(vc, vr, ch, do_not_decode, vec, vlen, 0); return vorbis_residue_decode_internal(vc, vr, ch, do_not_decode, vec, vlen, 0);
else { else {
av_log(vc->avccontext, AV_LOG_ERROR, " Invalid residue type while residue decode?! \n"); av_log(vc->avccontext, AV_LOG_ERROR, " Invalid residue type while residue decode?! \n");
...@@ -1436,22 +1431,22 @@ static inline int vorbis_residue_decode(vorbis_context *vc, vorbis_residue *vr, ...@@ -1436,22 +1431,22 @@ static inline int vorbis_residue_decode(vorbis_context *vc, vorbis_residue *vr,
void vorbis_inverse_coupling(float *mag, float *ang, int blocksize) void vorbis_inverse_coupling(float *mag, float *ang, int blocksize)
{ {
int i; int i;
for(i=0; i<blocksize; i++) { for (i = 0; i < blocksize; i++) {
if (mag[i]>0.0) { if (mag[i] > 0.0) {
if (ang[i]>0.0) { if (ang[i] > 0.0) {
ang[i]=mag[i]-ang[i]; ang[i] = mag[i] - ang[i];
} else { } else {
float temp=ang[i]; float temp = ang[i];
ang[i]=mag[i]; ang[i] = mag[i];
mag[i]+=temp; mag[i] += temp;
} }
} else { } else {
if (ang[i]>0.0) { if (ang[i] > 0.0) {
ang[i]+=mag[i]; ang[i] += mag[i];
} else { } else {
float temp=ang[i]; float temp = ang[i];
ang[i]=mag[i]; ang[i] = mag[i];
mag[i]-=temp; mag[i] -= temp;
} }
} }
} }
...@@ -1461,10 +1456,10 @@ static void copy_normalize(float *dst, float *src, int len, int exp_bias, ...@@ -1461,10 +1456,10 @@ static void copy_normalize(float *dst, float *src, int len, int exp_bias,
float add_bias) float add_bias)
{ {
int i; int i;
if(exp_bias) { if (exp_bias) {
memcpy(dst, src, len * sizeof(float)); memcpy(dst, src, len * sizeof(float));
} else { } else {
for(i=0; i<len; i++) for (i = 0; i < len; i++)
dst[i] = src[i] + add_bias; dst[i] = src[i] + add_bias;
} }
} }
...@@ -1473,9 +1468,9 @@ static void copy_normalize(float *dst, float *src, int len, int exp_bias, ...@@ -1473,9 +1468,9 @@ static void copy_normalize(float *dst, float *src, int len, int exp_bias,
static int vorbis_parse_audio_packet(vorbis_context *vc) static int vorbis_parse_audio_packet(vorbis_context *vc)
{ {
GetBitContext *gb=&vc->gb; GetBitContext *gb = &vc->gb;
uint_fast8_t previous_window=vc->previous_window; uint_fast8_t previous_window = vc->previous_window;
uint_fast8_t mode_number; uint_fast8_t mode_number;
uint_fast8_t blockflag; uint_fast8_t blockflag;
uint_fast16_t blocksize; uint_fast16_t blocksize;
...@@ -1483,11 +1478,11 @@ static int vorbis_parse_audio_packet(vorbis_context *vc) ...@@ -1483,11 +1478,11 @@ static int vorbis_parse_audio_packet(vorbis_context *vc)
uint_fast8_t no_residue[vc->audio_channels]; uint_fast8_t no_residue[vc->audio_channels];
uint_fast8_t do_not_decode[vc->audio_channels]; uint_fast8_t do_not_decode[vc->audio_channels];
vorbis_mapping *mapping; vorbis_mapping *mapping;
float *ch_res_ptr=vc->channel_residues; float *ch_res_ptr = vc->channel_residues;
float *ch_floor_ptr=vc->channel_floors; float *ch_floor_ptr = vc->channel_floors;
uint_fast8_t res_chan[vc->audio_channels]; uint_fast8_t res_chan[vc->audio_channels];
uint_fast8_t res_num=0; uint_fast8_t res_num = 0;
int_fast16_t retlen=0; int_fast16_t retlen = 0;
float fadd_bias = vc->add_bias; float fadd_bias = vc->add_bias;
if (get_bits1(gb)) { if (get_bits1(gb)) {
...@@ -1495,116 +1490,116 @@ static int vorbis_parse_audio_packet(vorbis_context *vc) ...@@ -1495,116 +1490,116 @@ static int vorbis_parse_audio_packet(vorbis_context *vc)
return -1; // packet type not audio return -1; // packet type not audio
} }
if (vc->mode_count==1) { if (vc->mode_count == 1) {
mode_number=0; mode_number = 0;
} else { } else {
mode_number=get_bits(gb, ilog(vc->mode_count-1)); mode_number = get_bits(gb, ilog(vc->mode_count-1));
} }
if (mode_number>=vc->mode_count) { if (mode_number >= vc->mode_count) {
av_log(vc->avccontext, AV_LOG_ERROR, "mode number %d out of range.\n", mode_number); av_log(vc->avccontext, AV_LOG_ERROR, "mode number %d out of range.\n", mode_number);
return -1; return -1;
} }
vc->mode_number=mode_number; vc->mode_number = mode_number;
mapping=&vc->mappings[vc->modes[mode_number].mapping]; mapping = &vc->mappings[vc->modes[mode_number].mapping];
AV_DEBUG(" Mode number: %d , mapping: %d , blocktype %d \n", mode_number, vc->modes[mode_number].mapping, vc->modes[mode_number].blockflag); AV_DEBUG(" Mode number: %d , mapping: %d , blocktype %d \n", mode_number, vc->modes[mode_number].mapping, vc->modes[mode_number].blockflag);
blockflag=vc->modes[mode_number].blockflag; blockflag = vc->modes[mode_number].blockflag;
blocksize=vc->blocksize[blockflag]; blocksize = vc->blocksize[blockflag];
if (blockflag) if (blockflag)
skip_bits(gb, 2); // previous_window, next_window skip_bits(gb, 2); // previous_window, next_window
memset(ch_res_ptr, 0, sizeof(float)*vc->audio_channels*blocksize/2); //FIXME can this be removed ? memset(ch_res_ptr, 0, sizeof(float) * vc->audio_channels * blocksize / 2); //FIXME can this be removed ?
memset(ch_floor_ptr, 0, sizeof(float)*vc->audio_channels*blocksize/2); //FIXME can this be removed ? memset(ch_floor_ptr, 0, sizeof(float) * vc->audio_channels * blocksize / 2); //FIXME can this be removed ?
// Decode floor // Decode floor
for(i=0;i<vc->audio_channels;++i) { for (i = 0; i < vc->audio_channels; ++i) {
vorbis_floor *floor; vorbis_floor *floor;
if (mapping->submaps>1) { if (mapping->submaps > 1) {
floor=&vc->floors[mapping->submap_floor[mapping->mux[i]]]; floor = &vc->floors[mapping->submap_floor[mapping->mux[i]]];
} else { } else {
floor=&vc->floors[mapping->submap_floor[0]]; floor = &vc->floors[mapping->submap_floor[0]];
} }
no_residue[i]=floor->decode(vc, &floor->data, ch_floor_ptr); no_residue[i] = floor->decode(vc, &floor->data, ch_floor_ptr);
ch_floor_ptr+=blocksize/2; ch_floor_ptr += blocksize / 2;
} }
// Nonzero vector propagate // Nonzero vector propagate
for(i=mapping->coupling_steps-1;i>=0;--i) { for (i = mapping->coupling_steps - 1; i >= 0; --i) {
if (!(no_residue[mapping->magnitude[i]] & no_residue[mapping->angle[i]])) { if (!(no_residue[mapping->magnitude[i]] & no_residue[mapping->angle[i]])) {
no_residue[mapping->magnitude[i]]=0; no_residue[mapping->magnitude[i]] = 0;
no_residue[mapping->angle[i]]=0; no_residue[mapping->angle[i]] = 0;
} }
} }
// Decode residue // Decode residue
for(i=0;i<mapping->submaps;++i) { for (i = 0; i < mapping->submaps; ++i) {
vorbis_residue *residue; vorbis_residue *residue;
uint_fast8_t ch=0; uint_fast8_t ch = 0;
for(j=0;j<vc->audio_channels;++j) { for (j = 0; j < vc->audio_channels; ++j) {
if ((mapping->submaps==1) || (i==mapping->mux[j])) { if ((mapping->submaps == 1) || (i == mapping->mux[j])) {
res_chan[j]=res_num; res_chan[j] = res_num;
if (no_residue[j]) { if (no_residue[j]) {
do_not_decode[ch]=1; do_not_decode[ch] = 1;
} else { } else {
do_not_decode[ch]=0; do_not_decode[ch] = 0;
} }
++ch; ++ch;
++res_num; ++res_num;
} }
} }
residue=&vc->residues[mapping->submap_residue[i]]; residue = &vc->residues[mapping->submap_residue[i]];
vorbis_residue_decode(vc, residue, ch, do_not_decode, ch_res_ptr, blocksize/2); vorbis_residue_decode(vc, residue, ch, do_not_decode, ch_res_ptr, blocksize/2);
ch_res_ptr+=ch*blocksize/2; ch_res_ptr += ch * blocksize / 2;
} }
// Inverse coupling // Inverse coupling
for(i=mapping->coupling_steps-1;i>=0;--i) { //warning: i has to be signed for (i = mapping->coupling_steps - 1; i >= 0; --i) { //warning: i has to be signed
float *mag, *ang; float *mag, *ang;
mag=vc->channel_residues+res_chan[mapping->magnitude[i]]*blocksize/2; mag = vc->channel_residues+res_chan[mapping->magnitude[i]] * blocksize / 2;
ang=vc->channel_residues+res_chan[mapping->angle[i]]*blocksize/2; ang = vc->channel_residues+res_chan[mapping->angle[i]] * blocksize / 2;
vc->dsp.vorbis_inverse_coupling(mag, ang, blocksize/2); vc->dsp.vorbis_inverse_coupling(mag, ang, blocksize / 2);
} }
// Dotproduct, MDCT // Dotproduct, MDCT
for(j=vc->audio_channels-1;j>=0;j--) { for (j = vc->audio_channels-1;j >= 0; j--) {
ch_floor_ptr=vc->channel_floors+j*blocksize/2; ch_floor_ptr = vc->channel_floors + j * blocksize / 2;
ch_res_ptr=vc->channel_residues+res_chan[j]*blocksize/2; ch_res_ptr = vc->channel_residues + res_chan[j] * blocksize / 2;
vc->dsp.vector_fmul(ch_floor_ptr, ch_res_ptr, blocksize/2); vc->dsp.vector_fmul(ch_floor_ptr, ch_res_ptr, blocksize / 2);
ff_imdct_half(&vc->mdct[blockflag], ch_res_ptr, ch_floor_ptr); ff_imdct_half(&vc->mdct[blockflag], ch_res_ptr, ch_floor_ptr);
} }
// Overlap/add, save data for next overlapping FPMATH // Overlap/add, save data for next overlapping FPMATH
retlen = (blocksize + vc->blocksize[previous_window])/4; retlen = (blocksize + vc->blocksize[previous_window]) / 4;
for(j=0;j<vc->audio_channels;j++) { for (j = 0; j < vc->audio_channels; j++) {
uint_fast16_t bs0=vc->blocksize[0]; uint_fast16_t bs0 = vc->blocksize[0];
uint_fast16_t bs1=vc->blocksize[1]; uint_fast16_t bs1 = vc->blocksize[1];
float *residue=vc->channel_residues+res_chan[j]*blocksize/2; float *residue = vc->channel_residues + res_chan[j] * blocksize / 2;
float *saved=vc->saved+j*bs1/4; float *saved = vc->saved + j * bs1 / 4;
float *ret=vc->channel_floors+j*retlen; float *ret = vc->channel_floors + j * retlen;
float *buf=residue; float *buf = residue;
const float *win=vc->win[blockflag&previous_window]; const float *win = vc->win[blockflag & previous_window];
if(blockflag == previous_window) { if (blockflag == previous_window) {
vc->dsp.vector_fmul_window(ret, saved, buf, win, fadd_bias, blocksize/4); vc->dsp.vector_fmul_window(ret, saved, buf, win, fadd_bias, blocksize / 4);
} else if(blockflag > previous_window) { } else if (blockflag > previous_window) {
vc->dsp.vector_fmul_window(ret, saved, buf, win, fadd_bias, bs0/4); vc->dsp.vector_fmul_window(ret, saved, buf, win, fadd_bias, bs0 / 4);
copy_normalize(ret+bs0/2, buf+bs0/4, (bs1-bs0)/4, vc->exp_bias, fadd_bias); copy_normalize(ret+bs0/2, buf+bs0/4, (bs1-bs0)/4, vc->exp_bias, fadd_bias);
} else { } else {
copy_normalize(ret, saved, (bs1-bs0)/4, vc->exp_bias, fadd_bias); copy_normalize(ret, saved, (bs1 - bs0) / 4, vc->exp_bias, fadd_bias);
vc->dsp.vector_fmul_window(ret+(bs1-bs0)/4, saved+(bs1-bs0)/4, buf, win, fadd_bias, bs0/4); vc->dsp.vector_fmul_window(ret + (bs1 - bs0) / 4, saved + (bs1 - bs0) / 4, buf, win, fadd_bias, bs0 / 4);
} }
memcpy(saved, buf+blocksize/4, blocksize/4*sizeof(float)); memcpy(saved, buf + blocksize / 4, blocksize / 4 * sizeof(float));
} }
vc->previous_window = blockflag; vc->previous_window = blockflag;
...@@ -1626,32 +1621,32 @@ static int vorbis_decode_frame(AVCodecContext *avccontext, ...@@ -1626,32 +1621,32 @@ static int vorbis_decode_frame(AVCodecContext *avccontext,
int_fast16_t len; int_fast16_t len;
if(!buf_size) if (!buf_size)
return 0; return 0;
AV_DEBUG("packet length %d \n", buf_size); AV_DEBUG("packet length %d \n", buf_size);
init_get_bits(gb, buf, buf_size*8); init_get_bits(gb, buf, buf_size*8);
len=vorbis_parse_audio_packet(vc); len = vorbis_parse_audio_packet(vc);
if (len<=0) { if (len <= 0) {
*data_size=0; *data_size = 0;
return buf_size; return buf_size;
} }
if (!vc->first_frame) { if (!vc->first_frame) {
vc->first_frame=1; vc->first_frame = 1;
*data_size=0; *data_size = 0;
return buf_size ; return buf_size ;
} }
AV_DEBUG("parsed %d bytes %d bits, returned %d samples (*ch*bits) \n", get_bits_count(gb)/8, get_bits_count(gb)%8, len); AV_DEBUG("parsed %d bytes %d bits, returned %d samples (*ch*bits) \n", get_bits_count(gb)/8, get_bits_count(gb)%8, len);
for(i=0; i<vc->audio_channels; i++) for (i = 0; i < vc->audio_channels; i++)
channel_ptrs[i] = vc->channel_floors+i*len; channel_ptrs[i] = vc->channel_floors + i * len;
vc->dsp.float_to_int16_interleave(data, channel_ptrs, len, vc->audio_channels); vc->dsp.float_to_int16_interleave(data, channel_ptrs, len, vc->audio_channels);
*data_size=len*2*vc->audio_channels; *data_size = len * 2 * vc->audio_channels;
return buf_size ; return buf_size ;
} }
......
libavcodec/vorbis_enc.c
View file @ a7adcf29
...@@ -38,34 +38,34 @@ ...@@ -38,34 +38,34 @@
typedef struct { typedef struct {
int nentries; int nentries;
uint8_t * lens; uint8_t *lens;
uint32_t * codewords; uint32_t *codewords;
int ndimentions; int ndimentions;
float min; float min;
float delta; float delta;
int seq_p; int seq_p;
int lookup; int lookup;
int * quantlist; int *quantlist;
float * dimentions; float *dimentions;
float * pow2; float *pow2;
} vorbis_enc_codebook; } vorbis_enc_codebook;
typedef struct { typedef struct {
int dim; int dim;
int subclass; int subclass;
int masterbook; int masterbook;
int * books; int *books;
} vorbis_enc_floor_class; } vorbis_enc_floor_class;
typedef struct { typedef struct {
int partitions; int partitions;
int * partition_to_class; int *partition_to_class;
int nclasses; int nclasses;
vorbis_enc_floor_class * classes; vorbis_enc_floor_class *classes;
int multiplier; int multiplier;
int rangebits; int rangebits;
int values; int values;
vorbis_floor1_entry * list; vorbis_floor1_entry *list;
} vorbis_enc_floor; } vorbis_enc_floor;
typedef struct { typedef struct {
...@@ -81,12 +81,12 @@ typedef struct { ...@@ -81,12 +81,12 @@ typedef struct {
typedef struct { typedef struct {
int submaps; int submaps;
int * mux; int *mux;
int * floor; int *floor;
int * residue; int *residue;
int coupling_steps; int coupling_steps;
int * magnitude; int *magnitude;
int * angle; int *angle;
} vorbis_enc_mapping; } vorbis_enc_mapping;
typedef struct { typedef struct {
...@@ -99,33 +99,33 @@ typedef struct { ...@@ -99,33 +99,33 @@ typedef struct {
int sample_rate; int sample_rate;
int log2_blocksize[2]; int log2_blocksize[2];
FFTContext mdct[2]; FFTContext mdct[2];
const float * win[2]; const float *win[2];
int have_saved; int have_saved;
float * saved; float *saved;
float * samples; float *samples;
float * floor; // also used for tmp values for mdct float *floor; // also used for tmp values for mdct
float * coeffs; // also used for residue after floor float *coeffs; // also used for residue after floor
float quality; float quality;
int ncodebooks; int ncodebooks;
vorbis_enc_codebook * codebooks; vorbis_enc_codebook *codebooks;
int nfloors; int nfloors;
vorbis_enc_floor * floors; vorbis_enc_floor *floors;
int nresidues; int nresidues;
vorbis_enc_residue * residues; vorbis_enc_residue *residues;
int nmappings; int nmappings;
vorbis_enc_mapping * mappings; vorbis_enc_mapping *mappings;
int nmodes; int nmodes;
vorbis_enc_mode * modes; vorbis_enc_mode *modes;
int64_t sample_count; int64_t sample_count;
} vorbis_enc_context; } vorbis_enc_context;
static inline void put_codeword(PutBitContext * pb, vorbis_enc_codebook * cb, static inline void put_codeword(PutBitContext *pb, vorbis_enc_codebook *cb,
int entry) int entry)
{ {
assert(entry >= 0); assert(entry >= 0);
...@@ -139,19 +139,19 @@ static int cb_lookup_vals(int lookup, int dimentions, int entries) ...@@ -139,19 +139,19 @@ static int cb_lookup_vals(int lookup, int dimentions, int entries)
if (lookup == 1) if (lookup == 1)
return ff_vorbis_nth_root(entries, dimentions); return ff_vorbis_nth_root(entries, dimentions);
else if (lookup == 2) else if (lookup == 2)
return dimentions * entries; return dimentions *entries;
return 0; return 0;
} }
static void ready_codebook(vorbis_enc_codebook * cb) static void ready_codebook(vorbis_enc_codebook *cb)
{ {
int i; int i;
ff_vorbis_len2vlc(cb->lens, cb->codewords, cb->nentries); ff_vorbis_len2vlc(cb->lens, cb->codewords, cb->nentries);
if (!cb->lookup) if (!cb->lookup) {
cb->pow2 = cb->dimentions = NULL; cb->pow2 = cb->dimentions = NULL;
else { } else {
int vals = cb_lookup_vals(cb->lookup, cb->ndimentions, cb->nentries); int vals = cb_lookup_vals(cb->lookup, cb->ndimentions, cb->nentries);
cb->dimentions = av_malloc(sizeof(float) * cb->nentries * cb->ndimentions); cb->dimentions = av_malloc(sizeof(float) * cb->nentries * cb->ndimentions);
cb->pow2 = av_mallocz(sizeof(float) * cb->nentries); cb->pow2 = av_mallocz(sizeof(float) * cb->nentries);
...@@ -169,7 +169,7 @@ static void ready_codebook(vorbis_enc_codebook * cb) ...@@ -169,7 +169,7 @@ static void ready_codebook(vorbis_enc_codebook * cb)
cb->dimentions[i * cb->ndimentions + j] = last + cb->min + cb->quantlist[off] * cb->delta; cb->dimentions[i * cb->ndimentions + j] = last + cb->min + cb->quantlist[off] * cb->delta;
if (cb->seq_p) if (cb->seq_p)
last = cb->dimentions[i * cb->ndimentions + j]; last = cb->dimentions[i * cb->ndimentions + j];
cb->pow2[i] += cb->dimentions[i * cb->ndimentions + j]*cb->dimentions[i * cb->ndimentions + j]; cb->pow2[i] += cb->dimentions[i * cb->ndimentions + j] * cb->dimentions[i * cb->ndimentions + j];
div *= vals; div *= vals;
} }
cb->pow2[i] /= 2.; cb->pow2[i] /= 2.;
...@@ -177,7 +177,7 @@ static void ready_codebook(vorbis_enc_codebook * cb) ...@@ -177,7 +177,7 @@ static void ready_codebook(vorbis_enc_codebook * cb)
} }
} }
static void ready_residue(vorbis_enc_residue * rc, vorbis_enc_context * venc) static void ready_residue(vorbis_enc_residue *rc, vorbis_enc_context *venc)
{ {
int i; int i;
assert(rc->type == 2); assert(rc->type == 2);
...@@ -188,8 +188,8 @@ static void ready_residue(vorbis_enc_residue * rc, vorbis_enc_context * venc) ...@@ -188,8 +188,8 @@ static void ready_residue(vorbis_enc_residue * rc, vorbis_enc_context * venc)
for (j = 0; j < 8; j++) for (j = 0; j < 8; j++)
if (rc->books[i][j] != -1) if (rc->books[i][j] != -1)
break; break;
if (j == 8) if (j == 8) // zero
continue; // zero continue;
cb = &venc->codebooks[rc->books[i][j]]; cb = &venc->codebooks[rc->books[i][j]];
assert(cb->ndimentions >= 2); assert(cb->ndimentions >= 2);
assert(cb->lookup); assert(cb->lookup);
...@@ -213,12 +213,12 @@ static void ready_residue(vorbis_enc_residue * rc, vorbis_enc_context * venc) ...@@ -213,12 +213,12 @@ static void ready_residue(vorbis_enc_residue * rc, vorbis_enc_context * venc)
} }
} }
static void create_vorbis_context(vorbis_enc_context * venc, static void create_vorbis_context(vorbis_enc_context *venc,
AVCodecContext * avccontext) AVCodecContext *avccontext)
{ {
vorbis_enc_floor * fc; vorbis_enc_floor *fc;
vorbis_enc_residue * rc; vorbis_enc_residue *rc;
vorbis_enc_mapping * mc; vorbis_enc_mapping *mc;
int i, book; int i, book;
venc->channels = avccontext->channels; venc->channels = avccontext->channels;
...@@ -232,7 +232,7 @@ static void create_vorbis_context(vorbis_enc_context * venc, ...@@ -232,7 +232,7 @@ static void create_vorbis_context(vorbis_enc_context * venc,
// codebook 15 residue masterbook // codebook 15 residue masterbook
// codebook 16..29 residue // codebook 16..29 residue
for (book = 0; book < venc->ncodebooks; book++) { for (book = 0; book < venc->ncodebooks; book++) {
vorbis_enc_codebook * cb = &venc->codebooks[book]; vorbis_enc_codebook *cb = &venc->codebooks[book];
int vals; int vals;
cb->ndimentions = cvectors[book].dim; cb->ndimentions = cvectors[book].dim;
cb->nentries = cvectors[book].real_len; cb->nentries = cvectors[book].real_len;
...@@ -266,7 +266,7 @@ static void create_vorbis_context(vorbis_enc_context * venc, ...@@ -266,7 +266,7 @@ static void create_vorbis_context(vorbis_enc_context * venc,
fc->partition_to_class = av_malloc(sizeof(int) * fc->partitions); fc->partition_to_class = av_malloc(sizeof(int) * fc->partitions);
fc->nclasses = 0; fc->nclasses = 0;
for (i = 0; i < fc->partitions; i++) { for (i = 0; i < fc->partitions; i++) {
static const int a[] = {0,1,2,2,3,3,4,4}; static const int a[] = {0, 1, 2, 2, 3, 3, 4, 4};
fc->partition_to_class[i] = a[i]; fc->partition_to_class[i] = a[i];
fc->nclasses = FFMAX(fc->nclasses, fc->partition_to_class[i]); fc->nclasses = FFMAX(fc->nclasses, fc->partition_to_class[i]);
} }
...@@ -375,7 +375,7 @@ static void create_vorbis_context(vorbis_enc_context * venc, ...@@ -375,7 +375,7 @@ static void create_vorbis_context(vorbis_enc_context * venc,
ff_mdct_init(&venc->mdct[1], venc->log2_blocksize[1], 0, 1.0); ff_mdct_init(&venc->mdct[1], venc->log2_blocksize[1], 0, 1.0);
} }
static void put_float(PutBitContext * pb, float f) static void put_float(PutBitContext *pb, float f)
{ {
int exp, mant; int exp, mant;
uint32_t res = 0; uint32_t res = 0;
...@@ -389,7 +389,7 @@ static void put_float(PutBitContext * pb, float f) ...@@ -389,7 +389,7 @@ static void put_float(PutBitContext * pb, float f)
put_bits(pb, 32, res); put_bits(pb, 32, res);
} }
static void put_codebook_header(PutBitContext * pb, vorbis_enc_codebook * cb) static void put_codebook_header(PutBitContext *pb, vorbis_enc_codebook *cb)
{ {
int i; int i;
int ordered = 0; int ordered = 0;
...@@ -454,7 +454,7 @@ static void put_codebook_header(PutBitContext * pb, vorbis_enc_codebook * cb) ...@@ -454,7 +454,7 @@ static void put_codebook_header(PutBitContext * pb, vorbis_enc_codebook * cb)
} }
} }
static void put_floor_header(PutBitContext * pb, vorbis_enc_floor * fc) static void put_floor_header(PutBitContext *pb, vorbis_enc_floor *fc)
{ {
int i; int i;
...@@ -487,7 +487,7 @@ static void put_floor_header(PutBitContext * pb, vorbis_enc_floor * fc) ...@@ -487,7 +487,7 @@ static void put_floor_header(PutBitContext * pb, vorbis_enc_floor * fc)
put_bits(pb, fc->rangebits, fc->list[i].x); put_bits(pb, fc->rangebits, fc->list[i].x);
} }
static void put_residue_header(PutBitContext * pb, vorbis_enc_residue * rc) static void put_residue_header(PutBitContext *pb, vorbis_enc_residue *rc)
{ {
int i; int i;
...@@ -519,11 +519,11 @@ static void put_residue_header(PutBitContext * pb, vorbis_enc_residue * rc) ...@@ -519,11 +519,11 @@ static void put_residue_header(PutBitContext * pb, vorbis_enc_residue * rc)
} }
} }
static int put_main_header(vorbis_enc_context * venc, uint8_t ** out) static int put_main_header(vorbis_enc_context *venc, uint8_t **out)
{ {
int i; int i;
PutBitContext pb; PutBitContext pb;
uint8_t buffer[50000] = {0}, * p = buffer; uint8_t buffer[50000] = {0}, *p = buffer;
int buffer_len = sizeof buffer; int buffer_len = sizeof buffer;
int len, hlens[3]; int len, hlens[3];
...@@ -589,7 +589,7 @@ static int put_main_header(vorbis_enc_context * venc, uint8_t ** out) ...@@ -589,7 +589,7 @@ static int put_main_header(vorbis_enc_context * venc, uint8_t ** out)
// mappings // mappings
put_bits(&pb, 6, venc->nmappings - 1); put_bits(&pb, 6, venc->nmappings - 1);
for (i = 0; i < venc->nmappings; i++) { for (i = 0; i < venc->nmappings; i++) {
vorbis_enc_mapping * mc = &venc->mappings[i]; vorbis_enc_mapping *mc = &venc->mappings[i];
int j; int j;
put_bits(&pb, 16, 0); // mapping type put_bits(&pb, 16, 0); // mapping type
...@@ -649,7 +649,7 @@ static int put_main_header(vorbis_enc_context * venc, uint8_t ** out) ...@@ -649,7 +649,7 @@ static int put_main_header(vorbis_enc_context * venc, uint8_t ** out)
return p - *out; return p - *out;
} }
static float get_floor_average(vorbis_enc_floor * fc, float * coeffs, int i) static float get_floor_average(vorbis_enc_floor * fc, float *coeffs, int i)
{ {
int begin = fc->list[fc->list[FFMAX(i-1, 0)].sort].x; int begin = fc->list[fc->list[FFMAX(i-1, 0)].sort].x;
int end = fc->list[fc->list[FFMIN(i+1, fc->values - 1)].sort].x; int end = fc->list[fc->list[FFMIN(i+1, fc->values - 1)].sort].x;
...@@ -661,14 +661,14 @@ static float get_floor_average(vorbis_enc_floor * fc, float * coeffs, int i) ...@@ -661,14 +661,14 @@ static float get_floor_average(vorbis_enc_floor * fc, float * coeffs, int i)
return average / (end - begin); return average / (end - begin);
} }
static void floor_fit(vorbis_enc_context * venc, vorbis_enc_floor * fc, static void floor_fit(vorbis_enc_context *venc, vorbis_enc_floor *fc,
float * coeffs, uint_fast16_t * posts, int samples) float *coeffs, uint_fast16_t *posts, int samples)
{ {
int range = 255 / fc->multiplier + 1; int range = 255 / fc->multiplier + 1;
int i; int i;
float tot_average = 0.; float tot_average = 0.;
float averages[fc->values]; float averages[fc->values];
for (i = 0; i < fc->values; i++){ for (i = 0; i < fc->values; i++) {
averages[i] = get_floor_average(fc, coeffs, i); averages[i] = get_floor_average(fc, coeffs, i);
tot_average += averages[i]; tot_average += averages[i];
} }
...@@ -693,9 +693,9 @@ static int render_point(int x0, int y0, int x1, int y1, int x) ...@@ -693,9 +693,9 @@ static int render_point(int x0, int y0, int x1, int y1, int x)
return y0 + (x - x0) * (y1 - y0) / (x1 - x0); return y0 + (x - x0) * (y1 - y0) / (x1 - x0);
} }
static void floor_encode(vorbis_enc_context * venc, vorbis_enc_floor * fc, static void floor_encode(vorbis_enc_context *venc, vorbis_enc_floor *fc,
PutBitContext * pb, uint_fast16_t * posts, PutBitContext *pb, uint_fast16_t *posts,
float * floor, int samples) float *floor, int samples)
{ {
int range = 255 / fc->multiplier + 1; int range = 255 / fc->multiplier + 1;
int coded[fc->values]; // first 2 values are unused int coded[fc->values]; // first 2 values are unused
...@@ -772,10 +772,12 @@ static void floor_encode(vorbis_enc_context * venc, vorbis_enc_floor * fc, ...@@ -772,10 +772,12 @@ static void floor_encode(vorbis_enc_context * venc, vorbis_enc_floor * fc,
} }
} }
ff_vorbis_floor1_render_list(fc->list, fc->values, posts, coded, fc->multiplier, floor, samples); ff_vorbis_floor1_render_list(fc->list, fc->values, posts, coded,
fc->multiplier, floor, samples);
} }
static float * put_vector(vorbis_enc_codebook * book, PutBitContext * pb, float * num) static float *put_vector(vorbis_enc_codebook *book, PutBitContext *pb,
float *num)
{ {
int i, entry = -1; int i, entry = -1;
float distance = FLT_MAX; float distance = FLT_MAX;
...@@ -796,8 +798,8 @@ static float * put_vector(vorbis_enc_codebook * book, PutBitContext * pb, float ...@@ -796,8 +798,8 @@ static float * put_vector(vorbis_enc_codebook * book, PutBitContext * pb, float
return &book->dimentions[entry * book->ndimentions]; return &book->dimentions[entry * book->ndimentions];
} }
static void residue_encode(vorbis_enc_context * venc, vorbis_enc_residue * rc, static void residue_encode(vorbis_enc_context *venc, vorbis_enc_residue *rc,
PutBitContext * pb, float * coeffs, int samples, PutBitContext *pb, float *coeffs, int samples,
int real_ch) int real_ch)
{ {
int pass, i, j, p, k; int pass, i, j, p, k;
...@@ -840,7 +842,7 @@ static void residue_encode(vorbis_enc_context * venc, vorbis_enc_residue * rc, ...@@ -840,7 +842,7 @@ static void residue_encode(vorbis_enc_context * venc, vorbis_enc_residue * rc,
for (j = 0; j < channels; j++) { for (j = 0; j < channels; j++) {
int nbook = rc->books[classes[j][p]][pass]; int nbook = rc->books[classes[j][p]][pass];
vorbis_enc_codebook * book = &venc->codebooks[nbook]; vorbis_enc_codebook * book = &venc->codebooks[nbook];
float * buf = coeffs + samples*j + rc->begin + p*psize; float *buf = coeffs + samples*j + rc->begin + p*psize;
if (nbook == -1) if (nbook == -1)
continue; continue;
...@@ -849,7 +851,7 @@ static void residue_encode(vorbis_enc_context * venc, vorbis_enc_residue * rc, ...@@ -849,7 +851,7 @@ static void residue_encode(vorbis_enc_context * venc, vorbis_enc_residue * rc,
if (rc->type == 0) { if (rc->type == 0) {
for (k = 0; k < psize; k += book->ndimentions) { for (k = 0; k < psize; k += book->ndimentions) {
float * a = put_vector(book, pb, &buf[k]); float *a = put_vector(book, pb, &buf[k]);
int l; int l;
for (l = 0; l < book->ndimentions; l++) for (l = 0; l < book->ndimentions; l++)
buf[k + l] -= a[l]; buf[k + l] -= a[l];
...@@ -861,11 +863,11 @@ static void residue_encode(vorbis_enc_context * venc, vorbis_enc_residue * rc, ...@@ -861,11 +863,11 @@ static void residue_encode(vorbis_enc_context * venc, vorbis_enc_residue * rc,
s = real_ch * samples; s = real_ch * samples;
for (k = 0; k < psize; k += book->ndimentions) { for (k = 0; k < psize; k += book->ndimentions) {
int dim, a2 = a1, b2 = b1; int dim, a2 = a1, b2 = b1;
float vec[book->ndimentions], * pv = vec; float vec[book->ndimentions], *pv = vec;
for (dim = book->ndimentions; dim--; ) { for (dim = book->ndimentions; dim--; ) {
*pv++ = coeffs[a2 + b2]; *pv++ = coeffs[a2 + b2];
if ((a2 += samples) == s) { if ((a2 += samples) == s) {
a2=0; a2 = 0;
b2++; b2++;
} }
} }
...@@ -873,7 +875,7 @@ static void residue_encode(vorbis_enc_context * venc, vorbis_enc_residue * rc, ...@@ -873,7 +875,7 @@ static void residue_encode(vorbis_enc_context * venc, vorbis_enc_residue * rc,
for (dim = book->ndimentions; dim--; ) { for (dim = book->ndimentions; dim--; ) {
coeffs[a1 + b1] -= *pv++; coeffs[a1 + b1] -= *pv++;
if ((a1 += samples) == s) { if ((a1 += samples) == s) {
a1=0; a1 = 0;
b1++; b1++;
} }
} }
...@@ -885,8 +887,8 @@ static void residue_encode(vorbis_enc_context * venc, vorbis_enc_residue * rc, ...@@ -885,8 +887,8 @@ static void residue_encode(vorbis_enc_context * venc, vorbis_enc_residue * rc,
} }
} }
static int apply_window_and_mdct(vorbis_enc_context * venc, static int apply_window_and_mdct(vorbis_enc_context *venc, signed short *audio,
signed short * audio, int samples) int samples)
{ {
int i, j, channel; int i, j, channel;
const float * win = venc->win[0]; const float * win = venc->win[0];
...@@ -897,12 +899,15 @@ static int apply_window_and_mdct(vorbis_enc_context * venc, ...@@ -897,12 +899,15 @@ static int apply_window_and_mdct(vorbis_enc_context * venc,
if (!venc->have_saved && !samples) if (!venc->have_saved && !samples)
return 0; return 0;
if (venc->have_saved) if (venc->have_saved) {
for (channel = 0; channel < venc->channels; channel++) for (channel = 0; channel < venc->channels; channel++)
memcpy(venc->samples + channel*window_len*2, venc->saved + channel*window_len, sizeof(float)*window_len); memcpy(venc->samples + channel * window_len * 2,
else venc->saved + channel * window_len, sizeof(float) * window_len);
} else {
for (channel = 0; channel < venc->channels; channel++) for (channel = 0; channel < venc->channels; channel++)
memset(venc->samples + channel*window_len*2, 0, sizeof(float)*window_len); memset(venc->samples + channel * window_len * 2, 0,
sizeof(float) * window_len);
}
if (samples) { if (samples) {
for (channel = 0; channel < venc->channels; channel++) { for (channel = 0; channel < venc->channels; channel++) {
...@@ -913,15 +918,17 @@ static int apply_window_and_mdct(vorbis_enc_context * venc, ...@@ -913,15 +918,17 @@ static int apply_window_and_mdct(vorbis_enc_context * venc,
} }
} else { } else {
for (channel = 0; channel < venc->channels; channel++) for (channel = 0; channel < venc->channels; channel++)
memset(venc->samples + channel*window_len*2 + window_len, 0, sizeof(float)*window_len); memset(venc->samples + channel * window_len * 2 + window_len,
0, sizeof(float) * window_len);
} }
for (channel = 0; channel < venc->channels; channel++) for (channel = 0; channel < venc->channels; channel++)
ff_mdct_calc(&venc->mdct[0], venc->coeffs + channel*window_len, venc->samples + channel*window_len*2); ff_mdct_calc(&venc->mdct[0], venc->coeffs + channel * window_len,
venc->samples + channel * window_len * 2);
if (samples) { if (samples) {
for (channel = 0; channel < venc->channels; channel++) { for (channel = 0; channel < venc->channels; channel++) {
float * offset = venc->saved + channel*window_len; float *offset = venc->saved + channel * window_len;
j = channel; j = channel;
for (i = 0; i < samples; i++, j += venc->channels) for (i = 0; i < samples; i++, j += venc->channels)
offset[i] = -audio[j] / 32768. / n * win[i]; //FIXME find out why the sign has to be fliped offset[i] = -audio[j] / 32768. / n * win[i]; //FIXME find out why the sign has to be fliped
...@@ -933,9 +940,9 @@ static int apply_window_and_mdct(vorbis_enc_context * venc, ...@@ -933,9 +940,9 @@ static int apply_window_and_mdct(vorbis_enc_context * venc,
return 1; return 1;
} }
static av_cold int vorbis_encode_init(AVCodecContext * avccontext) static av_cold int vorbis_encode_init(AVCodecContext *avccontext)
{ {
vorbis_enc_context * venc = avccontext->priv_data; vorbis_enc_context *venc = avccontext->priv_data;
if (avccontext->channels != 2) { if (avccontext->channels != 2) {
av_log(avccontext, AV_LOG_ERROR, "Current FFmpeg Vorbis encoder only supports 2 channels.\n"); av_log(avccontext, AV_LOG_ERROR, "Current FFmpeg Vorbis encoder only supports 2 channels.\n");
...@@ -960,13 +967,15 @@ static av_cold int vorbis_encode_init(AVCodecContext * avccontext) ...@@ -960,13 +967,15 @@ static av_cold int vorbis_encode_init(AVCodecContext * avccontext)
return 0; return 0;
} }
static int vorbis_encode_frame(AVCodecContext * avccontext, unsigned char * packets, int buf_size, void *data) static int vorbis_encode_frame(AVCodecContext *avccontext,
unsigned char *packets,
int buf_size, void *data)
{ {
vorbis_enc_context * venc = avccontext->priv_data; vorbis_enc_context *venc = avccontext->priv_data;
signed short * audio = data; signed short *audio = data;
int samples = data ? avccontext->frame_size : 0; int samples = data ? avccontext->frame_size : 0;
vorbis_enc_mode * mode; vorbis_enc_mode *mode;
vorbis_enc_mapping * mapping; vorbis_enc_mapping *mapping;
PutBitContext pb; PutBitContext pb;
int i; int i;
...@@ -988,7 +997,7 @@ static int vorbis_encode_frame(AVCodecContext * avccontext, unsigned char * pack ...@@ -988,7 +997,7 @@ static int vorbis_encode_frame(AVCodecContext * avccontext, unsigned char * pack
} }
for (i = 0; i < venc->channels; i++) { for (i = 0; i < venc->channels; i++) {
vorbis_enc_floor * fc = &venc->floors[mapping->floor[mapping->mux[i]]]; vorbis_enc_floor *fc = &venc->floors[mapping->floor[mapping->mux[i]]];
uint_fast16_t posts[fc->values]; uint_fast16_t posts[fc->values];
floor_fit(venc, fc, &venc->coeffs[i * samples], posts, samples); floor_fit(venc, fc, &venc->coeffs[i * samples], posts, samples);
floor_encode(venc, fc, &pb, posts, &venc->floor[i * samples], samples); floor_encode(venc, fc, &pb, posts, &venc->floor[i * samples], samples);
...@@ -998,8 +1007,8 @@ static int vorbis_encode_frame(AVCodecContext * avccontext, unsigned char * pack ...@@ -998,8 +1007,8 @@ static int vorbis_encode_frame(AVCodecContext * avccontext, unsigned char * pack
venc->coeffs[i] /= venc->floor[i]; venc->coeffs[i] /= venc->floor[i];
for (i = 0; i < mapping->coupling_steps; i++) { for (i = 0; i < mapping->coupling_steps; i++) {
float * mag = venc->coeffs + mapping->magnitude[i] * samples; float *mag = venc->coeffs + mapping->magnitude[i] * samples;
float * ang = venc->coeffs + mapping->angle[i] * samples; float *ang = venc->coeffs + mapping->angle[i] * samples;
int j; int j;
for (j = 0; j < samples; j++) { for (j = 0; j < samples; j++) {
float a = ang[j]; float a = ang[j];
...@@ -1011,7 +1020,8 @@ static int vorbis_encode_frame(AVCodecContext * avccontext, unsigned char * pack ...@@ -1011,7 +1020,8 @@ static int vorbis_encode_frame(AVCodecContext * avccontext, unsigned char * pack
} }
} }
residue_encode(venc, &venc->residues[mapping->residue[mapping->mux[0]]], &pb, venc->coeffs, samples, venc->channels); residue_encode(venc, &venc->residues[mapping->residue[mapping->mux[0]]],
&pb, venc->coeffs, samples, venc->channels);
avccontext->coded_frame->pts = venc->sample_count; avccontext->coded_frame->pts = venc->sample_count;
venc->sample_count += avccontext->frame_size; venc->sample_count += avccontext->frame_size;
...@@ -1020,9 +1030,9 @@ static int vorbis_encode_frame(AVCodecContext * avccontext, unsigned char * pack ...@@ -1020,9 +1030,9 @@ static int vorbis_encode_frame(AVCodecContext * avccontext, unsigned char * pack
} }
static av_cold int vorbis_encode_close(AVCodecContext * avccontext) static av_cold int vorbis_encode_close(AVCodecContext *avccontext)
{ {
vorbis_enc_context * venc = avccontext->priv_data; vorbis_enc_context *venc = avccontext->priv_data;
int i; int i;
if (venc->codebooks) if (venc->codebooks)
......
libavcodec/vorbis_enc_data.h
View file @ a7adcf29
...@@ -24,8 +24,7 @@ ...@@ -24,8 +24,7 @@
#include <stdint.h> #include <stdint.h>
static const uint8_t codebook0[] = { static const uint8_t codebook0[] = {
2, 10, 8, 14, 7, 12, 11, 14, 1, 5, 3, 7, 4, 9, 7, 2, 10, 8, 14, 7, 12, 11, 14, 1, 5, 3, 7, 4, 9, 7, 13,
13,
}; };
static const uint8_t codebook1[] = { static const uint8_t codebook1[] = {
...@@ -452,11 +451,11 @@ static const struct { ...@@ -452,11 +451,11 @@ static const struct {
int dim; int dim;
int len; int len;
int real_len; int real_len;
const uint8_t * clens; const uint8_t *clens;
int lookup; int lookup;
float min; float min;
float delta; float delta;
const uint8_t * quant; const uint8_t *quant;
} cvectors[] = { } cvectors[] = {
{ 2, 16, 16, codebook0, 0 }, { 2, 16, 16, codebook0, 0 },
{ 2, 8, 8, codebook1, 0 }, { 2, 8, 8, codebook1, 0 },
...@@ -493,7 +492,7 @@ static const struct { ...@@ -493,7 +492,7 @@ static const struct {
int dim; int dim;
int subclass; int subclass;
int masterbook; int masterbook;
const int * nbooks; const int *nbooks;
} floor_classes[] = { } floor_classes[] = {
{ 3, 0, 0, (const int[]){ 4 } }, { 3, 0, 0, (const int[]){ 4 } },
{ 4, 1, 0, (const int[]){ 5, 6 } }, { 4, 1, 0, (const int[]){ 5, 6 } },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment