Diff of /xvidcore/src/motion/motion_est.c

-revision 1.58.2.16, Mon Jun  9 01:22:11 2003 UTC
+revision 1.72, Thu Jun 26 10:37:09 2003 UTC
 Line 31
  #include <assert.h>
  #include <stdio.h>
  #include <stdlib.h>
- #include <string.h>     /* memcpy */
+ #include <string.h>     // memcpy
- #include <math.h>       /* lrint */
+ #include <math.h>       // lrint
  #include "../encoder.h"
  #include "../utils/mbfunctions.h"
 Line 168
          const uint32_t stride = data->iEdgedWidth/2;
          int offset = (dx>>1) + (dy>>1)*stride;
-         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
-         data->temp[5] = dx; data->temp[6] = dy; /* backup */
+         data->temp[5] = dx; data->temp[6] = dy; // backup
          switch (((dx & 1) << 1) | (dy & 1))     {
                  case 0:
 Line 192
                          sad += sad8(data->CurV, data->RefQ, stride);
                          break;
          }
-         data->temp[7] = sad; /* backup, part 2 */
+         data->temp[7] = sad; //backup, part 2
          return sad;
  }
  static __inline const uint8_t *
  GetReferenceB(const int x, const int y, const uint32_t dir, const SearchData * const data)
  {
-         /* dir : 0 = forward, 1 = backward */
+ //      dir : 0 = forward, 1 = backward
          const uint8_t *const *const direction = ( dir == 0 ? data->RefP : data->b_RefP );
          const int picture = ((x&1)<<1) | (y&1);
          const int offset = (x>>1) + (y>>1)*data->iEdgedWidth;
          return direction[picture] + offset;
  }
- /* 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
  static __inline const uint8_t *
  GetReference(const int x, const int y, const SearchData * const data)
  {
 Line 218
  static uint8_t *
  Interpolate8x8qpel(const int x, const int y, const uint32_t block, const uint32_t dir, const SearchData * const data)
  {
-         /* create or find a qpel-precision reference picture; return pointer to it */
+ // create or find a qpel-precision reference picture; return pointer to it
          uint8_t * Reference = data->RefQ + 16*dir;
          const uint32_t iEdgedWidth = data->iEdgedWidth;
          const uint32_t rounding = data->rounding;
 Line 229
          ref1 = GetReferenceB(halfpel_x, halfpel_y, dir, data);
          ref1 += 8 * (block&1) + 8 * (block>>1) * iEdgedWidth;
          switch( ((x&1)<<1) + (y&1) ) {
-         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
-                         /* bottom left/right) during qpel refinement */
+                         // bottom left/right) during qpel refinement
                  ref2 = GetReferenceB(halfpel_x, y - halfpel_y, dir, data);
                  ref3 = GetReferenceB(x - halfpel_x, halfpel_y, dir, data);
                  ref4 = GetReferenceB(x - halfpel_x, y - halfpel_y, dir, data);
 Line 240
                  interpolate8x8_avg4(Reference, ref1, ref2, ref3, ref4, iEdgedWidth, rounding);
                  break;
-         case 1: /* x halfpel, y qpel - top or bottom during qpel refinement */
+         case 1: // x halfpel, y qpel - top or bottom during qpel refinement
                  ref2 = GetReferenceB(halfpel_x, y - halfpel_y, dir, data);
                  ref2 += 8 * (block&1) + 8 * (block>>1) * iEdgedWidth;
                  interpolate8x8_avg2(Reference, ref1, ref2, iEdgedWidth, rounding, 8);
                  break;
-         case 2: /* x qpel, y halfpel - left or right during qpel refinement */
+         case 2: // x qpel, y halfpel - left or right during qpel refinement
                  ref2 = GetReferenceB(x - halfpel_x, halfpel_y, dir, data);
                  ref2 += 8 * (block&1) + 8 * (block>>1) * iEdgedWidth;
                  interpolate8x8_avg2(Reference, ref1, ref2, iEdgedWidth, rounding, 8);
                  break;
-         default: /* pure halfpel position */
+         default: // pure halfpel position
                  return (uint8_t *) ref1;
          }
 Line 262
  static uint8_t *
  Interpolate16x16qpel(const int x, const int y, const uint32_t dir, const SearchData * const data)
  {
-         /* create or find a qpel-precision reference picture; return pointer to it */
+ // create or find a qpel-precision reference picture; return pointer to it
          uint8_t * Reference = data->RefQ + 16*dir;
          const uint32_t iEdgedWidth = data->iEdgedWidth;
          const uint32_t rounding = data->rounding;
 Line 272
          ref1 = GetReferenceB(halfpel_x, halfpel_y, dir, data);
          switch( ((x&1)<<1) + (y&1) ) {
-         case 3:
+         case 3: // x and y in qpel resolution - the "corners" (top left/right and
-                 /*
+                         // bottom left/right) during qpel refinement
-                  * x and y in qpel resolution - the "corners" (top left/right and
-                  * bottom left/right) during qpel refinement
-                  */
                  ref2 = GetReferenceB(halfpel_x, y - halfpel_y, dir, data);
                  ref3 = GetReferenceB(x - halfpel_x, halfpel_y, dir, data);
                  ref4 = GetReferenceB(x - halfpel_x, y - halfpel_y, dir, data);
-Line 286
+Line 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);
                  break;
-         case 1: /* x halfpel, y qpel - top or bottom during qpel refinement */
+         case 1: // x halfpel, y qpel - top or bottom during qpel refinement
                  ref2 = GetReferenceB(halfpel_x, y - halfpel_y, dir, data);
                  interpolate8x8_avg2(Reference, ref1, ref2, iEdgedWidth, rounding, 8);
                  interpolate8x8_avg2(Reference+8, ref1+8, ref2+8, iEdgedWidth, rounding, 8);
-Line 294
+Line 291
                  interpolate8x8_avg2(Reference+8*iEdgedWidth+8, ref1+8*iEdgedWidth+8, ref2+8*iEdgedWidth+8, iEdgedWidth, rounding, 8);
                  break;
-         case 2: /* x qpel, y halfpel - left or right during qpel refinement */
+         case 2: // x qpel, y halfpel - left or right during qpel refinement
                  ref2 = GetReferenceB(x - halfpel_x, halfpel_y, dir, data);
                  interpolate8x8_avg2(Reference, ref1, ref2, iEdgedWidth, rounding, 8);
                  interpolate8x8_avg2(Reference+8, ref1+8, ref2+8, iEdgedWidth, rounding, 8);
-Line 302
+Line 299
                  interpolate8x8_avg2(Reference+8*iEdgedWidth+8, ref1+8*iEdgedWidth+8, ref2+8*iEdgedWidth+8, iEdgedWidth, rounding, 8);
                  break;
-         default: /* pure halfpel position */
+         default: // pure halfpel position
                  return (uint8_t *) ref1;
          }
          return Reference;
-Line 325
+Line 322
                  Reference = GetReference(x, y, data);
                  current = data->currentMV;
                  xc = x; yc = y;
-         } else { /* x and y are in 1/4 precision */
+         } else { // x and y are in 1/4 precision
                  Reference = Interpolate16x16qpel(x, y, 0, data);
-                 xc = x/2; yc = y/2; /* for chroma sad */
+                 xc = x/2; yc = y/2; //for chroma sad
                  current = data->currentQMV;
          }
-Line 369
+Line 366
          if (!data->qpel_precision) {
                  Reference = GetReference(x, y, data);
                  current = data->currentMV;
-         } else { /* x and y are in 1/4 precision */
+         } else { // x and y are in 1/4 precision
                  Reference = Interpolate8x8qpel(x, y, 0, 0, data);
                  current = data->currentQMV;
          }
-Line 392
+Line 389
          uint32_t t;
          const uint8_t * Reference;
-         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
                  (x > data->max_dx) || (x < data->min_dx)
                  || (y > data->max_dy) || (y < data->min_dy) ) return;
-Line 430
+Line 427
          if ( (x > data->max_dx) || ( x < data->min_dx)
                  || (y > data->max_dy) || (y < data->min_dy) ) return;
