comparison mpegvideo.c @ 1805:5dd5b2052f5b libavcodec

mpeg4 b frame + adaptive quantization assertion failure fix

1804:cc0a15943a87

        update_qscale(s);
    
        if(!(s->flags&CODEC_FLAG_QP_RD)){
            s->dquant= s->qscale - last_qp;

            if(s->out_format==FMT_H263)
                s->dquant= clip(s->dquant, -2, 2); //FIXME RD
            
            if(s->codec_id==CODEC_ID_MPEG4){        
                if(!s->mb_intra){
                    if((s->mv_dir&MV_DIRECT) || s->mv_type==MV_TYPE_8X8)
                        s->dquant=0;
                }
            }
        }
        ff_set_qscale(s, last_qp + s->dquant);
    }

            s->current_picture.mb_var [s->mb_stride * mb_y + mb_x] = varc;
            s->current_picture.mb_mean[s->mb_stride * mb_y + mb_x] = (sum+128)>>8;
            s->mb_var_sum_temp    += varc;
        }
    }
}

static void write_slice_end(MpegEncContext *s){
    if(s->codec_id==CODEC_ID_MPEG4){
        if(s->partitioned_frame){

1805:5dd5b2052f5b

        update_qscale(s);
    
        if(!(s->flags&CODEC_FLAG_QP_RD)){
            s->dquant= s->qscale - last_qp;

            if(s->out_format==FMT_H263){
                s->dquant= clip(s->dquant, -2, 2); //FIXME RD
            
                if(s->codec_id==CODEC_ID_MPEG4){        
                    if(!s->mb_intra){
                        if(s->pict_type == B_TYPE){
                            if(s->dquant&1) 
                                s->dquant= (s->dquant/2)*2;
                            if(s->mv_dir&MV_DIRECT)
                                s->dquant= 0;
                        }
                        if(s->mv_type==MV_TYPE_8X8)
                            s->dquant=0;
                    }
                }
            }
        }
        ff_set_qscale(s, last_qp + s->dquant);
    }

            s->current_picture.mb_var [s->mb_stride * mb_y + mb_x] = varc;
            s->current_picture.mb_mean[s->mb_stride * mb_y + mb_x] = (sum+128)>>8;
            s->mb_var_sum_temp    += varc;
        }
    }
    return 0;
}

static void write_slice_end(MpegEncContext *s){
    if(s->codec_id==CODEC_ID_MPEG4){
        if(s->partitioned_frame){