comparison vc1.c @ 3538:f26bf13bbb69 libavcodec

Don't try to decode P-frames from old WMV3 variant until their format is figured

3537:f52e3f60481b

    {
        v->finterpflag = get_bits(gb, 1); //common
        v->res_rtm_flag = get_bits(gb, 1); //reserved
        if (!v->res_rtm_flag)
        {
            av_log(avctx, AV_LOG_ERROR,
                   "0 for reserved RES_RTM_FLAG is forbidden\n");
            //return -1;
        }
        av_log(avctx, AV_LOG_DEBUG,
               "Profile %i:\nfrmrtq_postproc=%i, bitrtq_postproc=%i\n"
               "LoopFilter=%i, MultiRes=%i, FastUVMC=%i, Extended MV=%i\n"

    init_get_bits(&s->gb, buf, buf_size*8);
    // do parse frame header
    if(vc1_parse_frame_header(v, &s->gb) == -1)
        return -1;

//    if(s->pict_type != I_TYPE && s->pict_type != P_TYPE)return -1;

    // for hurry_up==5
    s->current_picture.pict_type= s->pict_type;
    s->current_picture.key_frame= s->pict_type == I_TYPE;

3538:f26bf13bbb69

    {
        v->finterpflag = get_bits(gb, 1); //common
        v->res_rtm_flag = get_bits(gb, 1); //reserved
        if (!v->res_rtm_flag)
        {
//            av_log(avctx, AV_LOG_ERROR,
//                   "0 for reserved RES_RTM_FLAG is forbidden\n");
            av_log(avctx, AV_LOG_ERROR,
                   "Old WMV3 version detected, only I-frames will be decoded\n");
            //return -1;
        }
        av_log(avctx, AV_LOG_DEBUG,
               "Profile %i:\nfrmrtq_postproc=%i, bitrtq_postproc=%i\n"
               "LoopFilter=%i, MultiRes=%i, FastUVMC=%i, Extended MV=%i\n"

    init_get_bits(&s->gb, buf, buf_size*8);
    // do parse frame header
    if(vc1_parse_frame_header(v, &s->gb) == -1)
        return -1;

    if(s->pict_type != I_TYPE && !v->res_rtm_flag)return -1;

    // for hurry_up==5
    s->current_picture.pict_type= s->pict_type;
    s->current_picture.key_frame= s->pict_type == I_TYPE;