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

Diff of /xvidcore/src/decoder.c

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

revision 1.51.2.3, Mon May 3 23:28:29 2004 UTC revision 1.55, Thu Apr 15 12:05:19 2004 UTC
# Line 4  Line 4 
4   *  - Decoder Module -   *  - Decoder Module -
5   *   *
6   *  Copyright(C) 2002      MinChen <chenm001@163.com>   *  Copyright(C) 2002      MinChen <chenm001@163.com>
7   *               2002-2003 Peter Ross <pross@xvid.org>   *               2002-2004 Peter Ross <pross@xvid.org>
8   *   *
9   *  This program is free software ; you can redistribute it and/or modify   *  This program is free software ; you can redistribute it and/or modify
10   *  it under the terms of the GNU General Public License as published by   *  it under the terms of the GNU General Public License as published by
# Line 222  Line 222 
222          dec->time = dec->time_base = dec->last_time_base = 0;          dec->time = dec->time_base = dec->last_time_base = 0;
223          dec->low_delay = 0;          dec->low_delay = 0;
224          dec->packed_mode = 0;          dec->packed_mode = 0;
         dec->time_inc_resolution = 1; /* until VOL header says otherwise */  
225    
226          dec->fixed_dimensions = (dec->width > 0 && dec->height > 0);          dec->fixed_dimensions = (dec->width > 0 && dec->height > 0);
227    
# Line 303  Line 302 
302    
303                  start_timer();                  start_timer();
304                  predict_acdc(dec->mbs, x_pos, y_pos, dec->mb_width, i, &block[i * 64],                  predict_acdc(dec->mbs, x_pos, y_pos, dec->mb_width, i, &block[i * 64],
305                                           iQuant, iDcScaler, predictors, bound, dec->bs_version);                                           iQuant, iDcScaler, predictors, bound);
306                  if (!acpred_flag) {                  if (!acpred_flag) {
307                          pMB->acpred_directions[i] = 0;                          pMB->acpred_directions[i] = 0;
308                  }                  }
# Line 1361  Line 1360 
1360                                          xvid_dec_frame_t * frame, xvid_dec_stats_t * stats,                                          xvid_dec_frame_t * frame, xvid_dec_stats_t * stats,
1361                                          int coding_type, int quant)                                          int coding_type, int quant)
1362  {  {
1363            const int brightness = XVID_VERSION_MINOR(frame->version) >= 1 ? frame->brightness : 0;
1364    
1365          if (dec->cartoon_mode)          if (dec->cartoon_mode)
1366                  frame->general &= ~XVID_FILMEFFECT;                  frame->general &= ~XVID_FILMEFFECT;
1367    
1368          if (frame->general & (XVID_DEBLOCKY|XVID_DEBLOCKUV|XVID_FILMEFFECT) && mbs != NULL)     /* post process */          if ((frame->general & (XVID_DEBLOCKY|XVID_DEBLOCKUV|XVID_FILMEFFECT) || brightness!=0)
1369                    && mbs != NULL) /* post process */
1370          {          {
1371                  /* note: image is stored to tmp */                  /* note: image is stored to tmp */
1372                  image_copy(&dec->tmp, img, dec->edged_width, dec->height);                  image_copy(&dec->tmp, img, dec->edged_width, dec->height);
1373                  image_postproc(&dec->postproc, &dec->tmp, dec->edged_width,                  image_postproc(&dec->postproc, &dec->tmp, dec->edged_width,
1374                                             mbs, dec->mb_width, dec->mb_height, dec->mb_width,                                             mbs, dec->mb_width, dec->mb_height, dec->mb_width,
1375                                             frame->general, dec->frames, (coding_type == B_VOP));                                             frame->general, brightness, dec->frames, (coding_type == B_VOP));
1376                  img = &dec->tmp;                  img = &dec->tmp;
1377          }          }
1378    
# Line 1490  Line 1492 
1492                  goto repeat;                  goto repeat;
1493          }          }
1494    
         if(dec->frames == 0 && coding_type != I_VOP) {  
                 /* 1st frame is not an i-vop */  
                 goto repeat;  
         }  
   
1495          dec->p_bmv.x = dec->p_bmv.y = dec->p_fmv.y = dec->p_fmv.y = 0;  /* init pred vector to 0 */          dec->p_bmv.x = dec->p_bmv.y = dec->p_fmv.y = dec->p_fmv.y = 0;  /* init pred vector to 0 */
1496    
1497          /* packed_mode: special-N_VOP treament */          /* packed_mode: special-N_VOP treament */

Legend:
Removed from v.1.51.2.3  
changed lines
  Added in v.1.55

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