[svn] / branches / dev-api-4 / xvidcore / src / motion / motion_est.c Repository:
ViewVC logotype

Diff of /branches/dev-api-4/xvidcore/src/motion/motion_est.c

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

revision 1023, Wed May 14 20:23:02 2003 UTC revision 1054, Mon Jun 9 13:55:56 2003 UTC
# Line 1  Line 1 
1  /**************************************************************************  /*****************************************************************************
2   *   *
3   *      XVID MPEG-4 VIDEO CODEC   *      XVID MPEG-4 VIDEO CODEC
4   *      motion estimation   *  - Motion Estimation related code  -
5   *   *
6   *      This program is an implementation of a part of one or more MPEG-4   *  Copyright(C) 2002 Christoph Lampert <gruel@web.de>
7   *      Video tools as specified in ISO/IEC 14496-2 standard.  Those intending   *               2002 Michael Militzer <michael@xvid.org>
8   *      to use this software module in hardware or software products are   *               2002-2003 Radoslaw Czyz <xvid@syskin.cjb.net>
  *      advised that its use may infringe existing patents or copyrights, and  
  *      any such use would be at such party's own risk.  The original  
  *      developer of this software module and his/her company, and subsequent  
  *      editors and their companies, will have no liability for use of this  
  *      software or modifications or derivatives thereof.  
9   *   *
10   *      This program is free software; you can redistribute it and/or modify   *      This program is free software; you can redistribute it and/or modify
11   *      it under the terms of the GNU General Public License as published by   *      it under the terms of the GNU General Public License as published by
# Line 24  Line 19 
19   *   *
20   *      You should have received a copy of the GNU General Public License   *      You should have received a copy of the GNU General Public License
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., 675 Mass Ave, Cambridge, MA 02139, USA.   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
23     *
24     * $Id: motion_est.c,v 1.58.2.17 2003-06-09 13:54:37 edgomez Exp $
25   *   *
26   *************************************************************************/   ****************************************************************************/
27    
28  #include <assert.h>  #include <assert.h>
29  #include <stdio.h>  #include <stdio.h>
30  #include <stdlib.h>  #include <stdlib.h>
31  #include <string.h>     // memcpy  #include <string.h>     /* memcpy */
32  #include <math.h>       // lrint  #include <math.h>       /* lrint */
33    
34  #include "../encoder.h"  #include "../encoder.h"
35  #include "../utils/mbfunctions.h"  #include "../utils/mbfunctions.h"
# Line 168  Line 165 
165          const uint32_t stride = data->iEdgedWidth/2;          const uint32_t stride = data->iEdgedWidth/2;
166          int offset = (dx>>1) + (dy>>1)*stride;          int offset = (dx>>1) + (dy>>1)*stride;
167    
168          if (dx == data->temp[5] && dy == data->temp[6]) return data->temp[7]; //it has been checked recently          if (dx == data->temp[5] && dy == data->temp[6]) return data->temp[7]; /* it has been checked recently */
169          data->temp[5] = dx; data->temp[6] = dy; // backup          data->temp[5] = dx; data->temp[6] = dy; /* backup */
170    
171          switch (((dx & 1) << 1) | (dy & 1))     {          switch (((dx & 1) << 1) | (dy & 1))     {
172                  case 0:                  case 0:
# Line 192  Line 189 
189                          sad += sad8(data->CurV, data->RefQ, stride);                          sad += sad8(data->CurV, data->RefQ, stride);
190                          break;                          break;
191          }          }
192          data->temp[7] = sad; //backup, part 2          data->temp[7] = sad; /* backup, part 2 */
193          return sad;          return sad;
194  }  }
195    
196  static __inline const uint8_t *  static __inline const uint8_t *
197  GetReferenceB(const int x, const int y, const uint32_t dir, const SearchData * const data)  GetReferenceB(const int x, const int y, const uint32_t dir, const SearchData * const data)
198  {  {
199  //      dir : 0 = forward, 1 = backward          /* dir : 0 = forward, 1 = backward */
200          const uint8_t *const *const direction = ( dir == 0 ? data->RefP : data->b_RefP );          const uint8_t *const *const direction = ( dir == 0 ? data->RefP : data->b_RefP );
201          const int picture = ((x&1)<<1) | (y&1);          const int picture = ((x&1)<<1) | (y&1);
202          const int offset = (x>>1) + (y>>1)*data->iEdgedWidth;          const int offset = (x>>1) + (y>>1)*data->iEdgedWidth;
203          return direction[picture] + offset;          return direction[picture] + offset;
204  }  }
205    
206  // this is a simpler copy of GetReferenceB, but as it's __inline anyway, we can keep the two separate  /* this is a simpler copy of GetReferenceB, but as it's __inline anyway, we can keep the two separate */
207  static __inline const uint8_t *  static __inline const uint8_t *
208  GetReference(const int x, const int y, const SearchData * const data)  GetReference(const int x, const int y, const SearchData * const data)
209  {  {
# Line 218  Line 215 
215  static uint8_t *  static uint8_t *
216  Interpolate8x8qpel(const int x, const int y, const uint32_t block, const uint32_t dir, const SearchData * const data)  Interpolate8x8qpel(const int x, const int y, const uint32_t block, const uint32_t dir, const SearchData * const data)
217  {  {
218  // create or find a qpel-precision reference picture; return pointer to it          /* create or find a qpel-precision reference picture; return pointer to it */
219          uint8_t * Reference = data->RefQ + 16*dir;          uint8_t * Reference = data->RefQ + 16*dir;
220          const uint32_t iEdgedWidth = data->iEdgedWidth;          const uint32_t iEdgedWidth = data->iEdgedWidth;
221          const uint32_t rounding = data->rounding;          const uint32_t rounding = data->rounding;
# Line 229  Line 226 
226          ref1 = GetReferenceB(halfpel_x, halfpel_y, dir, data);          ref1 = GetReferenceB(halfpel_x, halfpel_y, dir, data);
227          ref1 += 8 * (block&1) + 8 * (block>>1) * iEdgedWidth;          ref1 += 8 * (block&1) + 8 * (block>>1) * iEdgedWidth;
228          switch( ((x&1)<<1) + (y&1) ) {          switch( ((x&1)<<1) + (y&1) ) {
229          case 3: // x and y in qpel resolution - the "corners" (top left/right and          case 3: /* x and y in qpel resolution - the "corners" (top left/right and */
230                          // bottom left/right) during qpel refinement                          /* bottom left/right) during qpel refinement */
231                  ref2 = GetReferenceB(halfpel_x, y - halfpel_y, dir, data);                  ref2 = GetReferenceB(halfpel_x, y - halfpel_y, dir, data);
232                  ref3 = GetReferenceB(x - halfpel_x, halfpel_y, dir, data);                  ref3 = GetReferenceB(x - halfpel_x, halfpel_y, dir, data);
233                  ref4 = GetReferenceB(x - halfpel_x, y - halfpel_y, dir, data);                  ref4 = GetReferenceB(x - halfpel_x, y - halfpel_y, dir, data);
# Line 240  Line 237 
237                  interpolate8x8_avg4(Reference, ref1, ref2, ref3, ref4, iEdgedWidth, rounding);                  interpolate8x8_avg4(Reference, ref1, ref2, ref3, ref4, iEdgedWidth, rounding);
238                  break;                  break;
239    
240          case 1: // x halfpel, y qpel - top or bottom during qpel refinement          case 1: /* x halfpel, y qpel - top or bottom during qpel refinement */
241                  ref2 = GetReferenceB(halfpel_x, y - halfpel_y, dir, data);                  ref2 = GetReferenceB(halfpel_x, y - halfpel_y, dir, data);
242                  ref2 += 8 * (block&1) + 8 * (block>>1) * iEdgedWidth;                  ref2 += 8 * (block&1) + 8 * (block>>1) * iEdgedWidth;
243                  interpolate8x8_avg2(Reference, ref1, ref2, iEdgedWidth, rounding, 8);                  interpolate8x8_avg2(Reference, ref1, ref2, iEdgedWidth, rounding, 8);
244                  break;                  break;
245    
246          case 2: // x qpel, y halfpel - left or right during qpel refinement          case 2: /* x qpel, y halfpel - left or right during qpel refinement */
247                  ref2 = GetReferenceB(x - halfpel_x, halfpel_y, dir, data);                  ref2 = GetReferenceB(x - halfpel_x, halfpel_y, dir, data);
248                  ref2 += 8 * (block&1) + 8 * (block>>1) * iEdgedWidth;                  ref2 += 8 * (block&1) + 8 * (block>>1) * iEdgedWidth;
249                  interpolate8x8_avg2(Reference, ref1, ref2, iEdgedWidth, rounding, 8);                  interpolate8x8_avg2(Reference, ref1, ref2, iEdgedWidth, rounding, 8);
250                  break;                  break;
251    
252          default: // pure halfpel position          default: /* pure halfpel position */
253                  return (uint8_t *) ref1;                  return (uint8_t *) ref1;
254    
255          }          }
# Line 262  Line 259 
259  static uint8_t *  static uint8_t *
260  Interpolate16x16qpel(const int x, const int y, const uint32_t dir, const SearchData * const data)  Interpolate16x16qpel(const int x, const int y, const uint32_t dir, const SearchData * const data)
261  {  {
262  // create or find a qpel-precision reference picture; return pointer to it          /* create or find a qpel-precision reference picture; return pointer to it */
263          uint8_t * Reference = data->RefQ + 16*dir;          uint8_t * Reference = data->RefQ + 16*dir;
264          const uint32_t iEdgedWidth = data->iEdgedWidth;          const uint32_t iEdgedWidth = data->iEdgedWidth;
265          const uint32_t rounding = data->rounding;          const uint32_t rounding = data->rounding;
# Line 272  Line 269 
269    
270          ref1 = GetReferenceB(halfpel_x, halfpel_y, dir, data);          ref1 = GetReferenceB(halfpel_x, halfpel_y, dir, data);
271          switch( ((x&1)<<1) + (y&1) ) {          switch( ((x&1)<<1) + (y&1) ) {
272          case 3: // x and y in qpel resolution - the "corners" (top left/right and          case 3:
273                          // bottom left/right) during qpel refinement                  /*
274                     * x and y in qpel resolution - the "corners" (top left/right and
275                     * bottom left/right) during qpel refinement
276                     */
277                  ref2 = GetReferenceB(halfpel_x, y - halfpel_y, dir, data);                  ref2 = GetReferenceB(halfpel_x, y - halfpel_y, dir, data);
278                  ref3 = GetReferenceB(x - halfpel_x, halfpel_y, dir, data);                  ref3 = GetReferenceB(x - halfpel_x, halfpel_y, dir, data);
279                  ref4 = GetReferenceB(x - halfpel_x, y - halfpel_y, dir, data);                  ref4 = GetReferenceB(x - halfpel_x, y - halfpel_y, dir, data);
# Line 283  Line 283 
283                  interpolate8x8_avg4(Reference+8*iEdgedWidth+8, ref1+8*iEdgedWidth+8, ref2+8*iEdgedWidth+8, ref3+8*iEdgedWidth+8, ref4+8*iEdgedWidth+8, iEdgedWidth, rounding);                  interpolate8x8_avg4(Reference+8*iEdgedWidth+8, ref1+8*iEdgedWidth+8, ref2+8*iEdgedWidth+8, ref3+8*iEdgedWidth+8, ref4+8*iEdgedWidth+8, iEdgedWidth, rounding);
284                  break;                  break;
285    
286          case 1: // x halfpel, y qpel - top or bottom during qpel refinement          case 1: /* x halfpel, y qpel - top or bottom during qpel refinement */
287                  ref2 = GetReferenceB(halfpel_x, y - halfpel_y, dir, data);                  ref2 = GetReferenceB(halfpel_x, y - halfpel_y, dir, data);
288                  interpolate8x8_avg2(Reference, ref1, ref2, iEdgedWidth, rounding, 8);                  interpolate8x8_avg2(Reference, ref1, ref2, iEdgedWidth, rounding, 8);
289                  interpolate8x8_avg2(Reference+8, ref1+8, ref2+8, iEdgedWidth, rounding, 8);                  interpolate8x8_avg2(Reference+8, ref1+8, ref2+8, iEdgedWidth, rounding, 8);
# Line 291  Line 291 
291                  interpolate8x8_avg2(Reference+8*iEdgedWidth+8, ref1+8*iEdgedWidth+8, ref2+8*iEdgedWidth+8, iEdgedWidth, rounding, 8);                  interpolate8x8_avg2(Reference+8*iEdgedWidth+8, ref1+8*iEdgedWidth+8, ref2+8*iEdgedWidth+8, iEdgedWidth, rounding, 8);
292                  break;                  break;
293    
294          case 2: // x qpel, y halfpel - left or right during qpel refinement          case 2: /* x qpel, y halfpel - left or right during qpel refinement */
295                  ref2 = GetReferenceB(x - halfpel_x, halfpel_y, dir, data);                  ref2 = GetReferenceB(x - halfpel_x, halfpel_y, dir, data);
296                  interpolate8x8_avg2(Reference, ref1, ref2, iEdgedWidth, rounding, 8);                  interpolate8x8_avg2(Reference, ref1, ref2, iEdgedWidth, rounding, 8);
297                  interpolate8x8_avg2(Reference+8, ref1+8, ref2+8, iEdgedWidth, rounding, 8);                  interpolate8x8_avg2(Reference+8, ref1+8, ref2+8, iEdgedWidth, rounding, 8);
# Line 299  Line 299 
299                  interpolate8x8_avg2(Reference+8*iEdgedWidth+8, ref1+8*iEdgedWidth+8, ref2+8*iEdgedWidth+8, iEdgedWidth, rounding, 8);                  interpolate8x8_avg2(Reference+8*iEdgedWidth+8, ref1+8*iEdgedWidth+8, ref2+8*iEdgedWidth+8, iEdgedWidth, rounding, 8);
300                  break;                  break;
301    
302          default: // pure halfpel position          default: /* pure halfpel position */
303                  return (uint8_t *) ref1;                  return (uint8_t *) ref1;
304          }          }
305          return Reference;          return Reference;
# Line 322  Line 322 
322                  Reference = GetReference(x, y, data);                  Reference = GetReference(x, y, data);
323                  current = data->currentMV;                  current = data->currentMV;
324                  xc = x; yc = y;                  xc = x; yc = y;
325          } else { // x and y are in 1/4 precision          } else { /* x and y are in 1/4 precision */
326                  Reference = Interpolate16x16qpel(x, y, 0, data);                  Reference = Interpolate16x16qpel(x, y, 0, data);
327                  xc = x/2; yc = y/2; //for chroma sad                  xc = x/2; yc = y/2; /* for chroma sad */
328                  current = data->currentQMV;                  current = data->currentQMV;
329          }          }
330    
# Line 366  Line 366 
366          if (!data->qpel_precision) {          if (!data->qpel_precision) {
367                  Reference = GetReference(x, y, data);                  Reference = GetReference(x, y, data);
368                  current = data->currentMV;                  current = data->currentMV;
369          } else { // x and y are in 1/4 precision          } else { /* x and y are in 1/4 precision */
370                  Reference = Interpolate8x8qpel(x, y, 0, 0, data);                  Reference = Interpolate8x8qpel(x, y, 0, 0, data);
371                  current = data->currentQMV;                  current = data->currentQMV;
372          }          }
# Line 389  Line 389 
389          uint32_t t;          uint32_t t;
390          const uint8_t * Reference;          const uint8_t * Reference;
391    
392          if ( (!(x&1) && x !=0) || (!(y&1) && y !=0) || //non-zero even value          if ( (!(x&1) && x !=0) || (!(y&1) && y !=0) || /* non-zero even value */
393                  (x > data->max_dx) || (x < data->min_dx)                  (x > data->max_dx) || (x < data->min_dx)
394                  || (y > data->max_dy) || (y < data->min_dy) ) return;                  || (y > data->max_dy) || (y < data->min_dy) ) return;
395    
# Line 427  Line 427 
427          if ( (x > data->max_dx) || ( x < data->min_dx)          if ( (x > data->max_dx) || ( x < data->min_dx)
428                  || (y > data->max_dy) || (y < data->min_dy) ) return;                  || (y > data->max_dy) || (y < data->min_dy) ) return;
429    
430          if (data->rrv && (!(x&1) && x !=0) | (!(y&1) && y !=0) ) return; //non-zero even value          if (data->rrv && (!(x&1) && x !=0) | (!(y&1) && y !=0) ) return; /* non-zero even value */
431    
432          if (data->qpel_precision) { // x and y are in 1/4 precision          if (data->qpel_precision) { /* x and y are in 1/4 precision */
433                  Reference = Interpolate16x16qpel(x, y, 0, data);                  Reference = Interpolate16x16qpel(x, y, 0, data);
434                  current = data->currentQMV;                  current = data->currentQMV;
435                  xc = x/2; yc = y/2;                  xc = x/2; yc = y/2;
# Line 457  Line 457 
457  static void  static void
458  CheckCandidate32I(const int x, const int y, const int Direction, int * const dir, const SearchData * const data)  CheckCandidate32I(const int x, const int y, const int Direction, int * const dir, const SearchData * const data)
459  {  {
460  // maximum speed - for P/B/I decision          /* maximum speed - for P/B/I decision */
461          int32_t sad;          int32_t sad;
462    
463          if ( (x > data->max_dx) || (x < data->min_dx)          if ( (x > data->max_dx) || (x < data->min_dx)
# Line 562  Line 562 
562                  } else {                  } else {
563                          xcf += mvs.x; ycf += mvs.y;                          xcf += mvs.x; ycf += mvs.y;
564                          xcb += b_mvs.x; ycb += b_mvs.y;                          xcb += b_mvs.x; ycb += b_mvs.y;
565                          mvs.x *= 2; mvs.y *= 2; //we move to qpel precision anyway                          mvs.x *= 2; mvs.y *= 2; /* we move to qpel precision anyway */
566                          b_mvs.x *= 2; b_mvs.y *= 2;                          b_mvs.x *= 2; b_mvs.y *= 2;
567                  }                  }
568    
# Line 658  Line 658 
658                  ptr = GetReference(x, y, data);                  ptr = GetReference(x, y, data);
659                  current = data->currentMV;                  current = data->currentMV;
660                  xc = x; yc = y;                  xc = x; yc = y;
661          } else { // x and y are in 1/4 precision          } else { /* x and y are in 1/4 precision */
662                  ptr = Interpolate16x16qpel(x, y, 0, data);                  ptr = Interpolate16x16qpel(x, y, 0, data);
663                  current = data->currentQMV;                  current = data->currentQMV;
664                  xc = x/2; yc = y/2;                  xc = x/2; yc = y/2;
# Line 676  Line 676 
676    
677          if (bits >= data->iMinSAD[0]) return;          if (bits >= data->iMinSAD[0]) return;
678    
679          //chroma          /* chroma */
680          xc = (xc >> 1) + roundtab_79[xc & 0x3];          xc = (xc >> 1) + roundtab_79[xc & 0x3];
681          yc = (yc >> 1) + roundtab_79[yc & 0x3];          yc = (yc >> 1) + roundtab_79[yc & 0x3];
682    
683          //chroma U          /* chroma U */
684          ptr = interpolate8x8_switch2(data->RefQ + 64, data->RefP[4], 0, 0, xc, yc,  data->iEdgedWidth/2, data->rounding);          ptr = interpolate8x8_switch2(data->RefQ + 64, data->RefP[4], 0, 0, xc, yc,  data->iEdgedWidth/2, data->rounding);
685          transfer_8to16subro(in, ptr, data->CurU, data->iEdgedWidth/2);          transfer_8to16subro(in, ptr, data->CurU, data->iEdgedWidth/2);
686          bits += Block_CalcBits(coeff, in, data->iQuant, data->quant_type, &cbp, 4);          bits += Block_CalcBits(coeff, in, data->iQuant, data->quant_type, &cbp, 4);
687          if (bits >= data->iMinSAD[0]) return;          if (bits >= data->iMinSAD[0]) return;
688    
689          //chroma V          /* chroma V */
690          ptr = interpolate8x8_switch2(data->RefQ + 64, data->RefP[5], 0, 0, xc, yc,  data->iEdgedWidth/2, data->rounding);          ptr = interpolate8x8_switch2(data->RefQ + 64, data->RefP[5], 0, 0, xc, yc,  data->iEdgedWidth/2, data->rounding);
691          transfer_8to16subro(in, ptr, data->CurV, data->iEdgedWidth/2);          transfer_8to16subro(in, ptr, data->CurV, data->iEdgedWidth/2);
692          bits += Block_CalcBits(coeff, in, data->iQuant, data->quant_type, &cbp, 5);          bits += Block_CalcBits(coeff, in, data->iQuant, data->quant_type, &cbp, 5);
# Line 725  Line 725 
725          if (!data->qpel_precision) {          if (!data->qpel_precision) {
726                  ptr = GetReference(x, y, data);                  ptr = GetReference(x, y, data);
727                  current = data->currentMV;                  current = data->currentMV;
728          } else { // x and y are in 1/4 precision          } else { /* x and y are in 1/4 precision */
729                  ptr = Interpolate8x8qpel(x, y, 0, 0, data);                  ptr = Interpolate8x8qpel(x, y, 0, 0, data);
730                  current = data->currentQMV;                  current = data->currentQMV;
731          }          }
# Line 754  Line 754 
754    
755          int iDirection;          int iDirection;
756    
757          for(;;) { //forever          for(;;) { /* forever */
758                  iDirection = 0;                  iDirection = 0;
759                  if (bDirection & 1) CHECK_CANDIDATE(x - iDiamondSize, y, 1);                  if (bDirection & 1) CHECK_CANDIDATE(x - iDiamondSize, y, 1);
760                  if (bDirection & 2) CHECK_CANDIDATE(x + iDiamondSize, y, 2);                  if (bDirection & 2) CHECK_CANDIDATE(x + iDiamondSize, y, 2);
# Line 763  Line 763 
763    
764                  /* now we're doing diagonal checks near our candidate */                  /* now we're doing diagonal checks near our candidate */
765    
766                  if (iDirection) {               //if anything found                  if (iDirection) {               /* if anything found */
767                          bDirection = iDirection;                          bDirection = iDirection;
768                          iDirection = 0;                          iDirection = 0;
769                          x = data->currentMV->x; y = data->currentMV->y;                          x = data->currentMV->x; y = data->currentMV->y;
770                          if (bDirection & 3) {   //our candidate is left or right                          if (bDirection & 3) {   /* our candidate is left or right */
771                                  CHECK_CANDIDATE(x, y + iDiamondSize, 8);                                  CHECK_CANDIDATE(x, y + iDiamondSize, 8);
772                                  CHECK_CANDIDATE(x, y - iDiamondSize, 4);                                  CHECK_CANDIDATE(x, y - iDiamondSize, 4);
773                          } else {                        // what remains here is up or down                          } else {                        /* what remains here is up or down */
774                                  CHECK_CANDIDATE(x + iDiamondSize, y, 2);                                  CHECK_CANDIDATE(x + iDiamondSize, y, 2);
775                                  CHECK_CANDIDATE(x - iDiamondSize, y, 1);                                  CHECK_CANDIDATE(x - iDiamondSize, y, 1);
776                          }                          }
# Line 779  Line 779 
779                                  bDirection += iDirection;                                  bDirection += iDirection;
780                                  x = data->currentMV->x; y = data->currentMV->y;                                  x = data->currentMV->x; y = data->currentMV->y;
781                          }                          }
782                  } else {                                //about to quit, eh? not so fast....                  } else {                                /* about to quit, eh? not so fast.... */
783                          switch (bDirection) {                          switch (bDirection) {
784                          case 2:                          case 2:
785                                  CHECK_CANDIDATE(x + iDiamondSize, y - iDiamondSize, 2 + 4);                                  CHECK_CANDIDATE(x + iDiamondSize, y - iDiamondSize, 2 + 4);
# Line 817  Line 817 
817                                  CHECK_CANDIDATE(x + iDiamondSize, y + iDiamondSize, 2 + 8);                                  CHECK_CANDIDATE(x + iDiamondSize, y + iDiamondSize, 2 + 8);
818                                  CHECK_CANDIDATE(x - iDiamondSize, y + iDiamondSize, 1 + 8);                                  CHECK_CANDIDATE(x - iDiamondSize, y + iDiamondSize, 1 + 8);
819                                  break;                                  break;
820                          default:                //1+2+4+8 == we didn't find anything at all                          default:                /* 1+2+4+8 == we didn't find anything at all */
821                                  CHECK_CANDIDATE(x - iDiamondSize, y - iDiamondSize, 1 + 4);                                  CHECK_CANDIDATE(x - iDiamondSize, y - iDiamondSize, 1 + 4);
822                                  CHECK_CANDIDATE(x - iDiamondSize, y + iDiamondSize, 1 + 8);                                  CHECK_CANDIDATE(x - iDiamondSize, y + iDiamondSize, 1 + 8);
823                                  CHECK_CANDIDATE(x + iDiamondSize, y - iDiamondSize, 2 + 4);                                  CHECK_CANDIDATE(x + iDiamondSize, y - iDiamondSize, 2 + 4);
824                                  CHECK_CANDIDATE(x + iDiamondSize, y + iDiamondSize, 2 + 8);                                  CHECK_CANDIDATE(x + iDiamondSize, y + iDiamondSize, 2 + 8);
825                                  break;                                  break;
826                          }                          }
827                          if (!iDirection) break;         //ok, the end. really                          if (!iDirection) break;         /* ok, the end. really */
828                          bDirection = iDirection;                          bDirection = iDirection;
829                          x = data->currentMV->x; y = data->currentMV->y;                          x = data->currentMV->x; y = data->currentMV->y;
830                  }                  }
# Line 869  Line 869 
869    
870                  /* now we're doing diagonal checks near our candidate */                  /* now we're doing diagonal checks near our candidate */
871    
872                  if (iDirection) {               //checking if anything found                  if (iDirection) {               /* checking if anything found */
873                          bDirection = iDirection;                          bDirection = iDirection;
874                          iDirection = 0;                          iDirection = 0;
875                          x = data->currentMV->x; y = data->currentMV->y;                          x = data->currentMV->x; y = data->currentMV->y;
876                          if (bDirection & 3) {   //our candidate is left or right                          if (bDirection & 3) {   /* our candidate is left or right */
877                                  CHECK_CANDIDATE(x, y + iDiamondSize, 8);                                  CHECK_CANDIDATE(x, y + iDiamondSize, 8);
878                                  CHECK_CANDIDATE(x, y - iDiamondSize, 4);                                  CHECK_CANDIDATE(x, y - iDiamondSize, 4);
879                          } else {                        // what remains here is up or down                          } else {                        /* what remains here is up or down */
880                                  CHECK_CANDIDATE(x + iDiamondSize, y, 2);                                  CHECK_CANDIDATE(x + iDiamondSize, y, 2);
881                                  CHECK_CANDIDATE(x - iDiamondSize, y, 1);                                  CHECK_CANDIDATE(x - iDiamondSize, y, 1);
882                          }                          }
# Line 894  Line 894 
894  {  {
895  /* Do a half-pel or q-pel refinement */  /* Do a half-pel or q-pel refinement */
896          const VECTOR centerMV = data->qpel_precision ? *data->currentQMV : *data->currentMV;          const VECTOR centerMV = data->qpel_precision ? *data->currentQMV : *data->currentMV;
897          int iDirection; //only needed because macro expects it          int iDirection; /* only needed because macro expects it */
898    
899          CHECK_CANDIDATE(centerMV.x, centerMV.y - 1, 0);          CHECK_CANDIDATE(centerMV.x, centerMV.y - 1, 0);
900          CHECK_CANDIDATE(centerMV.x + 1, centerMV.y - 1, 0);          CHECK_CANDIDATE(centerMV.x + 1, centerMV.y - 1, 0);
# Line 960  Line 960 
960    
961          const int skip_possible = (!(VolFlags & XVID_VOL_GMC)) && (pMB->dquant == 0);          const int skip_possible = (!(VolFlags & XVID_VOL_GMC)) && (pMB->dquant == 0);
962    
963          if (!(VopFlags & XVID_VOP_MODEDECISION_BITS)) { //normal, fast, SAD-based mode decision          if (!(VopFlags & XVID_VOP_MODEDECISION_BITS)) { /* normal, fast, SAD-based mode decision */
964                  int sad;                  int sad;
965                  int InterBias = MV16_INTER_BIAS;                  int InterBias = MV16_INTER_BIAS;
966                  if (inter4v == 0 || Data->iMinSAD[0] < Data->iMinSAD[1] + Data->iMinSAD[2] +                  if (inter4v == 0 || Data->iMinSAD[0] < Data->iMinSAD[1] + Data->iMinSAD[2] +
# Line 984  Line 984 
984    
985                  /* intra decision */                  /* intra decision */
986    
987                  if (iQuant > 8) InterBias += 100 * (iQuant - 8); // to make high quants work                  if (iQuant > 8) InterBias += 100 * (iQuant - 8); /* to make high quants work */
988                  if (y != 0)                  if (y != 0)
989                          if ((pMB - pParam->mb_width)->mode == MODE_INTRA ) InterBias -= 80;                          if ((pMB - pParam->mb_width)->mode == MODE_INTRA ) InterBias -= 80;
990                  if (x != 0)                  if (x != 0)
991                          if ((pMB - 1)->mode == MODE_INTRA ) InterBias -= 80;                          if ((pMB - 1)->mode == MODE_INTRA ) InterBias -= 80;
992    
993                  if (Data->chroma) InterBias += 50; // dev8(chroma) ???                  if (Data->chroma) InterBias += 50; /* dev8(chroma) ??? */
994                  if (Data->rrv) InterBias *= 4;                  if (Data->rrv) InterBias *= 4;
995    
996                  if (InterBias < pMB->sad16) {                  if (InterBias < pMB->sad16) {
# Line 1004  Line 1004 
1004                          if (deviation < (sad - InterBias)) mode = MODE_INTRA;                          if (deviation < (sad - InterBias)) mode = MODE_INTRA;
1005                  }                  }
1006    
1007          } else { // BITS          } else { /* BITS */
1008    
1009                  int bits, intra, i;                  int bits, intra, i;
1010                  VECTOR backup[5], *v;                  VECTOR backup[5], *v;
# Line 1018  Line 1018 
1018    
1019                  bits = CountMBBitsInter(Data, pMBs, x, y, pParam, MotionFlags);                  bits = CountMBBitsInter(Data, pMBs, x, y, pParam, MotionFlags);
1020                  if (bits == 0)                  if (bits == 0)
1021                          mode = MODE_INTER; // quick stop                          mode = MODE_INTER; /* quick stop */
1022                  else {                  else {
1023                          if (inter4v) {                          if (inter4v) {
1024                                  int bits_inter4v = CountMBBitsInter4v(Data, pMB, pMBs, x, y, pParam, MotionFlags, backup);                                  int bits_inter4v = CountMBBitsInter4v(Data, pMB, pMBs, x, y, pParam, MotionFlags, backup);
# Line 1052  Line 1052 
1052    
1053          } else if (mode == MODE_INTER4V)          } else if (mode == MODE_INTER4V)
1054                  pMB->sad16 = Data->iMinSAD[0];                  pMB->sad16 = Data->iMinSAD[0];
1055          else // INTRA, NOT_CODED          else /* INTRA, NOT_CODED */
1056                  SkipMacroblockP(pMB, 0);                  SkipMacroblockP(pMB, 0);
1057    
1058          pMB->mode = mode;          pMB->mode = mode;
# Line 1084  Line 1084 
1084                  (current->vop_flags & XVID_VOP_REDUCED ? 4:1) * \                  (current->vop_flags & XVID_VOP_REDUCED ? 4:1) * \
1085                  (current->vop_flags & XVID_VOP_MODEDECISION_BITS ? 2:1);                  (current->vop_flags & XVID_VOP_MODEDECISION_BITS ? 2:1);
1086    
1087          // some pre-initialized thingies for SearchP          /* some pre-initialized thingies for SearchP */
1088          int32_t temp[8];          int32_t temp[8];
1089          VECTOR currentMV[5];          VECTOR currentMV[5];
1090          VECTOR currentQMV[5];          VECTOR currentQMV[5];
# Line 1111  Line 1111 
1111                  Data.qpel = 0;                  Data.qpel = 0;
1112          }          }
1113    
1114          Data.RefQ = pRefV->u; // a good place, also used in MC (for similar purpose)          Data.RefQ = pRefV->u; /* a good place, also used in MC (for similar purpose) */
1115          if (sadInit) (*sadInit) ();          if (sadInit) (*sadInit) ();
1116    
1117          for (y = 0; y < mb_height; y++) {          for (y = 0; y < mb_height; y++) {
# Line 1145  Line 1145 
1145                          }                          }
1146                          pMB->quant = quant;                          pMB->quant = quant;
1147    
1148  //initial skip decision                          /* initial skip decision */
1149  /* no early skip for GMC (global vector = skip vector is unknown!)  */  /* no early skip for GMC (global vector = skip vector is unknown!)  */
1150                          if (!(current->vol_flags & XVID_VOL_GMC))       { /* no fast SKIP for S(GMC)-VOPs */                          if (!(current->vol_flags & XVID_VOL_GMC))       { /* no fast SKIP for S(GMC)-VOPs */
1151                                  if (pMB->dquant == 0 && sad00 < pMB->quant * skip_thresh)                                  if (pMB->dquant == 0 && sad00 < pMB->quant * skip_thresh)
# Line 1181  Line 1181 
1181  {  {
1182          int mask = 255, j;          int mask = 255, j;
1183          for (j = 0; j < i; j++) {          for (j = 0; j < i; j++) {
1184                  if (MVequal(pmv[i], pmv[j])) return 0; // same vector has been checked already                  if (MVequal(pmv[i], pmv[j])) return 0; /* same vector has been checked already */
1185                  if (pmv[i].x == pmv[j].x) {                  if (pmv[i].x == pmv[j].x) {
1186                          if (pmv[i].y == pmv[j].y + iDiamondSize) mask &= ~4;                          if (pmv[i].y == pmv[j].y + iDiamondSize) mask &= ~4;
1187                          else if (pmv[i].y == pmv[j].y - iDiamondSize) mask &= ~8;                          else if (pmv[i].y == pmv[j].y - iDiamondSize) mask &= ~8;
# Line 1198  Line 1198 
1198  PreparePredictionsP(VECTOR * const pmv, int x, int y, int iWcount,  PreparePredictionsP(VECTOR * const pmv, int x, int y, int iWcount,
1199                          int iHcount, const MACROBLOCK * const prevMB, int rrv)                          int iHcount, const MACROBLOCK * const prevMB, int rrv)
1200  {  {
1201            /* this function depends on get_pmvdata which means that it sucks. It should get the predictions by itself */
 //this function depends on get_pmvdata which means that it sucks. It should get the predictions by itself  
1202          if (rrv) { iWcount /= 2; iHcount /= 2; }          if (rrv) { iWcount /= 2; iHcount /= 2; }
1203    
1204          if ( (y != 0) && (x < (iWcount-1)) ) {          // [5] top-right neighbour          if ( (y != 0) && (x < (iWcount-1)) ) {          /* [5] top-right neighbour */
1205                  pmv[5].x = EVEN(pmv[3].x);                  pmv[5].x = EVEN(pmv[3].x);
1206                  pmv[5].y = EVEN(pmv[3].y);                  pmv[5].y = EVEN(pmv[3].y);
1207          } else pmv[5].x = pmv[5].y = 0;          } else pmv[5].x = pmv[5].y = 0;
1208    
1209          if (x != 0) { pmv[3].x = EVEN(pmv[1].x); pmv[3].y = EVEN(pmv[1].y); }// pmv[3] is left neighbour          if (x != 0) { pmv[3].x = EVEN(pmv[1].x); pmv[3].y = EVEN(pmv[1].y); }/* pmv[3] is left neighbour */
1210          else pmv[3].x = pmv[3].y = 0;          else pmv[3].x = pmv[3].y = 0;
1211    
1212          if (y != 0) { pmv[4].x = EVEN(pmv[2].x); pmv[4].y = EVEN(pmv[2].y); }// [4] top neighbour          if (y != 0) { pmv[4].x = EVEN(pmv[2].x); pmv[4].y = EVEN(pmv[2].y); }/* [4] top neighbour */
1213          else pmv[4].x = pmv[4].y = 0;          else pmv[4].x = pmv[4].y = 0;
1214    
1215          // [1] median prediction          /* [1] median prediction */
1216          pmv[1].x = EVEN(pmv[0].x); pmv[1].y = EVEN(pmv[0].y);          pmv[1].x = EVEN(pmv[0].x); pmv[1].y = EVEN(pmv[0].y);
1217    
1218          pmv[0].x = pmv[0].y = 0; // [0] is zero; not used in the loop (checked before) but needed here for make_mask          pmv[0].x = pmv[0].y = 0; /* [0] is zero; not used in the loop (checked before) but needed here for make_mask */
1219    
1220          pmv[2].x = EVEN(prevMB->mvs[0].x); // [2] is last frame          pmv[2].x = EVEN(prevMB->mvs[0].x); /* [2] is last frame */
1221          pmv[2].y = EVEN(prevMB->mvs[0].y);          pmv[2].y = EVEN(prevMB->mvs[0].y);
1222    
1223          if ((x < iWcount-1) && (y < iHcount-1)) {          if ((x < iWcount-1) && (y < iHcount-1)) {
1224                  pmv[6].x = EVEN((prevMB+1+iWcount)->mvs[0].x); //[6] right-down neighbour in last frame                  pmv[6].x = EVEN((prevMB+1+iWcount)->mvs[0].x); /* [6] right-down neighbour in last frame */
1225                  pmv[6].y = EVEN((prevMB+1+iWcount)->mvs[0].y);                  pmv[6].y = EVEN((prevMB+1+iWcount)->mvs[0].y);
1226          } else pmv[6].x = pmv[6].y = 0;          } else pmv[6].x = pmv[6].y = 0;
1227    
# Line 1262  Line 1261 
1261    
1262          get_pmvdata2(pMBs, pParam->mb_width, 0, x, y, 0, pmv, Data->temp);          get_pmvdata2(pMBs, pParam->mb_width, 0, x, y, 0, pmv, Data->temp);
1263    
1264          Data->temp[5] = Data->temp[6] = 0; // chroma-sad cache          Data->temp[5] = Data->temp[6] = 0; /* chroma-sad cache */
1265          i = Data->rrv ? 2 : 1;          i = Data->rrv ? 2 : 1;
1266          Data->Cur = pCur->y + (x + y * Data->iEdgedWidth) * 16*i;          Data->Cur = pCur->y + (x + y * Data->iEdgedWidth) * 16*i;
1267          Data->CurV = pCur->v + (x + y * (Data->iEdgedWidth/2)) * 8*i;          Data->CurV = pCur->v + (x + y * (Data->iEdgedWidth/2)) * 8*i;
# Line 1292  Line 1291 
1291          Data->iMinSAD[4] = pMB->sad8[3];          Data->iMinSAD[4] = pMB->sad8[3];
1292    
1293          if ((!(VopFlags & XVID_VOP_MODEDECISION_BITS)) || (x | y)) {          if ((!(VopFlags & XVID_VOP_MODEDECISION_BITS)) || (x | y)) {
1294                  threshA = Data->temp[0]; // that's where we keep this SAD atm                  threshA = Data->temp[0]; /* that's where we keep this SAD atm */
1295                  if (threshA < 512) threshA = 512;                  if (threshA < 512) threshA = 512;
1296                  else if (threshA > 1024) threshA = 1024;                  else if (threshA > 1024) threshA = 1024;
1297          } else          } else
# Line 1303  Line 1302 
1302    
1303          if (!Data->rrv) {          if (!Data->rrv) {
1304                  if (inter4v | Data->chroma) CheckCandidate = CheckCandidate16;                  if (inter4v | Data->chroma) CheckCandidate = CheckCandidate16;
1305                          else CheckCandidate = CheckCandidate16no4v; //for extra speed                          else CheckCandidate = CheckCandidate16no4v; /* for extra speed */
1306          } else CheckCandidate = CheckCandidate32;          } else CheckCandidate = CheckCandidate32;
1307    
1308  /* main loop. checking all predictions (but first, which is 0,0 and has been checked in MotionEstimation())*/  /* main loop. checking all predictions (but first, which is 0,0 and has been checked in MotionEstimation())*/
# Line 1366  Line 1365 
1365                          SubpelRefine(Data);                          SubpelRefine(Data);
1366    
1367          for(i = 0; i < 5; i++) {          for(i = 0; i < 5; i++) {
1368                  Data->currentQMV[i].x = 2 * Data->currentMV[i].x; // initialize qpel vectors                  Data->currentQMV[i].x = 2 * Data->currentMV[i].x; /* initialize qpel vectors */
1369                  Data->currentQMV[i].y = 2 * Data->currentMV[i].y;                  Data->currentQMV[i].y = 2 * Data->currentMV[i].y;
1370          }          }
1371    
# Line 1383  Line 1382 
1382    
1383          if (inter4v) {          if (inter4v) {
1384                  SearchData Data8;                  SearchData Data8;
1385                  memcpy(&Data8, Data, sizeof(SearchData)); //quick copy of common data                  memcpy(&Data8, Data, sizeof(SearchData)); /* quick copy of common data */
1386    
1387                  Search8(Data, 2*x, 2*y, MotionFlags, pParam, pMB, pMBs, 0, &Data8);                  Search8(Data, 2*x, 2*y, MotionFlags, pParam, pMB, pMBs, 0, &Data8);
1388                  Search8(Data, 2*x + 1, 2*y, MotionFlags, pParam, pMB, pMBs, 1, &Data8);                  Search8(Data, 2*x + 1, 2*y, MotionFlags, pParam, pMB, pMBs, 1, &Data8);
# Line 1391  Line 1390 
1390                  Search8(Data, 2*x + 1, 2*y + 1, MotionFlags, pParam, pMB, pMBs, 3, &Data8);                  Search8(Data, 2*x + 1, 2*y + 1, MotionFlags, pParam, pMB, pMBs, 3, &Data8);
1391    
1392                  if ((Data->chroma) && (!(VopFlags & XVID_VOP_MODEDECISION_BITS))) {                  if ((Data->chroma) && (!(VopFlags & XVID_VOP_MODEDECISION_BITS))) {
1393                          // chroma is only used for comparsion to INTER. if the comparsion will be done in BITS domain, it will not be used                          /* chroma is only used for comparsion to INTER. if the comparsion will be done in BITS domain, it will not be used */
1394                          int sumx = 0, sumy = 0;                          int sumx = 0, sumy = 0;
1395    
1396                          if (Data->qpel)                          if (Data->qpel)
# Line 1457  Line 1456 
1456                  else CheckCandidate = CheckCandidate16no4v;                  else CheckCandidate = CheckCandidate16no4v;
1457    
1458                  if (MotionFlags & XVID_ME_EXTSEARCH8 && (!(MotionFlags & XVID_ME_EXTSEARCH_BITS))) {                  if (MotionFlags & XVID_ME_EXTSEARCH8 && (!(MotionFlags & XVID_ME_EXTSEARCH_BITS))) {
1459                          int32_t temp_sad = *(Data->iMinSAD); // store current MinSAD                          int32_t temp_sad = *(Data->iMinSAD); /* store current MinSAD */
1460    
1461                          MainSearchFunc *MainSearchPtr;                          MainSearchFunc *MainSearchPtr;
1462                          if (MotionFlags & XVID_ME_USESQUARES8) MainSearchPtr = SquareSearch;                          if (MotionFlags & XVID_ME_USESQUARES8) MainSearchPtr = SquareSearch;
# Line 1467  Line 1466 
1466                          MainSearchPtr(Data->currentMV->x, Data->currentMV->y, Data, 255);                          MainSearchPtr(Data->currentMV->x, Data->currentMV->y, Data, 255);
1467    
1468                          if(*(Data->iMinSAD) < temp_sad) {                          if(*(Data->iMinSAD) < temp_sad) {
1469                                          Data->currentQMV->x = 2 * Data->currentMV->x; // update our qpel vector                                          Data->currentQMV->x = 2 * Data->currentMV->x; /* update our qpel vector */
1470                                          Data->currentQMV->y = 2 * Data->currentMV->y;                                          Data->currentQMV->y = 2 * Data->currentMV->y;
1471                          }                          }
1472                  }                  }
1473    
1474                  if (MotionFlags & XVID_ME_HALFPELREFINE8) {                  if (MotionFlags & XVID_ME_HALFPELREFINE8) {
1475                          int32_t temp_sad = *(Data->iMinSAD); // store current MinSAD                          int32_t temp_sad = *(Data->iMinSAD); /* store current MinSAD */
1476    
1477                          SubpelRefine(Data); // perform halfpel refine of current best vector                          SubpelRefine(Data); /* perform halfpel refine of current best vector */
1478    
1479                          if(*(Data->iMinSAD) < temp_sad) { // we have found a better match                          if(*(Data->iMinSAD) < temp_sad) { /* we have found a better match */
1480                                  Data->currentQMV->x = 2 * Data->currentMV->x; // update our qpel vector                                  Data->currentQMV->x = 2 * Data->currentMV->x; /* update our qpel vector */
1481                                  Data->currentQMV->y = 2 * Data->currentMV->y;                                  Data->currentQMV->y = 2 * Data->currentMV->y;
1482                          }                          }
1483                  }                  }
# Line 1525  Line 1524 
1524                                                          const uint32_t mode_curr)                                                          const uint32_t mode_curr)
1525  {  {
1526    
1527          // [0] is prediction          /* [0] is prediction */
1528          pmv[0].x = EVEN(pmv[0].x); pmv[0].y = EVEN(pmv[0].y);          pmv[0].x = EVEN(pmv[0].x); pmv[0].y = EVEN(pmv[0].y);
1529    
1530          pmv[1].x = pmv[1].y = 0; // [1] is zero          pmv[1].x = pmv[1].y = 0; /* [1] is zero */
1531    
1532          pmv[2] = ChoosePred(pMB, mode_curr);          pmv[2] = ChoosePred(pMB, mode_curr);
1533          pmv[2].x = EVEN(pmv[2].x); pmv[2].y = EVEN(pmv[2].y);          pmv[2].x = EVEN(pmv[2].x); pmv[2].y = EVEN(pmv[2].y);
1534    
1535          if ((y != 0)&&(x != (int)(iWcount+1))) {                        // [3] top-right neighbour          if ((y != 0)&&(x != (int)(iWcount+1))) {                        /* [3] top-right neighbour */
1536                  pmv[3] = ChoosePred(pMB+1-iWcount, mode_curr);                  pmv[3] = ChoosePred(pMB+1-iWcount, mode_curr);
1537                  pmv[3].x = EVEN(pmv[3].x); pmv[3].y = EVEN(pmv[3].y);                  pmv[3].x = EVEN(pmv[3].x); pmv[3].y = EVEN(pmv[3].y);
1538          } else pmv[3].x = pmv[3].y = 0;          } else pmv[3].x = pmv[3].y = 0;
# Line 1579  Line 1578 
1578          *Data->iMinSAD = MV_MAX_ERROR;          *Data->iMinSAD = MV_MAX_ERROR;
1579          Data->iFcode = iFcode;          Data->iFcode = iFcode;
1580          Data->qpel_precision = 0;          Data->qpel_precision = 0;
1581          Data->temp[5] = Data->temp[6] = Data->temp[7] = 256*4096; // reset chroma-sad cache          Data->temp[5] = Data->temp[6] = Data->temp[7] = 256*4096; /* reset chroma-sad cache */
1582    
1583          Data->RefP[0] = pRef->y + (x + Data->iEdgedWidth*y) * 16;          Data->RefP[0] = pRef->y + (x + Data->iEdgedWidth*y) * 16;
1584          Data->RefP[2] = pRefH + (x + Data->iEdgedWidth*y) * 16;          Data->RefP[2] = pRefH + (x + Data->iEdgedWidth*y) * 16;
# Line 1601  Line 1600 
1600          Data->currentMV->x = Data->currentMV->y = 0;          Data->currentMV->x = Data->currentMV->y = 0;
1601          CheckCandidate = CheckCandidate16no4v;          CheckCandidate = CheckCandidate16no4v;
1602    
1603  // main loop. checking all predictions          /* main loop. checking all predictions */
1604          for (i = 0; i < 7; i++) {          for (i = 0; i < 7; i++) {
1605                  if (!(mask = make_mask(pmv, i)) ) continue;                  if (!(mask = make_mask(pmv, i)) ) continue;
1606                  CheckCandidate16no4v(pmv[i].x, pmv[i].y, mask, &iDirection, Data);                  CheckCandidate16no4v(pmv[i].x, pmv[i].y, mask, &iDirection, Data);
# Line 1624  Line 1623 
1623                  SubpelRefine(Data);                  SubpelRefine(Data);
1624          }          }
1625    
1626  // three bits are needed to code backward mode. four for forward          /* three bits are needed to code backward mode. four for forward */
1627    
1628          if (mode_current == MODE_FORWARD) *Data->iMinSAD += 4 * Data->lambda16;          if (mode_current == MODE_FORWARD) *Data->iMinSAD += 4 * Data->lambda16;
1629          else *Data->iMinSAD += 3 * Data->lambda16;          else *Data->iMinSAD += 3 * Data->lambda16;
# Line 1648  Line 1647 
1647          }          }
1648    
1649          if (mode_current == MODE_FORWARD) *(Data->currentMV+2) = *Data->currentMV;          if (mode_current == MODE_FORWARD) *(Data->currentMV+2) = *Data->currentMV;
1650          else *(Data->currentMV+1) = *Data->currentMV; //we store currmv for interpolate search          else *(Data->currentMV+1) = *Data->currentMV; /* we store currmv for interpolate search */
1651  }  }
1652    
1653  static void  static void
# Line 1664  Line 1663 
1663          const int div = 1 + Data->qpel;          const int div = 1 + Data->qpel;
1664          int k;          int k;
1665          const uint32_t stride = Data->iEdgedWidth/2;          const uint32_t stride = Data->iEdgedWidth/2;
1666  //this is not full chroma compensation, only it's fullpel approximation. should work though          /* this is not full chroma compensation, only it's fullpel approximation. should work though */
1667    
1668          for (k = 0; k < 4; k++) {          for (k = 0; k < 4; k++) {
1669                  dy += Data->directmvF[k].y / div;                  dy += Data->directmvF[k].y / div;
# Line 1683  Line 1682 
1682                                          b_Ref->u + (y*8 + b_dy/2) * stride + x*8 + b_dx/2,                                          b_Ref->u + (y*8 + b_dy/2) * stride + x*8 + b_dx/2,
1683                                          stride);                                          stride);
1684    
1685          if (sum >= 2 * MAX_CHROMA_SAD_FOR_SKIP * pMB->quant) return; //no skip          if (sum >= 2 * MAX_CHROMA_SAD_FOR_SKIP * pMB->quant) return; /* no skip */
1686    
1687          sum += sad8bi(pCur->v + 8*x + 8 * y * stride,          sum += sad8bi(pCur->v + 8*x + 8 * y * stride,
1688                                          f_Ref->v + (y*8 + dy/2) * stride + x*8 + dx/2,                                          f_Ref->v + (y*8 + dy/2) * stride + x*8 + dx/2,
# Line 1691  Line 1690 
1690                                          stride);                                          stride);
1691    
1692          if (sum < 2 * MAX_CHROMA_SAD_FOR_SKIP * pMB->quant) {          if (sum < 2 * MAX_CHROMA_SAD_FOR_SKIP * pMB->quant) {
1693                  pMB->mode = MODE_DIRECT_NONE_MV; //skipped                  pMB->mode = MODE_DIRECT_NONE_MV; /* skipped */
1694                  for (k = 0; k < 4; k++) {                  for (k = 0; k < 4; k++) {
1695                          pMB->qmvs[k] = pMB->mvs[k];                          pMB->qmvs[k] = pMB->mvs[k];
1696                          pMB->b_qmvs[k] = pMB->b_mvs[k];                          pMB->b_qmvs[k] = pMB->b_mvs[k];
# Line 1755  Line 1754 
1754                  if ( (pMB->b_mvs[k].x > Data->max_dx) | (pMB->b_mvs[k].x < Data->min_dx)                  if ( (pMB->b_mvs[k].x > Data->max_dx) | (pMB->b_mvs[k].x < Data->min_dx)
1755                          | (pMB->b_mvs[k].y > Data->max_dy) | (pMB->b_mvs[k].y < Data->min_dy) ) {                          | (pMB->b_mvs[k].y > Data->max_dy) | (pMB->b_mvs[k].y < Data->min_dy) ) {
1756    
1757                          *best_sad = 256*4096; // in that case, we won't use direct mode                          *best_sad = 256*4096; /* in that case, we won't use direct mode */
1758                          pMB->mode = MODE_DIRECT; // just to make sure it doesn't say "MODE_DIRECT_NONE_MV"                          pMB->mode = MODE_DIRECT; /* just to make sure it doesn't say "MODE_DIRECT_NONE_MV" */
1759                          pMB->b_mvs[0].x = pMB->b_mvs[0].y = 0;                          pMB->b_mvs[0].x = pMB->b_mvs[0].y = 0;
1760                          return 256*4096;                          return 256*4096;
1761                  }                  }
# Line 1773  Line 1772 
1772    
1773          CheckCandidate(0, 0, 255, &k, Data);          CheckCandidate(0, 0, 255, &k, Data);
1774    
1775  // initial (fast) skip decision          /* initial (fast) skip decision */
1776          if (*Data->iMinSAD < pMB->quant * INITIAL_SKIP_THRESH * (Data->chroma?3:2)) {          if (*Data->iMinSAD < pMB->quant * INITIAL_SKIP_THRESH * (Data->chroma?3:2)) {
1777                  //possible skip                  /* possible skip */
1778                  if (Data->chroma) {                  if (Data->chroma) {
1779                          pMB->mode = MODE_DIRECT_NONE_MV;                          pMB->mode = MODE_DIRECT_NONE_MV;
1780                          return *Data->iMinSAD; // skip.                          return *Data->iMinSAD; /* skip. */
1781                  } else {                  } else {
1782                          SkipDecisionB(pCur, f_Ref, b_Ref, pMB, x, y, Data);                          SkipDecisionB(pCur, f_Ref, b_Ref, pMB, x, y, Data);
1783                          if (pMB->mode == MODE_DIRECT_NONE_MV) return *Data->iMinSAD; // skip.                          if (pMB->mode == MODE_DIRECT_NONE_MV) return *Data->iMinSAD; /* skip. */
1784                  }                  }
1785          }          }
1786    
1787          *Data->iMinSAD += Data->lambda16;          *Data->iMinSAD += Data->lambda16;
1788          skip_sad = *Data->iMinSAD;          skip_sad = *Data->iMinSAD;
1789    
1790  //      DIRECT MODE DELTA VECTOR SEARCH.          /*
1791  //      This has to be made more effective, but at the moment I'm happy it's running at all           * DIRECT MODE DELTA VECTOR SEARCH.
1792             * This has to be made more effective, but at the moment I'm happy it's running at all
1793             */
1794    
1795          if (MotionFlags & XVID_ME_USESQUARES16) MainSearchPtr = SquareSearch;          if (MotionFlags & XVID_ME_USESQUARES16) MainSearchPtr = SquareSearch;
1796                  else if (MotionFlags & XVID_ME_ADVANCEDDIAMOND16) MainSearchPtr = AdvDiamondSearch;                  else if (MotionFlags & XVID_ME_ADVANCEDDIAMOND16) MainSearchPtr = AdvDiamondSearch;
# Line 1802  Line 1803 
1803          *best_sad = *Data->iMinSAD;          *best_sad = *Data->iMinSAD;
1804    
1805          if (Data->qpel || b_mb->mode == MODE_INTER4V) pMB->mode = MODE_DIRECT;          if (Data->qpel || b_mb->mode == MODE_INTER4V) pMB->mode = MODE_DIRECT;
1806          else pMB->mode = MODE_DIRECT_NO4V; //for faster compensation          else pMB->mode = MODE_DIRECT_NO4V; /* for faster compensation */
1807    
1808          pMB->pmvs[3] = *Data->currentMV;          pMB->pmvs[3] = *Data->currentMV;
1809    
# Line 1860  Line 1861 
1861          SearchData bData;          SearchData bData;
1862    
1863          fData->qpel_precision = 0;          fData->qpel_precision = 0;
1864          memcpy(&bData, fData, sizeof(SearchData)); //quick copy of common data          memcpy(&bData, fData, sizeof(SearchData)); /* quick copy of common data */
1865          *fData->iMinSAD = 4096*256;          *fData->iMinSAD = 4096*256;
1866          bData.currentMV++; bData.currentQMV++;          bData.currentMV++; bData.currentQMV++;
1867          fData->iFcode = bData.bFcode = fcode; fData->bFcode = bData.iFcode = bcode;          fData->iFcode = bData.bFcode = fcode; fData->bFcode = bData.iFcode = bcode;
# Line 1899  Line 1900 
1900    
1901          CheckCandidateInt(fData->currentMV[0].x, fData->currentMV[0].y, 255, &iDirection, fData);          CheckCandidateInt(fData->currentMV[0].x, fData->currentMV[0].y, 255, &iDirection, fData);
1902    
1903  //diamond          /* diamond */
1904          do {          do {
1905                  iDirection = 255;                  iDirection = 255;
1906                  // forward MV moves                  /* forward MV moves */
1907                  i = fData->currentMV[0].x; j = fData->currentMV[0].y;                  i = fData->currentMV[0].x; j = fData->currentMV[0].y;
1908    
1909                  CheckCandidateInt(i + 1, j, 0, &iDirection, fData);                  CheckCandidateInt(i + 1, j, 0, &iDirection, fData);
# Line 1910  Line 1911 
1911                  CheckCandidateInt(i - 1, j, 0, &iDirection, fData);                  CheckCandidateInt(i - 1, j, 0, &iDirection, fData);
1912                  CheckCandidateInt(i, j - 1, 0, &iDirection, fData);                  CheckCandidateInt(i, j - 1, 0, &iDirection, fData);
1913    
1914                  // backward MV moves                  /* backward MV moves */
1915                  i = fData->currentMV[1].x; j = fData->currentMV[1].y;                  i = fData->currentMV[1].x; j = fData->currentMV[1].y;
1916                  fData->currentMV[2] = fData->currentMV[0];                  fData->currentMV[2] = fData->currentMV[0];
1917                  CheckCandidateInt(i + 1, j, 0, &iDirection, &bData);                  CheckCandidateInt(i + 1, j, 0, &iDirection, &bData);
# Line 1920  Line 1921 
1921    
1922          } while (!(iDirection));          } while (!(iDirection));
1923    
1924  //qpel refinement          /* qpel refinement */
1925          if (fData->qpel) {          if (fData->qpel) {
1926                  if (*fData->iMinSAD > *best_sad + 500) return;                  if (*fData->iMinSAD > *best_sad + 500) return;
1927                  CheckCandidate = CheckCandidateInt;                  CheckCandidate = CheckCandidateInt;
# Line 1937  Line 1938 
1938                  SubpelRefine(&bData);                  SubpelRefine(&bData);
1939          }          }
1940    
1941          *fData->iMinSAD += (2+3) * fData->lambda16; // two bits are needed to code interpolate mode.          *fData->iMinSAD += (2+3) * fData->lambda16; /* two bits are needed to code interpolate mode. */
1942    
1943          if (*fData->iMinSAD < *best_sad) {          if (*fData->iMinSAD < *best_sad) {
1944                  *best_sad = *fData->iMinSAD;                  *best_sad = *fData->iMinSAD;
# Line 1965  Line 1966 
1966                                           FRAMEINFO * const frame,                                           FRAMEINFO * const frame,
1967                                           const int32_t time_bp,                                           const int32_t time_bp,
1968                                           const int32_t time_pp,                                           const int32_t time_pp,
1969                                           // forward (past) reference                                           /* forward (past) reference */
1970                                           const MACROBLOCK * const f_mbs,                                           const MACROBLOCK * const f_mbs,
1971                                           const IMAGE * const f_ref,                                           const IMAGE * const f_ref,
1972                                           const IMAGE * const f_refH,                                           const IMAGE * const f_refH,
1973                                           const IMAGE * const f_refV,                                           const IMAGE * const f_refV,
1974                                           const IMAGE * const f_refHV,                                           const IMAGE * const f_refHV,
1975                                           // backward (future) reference                                           /* backward (future) reference */
1976                                           const FRAMEINFO * const b_reference,                                           const FRAMEINFO * const b_reference,
1977                                           const IMAGE * const b_ref,                                           const IMAGE * const b_ref,
1978                                           const IMAGE * const b_refH,                                           const IMAGE * const b_refH,
# Line 1989  Line 1990 
1990          const int32_t TRB = time_pp - time_bp;          const int32_t TRB = time_pp - time_bp;
1991          const int32_t TRD = time_pp;          const int32_t TRD = time_pp;
1992    
1993  // some pre-inintialized data for the rest of the search          /* some pre-inintialized data for the rest of the search */
1994    
1995          SearchData Data;          SearchData Data;
1996          int32_t iMinSAD;          int32_t iMinSAD;
# Line 2006  Line 2007 
2007          Data.chroma = frame->motion_flags & XVID_ME_CHROMA8;          Data.chroma = frame->motion_flags & XVID_ME_CHROMA8;
2008          Data.temp = temp;          Data.temp = temp;
2009    
2010          Data.RefQ = f_refV->u; // a good place, also used in MC (for similar purpose)          Data.RefQ = f_refV->u; /* a good place, also used in MC (for similar purpose) */
2011          // note: i==horizontal, j==vertical  
2012            /* note: i==horizontal, j==vertical */
2013          for (j = 0; j < pParam->mb_height; j++) {          for (j = 0; j < pParam->mb_height; j++) {
2014    
2015                  f_predMV = b_predMV = zeroMV;   /* prediction is reset at left boundary */                  f_predMV = b_predMV = zeroMV;   /* prediction is reset at left boundary */
# Line 2043  Line 2045 
2045    
2046                          if (pMB->mode == MODE_DIRECT_NONE_MV) { n_count++; continue; }                          if (pMB->mode == MODE_DIRECT_NONE_MV) { n_count++; continue; }
2047    
2048                          // forward search                          /* forward search */
2049                          SearchBF(f_ref, f_refH->y, f_refV->y, f_refHV->y,                          SearchBF(f_ref, f_refH->y, f_refV->y, f_refHV->y,
2050                                                  &frame->image, i, j,                                                  &frame->image, i, j,
2051                                                  frame->motion_flags,                                                  frame->motion_flags,
# Line 2051  Line 2053 
2053                                                  pMB, &f_predMV, &best_sad,                                                  pMB, &f_predMV, &best_sad,
2054                                                  MODE_FORWARD, &Data);                                                  MODE_FORWARD, &Data);
2055    
2056                          // backward search                          /* backward search */
2057                          SearchBF(b_ref, b_refH->y, b_refV->y, b_refHV->y,                          SearchBF(b_ref, b_refH->y, b_refV->y, b_refHV->y,
2058                                                  &frame->image, i, j,                                                  &frame->image, i, j,
2059                                                  frame->motion_flags,                                                  frame->motion_flags,
# Line 2059  Line 2061 
2061                                                  pMB, &b_predMV, &best_sad,                                                  pMB, &b_predMV, &best_sad,
2062                                                  MODE_BACKWARD, &Data);                                                  MODE_BACKWARD, &Data);
2063    
2064                          // interpolate search comes last, because it uses data from forward and backward as prediction                          /* interpolate search comes last, because it uses data from forward and backward as prediction */
2065                          SearchInterpolate(f_ref, f_refH->y, f_refV->y, f_refHV->y,                          SearchInterpolate(f_ref, f_refH->y, f_refV->y, f_refHV->y,
2066                                                  b_ref, b_refH->y, b_refV->y, b_refHV->y,                                                  b_ref, b_refH->y, b_refV->y, b_refHV->y,
2067                                                  &frame->image,                                                  &frame->image,
# Line 2071  Line 2073 
2073                                                  pMB, &best_sad,                                                  pMB, &best_sad,
2074                                                  &Data);                                                  &Data);
2075    
2076  // final skip decision                          /* final skip decision */
2077                          if ( (skip_sad < frame->quant * MAX_SAD00_FOR_SKIP * 2)                          if ( (skip_sad < frame->quant * MAX_SAD00_FOR_SKIP * 2)
2078                                          && ((100*best_sad)/(skip_sad+1) > FINAL_SKIP_THRESH) )                                          && ((100*best_sad)/(skip_sad+1) > FINAL_SKIP_THRESH) )
2079                                  SkipDecisionB(&frame->image, f_ref, b_ref, pMB, i, j, &Data);                                  SkipDecisionB(&frame->image, f_ref, b_ref, pMB, i, j, &Data);
# Line 2117  Line 2119 
2119    
2120          for (i = 0; i < 5; i++) Data->iMinSAD[i] = MV_MAX_ERROR;          for (i = 0; i < 5; i++) Data->iMinSAD[i] = MV_MAX_ERROR;
2121    
2122          //median is only used as prediction. it doesn't have to be real          /* median is only used as prediction. it doesn't have to be real */
2123          if (x == 1 && y == 1) Data->predMV.x = Data->predMV.y = 0;          if (x == 1 && y == 1) Data->predMV.x = Data->predMV.y = 0;
2124          else          else
2125                  if (x == 1) //left macroblock does not have any vector now                  if (x == 1) /* left macroblock does not have any vector now */
2126                          Data->predMV = (pMB - pParam->mb_width)->mvs[0]; // top instead of median                          Data->predMV = (pMB - pParam->mb_width)->mvs[0]; /* top instead of median */
2127                  else if (y == 1) // top macroblock doesn't have it's vector                  else if (y == 1) /* top macroblock doesn't have it's vector */
2128                          Data->predMV = (pMB - 1)->mvs[0]; // left instead of median                          Data->predMV = (pMB - 1)->mvs[0]; /* left instead of median */
2129                          else Data->predMV = get_pmv2(pMBs, pParam->mb_width, 0, x, y, 0); //else median                          else Data->predMV = get_pmv2(pMBs, pParam->mb_width, 0, x, y, 0); /* else median */
2130    
2131          get_range(&Data->min_dx, &Data->max_dx, &Data->min_dy, &Data->max_dy, x, y, 16,          get_range(&Data->min_dx, &Data->max_dx, &Data->min_dy, &Data->max_dy, x, y, 16,
2132          pParam->width, pParam->height, Data->iFcode - quarterpel, 0, 0);          pParam->width, pParam->height, Data->iFcode - quarterpel, 0, 0);
# Line 2147  Line 2149 
2149                  if (!(mask = make_mask(pmv, 2)))                  if (!(mask = make_mask(pmv, 2)))
2150                          CheckCandidate32I(pmv[2].x, pmv[2].y, mask, &i, Data);                          CheckCandidate32I(pmv[2].x, pmv[2].y, mask, &i, Data);
2151    
2152                  if (*Data->iMinSAD > 4 * MAX_SAD00_FOR_SKIP) // diamond only if needed                  if (*Data->iMinSAD > 4 * MAX_SAD00_FOR_SKIP) /* diamond only if needed */
2153                          DiamondSearch(Data->currentMV->x, Data->currentMV->y, Data, i);                          DiamondSearch(Data->currentMV->x, Data->currentMV->y, Data, i);
2154          }          }
2155    
# Line 2166  Line 2168 
2168  MEanalysis(     const IMAGE * const pRef,  MEanalysis(     const IMAGE * const pRef,
2169                          const FRAMEINFO * const Current,                          const FRAMEINFO * const Current,
2170                          const MBParam * const pParam,                          const MBParam * const pParam,
2171                          const int maxIntra, //maximum number if non-I frames                          const int maxIntra, /* maximum number if non-I frames */
2172                          const int intraCount, //number of non-I frames after last I frame; 0 if we force P/B frame                          const int intraCount, /* number of non-I frames after last I frame; 0 if we force P/B frame */
2173                          const int bCount,  // number of B frames in a row                          const int bCount,  /* number of B frames in a row */
2174                          const int b_thresh)                          const int b_thresh)
2175  {  {
2176          uint32_t x, y, intra = 0;          uint32_t x, y, intra = 0;
# Line 2189  Line 2191 
2191          CheckCandidate = CheckCandidate32I;          CheckCandidate = CheckCandidate32I;
2192    
2193          if (intraCount != 0) {          if (intraCount != 0) {
2194                  if (intraCount < 10) // we're right after an I frame                  if (intraCount < 10) /* we're right after an I frame */
2195                          IntraThresh += 15* (intraCount - 10) * (intraCount - 10);                          IntraThresh += 15* (intraCount - 10) * (intraCount - 10);
2196                  else                  else
2197                          if ( 5*(maxIntra - intraCount) < maxIntra) // we're close to maximum. 2 sec when max is 10 sec                          if ( 5*(maxIntra - intraCount) < maxIntra) /* we're close to maximum. 2 sec when max is 10 sec */
2198                                  IntraThresh -= (IntraThresh * (maxIntra - 8*(maxIntra - intraCount)))/maxIntra;                                  IntraThresh -= (IntraThresh * (maxIntra - 8*(maxIntra - intraCount)))/maxIntra;
2199          }          }
2200    
# Line 2207  Line 2209 
2209                          blocks += 4;                          blocks += 4;
2210    
2211                          if (bCount == 0) pMBs[x + y * pParam->mb_width].mvs[0] = zeroMV;                          if (bCount == 0) pMBs[x + y * pParam->mb_width].mvs[0] = zeroMV;
2212                          else { //extrapolation of the vector found for last frame                          else { /* extrapolation of the vector found for last frame */
2213                                  pMBs[x + y * pParam->mb_width].mvs[0].x =                                  pMBs[x + y * pParam->mb_width].mvs[0].x =
2214                                          (pMBs[x + y * pParam->mb_width].mvs[0].x * (bCount+1) ) / bCount;                                          (pMBs[x + y * pParam->mb_width].mvs[0].x * (bCount+1) ) / bCount;
2215                                  pMBs[x + y * pParam->mb_width].mvs[0].y =                                  pMBs[x + y * pParam->mb_width].mvs[0].y =
# Line 2238  Line 2240 
2240    
2241          if (b_thresh < 20) {          if (b_thresh < 20) {
2242                  s = (10*s) / blocks;                  s = (10*s) / blocks;
2243                  if (s > 4) sSAD += (s - 2) * (40 - 2*b_thresh); //static block - looks bad when in bframe...                  if (s > 4) sSAD += (s - 2) * (40 - 2*b_thresh); /* static block - looks bad when in bframe... */
2244          }          }
2245    
2246          if (sSAD > InterThresh ) return P_VOP;          if (sSAD > InterThresh ) return P_VOP;
# Line 2257  Line 2259 
2259                                  const IMAGE * const pRefHV      )                                  const IMAGE * const pRefHV      )
2260  {  {
2261    
2262          const int deltax=8;             // upper bound for difference between a MV and it's neighbour MVs          const int deltax=8;             /* upper bound for difference between a MV and it's neighbour MVs */
2263          const int deltay=8;          const int deltay=8;
2264          const int grad=512;             // lower bound for deviation in MB          const int grad=512;             /* lower bound for deviation in MB */
2265    
2266          WARPPOINTS gmc;          WARPPOINTS gmc;
2267    
# Line 2281  Line 2283 
2283                                                  gmc.duv[2].x= gmc.duv[2].y = 0;                                                  gmc.duv[2].x= gmc.duv[2].y = 0;
2284                                          return gmc; }                                          return gmc; }
2285    
2286  // filter mask of all blocks          /* filter mask of all blocks */
2287    
2288          for (my = 1; my < (uint32_t)MBh-1; my++)          for (my = 1; my < (uint32_t)MBh-1; my++)
2289          for (mx = 1; mx < (uint32_t)MBw-1; mx++)          for (mx = 1; mx < (uint32_t)MBw-1; mx++)
# Line 2422  Line 2424 
2424                  gmc.duv[2].x=0;                  gmc.duv[2].x=0;
2425                  gmc.duv[2].y=0;                  gmc.duv[2].y=0;
2426          }          }
2427  //      fprintf(stderr,"wp1 = ( %4d, %4d)  wp2 = ( %4d, %4d) \n", gmc.duv[0].x, gmc.duv[0].y, gmc.duv[1].x, gmc.duv[1].y);  /*      fprintf(stderr,"wp1 = ( %4d, %4d)  wp2 = ( %4d, %4d) \n", gmc.duv[0].x, gmc.duv[0].y, gmc.duv[1].x, gmc.duv[1].y); */
2428    
2429          free(MBmask);          free(MBmask);
2430    
2431          return gmc;          return gmc;
2432  }  }
2433    
2434  // functions which perform BITS-based search/bitcount  /* functions which perform BITS-based search/bitcount */
2435    
2436  static int  static int
2437  CountMBBitsInter(SearchData * const Data,  CountMBBitsInter(SearchData * const Data,
# Line 2450  Line 2452 
2452                  Data->qpel_precision = 1;                  Data->qpel_precision = 1;
2453                  CheckCandidateBits16(Data->currentQMV[0].x, Data->currentQMV[0].y, 255, &iDirection, Data);                  CheckCandidateBits16(Data->currentQMV[0].x, Data->currentQMV[0].y, 255, &iDirection, Data);
2454    
2455                  if (MotionFlags & (XVID_ME_HALFPELREFINE16_BITS | XVID_ME_EXTSEARCH_BITS)) { //we have to prepare for halfpixel-precision search                  if (MotionFlags & (XVID_ME_HALFPELREFINE16_BITS | XVID_ME_EXTSEARCH_BITS)) { /* we have to prepare for halfpixel-precision search */
2456                          for(i = 0; i < 5; i++) bsad[i] = Data->iMinSAD[i];                          for(i = 0; i < 5; i++) bsad[i] = Data->iMinSAD[i];
2457                          get_range(&Data->min_dx, &Data->max_dx, &Data->min_dy, &Data->max_dy, x, y, 16,                          get_range(&Data->min_dx, &Data->max_dx, &Data->min_dy, &Data->max_dy, x, y, 16,
2458                                                  pParam->width, pParam->height, Data->iFcode - Data->qpel, 0, Data->rrv);                                                  pParam->width, pParam->height, Data->iFcode - Data->qpel, 0, Data->rrv);
# Line 2459  Line 2461 
2461                                  CheckCandidateBits16(Data->currentMV[0].x, Data->currentMV[0].y, 255, &iDirection, Data);                                  CheckCandidateBits16(Data->currentMV[0].x, Data->currentMV[0].y, 255, &iDirection, Data);
2462                  }                  }
2463    
2464          } else { // not qpel          } else { /* not qpel */
2465    
2466                  CheckCandidateBits16(Data->currentMV[0].x, Data->currentMV[0].y, 255, &iDirection, Data);                  CheckCandidateBits16(Data->currentMV[0].x, Data->currentMV[0].y, 255, &iDirection, Data);
2467          }          }
# Line 2469  Line 2471 
2471          if (MotionFlags&XVID_ME_HALFPELREFINE16_BITS) SubpelRefine(Data);          if (MotionFlags&XVID_ME_HALFPELREFINE16_BITS) SubpelRefine(Data);
2472    
2473          if (Data->qpel) {          if (Data->qpel) {
2474                  if (MotionFlags&(XVID_ME_EXTSEARCH_BITS | XVID_ME_HALFPELREFINE16_BITS)) { // there was halfpel-precision search                  if (MotionFlags&(XVID_ME_EXTSEARCH_BITS | XVID_ME_HALFPELREFINE16_BITS)) { /* there was halfpel-precision search */
2475                          for(i = 0; i < 5; i++) if (bsad[i] > Data->iMinSAD[i]) {                          for(i = 0; i < 5; i++) if (bsad[i] > Data->iMinSAD[i]) {
2476                                  Data->currentQMV[i].x = 2 * Data->currentMV[i].x; // we have found a better match                                  Data->currentQMV[i].x = 2 * Data->currentMV[i].x; /* we have found a better match */
2477                                  Data->currentQMV[i].y = 2 * Data->currentMV[i].y;                                  Data->currentQMV[i].y = 2 * Data->currentMV[i].y;
2478                          }                          }
2479    
2480                          // preparing for qpel-precision search                          /* preparing for qpel-precision search */
2481                          Data->qpel_precision = 1;                          Data->qpel_precision = 1;
2482                          get_range(&Data->min_dx, &Data->max_dx, &Data->min_dy, &Data->max_dy, x, y, 16,                          get_range(&Data->min_dx, &Data->max_dx, &Data->min_dy, &Data->max_dy, x, y, 16,
2483                                          pParam->width, pParam->height, Data->iFcode, 1, 0);                                          pParam->width, pParam->height, Data->iFcode, 1, 0);
# Line 2483  Line 2485 
2485                  if (MotionFlags&XVID_ME_QUARTERPELREFINE16_BITS) SubpelRefine(Data);                  if (MotionFlags&XVID_ME_QUARTERPELREFINE16_BITS) SubpelRefine(Data);
2486          }          }
2487    
2488          if (MotionFlags&XVID_ME_CHECKPREDICTION_BITS) { //let's check vector equal to prediction          if (MotionFlags&XVID_ME_CHECKPREDICTION_BITS) { /* let's check vector equal to prediction */
2489                  VECTOR * v = Data->qpel ? Data->currentQMV : Data->currentMV;                  VECTOR * v = Data->qpel ? Data->currentQMV : Data->currentMV;
2490                  if (!(Data->predMV.x == v->x && Data->predMV.y == v->y))                  if (!(Data->predMV.x == v->x && Data->predMV.y == v->y))
2491                          CheckCandidateBits16(Data->predMV.x, Data->predMV.y, 255, &iDirection, Data);                          CheckCandidateBits16(Data->predMV.x, Data->predMV.y, 255, &iDirection, Data);
# Line 2508  Line 2510 
2510          memcpy(Data8, Data, sizeof(SearchData));          memcpy(Data8, Data, sizeof(SearchData));
2511          CheckCandidate = CheckCandidateBits8;          CheckCandidate = CheckCandidateBits8;
2512    
2513          for (i = 0; i < 4; i++) { //for all luma blocks          for (i = 0; i < 4; i++) { /* for all luma blocks */
2514    
2515                  Data8->iMinSAD = Data->iMinSAD + i + 1;                  Data8->iMinSAD = Data->iMinSAD + i + 1;
2516                  Data8->currentMV = Data->currentMV + i + 1;                  Data8->currentMV = Data->currentMV + i + 1;
# Line 2535  Line 2537 
2537                  *Data8->iMinSAD += BITS_MULT*t;                  *Data8->iMinSAD += BITS_MULT*t;
2538    
2539                  Data8->qpel_precision = Data8->qpel;                  Data8->qpel_precision = Data8->qpel;
2540                  // checking the vector which has been found by SAD-based 8x8 search (if it's different than the one found so far)                  /* checking the vector which has been found by SAD-based 8x8 search (if it's different than the one found so far) */
2541                  {                  {
2542                          VECTOR *v = Data8->qpel ? Data8->currentQMV : Data8->currentMV;                          VECTOR *v = Data8->qpel ? Data8->currentQMV : Data8->currentMV;
2543                          if (!MVequal (*v, backup[i+1]) )                          if (!MVequal (*v, backup[i+1]) )
# Line 2543  Line 2545 
2545                  }                  }
2546    
2547                  if (Data8->qpel) {                  if (Data8->qpel) {
2548                          if (MotionFlags&XVID_ME_HALFPELREFINE8_BITS || (MotionFlags&XVID_ME_EXTSEARCH8 && MotionFlags&XVID_ME_EXTSEARCH_BITS)) { // halfpixel motion search follows                          if (MotionFlags&XVID_ME_HALFPELREFINE8_BITS || (MotionFlags&XVID_ME_EXTSEARCH8 && MotionFlags&XVID_ME_EXTSEARCH_BITS)) { /* halfpixel motion search follows */
2549                                  int32_t s = *Data8->iMinSAD;                                  int32_t s = *Data8->iMinSAD;
2550                                  Data8->currentMV->x = Data8->currentQMV->x/2;                                  Data8->currentMV->x = Data8->currentQMV->x/2;
2551                                  Data8->currentMV->y = Data8->currentQMV->y/2;                                  Data8->currentMV->y = Data8->currentQMV->y/2;
# Line 2560  Line 2562 
2562                                  if (MotionFlags & XVID_ME_HALFPELREFINE8_BITS)                                  if (MotionFlags & XVID_ME_HALFPELREFINE8_BITS)
2563                                          SubpelRefine(Data8);                                          SubpelRefine(Data8);
2564    
2565                                  if(s > *Data8->iMinSAD) { //we have found a better match                                  if(s > *Data8->iMinSAD) { /* we have found a better match */
2566                                          Data8->currentQMV->x = 2*Data8->currentMV->x;                                          Data8->currentQMV->x = 2*Data8->currentMV->x;
2567                                          Data8->currentQMV->y = 2*Data8->currentMV->y;                                          Data8->currentQMV->y = 2*Data8->currentMV->y;
2568                                  }                                  }
# Line 2572  Line 2574 
2574                          }                          }
2575                          if (MotionFlags & XVID_ME_QUARTERPELREFINE8_BITS) SubpelRefine(Data8);                          if (MotionFlags & XVID_ME_QUARTERPELREFINE8_BITS) SubpelRefine(Data8);
2576    
2577                  } else { // not qpel                  } else { /* not qpel */
2578    
2579                          if (MotionFlags & XVID_ME_EXTSEARCH8 && MotionFlags & XVID_ME_EXTSEARCH_BITS) //extsearch                          if (MotionFlags & XVID_ME_EXTSEARCH8 && MotionFlags & XVID_ME_EXTSEARCH_BITS) /* extsearch */
2580                                  SquareSearch(Data8->currentMV->x, Data8->currentMV->x, Data8, 255);                                  SquareSearch(Data8->currentMV->x, Data8->currentMV->x, Data8, 255);
2581    
2582                          if (MotionFlags & XVID_ME_HALFPELREFINE8_BITS)                          if (MotionFlags & XVID_ME_HALFPELREFINE8_BITS)
2583                                  SubpelRefine(Data8); //halfpel refinement                                  SubpelRefine(Data8); /* halfpel refinement */
2584                  }                  }
2585    
2586                  //checking vector equal to predicion                  /* checking vector equal to predicion */
2587                  if (i != 0 && MotionFlags & XVID_ME_CHECKPREDICTION_BITS) {                  if (i != 0 && MotionFlags & XVID_ME_CHECKPREDICTION_BITS) {
2588                          const VECTOR * v = Data->qpel ? Data8->currentQMV : Data8->currentMV;                          const VECTOR * v = Data->qpel ? Data8->currentQMV : Data8->currentMV;
2589                          if (!MVequal(*v, Data8->predMV))                          if (!MVequal(*v, Data8->predMV))
# Line 2589  Line 2591 
2591                  }                  }
2592    
2593                  bits += *Data8->iMinSAD;                  bits += *Data8->iMinSAD;
2594                  if (bits >= Data->iMinSAD[0]) return bits; // no chances for INTER4V                  if (bits >= Data->iMinSAD[0]) return bits; /* no chances for INTER4V */
2595    
2596                  // MB structures for INTER4V mode; we have to set them here, we don't have predictor anywhere else                  /* MB structures for INTER4V mode; we have to set them here, we don't have predictor anywhere else */
2597                  if(Data->qpel) {                  if(Data->qpel) {
2598                          pMB->pmvs[i].x = Data8->currentQMV->x - Data8->predMV.x;                          pMB->pmvs[i].x = Data8->currentQMV->x - Data8->predMV.x;
2599                          pMB->pmvs[i].y = Data8->currentQMV->y - Data8->predMV.y;                          pMB->pmvs[i].y = Data8->currentQMV->y - Data8->predMV.y;
# Line 2608  Line 2610 
2610                  pMB->sad8[i] = 4 * *Data8->iMinSAD;                  pMB->sad8[i] = 4 * *Data8->iMinSAD;
2611                  if (Data8->temp[0]) cbp |= 1 << (5 - i);                  if (Data8->temp[0]) cbp |= 1 << (5 - i);
2612    
2613          } // /for all luma blocks          } /* /for all luma blocks */
2614    
2615          bits += BITS_MULT*xvid_cbpy_tab[15-(cbp>>2)].len;          bits += BITS_MULT*xvid_cbpy_tab[15-(cbp>>2)].len;
2616    
2617          // let's check chroma          /* let's check chroma */
2618          sumx = (sumx >> 3) + roundtab_76[sumx & 0xf];          sumx = (sumx >> 3) + roundtab_76[sumx & 0xf];
2619          sumy = (sumy >> 3) + roundtab_76[sumy & 0xf];          sumy = (sumy >> 3) + roundtab_76[sumy & 0xf];
2620    
2621          //chroma U          /* chroma U */
2622          ptr = interpolate8x8_switch2(Data->RefQ + 64, Data->RefP[4], 0, 0, sumx, sumy, Data->iEdgedWidth/2, Data->rounding);          ptr = interpolate8x8_switch2(Data->RefQ + 64, Data->RefP[4], 0, 0, sumx, sumy, Data->iEdgedWidth/2, Data->rounding);
2623          transfer_8to16subro(in, Data->CurU, ptr, Data->iEdgedWidth/2);          transfer_8to16subro(in, Data->CurU, ptr, Data->iEdgedWidth/2);
2624          bits += Block_CalcBits(coeff, in, Data->iQuant, Data->quant_type, &cbp, 4);          bits += Block_CalcBits(coeff, in, Data->iQuant, Data->quant_type, &cbp, 4);
2625    
2626          if (bits >= *Data->iMinSAD) return bits;          if (bits >= *Data->iMinSAD) return bits;
2627    
2628          //chroma V          /* chroma V */
2629          ptr = interpolate8x8_switch2(Data->RefQ + 64, Data->RefP[5], 0, 0, sumx, sumy, Data->iEdgedWidth/2, Data->rounding);          ptr = interpolate8x8_switch2(Data->RefQ + 64, Data->RefP[5], 0, 0, sumx, sumy, Data->iEdgedWidth/2, Data->rounding);
2630          transfer_8to16subro(in, Data->CurV, ptr, Data->iEdgedWidth/2);          transfer_8to16subro(in, Data->CurV, ptr, Data->iEdgedWidth/2);
2631          bits += Block_CalcBits(coeff, in, Data->iQuant, Data->quant_type, &cbp, 5);          bits += Block_CalcBits(coeff, in, Data->iQuant, Data->quant_type, &cbp, 5);
# Line 2636  Line 2638 
2638  static int  static int
2639  CountMBBitsIntra(const SearchData * const Data)  CountMBBitsIntra(const SearchData * const Data)
2640  {  {
2641          int bits = BITS_MULT*1; //this one is ac/dc prediction flag bit          int bits = BITS_MULT*1; /* this one is ac/dc prediction flag bit */
2642          int cbp = 0, i, dc = 0;          int cbp = 0, i, dc = 0;
2643          int16_t *in = Data->dctSpace, * coeff = Data->dctSpace + 64;          int16_t *in = Data->dctSpace, * coeff = Data->dctSpace + 64;
2644    
# Line 2650  Line 2652 
2652    
2653          bits += BITS_MULT*xvid_cbpy_tab[cbp>>2].len;          bits += BITS_MULT*xvid_cbpy_tab[cbp>>2].len;
2654    
2655          //chroma U          /*chroma U */
2656          transfer_8to16copy(in, Data->CurU, Data->iEdgedWidth/2);          transfer_8to16copy(in, Data->CurU, Data->iEdgedWidth/2);
2657          bits += Block_CalcBitsIntra(coeff, in, Data->iQuant, Data->quant_type, &cbp, 4, &dc);          bits += Block_CalcBitsIntra(coeff, in, Data->iQuant, Data->quant_type, &cbp, 4, &dc);
2658    
2659          if (bits >= Data->iMinSAD[0]) return bits;          if (bits >= Data->iMinSAD[0]) return bits;
2660    
2661          //chroma V          /* chroma V */
2662          transfer_8to16copy(in, Data->CurV, Data->iEdgedWidth/2);          transfer_8to16copy(in, Data->CurV, Data->iEdgedWidth/2);
2663          bits += Block_CalcBitsIntra(coeff, in, Data->iQuant, Data->quant_type, &cbp, 5, &dc);          bits += Block_CalcBitsIntra(coeff, in, Data->iQuant, Data->quant_type, &cbp, 5, &dc);
2664    

Legend:
Removed from v.1023  
changed lines
  Added in v.1054

No admin address has been configured
ViewVC Help
Powered by ViewVC 1.0.4