[svn] / trunk / xvidcore / src / motion / estimation_rd_based.c Repository:
ViewVC logotype

Diff of /trunk/xvidcore/src/motion/estimation_rd_based.c

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

revision 1652, Thu Nov 3 05:44:07 2005 UTC revision 1653, Tue Nov 22 10:23:01 2005 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.12 2004-12-18 12:06:43 syskin Exp $   * $Id: estimation_rd_based.c,v 1.13 2005-11-22 10:23:01 suxen_drol Exp $
24   *   *
25   ****************************************************************************/   ****************************************************************************/
26    
# Line 64  Line 64 
64          int bits;          int bits;
65          int distortion = 0;          int distortion = 0;
66    
67          fdct(data);          fdct((short * const)data);
68    
69          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);
70          else sum = quant_mpeg_inter(coeff, data, quant, mpeg_quant_matrices);          else sum = quant_mpeg_inter(coeff, data, quant, mpeg_quant_matrices);
# Line 121  Line 121 
121          unsigned int distortion = 0;          unsigned int distortion = 0;
122          const uint32_t iDcScaler = get_dc_scaler(quant, block < 4);          const uint32_t iDcScaler = get_dc_scaler(quant, block < 4);
123    
124          fdct(coeff);          fdct((short * const)coeff);
125    
126          if (quant_type) {          if (quant_type) {
127                  quant_h263_intra(qcoeff, coeff, quant, iDcScaler, mpeg_quant_matrices);                  quant_h263_intra(qcoeff, coeff, quant, iDcScaler, mpeg_quant_matrices);
# Line 135  Line 135 
135                                  quant, iDcScaler, predictors, 0);                                  quant, iDcScaler, predictors, 0);
136    
137          direction = pMB->acpred_directions[block];          direction = pMB->acpred_directions[block];
138          pCurrent = pMB->pred_values[block];          pCurrent = (int16_t*)pMB->pred_values[block];
139    
140          /* store current coeffs to pred_values[] for future prediction */          /* store current coeffs to pred_values[] for future prediction */
141          pCurrent[0] = qcoeff[0] * iDcScaler;          pCurrent[0] = qcoeff[0] * iDcScaler;
Legend:
Removed from v.1652  
changed lines
  Added in v.1653
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4