Mercurial > libavcodec.hg
diff msmpeg4.c @ 6481:493dc59d469a libavcodec
add FF_ prefix to all (frame)_TYPE usage
author | aurel |
---|---|
date | Sun, 09 Mar 2008 23:31:02 +0000 |
parents | 8e63d869a904 |
children | 778ecab25dd8 |
line wrap: on
line diff
--- a/msmpeg4.c Sun Mar 09 17:05:19 2008 +0000 +++ b/msmpeg4.c Sun Mar 09 23:31:02 2008 +0000 @@ -263,7 +263,7 @@ int intra_luma_count = s->ac_stats[1][0][level][run][last]; int intra_chroma_count= s->ac_stats[1][1][level][run][last]; - if(s->pict_type==I_TYPE){ + if(s->pict_type==FF_I_TYPE){ size += intra_luma_count *rl_length[i ][level][run][last]; chroma_size+= intra_chroma_count*rl_length[i+3][level][run][last]; }else{ @@ -288,7 +288,7 @@ // printf("type:%d, best:%d, qp:%d, var:%d, mcvar:%d, size:%d //\n", // s->pict_type, best, s->qscale, s->mb_var_sum, s->mc_mb_var_sum, best_size); - if(s->pict_type==P_TYPE) chroma_best= best; + if(s->pict_type==FF_P_TYPE) chroma_best= best; memset(s->ac_stats, 0, sizeof(int)*(MAX_LEVEL+1)*(MAX_RUN+1)*2*2*2); @@ -297,7 +297,7 @@ if(s->pict_type != s->last_non_b_pict_type){ s->rl_table_index= 2; - if(s->pict_type==I_TYPE) + if(s->pict_type==FF_I_TYPE) s->rl_chroma_table_index= 1; else s->rl_chroma_table_index= 2; @@ -324,10 +324,10 @@ s->use_skip_mb_code = 1; /* only if P frame */ s->per_mb_rl_table = 0; if(s->msmpeg4_version==4) - s->inter_intra_pred= (s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE && s->pict_type==P_TYPE); + s->inter_intra_pred= (s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE && s->pict_type==FF_P_TYPE); //printf("%d %d %d %d %d\n", s->pict_type, s->bit_rate, s->inter_intra_pred, s->width, s->height); - if (s->pict_type == I_TYPE) { + if (s->pict_type == FF_I_TYPE) { s->slice_height= s->mb_height/1; put_bits(&s->pb, 5, 0x16 + s->mb_height/s->slice_height); @@ -550,7 +550,7 @@ #endif if(s->msmpeg4_version<=2){ - if (s->pict_type == I_TYPE) { + if (s->pict_type == FF_I_TYPE) { put_bits(&s->pb, v2_intra_cbpc[cbp&3][1], v2_intra_cbpc[cbp&3][0]); } else { @@ -565,7 +565,7 @@ cbpy_tab[cbp>>2][1], cbpy_tab[cbp>>2][0]); }else{ - if (s->pict_type == I_TYPE) { + if (s->pict_type == FF_I_TYPE) { put_bits(&s->pb, ff_msmp4_mb_i_table[coded_cbp][1], ff_msmp4_mb_i_table[coded_cbp][0]); } else { @@ -1176,15 +1176,15 @@ } s->pict_type = get_bits(&s->gb, 2) + 1; - if (s->pict_type != I_TYPE && - s->pict_type != P_TYPE){ + if (s->pict_type != FF_I_TYPE && + s->pict_type != FF_P_TYPE){ av_log(s->avctx, AV_LOG_ERROR, "invalid picture type\n"); return -1; } #if 0 { static int had_i=0; - if(s->pict_type == I_TYPE) had_i=1; + if(s->pict_type == FF_I_TYPE) had_i=1; if(!had_i) return -1; } #endif @@ -1194,7 +1194,7 @@ return -1; } - if (s->pict_type == I_TYPE) { + if (s->pict_type == FF_I_TYPE) { code = get_bits(&s->gb, 5); if(s->msmpeg4_version==1){ if(code==0 || code>s->mb_height){ @@ -1428,7 +1428,7 @@ { int cbp, code, i; - if (s->pict_type == P_TYPE) { + if (s->pict_type == FF_P_TYPE) { if (s->use_skip_mb_code) { if (get_bits1(&s->gb)) { /* skip mb */ @@ -1495,7 +1495,7 @@ } else{ s->ac_pred = 0; cbp|= get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1)<<2; //FIXME check errors - if(s->pict_type==P_TYPE) cbp^=0x3C; + if(s->pict_type==FF_P_TYPE) cbp^=0x3C; } } @@ -1516,7 +1516,7 @@ uint8_t *coded_val; uint32_t * const mb_type_ptr= &s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride ]; - if (s->pict_type == P_TYPE) { + if (s->pict_type == FF_P_TYPE) { if (s->use_skip_mb_code) { if (get_bits1(&s->gb)) { /* skip mb */