comparison libmpcodecs/ve_lavc.c @ 17906:20aca9baf5d8

passing pts through the filter layer (lets see if pts or cola comes out at the end)

17905:433494f162a9

#if LIBAVCODEC_BUILD < 4684
#define FF_QP2LAMBDA 1
#endif

static int encode_frame(struct vf_instance_s* vf, AVFrame *pic);

static int config(struct vf_instance_s* vf,
        int width, int height, int d_width, int d_height,
	unsigned int flags, unsigned int outfmt){
    int size, i;

static int control(struct vf_instance_s* vf, int request, void* data){

    switch(request){
        case VFCTRL_FLUSH_FRAMES:
            if(vf->priv->codec->capabilities & CODEC_CAP_DELAY)
                while(encode_frame(vf, NULL) > 0);
            return CONTROL_TRUE;
        default:
            return CONTROL_UNKNOWN;
    }
}

static double psnr(double d){
    if(d==0) return INFINITY;
    return -10.0*log(d)/log(10);
}

static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
    AVFrame *pic= vf->priv->pic;

    pic->data[0]=mpi->planes[0];
    pic->data[1]=mpi->planes[1];
    pic->data[2]=mpi->planes[2];

        if(lavc_param_top!=-1)
            pic->top_field_first= lavc_param_top;
    }
#endif

    return (encode_frame(vf, pic) >= 0);
}

static int encode_frame(struct vf_instance_s* vf, AVFrame *pic){
    const char pict_type_char[5]= {'?', 'I', 'P', 'B', 'S'};
    int out_size;

	out_size = avcodec_encode_video(lavc_venc_context, mux_v->buffer, mux_v->buffer_size,
	    pic);

    if(out_size == 0) {
        ++mux_v->encoder_delay;
        return 0;
    }
           
    muxer_write_chunk(mux_v,out_size,lavc_venc_context->coded_frame->key_frame?0x10:0, MP_NOPTS_VALUE, MP_NOPTS_VALUE);
        
#if LIBAVCODEC_BUILD >= 4643
    /* store psnr / pict size / type / qscale */
    if(lavc_param_psnr){
        static FILE *fvstats=NULL;

17906:20aca9baf5d8

#if LIBAVCODEC_BUILD < 4684
#define FF_QP2LAMBDA 1
#endif

static int encode_frame(struct vf_instance_s* vf, AVFrame *pic, double pts);

static int config(struct vf_instance_s* vf,
        int width, int height, int d_width, int d_height,
	unsigned int flags, unsigned int outfmt){
    int size, i;

static int control(struct vf_instance_s* vf, int request, void* data){

    switch(request){
        case VFCTRL_FLUSH_FRAMES:
            if(vf->priv->codec->capabilities & CODEC_CAP_DELAY)
                while(encode_frame(vf, NULL, MP_NOPTS_VALUE) > 0);
            return CONTROL_TRUE;
        default:
            return CONTROL_UNKNOWN;
    }
}

static double psnr(double d){
    if(d==0) return INFINITY;
    return -10.0*log(d)/log(10);
}

static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
    AVFrame *pic= vf->priv->pic;

    pic->data[0]=mpi->planes[0];
    pic->data[1]=mpi->planes[1];
    pic->data[2]=mpi->planes[2];

        if(lavc_param_top!=-1)
            pic->top_field_first= lavc_param_top;
    }
#endif

    return (encode_frame(vf, pic, pts) >= 0);
}

static int encode_frame(struct vf_instance_s* vf, AVFrame *pic, double pts){
    const char pict_type_char[5]= {'?', 'I', 'P', 'B', 'S'};
    int out_size;

    if(pic){
        pic->opaque= malloc(sizeof(pts));
        memcpy(pic->opaque, &pts, sizeof(pts));
    }
	out_size = avcodec_encode_video(lavc_venc_context, mux_v->buffer, mux_v->buffer_size,
	    pic);

    if(out_size == 0) {
        ++mux_v->encoder_delay;
        return 0;
    }
           
    muxer_write_chunk(mux_v,out_size,lavc_venc_context->coded_frame->key_frame?0x10:0, 
                      pts, 
                      *(double*)lavc_venc_context->coded_frame->opaque);
    free(lavc_venc_context->coded_frame->opaque);
        
#if LIBAVCODEC_BUILD >= 4643
    /* store psnr / pict size / type / qscale */
    if(lavc_param_psnr){
        static FILE *fvstats=NULL;