-         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
-         if (data->qpel_precision) { /* x and y are in 1/4 precision */
+         if (data->qpel_precision) { // x and y are in 1/4 precision
                  Reference = Interpolate16x16qpel(x, y, 0, data);
                  current = data->currentQMV;
                  xc = x/2; yc = y/2;
-Line 460
+Line 457
  static void
  CheckCandidate32I(const int x, const int y, const int Direction, int * const dir, const SearchData * const data)
  {
-         /* maximum speed - for P/B/I decision */
+ // maximum speed - for P/B/I decision
          int32_t sad;
          if ( (x > data->max_dx) || (x < data->min_dx)
-Line 565
+Line 562
                  } else {
                          xcf += mvs.x; ycf += mvs.y;
                          xcb += b_mvs.x; ycb += b_mvs.y;
-                         mvs.x *= 2; mvs.y *= 2; /* we move to qpel precision anyway */
+                         mvs.x *= 2; mvs.y *= 2; //we move to qpel precision anyway
                          b_mvs.x *= 2; b_mvs.y *= 2;
                  }
-Line 661
+Line 658
                  ptr = GetReference(x, y, data);
                  current = data->currentMV;
                  xc = x; yc = y;
-         } else { /* x and y are in 1/4 precision */
+         } else { // x and y are in 1/4 precision
                  ptr = Interpolate16x16qpel(x, y, 0, data);
                  current = data->currentQMV;
                  xc = x/2; yc = y/2;
-Line 670
+Line 667
          for(i = 0; i < 4; i++) {
                  int s = 8*((i&1) + (i>>1)*data->iEdgedWidth);
                  transfer_8to16subro(in, data->Cur + s, ptr + s, data->iEdgedWidth);
-                 bits += data->temp[i] = Block_CalcBits(coeff, in, data->iQuant, data->quant_type, &cbp, i);
+                 bits += data->temp[i] = Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp, i);
          }
          bits += t = BITS_MULT*d_mv_bits(x, y, data->predMV, data->iFcode, data->qpel^data->qpel_precision, 0);
+         //8x8 blocks for inter4v mode
+         if (data->temp[0] + t < data->iMinSAD[1]) {
+                 data->iMinSAD[1] = data->temp[0] + t; current[1].x = x; current[1].y = y; }
+         if (data->temp[1] < data->iMinSAD[2]) {
+                 data->iMinSAD[2] = data->temp[1]; current[2].x = x; current[2].y = y; }
+         if (data->temp[2] < data->iMinSAD[3]) {
+                 data->iMinSAD[3] = data->temp[2]; current[3].x = x; current[3].y = y; }
+         if (data->temp[3] < data->iMinSAD[4]) {
+                 data->iMinSAD[4] = data->temp[3]; current[4].x = x; current[4].y = y; }
          bits += BITS_MULT*xvid_cbpy_tab[15-(cbp>>2)].len;
          if (bits >= data->iMinSAD[0]) return;
-         /* chroma */
+         //chroma
          xc = (xc >> 1) + roundtab_79[xc & 0x3];
          yc = (yc >> 1) + roundtab_79[yc & 0x3];
-         /* chroma U */
+         //chroma U
          ptr = interpolate8x8_switch2(data->RefQ + 64, data->RefP[4], 0, 0, xc, yc,  data->iEdgedWidth/2, data->rounding);
          transfer_8to16subro(in, ptr, data->CurU, data->iEdgedWidth/2);
-         bits += Block_CalcBits(coeff, in, data->iQuant, data->quant_type, &cbp, 4);
+         bits += Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp, 4);
          if (bits >= data->iMinSAD[0]) return;
-         /* chroma V */
+         //chroma V
          ptr = interpolate8x8_switch2(data->RefQ + 64, data->RefP[5], 0, 0, xc, yc,  data->iEdgedWidth/2, data->rounding);
          transfer_8to16subro(in, ptr, data->CurV, data->iEdgedWidth/2);
-         bits += Block_CalcBits(coeff, in, data->iQuant, data->quant_type, &cbp, 5);
+         bits += Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp, 5);
          bits += BITS_MULT*mcbpc_inter_tab[(MODE_INTER & 7) | ((cbp & 3) << 3)].len;
-Line 701
+Line 708
                  current[0].x = x; current[0].y = y;
                  *dir = Direction;
          }
-         if (data->temp[0] + t < data->iMinSAD[1]) {
-                 data->iMinSAD[1] = data->temp[0] + t; current[1].x = x; current[1].y = y; }
-         if (data->temp[1] < data->iMinSAD[2]) {
-                 data->iMinSAD[2] = data->temp[1]; current[2].x = x; current[2].y = y; }
-         if (data->temp[2] < data->iMinSAD[3]) {
-                 data->iMinSAD[3] = data->temp[2]; current[3].x = x; current[3].y = y; }
-         if (data->temp[3] < data->iMinSAD[4]) {
-                 data->iMinSAD[4] = data->temp[3]; current[4].x = x; current[4].y = y; }
  }
  static void
  CheckCandidateBits8(const int x, const int y, const int Direction, int * const dir, const SearchData * const data)
-Line 728
+Line 725
          if (!data->qpel_precision) {
                  ptr = GetReference(x, y, data);
                  current = data->currentMV;
-         } else { /* x and y are in 1/4 precision */
+         } else { // x and y are in 1/4 precision
                  ptr = Interpolate8x8qpel(x, y, 0, 0, data);
                  current = data->currentQMV;
          }
          transfer_8to16subro(in, data->Cur, ptr, data->iEdgedWidth);
