Mercurial > libavcodec.hg
comparison motion_est.c @ 11574:7b86b341edd0 libavcodec
Move comment that belonged to cmp() back to cmp().
| author | michael |
|---|---|
| date | Fri, 02 Apr 2010 01:13:59 +0000 |
| parents | a734f92c94b4 |
| children | 5a7797213359 |
comparison
equal
deleted
inserted
replaced
| 11573:a734f92c94b4 | 11574:7b86b341edd0 |
|---|---|
| 102 return ((c->avctx->flags&CODEC_FLAG_QPEL) ? FLAG_QPEL : 0) | 102 return ((c->avctx->flags&CODEC_FLAG_QPEL) ? FLAG_QPEL : 0) |
| 103 + (direct ? FLAG_DIRECT : 0) | 103 + (direct ? FLAG_DIRECT : 0) |
| 104 + (chroma ? FLAG_CHROMA : 0); | 104 + (chroma ? FLAG_CHROMA : 0); |
| 105 } | 105 } |
| 106 | 106 |
| 107 /*! \brief compares a block (either a full macroblock or a partition thereof) | |
| 108 against a proposed motion-compensated prediction of that block | |
| 109 */ | |
| 110 static av_always_inline int cmp_direct_inline(MpegEncContext *s, const int x, const int y, const int subx, const int suby, | 107 static av_always_inline int cmp_direct_inline(MpegEncContext *s, const int x, const int y, const int subx, const int suby, |
| 111 const int size, const int h, int ref_index, int src_index, | 108 const int size, const int h, int ref_index, int src_index, |
| 112 me_cmp_func cmp_func, me_cmp_func chroma_cmp_func, int qpel){ | 109 me_cmp_func cmp_func, me_cmp_func chroma_cmp_func, int qpel){ |
| 113 MotionEstContext * const c= &s->me; | 110 MotionEstContext * const c= &s->me; |
| 114 const int stride= c->stride; | 111 const int stride= c->stride; |
| 249 }else{ | 246 }else{ |
| 250 return cmp_inline(s,x,y,subx,suby,size,h,ref_index,src_index, cmp_func, chroma_cmp_func, flags&FLAG_QPEL, flags&FLAG_CHROMA); | 247 return cmp_inline(s,x,y,subx,suby,size,h,ref_index,src_index, cmp_func, chroma_cmp_func, flags&FLAG_QPEL, flags&FLAG_CHROMA); |
| 251 } | 248 } |
| 252 } | 249 } |
| 253 | 250 |
| 251 /*! \brief compares a block (either a full macroblock or a partition thereof) | |
| 252 against a proposed motion-compensated prediction of that block | |
| 253 */ | |
| 254 static av_always_inline int cmp(MpegEncContext *s, const int x, const int y, const int subx, const int suby, | 254 static av_always_inline int cmp(MpegEncContext *s, const int x, const int y, const int subx, const int suby, |
| 255 const int size, const int h, int ref_index, int src_index, | 255 const int size, const int h, int ref_index, int src_index, |
| 256 me_cmp_func cmp_func, me_cmp_func chroma_cmp_func, const int flags){ | 256 me_cmp_func cmp_func, me_cmp_func chroma_cmp_func, const int flags){ |
| 257 if(av_builtin_constant_p(flags) && av_builtin_constant_p(h) && av_builtin_constant_p(size) | 257 if(av_builtin_constant_p(flags) && av_builtin_constant_p(h) && av_builtin_constant_p(size) |
| 258 && av_builtin_constant_p(subx) && av_builtin_constant_p(suby) | 258 && av_builtin_constant_p(subx) && av_builtin_constant_p(suby) |