[svn] / trunk / xvidcore / src / motion / motion_inlines.h Repository:
ViewVC logotype

Diff of /trunk/xvidcore/src/motion/motion_inlines.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1563, Wed Nov 24 22:14:11 2004 UTC revision 1564, Sun Dec 5 04:53:01 2004 UTC
# Line 21  Line 21 
21   *  along with this program ; if not, write to the Free Software   *  along with this program ; if not, write to the Free Software
22   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
23   *   *
24   * $Id: motion_inlines.h,v 1.2 2004-03-22 22:36:24 edgomez Exp $   * $Id: motion_inlines.h,v 1.3 2004-12-05 04:53:01 syskin Exp $
25   *   *
26   ****************************************************************************/   ****************************************************************************/
27    
# Line 45  Line 45 
45                    const uint32_t width,                    const uint32_t width,
46                    const uint32_t height,                    const uint32_t height,
47                    const uint32_t fcode,                    const uint32_t fcode,
48                    const int precision, /* 2 for qpel, 1 for halfpel */                    const int precision) /* 2 for qpel, 1 for halfpel */
                   const int rrv)  
49  {  {
50          int k;          int k;
51          const int search_range = 16 << fcode;          const int search_range = 16 << fcode;
52          int high = search_range - 1;          int high = search_range - 1;
53          int low = -search_range;          int low = -search_range;
54    
         if (rrv) {  
                 high = RRV_MV_SCALEUP(high);  
                 low = RRV_MV_SCALEUP(low);  
                 block_sz++;  
         }  
   
55          k = (int)(width - (x<<block_sz))<<precision;          k = (int)(width - (x<<block_sz))<<precision;
56          *max_dx = MIN(high, k);          *max_dx = MIN(high, k);
57          k = (int)(height -  (y<<block_sz))<<precision;          k = (int)(height -  (y<<block_sz))<<precision;
# Line 83  Line 76 
76  };  };
77    
78  static __inline uint32_t  static __inline uint32_t
79  d_mv_bits(int x, int y, const VECTOR pred, const uint32_t iFcode, const int qpel, const int rrv)  d_mv_bits(int x, int y, const VECTOR pred, const uint32_t iFcode, const int qpel)
80  {  {
81          unsigned int bits;          unsigned int bits;
82    
83          x <<= qpel;          x <<= qpel;
84          y <<= qpel;          y <<= qpel;
         if (rrv) { x = RRV_MV_SCALEDOWN(x); y = RRV_MV_SCALEDOWN(y); }  
85    
86          x -= pred.x;          x -= pred.x;
87          bits = (x != 0 ? iFcode:0);          bits = (x != 0 ? iFcode:0);
Legend:
Removed from v.1563  
changed lines
  Added in v.1564
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4