-         bits = Block_CalcBits(coeff, in, data->iQuant, data->quant_type, &cbp, 5);
+         bits = Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp, 5);
          bits += BITS_MULT*d_mv_bits(x, y, data->predMV, data->iFcode, data->qpel^data->qpel_precision, 0);
          if (bits < data->iMinSAD[0]) {
-Line 757
+Line 754
          int iDirection;
-         for(;;) { /* forever */
+         for(;;) { //forever
                  iDirection = 0;
                  if (bDirection & 1) CHECK_CANDIDATE(x - iDiamondSize, y, 1);
                  if (bDirection & 2) CHECK_CANDIDATE(x + iDiamondSize, y, 2);
-Line 766
+Line 763
                  /* now we're doing diagonal checks near our candidate */
-                 if (iDirection) {               /* if anything found */
+                 if (iDirection) {               //if anything found
                          bDirection = iDirection;
                          iDirection = 0;
                          x = data->currentMV->x; y = data->currentMV->y;
-                         if (bDirection & 3) {   /* our candidate is left or right */
+                         if (bDirection & 3) {   //our candidate is left or right
                                  CHECK_CANDIDATE(x, y + iDiamondSize, 8);
                                  CHECK_CANDIDATE(x, y - iDiamondSize, 4);
-                         } else {                        /* what remains here is up or down */
+                         } else {                        // what remains here is up or down
                                  CHECK_CANDIDATE(x + iDiamondSize, y, 2);
                                  CHECK_CANDIDATE(x - iDiamondSize, y, 1);
                          }
-Line 782
+Line 779
                                  bDirection += iDirection;
                                  x = data->currentMV->x; y = data->currentMV->y;
                          }
-                 } else {                                /* about to quit, eh? not so fast.... */
+                 } else {                                //about to quit, eh? not so fast....
                          switch (bDirection) {
                          case 2:
                                  CHECK_CANDIDATE(x + iDiamondSize, y - iDiamondSize, 2 + 4);
-Line 820
+Line 817
                                  CHECK_CANDIDATE(x + iDiamondSize, y + iDiamondSize, 2 + 8);
                                  CHECK_CANDIDATE(x - iDiamondSize, y + iDiamondSize, 1 + 8);
                                  break;
-                         default:                /* 1+2+4+8 == we didn't find anything at all */
+                         default:                //1+2+4+8 == we didn't find anything at all
                                  CHECK_CANDIDATE(x - iDiamondSize, y - iDiamondSize, 1 + 4);
                                  CHECK_CANDIDATE(x - iDiamondSize, y + iDiamondSize, 1 + 8);
                                  CHECK_CANDIDATE(x + iDiamondSize, y - iDiamondSize, 2 + 4);
                                  CHECK_CANDIDATE(x + iDiamondSize, y + iDiamondSize, 2 + 8);
                                  break;
                          }
-                         if (!iDirection) break;         /* ok, the end. really */
+                         if (!iDirection) break;         //ok, the end. really
                          bDirection = iDirection;
                          x = data->currentMV->x; y = data->currentMV->y;
                  }
-Line 872
+Line 869
                  /* now we're doing diagonal checks near our candidate */
-                 if (iDirection) {               /* checking if anything found */
+                 if (iDirection) {               //checking if anything found
                          bDirection = iDirection;
                          iDirection = 0;
                          x = data->currentMV->x; y = data->currentMV->y;
-                         if (bDirection & 3) {   /* our candidate is left or right */
+                         if (bDirection & 3) {   //our candidate is left or right
                                  CHECK_CANDIDATE(x, y + iDiamondSize, 8);
                                  CHECK_CANDIDATE(x, y - iDiamondSize, 4);
-                         } else {                        /* what remains here is up or down */
+                         } else {                        // what remains here is up or down
                                  CHECK_CANDIDATE(x + iDiamondSize, y, 2);
                                  CHECK_CANDIDATE(x - iDiamondSize, y, 1);
                          }
-Line 897
+Line 894
  {
  /* Do a half-pel or q-pel refinement */
          const VECTOR centerMV = data->qpel_precision ? *data->currentQMV : *data->currentMV;
-         int iDirection; /* only needed because macro expects it */
+         int iDirection; //only needed because macro expects it
          CHECK_CANDIDATE(centerMV.x, centerMV.y - 1, 0);
          CHECK_CANDIDATE(centerMV.x + 1, centerMV.y - 1, 0);
-Line 952
+Line 949
                          const int x, const int y,
                          const MBParam * const pParam,
                          const uint32_t MotionFlags,
-                         const uint32_t VopFlags,
+                         const uint32_t GlobalFlags,
-                         const uint32_t VolFlags,
                          const IMAGE * const pCurrent,
                          const IMAGE * const pRef)
  {
          int mode = MODE_INTER;
-         int inter4v = (VopFlags & XVID_VOP_INTER4V) && (pMB->dquant == 0);
+         int inter4v = (GlobalFlags & XVID_INTER4V) && (pMB->dquant == NO_CHANGE);
          const uint32_t iQuant = pMB->quant;
-         const int skip_possible = (!(VolFlags & XVID_VOL_GMC)) && (pMB->dquant == 0);
+         const int skip_possible = (!(GlobalFlags & XVID_GMC)) && (pMB->dquant == NO_CHANGE);
-         if (!(VopFlags & XVID_VOP_MODEDECISION_BITS)) { /* normal, fast, SAD-based mode decision */
+         if (!(GlobalFlags & XVID_MODEDECISION_BITS)) { //normal, fast, SAD-based mode decision
                  int sad;
                  int InterBias = MV16_INTER_BIAS;
                  if (inter4v == 0 || Data->iMinSAD[0] < Data->iMinSAD[1] + Data->iMinSAD[2] +
-Line 977
+Line 973
                          Data->iMinSAD[0] = sad;
                  }
-                 /* final skip decision, a.k.a. "the vector you found, really that good?" */
+                 // final skip decision, a.k.a. "the vector you found, really that good?"
                  if (skip_possible && (pMB->sad16 < (int)iQuant * MAX_SAD00_FOR_SKIP))
                          if ( (100*sad)/(pMB->sad16+1) > FINAL_SKIP_THRESH)
                                  if (Data->chroma || SkipDecisionP(pCurrent, pRef, x, y, Data->iEdgedWidth/2, iQuant, Data->rrv)) {
-Line 985
+Line 981
                                          sad = 0;
                                  }
-                 /* intra decision */
+                 // intra decision
-                 if (iQuant > 8) InterBias += 100 * (iQuant - 8); /* to make high quants work */
+                 if (iQuant > 8) InterBias += 100 * (iQuant - 8); // to make high quants work
                  if (y != 0)
                          if ((pMB - pParam->mb_width)->mode == MODE_INTRA ) InterBias -= 80;
                  if (x != 0)
                          if ((pMB - 1)->mode == MODE_INTRA ) InterBias -= 80;
-                 if (Data->chroma) InterBias += 50; /* dev8(chroma) ??? */
+                 if (Data->chroma) InterBias += 50; // dev8(chroma) ???
                  if (Data->rrv) InterBias *= 4;
                  if (InterBias < pMB->sad16) {
-Line 1007
+Line 1003
                          if (deviation < (sad - InterBias)) mode = MODE_INTRA;
                  }
-         } else { /* BITS */
+         } else { // BITS
                  int bits, intra, i;
                  VECTOR backup[5], *v;
-Line 1021
+Line 1017
                  bits = CountMBBitsInter(Data, pMBs, x, y, pParam, MotionFlags);
                  if (bits == 0)
-                         mode = MODE_INTER; /* quick stop */
+                         mode = MODE_INTER; // quick stop
                  else {
                          if (inter4v) {
                                  int bits_inter4v = CountMBBitsInter4v(Data, pMB, pMBs, x, y, pParam, MotionFlags, backup);
-Line 1055
+Line 1051
          } else if (mode == MODE_INTER4V)
                  pMB->sad16 = Data->iMinSAD[0];
-         else /* INTRA, NOT_CODED */
+         else // INTRA, NOT_CODED
                  SkipMacroblockP(pMB, 0);
          pMB->mode = mode;
-Line 1077
+Line 1073
          uint32_t mb_width = pParam->mb_width;
          uint32_t mb_height = pParam->mb_height;
          const uint32_t iEdgedWidth = pParam->edged_width;
-         const uint32_t MotionFlags = MakeGoodMotionFlags(current->motion_flags, current->vop_flags, current->vol_flags);
+         const uint32_t MotionFlags = MakeGoodMotionFlags(current->motion_flags, current->global_flags);
          uint32_t x, y;
          uint32_t iIntra = 0;
          int32_t quant = current->quant, sad00;
-         int skip_thresh = \
+         int skip_thresh = INITIAL_SKIP_THRESH *
-                 INITIAL_SKIP_THRESH * \
+                 (current->global_flags & XVID_REDUCED ? 4:1) *
-                 (current->vop_flags & XVID_VOP_REDUCED ? 4:1) * \
+                 (current->global_flags & XVID_MODEDECISION_BITS ? 2:1);
-                 (current->vop_flags & XVID_VOP_MODEDECISION_BITS ? 2:1);
-         /* some pre-initialized thingies for SearchP */
+         // some pre-initialized thingies for SearchP
          int32_t temp[8];
          VECTOR currentMV[5];
          VECTOR currentQMV[5];
          int32_t iMinSAD[5];
-         DECLARE_ALIGNED_MATRIX(dct_space, 2, 64, int16_t, CACHE_LINE);
+         DECLARE_ALIGNED_MATRIX(dct_space, 3, 64, int16_t, CACHE_LINE);
          SearchData Data;
          memset(&Data, 0, sizeof(SearchData));
          Data.iEdgedWidth = iEdgedWidth;
-Line 1102
+Line 1097
          Data.temp = temp;
          Data.iFcode = current->fcode;
          Data.rounding = pParam->m_rounding_type;
-         Data.qpel = (current->vol_flags & XVID_VOL_QUARTERPEL ? 1:0);
+         Data.qpel = pParam->m_quarterpel;
-         Data.chroma = MotionFlags & XVID_ME_CHROMA16;
+         Data.chroma = MotionFlags & PMV_CHROMA16;
-         Data.rrv = (current->vop_flags & XVID_VOP_REDUCED ? 1:0);
+         Data.rrv = current->global_flags & XVID_REDUCED;
          Data.dctSpace = dct_space;
-         Data.quant_type = !(pParam->vol_flags & XVID_VOL_MPEGQUANT);
+         Data.quant_type = pParam->m_quant_type;
-         if ((current->vop_flags & XVID_VOP_REDUCED)) {
+         if ((current->global_flags & XVID_REDUCED)) {
                  mb_width = (pParam->width + 31) / 32;
                  mb_height = (pParam->height + 31) / 32;
                  Data.qpel = 0;
          }
-         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)
          if (sadInit) (*sadInit) ();
          for (y = 0; y < mb_height; y++) {
-Line 1141
+Line 1136
                          sad00 = pMB->sad16;
-                         if (pMB->dquant != 0) {
+                         if (!(current->global_flags & XVID_LUMIMASKING))
+                                 pMB->dquant = NO_CHANGE;
+                         else {
+                                 if (pMB->dquant != NO_CHANGE) {
                                  quant += DQtab[pMB->dquant];
                                  if (quant > 31) quant = 31;
                                  else if (quant < 1) quant = 1;
                          }
+                         }
                          pMB->quant = quant;
-                         /* initial skip decision */
+ //initial skip decision
                          /* no early skip for GMC (global vector = skip vector is unknown!)  */
-                         if (!(current->vol_flags & XVID_VOL_GMC))       { /* no fast SKIP for S(GMC)-VOPs */
+                         if (!(current->global_flags & XVID_GMC))        { /* no fast SKIP for S(GMC)-VOPs */
-                                 if (pMB->dquant == 0 && sad00 < pMB->quant * skip_thresh)
+                                 if (pMB->dquant == NO_CHANGE && sad00 < quant * skip_thresh)
                                          if (Data.chroma || SkipDecisionP(pCurrent, pRef, x, y, iEdgedWidth/2, pMB->quant, Data.rrv)) {
                                                  SkipMacroblockP(pMB, sad00);
                                                  continue;
-Line 1159
+Line 1158
                          }
                          SearchP(pRef, pRefH->y, pRefV->y, pRefHV->y, pCurrent, x,
-                                         y, MotionFlags, current->vop_flags, current->vol_flags,
+                                                 y, MotionFlags, current->global_flags,
                                          &Data, pParam, pMBs, reference->mbs, pMB);
                          ModeDecision(&Data, pMB, pMBs, x, y, pParam,
-                                                  MotionFlags, current->vop_flags, current->vol_flags,
+                                                         MotionFlags, current->global_flags,
                                                   pCurrent, pRef);
                          if (pMB->mode == MODE_INTRA)
-Line 1171
+Line 1170
                  }
          }
-         if (current->vol_flags & XVID_VOL_GMC ) /* GMC only for S(GMC)-VOPs */
+         if (current->global_flags & XVID_GMC )  /* GMC only for S(GMC)-VOPs */
          {
                  current->warp = GlobalMotionEst( pMBs, pParam, current, reference, pRefH, pRefV, pRefHV);
          }
-Line 1184
+Line 1183
  {
          int mask = 255, j;
          for (j = 0; j < i; j++) {
-                 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
                  if (pmv[i].x == pmv[j].x) {
                          if (pmv[i].y == pmv[j].y + iDiamondSize) mask &= ~4;
                          else if (pmv[i].y == pmv[j].y - iDiamondSize) mask &= ~8;
-Line 1201
+Line 1200
  PreparePredictionsP(VECTOR * const pmv, int x, int y, int iWcount,
                          int iHcount, const MACROBLOCK * const prevMB, int rrv)
  {
-         /* 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
          if (rrv) { iWcount /= 2; iHcount /= 2; }
-         if ( (y != 0) && (x < (iWcount-1)) ) {          /* [5] top-right neighbour */
+         if ( (y != 0) && (x < (iWcount-1)) ) {          // [5] top-right neighbour
                  pmv[5].x = EVEN(pmv[3].x);
                  pmv[5].y = EVEN(pmv[3].y);
          } else pmv[5].x = pmv[5].y = 0;
-         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
          else pmv[3].x = pmv[3].y = 0;
-         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
          else pmv[4].x = pmv[4].y = 0;
-         /* [1] median prediction */
+         // [1] median prediction
          pmv[1].x = EVEN(pmv[0].x); pmv[1].y = EVEN(pmv[0].y);
-         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
-         pmv[2].x = EVEN(prevMB->mvs[0].x); /* [2] is last frame */
+         pmv[2].x = EVEN(prevMB->mvs[0].x); // [2] is last frame
          pmv[2].y = EVEN(prevMB->mvs[0].y);
          if ((x < iWcount-1) && (y < iHcount-1)) {
-                 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
                  pmv[6].y = EVEN((prevMB+1+iWcount)->mvs[0].y);
          } else pmv[6].x = pmv[6].y = 0;
 Line 1246
                  const int x,
                  const int y,
                  const uint32_t MotionFlags,
-                 const uint32_t VopFlags,
+                 const uint32_t GlobalFlags,
-                 const uint32_t VolFlags,
                  SearchData * const Data,
                  const MBParam * const pParam,
                  const MACROBLOCK * const pMBs,
-Line 1257
+Line 1256
          int i, iDirection = 255, mask, threshA;
          VECTOR pmv[7];
-         int inter4v = (VopFlags & XVID_VOP_INTER4V) && (pMB->dquant == 0);
+         int inter4v = (GlobalFlags & XVID_INTER4V) && (pMB->dquant == NO_CHANGE);
          get_range(&Data->min_dx, &Data->max_dx, &Data->min_dy, &Data->max_dy, x, y, 16,
                                                  pParam->width, pParam->height, Data->iFcode - Data->qpel, 0, Data->rrv);
          get_pmvdata2(pMBs, pParam->mb_width, 0, x, y, 0, pmv, Data->temp);
-         Data->temp[5] = Data->temp[6] = 0; /* chroma-sad cache */
+         Data->temp[5] = Data->temp[6] = 0; // chroma-sad cache
          i = Data->rrv ? 2 : 1;
          Data->Cur = pCur->y + (x + y * Data->iEdgedWidth) * 16*i;
          Data->CurV = pCur->v + (x + y * (Data->iEdgedWidth/2)) * 8*i;
-Line 1293
+Line 1292
          Data->iMinSAD[3] = pMB->sad8[2];
          Data->iMinSAD[4] = pMB->sad8[3];
-         if ((!(VopFlags & XVID_VOP_MODEDECISION_BITS)) || (x | y)) {
+         if ((!(GlobalFlags & XVID_MODEDECISION_BITS)) && (x | y)) {
-                 threshA = Data->temp[0]; /* that's where we keep this SAD atm */
+                 threshA = Data->temp[0]; // that's where we keep this SAD atm
                  if (threshA < 512) threshA = 512;
                  else if (threshA > 1024) threshA = 1024;
          } else
-Line 1305
+Line 1304
          if (!Data->rrv) {
                  if (inter4v | Data->chroma) CheckCandidate = CheckCandidate16;
-                         else CheckCandidate = CheckCandidate16no4v; /* for extra speed */
+                         else CheckCandidate = CheckCandidate16no4v; //for extra speed
          } else CheckCandidate = CheckCandidate32;
  /* main loop. checking all predictions (but first, which is 0,0 and has been checked in MotionEstimation())*/
-Line 1323
+Line 1322
          else {
                  MainSearchFunc * MainSearchPtr;
-                 if (MotionFlags & XVID_ME_USESQUARES16) MainSearchPtr = SquareSearch;
+                 if (MotionFlags & PMV_USESQUARES16) MainSearchPtr = SquareSearch;
-                 else if (MotionFlags & XVID_ME_ADVANCEDDIAMOND16) MainSearchPtr = AdvDiamondSearch;
+                 else if (MotionFlags & PMV_ADVANCEDDIAMOND16) MainSearchPtr = AdvDiamondSearch;
                          else MainSearchPtr = DiamondSearch;
                  MainSearchPtr(Data->currentMV->x, Data->currentMV->y, Data, iDirection);
-Line 1333
+Line 1332
          note that this search is/might be done in halfpel positions,
          which makes it more different than the diamond above */
-                 if (MotionFlags & XVID_ME_EXTSEARCH16) {
+                 if (MotionFlags & PMV_EXTSEARCH16) {
                          int32_t bSAD;
                          VECTOR startMV = Data->predMV, backupMV = Data->currentMV[0];
                          if (Data->rrv) {
-Line 1364
+Line 1363
                  }
          }
-         if (MotionFlags & XVID_ME_HALFPELREFINE16)
+         if (MotionFlags & PMV_HALFPELREFINE16)
                          SubpelRefine(Data);
          for(i = 0; i < 5; i++) {
-                 Data->currentQMV[i].x = 2 * Data->currentMV[i].x; /* initialize qpel vectors */
+                 Data->currentQMV[i].x = 2 * Data->currentMV[i].x; // initialize qpel vectors
                  Data->currentQMV[i].y = 2 * Data->currentMV[i].y;
          }
-Line 1376
+Line 1375
                  get_range(&Data->min_dx, &Data->max_dx, &Data->min_dy, &Data->max_dy, x, y, 16,
                                  pParam->width, pParam->height, Data->iFcode, 1, 0);
                  Data->qpel_precision = 1;
-                 if (MotionFlags & XVID_ME_QUARTERPELREFINE16)
+                 if (MotionFlags & PMV_QUARTERPELREFINE16)
                          SubpelRefine(Data);
          }
-Line 1385
+Line 1384
          if (inter4v) {
                  SearchData Data8;
-                 memcpy(&Data8, Data, sizeof(SearchData)); /* quick copy of common data */
+                 memcpy(&Data8, Data, sizeof(SearchData)); //quick copy of common data
                  Search8(Data, 2*x, 2*y, MotionFlags, pParam, pMB, pMBs, 0, &Data8);
                  Search8(Data, 2*x + 1, 2*y, MotionFlags, pParam, pMB, pMBs, 1, &Data8);
                  Search8(Data, 2*x, 2*y + 1, MotionFlags, pParam, pMB, pMBs, 2, &Data8);
                  Search8(Data, 2*x + 1, 2*y + 1, MotionFlags, pParam, pMB, pMBs, 3, &Data8);
-                 if ((Data->chroma) && (!(VopFlags & XVID_VOP_MODEDECISION_BITS))) {
+                 if ((Data->chroma) && (!(GlobalFlags & XVID_MODEDECISION_BITS))) {
-                         /* 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
                          int sumx = 0, sumy = 0;
                          if (Data->qpel)
-Line 1440
+Line 1439
          *(Data->iMinSAD) += (Data->lambda8 * i * (*Data->iMinSAD + NEIGH_8X8_BIAS))>>10;
-         if (MotionFlags & (XVID_ME_EXTSEARCH8|XVID_ME_HALFPELREFINE8|XVID_ME_QUARTERPELREFINE8)) {
+         if (MotionFlags & (PMV_EXTSEARCH8|PMV_HALFPELREFINE8|PMV_QUARTERPELREFINE8)) {
                  if (Data->rrv) i = 16; else i = 8;
-Line 1458
+Line 1457
                  if (!Data->rrv) CheckCandidate = CheckCandidate8;
                  else CheckCandidate = CheckCandidate16no4v;
-                 if (MotionFlags & XVID_ME_EXTSEARCH8 && (!(MotionFlags & XVID_ME_EXTSEARCH_BITS))) {
+                 if (MotionFlags & PMV_EXTSEARCH8 && (!(MotionFlags & EXTSEARCH_BITS))) {
-                         int32_t temp_sad = *(Data->iMinSAD); /* store current MinSAD */
+                         int32_t temp_sad = *(Data->iMinSAD); // store current MinSAD
                          MainSearchFunc *MainSearchPtr;
-                         if (MotionFlags & XVID_ME_USESQUARES8) MainSearchPtr = SquareSearch;
+                         if (MotionFlags & PMV_USESQUARES8) MainSearchPtr = SquareSearch;
-                                 else if (MotionFlags & XVID_ME_ADVANCEDDIAMOND8) MainSearchPtr = AdvDiamondSearch;
+                                 else if (MotionFlags & PMV_ADVANCEDDIAMOND8) MainSearchPtr = AdvDiamondSearch;
                                          else MainSearchPtr = DiamondSearch;
                          MainSearchPtr(Data->currentMV->x, Data->currentMV->y, Data, 255);
                          if(*(Data->iMinSAD) < temp_sad) {
-                                         Data->currentQMV->x = 2 * Data->currentMV->x; /* update our qpel vector */
+                                         Data->currentQMV->x = 2 * Data->currentMV->x; // update our qpel vector
                                          Data->currentQMV->y = 2 * Data->currentMV->y;
                          }
                  }
-                 if (MotionFlags & XVID_ME_HALFPELREFINE8) {
+                 if (MotionFlags & PMV_HALFPELREFINE8) {
-                         int32_t temp_sad = *(Data->iMinSAD); /* store current MinSAD */
+                         int32_t temp_sad = *(Data->iMinSAD); // store current MinSAD
-                         SubpelRefine(Data); /* perform halfpel refine of current best vector */
+                         SubpelRefine(Data); // perform halfpel refine of current best vector
-                         if(*(Data->iMinSAD) < temp_sad) { /* we have found a better match */
+                         if(*(Data->iMinSAD) < temp_sad) { // we have found a better match
-                                 Data->currentQMV->x = 2 * Data->currentMV->x; /* update our qpel vector */
+                                 Data->currentQMV->x = 2 * Data->currentMV->x; // update our qpel vector
                                  Data->currentQMV->y = 2 * Data->currentMV->y;
                          }
                  }
-                 if (Data->qpel && MotionFlags & XVID_ME_QUARTERPELREFINE8) {
+                 if (Data->qpel && MotionFlags & PMV_QUARTERPELREFINE8) {
                                  Data->qpel_precision = 1;
                                  get_range(&Data->min_dx, &Data->max_dx, &Data->min_dy, &Data->max_dy, x, y, 8,
                                          pParam->width, pParam->height, Data->iFcode, 1, 0);
-Line 1527
+Line 1526
                                                          const uint32_t mode_curr)
  {
-         /* [0] is prediction */
+         // [0] is prediction
          pmv[0].x = EVEN(pmv[0].x); pmv[0].y = EVEN(pmv[0].y);
-         pmv[1].x = pmv[1].y = 0; /* [1] is zero */
+         pmv[1].x = pmv[1].y = 0; // [1] is zero
          pmv[2] = ChoosePred(pMB, mode_curr);
          pmv[2].x = EVEN(pmv[2].x); pmv[2].y = EVEN(pmv[2].y);
-         if ((y != 0)&&(x != (int)(iWcount+1))) {                        /* [3] top-right neighbour */
+         if ((y != 0)&&(x != (int)(iWcount+1))) {                        // [3] top-right neighbour
                  pmv[3] = ChoosePred(pMB+1-iWcount, mode_curr);
                  pmv[3].x = EVEN(pmv[3].x); pmv[3].y = EVEN(pmv[3].y);
          } else pmv[3].x = pmv[3].y = 0;
-Line 1581
+Line 1580
          *Data->iMinSAD = MV_MAX_ERROR;
          Data->iFcode = iFcode;
          Data->qpel_precision = 0;
-         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
          Data->RefP[0] = pRef->y + (x + Data->iEdgedWidth*y) * 16;
          Data->RefP[2] = pRefH + (x + Data->iEdgedWidth*y) * 16;
-Line 1603
+Line 1602
          Data->currentMV->x = Data->currentMV->y = 0;
          CheckCandidate = CheckCandidate16no4v;
-         /* main loop. checking all predictions */
+ // main loop. checking all predictions
          for (i = 0; i < 7; i++) {
                  if (!(mask = make_mask(pmv, i)) ) continue;
                  CheckCandidate16no4v(pmv[i].x, pmv[i].y, mask, &iDirection, Data);
          }
-         if (MotionFlags & XVID_ME_USESQUARES16) MainSearchPtr = SquareSearch;
+         if (MotionFlags & PMV_USESQUARES16) MainSearchPtr = SquareSearch;
-         else if (MotionFlags & XVID_ME_ADVANCEDDIAMOND16) MainSearchPtr = AdvDiamondSearch;
+         else if (MotionFlags & PMV_ADVANCEDDIAMOND16) MainSearchPtr = AdvDiamondSearch;
                  else MainSearchPtr = DiamondSearch;
          MainSearchPtr(Data->currentMV->x, Data->currentMV->y, Data, iDirection);
-Line 1626
+Line 1625
                  SubpelRefine(Data);
          }
-         /* three bits are needed to code backward mode. four for forward */
+ // three bits are needed to code backward mode. four for forward
          if (mode_current == MODE_FORWARD) *Data->iMinSAD += 4 * Data->lambda16;
          else *Data->iMinSAD += 3 * Data->lambda16;
-Line 1650
+Line 1649
          }
          if (mode_current == MODE_FORWARD) *(Data->currentMV+2) = *Data->currentMV;
-         else *(Data->currentMV+1) = *Data->currentMV; /* we store currmv for interpolate search */
+         else *(Data->currentMV+1) = *Data->currentMV; //we store currmv for interpolate search
  }
  static void
-Line 1666
+Line 1665
          const int div = 1 + Data->qpel;
          int k;
          const uint32_t stride = Data->iEdgedWidth/2;
-         /* 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
          for (k = 0; k < 4; k++) {
                  dy += Data->directmvF[k].y / div;
-Line 1685
+Line 1684
                                          b_Ref->u + (y*8 + b_dy/2) * stride + x*8 + b_dx/2,
                                          stride);
-         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
          sum += sad8bi(pCur->v + 8*x + 8 * y * stride,
                                          f_Ref->v + (y*8 + dy/2) * stride + x*8 + dx/2,
-Line 1693
+Line 1692
                                          stride);
          if (sum < 2 * MAX_CHROMA_SAD_FOR_SKIP * pMB->quant) {
-                 pMB->mode = MODE_DIRECT_NONE_MV; /* skipped */
+                 pMB->mode = MODE_DIRECT_NONE_MV; //skipped
                  for (k = 0; k < 4; k++) {
                          pMB->qmvs[k] = pMB->mvs[k];
                          pMB->b_qmvs[k] = pMB->b_mvs[k];
-Line 1757
+Line 1756
                  if ( (pMB->b_mvs[k].x > Data->max_dx) | (pMB->b_mvs[k].x < Data->min_dx)
                          | (pMB->b_mvs[k].y > Data->max_dy) | (pMB->b_mvs[k].y < Data->min_dy) ) {
-                         *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
-                         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"
                          pMB->b_mvs[0].x = pMB->b_mvs[0].y = 0;
                          return 256*4096;
                  }
-Line 1775
+Line 1774
          CheckCandidate(0, 0, 255, &k, Data);
-         /* initial (fast) skip decision */
+ // initial (fast) skip decision
          if (*Data->iMinSAD < pMB->quant * INITIAL_SKIP_THRESH * (Data->chroma?3:2)) {
-                 /* possible skip */
+                 //possible skip
                  if (Data->chroma) {
                          pMB->mode = MODE_DIRECT_NONE_MV;
-                         return *Data->iMinSAD; /* skip. */
+                         return *Data->iMinSAD; // skip.
                  } else {
                          SkipDecisionB(pCur, f_Ref, b_Ref, pMB, x, y, Data);
-                         if (pMB->mode == MODE_DIRECT_NONE_MV) return *Data->iMinSAD; /* skip. */
+                         if (pMB->mode == MODE_DIRECT_NONE_MV) return *Data->iMinSAD; // skip.
                  }
          }
          *Data->iMinSAD += Data->lambda16;
          skip_sad = *Data->iMinSAD;
-         /*
+ //      DIRECT MODE DELTA VECTOR SEARCH.
-          * DIRECT MODE DELTA VECTOR SEARCH.
+ //      This has to be made more effective, but at the moment I'm happy it's running at all
-          * This has to be made more effective, but at the moment I'm happy it's running at all
-          */
-         if (MotionFlags & XVID_ME_USESQUARES16) MainSearchPtr = SquareSearch;
+         if (MotionFlags & PMV_USESQUARES16) MainSearchPtr = SquareSearch;
-                 else if (MotionFlags & XVID_ME_ADVANCEDDIAMOND16) MainSearchPtr = AdvDiamondSearch;
+                 else if (MotionFlags & PMV_ADVANCEDDIAMOND16) MainSearchPtr = AdvDiamondSearch;
                          else MainSearchPtr = DiamondSearch;
          MainSearchPtr(0, 0, Data, 255);
-Line 1806
+Line 1803
          *best_sad = *Data->iMinSAD;
          if (Data->qpel || b_mb->mode == MODE_INTER4V) pMB->mode = MODE_DIRECT;
-         else pMB->mode = MODE_DIRECT_NO4V; /* for faster compensation */
+         else pMB->mode = MODE_DIRECT_NO4V; //for faster compensation
          pMB->pmvs[3] = *Data->currentMV;
-Line 1864
+Line 1861
          SearchData bData;
          fData->qpel_precision = 0;
-         memcpy(&bData, fData, sizeof(SearchData)); /* quick copy of common data */
+         memcpy(&bData, fData, sizeof(SearchData)); //quick copy of common data
          *fData->iMinSAD = 4096*256;
          bData.currentMV++; bData.currentQMV++;
          fData->iFcode = bData.bFcode = fcode; fData->bFcode = bData.iFcode = bcode;
-Line 1903
+Line 1900
          CheckCandidateInt(fData->currentMV[0].x, fData->currentMV[0].y, 255, &iDirection, fData);
-         /* diamond */
+ //diamond
          do {
                  iDirection = 255;
-                 /* forward MV moves */
+                 // forward MV moves
                  i = fData->currentMV[0].x; j = fData->currentMV[0].y;
                  CheckCandidateInt(i + 1, j, 0, &iDirection, fData);
-Line 1914
+Line 1911
                  CheckCandidateInt(i - 1, j, 0, &iDirection, fData);
                  CheckCandidateInt(i, j - 1, 0, &iDirection, fData);
-                 /* backward MV moves */
+                 // backward MV moves
                  i = fData->currentMV[1].x; j = fData->currentMV[1].y;
                  fData->currentMV[2] = fData->currentMV[0];
                  CheckCandidateInt(i + 1, j, 0, &iDirection, &bData);
-Line 1924
+Line 1921
          } while (!(iDirection));
-         /* qpel refinement */
+ //qpel refinement
          if (fData->qpel) {
                  if (*fData->iMinSAD > *best_sad + 500) return;
                  CheckCandidate = CheckCandidateInt;
-Line 1941
+Line 1938
                  SubpelRefine(&bData);
          }
-         *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.
          if (*fData->iMinSAD < *best_sad) {
                  *best_sad = *fData->iMinSAD;
-Line 1969
+Line 1966
                                           FRAMEINFO * const frame,
                                           const int32_t time_bp,
                                           const int32_t time_pp,
-                                          /* forward (past) reference */
+                                         // forward (past) reference
                                           const MACROBLOCK * const f_mbs,
                                           const IMAGE * const f_ref,
                                           const IMAGE * const f_refH,
                                           const IMAGE * const f_refV,
                                           const IMAGE * const f_refHV,
-                                          /* backward (future) reference */
+                                         // backward (future) reference
                                           const FRAMEINFO * const b_reference,
                                           const IMAGE * const b_ref,
                                           const IMAGE * const b_refH,
-Line 1993
+Line 1990
          const int32_t TRB = time_pp - time_bp;
          const int32_t TRD = time_pp;
-         /* some pre-inintialized data for the rest of the search */
+ // some pre-inintialized data for the rest of the search
          SearchData Data;
          int32_t iMinSAD;
-Line 2005
+Line 2002
          Data.currentMV = currentMV; Data.currentQMV = currentQMV;
          Data.iMinSAD = &iMinSAD;
          Data.lambda16 = lambda_vec16[frame->quant];
-         Data.qpel = pParam->vol_flags & XVID_VOL_QUARTERPEL;
+         Data.qpel = pParam->m_quarterpel;
          Data.rounding = 0;
-         Data.chroma = frame->motion_flags & XVID_ME_CHROMA8;
+         Data.chroma = frame->motion_flags & PMV_CHROMA8;
          Data.temp = temp;
-         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)
+         // note: i==horizontal, j==vertical
-         /* note: i==horizontal, j==vertical */
          for (j = 0; j < pParam->mb_height; j++) {
                  f_predMV = b_predMV = zeroMV;   /* prediction is reset at left boundary */
-Line 2048
+Line 2044
                          if (pMB->mode == MODE_DIRECT_NONE_MV) { n_count++; continue; }
-                         /* forward search */
+                         // forward search
                          SearchBF(f_ref, f_refH->y, f_refV->y, f_refHV->y,
                                                  &frame->image, i, j,
                                                  frame->motion_flags,
-Line 2056
+Line 2052
                                                  pMB, &f_predMV, &best_sad,
                                                  MODE_FORWARD, &Data);
-                         /* backward search */
+                         // backward search
                          SearchBF(b_ref, b_refH->y, b_refV->y, b_refHV->y,
                                                  &frame->image, i, j,
                                                  frame->motion_flags,
-Line 2064
+Line 2060
                                                  pMB, &b_predMV, &best_sad,
                                                  MODE_BACKWARD, &Data);
-                         /* 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
                          SearchInterpolate(f_ref, f_refH->y, f_refV->y, f_refHV->y,
                                                  b_ref, b_refH->y, b_refV->y, b_refHV->y,
                                                  &frame->image,
-Line 2076
+Line 2072
                                                  pMB, &best_sad,
                                                  &Data);
-                         /* final skip decision */
+ // final skip decision
                          if ( (skip_sad < frame->quant * MAX_SAD00_FOR_SKIP * 2)
                                          && ((100*best_sad)/(skip_sad+1) > FINAL_SKIP_THRESH) )
                                  SkipDecisionB(&frame->image, f_ref, b_ref, pMB, i, j, &Data);
-Line 2116
+Line 2112
  {
          int i, mask;
-         int quarterpel = (pParam->vol_flags & XVID_VOL_QUARTERPEL)? 1: 0;
          VECTOR pmv[3];
          MACROBLOCK * const pMB = &pMBs[x + y * pParam->mb_width];
          for (i = 0; i < 5; i++) Data->iMinSAD[i] = MV_MAX_ERROR;
-         /* 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
          if (x == 1 && y == 1) Data->predMV.x = Data->predMV.y = 0;
          else
-                 if (x == 1) /* left macroblock does not have any vector now */
+                 if (x == 1) //left macroblock does not have any vector now
-                         Data->predMV = (pMB - pParam->mb_width)->mvs[0]; /* top instead of median */
+                         Data->predMV = (pMB - pParam->mb_width)->mvs[0]; // top instead of median
-                 else if (y == 1) /* top macroblock doesn't have it's vector */
+                 else if (y == 1) // top macroblock doesn't have it's vector
-                         Data->predMV = (pMB - 1)->mvs[0]; /* left instead of median */
+                         Data->predMV = (pMB - 1)->mvs[0]; // left instead of median
-                         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
          get_range(&Data->min_dx, &Data->max_dx, &Data->min_dy, &Data->max_dy, x, y, 16,
-         pParam->width, pParam->height, Data->iFcode - quarterpel, 0, 0);
+                                 pParam->width, pParam->height, Data->iFcode - pParam->m_quarterpel, 0, 0);
          Data->Cur = pCur + (x + y * pParam->edged_width) * 16;
          Data->RefP[0] = pRef + (x + y * pParam->edged_width) * 16;
-Line 2152
+Line 2147
                  if (!(mask = make_mask(pmv, 2)))
                          CheckCandidate32I(pmv[2].x, pmv[2].y, mask, &i, Data);
-                 if (*Data->iMinSAD > 4 * MAX_SAD00_FOR_SKIP) /* diamond only if needed */
+                 if (*Data->iMinSAD > 4 * MAX_SAD00_FOR_SKIP) // diamond only if needed
                          DiamondSearch(Data->currentMV->x, Data->currentMV->y, Data, i);
          }
-Line 2164
+Line 2159
          }
  }
- #define INTRA_THRESH    1700
+ #define INTRA_THRESH    2200
- #define INTER_THRESH    1200
+ #define INTER_THRESH    50
+ #define INTRA_THRESH2   95
  int
  MEanalysis(     const IMAGE * const pRef,
                          const FRAMEINFO * const Current,
                          const MBParam * const pParam,
-                         const int maxIntra, /* maximum number if non-I frames */
+                         const int maxIntra, //maximum number if non-I frames
-                         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
-                         const int bCount,  /* number of B frames in a row */
+                         const int bCount,  // number of B frames in a row
                          const int b_thresh)
  {
          uint32_t x, y, intra = 0;
          int sSAD = 0;
          MACROBLOCK * const pMBs = Current->mbs;
          const IMAGE * const pCurrent = &Current->image;
-         int IntraThresh = INTRA_THRESH, InterThresh = INTER_THRESH + 10*b_thresh;
+         int IntraThresh = INTRA_THRESH, InterThresh = INTER_THRESH + b_thresh;
          int s = 0, blocks = 0;
+         int complexity = 0;
          int32_t iMinSAD[5], temp[5];
          VECTOR currentMV[5];
-Line 2193
+Line 2190
          Data.temp = temp;
          CheckCandidate = CheckCandidate32I;
          if (intraCount != 0) {
-                 if (intraCount < 10) /* we're right after an I frame */
+                 if (intraCount < 10) // we're right after an I frame
                          IntraThresh += 15* (intraCount - 10) * (intraCount - 10);
                  else
-                         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
                                  IntraThresh -= (IntraThresh * (maxIntra - 8*(maxIntra - intraCount)))/maxIntra;
          }
-         InterThresh -= (350 - 8*b_thresh) * bCount;
+         InterThresh -= 12 * bCount;
-         if (InterThresh < 300 + 5*b_thresh) InterThresh = 300 + 5*b_thresh;
+         if (InterThresh < 15 + b_thresh) InterThresh = 15 + b_thresh;
          if (sadInit) (*sadInit) ();
          for (y = 1; y < pParam->mb_height-1; y += 2) {
                  for (x = 1; x < pParam->mb_width-1; x += 2) {
                          int i;
-                         blocks += 4;
+                         blocks += 10;
                          if (bCount == 0) pMBs[x + y * pParam->mb_width].mvs[0] = zeroMV;
-                         else { /* extrapolation of the vector found for last frame */
+                         else { //extrapolation of the vector found for last frame
                                  pMBs[x + y * pParam->mb_width].mvs[0].x =
                                          (pMBs[x + y * pParam->mb_width].mvs[0].x * (bCount+1) ) / bCount;
                                  pMBs[x + y * pParam->mb_width].mvs[0].y =
-Line 2224
+Line 2222
                          for (i = 0; i < 4; i++) {
                                  int dev;
                                  MACROBLOCK *pMB = &pMBs[x+(i&1) + (y+(i>>1)) * pParam->mb_width];
-                                 if (pMB->sad16 > IntraThresh) {
                                          dev = dev16(pCurrent->y + (x + (i&1) + (y + (i>>1)) * pParam->edged_width) * 16,
                                                                          pParam->edged_width);
+                                 complexity += dev;
                                          if (dev + IntraThresh < pMB->sad16) {
                                                  pMB->mode = MODE_INTRA;
                                                  if (++intra > ((pParam->mb_height-2)*(pParam->mb_width-2))/2) return I_VOP;
                                          }
-                                 }
-                                 if (pMB->mvs[0].x == 0 && pMB->mvs[0].y == 0) s++;
+                                 if (pMB->mvs[0].x == 0 && pMB->mvs[0].y == 0)
+                                         if (dev > 500 && pMB->sad16 < 1000)
+                                                 sSAD += 1000;
                                  sSAD += pMB->sad16;
                          }
                  }
          }
+         complexity >>= 7;
-         sSAD /= blocks;
+         sSAD /= complexity + 4*blocks;
-         if (b_thresh < 20) {
-                 s = (10*s) / blocks;
-                 if (s > 4) sSAD += (s - 2) * (40 - 2*b_thresh); /* static block - looks bad when in bframe... */
-         }
+         if (intraCount > 12 && sSAD > INTRA_THRESH2 ) return I_VOP;
          if (sSAD > InterThresh ) return P_VOP;
          emms();
          return B_VOP;
-Line 2262
+Line 2260
                                  const IMAGE * const pRefHV      )
  {
-         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
          const int deltay=8;
-         const int grad=512;             /* lower bound for deviation in MB */
+         const int grad=512;             // lower bound for deviation in MB
          WARPPOINTS gmc;
-Line 2286
+Line 2284
                                                  gmc.duv[2].x= gmc.duv[2].y = 0;
                                          return gmc; }
-         /* filter mask of all blocks */
+ // filter mask of all blocks
          for (my = 1; my < (uint32_t)MBh-1; my++)
          for (mx = 1; mx < (uint32_t)MBw-1; mx++)
-Line 2427
+Line 2425
                  gmc.duv[2].x=0;
                  gmc.duv[2].y=0;
          }
- /*      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);
          free(MBmask);
          return gmc;
  }
- /* functions which perform BITS-based search/bitcount */
+ // functions which perform BITS-based search/bitcount
  static int
  CountMBBitsInter(SearchData * const Data,
-Line 2455
+Line 2453
                  Data->qpel_precision = 1;
                  CheckCandidateBits16(Data->currentQMV[0].x, Data->currentQMV[0].y, 255, &iDirection, Data);
-                 if (MotionFlags & (XVID_ME_HALFPELREFINE16_BITS | XVID_ME_EXTSEARCH_BITS)) { /* we have to prepare for halfpixel-precision search */
+                 if (MotionFlags & (HALFPELREFINE16_BITS | EXTSEARCH_BITS)) { //we have to prepare for halfpixel-precision search
                          for(i = 0; i < 5; i++) bsad[i] = Data->iMinSAD[i];
                          get_range(&Data->min_dx, &Data->max_dx, &Data->min_dy, &Data->max_dy, x, y, 16,
                                                  pParam->width, pParam->height, Data->iFcode - Data->qpel, 0, Data->rrv);
-Line 2464
+Line 2462
                                  CheckCandidateBits16(Data->currentMV[0].x, Data->currentMV[0].y, 255, &iDirection, Data);
                  }
-         } else { /* not qpel */
+         } else { // not qpel
                  CheckCandidateBits16(Data->currentMV[0].x, Data->currentMV[0].y, 255, &iDirection, Data);
          }
-         if (MotionFlags&XVID_ME_EXTSEARCH_BITS) SquareSearch(Data->currentMV->x, Data->currentMV->y, Data, iDirection);
+         if (MotionFlags&EXTSEARCH_BITS) SquareSearch(Data->currentMV->x, Data->currentMV->y, Data, iDirection);
-         if (MotionFlags&XVID_ME_HALFPELREFINE16_BITS) SubpelRefine(Data);
+         if (MotionFlags&HALFPELREFINE16_BITS) SubpelRefine(Data);
          if (Data->qpel) {
-                 if (MotionFlags&(XVID_ME_EXTSEARCH_BITS | XVID_ME_HALFPELREFINE16_BITS)) { /* there was halfpel-precision search */
+                 if (MotionFlags&(EXTSEARCH_BITS | HALFPELREFINE16_BITS)) { // there was halfpel-precision search
                          for(i = 0; i < 5; i++) if (bsad[i] > Data->iMinSAD[i]) {
-                                 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
                                  Data->currentQMV[i].y = 2 * Data->currentMV[i].y;
                          }
-                         /* preparing for qpel-precision search */
+                         // preparing for qpel-precision search
                          Data->qpel_precision = 1;
                          get_range(&Data->min_dx, &Data->max_dx, &Data->min_dy, &Data->max_dy, x, y, 16,
                                          pParam->width, pParam->height, Data->iFcode, 1, 0);
                  }
-                 if (MotionFlags&XVID_ME_QUARTERPELREFINE16_BITS) SubpelRefine(Data);
+                 if (MotionFlags&QUARTERPELREFINE16_BITS) SubpelRefine(Data);
          }
-         if (MotionFlags&XVID_ME_CHECKPREDICTION_BITS) { /* let's check vector equal to prediction */
+         if (MotionFlags&CHECKPREDICTION_BITS) { //let's check vector equal to prediction
                  VECTOR * v = Data->qpel ? Data->currentQMV : Data->currentMV;
                  if (!(Data->predMV.x == v->x && Data->predMV.y == v->y))
                          CheckCandidateBits16(Data->predMV.x, Data->predMV.y, 255, &iDirection, Data);
-Line 2513
+Line 2511
          memcpy(Data8, Data, sizeof(SearchData));
          CheckCandidate = CheckCandidateBits8;
-         for (i = 0; i < 4; i++) { /* for all luma blocks */
+         for (i = 0; i < 4; i++) { //for all luma blocks
                  Data8->iMinSAD = Data->iMinSAD + i + 1;
                  Data8->currentMV = Data->currentMV + i + 1;
-Line 2540
+Line 2538
                  *Data8->iMinSAD += BITS_MULT*t;
                  Data8->qpel_precision = Data8->qpel;
-                 /* 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)
                  {
                          VECTOR *v = Data8->qpel ? Data8->currentQMV : Data8->currentMV;
                          if (!MVequal (*v, backup[i+1]) )
-Line 2548
+Line 2546
                  }
                  if (Data8->qpel) {
-                         if (MotionFlags&XVID_ME_HALFPELREFINE8_BITS || (MotionFlags&XVID_ME_EXTSEARCH8 && MotionFlags&XVID_ME_EXTSEARCH_BITS)) { /* halfpixel motion search follows */
+                         if (MotionFlags&HALFPELREFINE8_BITS || (MotionFlags&PMV_EXTSEARCH8 && MotionFlags&EXTSEARCH_BITS)) { // halfpixel motion search follows
                                  int32_t s = *Data8->iMinSAD;
                                  Data8->currentMV->x = Data8->currentQMV->x/2;
                                  Data8->currentMV->y = Data8->currentQMV->y/2;
-Line 2559
+Line 2557
                                  if (Data8->currentQMV->x & 1 || Data8->currentQMV->y & 1)
                                          CheckCandidateBits8(Data8->currentMV->x, Data8->currentMV->y, 255, &iDirection, Data8);
-                                 if (MotionFlags & XVID_ME_EXTSEARCH8 && MotionFlags & XVID_ME_EXTSEARCH_BITS)
+                                 if (MotionFlags & PMV_EXTSEARCH8 && MotionFlags & EXTSEARCH_BITS)
                                          SquareSearch(Data8->currentMV->x, Data8->currentMV->x, Data8, 255);
-                                 if (MotionFlags & XVID_ME_HALFPELREFINE8_BITS)
+                                 if (MotionFlags & HALFPELREFINE8_BITS)
                                          SubpelRefine(Data8);
-                                 if(s > *Data8->iMinSAD) { /* we have found a better match */
+                                 if (s > *Data8->iMinSAD) { //we have found a better match
                                          Data8->currentQMV->x = 2*Data8->currentMV->x;
                                          Data8->currentQMV->y = 2*Data8->currentMV->y;
                                  }
-Line 2575
+Line 2573
                                                          pParam->width, pParam->height, Data8->iFcode, 1, 0);
                          }
-                         if (MotionFlags & XVID_ME_QUARTERPELREFINE8_BITS) SubpelRefine(Data8);
+                         if (MotionFlags & QUARTERPELREFINE8_BITS) SubpelRefine(Data8);
-                 } else { /* not qpel */
+                 } else { // not qpel
-                         if (MotionFlags & XVID_ME_EXTSEARCH8 && MotionFlags & XVID_ME_EXTSEARCH_BITS) /* extsearch */
+                         if (MotionFlags & PMV_EXTSEARCH8 && MotionFlags & EXTSEARCH_BITS) //extsearch
                                  SquareSearch(Data8->currentMV->x, Data8->currentMV->x, Data8, 255);
-                         if (MotionFlags & XVID_ME_HALFPELREFINE8_BITS)
+                         if (MotionFlags & HALFPELREFINE8_BITS)
-                                 SubpelRefine(Data8); /* halfpel refinement */
+                                 SubpelRefine(Data8); //halfpel refinement
                  }
-                 /* checking vector equal to predicion */
+                 //checking vector equal to predicion
-                 if (i != 0 && MotionFlags & XVID_ME_CHECKPREDICTION_BITS) {
+                 if (i != 0 && MotionFlags & CHECKPREDICTION_BITS) {
                          const VECTOR * v = Data->qpel ? Data8->currentQMV : Data8->currentMV;
                          if (!MVequal(*v, Data8->predMV))
                                  CheckCandidateBits8(Data8->predMV.x, Data8->predMV.y, 255, &iDirection, Data8);
                  }
                  bits += *Data8->iMinSAD;
-                 if (bits >= Data->iMinSAD[0]) return bits; /* no chances for INTER4V */
+                 if (bits >= Data->iMinSAD[0]) return bits; // no chances for INTER4V
-                 /* 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
                  if(Data->qpel) {
                          pMB->pmvs[i].x = Data8->currentQMV->x - Data8->predMV.x;
                          pMB->pmvs[i].y = Data8->currentQMV->y - Data8->predMV.y;
-Line 2613
+Line 2611
                  pMB->sad8[i] = 4 * *Data8->iMinSAD;
                  if (Data8->temp[0]) cbp |= 1 << (5 - i);
-         } /* /for all luma blocks */
+         } // /for all luma blocks
          bits += BITS_MULT*xvid_cbpy_tab[15-(cbp>>2)].len;
-         /* let's check chroma */
+         // let's check chroma
          sumx = (sumx >> 3) + roundtab_76[sumx & 0xf];
          sumy = (sumy >> 3) + roundtab_76[sumy & 0xf];
-         /* chroma U */
+         //chroma U
          ptr = interpolate8x8_switch2(Data->RefQ + 64, Data->RefP[4], 0, 0, sumx, sumy, Data->iEdgedWidth/2, Data->rounding);
          transfer_8to16subro(in, Data->CurU, ptr, Data->iEdgedWidth/2);
-         bits += Block_CalcBits(coeff, in, Data->iQuant, Data->quant_type, &cbp, 4);
+         bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 4);
          if (bits >= *Data->iMinSAD) return bits;
-         /* chroma V */
+         //chroma V
          ptr = interpolate8x8_switch2(Data->RefQ + 64, Data->RefP[5], 0, 0, sumx, sumy, Data->iEdgedWidth/2, Data->rounding);
          transfer_8to16subro(in, Data->CurV, ptr, Data->iEdgedWidth/2);
-         bits += Block_CalcBits(coeff, in, Data->iQuant, Data->quant_type, &cbp, 5);
+         bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 5);
          bits += BITS_MULT*mcbpc_inter_tab[(MODE_INTER4V & 7) | ((cbp & 3) << 3)].len;
-Line 2641
+Line 2639
  static int
  CountMBBitsIntra(const SearchData * const Data)
  {
-         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
          int cbp = 0, i, dc = 0;
          int16_t *in = Data->dctSpace, * coeff = Data->dctSpace + 64;
          for(i = 0; i < 4; i++) {
                  int s = 8*((i&1) + (i>>1)*Data->iEdgedWidth);
                  transfer_8to16copy(in, Data->Cur + s, Data->iEdgedWidth);
-                 bits += Block_CalcBitsIntra(coeff, in, Data->iQuant, Data->quant_type, &cbp, i, &dc);
+                 bits += Block_CalcBitsIntra(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, i, &dc);
                  if (bits >= Data->iMinSAD[0]) return bits;
          }
          bits += BITS_MULT*xvid_cbpy_tab[cbp>>2].len;
-         /*chroma U */
+         //chroma U
          transfer_8to16copy(in, Data->CurU, Data->iEdgedWidth/2);
-         bits += Block_CalcBitsIntra(coeff, in, Data->iQuant, Data->quant_type, &cbp, 4, &dc);
+         bits += Block_CalcBitsIntra(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 4, &dc);
          if (bits >= Data->iMinSAD[0]) return bits;
-         /* chroma V */
+         //chroma V
          transfer_8to16copy(in, Data->CurV, Data->iEdgedWidth/2);
-         bits += Block_CalcBitsIntra(coeff, in, Data->iQuant, Data->quant_type, &cbp, 5, &dc);
+         bits += Block_CalcBitsIntra(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 5, &dc);
          bits += BITS_MULT*mcbpc_inter_tab[(MODE_INTRA & 7) | ((cbp & 3) << 3)].len;

 Legend:



Removed from v.1.58.2.16
 


changed lines


 
Added in v.1.72
 Legend:



Removed from v.1.58.2.16
 


changed lines


 
Added in v.1.72
-Removed from v.1.58.2.16
+Added in v.1.72

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