[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.74, Tue Sep 20 11:54:11 2005 UTC revision 1.79, Sun Sep 10 22:42:15 2006 UTC
# Line 195  Line 195 
195    dec->low_delay = 0;    dec->low_delay = 0;
196    dec->packed_mode = 0;    dec->packed_mode = 0;
197    dec->time_inc_resolution = 1; /* until VOL header says otherwise */    dec->time_inc_resolution = 1; /* until VOL header says otherwise */
198      dec->ver_id = 1;
199    
200      dec->bs_version = 0xffff; /* Initialize to very high value -> assume bugfree stream */
201    
202    dec->fixed_dimensions = (dec->width > 0 && dec->height > 0);    dec->fixed_dimensions = (dec->width > 0 && dec->height > 0);
203    
# Line 316  Line 319 
319      stop_iquant_timer();      stop_iquant_timer();
320    
321      start_timer();      start_timer();
322      idct(&data[i * 64]);      idct((short * const)&data[i * 64]);
323      stop_idct_timer();      stop_idct_timer();
324    
325    }    }
# Line 406  Line 409 
409    
410        /* iDCT */        /* iDCT */
411        start_timer();        start_timer();
412        idct(&data[0]);        idct((short * const)&data[0]);
413        stop_idct_timer();        stop_idct_timer();
414    
415        /* Add this residual to the predicted block */        /* Add this residual to the predicted block */
# Line 466  Line 469 
469          const uint32_t cbp,          const uint32_t cbp,
470          Bitstream * bs,          Bitstream * bs,
471          const uint32_t rounding,          const uint32_t rounding,
472          const int ref)          const int ref,
473                    const int bvop)
474  {  {
475    uint32_t stride = dec->edged_width;    uint32_t stride = dec->edged_width;
476    uint32_t stride2 = stride / 2;    uint32_t stride2 = stride / 2;
# Line 487  Line 491 
491    
492    start_timer();    start_timer();
493    
494    if (pMB->mode != MODE_INTER4V) { /* INTER, INTER_Q, NOT_CODED, FORWARD, BACKWARD */    if ((pMB->mode != MODE_INTER4V) || (bvop)) { /* INTER, INTER_Q, NOT_CODED, FORWARD, BACKWARD */
495    
496      uv_dx = mv[0].x;      uv_dx = mv[0].x;
497      uv_dy = mv[0].y;      uv_dy = mv[0].y;
# Line 581  Line 585 
585          const uint32_t cbp,          const uint32_t cbp,
586          Bitstream * bs,          Bitstream * bs,
587          const uint32_t rounding,          const uint32_t rounding,
588          const int ref)          const int ref,
589                    const int bvop)
590  {  {
591    uint32_t stride = dec->edged_width;    uint32_t stride = dec->edged_width;
592    uint32_t stride2 = stride / 2;    uint32_t stride2 = stride / 2;
# Line 605  Line 610 
610    
611    start_timer();    start_timer();
612    
613    if(pMB->mode!=MODE_INTER4V)   /* INTER, INTER_Q, NOT_CODED, FORWARD, BACKWARD */    if((pMB->mode!=MODE_INTER4V) || (bvop))   /* INTER, INTER_Q, NOT_CODED, FORWARD, BACKWARD */
614    {    {
615      /* Prepare top field vector */      /* Prepare top field vector */
616      uvtop_dx = DIV2ROUND(mv[0].x);      uvtop_dx = DIV2ROUND(mv[0].x);
# Line 1063  Line 1068 
1068    
1069          /* See how to decode */          /* See how to decode */
1070          if(!mb->field_pred)          if(!mb->field_pred)
1071           decoder_mbinter(dec, mb, x, y, cbp, bs, rounding, 0);           decoder_mbinter(dec, mb, x, y, cbp, bs, rounding, 0, 0);
1072          else          else
1073           decoder_mbinter_field(dec, mb, x, y, cbp, bs, rounding, 0);           decoder_mbinter_field(dec, mb, x, y, cbp, bs, rounding, 0, 0);
1074    
1075        } else if (gmc_warp) {  /* a not coded S(GMC)-VOP macroblock */        } else if (gmc_warp) {  /* a not coded S(GMC)-VOP macroblock */
1076          mb->mode = MODE_NOT_CODED_GMC;          mb->mode = MODE_NOT_CODED_GMC;
# Line 1086  Line 1091 
1091          mb->field_pred=0; /* (!) */          mb->field_pred=0; /* (!) */
1092    
1093          decoder_mbinter(dec, mb, x, y, 0, bs,          decoder_mbinter(dec, mb, x, y, 0, bs,
1094                                  rounding, 0);                                  rounding, 0, 0);
1095    
1096          if(dec->out_frm && cp_mb > 0) {          if(dec->out_frm && cp_mb > 0) {
1097            output_slice(&dec->cur, dec->edged_width,dec->width,dec->out_frm,st_mb,y,cp_mb);            output_slice(&dec->cur, dec->edged_width,dec->width,dec->out_frm,st_mb,y,cp_mb);
# Line 1188  Line 1193 
1193      b_uv_dy = (b_uv_dy >> 1) + roundtab_79[b_uv_dy & 0x3];      b_uv_dy = (b_uv_dy >> 1) + roundtab_79[b_uv_dy & 0x3];
1194    
1195    } else {    } else {
1196      uv_dx = pMB->mvs[0].x + pMB->mvs[1].x + pMB->mvs[2].x + pMB->mvs[3].x;            if (dec->quarterpel) { /* for qpel the /2 shall be done before summation. We've done it right in the encoder in the past. */
1197      uv_dy = pMB->mvs[0].y + pMB->mvs[1].y + pMB->mvs[2].y + pMB->mvs[3].y;                                                           /* TODO: figure out if we ever did it wrong on the encoder side. If yes, add some workaround */
     b_uv_dx = pMB->b_mvs[0].x + pMB->b_mvs[1].x + pMB->b_mvs[2].x + pMB->b_mvs[3].x;  
     b_uv_dy = pMB->b_mvs[0].y + pMB->b_mvs[1].y + pMB->b_mvs[2].y + pMB->b_mvs[3].y;  
   
     if (dec->quarterpel) {  
1198        if (dec->bs_version <= BS_VERSION_BUGGY_CHROMA_ROUNDING) {        if (dec->bs_version <= BS_VERSION_BUGGY_CHROMA_ROUNDING) {
1199                                  uv_dx = (uv_dx>>1) | (uv_dx&1);                          int z;
1200                                  uv_dy = (uv_dy>>1) | (uv_dy&1);                          uv_dx = 0; uv_dy = 0;
1201                                  b_uv_dx = (b_uv_dx>>1) | (b_uv_dx&1);                          b_uv_dx = 0; b_uv_dy = 0;
1202                                  b_uv_dy = (b_uv_dy>>1) | (b_uv_dy&1);                          for (z = 0; z < 4; z++) {
1203                              uv_dx += ((pMB->mvs[z].x>>1) | (pMB->mvs[z].x&1));
1204                              uv_dy += ((pMB->mvs[z].y>>1) | (pMB->mvs[z].y&1));
1205                              b_uv_dx += ((pMB->b_mvs[z].x>>1) | (pMB->b_mvs[z].x&1));
1206                              b_uv_dy += ((pMB->b_mvs[z].y>>1) | (pMB->b_mvs[z].y&1));
1207                            }
1208                          }                          }
1209                          else {                          else {
1210          uv_dx /= 2;                          uv_dx = (pMB->mvs[0].x / 2) + (pMB->mvs[1].x / 2) + (pMB->mvs[2].x / 2) + (pMB->mvs[3].x / 2);
1211          uv_dy /= 2;                          uv_dy = (pMB->mvs[0].y / 2) + (pMB->mvs[1].y / 2) + (pMB->mvs[2].y / 2) + (pMB->mvs[3].y / 2);
1212          b_uv_dx /= 2;                          b_uv_dx = (pMB->b_mvs[0].x / 2) + (pMB->b_mvs[1].x / 2) + (pMB->b_mvs[2].x / 2) + (pMB->b_mvs[3].x / 2);
1213          b_uv_dy /= 2;                          b_uv_dy = (pMB->b_mvs[0].y / 2) + (pMB->b_mvs[1].y / 2) + (pMB->b_mvs[2].y / 2) + (pMB->b_mvs[3].y / 2);
1214        }        }
1215            } else {
1216          uv_dx = pMB->mvs[0].x + pMB->mvs[1].x + pMB->mvs[2].x + pMB->mvs[3].x;
1217          uv_dy = pMB->mvs[0].y + pMB->mvs[1].y + pMB->mvs[2].y + pMB->mvs[3].y;
1218          b_uv_dx = pMB->b_mvs[0].x + pMB->b_mvs[1].x + pMB->b_mvs[2].x + pMB->b_mvs[3].x;
1219          b_uv_dy = pMB->b_mvs[0].y + pMB->b_mvs[1].y + pMB->b_mvs[2].y + pMB->b_mvs[3].y;
1220      }      }
1221    
1222      uv_dx = (uv_dx >> 3) + roundtab_76[uv_dx & 0xf];      uv_dx = (uv_dx >> 3) + roundtab_76[uv_dx & 0xf];
# Line 1384  Line 1395 
1395        if (last_mb->mode == MODE_NOT_CODED) {        if (last_mb->mode == MODE_NOT_CODED) {
1396          mb->cbp = 0;          mb->cbp = 0;
1397          mb->mode = MODE_FORWARD;          mb->mode = MODE_FORWARD;
1398          decoder_mbinter(dec, mb, x, y, mb->cbp, bs, 0, 1);          decoder_mbinter(dec, mb, x, y, mb->cbp, bs, 0, 1, 1);
1399          continue;          continue;
1400        }        }
1401    
# Line 1467  Line 1478 
1478          get_b_motion_vector(bs, &mb->mvs[0], fcode_backward, dec->p_bmv, dec, x, y);          get_b_motion_vector(bs, &mb->mvs[0], fcode_backward, dec->p_bmv, dec, x, y);
1479          dec->p_bmv = mb->mvs[1] = mb->mvs[2] = mb->mvs[3] = mb->mvs[0];          dec->p_bmv = mb->mvs[1] = mb->mvs[2] = mb->mvs[3] = mb->mvs[0];
1480    
1481          decoder_mbinter(dec, mb, x, y, mb->cbp, bs, 0, 0);          decoder_mbinter(dec, mb, x, y, mb->cbp, bs, 0, 0, 1);
1482          break;          break;
1483    
1484        case MODE_FORWARD:        case MODE_FORWARD:
1485          get_b_motion_vector(bs, &mb->mvs[0], fcode_forward, dec->p_fmv, dec, x, y);          get_b_motion_vector(bs, &mb->mvs[0], fcode_forward, dec->p_fmv, dec, x, y);
1486          dec->p_fmv = mb->mvs[1] = mb->mvs[2] = mb->mvs[3] = mb->mvs[0];          dec->p_fmv = mb->mvs[1] = mb->mvs[2] = mb->mvs[3] = mb->mvs[0];
1487    
1488          decoder_mbinter(dec, mb, x, y, mb->cbp, bs, 0, 1);          decoder_mbinter(dec, mb, x, y, mb->cbp, bs, 0, 1, 1);
1489          break;          break;
1490    
1491        default:        default:
# Line 1485  Line 1496 
1496  }  }
1497    
1498  /* perform post processing if necessary, and output the image */  /* perform post processing if necessary, and output the image */
1499  void decoder_output(DECODER * dec, IMAGE * img, MACROBLOCK * mbs,  static void decoder_output(DECODER * dec, IMAGE * img, MACROBLOCK * mbs,
1500            xvid_dec_frame_t * frame, xvid_dec_stats_t * stats,            xvid_dec_frame_t * frame, xvid_dec_stats_t * stats,
1501            int coding_type, int quant)            int coding_type, int quant)
1502  {  {
# Line 1607  Line 1618 
1618    if (coding_type == -2 || coding_type == -3) { /* vol and/or resize */    if (coding_type == -2 || coding_type == -3) { /* vol and/or resize */
1619    
1620      if (coding_type == -3)      if (coding_type == -3)
1621        decoder_resize(dec);        if (decoder_resize(dec)) return XVID_ERR_MEMORY;
1622    
1623      if(stats) {      if(stats) {
1624        stats->type = XVID_TYPE_VOL;        stats->type = XVID_TYPE_VOL;

Legend:
Removed from v.1.74  
changed lines
  Added in v.1.79

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