diff options
| author | Jeff Downs <heydowns@borg.com> | 2007-10-13 05:50:11 +0000 |
|---|---|---|
| committer | Andreas Öman <andreas@lonelycoder.com> | 2007-10-13 05:50:11 +0000 |
| commit | 0d43dd8c2d1e8dc7cf0bc65b95b7612cbe01c060 (patch) | |
| tree | c92a995c0717fe5965b5176f101aea8f7ccbc99d /libavcodec/h264.c | |
| parent | b8a9dfb7f6706d56bc0e71bd5348e676ac96d14d (diff) | |
Simplify tests for field macroblocks
patch by Jeff Downs, heydowns a borg d com
Originally committed as revision 10721 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 3d11fb181f..9633995239 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1703,7 +1703,7 @@ static inline void mc_dir_part(H264Context *h, Picture *pic, int n, int square, const int full_mx= mx>>2; const int full_my= my>>2; const int pic_width = 16*s->mb_width; - const int pic_height = 16*s->mb_height >> (MB_MBAFF || FIELD_PICTURE); + const int pic_height = 16*s->mb_height >> MB_FIELD; if(!pic->data[0]) //FIXME this is unacceptable, some senseable error concealment must be done for missing reference frames return; @@ -1727,7 +1727,7 @@ static inline void mc_dir_part(H264Context *h, Picture *pic, int n, int square, if(ENABLE_GRAY && s->flags&CODEC_FLAG_GRAY) return; - if(MB_MBAFF || FIELD_PICTURE){ + if(MB_FIELD){ // chroma offset when predicting from a field of opposite parity my += 2 * ((s->mb_y & 1) - (h->ref_cache[list][scan8[n]] & 1)); emu |= (my>>3) < 0 || (my>>3) + 8 >= (pic_height>>1); @@ -1762,7 +1762,7 @@ static inline void mc_part_std(H264Context *h, int n, int square, int chroma_hei dest_cb += x_offset + y_offset*h->mb_uvlinesize; dest_cr += x_offset + y_offset*h->mb_uvlinesize; x_offset += 8*s->mb_x; - y_offset += 8*(s->mb_y >> (MB_MBAFF || FIELD_PICTURE)); + y_offset += 8*(s->mb_y >> MB_FIELD); if(list0){ Picture *ref= &h->ref_list[0][ h->ref_cache[0][ scan8[n] ] ]; @@ -1795,7 +1795,7 @@ static inline void mc_part_weighted(H264Context *h, int n, int square, int chrom dest_cb += x_offset + y_offset*h->mb_uvlinesize; dest_cr += x_offset + y_offset*h->mb_uvlinesize; x_offset += 8*s->mb_x; - y_offset += 8*(s->mb_y >> (MB_MBAFF || FIELD_PICTURE)); + y_offset += 8*(s->mb_y >> MB_FIELD); if(list0 && list1){ /* don't optimize for luma-only case, since B-frames usually |