Browse Source

fix asymmetric CQMs with pre-transposed DCT.

Originally committed as revision 4799 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Loren Merritt 19 years ago
parent
commit
ab2e3e2c80
1 changed files with 3 additions and 1 deletions
  1. +3
    -1
      libavcodec/h264.c

+ 3
- 1
libavcodec/h264.c View File

@@ -2973,6 +2973,7 @@ static void init_dequant8_coeff_table(H264Context *h){

static void init_dequant4_coeff_table(H264Context *h){
int i,j,q,x;
const int transpose = (h->s.dsp.h264_idct_add != ff_h264_idct_add_c); //FIXME ugly
for(i=0; i<6; i++ ){
h->dequant4_coeff[i] = h->dequant4_buffer[i];
for(j=0; j<i; j++){
@@ -2988,7 +2989,8 @@ static void init_dequant4_coeff_table(H264Context *h){
int shift = div6[q] + 2;
int idx = rem6[q];
for(x=0; x<16; x++)
h->dequant4_coeff[i][q][x] = ((uint32_t)dequant4_coeff_init[idx][(x&1) + ((x>>2)&1)] *
h->dequant4_coeff[i][q][transpose ? (x>>2)|((x<<2)&0xF) : x] =
((uint32_t)dequant4_coeff_init[idx][(x&1) + ((x>>2)&1)] *
h->pps.scaling_matrix4[i][x]) << shift;
}
}


Loading…
Cancel
Save