libavcodec.hg: h264.c comparison

comparison h264.c @ 7341:b75aa0197be4 libavcodec

Use slice_type_nos instead of slice_type where it makes no difference. This way we use slice_type_nos almost everywhere which means 1 variable less for gcc to put in a register.

author	michael
date	Mon, 21 Jul 2008 19:11:41 +0000
parents	ef40221c1452
children	9a4cb430d8ff

comparison

equal deleted inserted replaced

-:ef40221c1452
+:b75aa0197be4
 *(uint32_t*)h->mvd_cache [list][scan8[7 ]+1]=
 *(uint32_t*)h->mvd_cache [list][scan8[13]+1]= //FIXME remove past 3 (init somewhere else)
 *(uint32_t*)h->mvd_cache [list][scan8[4 ]]=
 *(uint32_t*)h->mvd_cache [list][scan8[12]]= 0;
-if(h->slice_type == FF_B_TYPE){
+if(h->slice_type_nos == FF_B_TYPE){
 fill_rectangle(&h->direct_cache[scan8[0]], 4, 4, 8, 0, 1);
 if(IS_DIRECT(top_type)){
 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0x01010101;
 }else if(IS_8X8(top_type)){
 ref_index[0+1*h->b8_stride]= h->ref_cache[list][scan8[8]];
 ref_index[1+1*h->b8_stride]= h->ref_cache[list][scan8[12]];
 }
 }
-if(h->slice_type == FF_B_TYPE && h->pps.cabac){
+if(h->slice_type_nos == FF_B_TYPE && h->pps.cabac){
 if(IS_8X8(mb_type)){
 uint8_t *direct_table = &h->direct_table[b8_xy];
 direct_table[1+0*h->b8_stride] = IS_DIRECT(h->sub_mb_type[1]) ? 1 : 0;
 direct_table[0+1*h->b8_stride] = IS_DIRECT(h->sub_mb_type[2]) ? 1 : 0;
 direct_table[1+1*h->b8_stride] = IS_DIRECT(h->sub_mb_type[3]) ? 1 : 0;
 structure_sel = 0;
 frame_list[0] = h->default_ref_list[0];
 frame_list[1] = h->default_ref_list[1];
 }
-if(h->slice_type==FF_B_TYPE){
+if(h->slice_type_nos==FF_B_TYPE){
 int list;
 int len[2];
 int short_len[2];
 int out_i;
 int limit= INT_MIN;
 }
 #ifdef TRACE
 for (i=0; i<h->ref_count[0]; i++) {
 tprintf(h->s.avctx, "List0: %s fn:%d 0x%p\n", (h->default_ref_list[0][i].long_ref ? "LT" : "ST"), h->default_ref_list[0][i].pic_id, h->default_ref_list[0][i].data[0]);
 }
-if(h->slice_type==FF_B_TYPE){
+if(h->slice_type_nos==FF_B_TYPE){
 for (i=0; i<h->ref_count[1]; i++) {
 tprintf(h->s.avctx, "List1: %s fn:%d 0x%p\n", (h->default_ref_list[1][i].long_ref ? "LT" : "ST"), h->default_ref_list[1][i].pic_id, h->default_ref_list[1][i].data[0]);
 }
 }
 #endif
 if(!h->ref_list[list][index].data[0])
 h->ref_list[list][index]= s->current_picture;
 }
 }
-if(h->slice_type==FF_B_TYPE && !h->direct_spatial_mv_pred)
+if(h->slice_type_nos==FF_B_TYPE && !h->direct_spatial_mv_pred)
 direct_dist_scale_factor(h);
 direct_ref_list_init(h);
 return 0;
 }
 h->chroma_weight[list][i][j]= chroma_def;
 h->chroma_offset[list][i][j]= 0;
 }
 }
 }
