comparison svq3.c @ 2452:73a66a4a6ab4 libavcodec

more detailed error messages

2451:0fcee7879d3f

      } else {
	dy = svq3_get_se_golomb (&s->gb);
	dx = svq3_get_se_golomb (&s->gb);

	if (dx == INVALID_VLC || dy == INVALID_VLC) {
	  return -1;
	}
      }

      /* compute motion vector */

      /* decode prediction codes for luma blocks */
      for (i=0; i < 16; i+=2) {
	vlc = svq3_get_ue_golomb (&s->gb);

	if (vlc >= 25)
	  return -1;

	left	= &h->intra4x4_pred_mode_cache[scan8[i] - 1];
	top	= &h->intra4x4_pred_mode_cache[scan8[i] - 8];

	left[1]	= svq3_pred_1[top[0] + 1][left[0] + 1][svq3_pred_0[vlc][0]];
	left[2]	= svq3_pred_1[top[1] + 1][left[1] + 1][svq3_pred_0[vlc][1]];

	if (left[1] == -1 || left[2] == -1)
	  return -1;
      }
    } else {	/* mb_type == 33, DC_128_PRED block type */
      for (i=0; i < 4; i++) {
	memset (&h->intra4x4_pred_mode_cache[scan8[0] + 8*i], DC_PRED, 4);
      }

    mb_type = MB_TYPE_INTRA4x4;
  } else {			/* INTRA16x16 */
    dir = i_mb_type_info[mb_type - 8].pred_mode;
    dir = (dir >> 1) ^ 3*(dir & 1) ^ 1;

    if ((h->intra16x16_pred_mode = check_intra_pred_mode (h, dir)) == -1)
      return -1;

    cbp = i_mb_type_info[mb_type - 8].cbp;
    mb_type = MB_TYPE_INTRA16x16;
  }

    memset (h->non_zero_count_cache + 8, 0, 4*9*sizeof(uint8_t));
    s->dsp.clear_blocks(h->mb);
  }

  if (!IS_INTRA16x16(mb_type) && (!IS_SKIP(mb_type) || s->pict_type == B_TYPE)) {
    if ((vlc = svq3_get_ue_golomb (&s->gb)) >= 48)
      return -1;

    cbp = IS_INTRA(mb_type) ? golomb_to_intra4x4_cbp[vlc] : golomb_to_inter_cbp[vlc];
  }
  if (IS_INTRA16x16(mb_type) || (s->pict_type != I_TYPE && s->adaptive_quant && cbp)) {
    s->qscale += svq3_get_se_golomb (&s->gb);

    if (s->qscale > 31)
      return -1;
  }
  if (IS_INTRA16x16(mb_type)) {
    if (svq3_decode_block (&s->gb, h->mb, 0, 0))
      return -1;
  }

  if (cbp) {
    const int index = IS_INTRA16x16(mb_type) ? 1 : 0;
    const int type = ((s->qscale < 24 && IS_INTRA4x4(mb_type)) ? 2 : 1);

      if ((cbp & (1 << i))) {
	for (j=0; j < 4; j++) {
	  k = index ? ((j&1) + 2*(i&1) + 2*(j&2) + 4*(i&2)) : (4*i + j);
	  h->non_zero_count_cache[ scan8[k] ] = 1;

	  if (svq3_decode_block (&s->gb, &h->mb[16*k], index, type))
	    return -1;
	}
      }
    }

    if ((cbp & 0x30)) {
      for (i=0; i < 2; ++i) {
	if (svq3_decode_block (&s->gb, &h->mb[16*(16 + 4*i)], 0, 3))
	  return -1;
      }

      if ((cbp & 0x20)) {
	for (i=0; i < 8; i++) {
	  h->non_zero_count_cache[ scan8[16+i] ] = 1;

	  if (svq3_decode_block (&s->gb, &h->mb[16*(16 + i)], 1, 1))
	    return -1;
	}
      }
    }
  }

