[cvs] / xvidcore / src / motion / estimation_rd_based_bvop.c Repository:
ViewVC logotype

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

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

revision 1.8, Sun Dec 19 14:05:55 2004 UTC revision 1.10, Fri Dec 9 04:45:35 2005 UTC
# Line 63  Line 63 
63          int bits;          int bits;
64          int distortion = 0;          int distortion = 0;
65    
66          fdct(data);          fdct((short * const)data);
67    
68          if (quant_type) sum = quant_h263_inter(coeff, data, quant, mpeg_quant_matrices);          if (quant_type) sum = quant_h263_inter(coeff, data, quant, mpeg_quant_matrices);
69          else sum = quant_mpeg_inter(coeff, data, quant, mpeg_quant_matrices);          else sum = quant_mpeg_inter(coeff, data, quant, mpeg_quant_matrices);
# Line 115  Line 115 
115          int bits;          int bits;
116          int distortion = 0;          int distortion = 0;
117    
118          fdct(data);          fdct((short * const)data);
119    
120          if (quant_type) sum = quant_h263_inter(coeff, data, quant, mpeg_quant_matrices);          if (quant_type) sum = quant_h263_inter(coeff, data, quant, mpeg_quant_matrices);
121          else sum = quant_mpeg_inter(coeff, data, quant, mpeg_quant_matrices);          else sum = quant_mpeg_inter(coeff, data, quant, mpeg_quant_matrices);
# Line 503  Line 503 
503          f_rd = b_rd = i_rd = d_rd = best_rd = 256*4096;          f_rd = b_rd = i_rd = d_rd = best_rd = 256*4096;
504    
505          for (i = 0; i < 6; i++) {          for (i = 0; i < 6; i++) {
506                  int lam = (LAMBDA*iQuant*iQuant)/(ref_quant*(ref_quant+1)); /* re-calculate as if it was p-frame's quant +.5 */                  /* re-calculate as if it was p-frame's quant +.5 */
507                    int lam = (pMB->lambda[i]*LAMBDA*iQuant*iQuant)/(ref_quant*(ref_quant+1));
508                    lam >>= LAMBDA_EXP;
509                  Data_d->lambda[i] = lam;                  Data_d->lambda[i] = lam;
510                  Data_b->lambda[i] = lam;                  Data_b->lambda[i] = lam;
511                  Data_f->lambda[i] = lam;                  Data_f->lambda[i] = lam;

Legend:
Removed from v.1.8  
changed lines
  Added in v.1.10

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