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

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

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

revision 1156, Sun Sep 28 16:12:32 2003 UTC revision 1177, Sat Oct 11 16:36:10 2003 UTC
# Line 20  Line 20 
20   *  along with this program ; if not, write to the Free Software   *  along with this program ; if not, write to the Free Software
21   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
22   *   *
23   * $Id: estimation_rd_based.c,v 1.1.2.2 2003-09-28 16:12:32 syskin Exp $   * $Id: estimation_rd_based.c,v 1.1.2.8 2003-10-11 16:36:10 syskin Exp $
24   *   *
25   ****************************************************************************/   ****************************************************************************/
26    
# Line 40  Line 40 
40  #include "motion.h"  #include "motion.h"
41  #include "sad.h"  #include "sad.h"
42  #include "../bitstream/zigzag.h"  #include "../bitstream/zigzag.h"
43  #include "../quant/quant_mpeg4.h"  #include "../quant/quant.h"
 #include "../quant/quant_h263.h"  
44  #include "../bitstream/vlc_codes.h"  #include "../bitstream/vlc_codes.h"
45  #include "../dct/fdct.h"  #include "../dct/fdct.h"
46  #include "motion_inlines.h"  #include "motion_inlines.h"
# Line 55  Line 54 
54                                  int16_t * const dqcoeff,                                  int16_t * const dqcoeff,
55                                  const uint32_t quant, const int quant_type,                                  const uint32_t quant, const int quant_type,
56                                  uint32_t * cbp,                                  uint32_t * cbp,
57                                  const int block)                                  const int block,
58                                    const uint16_t * scan_table)
59  {  {
60          int sum;          int sum;
61          int bits;          int bits;
# Line 64  Line 64 
64    
65          fdct(data);          fdct(data);
66    
67          if (quant_type) sum = quant_inter(coeff, data, quant);          if (quant_type) sum = quant_h263_inter(coeff, data, quant);
68          else sum = quant4_inter(coeff, data, quant);          else sum = quant_mpeg_inter(coeff, data, quant);
69    
70          if (sum > 0) {          if (sum > 0) {
71                  *cbp |= 1 << (5 - block);                  *cbp |= 1 << (5 - block);
72                  bits = BITS_MULT * CodeCoeffInter_CalcBits(coeff, scan_tables[0]);                  bits = BITS_MULT * CodeCoeffInter_CalcBits(coeff, scan_table);
73    
74                  if (quant_type) dequant_inter(dqcoeff, coeff, quant);                  if (quant_type) dequant_h263_inter(dqcoeff, coeff, quant);
75                  else dequant4_inter(dqcoeff, coeff, quant);                  else dequant_mpeg_inter(dqcoeff, coeff, quant);
76    
77                  for (i = 0; i < 64; i++)                  for (i = 0; i < 64; i++)
78                          distortion += (data[i] - dqcoeff[i])*(data[i] - dqcoeff[i]);                          distortion += (data[i] - dqcoeff[i])*(data[i] - dqcoeff[i]);
# Line 87  Line 87 
87  }  }
88    
89  static __inline unsigned int  static __inline unsigned int
90  Block_CalcBitsIntra(int16_t * const coeff,  Block_CalcBitsIntra(MACROBLOCK * pMB,
91                                          int16_t * const data,                                          const unsigned int x,
92                                          int16_t * const dqcoeff,                                          const unsigned int y,
93                                          const uint32_t quant, const int quant_type,                                          const unsigned int mb_width,
94                                          uint32_t * cbp,                                          const uint32_t block,
95                                          const int block,                                          int16_t coeff[64],
96                                          int * dcpred)                                          int16_t qcoeff[64],
97  {                                          int16_t dqcoeff[64],
98          int bits, i;                                          int16_t predictors[8],
99          int distortion = 0;                                          const uint32_t quant,
100          uint32_t iDcScaler = get_dc_scaler(quant, block < 4);                                          const int quant_type,
101          int b_dc;                                          unsigned int bits[2],
102                                            unsigned int cbp[2])
103    {
104            int direction;
105            int16_t *pCurrent;
106            unsigned int i, coded;
107            unsigned int distortion = 0;
108            const uint32_t iDcScaler = get_dc_scaler(quant, block < 4);
109    
110            fdct(coeff);
111    
112            if (quant_type) {
113                    quant_h263_intra(qcoeff, coeff, quant, iDcScaler);
114                    dequant_h263_intra(dqcoeff, qcoeff, quant, iDcScaler);
115            } else {
116                    quant_mpeg_intra(qcoeff, coeff, quant, iDcScaler);
117                    dequant_mpeg_intra(dqcoeff, qcoeff, quant, iDcScaler);
118            }
119    
120          fdct(data);          predict_acdc(pMB-(x+mb_width*y), x, y, mb_width, block, qcoeff,
121          data[0] -= 1024;                                  quant, iDcScaler, predictors, 0);
122    
123          if (quant_type) quant_intra(coeff, data, quant, iDcScaler);          direction = pMB->acpred_directions[block];
124          else quant4_intra(coeff, data, quant, iDcScaler);          pCurrent = pMB->pred_values[block];
125    
126          b_dc = coeff[0];          /* store current coeffs to pred_values[] for future prediction */
127          if (block < 4) {          pCurrent[0] = qcoeff[0] * iDcScaler;
128                  coeff[0] -= *dcpred;          for (i = 1; i < 8; i++) {
129                  *dcpred = b_dc;                  pCurrent[i] = qcoeff[i];
130                    pCurrent[i + 7] = qcoeff[i * 8];
131          }          }
132    
133          bits = BITS_MULT*CodeCoeffIntra_CalcBits(coeff, scan_tables[0]);          /* dc prediction */
134          if (bits != 0) *cbp |= 1 << (5 - block);          qcoeff[0] = qcoeff[0] - predictors[0];
135    
136            if (block < 4) bits[1] = bits[0] = dcy_tab[qcoeff[0] + 255].len;
137            else bits[1] = bits[0] = dcc_tab[qcoeff[0] + 255].len;
138    
139            /* calc cost before ac prediction */
140            bits[0] += coded = CodeCoeffIntra_CalcBits(qcoeff, scan_tables[0]);
141            if (coded > 0) cbp[0] |= 1 << (5 - block);
142    
143          if (block < 4) bits += BITS_MULT*dcy_tab[coeff[0] + 255].len;          /* apply ac prediction & calc cost*/
144          else bits += BITS_MULT*dcc_tab[coeff[0] + 255].len;          if (direction == 1) {
145                    for (i = 1; i < 8; i++) {
146                            qcoeff[i] -= predictors[i];
147                            predictors[i] = qcoeff[i];
148                    }
149            } else {                                                /* acpred_direction == 2 */
150                    for (i = 1; i < 8; i++) {
151                            qcoeff[i*8] -= predictors[i];
152                            predictors[i] = qcoeff[i*8];
153                    }
154            }
155    
156          coeff[0] = b_dc;          bits[1] += coded = CodeCoeffIntra_CalcBits(qcoeff, scan_tables[direction]);
157          if (quant_type) dequant_intra(dqcoeff, coeff, quant, iDcScaler);          if (coded > 0) cbp[1] |= 1 << (5 - block);
         else dequant4_intra(dqcoeff, coeff, quant, iDcScaler);  
158    
159          for (i = 0; i < 64; i++)          for (i = 0; i < 64; i++)
160                  distortion += (data[i] - dqcoeff[i])*(data[i] - dqcoeff[i]);                  distortion += (coeff[i] - dqcoeff[i])*(coeff[i] - dqcoeff[i]);
161    
162    
163            return (LAMBDA*distortion)/(quant*quant);
164    
         return bits + (LAMBDA*distortion)/(quant*quant);  
165  }  }
166    
167    
168    
169  static void  static void
170  CheckCandidateRD16(const int x, const int y, const SearchData * const data, const unsigned int Direction)  CheckCandidateRD16(const int x, const int y, const SearchData * const data, const unsigned int Direction)
171  {  {
# Line 154  Line 192 
192          for(i = 0; i < 4; i++) {          for(i = 0; i < 4; i++) {
193                  int s = 8*((i&1) + (i>>1)*data->iEdgedWidth);                  int s = 8*((i&1) + (i>>1)*data->iEdgedWidth);
194                  transfer_8to16subro(in, data->Cur + s, ptr + s, data->iEdgedWidth);                  transfer_8to16subro(in, data->Cur + s, ptr + s, data->iEdgedWidth);
195                  rd += data->temp[i] = Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp, i);                  rd += data->temp[i] = Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp, i, data->scan_table);
196          }          }
197    
198          rd += t = BITS_MULT*d_mv_bits(x, y, data->predMV, data->iFcode, data->qpel^data->qpel_precision, 0);          rd += t = BITS_MULT*d_mv_bits(x, y, data->predMV, data->iFcode, data->qpel^data->qpel_precision, 0);
# Line 179  Line 217 
217          /* chroma U */          /* chroma U */
218          ptr = interpolate8x8_switch2(data->RefQ, data->RefP[4], 0, 0, xc, yc, data->iEdgedWidth/2, data->rounding);          ptr = interpolate8x8_switch2(data->RefQ, data->RefP[4], 0, 0, xc, yc, data->iEdgedWidth/2, data->rounding);
219          transfer_8to16subro(in, data->CurU, ptr, data->iEdgedWidth/2);          transfer_8to16subro(in, data->CurU, ptr, data->iEdgedWidth/2);
220          rd += Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp, 4);          rd += Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp, 4, data->scan_table);
221          if (rd >= data->iMinSAD[0]) return;          if (rd >= data->iMinSAD[0]) return;
222    
223          /* chroma V */          /* chroma V */
224          ptr = interpolate8x8_switch2(data->RefQ, data->RefP[5], 0, 0, xc, yc, data->iEdgedWidth/2, data->rounding);          ptr = interpolate8x8_switch2(data->RefQ, data->RefP[5], 0, 0, xc, yc, data->iEdgedWidth/2, data->rounding);
225          transfer_8to16subro(in, data->CurV, ptr, data->iEdgedWidth/2);          transfer_8to16subro(in, data->CurV, ptr, data->iEdgedWidth/2);
226          rd += Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp, 5);          rd += Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp, 5, data->scan_table);
227    
228          rd += BITS_MULT*mcbpc_inter_tab[(MODE_INTER & 7) | ((cbp & 3) << 3)].len;          rd += BITS_MULT*mcbpc_inter_tab[(MODE_INTER & 7) | ((cbp & 3) << 3)].len;
229    
# Line 219  Line 257 
257          }          }
258    
259          transfer_8to16subro(in, data->Cur, ptr, data->iEdgedWidth);          transfer_8to16subro(in, data->Cur, ptr, data->iEdgedWidth);
260          rd = Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp, 5);          rd = Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp, 5, data->scan_table);
261          rd += BITS_MULT*d_mv_bits(x, y, data->predMV, data->iFcode, data->qpel^data->qpel_precision, 0);          rd += BITS_MULT*d_mv_bits(x, y, data->predMV, data->iFcode, data->qpel^data->qpel_precision, 0);
262    
263          if (rd < data->iMinSAD[0]) {          if (rd < data->iMinSAD[0]) {
# Line 318  Line 356 
356                  Data8->RefP[2] = Data->RefP[2] + 8*((i&1) + (i>>1)*Data->iEdgedWidth);                  Data8->RefP[2] = Data->RefP[2] + 8*((i&1) + (i>>1)*Data->iEdgedWidth);
357                  Data8->RefP[1] = Data->RefP[1] + 8*((i&1) + (i>>1)*Data->iEdgedWidth);                  Data8->RefP[1] = Data->RefP[1] + 8*((i&1) + (i>>1)*Data->iEdgedWidth);
358                  Data8->RefP[3] = Data->RefP[3] + 8*((i&1) + (i>>1)*Data->iEdgedWidth);                  Data8->RefP[3] = Data->RefP[3] + 8*((i&1) + (i>>1)*Data->iEdgedWidth);
359                  *Data8->cbp = (Data->cbp[1] & (1<<(5-i))) ? 1:0; // copy corresponding cbp bit                  *Data8->cbp = (Data->cbp[1] & (1<<(5-i))) ? 1:0; /* copy corresponding cbp bit */
360    
361                  if(Data->qpel) {                  if(Data->qpel) {
362                          Data8->predMV = get_qpmv2(pMBs, pParam->mb_width, 0, x, y, i);                          Data8->predMV = get_qpmv2(pMBs, pParam->mb_width, 0, x, y, i);
# Line 421  Line 459 
459          /* chroma U */          /* chroma U */
460          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);
461          transfer_8to16subro(in, Data->CurU, ptr, Data->iEdgedWidth/2);          transfer_8to16subro(in, Data->CurU, ptr, Data->iEdgedWidth/2);
462          bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 4);          bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 4, Data->scan_table);
463    
464          if (bits >= *Data->iMinSAD) return bits;          if (bits >= *Data->iMinSAD) return bits;
465    
466          /* chroma V */          /* chroma V */
467          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);
468          transfer_8to16subro(in, Data->CurV, ptr, Data->iEdgedWidth/2);          transfer_8to16subro(in, Data->CurV, ptr, Data->iEdgedWidth/2);
469          bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 5);          bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 5, Data->scan_table);
470    
471          bits += BITS_MULT*mcbpc_inter_tab[(MODE_INTER4V & 7) | ((cbp & 3) << 3)].len;          bits += BITS_MULT*mcbpc_inter_tab[(MODE_INTER4V & 7) | ((cbp & 3) << 3)].len;
472    
# Line 437  Line 475 
475  }  }
476    
477  static int  static int
478  findRD_intra(const SearchData * const Data)  findRD_intra(const SearchData * const Data, MACROBLOCK * pMB,
479                             const int x, const int y, const int mb_width)
480  {  {
481          int bits = BITS_MULT*1; /* this one is ac/dc prediction flag bit */          int cbp[2] = {0, 0}, bits[2], i;
482          int cbp = 0, i, dc = 0;          int bits1 = BITS_MULT*1, bits2 = BITS_MULT*1; /* this one is ac/dc prediction flag bit */
483          int16_t *in = Data->dctSpace, * coeff = Data->dctSpace + 64;          int distortion = 0;
484    
485            int16_t *in = Data->dctSpace, * coeff = Data->dctSpace + 64, * dqcoeff = Data->dctSpace + 128;
486            const uint32_t iQuant = Data->iQuant;
487            int16_t predictors[6][8];
488    
489          for(i = 0; i < 4; i++) {          for(i = 0; i < 4; i++) {
490                  int s = 8*((i&1) + (i>>1)*Data->iEdgedWidth);                  int s = 8*((i&1) + (i>>1)*Data->iEdgedWidth);
491                  transfer_8to16copy(in, Data->Cur + s, Data->iEdgedWidth);                  transfer_8to16copy(in, Data->Cur + s, Data->iEdgedWidth);
                 bits += Block_CalcBitsIntra(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, i, &dc);  
492    
493                  if (bits >= Data->iMinSAD[0]) return bits;  
494                    distortion = Block_CalcBitsIntra(pMB, x, y, mb_width, i, in, coeff, dqcoeff,
495                                                                    predictors[i], iQuant, Data->quant_type, bits, cbp);
496                    bits1 += distortion + BITS_MULT * bits[0];
497                    bits2 += distortion + BITS_MULT * bits[1];
498    
499                    if (bits1 >= Data->iMinSAD[0] && bits2 >= Data->iMinSAD[0])
500                            return bits1;
501          }          }
502    
503          bits += BITS_MULT*xvid_cbpy_tab[cbp>>2].len;          bits1 += BITS_MULT*xvid_cbpy_tab[cbp[0]>>2].len;
504            bits2 += BITS_MULT*xvid_cbpy_tab[cbp[1]>>2].len;
505    
506          /*chroma U */          /*chroma U */
507          transfer_8to16copy(in, Data->CurU, Data->iEdgedWidth/2);          transfer_8to16copy(in, Data->CurU, Data->iEdgedWidth/2);
508          bits += Block_CalcBitsIntra(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 4, &dc);          distortion = Block_CalcBitsIntra(pMB, x, y, mb_width, 4, in, coeff, dqcoeff,
509                                                                            predictors[4], iQuant, Data->quant_type, bits, cbp);
510            bits1 += distortion + BITS_MULT * bits[0];
511            bits2 += distortion + BITS_MULT * bits[1];
512    
513          if (bits >= Data->iMinSAD[0]) return bits;          if (bits1 >= Data->iMinSAD[0] && bits2 >= Data->iMinSAD[0])
514                    return bits1;
515    
516          /* chroma V */          /* chroma V */
517          transfer_8to16copy(in, Data->CurV, Data->iEdgedWidth/2);          transfer_8to16copy(in, Data->CurV, Data->iEdgedWidth/2);
518          bits += Block_CalcBitsIntra(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 5, &dc);          distortion = Block_CalcBitsIntra(pMB, x, y, mb_width, 5, in, coeff, dqcoeff,
519                                                                            predictors[5], iQuant, Data->quant_type, bits, cbp);
520    
521          bits += BITS_MULT*mcbpc_inter_tab[(MODE_INTRA & 7) | ((cbp & 3) << 3)].len;          bits1 += distortion + BITS_MULT * bits[0];
522            bits2 += distortion + BITS_MULT * bits[1];
523    
524          return bits;          bits1 += BITS_MULT*mcbpc_inter_tab[(MODE_INTRA & 7) | ((cbp[0] & 3) << 3)].len;
525            bits2 += BITS_MULT*mcbpc_inter_tab[(MODE_INTRA & 7) | ((cbp[1] & 3) << 3)].len;
526    
527            *Data->cbp = bits1 <= bits2 ? cbp[0] : cbp[1];
528    
529            return MIN(bits1, bits2);
530  }  }
531    
532    
533  static int  static int
534  findRD_gmc(const SearchData * const Data, const IMAGE * const vGMC, const int x, const int y)  findRD_gmc(const SearchData * const Data, const IMAGE * const vGMC, const int x, const int y)
535  {  {
# Line 478  Line 540 
540          for(i = 0; i < 4; i++) {          for(i = 0; i < 4; i++) {
541                  int s = 8*((i&1) + (i>>1)*Data->iEdgedWidth);                  int s = 8*((i&1) + (i>>1)*Data->iEdgedWidth);
542                  transfer_8to16subro(in, Data->Cur + s, vGMC->y + s + 16*(x+y*Data->iEdgedWidth), Data->iEdgedWidth);                  transfer_8to16subro(in, Data->Cur + s, vGMC->y + s + 16*(x+y*Data->iEdgedWidth), Data->iEdgedWidth);
543                  bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, i);                  bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, i, Data->scan_table);
544                  if (bits >= Data->iMinSAD[0]) return bits;                  if (bits >= Data->iMinSAD[0]) return bits;
545          }          }
546    
# Line 486  Line 548 
548    
549          /*chroma U */          /*chroma U */
550          transfer_8to16subro(in, Data->CurU, vGMC->u + 8*(x+y*(Data->iEdgedWidth/2)), Data->iEdgedWidth/2);          transfer_8to16subro(in, Data->CurU, vGMC->u + 8*(x+y*(Data->iEdgedWidth/2)), Data->iEdgedWidth/2);
551          bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 4);          bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 4, Data->scan_table);
552    
553          if (bits >= Data->iMinSAD[0]) return bits;          if (bits >= Data->iMinSAD[0]) return bits;
554    
555          /* chroma V */          /* chroma V */
556          transfer_8to16subro(in, Data->CurV , vGMC->v + 8*(x+y*(Data->iEdgedWidth/2)), Data->iEdgedWidth/2);          transfer_8to16subro(in, Data->CurV , vGMC->v + 8*(x+y*(Data->iEdgedWidth/2)), Data->iEdgedWidth/2);
557          bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 5);          bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 5, Data->scan_table);
558    
559          bits += BITS_MULT*mcbpc_inter_tab[(MODE_INTER & 7) | ((cbp & 3) << 3)].len;          bits += BITS_MULT*mcbpc_inter_tab[(MODE_INTER & 7) | ((cbp & 3) << 3)].len;
560    
# Line 524  Line 586 
586          VECTOR backup[5], *v;          VECTOR backup[5], *v;
587          Data->iQuant = iQuant;          Data->iQuant = iQuant;
588          Data->cbp = c;          Data->cbp = c;
589            Data->scan_table = VopFlags & XVID_VOP_ALTERNATESCAN ?
590                                                    scan_tables[2] : scan_tables[0];
591    
592          pMB->mcsel = 0;          pMB->mcsel = 0;
593    
# Line 558  Line 622 
622                  }                  }
623          }          }
624    
625          intra_rd = findRD_intra(Data);          intra_rd = findRD_intra(Data, pMB, x, y, pParam->mb_width);
626          if (intra_rd < min_rd) {          if (intra_rd < min_rd) {
627                  *Data->iMinSAD = min_rd = intra_rd;                  *Data->iMinSAD = min_rd = intra_rd;
628                  mode = MODE_INTRA;                  mode = MODE_INTRA;
629                    cbp = *Data->cbp;
630          }          }
631    
632          pMB->sad16 = pMB->sad8[0] = pMB->sad8[1] = pMB->sad8[2] = pMB->sad8[3] = 0;          pMB->sad16 = pMB->sad8[0] = pMB->sad8[1] = pMB->sad8[2] = pMB->sad8[3] = 0;
# Line 586  Line 651 
651                          pMB->pmvs[0].y = Data->currentMV[0].y - Data->predMV.y;                          pMB->pmvs[0].y = Data->currentMV[0].y - Data->predMV.y;
652                  }                  }
653    
654          } else if (mode == MODE_INTER ) { // but mcsel == 1          } else if (mode == MODE_INTER ) { /* but mcsel == 1 */
655    
656                  pMB->mcsel = 1;                  pMB->mcsel = 1;
657                  if (Data->qpel) {                  if (Data->qpel) {
# Line 630  Line 695 
695          int InterBias = MV16_INTER_BIAS;          int InterBias = MV16_INTER_BIAS;
696          int thresh = 0;          int thresh = 0;
697          int top = 0, top_right = 0, left = 0;          int top = 0, top_right = 0, left = 0;
698            Data->scan_table = VopFlags & XVID_VOP_ALTERNATESCAN ?
699                                                    scan_tables[2] : scan_tables[0];
700    
701          pMB->mcsel = 0;          pMB->mcsel = 0;
702    
# Line 734  Line 801 
801          thresh = 0;          thresh = 0;
802    
803          if((x > 0) && (y > 0) && (x < (int32_t) pParam->mb_width)) {          if((x > 0) && (y > 0) && (x < (int32_t) pParam->mb_width)) {
804                  left = (&pMBs[(x-1) + y * pParam->mb_width])->sad16; // left                  left = (&pMBs[(x-1) + y * pParam->mb_width])->sad16; /* left */
805                  top = (&pMBs[x + (y-1) * pParam->mb_width])->sad16; // top                  top = (&pMBs[x + (y-1) * pParam->mb_width])->sad16; /* top */
806                  top_right = (&pMBs[(x+1) + (y-1) * pParam->mb_width])->sad16; // top right                  top_right = (&pMBs[(x+1) + (y-1) * pParam->mb_width])->sad16; /* top right */
807    
808                  if(((&pMBs[(x-1) + y * pParam->mb_width])->mode != MODE_INTRA) &&                  if(((&pMBs[(x-1) + y * pParam->mb_width])->mode != MODE_INTRA) &&
809                     ((&pMBs[x + (y-1) * pParam->mb_width])->mode != MODE_INTRA) &&                     ((&pMBs[x + (y-1) * pParam->mb_width])->mode != MODE_INTRA) &&
# Line 814  Line 881 
881                          }                          }
882                  }                  }
883    
884                  intra_rd = findRD_intra(Data);                  intra_rd = findRD_intra(Data, pMB, x, y, pParam->mb_width);
885                  if (intra_rd < min_rd) {                  if (intra_rd < min_rd) {
886                          *Data->iMinSAD = min_rd = intra_rd;                          *Data->iMinSAD = min_rd = intra_rd;
887                          mode = MODE_INTRA;                          mode = MODE_INTRA;
# Line 844  Line 911 
911                          pMB->pmvs[0].y = Data->currentMV[0].y - Data->predMV.y;                          pMB->pmvs[0].y = Data->currentMV[0].y - Data->predMV.y;
912                  }                  }
913    
914          } else if (mode == MODE_INTER ) { // but mcsel == 1          } else if (mode == MODE_INTER ) { /* but mcsel == 1 */
915    
916                  pMB->mcsel = 1;                  pMB->mcsel = 1;
917                  if (Data->qpel) {                  if (Data->qpel) {
Legend:
Removed from v.1156  
changed lines
  Added in v.1177
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4