2452:73a66a4a6ab4

      } else {
	dy = svq3_get_se_golomb (&s->gb);
	dx = svq3_get_se_golomb (&s->gb);

	if (dx == INVALID_VLC || dy == INVALID_VLC) {
          av_log(h->s.avctx, AV_LOG_ERROR, "invalid MV vlc\n");
	  return -1;
	}
      }

      /* compute motion vector */

      /* decode prediction codes for luma blocks */
      for (i=0; i < 16; i+=2) {
	vlc = svq3_get_ue_golomb (&s->gb);

	if (vlc >= 25){
          av_log(h->s.avctx, AV_LOG_ERROR, "luma prediction:%d\n", vlc);
	  return -1;
        }

	left	= &h->intra4x4_pred_mode_cache[scan8[i] - 1];
	top	= &h->intra4x4_pred_mode_cache[scan8[i] - 8];

	left[1]	= svq3_pred_1[top[0] + 1][left[0] + 1][svq3_pred_0[vlc][0]];
	left[2]	= svq3_pred_1[top[1] + 1][left[1] + 1][svq3_pred_0[vlc][1]];

	if (left[1] == -1 || left[2] == -1){
          av_log(h->s.avctx, AV_LOG_ERROR, "weird prediction\n");
	  return -1;
        }
      }
    } else {	/* mb_type == 33, DC_128_PRED block type */
      for (i=0; i < 4; i++) {
	memset (&h->intra4x4_pred_mode_cache[scan8[0] + 8*i], DC_PRED, 4);
      }

    mb_type = MB_TYPE_INTRA4x4;
  } else {			/* INTRA16x16 */
    dir = i_mb_type_info[mb_type - 8].pred_mode;
    dir = (dir >> 1) ^ 3*(dir & 1) ^ 1;

    if ((h->intra16x16_pred_mode = check_intra_pred_mode (h, dir)) == -1){
      av_log(h->s.avctx, AV_LOG_ERROR, "check_intra_pred_mode = -1\n");
      return -1;
    }

    cbp = i_mb_type_info[mb_type - 8].cbp;
    mb_type = MB_TYPE_INTRA16x16;
  }

    memset (h->non_zero_count_cache + 8, 0, 4*9*sizeof(uint8_t));
    s->dsp.clear_blocks(h->mb);
  }

  if (!IS_INTRA16x16(mb_type) && (!IS_SKIP(mb_type) || s->pict_type == B_TYPE)) {
    if ((vlc = svq3_get_ue_golomb (&s->gb)) >= 48){
      av_log(h->s.avctx, AV_LOG_ERROR, "cbp_vlc=%d\n", vlc);
      return -1;
    }

    cbp = IS_INTRA(mb_type) ? golomb_to_intra4x4_cbp[vlc] : golomb_to_inter_cbp[vlc];
  }
  if (IS_INTRA16x16(mb_type) || (s->pict_type != I_TYPE && s->adaptive_quant && cbp)) {
    s->qscale += svq3_get_se_golomb (&s->gb);

    if (s->qscale > 31){
      av_log(h->s.avctx, AV_LOG_ERROR, "qscale:%d\n", s->qscale);
      return -1;
    }
  }
  if (IS_INTRA16x16(mb_type)) {
    if (svq3_decode_block (&s->gb, h->mb, 0, 0)){
      av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding intra luma dc\n");
      return -1;
    }
  }

  if (cbp) {
    const int index = IS_INTRA16x16(mb_type) ? 1 : 0;
    const int type = ((s->qscale < 24 && IS_INTRA4x4(mb_type)) ? 2 : 1);

      if ((cbp & (1 << i))) {
	for (j=0; j < 4; j++) {
	  k = index ? ((j&1) + 2*(i&1) + 2*(j&2) + 4*(i&2)) : (4*i + j);
	  h->non_zero_count_cache[ scan8[k] ] = 1;

	  if (svq3_decode_block (&s->gb, &h->mb[16*k], index, type)){
            av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding block\n");
	    return -1;
          }
	}
      }
    }

    if ((cbp & 0x30)) {
      for (i=0; i < 2; ++i) {
	if (svq3_decode_block (&s->gb, &h->mb[16*(16 + 4*i)], 0, 3)){
          av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding chroma dc block\n");
	  return -1;
        }
      }

      if ((cbp & 0x20)) {
	for (i=0; i < 8; i++) {
	  h->non_zero_count_cache[ scan8[16+i] ] = 1;

	  if (svq3_decode_block (&s->gb, &h->mb[16*(16 + i)], 1, 1)){
            av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding chroma ac block\n");
	    return -1;
          }
	}
      }
    }
  }