har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify code in mv_pred.

Browse Source 
Not benchmarked as this is petty much just code removial.

Originally committed as revision 22066 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2010-02-26 00:08:27 +00:00
parent 358b5b1a59
commit aa5ee59eee
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/h264_mvpred.h
View File

@ -62,14 +62,14 @@ static inline int fetch_diagonal_mv(H264Context *h, const int16_t **C, int i, in
*C = h->mv_cache[list][scan8[0]-2]; *C = h->mv_cache[list][scan8[0]-2];
if(!MB_FIELD if(!MB_FIELD
&& IS_INTERLACED(mb_types[h->left_mb_xy[0]])){ && IS_INTERLACED(h->left_type[0])){
SET_DIAG_MV(*2, >>1, h->left_mb_xy[0]+s->mb_stride, (s->mb_y&1)*2+(i>>4)-1); SET_DIAG_MV(*2, >>1, h->left_mb_xy[0]+s->mb_stride, (s->mb_y&1)*2+(i>>5));
assert(h->left_mb_xy[0] == h->left_mb_xy[1]); assert(h->left_mb_xy[0] == h->left_mb_xy[1]);
} }
if(MB_FIELD if(MB_FIELD
&& !IS_INTERLACED(mb_types[h->left_mb_xy[0]])){ && !IS_INTERLACED(h->left_type[0])){
// left shift will turn LIST_NOT_USED into PART_NOT_AVAILABLE, but that's OK. // left shift will turn LIST_NOT_USED into PART_NOT_AVAILABLE, but that's OK.
SET_DIAG_MV(/2, <<1, h->left_mb_xy[i>=36], (- 1 + ((i-scan8[0])>>3)*2)&3); SET_DIAG_MV(/2, <<1, h->left_mb_xy[i>=36], ((i>>2))&3);
} }
} }
#undef SET_DIAG_MV #undef SET_DIAG_MV