[svn] / branches / release-1_3-branch / xvidcore / src / decoder.c Repository:
ViewVC logotype

Diff of /branches/release-1_3-branch/xvidcore/src/decoder.c

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

trunk/xvidcore/src/decoder.c revision 1632, Tue Sep 13 12:12:15 2005 UTC branches/release-1_3-branch/xvidcore/src/decoder.c revision 2180, Tue Nov 12 14:48:35 2019 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-2004 Peter Ross <pross@xvid.org>   *               2002-2010 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 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: decoder.c,v 1.73 2005-09-13 12:12:15 suxen_drol Exp $   * $Id$
24   *   *
25   ****************************************************************************/   ****************************************************************************/
26    
# Line 149  Line 149 
149  int  int
150  decoder_create(xvid_dec_create_t * create)  decoder_create(xvid_dec_create_t * create)
151  {  {
152      int ret = 0;
153    DECODER *dec;    DECODER *dec;
154    
155    if (XVID_VERSION_MAJOR(create->version) != 1) /* v1.x.x */    if (XVID_VERSION_MAJOR(create->version) != 1) /* v1.x.x */
# Line 169  Line 170 
170    
171    create->handle = dec;    create->handle = dec;
172    
173    dec->width = create->width;    dec->width = MAX(0, create->width);
174    dec->height = create->height;    dec->height = MAX(0, create->height);
175    
176      dec->num_threads = MAX(0, create->num_threads);
177    
178    image_null(&dec->cur);    image_null(&dec->cur);
179    image_null(&dec->refn[0]);    image_null(&dec->refn[0]);
# Line 195  Line 198 
198    dec->low_delay = 0;    dec->low_delay = 0;
199    dec->packed_mode = 0;    dec->packed_mode = 0;
200    dec->time_inc_resolution = 1; /* until VOL header says otherwise */    dec->time_inc_resolution = 1; /* until VOL header says otherwise */
201      dec->ver_id = 1;
202    
203      if (create->fourcc == ((int)('X')|((int)('V')<<8)|
204                             ((int)('I')<<16)|((int)('D')<<24))) { /* XVID */
205        dec->bs_version = 0; /* Initially assume oldest xvid version */
206      }
207      else {
208            dec->bs_version = 0xffff; /* Initialize to very high value -> assume bugfree stream */
209      }
210    
211    dec->fixed_dimensions = (dec->width > 0 && dec->height > 0);    dec->fixed_dimensions = (dec->width > 0 && dec->height > 0);
212    
213    if (dec->fixed_dimensions)    ret = decoder_resize(dec);
214      return decoder_resize(dec);    if (ret == XVID_ERR_MEMORY) create->handle = NULL;
215    else  
216      return 0;    return ret;
217  }  }
218    
219    
# Line 252  Line 264 
264    uint32_t stride2 = stride / 2;    uint32_t stride2 = stride / 2;
265    uint32_t next_block = stride * 8;    uint32_t next_block = stride * 8;
266    uint32_t i;    uint32_t i;
267    uint32_t iQuant = pMB->quant;    uint32_t iQuant = MAX(1, pMB->quant);
268    uint8_t *pY_Cur, *pU_Cur, *pV_Cur;    uint8_t *pY_Cur, *pU_Cur, *pV_Cur;
269    
270    pY_Cur = dec->cur.y + (y_pos << 4) * stride + (x_pos << 4);    pY_Cur = dec->cur.y + (y_pos << 4) * stride + (x_pos << 4);
# Line 316  Line 328 
328      stop_iquant_timer();      stop_iquant_timer();
329    
330      start_timer();      start_timer();
331      idct(&data[i * 64]);      idct((short * const)&data[i * 64]);
332      stop_idct_timer();      stop_idct_timer();
333    
334    }    }
# Line 349  Line 361 
361    
362    int stride = dec->edged_width;    int stride = dec->edged_width;
363    int i;    int i;
364    const uint32_t iQuant = pMB->quant;    const uint32_t iQuant = MAX(1, pMB->quant);
365    const int direction = dec->alternate_vertical_scan ? 2 : 0;    const int direction = dec->alternate_vertical_scan ? 2 : 0;
366    typedef void (*get_inter_block_function_t)(    typedef void (*get_inter_block_function_t)(
367        Bitstream * bs,        Bitstream * bs,
# Line 406  Line 418 
418    
419        /* iDCT */        /* iDCT */
420        start_timer();        start_timer();
421        idct(&data[0]);        idct((short * const)&data[0]);
422        stop_idct_timer();        stop_idct_timer();
423    
424        /* Add this residual to the predicted block */        /* Add this residual to the predicted block */
# Line 466  Line 478 
478          const uint32_t cbp,          const uint32_t cbp,
479          Bitstream * bs,          Bitstream * bs,
480          const uint32_t rounding,          const uint32_t rounding,
481          const int ref)          const int ref,
482                    const int bvop)
483  {  {
484    uint32_t stride = dec->edged_width;    uint32_t stride = dec->edged_width;
485    uint32_t stride2 = stride / 2;    uint32_t stride2 = stride / 2;
# Line 487  Line 500 
500    
501    start_timer();    start_timer();
502    
503    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 */
504    
505      uv_dx = mv[0].x;      uv_dx = mv[0].x;
506      uv_dy = mv[0].y;      uv_dy = mv[0].y;
# Line 581  Line 594 
594          const uint32_t cbp,          const uint32_t cbp,
595          Bitstream * bs,          Bitstream * bs,
596          const uint32_t rounding,          const uint32_t rounding,
597          const int ref)          const int ref,
598                    const int bvop)
599  {  {
600    uint32_t stride = dec->edged_width;    uint32_t stride = dec->edged_width;
601    uint32_t stride2 = stride / 2;    uint32_t stride2 = stride / 2;
# Line 605  Line 619 
619    
620    start_timer();    start_timer();
621    
622    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 */
623    {    {
624      /* Prepare top field vector */      /* Prepare top field vector */
625      uvtop_dx = DIV2ROUND(mv[0].x);      uvtop_dx = DIV2ROUND(mv[0].x);
# Line 743  Line 757 
757          bound = read_video_packet_header(bs, dec, 0,          bound = read_video_packet_header(bs, dec, 0,
758                &quant, NULL, NULL, &intra_dc_threshold);                &quant, NULL, NULL, &intra_dc_threshold);
759          x = bound % mb_width;          x = bound % mb_width;
760          y = bound / mb_width;          y = MIN((bound / mb_width), (mb_height-1));
761        }        }
762        mb = &dec->mbs[y * dec->mb_width + x];        mb = &dec->mbs[y * dec->mb_width + x];
763    
# Line 970  Line 984 
984          bound = read_video_packet_header(bs, dec, fcode - 1,          bound = read_video_packet_header(bs, dec, fcode - 1,
985            &quant, &fcode, NULL, &intra_dc_threshold);            &quant, &fcode, NULL, &intra_dc_threshold);
986          x = bound % mb_width;          x = bound % mb_width;
987          y = bound / mb_width;          y = MIN((bound / mb_width), (mb_height-1));
988        }        }
989        mb = &dec->mbs[y * dec->mb_width + x];        mb = &dec->mbs[y * dec->mb_width + x];
990    
# Line 1063  Line 1077 
1077    
1078          /* See how to decode */          /* See how to decode */
1079          if(!mb->field_pred)          if(!mb->field_pred)
1080           decoder_mbinter(dec, mb, x, y, cbp, bs, rounding, 0);           decoder_mbinter(dec, mb, x, y, cbp, bs, rounding, 0, 0);
1081          else          else
1082           decoder_mbinter_field(dec, mb, x, y, cbp, bs, rounding, 0);           decoder_mbinter_field(dec, mb, x, y, cbp, bs, rounding, 0, 0);
1083    
1084        } else if (gmc_warp) {  /* a not coded S(GMC)-VOP macroblock */        } else if (gmc_warp) {  /* a not coded S(GMC)-VOP macroblock */
1085          mb->mode = MODE_NOT_CODED_GMC;          mb->mode = MODE_NOT_CODED_GMC;
# Line 1086  Line 1100 
1100          mb->field_pred=0; /* (!) */          mb->field_pred=0; /* (!) */
1101    
1102          decoder_mbinter(dec, mb, x, y, 0, bs,          decoder_mbinter(dec, mb, x, y, 0, bs,
1103                                  rounding, 0);                                  rounding, 0, 0);
1104    
1105          if(dec->out_frm && cp_mb > 0) {          if(dec->out_frm && cp_mb > 0) {
1106            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 1202 
1202      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];
1203    
1204    } else {    } else {
1205      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. */
1206      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) {  
1207        if (dec->bs_version <= BS_VERSION_BUGGY_CHROMA_ROUNDING) {        if (dec->bs_version <= BS_VERSION_BUGGY_CHROMA_ROUNDING) {
1208                                  uv_dx = (uv_dx>>1) | (uv_dx&1);                          int z;
1209                                  uv_dy = (uv_dy>>1) | (uv_dy&1);                          uv_dx = 0; uv_dy = 0;
1210                                  b_uv_dx = (b_uv_dx>>1) | (b_uv_dx&1);                          b_uv_dx = 0; b_uv_dy = 0;
1211                                  b_uv_dy = (b_uv_dy>>1) | (b_uv_dy&1);                          for (z = 0; z < 4; z++) {
1212                              uv_dx += ((pMB->mvs[z].x>>1) | (pMB->mvs[z].x&1));
1213                              uv_dy += ((pMB->mvs[z].y>>1) | (pMB->mvs[z].y&1));
1214                              b_uv_dx += ((pMB->b_mvs[z].x>>1) | (pMB->b_mvs[z].x&1));
1215                              b_uv_dy += ((pMB->b_mvs[z].y>>1) | (pMB->b_mvs[z].y&1));
1216                            }
1217                          }                          }
1218                          else {                          else {
1219          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);
1220          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);
1221          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);
1222          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);
1223        }        }
1224            } else {
1225          uv_dx = pMB->mvs[0].x + pMB->mvs[1].x + pMB->mvs[2].x + pMB->mvs[3].x;
1226          uv_dy = pMB->mvs[0].y + pMB->mvs[1].y + pMB->mvs[2].y + pMB->mvs[3].y;
1227          b_uv_dx = pMB->b_mvs[0].x + pMB->b_mvs[1].x + pMB->b_mvs[2].x + pMB->b_mvs[3].x;
1228          b_uv_dy = pMB->b_mvs[0].y + pMB->b_mvs[1].y + pMB->b_mvs[2].y + pMB->b_mvs[3].y;
1229      }      }
1230    
1231      uv_dx = (uv_dx >> 3) + roundtab_76[uv_dx & 0xf];      uv_dx = (uv_dx >> 3) + roundtab_76[uv_dx & 0xf];
# Line 1324  Line 1344 
1344    return -1;    return -1;
1345  }  }
1346    
1347    static int __inline get_resync_len_b(const int fcode_backward,
1348                                         const int fcode_forward) {
1349      int resync_len = ((fcode_forward>fcode_backward) ? fcode_forward : fcode_backward) - 1;
1350      if (resync_len < 1) resync_len = 1;
1351      return resync_len;
1352    }
1353    
1354  static void  static void
1355  decoder_bframe(DECODER * dec,  decoder_bframe(DECODER * dec,
1356          Bitstream * bs,          Bitstream * bs,
# Line 1335  Line 1362 
1362    VECTOR mv;    VECTOR mv;
1363    const VECTOR zeromv = {0,0};    const VECTOR zeromv = {0,0};
1364    int i;    int i;
1365      int resync_len;
1366    
1367    if (!dec->is_edged[0]) {    if (!dec->is_edged[0]) {
1368      start_timer();      start_timer();
# Line 1352  Line 1380 
1380      stop_edges_timer();      stop_edges_timer();
1381    }    }
1382    
1383      resync_len = get_resync_len_b(fcode_backward, fcode_forward);
1384    for (y = 0; y < dec->mb_height; y++) {    for (y = 0; y < dec->mb_height; y++) {
1385      /* Initialize Pred Motion Vector */      /* Initialize Pred Motion Vector */
1386      dec->p_fmv = dec->p_bmv = zeromv;      dec->p_fmv = dec->p_bmv = zeromv;
1387      for (x = 0; x < dec->mb_width; x++) {      for (x = 0; x < dec->mb_width; x++) {
1388        MACROBLOCK *mb = &dec->mbs[y * dec->mb_width + x];        MACROBLOCK *mb = &dec->mbs[y * dec->mb_width + x];
1389        MACROBLOCK *last_mb = &dec->last_mbs[y * dec->mb_width + x];        MACROBLOCK *last_mb = &dec->last_mbs[y * dec->mb_width + x];
1390        const int fcode_max = (fcode_forward>fcode_backward) ? fcode_forward : fcode_backward;        int intra_dc_threshold; /* fake variable */
       uint32_t intra_dc_threshold; /* fake variable */  
   
       if (check_resync_marker(bs, fcode_max  - 1)) {  
         int bound = read_video_packet_header(bs, dec, fcode_max - 1, &quant,  
                            &fcode_forward, &fcode_backward, &intra_dc_threshold);  
         x = bound % dec->mb_width;  
         y = bound / dec->mb_width;  
         /* reset predicted macroblocks */  
         dec->p_fmv = dec->p_bmv = zeromv;  
       }  
1391    
1392        mv =        mv =
1393        mb->b_mvs[0] = mb->b_mvs[1] = mb->b_mvs[2] = mb->b_mvs[3] =        mb->b_mvs[0] = mb->b_mvs[1] = mb->b_mvs[2] = mb->b_mvs[3] =
# Line 1384  Line 1403 
1403        if (last_mb->mode == MODE_NOT_CODED) {        if (last_mb->mode == MODE_NOT_CODED) {
1404          mb->cbp = 0;          mb->cbp = 0;
1405          mb->mode = MODE_FORWARD;          mb->mode = MODE_FORWARD;
1406          decoder_mbinter(dec, mb, x, y, mb->cbp, bs, 0, 1);          decoder_mbinter(dec, mb, x, y, mb->cbp, bs, 0, 1, 1);
1407          continue;          continue;
1408        }        }
1409    
1410          if (check_resync_marker(bs, resync_len)) {
1411            int bound = read_video_packet_header(bs, dec, resync_len, &quant,
1412                               &fcode_forward, &fcode_backward, &intra_dc_threshold);
1413    
1414                    bound = MAX(0, bound-1); /* valid bound must always be >0 */
1415            x = bound % dec->mb_width;
1416            y = MIN((bound / dec->mb_width), (dec->mb_height-1));
1417            /* reset predicted macroblocks */
1418            dec->p_fmv = dec->p_bmv = zeromv;
1419            /* update resync len with new fcodes */
1420            resync_len = get_resync_len_b(fcode_backward, fcode_forward);
1421                    continue; /* re-init loop */
1422              }
1423    
1424        if (!BitstreamGetBit(bs)) { /* modb=='0' */        if (!BitstreamGetBit(bs)) { /* modb=='0' */
1425          const uint8_t modb2 = BitstreamGetBit(bs);          const uint8_t modb2 = BitstreamGetBit(bs);
1426    
# Line 1467  Line 1500 
1500          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);
1501          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];
1502    
1503          decoder_mbinter(dec, mb, x, y, mb->cbp, bs, 0, 0);          decoder_mbinter(dec, mb, x, y, mb->cbp, bs, 0, 0, 1);
1504          break;          break;
1505    
1506        case MODE_FORWARD:        case MODE_FORWARD:
1507          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);
1508          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];
1509    
1510          decoder_mbinter(dec, mb, x, y, mb->cbp, bs, 0, 1);          decoder_mbinter(dec, mb, x, y, mb->cbp, bs, 0, 1, 1);
1511          break;          break;
1512    
1513        default:        default:
# Line 1485  Line 1518 
1518  }  }
1519    
1520  /* perform post processing if necessary, and output the image */  /* perform post processing if necessary, and output the image */
1521  void decoder_output(DECODER * dec, IMAGE * img, MACROBLOCK * mbs,  static void decoder_output(DECODER * dec, IMAGE * img, MACROBLOCK * mbs,
1522            xvid_dec_frame_t * frame, xvid_dec_stats_t * stats,            xvid_dec_frame_t * frame, xvid_dec_stats_t * stats,
1523            int coding_type, int quant)            int coding_type, int quant)
1524  {  {
# Line 1501  Line 1534 
1534      image_copy(&dec->tmp, img, dec->edged_width, dec->height);      image_copy(&dec->tmp, img, dec->edged_width, dec->height);
1535      image_postproc(&dec->postproc, &dec->tmp, dec->edged_width,      image_postproc(&dec->postproc, &dec->tmp, dec->edged_width,
1536               mbs, dec->mb_width, dec->mb_height, dec->mb_width,               mbs, dec->mb_width, dec->mb_height, dec->mb_width,
1537               frame->general, brightness, dec->frames, (coding_type == B_VOP));               frame->general, brightness, dec->frames, (coding_type == B_VOP), dec->num_threads);
1538      img = &dec->tmp;      img = &dec->tmp;
1539    }    }
1540    
1541      if ((frame->output.plane[0] != NULL) && (frame->output.stride[0] >= dec->width)) {
1542    image_output(img, dec->width, dec->height,    image_output(img, dec->width, dec->height,
1543           dec->edged_width, (uint8_t**)frame->output.plane, frame->output.stride,           dec->edged_width, (uint8_t**)frame->output.plane, frame->output.stride,
1544           frame->output.csp, dec->interlacing);           frame->output.csp, dec->interlacing);
1545      }
1546    
1547    if (stats) {    if (stats) {
1548      stats->type = coding2type(coding_type);      stats->type = coding2type(coding_type);
# Line 1530  Line 1565 
1565  {  {
1566    
1567    Bitstream bs;    Bitstream bs;
1568    uint32_t rounding;    uint32_t rounding = 0;
1569    uint32_t quant = 2;    uint32_t quant = 2;
1570    uint32_t fcode_forward;    uint32_t fcode_forward = 0;
1571    uint32_t fcode_backward;    uint32_t fcode_backward = 0;
1572    uint32_t intra_dc_threshold;    uint32_t intra_dc_threshold = 0;
1573    WARPPOINTS gmc_warp;    WARPPOINTS gmc_warp;
1574    int coding_type;    int coding_type = -1;
1575    int success, output, seen_something;    int success, output, seen_something;
1576    
1577    if (XVID_VERSION_MAJOR(frame->version) != 1 || (stats && XVID_VERSION_MAJOR(stats->version) != 1))  /* v1.x.x */    if (XVID_VERSION_MAJOR(frame->version) != 1 || (stats && XVID_VERSION_MAJOR(stats->version) != 1))  /* v1.x.x */
1578      return XVID_ERR_VERSION;      return XVID_ERR_VERSION;
1579    
1580    start_global_timer();    start_global_timer();
1581      memset((void *)&gmc_warp, 0, sizeof(WARPPOINTS));
1582    
1583    dec->low_delay_default = (frame->general & XVID_LOWDELAY);    dec->low_delay_default = (frame->general & XVID_LOWDELAY);
1584    if ((frame->general & XVID_DISCONTINUITY))    if ((frame->general & XVID_DISCONTINUITY))
# Line 1607  Line 1643 
1643    if (coding_type == -2 || coding_type == -3) { /* vol and/or resize */    if (coding_type == -2 || coding_type == -3) { /* vol and/or resize */
1644    
1645      if (coding_type == -3)      if (coding_type == -3)
1646        decoder_resize(dec);        if (decoder_resize(dec)) return XVID_ERR_MEMORY;
1647    
1648      if(stats) {      if(stats) {
1649        stats->type = XVID_TYPE_VOL;        stats->type = XVID_TYPE_VOL;
1650        stats->data.vol.general = 0;        stats->data.vol.general = 0;
1651        /*XXX: if (dec->interlacing)            stats->data.vop.general = 0;
1652          stats->data.vol.general |= ++INTERLACING; */            if (dec->interlacing) {
1653        stats->data.vol.width = dec->width;                    stats->data.vol.general |= XVID_VOL_INTERLACING;
1654                      if (dec->top_field_first) {
1655                              stats->data.vop.general |= XVID_VOP_TOPFIELDFIRST;
1656                      }
1657              }      stats->data.vol.width = dec->width;
1658        stats->data.vol.height = dec->height;        stats->data.vol.height = dec->height;
1659        stats->data.vol.par = dec->aspect_ratio;        stats->data.vol.par = dec->aspect_ratio;
1660        stats->data.vol.par_width = dec->par_width;        stats->data.vol.par_width = dec->par_width;
# Line 1625  Line 1665 
1665      goto repeat;      goto repeat;
1666    }    }
1667    
1668    if(dec->frames == 0 && coding_type != I_VOP) {    if((dec->frames == 0 && coding_type != I_VOP) || (!dec->width || !dec->height)) {
1669      /* 1st frame is not an i-vop */      /* 1st frame is not an i-vop */
1670      goto repeat;      goto repeat;
1671    }    }
1672    
1673    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.x = dec->p_fmv.y = 0;  /* init pred vector to 0 */
1674    
1675    /* packed_mode: special-N_VOP treament */    /* packed_mode: special-N_VOP treament */
1676    if (dec->packed_mode && coding_type == N_VOP) {    if (dec->packed_mode && coding_type == N_VOP) {
Legend:
Removed from v.1632  
changed lines
  Added in v.2180
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4