[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.75, Tue Nov 22 10:23:01 2005 UTC revision 1.76, Sat Dec 24 01:06:20 2005 UTC
# Line 466  Line 466 
466          const uint32_t cbp,          const uint32_t cbp,
467          Bitstream * bs,          Bitstream * bs,
468          const uint32_t rounding,          const uint32_t rounding,
469          const int ref)          const int ref,
470                    const int bvop)
471  {  {
472    uint32_t stride = dec->edged_width;    uint32_t stride = dec->edged_width;
473    uint32_t stride2 = stride / 2;    uint32_t stride2 = stride / 2;
# Line 487  Line 488 
488    
489    start_timer();    start_timer();
490    
491    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 */
492    
493      uv_dx = mv[0].x;      uv_dx = mv[0].x;
494      uv_dy = mv[0].y;      uv_dy = mv[0].y;
# Line 581  Line 582 
582          const uint32_t cbp,          const uint32_t cbp,
583          Bitstream * bs,          Bitstream * bs,
584          const uint32_t rounding,          const uint32_t rounding,
585          const int ref)          const int ref,
586                    const int bvop)
587  {  {
588    uint32_t stride = dec->edged_width;    uint32_t stride = dec->edged_width;
589    uint32_t stride2 = stride / 2;    uint32_t stride2 = stride / 2;
# Line 605  Line 607 
607    
608    start_timer();    start_timer();
609    
610    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 */
611    {    {
612      /* Prepare top field vector */      /* Prepare top field vector */
613      uvtop_dx = DIV2ROUND(mv[0].x);      uvtop_dx = DIV2ROUND(mv[0].x);
# Line 1063  Line 1065 
1065    
1066          /* See how to decode */          /* See how to decode */
1067          if(!mb->field_pred)          if(!mb->field_pred)
1068           decoder_mbinter(dec, mb, x, y, cbp, bs, rounding, 0);           decoder_mbinter(dec, mb, x, y, cbp, bs, rounding, 0, 0);
1069          else          else
1070           decoder_mbinter_field(dec, mb, x, y, cbp, bs, rounding, 0);           decoder_mbinter_field(dec, mb, x, y, cbp, bs, rounding, 0, 0);
1071    
1072        } else if (gmc_warp) {  /* a not coded S(GMC)-VOP macroblock */        } else if (gmc_warp) {  /* a not coded S(GMC)-VOP macroblock */
1073          mb->mode = MODE_NOT_CODED_GMC;          mb->mode = MODE_NOT_CODED_GMC;
# Line 1086  Line 1088 
1088          mb->field_pred=0; /* (!) */          mb->field_pred=0; /* (!) */
1089    
1090          decoder_mbinter(dec, mb, x, y, 0, bs,          decoder_mbinter(dec, mb, x, y, 0, bs,
1091                                  rounding, 0);                                  rounding, 0, 0);
1092    
1093          if(dec->out_frm && cp_mb > 0) {          if(dec->out_frm && cp_mb > 0) {
1094            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 1190 
1190      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];
1191    
1192    } else {    } else {
1193      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. */
1194      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) {  
1195        if (dec->bs_version <= BS_VERSION_BUGGY_CHROMA_ROUNDING) {        if (dec->bs_version <= BS_VERSION_BUGGY_CHROMA_ROUNDING) {
1196                                  uv_dx = (uv_dx>>1) | (uv_dx&1);                          int z;
1197                                  uv_dy = (uv_dy>>1) | (uv_dy&1);                          uv_dx = 0; uv_dy = 0;
1198                                  b_uv_dx = (b_uv_dx>>1) | (b_uv_dx&1);                          b_uv_dx = 0; b_uv_dy = 0;
1199                                  b_uv_dy = (b_uv_dy>>1) | (b_uv_dy&1);                          for (z = 0; z < 4; z++) {
1200                              uv_dx += ((pMB->mvs[z].x>>1) | (pMB->mvs[z].x&1));
1201                              uv_dy += ((pMB->mvs[z].y>>1) | (pMB->mvs[z].y&1));
1202                              b_uv_dx += ((pMB->b_mvs[z].x>>1) | (pMB->b_mvs[z].x&1));
1203                              b_uv_dy += ((pMB->b_mvs[z].y>>1) | (pMB->b_mvs[z].y&1));
1204                            }
1205                          }                          }
1206                          else {                          else {
1207          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);
1208          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);
1209          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);
1210          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);
1211        }        }
1212            } else {
1213          uv_dx = pMB->mvs[0].x + pMB->mvs[1].x + pMB->mvs[2].x + pMB->mvs[3].x;
1214          uv_dy = pMB->mvs[0].y + pMB->mvs[1].y + pMB->mvs[2].y + pMB->mvs[3].y;
1215          b_uv_dx = pMB->b_mvs[0].x + pMB->b_mvs[1].x + pMB->b_mvs[2].x + pMB->b_mvs[3].x;
1216          b_uv_dy = pMB->b_mvs[0].y + pMB->b_mvs[1].y + pMB->b_mvs[2].y + pMB->b_mvs[3].y;
1217      }      }
1218    
1219      uv_dx = (uv_dx >> 3) + roundtab_76[uv_dx & 0xf];      uv_dx = (uv_dx >> 3) + roundtab_76[uv_dx & 0xf];
# Line 1384  Line 1392 
1392        if (last_mb->mode == MODE_NOT_CODED) {        if (last_mb->mode == MODE_NOT_CODED) {
1393          mb->cbp = 0;          mb->cbp = 0;
1394          mb->mode = MODE_FORWARD;          mb->mode = MODE_FORWARD;
1395          decoder_mbinter(dec, mb, x, y, mb->cbp, bs, 0, 1);          decoder_mbinter(dec, mb, x, y, mb->cbp, bs, 0, 1, 1);
1396          continue;          continue;
1397        }        }
1398    
# Line 1467  Line 1475 
1475          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);
1476          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];
1477    
1478          decoder_mbinter(dec, mb, x, y, mb->cbp, bs, 0, 0);          decoder_mbinter(dec, mb, x, y, mb->cbp, bs, 0, 0, 1);
1479          break;          break;
1480    
1481        case MODE_FORWARD:        case MODE_FORWARD:
1482          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);
1483          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];
1484    
1485          decoder_mbinter(dec, mb, x, y, mb->cbp, bs, 0, 1);          decoder_mbinter(dec, mb, x, y, mb->cbp, bs, 0, 1, 1);
1486          break;          break;
1487    
1488        default:        default:

Legend:
Removed from v.1.75  
changed lines
  Added in v.1.76

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