comparison vc1.c @ 3693:e9be5d4bad80 libavcodec

Support for BI-frames in Advanced Profile

3692:7857ae840b0b

    VC1Context *v = avctx->priv_data;
    int i;

    av_log(avctx, AV_LOG_DEBUG, "Entry point: %08X\n", show_bits_long(gb, 32));
    get_bits1(gb); // broken link
    get_bits1(gb); // closed entry
    v->panscanflag = get_bits1(gb);
    get_bits1(gb); // refdist flag
    v->s.loop_filter = get_bits1(gb);
    v->fastuvmc = get_bits1(gb);
    v->extended_mv = get_bits1(gb);

    case 2:
        v->s.pict_type = I_TYPE;
        break;
    case 3:
        v->s.pict_type = BI_TYPE;
        return -1;
//      break;
    case 4:
        v->s.pict_type = P_TYPE; // skipped pic
        v->p_frame_skipped = 1;
        return 0;
    }

    if (v->quantizer_mode == QUANT_FRAME_EXPLICIT)
        v->pquantizer = get_bits(gb, 1);

    switch(v->s.pict_type) {
    case I_TYPE:
        status = bitplane_decoding(v->acpred_plane, &v->acpred_is_raw, v);
        if (status < 0) return -1;
        av_log(v->s.avctx, AV_LOG_DEBUG, "ACPRED plane encoding: "
                "Imode: %i, Invert: %i\n", status>>1, status&1);
        v->condover = CONDOVER_NONE;

    if (v->s.pict_type == I_TYPE && v->dquant) {
        av_log(v->s.avctx, AV_LOG_DEBUG, "VOP DQuant info\n");
        vop_dquant_decoding(v);
    }

    return 0;
}

/***********************************************************************/
/**

3693:e9be5d4bad80

    VC1Context *v = avctx->priv_data;
    int i;

    av_log(avctx, AV_LOG_DEBUG, "Entry point: %08X\n", show_bits_long(gb, 32));
    get_bits1(gb); // broken link
    avctx->max_b_frames = 1 - get_bits1(gb); // 'closed entry' also signalize possible B-frames
    v->panscanflag = get_bits1(gb);
    get_bits1(gb); // refdist flag
    v->s.loop_filter = get_bits1(gb);
    v->fastuvmc = get_bits1(gb);
    v->extended_mv = get_bits1(gb);

    case 2:
        v->s.pict_type = I_TYPE;
        break;
    case 3:
        v->s.pict_type = BI_TYPE;
        break;
    case 4:
        v->s.pict_type = P_TYPE; // skipped pic
        v->p_frame_skipped = 1;
        return 0;
    }

    if (v->quantizer_mode == QUANT_FRAME_EXPLICIT)
        v->pquantizer = get_bits(gb, 1);

    switch(v->s.pict_type) {
    case I_TYPE:
    case BI_TYPE:
        status = bitplane_decoding(v->acpred_plane, &v->acpred_is_raw, v);
        if (status < 0) return -1;
        av_log(v->s.avctx, AV_LOG_DEBUG, "ACPRED plane encoding: "
                "Imode: %i, Invert: %i\n", status>>1, status&1);
        v->condover = CONDOVER_NONE;

    if (v->s.pict_type == I_TYPE && v->dquant) {
        av_log(v->s.avctx, AV_LOG_DEBUG, "VOP DQuant info\n");
        vop_dquant_decoding(v);
    }

    v->bi_type = 0;
    if(v->s.pict_type == BI_TYPE) {
        v->s.pict_type = B_TYPE;
        v->bi_type = 1;
    }
    return 0;
}

/***********************************************************************/
/**