-if(h->slice_type != FF_B_TYPE) break;
+if(h->slice_type_nos != FF_B_TYPE) break;
 }
 h->use_weight= h->use_weight || h->use_weight_chroma;
 return 0;
 }
 //set defaults, might be overriden a few line later
 h->ref_count[0]= h->pps.ref_count[0];
 h->ref_count[1]= h->pps.ref_count[1];
 if(h->slice_type_nos != FF_I_TYPE){
-if(h->slice_type == FF_B_TYPE){
+if(h->slice_type_nos == FF_B_TYPE){
 h->direct_spatial_mv_pred= get_bits1(&s->gb);
 if(FIELD_PICTURE && h->direct_spatial_mv_pred)
 av_log(h->s.avctx, AV_LOG_ERROR, "PAFF + spatial direct mode is not implemented\n");
 }
 num_ref_idx_active_override_flag= get_bits1(&s->gb);
 if(num_ref_idx_active_override_flag){
 h->ref_count[0]= get_ue_golomb(&s->gb) + 1;
-if(h->slice_type==FF_B_TYPE)
+if(h->slice_type_nos==FF_B_TYPE)
 h->ref_count[1]= get_ue_golomb(&s->gb) + 1;
 if(h->ref_count[0]-1 > 32-1 || h->ref_count[1]-1 > 32-1){
 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow\n");
 h->ref_count[0]= h->ref_count[1]= 1;
 return -1;
 }
 }
-if(h->slice_type == FF_B_TYPE)
+if(h->slice_type_nos == FF_B_TYPE)
 h->list_count= 2;
 else
 h->list_count= 1;
 }else
 h->list_count= 0;
 if(decode_ref_pic_list_reordering(h) < 0)
 return -1;
 if(   (h->pps.weighted_pred          && h->slice_type_nos == FF_P_TYPE )
-|| (h->pps.weighted_bipred_idc==1 && h->slice_type==FF_B_TYPE ) )
+||  (h->pps.weighted_bipred_idc==1 && h->slice_type_nos== FF_B_TYPE ) )
 pred_weight_table(h);
