mirror of https://git.ffmpeg.org/ffmpeg.git
h264: move {prev,next}_mb_skipped into the per-slice context
This commit is contained in:
parent
06789ad3b7
commit
5355ed6b20
|
@ -314,6 +314,9 @@ typedef struct H264SliceContext {
|
|||
int luma_weight[48][2][2];
|
||||
int chroma_weight[48][2][2][2];
|
||||
int implicit_weight[48][48][2];
|
||||
|
||||
int prev_mb_skipped;
|
||||
int next_mb_skipped;
|
||||
} H264SliceContext;
|
||||
|
||||
/**
|
||||
|
@ -350,9 +353,6 @@ typedef struct H264Context {
|
|||
int flags;
|
||||
int workaround_bugs;
|
||||
|
||||
int prev_mb_skipped;
|
||||
int next_mb_skipped;
|
||||
|
||||
// prediction stuff
|
||||
int chroma_pred_mode;
|
||||
int intra16x16_pred_mode;
|
||||
|
|
|
@ -1897,16 +1897,16 @@ int ff_h264_decode_mb_cabac(H264Context *h, H264SliceContext *sl)
|
|||
if( h->slice_type_nos != AV_PICTURE_TYPE_I ) {
|
||||
int skip;
|
||||
/* a skipped mb needs the aff flag from the following mb */
|
||||
if (FRAME_MBAFF(h) && (h->mb_y & 1) == 1 && h->prev_mb_skipped)
|
||||
skip = h->next_mb_skipped;
|
||||
if (FRAME_MBAFF(h) && (h->mb_y & 1) == 1 && sl->prev_mb_skipped)
|
||||
skip = sl->next_mb_skipped;
|
||||
else
|
||||
skip = decode_cabac_mb_skip( h, h->mb_x, h->mb_y );
|
||||
/* read skip flags */
|
||||
if( skip ) {
|
||||
if (FRAME_MBAFF(h) && (h->mb_y & 1) == 0) {
|
||||
h->cur_pic.mb_type[mb_xy] = MB_TYPE_SKIP;
|
||||
h->next_mb_skipped = decode_cabac_mb_skip( h, h->mb_x, h->mb_y+1 );
|
||||
if(!h->next_mb_skipped)
|
||||
sl->next_mb_skipped = decode_cabac_mb_skip( h, h->mb_x, h->mb_y+1 );
|
||||
if(!sl->next_mb_skipped)
|
||||
h->mb_mbaff = h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h);
|
||||
}
|
||||
|
||||
|
@ -1926,7 +1926,7 @@ int ff_h264_decode_mb_cabac(H264Context *h, H264SliceContext *sl)
|
|||
h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h);
|
||||
}
|
||||
|
||||
h->prev_mb_skipped = 0;
|
||||
sl->prev_mb_skipped = 0;
|
||||
|
||||
fill_decode_neighbors(h, -(MB_FIELD(h)));
|
||||
|
||||
|
|
|
@ -721,7 +721,7 @@ int ff_h264_decode_mb_cavlc(H264Context *h, H264SliceContext *sl)
|
|||
h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&h->gb);
|
||||
}
|
||||
|
||||
h->prev_mb_skipped= 0;
|
||||
sl->prev_mb_skipped = 0;
|
||||
|
||||
mb_type= get_ue_golomb(&h->gb);
|
||||
if(h->slice_type_nos == AV_PICTURE_TYPE_B){
|
||||
|
|
|
@ -824,7 +824,7 @@ static void av_unused decode_mb_skip(H264Context *h, H264SliceContext *sl)
|
|||
h->cur_pic.mb_type[mb_xy] = mb_type;
|
||||
h->cur_pic.qscale_table[mb_xy] = sl->qscale;
|
||||
h->slice_table[mb_xy] = h->slice_num;
|
||||
h->prev_mb_skipped = 1;
|
||||
sl->prev_mb_skipped = 1;
|
||||
}
|
||||
|
||||
#endif /* AVCODEC_H264_MVPRED_H */
|
||||
|
|
Loading…
Reference in New Issue