[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 1161, Wed Oct 1 23:23:01 2003 UTC revision 1215, Wed Nov 19 12:24:25 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.4 2003-10-01 23:23:01 edgomez Exp $   * $Id: estimation_rd_based.c,v 1.1.2.10 2003-11-19 12:24:25 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;
62          int distortion = 0;          int distortion = 0;
         int i;  
63    
64          fdct(data);          fdct(data);
65    
66          if (quant_type) sum = quant_inter(coeff, data, quant);          if (quant_type) sum = quant_h263_inter(coeff, data, quant);
67          else sum = quant4_inter(coeff, data, quant);          else sum = quant_mpeg_inter(coeff, data, quant);
68    
69          if (sum > 0) {          if (sum > 0) {
70                  *cbp |= 1 << (5 - block);                  *cbp |= 1 << (5 - block);
71                  bits = BITS_MULT * CodeCoeffInter_CalcBits(coeff, scan_tables[0]);                  bits = BITS_MULT * CodeCoeffInter_CalcBits(coeff, scan_table);
   
                 if (quant_type) dequant_inter(dqcoeff, coeff, quant);  
                 else dequant4_inter(dqcoeff, coeff, quant);  
72    
73                  for (i = 0; i < 64; i++)                  if (quant_type) dequant_h263_inter(dqcoeff, coeff, quant);
74                          distortion += (data[i] - dqcoeff[i])*(data[i] - dqcoeff[i]);                  else dequant_mpeg_inter(dqcoeff, coeff, quant);
75    
76                    distortion = sse8_16bit(data, dqcoeff, 8*sizeof(int16_t));
77          } else {          } else {
78                    const static int16_t zero_block[64] =
79                            {
80                                    0, 0, 0, 0, 0, 0, 0, 0,
81                                    0, 0, 0, 0, 0, 0, 0, 0,
82                                    0, 0, 0, 0, 0, 0, 0, 0,
83                                    0, 0, 0, 0, 0, 0, 0, 0,
84                                    0, 0, 0, 0, 0, 0, 0, 0,
85                                    0, 0, 0, 0, 0, 0, 0, 0,
86                                    0, 0, 0, 0, 0, 0, 0, 0,
87                                    0, 0, 0, 0, 0, 0, 0, 0,
88                            };
89                  bits = 0;                  bits = 0;
90                  for (i = 0; i < 64; i++)                  distortion = sse8_16bit(data, zero_block, 8*sizeof(int16_t));
                         distortion += data[i]*data[i];  
91          }          }
92    
93    
94          return bits + (LAMBDA*distortion)/(quant*quant);          return bits + (LAMBDA*distortion)/(quant*quant);
95  }  }
96    
97  static __inline unsigned int  static __inline unsigned int
98  Block_CalcBitsIntra(int16_t * const coeff,  Block_CalcBitsIntra(MACROBLOCK * pMB,
99                                          int16_t * const data,                                          const unsigned int x,
100                                          int16_t * const dqcoeff,                                          const unsigned int y,
101                                          const uint32_t quant, const int quant_type,                                          const unsigned int mb_width,
102                                          uint32_t * cbp,                                          const uint32_t block,
103                                          const int block,                                          int16_t coeff[64],
104                                          int * dcpred)                                          int16_t qcoeff[64],
105  {                                          int16_t dqcoeff[64],
106          int bits, i;                                          int16_t predictors[8],
107          int distortion = 0;                                          const uint32_t quant,
108          uint32_t iDcScaler = get_dc_scaler(quant, block < 4);                                          const int quant_type,
109          int b_dc;                                          unsigned int bits[2],
110                                            unsigned int cbp[2])
111    {
112            int direction;
113            int16_t *pCurrent;
114            unsigned int i, coded;
115            unsigned int distortion = 0;
116            const uint32_t iDcScaler = get_dc_scaler(quant, block < 4);
117    
118            fdct(coeff);
119    
120            if (quant_type) {
121                    quant_h263_intra(qcoeff, coeff, quant, iDcScaler);
122                    dequant_h263_intra(dqcoeff, qcoeff, quant, iDcScaler);
123            } else {
124                    quant_mpeg_intra(qcoeff, coeff, quant, iDcScaler);
125                    dequant_mpeg_intra(dqcoeff, qcoeff, quant, iDcScaler);
126            }
127    
128          fdct(data);          predict_acdc(pMB-(x+mb_width*y), x, y, mb_width, block, qcoeff,
129          data[0] -= 1024;                                  quant, iDcScaler, predictors, 0);
130    
131          if (quant_type) quant_intra(coeff, data, quant, iDcScaler);          direction = pMB->acpred_directions[block];
132          else quant4_intra(coeff, data, quant, iDcScaler);          pCurrent = pMB->pred_values[block];
133    
134          b_dc = coeff[0];          /* store current coeffs to pred_values[] for future prediction */
135          if (block < 4) {          pCurrent[0] = qcoeff[0] * iDcScaler;
136                  coeff[0] -= *dcpred;          for (i = 1; i < 8; i++) {
137                  *dcpred = b_dc;                  pCurrent[i] = qcoeff[i];
138                    pCurrent[i + 7] = qcoeff[i * 8];
139          }          }
140    
141          bits = BITS_MULT*CodeCoeffIntra_CalcBits(coeff, scan_tables[0]);          /* dc prediction */
142          if (bits != 0) *cbp |= 1 << (5 - block);          qcoeff[0] = qcoeff[0] - predictors[0];
143    
144          if (block < 4) bits += BITS_MULT*dcy_tab[coeff[0] + 255].len;          if (block < 4) bits[1] = bits[0] = dcy_tab[qcoeff[0] + 255].len;
145          else bits += BITS_MULT*dcc_tab[coeff[0] + 255].len;          else bits[1] = bits[0] = dcc_tab[qcoeff[0] + 255].len;
146    
147          coeff[0] = b_dc;          /* calc cost before ac prediction */
148          if (quant_type) dequant_intra(dqcoeff, coeff, quant, iDcScaler);          bits[0] += coded = CodeCoeffIntra_CalcBits(qcoeff, scan_tables[0]);
149          else dequant4_intra(dqcoeff, coeff, quant, iDcScaler);          if (coded > 0) cbp[0] |= 1 << (5 - block);
150    
151          for (i = 0; i < 64; i++)          /* apply ac prediction & calc cost*/
152                  distortion += (data[i] - dqcoeff[i])*(data[i] - dqcoeff[i]);          if (direction == 1) {
153                    for (i = 1; i < 8; i++) {
154                            qcoeff[i] -= predictors[i];
155                            predictors[i] = qcoeff[i];
156                    }
157            } else {                                                /* acpred_direction == 2 */
158                    for (i = 1; i < 8; i++) {
159                            qcoeff[i*8] -= predictors[i];
160                            predictors[i] = qcoeff[i*8];
161                    }
162            }
163    
164          return bits + (LAMBDA*distortion)/(quant*quant);          bits[1] += coded = CodeCoeffIntra_CalcBits(qcoeff, scan_tables[direction]);
165            if (coded > 0) cbp[1] |= 1 << (5 - block);
166    
167            distortion = sse8_16bit(coeff, dqcoeff, 8*sizeof(int16_t));
168    
169            return (LAMBDA*distortion)/(quant*quant);
170  }  }
171    
172    
173    
174  static void  static void
175  CheckCandidateRD16(const int x, const int y, const SearchData * const data, const unsigned int Direction)  CheckCandidateRD16(const int x, const int y, SearchData * const data, const unsigned int Direction)
176  {  {
177    
178          int16_t *in = data->dctSpace, *coeff = data->dctSpace + 64;          int16_t *in = data->dctSpace, *coeff = data->dctSpace + 64;
179          int32_t rd = 0;          int32_t rd = 0;
180          VECTOR * current;          VECTOR * current;
181          const uint8_t * ptr;          const uint8_t * ptr;
182          int i, cbp = 0, t, xc, yc;          int i, t, xc, yc;
183            unsigned cbp = 0;
184    
185          if ( (x > data->max_dx) || (x < data->min_dx)          if ( (x > data->max_dx) || (x < data->min_dx)
186                  || (y > data->max_dy) || (y < data->min_dy) ) return;                  || (y > data->max_dy) || (y < data->min_dy) ) return;
# Line 154  Line 198 
198          for(i = 0; i < 4; i++) {          for(i = 0; i < 4; i++) {
199                  int s = 8*((i&1) + (i>>1)*data->iEdgedWidth);                  int s = 8*((i&1) + (i>>1)*data->iEdgedWidth);
200                  transfer_8to16subro(in, data->Cur + s, ptr + s, data->iEdgedWidth);                  transfer_8to16subro(in, data->Cur + s, ptr + s, data->iEdgedWidth);
201                  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);
202          }          }
203    
204          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 223 
223          /* chroma U */          /* chroma U */
224          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);
225          transfer_8to16subro(in, data->CurU, ptr, data->iEdgedWidth/2);          transfer_8to16subro(in, data->CurU, ptr, data->iEdgedWidth/2);
226          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);
227          if (rd >= data->iMinSAD[0]) return;          if (rd >= data->iMinSAD[0]) return;
228    
229          /* chroma V */          /* chroma V */
230          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);
231          transfer_8to16subro(in, data->CurV, ptr, data->iEdgedWidth/2);          transfer_8to16subro(in, data->CurV, ptr, data->iEdgedWidth/2);
232          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);
233    
234          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;
235    
236          if (rd < data->iMinSAD[0]) {          if (rd < data->iMinSAD[0]) {
237                  data->iMinSAD[0] = rd;                  data->iMinSAD[0] = rd;
238                  current[0].x = x; current[0].y = y;                  current[0].x = x; current[0].y = y;
239                  *data->dir = Direction;                  data->dir = Direction;
240                  *data->cbp = cbp;                  *data->cbp = cbp;
241          }          }
242  }  }
243    
244  static void  static void
245  CheckCandidateRD8(const int x, const int y, const SearchData * const data, const unsigned int Direction)  CheckCandidateRD8(const int x, const int y, SearchData * const data, const unsigned int Direction)
246  {  {
247    
248          int16_t *in = data->dctSpace, *coeff = data->dctSpace + 64;          int16_t *in = data->dctSpace, *coeff = data->dctSpace + 64;
249          int32_t rd;          int32_t rd;
250          VECTOR * current;          VECTOR * current;
251          const uint8_t * ptr;          const uint8_t * ptr;
252          int cbp = 0;          unsigned int cbp = 0;
253    
254          if ( (x > data->max_dx) || (x < data->min_dx)          if ( (x > data->max_dx) || (x < data->min_dx)
255                  || (y > data->max_dy) || (y < data->min_dy) ) return;                  || (y > data->max_dy) || (y < data->min_dy) ) return;
# Line 219  Line 263 
263          }          }
264    
265          transfer_8to16subro(in, data->Cur, ptr, data->iEdgedWidth);          transfer_8to16subro(in, data->Cur, ptr, data->iEdgedWidth);
266          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);
267          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);
268    
269          if (rd < data->iMinSAD[0]) {          if (rd < data->iMinSAD[0]) {
270                  *data->cbp = cbp;                  *data->cbp = cbp;
271                  data->iMinSAD[0] = rd;                  data->iMinSAD[0] = rd;
272                  current[0].x = x; current[0].y = y;                  current[0].x = x; current[0].y = y;
273                  *data->dir = Direction;                  data->dir = Direction;
274          }          }
275  }  }
276    
# Line 293  Line 337 
337  }  }
338    
339  static int  static int
340  findRD_inter4v(const SearchData * const Data,  findRD_inter4v(SearchData * const Data,
341                                  MACROBLOCK * const pMB, const MACROBLOCK * const pMBs,                                  MACROBLOCK * const pMB, const MACROBLOCK * const pMBs,
342                                  const int x, const int y,                                  const int x, const int y,
343                                  const MBParam * const pParam, const uint32_t MotionFlags,                                  const MBParam * const pParam, const uint32_t MotionFlags,
344                                  const VECTOR * const backup)                                  const VECTOR * const backup)
345  {  {
346    
347          int cbp = 0, bits = 0, t = 0, i;          unsigned int cbp = 0, bits = 0, t = 0, i;
348          SearchData Data2, *Data8 = &Data2;          SearchData Data2, *Data8 = &Data2;
349          int sumx = 0, sumy = 0;          int sumx = 0, sumy = 0;
350          int16_t *in = Data->dctSpace, *coeff = Data->dctSpace + 64;          int16_t *in = Data->dctSpace, *coeff = Data->dctSpace + 64;
# Line 310  Line 354 
354    
355          for (i = 0; i < 4; i++) { /* for all luma blocks */          for (i = 0; i < 4; i++) { /* for all luma blocks */
356    
357                  Data8->iMinSAD = Data->iMinSAD + i + 1;                  *Data8->iMinSAD = *(Data->iMinSAD + i + 1);
358                  Data8->currentMV = Data->currentMV + i + 1;                  *Data8->currentMV = *(Data->currentMV + i + 1);
359                  Data8->currentQMV = Data->currentQMV + i + 1;                  *Data8->currentQMV = *(Data->currentQMV + i + 1);
360                  Data8->Cur = Data->Cur + 8*((i&1) + (i>>1)*Data->iEdgedWidth);                  Data8->Cur = Data->Cur + 8*((i&1) + (i>>1)*Data->iEdgedWidth);
361                  Data8->RefP[0] = Data->RefP[0] + 8*((i&1) + (i>>1)*Data->iEdgedWidth);                  Data8->RefP[0] = Data->RefP[0] + 8*((i&1) + (i>>1)*Data->iEdgedWidth);
362                  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);
# Line 421  Line 465 
465          /* chroma U */          /* chroma U */
466          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);
467          transfer_8to16subro(in, Data->CurU, ptr, Data->iEdgedWidth/2);          transfer_8to16subro(in, Data->CurU, ptr, Data->iEdgedWidth/2);
468          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);
469    
470          if (bits >= *Data->iMinSAD) return bits;          if (bits >= *Data->iMinSAD) return bits;
471    
472          /* chroma V */          /* chroma V */
473          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);
474          transfer_8to16subro(in, Data->CurV, ptr, Data->iEdgedWidth/2);          transfer_8to16subro(in, Data->CurV, ptr, Data->iEdgedWidth/2);
475          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);
476    
477          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;
478    
# Line 437  Line 481 
481  }  }
482    
483  static int  static int
484  findRD_intra(const SearchData * const Data)  findRD_intra(SearchData * const Data, MACROBLOCK * pMB,
485                             const int x, const int y, const int mb_width)
486  {  {
487          int bits = BITS_MULT*1; /* this one is ac/dc prediction flag bit */          unsigned int cbp[2] = {0, 0}, bits[2], i;
488          int cbp = 0, i, dc = 0;          unsigned int bits1 = BITS_MULT*1, bits2 = BITS_MULT*1; /* this one is ac/dc prediction flag bit */
489          int16_t *in = Data->dctSpace, * coeff = Data->dctSpace + 64;          unsigned int distortion = 0;
490    
491            int16_t *in = Data->dctSpace, * coeff = Data->dctSpace + 64, * dqcoeff = Data->dctSpace + 128;
492            const uint32_t iQuant = Data->iQuant;
493            int16_t predictors[6][8];
494    
495          for(i = 0; i < 4; i++) {          for(i = 0; i < 4; i++) {
496                  int s = 8*((i&1) + (i>>1)*Data->iEdgedWidth);                  int s = 8*((i&1) + (i>>1)*Data->iEdgedWidth);
497                  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);  
498    
499                  if (bits >= Data->iMinSAD[0]) return bits;  
500                    distortion = Block_CalcBitsIntra(pMB, x, y, mb_width, i, in, coeff, dqcoeff,
501                                                                    predictors[i], iQuant, Data->quant_type, bits, cbp);
502                    bits1 += distortion + BITS_MULT * bits[0];
503                    bits2 += distortion + BITS_MULT * bits[1];
504    
505                    if (bits1 >= Data->iMinSAD[0] && bits2 >= Data->iMinSAD[0])
506                            return bits1;
507          }          }
508    
509          bits += BITS_MULT*xvid_cbpy_tab[cbp>>2].len;          bits1 += BITS_MULT*xvid_cbpy_tab[cbp[0]>>2].len;
510            bits2 += BITS_MULT*xvid_cbpy_tab[cbp[1]>>2].len;
511    
512          /*chroma U */          /*chroma U */
513          transfer_8to16copy(in, Data->CurU, Data->iEdgedWidth/2);          transfer_8to16copy(in, Data->CurU, Data->iEdgedWidth/2);
514          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,
515                                                                            predictors[4], iQuant, Data->quant_type, bits, cbp);
516            bits1 += distortion + BITS_MULT * bits[0];
517            bits2 += distortion + BITS_MULT * bits[1];
518    
519          if (bits >= Data->iMinSAD[0]) return bits;          if (bits1 >= Data->iMinSAD[0] && bits2 >= Data->iMinSAD[0])
520                    return bits1;
521    
522          /* chroma V */          /* chroma V */
523          transfer_8to16copy(in, Data->CurV, Data->iEdgedWidth/2);          transfer_8to16copy(in, Data->CurV, Data->iEdgedWidth/2);
524          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,
525                                                                            predictors[5], iQuant, Data->quant_type, bits, cbp);
526    
527          bits += BITS_MULT*mcbpc_inter_tab[(MODE_INTRA & 7) | ((cbp & 3) << 3)].len;          bits1 += distortion + BITS_MULT * bits[0];
528            bits2 += distortion + BITS_MULT * bits[1];
529    
530          return bits;          bits1 += BITS_MULT*mcbpc_inter_tab[(MODE_INTRA & 7) | ((cbp[0] & 3) << 3)].len;
531            bits2 += BITS_MULT*mcbpc_inter_tab[(MODE_INTRA & 7) | ((cbp[1] & 3) << 3)].len;
532    
533            *Data->cbp = bits1 <= bits2 ? cbp[0] : cbp[1];
534    
535            return MIN(bits1, bits2);
536  }  }
537    
538    
539  static int  static int
540  findRD_gmc(const SearchData * const Data, const IMAGE * const vGMC, const int x, const int y)  findRD_gmc(SearchData * const Data, const IMAGE * const vGMC, const int x, const int y)
541  {  {
542          int bits = BITS_MULT*1; /* this one is mcsel */          int bits = BITS_MULT*1; /* this one is mcsel */
543          int cbp = 0, i;          unsigned int cbp = 0, i;
544          int16_t *in = Data->dctSpace, * coeff = Data->dctSpace + 64;          int16_t *in = Data->dctSpace, * coeff = Data->dctSpace + 64;
545    
546          for(i = 0; i < 4; i++) {          for(i = 0; i < 4; i++) {
547                  int s = 8*((i&1) + (i>>1)*Data->iEdgedWidth);                  int s = 8*((i&1) + (i>>1)*Data->iEdgedWidth);
548                  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);
549                  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);
550                  if (bits >= Data->iMinSAD[0]) return bits;                  if (bits >= Data->iMinSAD[0]) return bits;
551          }          }
552    
# Line 486  Line 554 
554    
555          /*chroma U */          /*chroma U */
556          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);
557          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);
558    
559          if (bits >= Data->iMinSAD[0]) return bits;          if (bits >= Data->iMinSAD[0]) return bits;
560    
561          /* chroma V */          /* chroma V */
562          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);
563          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);
564    
565          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;
566    
# Line 520  Line 588 
588          int inter4v = (VopFlags & XVID_VOP_INTER4V) && (pMB->dquant == 0);          int inter4v = (VopFlags & XVID_VOP_INTER4V) && (pMB->dquant == 0);
589          const uint32_t iQuant = pMB->quant;          const uint32_t iQuant = pMB->quant;
590    
591          int min_rd, intra_rd, i, cbp, c[2] = {0, 0};          int min_rd, intra_rd, i, cbp;
592          VECTOR backup[5], *v;          VECTOR backup[5], *v;
593          Data->iQuant = iQuant;          Data->iQuant = iQuant;
594          Data->cbp = c;          Data->scan_table = VopFlags & XVID_VOP_ALTERNATESCAN ?
595                                                    scan_tables[2] : scan_tables[0];
596    
597          pMB->mcsel = 0;          pMB->mcsel = 0;
598    
# Line 558  Line 627 
627                  }                  }
628          }          }
629    
630          intra_rd = findRD_intra(Data);          intra_rd = findRD_intra(Data, pMB, x, y, pParam->mb_width);
631          if (intra_rd < min_rd) {          if (intra_rd < min_rd) {
632                  *Data->iMinSAD = min_rd = intra_rd;                  *Data->iMinSAD = min_rd = intra_rd;
633                  mode = MODE_INTRA;                  mode = MODE_INTRA;
634                    cbp = *Data->cbp;
635          }          }
636    
637          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 624  Line 694 
694          const uint32_t iQuant = pMB->quant;          const uint32_t iQuant = pMB->quant;
695          const int skip_possible = (coding_type == P_VOP) && (pMB->dquant == 0);          const int skip_possible = (coding_type == P_VOP) && (pMB->dquant == 0);
696      int sad;      int sad;
697          int min_rd = -1, intra_rd, i, cbp = 63, c[2] = {0, 0};          int min_rd = -1, intra_rd, i, cbp = 63;
698          VECTOR backup[5], *v;          VECTOR backup[5], *v;
699          int sad_backup[5];          int sad_backup[5];
700          int InterBias = MV16_INTER_BIAS;          int InterBias = MV16_INTER_BIAS;
701          int thresh = 0;          int thresh = 0;
702          int top = 0, top_right = 0, left = 0;          int top = 0, top_right = 0, left = 0;
703            Data->scan_table = VopFlags & XVID_VOP_ALTERNATESCAN ?
704                                                    scan_tables[2] : scan_tables[0];
705    
706          pMB->mcsel = 0;          pMB->mcsel = 0;
707    
# Line 676  Line 748 
748                  }                  }
749          } else { /* Rate-Distortion INTER<->INTER4V */          } else { /* Rate-Distortion INTER<->INTER4V */
750                  Data->iQuant = iQuant;                  Data->iQuant = iQuant;
                 Data->cbp = c;  
751                  v = Data->qpel ? Data->currentQMV : Data->currentMV;                  v = Data->qpel ? Data->currentQMV : Data->currentMV;
752    
753                  /* 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?" */
# Line 777  Line 848 
848          } else { /* Rate-Distortion INTRA<->INTER */          } else { /* Rate-Distortion INTRA<->INTER */
849                  if(min_rd < 0) {                  if(min_rd < 0) {
850                          Data->iQuant = iQuant;                          Data->iQuant = iQuant;
                         Data->cbp = c;  
851                          v = Data->qpel ? Data->currentQMV : Data->currentMV;                          v = Data->qpel ? Data->currentQMV : Data->currentMV;
852    
853                          for (i = 0; i < 5; i++) {                          for (i = 0; i < 5; i++) {
# Line 814  Line 884 
884                          }                          }
885                  }                  }
886    
887                  intra_rd = findRD_intra(Data);                  intra_rd = findRD_intra(Data, pMB, x, y, pParam->mb_width);
888                  if (intra_rd < min_rd) {                  if (intra_rd < min_rd) {
889                          *Data->iMinSAD = min_rd = intra_rd;                          *Data->iMinSAD = min_rd = intra_rd;
890                          mode = MODE_INTRA;                          mode = MODE_INTRA;
Legend:
Removed from v.1161  
changed lines
  Added in v.1215
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4