-else if(h->pps.weighted_bipred_idc==2 && h->slice_type==FF_B_TYPE)
+else if(h->pps.weighted_bipred_idc==2 && h->slice_type_nos== FF_B_TYPE)
 implicit_weight_table(h);
 else
 h->use_weight = 0;
 if(h->nal_ref_idc)
 }
 }
 if(   s->avctx->skip_loop_filter >= AVDISCARD_ALL
 ||(s->avctx->skip_loop_filter >= AVDISCARD_NONKEY && h->slice_type_nos != FF_I_TYPE)
-||(s->avctx->skip_loop_filter >= AVDISCARD_BIDIR  && h->slice_type == FF_B_TYPE)
+||(s->avctx->skip_loop_filter >= AVDISCARD_BIDIR  && h->slice_type_nos == FF_B_TYPE)
 ||(s->avctx->skip_loop_filter >= AVDISCARD_NONREF && h->nal_ref_idc == 0))
 h->deblocking_filter= 0;
 if(h->deblocking_filter == 1 && h0->max_contexts > 1) {
 if(s->avctx->flags2 & CODEC_FLAG2_FAST) {
 memset(h->non_zero_count_cache + 8, 0, 8*5); //FIXME ugly, remove pfui
 if(MB_FIELD)
 mb_type|= MB_TYPE_INTERLACED;
-if( h->slice_type == FF_B_TYPE )
+if( h->slice_type_nos == FF_B_TYPE )
 {
 // just for fill_caches. pred_direct_motion will set the real mb_type
 mb_type|= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2|MB_TYPE_SKIP;
 fill_caches(h, mb_type, 0); //FIXME check what is needed and what not ...
 h->mb_field_decoding_flag= (s->picture_structure!=PICT_FRAME);
 h->prev_mb_skipped= 0;
 mb_type= get_ue_golomb(&s->gb);
-if(h->slice_type == FF_B_TYPE){
+if(h->slice_type_nos == FF_B_TYPE){
 if(mb_type < 23){
 partition_count= b_mb_type_info[mb_type].partition_count;
 mb_type=         b_mb_type_info[mb_type].type;
 }else{
 mb_type -= 23;
 return -1;
 h->chroma_pred_mode= pred_mode;
 }else if(partition_count==4){
 int i, j, sub_partition_count[4], list, ref[2][4];
-if(h->slice_type == FF_B_TYPE){
+if(h->slice_type_nos == FF_B_TYPE){
 for(i=0; i<4; i++){
 h->sub_mb_type[i]= get_ue_golomb(&s->gb);
 if(h->sub_mb_type[i] >=13){
 av_log(h->s.avctx, AV_LOG_ERROR, "B sub_mb_type %u out of range at %d %d\n", h->sub_mb_type[i], s->mb_x, s->mb_y);
 return -1;
 return 2 - get_cabac_noinline( &h->cabac, &h->cabac_state[17] );
 }
 } else {
 return decode_cabac_intra_mb_type(h, 17, 0) + 5;
 }
-} else if( h->slice_type == FF_B_TYPE ) {
+} else if( h->slice_type_nos == FF_B_TYPE ) {
 const int mba_xy = h->left_mb_xy[0];
 const int mbb_xy = h->top_mb_xy;
 int ctx = 0;
 int bits;
 if( h->slice_table[mba_xy] == h->slice_num && !IS_SKIP( s->current_picture.mb_type[mba_xy] ))
 ctx++;
 if( h->slice_table[mbb_xy] == h->slice_num && !IS_SKIP( s->current_picture.mb_type[mbb_xy] ))
 ctx++;
-if( h->slice_type == FF_B_TYPE )
+if( h->slice_type_nos == FF_B_TYPE )
 ctx += 13;
 return get_cabac_noinline( &h->cabac, &h->cabac_state[11+ctx] );
 }
 static int decode_cabac_mb_intra4x4_pred_mode( H264Context *h, int pred_mode ) {
 int refa = h->ref_cache[list][scan8[n] - 1];
 int refb = h->ref_cache[list][scan8[n] - 8];
 int ref  = 0;
 int ctx  = 0;
-if( h->slice_type == FF_B_TYPE) {
+if( h->slice_type_nos == FF_B_TYPE) {
 if( refa > 0 && !h->direct_cache[scan8[n] - 1] )
 ctx++;
 if( refb > 0 && !h->direct_cache[scan8[n] - 8] )
 ctx += 2;
 } else {
 if( ( mb_type = decode_cabac_mb_type( h ) ) < 0 ) {
 av_log( h->s.avctx, AV_LOG_ERROR, "decode_cabac_mb_type failed\n" );
 return -1;
 }
-if( h->slice_type == FF_B_TYPE ) {
+if( h->slice_type_nos == FF_B_TYPE ) {
 if( mb_type < 23 ){
 partition_count= b_mb_type_info[mb_type].partition_count;
 mb_type=         b_mb_type_info[mb_type].type;
 }else{
 mb_type -= 23;
 if( pred_mode < 0 ) return -1;
 h->chroma_pred_mode= pred_mode;
 } else if( partition_count == 4 ) {
 int i, j, sub_partition_count[4], list, ref[2][4];
-if( h->slice_type == FF_B_TYPE ) {
+if( h->slice_type_nos == FF_B_TYPE ) {
 for( i = 0; i < 4; i++ ) {
 h->sub_mb_type[i] = decode_cabac_b_mb_sub_type( h );
 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
 h->sub_mb_type[i]=      b_sub_mb_type_info[ h->sub_mb_type[i] ].type;
 }
 && (s->current_picture.mb_type[mb_xy-1] & (MB_TYPE_16x16 | MB_TYPE_8x16))
 ? 3 : 0;
 int step = IS_8x8DCT(mb_type) ? 2 : 1;
 edges = (mb_type & MB_TYPE_16x16) && !(h->cbp & 15) ? 1 : 4;
 s->dsp.h264_loop_filter_strength( bS, h->non_zero_count_cache, h->ref_cache, h->mv_cache,
-(h->slice_type == FF_B_TYPE), edges, step, mask_edge0, mask_edge1, FIELD_PICTURE);
+(h->slice_type_nos == FF_B_TYPE), edges, step, mask_edge0, mask_edge1, FIELD_PICTURE);
 }
 if( IS_INTRA(s->current_picture.mb_type[mb_xy-1]) )
 bSv[0][0] = 0x0004000400040004ULL;
 if( IS_INTRA(s->current_picture.mb_type[h->top_mb_xy]) )
 bSv[1][0] = FIELD_PICTURE ? 0x0003000300030003ULL : 0x0004000400040004ULL;
 }
 else if( mask_par0 && (edge || (mbn_type & (MB_TYPE_16x16 | (MB_TYPE_8x16 >> dir)))) ) {
 int b_idx= 8 + 4 + edge * (dir ? 8:1);
 int bn_idx= b_idx - (dir ? 8:1);
 int v = 0;
-int xn= h->slice_type == FF_B_TYPE && h->ref2frm[0][h->ref_cache[0][b_idx]+2] != h->ref2frm[0][h->ref_cache[0][bn_idx]+2];
+int xn= h->slice_type_nos == FF_B_TYPE && h->ref2frm[0][h->ref_cache[0][b_idx]+2] != h->ref2frm[0][h->ref_cache[0][bn_idx]+2];
-for( l = 0; !v && l < 1 + (h->slice_type == FF_B_TYPE); l++ ) {
+for( l = 0; !v && l < 1 + (h->slice_type_nos == FF_B_TYPE); l++ ) {
 int ln= l^xn;
 v |= h->ref2frm[l][h->ref_cache[l][b_idx]+2] != h->ref2frm[ln][h->ref_cache[ln][bn_idx]+2] ||
 FFABS( h->mv_cache[l][b_idx][0] - h->mv_cache[ln][bn_idx][0] ) >= 4 ||
 FFABS( h->mv_cache[l][b_idx][1] - h->mv_cache[ln][bn_idx][1] ) >= mvy_limit;
 }
 h->non_zero_count_cache[bn_idx] != 0 ) {
 bS[i] = 2;
 }
 else if(!mv_done)
 {
-int xn= h->slice_type == FF_B_TYPE && h->ref2frm[0][h->ref_cache[0][b_idx]+2] != h->ref2frm[0][h->ref_cache[0][bn_idx]+2];
+int xn= h->slice_type_nos == FF_B_TYPE && h->ref2frm[0][h->ref_cache[0][b_idx]+2] != h->ref2frm[0][h->ref_cache[0][bn_idx]+2];
 bS[i] = 0;
-for( l = 0; l < 1 + (h->slice_type == FF_B_TYPE); l++ ) {
+for( l = 0; l < 1 + (h->slice_type_nos == FF_B_TYPE); l++ ) {
 int ln= l^xn;
 if( h->ref2frm[l][h->ref_cache[l][b_idx]+2] != h->ref2frm[ln][h->ref_cache[ln][bn_idx]+2] ||
 FFABS( h->mv_cache[l][b_idx][0] - h->mv_cache[ln][bn_idx][0] ) >= 4 ||
 FFABS( h->mv_cache[l][b_idx][1] - h->mv_cache[ln][bn_idx][1] ) >= mvy_limit ) {
 bS[i] = 1;
 break;
 s->current_picture_ptr->key_frame|= (hx->nal_unit_type == NAL_IDR_SLICE);
 if(hx->redundant_pic_count==0 && hx->s.hurry_up < 5
 && (avctx->skip_frame < AVDISCARD_NONREF || hx->nal_ref_idc)
-&& (avctx->skip_frame < AVDISCARD_BIDIR  || hx->slice_type!=FF_B_TYPE)
+&& (avctx->skip_frame < AVDISCARD_BIDIR  || hx->slice_type_nos!=FF_B_TYPE)
 && (avctx->skip_frame < AVDISCARD_NONKEY || hx->slice_type_nos==FF_I_TYPE)
 && avctx->skip_frame < AVDISCARD_ALL)
 context_count++;
 break;
 case NAL_DPA:
 if(hx->redundant_pic_count==0 && hx->intra_gb_ptr && hx->s.data_partitioning
 && s->context_initialized
 && s->hurry_up < 5
 && (avctx->skip_frame < AVDISCARD_NONREF || hx->nal_ref_idc)
-&& (avctx->skip_frame < AVDISCARD_BIDIR  || hx->slice_type!=FF_B_TYPE)
+&& (avctx->skip_frame < AVDISCARD_BIDIR  || hx->slice_type_nos!=FF_B_TYPE)
 && (avctx->skip_frame < AVDISCARD_NONKEY || hx->slice_type_nos==FF_I_TYPE)
 && avctx->skip_frame < AVDISCARD_ALL)
 context_count++;
 break;
 case NAL_SEI:

Mercurial > libavcodec.hg

comparison h264.c @ 7341:b75aa0197be4 libavcodec