comparison mpegvideo.c @ 2997:188f4ef688f2 libavcodec

second try of improved lambda/qp guessing for motion estimation RD in first pass

2996:bf34de4233a0

            draw_edges(s->current_picture.data[2], s->uvlinesize, s->h_edge_pos>>1, s->v_edge_pos>>1, EDGE_WIDTH/2);
    }
    emms_c();

    s->last_pict_type    = s->pict_type;
    if(s->pict_type!=B_TYPE){
        s->last_non_b_pict_type= s->pict_type;
    }
#if 0
        /* copy back current_picture variables */

        for(i=0; i<s->max_b_frames+1; i++){
            int is_p= i % (j+1) == j || i==s->max_b_frames;

            input[i+1].pict_type= is_p ? P_TYPE : B_TYPE;
            input[i+1].quality= s->rc_context.last_qscale_for[input[i+1].pict_type];
            out_size = avcodec_encode_video(c, outbuf, outbuf_size, &input[i+1]);
            rd += (out_size * lambda2) >> FF_LAMBDA_SHIFT;
        }

        /* get the delayed frames */

    if(s->flags & CODEC_FLAG_PASS2){
        estimate_qp(s, 1);
        ff_get_2pass_fcode(s);
    }else if(!(s->flags & CODEC_FLAG_QSCALE)){
        RateControlContext *rcc= &s->rc_context;

        if(s->pict_type==B_TYPE)
            s->lambda= rcc->last_qscale_for[s->pict_type];
        else
            s->lambda= rcc->last_qscale_for[rcc->last_non_b_pict_type];
        update_qscale(s);
    }

    s->mb_intra=0; //for the rate distortion & bit compare functions
    for(i=1; i<s->avctx->thread_count; i++){

2997:188f4ef688f2

            draw_edges(s->current_picture.data[2], s->uvlinesize, s->h_edge_pos>>1, s->v_edge_pos>>1, EDGE_WIDTH/2);
    }
    emms_c();

    s->last_pict_type    = s->pict_type;
    s->last_lambda_for[s->pict_type]= s->current_picture_ptr->quality;
    if(s->pict_type!=B_TYPE){
        s->last_non_b_pict_type= s->pict_type;
    }
#if 0
        /* copy back current_picture variables */

        for(i=0; i<s->max_b_frames+1; i++){
            int is_p= i % (j+1) == j || i==s->max_b_frames;

            input[i+1].pict_type= is_p ? P_TYPE : B_TYPE;
            input[i+1].quality= s->last_lambda_for[input[i+1].pict_type];
            out_size = avcodec_encode_video(c, outbuf, outbuf_size, &input[i+1]);
            rd += (out_size * lambda2) >> FF_LAMBDA_SHIFT;
        }

        /* get the delayed frames */

    if(s->flags & CODEC_FLAG_PASS2){
        estimate_qp(s, 1);
        ff_get_2pass_fcode(s);
    }else if(!(s->flags & CODEC_FLAG_QSCALE)){
        if(s->pict_type==B_TYPE)
            s->lambda= s->last_lambda_for[s->pict_type];
        else
            s->lambda= s->last_lambda_for[s->last_non_b_pict_type];
        update_qscale(s);
    }

    s->mb_intra=0; //for the rate distortion & bit compare functions
    for(i=1; i<s->avctx->thread_count; i++){