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

Diff of /trunk/xvidcore/src/encoder.c

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

revision 41, Wed Mar 20 00:28:02 2002 UTC revision 66, Sun Mar 24 20:07:31 2002 UTC
# Line 82  Line 82 
82                  pParam->bitrate = 900000;                  pParam->bitrate = 900000;
83    
84          if (pParam->rc_buffersize <= 0)          if (pParam->rc_buffersize <= 0)
85                  pParam->rc_buffersize = pParam->bitrate * pParam->fbase;                  pParam->rc_buffersize = 16;
86    
87          if ((pParam->min_quantizer <= 0) || (pParam->min_quantizer > 31))          if ((pParam->min_quantizer <= 0) || (pParam->min_quantizer > 31))
88                  pParam->min_quantizer = 1;                  pParam->min_quantizer = 1;
# Line 96  Line 96 
96          if (pParam->max_quantizer < pParam->min_quantizer)          if (pParam->max_quantizer < pParam->min_quantizer)
97                  pParam->max_quantizer = pParam->min_quantizer;                  pParam->max_quantizer = pParam->min_quantizer;
98    
99          if ((pEnc = (Encoder *) xvid_malloc(sizeof(Encoder), 16)) == NULL)          if ((pEnc = (Encoder *) xvid_malloc(sizeof(Encoder), CACHE_LINE)) == NULL)
100                  return XVID_ERR_MEMORY;                  return XVID_ERR_MEMORY;
101    
102          /* Fill members of Encoder structure */          /* Fill members of Encoder structure */
# Line 161  Line 161 
161                  return XVID_ERR_MEMORY;                  return XVID_ERR_MEMORY;
162          }          }
163    
164          pEnc->pMBs = xvid_malloc(sizeof(MACROBLOCK) * pEnc->mbParam.mb_width * pEnc->mbParam.mb_height, 16);          pEnc->pMBs = xvid_malloc(sizeof(MACROBLOCK) * pEnc->mbParam.mb_width * pEnc->mbParam.mb_height, CACHE_LINE);
165          if (pEnc->pMBs == NULL)          if (pEnc->pMBs == NULL)
166          {          {
167                  image_destroy(&pEnc->sCurrent, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);                  image_destroy(&pEnc->sCurrent, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
# Line 183  Line 183 
183    
184          if (pParam->bitrate)          if (pParam->bitrate)
185          {          {
186                  RateControlInit(pParam->bitrate, pParam->rc_buffersize, pParam->fbase, pParam->width,                  RateControlInit(pParam->bitrate, pParam->rc_buffersize, pParam->fbase * 100 / pParam->fincr,
187                                  pParam->height, pParam->max_quantizer, pParam->min_quantizer);                                  pParam->max_quantizer, pParam->min_quantizer);
188          }          }
189    
190          create_vlc_tables();          create_vlc_tables();
# Line 253  Line 253 
253    
254          if ((pEnc->mbParam.global_flags & XVID_LUMIMASKING) > 0)          if ((pEnc->mbParam.global_flags & XVID_LUMIMASKING) > 0)
255          {          {
256                  int * temp_dquants = (int *) xvid_malloc(pEnc->mbParam.mb_width * pEnc->mbParam.mb_height * sizeof(int), 16);                  int * temp_dquants = (int *) xvid_malloc(pEnc->mbParam.mb_width * pEnc->mbParam.mb_height * sizeof(int), CACHE_LINE);
257    
258                  pEnc->mbParam.quant = adaptive_quantization(pEnc->sCurrent.y, pEnc->mbParam.width,                  pEnc->mbParam.quant = adaptive_quantization(pEnc->sCurrent.y, pEnc->mbParam.width,
259                                                              temp_dquants, pFrame->quant, pFrame->quant,                                                              temp_dquants, pFrame->quant, pFrame->quant,
# Line 364  Line 364 
364    
365  static int FrameCodeI(Encoder * pEnc, Bitstream * bs, uint32_t *pBits)  static int FrameCodeI(Encoder * pEnc, Bitstream * bs, uint32_t *pBits)
366  {  {
367          int16_t dct_codes[6][64];          CACHE_ALIGN int16_t dct_codes[6][64];
368          int16_t qcoeff[6][64];          CACHE_ALIGN int16_t qcoeff[6][64];
369          uint16_t x, y;          uint16_t x, y;
370    
371          pEnc->iFrameNum = 0;          pEnc->iFrameNum = 0;
# Line 418  Line 418 
418  static int FrameCodeP(Encoder * pEnc, Bitstream * bs, uint32_t *pBits, bool force_inter, bool vol_header)  static int FrameCodeP(Encoder * pEnc, Bitstream * bs, uint32_t *pBits, bool force_inter, bool vol_header)
419  {  {
420          float fSigma;          float fSigma;
421          int16_t dct_codes[6][64];  
422          int16_t qcoeff[6][64];          CACHE_ALIGN int16_t dct_codes[6][64];
423            CACHE_ALIGN int16_t qcoeff[6][64];
424    
425          int iLimit;          int iLimit;
426          uint32_t x, y;          uint32_t x, y;
427          int iSearchRange;          int iSearchRange;

Legend:
Removed from v.41  
changed lines
  Added in v.66

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