Skip to content

F
ffmpeg-mt
Commit bb278628 authored by michael's avatar michael
Browse files
Options

maxdepth is supposed to be a constant, its faster if its too large then if its non constant 


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@4324 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 9dd633c2
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
libavcodec/vorbis.c
View file @ bb278628
...@@ -898,7 +898,7 @@ static uint_fast8_t vorbis_floor1_decode(vorbis_context *vc, vorbis_floor *vf, f ...@@ -898,7 +898,7 @@ static uint_fast8_t vorbis_floor1_decode(vorbis_context *vc, vorbis_floor *vf, f
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,
V_NB_BITS, vc->codebooks[vf->class_masterbook[class_]].maxdepth); V_NB_BITS, 3);
} }
for(j=0;j<cdim;++j) { for(j=0;j<cdim;++j) {
...@@ -909,7 +909,7 @@ static uint_fast8_t vorbis_floor1_decode(vorbis_context *vc, vorbis_floor *vf, f ...@@ -909,7 +909,7 @@ static uint_fast8_t vorbis_floor1_decode(vorbis_context *vc, vorbis_floor *vf, f
cval=cval>>cbits; cval=cval>>cbits;
if (book>0) { if (book>0) {
floor1_Y[offset+j]=get_vlc2(gb, vc->codebooks[book].vlc.table, floor1_Y[offset+j]=get_vlc2(gb, vc->codebooks[book].vlc.table,
V_NB_BITS, vc->codebooks[book].maxdepth); V_NB_BITS, 3);
} else { } else {
floor1_Y[offset+j]=0; floor1_Y[offset+j]=0;
} }
...@@ -1095,7 +1095,7 @@ static int vorbis_residue_decode(vorbis_context *vc, vorbis_residue *vr, uint_fa ...@@ -1095,7 +1095,7 @@ static int vorbis_residue_decode(vorbis_context *vc, vorbis_residue *vr, uint_fa
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,
V_NB_BITS, vc->codebooks[vr->classbook].maxdepth); V_NB_BITS, 3);
AV_DEBUG("Classword: %d \n", temp); AV_DEBUG("Classword: %d \n", temp);
...@@ -1127,7 +1127,7 @@ static int vorbis_residue_decode(vorbis_context *vc, vorbis_residue *vr, uint_fa ...@@ -1127,7 +1127,7 @@ static int vorbis_residue_decode(vorbis_context *vc, vorbis_residue *vr, uint_fa
voffs=voffset+j*vlen; voffs=voffset+j*vlen;
for(k=0;k<step;++k) { for(k=0;k<step;++k) {
coffs=get_vlc2(gb, vc->codebooks[vqbook].vlc.table, coffs=get_vlc2(gb, vc->codebooks[vqbook].vlc.table,
V_NB_BITS, vc->codebooks[vr->classbook].maxdepth) * vc->codebooks[vqbook].dimensions; V_NB_BITS, 3) * vc->codebooks[vqbook].dimensions;
for(l=0;l<vc->codebooks[vqbook].dimensions;++l) { for(l=0;l<vc->codebooks[vqbook].dimensions;++l) {
vec[voffs+k+l*step]+=vc->codebooks[vqbook].codevectors[coffs+l]; // FPMATH vec[voffs+k+l*step]+=vc->codebooks[vqbook].codevectors[coffs+l]; // FPMATH
} }
...@@ -1137,7 +1137,7 @@ static int vorbis_residue_decode(vorbis_context *vc, vorbis_residue *vr, uint_fa ...@@ -1137,7 +1137,7 @@ static int vorbis_residue_decode(vorbis_context *vc, vorbis_residue *vr, uint_fa
voffs=voffset+j*vlen; voffs=voffset+j*vlen;
for(k=0;k<vr->partition_size/vc->codebooks[vqbook].dimensions;++k) { for(k=0;k<vr->partition_size/vc->codebooks[vqbook].dimensions;++k) {
coffs=get_vlc2(gb, vc->codebooks[vqbook].vlc.table, coffs=get_vlc2(gb, vc->codebooks[vqbook].vlc.table,
V_NB_BITS, vc->codebooks[vr->classbook].maxdepth) * vc->codebooks[vqbook].dimensions; V_NB_BITS, 3) * vc->codebooks[vqbook].dimensions;
for(l=0;l<vc->codebooks[vqbook].dimensions;++l, ++voffs) { for(l=0;l<vc->codebooks[vqbook].dimensions;++l, ++voffs) {
vec[voffs]+=vc->codebooks[vqbook].codevectors[coffs+l]; // FPMATH vec[voffs]+=vc->codebooks[vqbook].codevectors[coffs+l]; // FPMATH
...@@ -1150,7 +1150,7 @@ static int vorbis_residue_decode(vorbis_context *vc, vorbis_residue *vr, uint_fa ...@@ -1150,7 +1150,7 @@ static int vorbis_residue_decode(vorbis_context *vc, vorbis_residue *vr, uint_fa
for(k=0;k<vr->partition_size/vc->codebooks[vqbook].dimensions;++k) { for(k=0;k<vr->partition_size/vc->codebooks[vqbook].dimensions;++k) {
coffs=get_vlc2(gb, vc->codebooks[vqbook].vlc.table, coffs=get_vlc2(gb, vc->codebooks[vqbook].vlc.table,
V_NB_BITS, vc->codebooks[vr->classbook].maxdepth) * vc->codebooks[vqbook].dimensions; V_NB_BITS, 3) * vc->codebooks[vqbook].dimensions;
for(l=0;l<vc->codebooks[vqbook].dimensions;++l, ++voffs) { for(l=0;l<vc->codebooks[vqbook].dimensions;++l, ++voffs) {
vec[(voffs>>1)+((voffs&1) ? vlen : 0)]+=vc->codebooks[vqbook].codevectors[coffs+l]; // FPMATH vec[(voffs>>1)+((voffs&1) ? vlen : 0)]+=vc->codebooks[vqbook].codevectors[coffs+l]; // FPMATH
...@@ -1164,7 +1164,7 @@ static int vorbis_residue_decode(vorbis_context *vc, vorbis_residue *vr, uint_fa ...@@ -1164,7 +1164,7 @@ static int vorbis_residue_decode(vorbis_context *vc, vorbis_residue *vr, uint_fa
for(k=0;k<vr->partition_size/vc->codebooks[vqbook].dimensions;++k) { for(k=0;k<vr->partition_size/vc->codebooks[vqbook].dimensions;++k) {
coffs=get_vlc2(gb, vc->codebooks[vqbook].vlc.table, coffs=get_vlc2(gb, vc->codebooks[vqbook].vlc.table,
V_NB_BITS, vc->codebooks[vr->classbook].maxdepth) * vc->codebooks[vqbook].dimensions; V_NB_BITS, 3) * vc->codebooks[vqbook].dimensions;
for(l=0;l<vc->codebooks[vqbook].dimensions;++l, ++voffs) { for(l=0;l<vc->codebooks[vqbook].dimensions;++l, ++voffs) {
vec[voffs/ch+(voffs%ch)*vlen]+=vc->codebooks[vqbook].codevectors[coffs+l]; // FPMATH FIXME use if and counter instead of / and % vec[voffs/ch+(voffs%ch)*vlen]+=vc->codebooks[vqbook].codevectors[coffs+l]; // FPMATH FIXME use if and counter instead of / and %
......
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