highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move check for and call of predict_field_decoding_flag() from the mb code to

Browse Source 
the row code. This function would only be needed on a MB basis for MBAFF+FMO

Originally committed as revision 21860 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2010-02-17 02:14:02 +00:00
parent 59f733d1b1
commit 69cc31832f
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/h264.c
View File

@ -2257,6 +2257,8 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg){
++s->mb_y; ++s->mb_y;
if(FIELD_OR_MBAFF_PICTURE) { if(FIELD_OR_MBAFF_PICTURE) {
++s->mb_y; ++s->mb_y;
if(FRAME_MBAFF && s->mb_y < s->mb_height)
predict_field_decoding_flag(h);
} }
} }
@ -2295,6 +2297,8 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg){
++s->mb_y; ++s->mb_y;
if(FIELD_OR_MBAFF_PICTURE) { if(FIELD_OR_MBAFF_PICTURE) {
++s->mb_y; ++s->mb_y;
if(FRAME_MBAFF && s->mb_y < s->mb_height)
predict_field_decoding_flag(h);
} }
if(s->mb_y >= s->mb_height){ if(s->mb_y >= s->mb_height){
tprintf(s->avctx, "slice end %d %d\n", get_bits_count(&s->gb), s->gb.size_in_bits); tprintf(s->avctx, "slice end %d %d\n", get_bits_count(&s->gb), s->gb.size_in_bits);

2
libavcodec/h264.h
View File

@ -1453,7 +1453,7 @@ static inline int get_dct8x8_allowed(H264Context *h){
static void predict_field_decoding_flag(H264Context *h){ static void predict_field_decoding_flag(H264Context *h){
MpegEncContext * const s = &h->s; MpegEncContext * const s = &h->s;
const int mb_xy= h->mb_xy; const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
int mb_type = (h->slice_table[mb_xy-1] == h->slice_num) int mb_type = (h->slice_table[mb_xy-1] == h->slice_num)
? s->current_picture.mb_type[mb_xy-1] ? s->current_picture.mb_type[mb_xy-1]
: (h->slice_table[mb_xy-s->mb_stride] == h->slice_num) : (h->slice_table[mb_xy-s->mb_stride] == h->slice_num)

2
libavcodec/h264_cabac.c
View File

@ -1196,8 +1196,6 @@ int ff_h264_decode_mb_cabac(H264Context *h) {
if( h->slice_type_nos != FF_I_TYPE ) { if( h->slice_type_nos != FF_I_TYPE ) {
int skip; int skip;
/* a skipped mb needs the aff flag from the following mb */ /* a skipped mb needs the aff flag from the following mb */
if( FRAME_MBAFF && s->mb_x==0 && (s->mb_y&1)==0 )
predict_field_decoding_flag(h);
if( FRAME_MBAFF && (s->mb_y&1)==1 && h->prev_mb_skipped ) if( FRAME_MBAFF && (s->mb_y&1)==1 && h->prev_mb_skipped )
skip = h->next_mb_skipped; skip = h->next_mb_skipped;
else else

2
libavcodec/h264_cavlc.c
View File

@ -547,8 +547,6 @@ int ff_h264_decode_mb_cavlc(H264Context *h){
if(FRAME_MBAFF && (s->mb_y&1) == 0){ if(FRAME_MBAFF && (s->mb_y&1) == 0){
if(s->mb_skip_run==0) if(s->mb_skip_run==0)
h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&s->gb); h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&s->gb);
else
predict_field_decoding_flag(h);
} }
decode_mb_skip(h); decode_mb_skip(h);
return 0; return 0;