libavcodec.hg: h264.c comparison

comparison h264.c @ 11499:2a4dc3c0b012 libavcodec

Move H264 dsputil functions into their own struct This moves the H264-specific functions from DSPContext to the new H264DSPContext. The code is made conditional on CONFIG_H264DSP which is set by the codecs requiring it. The qpel and chroma MC functions are not moved as these are used by non-h264 code.

author	mru
date	Tue, 16 Mar 2010 01:17:00 +0000
parents	049a0c71e5a3
children	9adad5749f23

comparison

equal deleted inserted replaced

-:8e889ce0d616
+:2a4dc3c0b012
 }
 }
 static void init_dequant8_coeff_table(H264Context *h){
 int i,q,x;
-const int transpose = (h->s.dsp.h264_idct8_add != ff_h264_idct8_add_c); //FIXME ugly
+const int transpose = (h->h264dsp.h264_idct8_add != ff_h264_idct8_add_c); //FIXME ugly
 h->dequant8_coeff[0] = h->dequant8_buffer[0];
 h->dequant8_coeff[1] = h->dequant8_buffer[1];
 for(i=0; i<2; i++ ){
 if(i && !memcmp(h->pps.scaling_matrix8[0], h->pps.scaling_matrix8[1], 64*sizeof(uint8_t))){
 }
 }
 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
+const int transpose = (h->h264dsp.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++){
 if(!memcmp(h->pps.scaling_matrix4[j], h->pps.scaling_matrix4[i], 16*sizeof(uint8_t))){
 h->dequant4_coeff[i] = h->dequant4_buffer[j];
 s->width = s->avctx->width;
 s->height = s->avctx->height;
 s->codec_id= s->avctx->codec->id;
+ff_h264dsp_init(&h->h264dsp);
 ff_h264_pred_init(&h->hpc, s->codec_id);
 h->dequant_coeff_pps= -1;
 s->unrestricted_mv=1;
 s->decode=1; //FIXME
 if(IS_8x8DCT(mb_type)){
 if(transform_bypass){
 idct_dc_add =
 idct_add    = s->dsp.add_pixels8;
 }else{
-idct_dc_add = s->dsp.h264_idct8_dc_add;
+idct_dc_add = h->h264dsp.h264_idct8_dc_add;
-idct_add    = s->dsp.h264_idct8_add;
+idct_add    = h->h264dsp.h264_idct8_add;
 }
 for(i=0; i<16; i+=4){
 uint8_t * const ptr= dest_y + block_offset[i];
 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ];
 if(transform_bypass && h->sps.profile_idc==244 && dir<=1){
 }else{
 if(transform_bypass){
 idct_dc_add =
 idct_add    = s->dsp.add_pixels4;
 }else{
-idct_dc_add = s->dsp.h264_idct_dc_add;
+idct_dc_add = h->h264dsp.h264_idct_dc_add;
-idct_add    = s->dsp.h264_idct_add;
+idct_add    = h->h264dsp.h264_idct_add;
 }
 for(i=0; i<16; i++){
 uint8_t * const ptr= dest_y + block_offset[i];
 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ];
 xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 0, simple);
 }else if(is_h264){
 hl_motion(h, dest_y, dest_cb, dest_cr,
 s->me.qpel_put, s->dsp.put_h264_chroma_pixels_tab,
 s->me.qpel_avg, s->dsp.avg_h264_chroma_pixels_tab,
-s->dsp.weight_h264_pixels_tab, s->dsp.biweight_h264_pixels_tab);
+h->h264dsp.weight_h264_pixels_tab, h->h264dsp.biweight_h264_pixels_tab);
 }
 if(!IS_INTRA4x4(mb_type)){
 if(is_h264){
 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16])
 s->dsp.add_pixels4(dest_y + block_offset[i], h->mb + i*16, linesize);
 }
 }
 }else{
-s->dsp.h264_idct_add16intra(dest_y, block_offset, h->mb, linesize, h->non_zero_count_cache);
+h->h264dsp.h264_idct_add16intra(dest_y, block_offset, h->mb, linesize, h->non_zero_count_cache);
 }
 }else if(h->cbp&15){
 if(transform_bypass){
 const int di = IS_8x8DCT(mb_type) ? 4 : 1;
 idct_add= IS_8x8DCT(mb_type) ? s->dsp.add_pixels8 : s->dsp.add_pixels4;
 idct_add(dest_y + block_offset[i], h->mb + i*16, linesize);
 }
 }
 }else{
 if(IS_8x8DCT(mb_type)){
-s->dsp.h264_idct8_add4(dest_y, block_offset, h->mb, linesize, h->non_zero_count_cache);
+h->h264dsp.h264_idct8_add4(dest_y, block_offset, h->mb, linesize, h->non_zero_count_cache);
 }else{
-s->dsp.h264_idct_add16(dest_y, block_offset, h->mb, linesize, h->non_zero_count_cache);
+h->h264dsp.h264_idct_add16(dest_y, block_offset, h->mb, linesize, h->non_zero_count_cache);
 }
 }
 }
 }else{
 for(i=0; i<16; i++){
 }
 }else{
 chroma_dc_dequant_idct_c(h->mb + 16*16, h->chroma_qp[0], h->dequant4_coeff[IS_INTRA(mb_type) ? 1:4][h->chroma_qp[0]][0]);
 chroma_dc_dequant_idct_c(h->mb + 16*16+4*16, h->chroma_qp[1], h->dequant4_coeff[IS_INTRA(mb_type) ? 2:5][h->chroma_qp[1]][0]);
 if(is_h264){
-idct_add = s->dsp.h264_idct_add;
+idct_add = h->h264dsp.h264_idct_add;
-idct_dc_add = s->dsp.h264_idct_dc_add;
+idct_dc_add = h->h264dsp.h264_idct_dc_add;
 for(i=16; i<16+8; i++){
 if(h->non_zero_count_cache[ scan8[i] ])
 idct_add   (dest[(i&4)>>2] + block_offset[i], h->mb + i*16, uvlinesize);
 else if(h->mb[i*16])
 idct_dc_add(dest[(i&4)>>2] + block_offset[i], h->mb + i*16, uvlinesize);
 * initialize scan tables
 */
 static void init_scan_tables(H264Context *h){
 MpegEncContext * const s = &h->s;
 int i;
-if(s->dsp.h264_idct_add == ff_h264_idct_add_c){ //FIXME little ugly
+if(h->h264dsp.h264_idct_add == ff_h264_idct_add_c){ //FIXME little ugly
 memcpy(h->zigzag_scan, zigzag_scan, 16*sizeof(uint8_t));
 memcpy(h-> field_scan,  field_scan, 16*sizeof(uint8_t));
 }else{
 for(i=0; i<16; i++){
 #define T(x) (x>>2) | ((x<<2) & 0xF)
 h->zigzag_scan[i] = T(zigzag_scan[i]);
 h-> field_scan[i] = T( field_scan[i]);
 #undef T
 }
 }
-if(s->dsp.h264_idct8_add == ff_h264_idct8_add_c){
+if(h->h264dsp.h264_idct8_add == ff_h264_idct8_add_c){
 memcpy(h->zigzag_scan8x8,       ff_zigzag_direct,     64*sizeof(uint8_t));
 memcpy(h->zigzag_scan8x8_cavlc, zigzag_scan8x8_cavlc, 64*sizeof(uint8_t));
 memcpy(h->field_scan8x8,        field_scan8x8,        64*sizeof(uint8_t));
 memcpy(h->field_scan8x8_cavlc,  field_scan8x8_cavlc,  64*sizeof(uint8_t));
 }else{
 if(j&1) block[j]= (block[j]*4 + 2)/5;
 if(j&4) block[j]= (block[j]*4 + 2)/5;
 }
 //        printf("\n");
-s->dsp.h264_idct_add(ref, block, 4);
+h->h264dsp.h264_idct_add(ref, block, 4);
 /*        for(j=0; j<16; j++){
 printf("%d ", ref[j]);
 }
 printf("\n");*/

Mercurial > libavcodec.hg

comparison h264.c @ 11499:2a4dc3c0b012 libavcodec