comparison rv10.c @ 2359:a3c029107a88 libavcodec

fixing rv20201002

2358:622a0b0f2d56

        seq= get_bits(&s->gb, 15);
        if (s->avctx->sub_id == 0x20201002 && 0 && get_bits(&s->gb, 1)){
            av_log(s->avctx, AV_LOG_ERROR, "unknown bit4 set\n");
//            return -1;
        }
        mb_pos= get_bits(&s->gb, av_log2(s->mb_num-1)+1);
        s->mb_x= mb_pos % s->mb_width;
        s->mb_y= mb_pos / s->mb_width;
    }else{
        seq= get_bits(&s->gb, 8)*128;
        mb_pos= ff_h263_decode_mba(s);
    }
//av_log(s->avctx, AV_LOG_DEBUG, "%d\n", seq);

        s->avctx->has_b_frames=1;
        break;
    default:
        av_log(s->avctx, AV_LOG_ERROR, "unknown header %X\n", avctx->sub_id);
    }
//printf("ver:%X\n", avctx->sub_id);
    if (MPV_common_init(s) < 0)
        return -1;

    h263_decode_init_vlc(s);

            ff_print_debug_info(s, pict);
        } else {
            *pict= *(AVFrame*)&s->last_picture;
            ff_print_debug_info(s, pict);
        }
        
        *data_size = sizeof(AVFrame);
    }

    return buf_size;
}

2359:a3c029107a88

        seq= get_bits(&s->gb, 15);
        if (s->avctx->sub_id == 0x20201002 && 0 && get_bits(&s->gb, 1)){
            av_log(s->avctx, AV_LOG_ERROR, "unknown bit4 set\n");
//            return -1;
        }
        if(s->avctx->sub_id == 0x20201002){
            mb_pos= ff_h263_decode_mba(s);
        }else{
            mb_pos= get_bits(&s->gb, av_log2(s->mb_num-1)+1);
            s->mb_x= mb_pos % s->mb_width;
            s->mb_y= mb_pos / s->mb_width;
        }
    }else{
        seq= get_bits(&s->gb, 8)*128;
        mb_pos= ff_h263_decode_mba(s);
    }
//av_log(s->avctx, AV_LOG_DEBUG, "%d\n", seq);

        s->avctx->has_b_frames=1;
        break;
    default:
        av_log(s->avctx, AV_LOG_ERROR, "unknown header %X\n", avctx->sub_id);
    }
//av_log(avctx, AV_LOG_DEBUG, "ver:%X\n", avctx->sub_id);
    if (MPV_common_init(s) < 0)
        return -1;

    h263_decode_init_vlc(s);

            ff_print_debug_info(s, pict);
        } else {
            *pict= *(AVFrame*)&s->last_picture;
            ff_print_debug_info(s, pict);
        }
        if(s->last_picture_ptr || s->low_delay)
            *data_size = sizeof(AVFrame);
    }

    return buf_size;
}