diff options
author | 2006-03-21 21:26:42 +0000 | |
---|---|---|
committer | 2006-03-21 21:26:42 +0000 | |
commit | 02b199e5e93926cc106774068eb3e883826c3ae4 (patch) | |
tree | 4dfe84f1d807e9fc598c347511bb9dfa84157500 /libmpcodecs | |
parent | aa6943767de4902e5b29e9952e252a1e75aac7ac (diff) |
passing pts through the filter layer (lets see if pts or cola comes out at the end)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17907 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
80 files changed, 191 insertions, 180 deletions
diff --git a/libmpcodecs/dec_video.c b/libmpcodecs/dec_video.c index 7bee9379ab..7916a6281f 100644 --- a/libmpcodecs/dec_video.c +++ b/libmpcodecs/dec_video.c @@ -336,7 +336,7 @@ if(!mpi || drop_frame) return 0; // error / skipped frame //vo_draw_image(video_out,mpi); vf=sh_video->vfilter; -ret = vf->put_image(vf,mpi); // apply video filters and call the leaf vo/ve +ret = vf->put_image(vf,mpi, MP_NOPTS_VALUE); // apply video filters and call the leaf vo/ve if(ret>0) vf->control(vf,VFCTRL_DRAW_OSD,NULL); t2=GetTimer()-t2; diff --git a/libmpcodecs/ve_divx4.c b/libmpcodecs/ve_divx4.c index 565713bf99..138c806218 100644 --- a/libmpcodecs/ve_divx4.c +++ b/libmpcodecs/ve_divx4.c @@ -387,7 +387,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){ return 0; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ ENC_RESULT enc_result; vf->priv->enc_frame.image=mpi->planes[0]; vf->priv->enc_frame.bitstream=mux_v->buffer; diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index efc8d7b582..d08d4c4a25 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -338,7 +338,7 @@ struct vf_priv_s { #define FF_QP2LAMBDA 1 #endif -static int encode_frame(struct vf_instance_s* vf, AVFrame *pic); +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, @@ -782,7 +782,7 @@ 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); + while(encode_frame(vf, NULL, MP_NOPTS_VALUE) > 0); return CONTROL_TRUE; default: return CONTROL_UNKNOWN; @@ -826,7 +826,7 @@ static double psnr(double d){ return -10.0*log(d)/log(10); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +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]; @@ -848,13 +848,17 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ } #endif - return (encode_frame(vf, pic) >= 0); + return (encode_frame(vf, pic, pts) >= 0); } -static int encode_frame(struct vf_instance_s* vf, AVFrame *pic){ +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); @@ -863,7 +867,10 @@ static int encode_frame(struct vf_instance_s* vf, AVFrame *pic){ return 0; } - muxer_write_chunk(mux_v,out_size,lavc_venc_context->coded_frame->key_frame?0x10:0, MP_NOPTS_VALUE, MP_NOPTS_VALUE); + 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 */ diff --git a/libmpcodecs/ve_libdv.c b/libmpcodecs/ve_libdv.c index 0f9430f295..3d4fd56a2e 100644 --- a/libmpcodecs/ve_libdv.c +++ b/libmpcodecs/ve_libdv.c @@ -71,13 +71,13 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){ return 0; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ dv_encode_full_frame(vf->priv->enc, mpi->planes, (mpi->flags&MP_IMGFLAG_YUV) ? e_dv_color_yuv : e_dv_color_rgb, mux_v->buffer); - muxer_write_chunk(mux_v, 480 * (vf->priv->enc->isPAL ? 300 : 250) , 0x10, MP_NOPTS_VALUE, MP_NOPTS_VALUE); + muxer_write_chunk(mux_v, 480 * (vf->priv->enc->isPAL ? 300 : 250) , 0x10, pts, pts); return 1; } diff --git a/libmpcodecs/ve_nuv.c b/libmpcodecs/ve_nuv.c index e61ac326ad..7d3706821e 100644 --- a/libmpcodecs/ve_nuv.c +++ b/libmpcodecs/ve_nuv.c @@ -97,7 +97,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){ return 0; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ struct rtframeheader* ench = (struct rtframeheader*)vf->priv->buffer; uint8_t* data = vf->priv->buffer + FRAMEHEADERSIZE; uint8_t* zdata = vf->priv->zbuffer + FRAMEHEADERSIZE; @@ -175,7 +175,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ ench->packetlength = len; le2me_rtframeheader(ench); mux_v->buffer=(void*)ench; - muxer_write_chunk(mux_v, len + FRAMEHEADERSIZE, 0x10, MP_NOPTS_VALUE, MP_NOPTS_VALUE); + muxer_write_chunk(mux_v, len + FRAMEHEADERSIZE, 0x10, pts, pts); return 1; } diff --git a/libmpcodecs/ve_qtvideo.c b/libmpcodecs/ve_qtvideo.c index 0d6fe172f5..6050e59860 100644 --- a/libmpcodecs/ve_qtvideo.c +++ b/libmpcodecs/ve_qtvideo.c @@ -172,7 +172,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){ static int codec_inited = 0; -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ OSErr cres; long framesizemax; diff --git a/libmpcodecs/ve_raw.c b/libmpcodecs/ve_raw.c index 8557eae1da..aeffee2e64 100644 --- a/libmpcodecs/ve_raw.c +++ b/libmpcodecs/ve_raw.c @@ -115,9 +115,9 @@ static int query_format(struct vf_instance_s *vf, unsigned int fmt) { return 0; } -static int put_image(struct vf_instance_s *vf, mp_image_t *mpi) { +static int put_image(struct vf_instance_s *vf, mp_image_t *mpi, double pts) { mux_v->buffer = mpi->planes[0]; - muxer_write_chunk(mux_v, mpi->width*mpi->height*mux_v->bih->biBitCount/8, 0x10, MP_NOPTS_VALUE, MP_NOPTS_VALUE); + muxer_write_chunk(mux_v, mpi->width*mpi->height*mux_v->bih->biBitCount/8, 0x10, pts, pts); return 1; } diff --git a/libmpcodecs/ve_vfw.c b/libmpcodecs/ve_vfw.c index b362908a89..6a272c5eeb 100644 --- a/libmpcodecs/ve_vfw.c +++ b/libmpcodecs/ve_vfw.c @@ -238,12 +238,12 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){ return 0; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ long flags=0; int ret; // flip_upside_down(vo_image_ptr,vo_image_ptr,3*vo_w,vo_h); // dirty hack ret=vfw_encode_frame(mux_v->bih, mux_v->buffer, vfw_bih, mpi->planes[0], &flags, 10000); - muxer_write_chunk(mux_v,mux_v->bih->biSizeImage,flags, MP_NOPTS_VALUE, MP_NOPTS_VALUE); + muxer_write_chunk(mux_v,mux_v->bih->biSizeImage,flags, pts, pts); return 1; } diff --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c index ba03fa4374..c8ad1fdeca 100644 --- a/libmpcodecs/ve_x264.c +++ b/libmpcodecs/ve_x264.c @@ -221,7 +221,7 @@ static int parse_cqm(const char *str, uint8_t *cqm, int length, return 0; } -static int put_image(struct vf_instance_s *vf, mp_image_t *mpi); +static int put_image(struct vf_instance_s *vf, mp_image_t *mpi, double pts); static int encode_frame(struct vf_instance_s *vf, x264_picture_t *pic_in); static int config(struct vf_instance_s* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { @@ -474,7 +474,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt) return 0; } -static int put_image(struct vf_instance_s *vf, mp_image_t *mpi) +static int put_image(struct vf_instance_s *vf, mp_image_t *mpi, double pts) { h264_module_t *mod=(h264_module_t*)vf->priv; int i; diff --git a/libmpcodecs/ve_xvid.c b/libmpcodecs/ve_xvid.c index 881d9508a5..cf2016c73a 100644 --- a/libmpcodecs/ve_xvid.c +++ b/libmpcodecs/ve_xvid.c @@ -434,7 +434,7 @@ query_format(struct vf_instance_s* vf, unsigned int fmt) } static int -put_image(struct vf_instance_s* vf, mp_image_t *mpi) +put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) { XVID_ENC_STATS enc_stats; struct vf_priv_s *fp = vf->priv; diff --git a/libmpcodecs/ve_xvid4.c b/libmpcodecs/ve_xvid4.c index cde7dbc75f..b0a5ddfd8f 100644 --- a/libmpcodecs/ve_xvid4.c +++ b/libmpcodecs/ve_xvid4.c @@ -591,7 +591,7 @@ query_format(struct vf_instance_s* vf, unsigned int fmt) *==========================================================================*/ static int -put_image(struct vf_instance_s* vf, mp_image_t *mpi) +put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) { int size; xvid_enc_stats_t stats; diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c index c436547c46..f7fb37ba76 100644 --- a/libmpcodecs/vf.c +++ b/libmpcodecs/vf.c @@ -630,8 +630,8 @@ int vf_next_query_format(struct vf_instance_s* vf, unsigned int fmt){ return flags; } -int vf_next_put_image(struct vf_instance_s* vf,mp_image_t *mpi){ - return vf->next->put_image(vf->next,mpi); +int vf_next_put_image(struct vf_instance_s* vf,mp_image_t *mpi, double pts){ + return vf->next->put_image(vf->next,mpi, pts); } void vf_next_draw_slice(struct vf_instance_s* vf,unsigned char** src, int * stride,int w, int h, int x, int y){ diff --git a/libmpcodecs/vf.h b/libmpcodecs/vf.h index 00a6cf2166..32a44d286b 100644 --- a/libmpcodecs/vf.h +++ b/libmpcodecs/vf.h @@ -37,7 +37,7 @@ typedef struct vf_instance_s { void (*get_image)(struct vf_instance_s* vf, mp_image_t *mpi); int (*put_image)(struct vf_instance_s* vf, - mp_image_t *mpi); + mp_image_t *mpi, double pts); void (*start_slice)(struct vf_instance_s* vf, mp_image_t *mpi); void (*draw_slice)(struct vf_instance_s* vf, @@ -78,6 +78,10 @@ typedef struct vf_seteq_s #include "vfcap.h" +//FIXME this should be in a common header, but i dunno which +#define MP_NOPTS_VALUE (-1LL<<63) //both int64_t and double should be able to represent this exactly + + // functions: void vf_mpi_clear(mp_image_t* mpi,int x0,int y0,int w,int h); mp_image_t* vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype, int mp_imgflag, int w, int h); @@ -96,7 +100,7 @@ int vf_next_config(struct vf_instance_s* vf, unsigned int flags, unsigned int outfmt); int vf_next_control(struct vf_instance_s* vf, int request, void* data); int vf_next_query_format(struct vf_instance_s* vf, unsigned int fmt); -int vf_next_put_image(struct vf_instance_s* vf,mp_image_t *mpi); +int vf_next_put_image(struct vf_instance_s* vf,mp_image_t *mpi, double pts); void vf_next_draw_slice (struct vf_instance_s* vf, unsigned char** src, int* stride, int w,int h, int x, int y); vf_instance_t* append_filters(vf_instance_t* last); diff --git a/libmpcodecs/vf_1bpp.c b/libmpcodecs/vf_1bpp.c index 400ddda781..e3aa9d8184 100644 --- a/libmpcodecs/vf_1bpp.c +++ b/libmpcodecs/vf_1bpp.c @@ -105,7 +105,7 @@ static void convert(mp_image_t *mpi, mp_image_t *dmpi, int value0, int value1,in } } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; // hope we'll get DR buffer: @@ -151,7 +151,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ return 0; } - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } //===========================================================================// diff --git a/libmpcodecs/vf_2xsai.c b/libmpcodecs/vf_2xsai.c index 338ecd387b..6e1f79751a 100644 --- a/libmpcodecs/vf_2xsai.c +++ b/libmpcodecs/vf_2xsai.c @@ -318,7 +318,7 @@ static int config(struct vf_instance_s* vf, return vf_next_config(vf,2*width,2*height,2*d_width,2*d_height,flags,outfmt); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; // hope we'll get DR buffer: @@ -330,7 +330,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ dmpi->planes[0], dmpi->stride[0], mpi->w, mpi->h, mpi->bpp/8); - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } //===========================================================================// diff --git a/libmpcodecs/vf_bmovl.c b/libmpcodecs/vf_bmovl.c index 2275b912f4..2e623052f8 100644 --- a/libmpcodecs/vf_bmovl.c +++ b/libmpcodecs/vf_bmovl.c @@ -199,7 +199,7 @@ _read_cmd(int fd, char *cmd, char *args) { static int -put_image(struct vf_instance_s* vf, mp_image_t* mpi){ +put_image(struct vf_instance_s* vf, mp_image_t* mpi, double pts){ int buf_x=0, buf_y=0, buf_pos=0; int have, got, want; int xpos=0, ypos=0, pos=0; @@ -246,10 +246,10 @@ put_image(struct vf_instance_s* vf, mp_image_t* mpi){ else if( strncmp(cmd,"OPAQUE",6)==0 ) vf->priv->opaque=TRUE; else if( strncmp(cmd,"SHOW", 4)==0 ) vf->priv->hidden=FALSE; else if( strncmp(cmd,"HIDE", 4)==0 ) vf->priv->hidden=TRUE; - else if( strncmp(cmd,"FLUSH" ,5)==0 ) return vf_next_put_image(vf, dmpi); + else if( strncmp(cmd,"FLUSH" ,5)==0 ) return vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE); else { mp_msg(MSGT_VFILTER, MSGL_WARN, "\nvf_bmovl: Unknown command: '%s'. Ignoring.\n", cmd); - return vf_next_put_image(vf, dmpi); + return vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE); } if(command == CMD_ALPHA) { @@ -268,7 +268,7 @@ put_image(struct vf_instance_s* vf, mp_image_t* mpi){ buffer = malloc(imgw*imgh*pxsz); if(!buffer) { mp_msg(MSGT_VFILTER, MSGL_WARN, "\nvf_bmovl: Couldn't allocate temporary buffer! Skipping...\n\n"); - return vf_next_put_image(vf, dmpi); + return vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE); } /* pipes/sockets might need multiple calls to read(): */ want = (imgw*imgh*pxsz); @@ -329,7 +329,7 @@ put_image(struct vf_instance_s* vf, mp_image_t* mpi){ if( (imgx <= vf->priv->x2) && ( (imgx+imgw) >= vf->priv->x2) ) vf->priv->x2 = imgx; } - return vf_next_put_image(vf, dmpi); + return vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE); } for( buf_y=0 ; (buf_y < imgh) && (buf_y < (vf->priv->h-imgy)) ; buf_y++ ) { @@ -387,7 +387,7 @@ put_image(struct vf_instance_s* vf, mp_image_t* mpi){ } } - if(vf->priv->hidden) return vf_next_put_image(vf, dmpi); + if(vf->priv->hidden) return vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE); if(vf->priv->opaque) { // Just copy buffer memory to screen for( ypos=vf->priv->y1 ; ypos < vf->priv->y2 ; ypos++ ) { @@ -439,7 +439,7 @@ put_image(struct vf_instance_s* vf, mp_image_t* mpi){ } // for xpos } // for ypos } // if !opaque - return vf_next_put_image(vf, dmpi); + return vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE); } // put_image static int diff --git a/libmpcodecs/vf_boxblur.c b/libmpcodecs/vf_boxblur.c index aee9f9ccc7..4dc2aeedaf 100644 --- a/libmpcodecs/vf_boxblur.c +++ b/libmpcodecs/vf_boxblur.c @@ -132,7 +132,7 @@ static void vBlur(uint8_t *dst, uint8_t *src, int w, int h, int dstStride, int s } } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ int cw= mpi->w >> mpi->chroma_x_shift; int ch= mpi->h >> mpi->chroma_y_shift; @@ -156,7 +156,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ vBlur(dmpi->planes[2], dmpi->planes[2], cw,ch, dmpi->stride[2], dmpi->stride[2], vf->priv->chromaParam.radius, vf->priv->chromaParam.power); - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } //===========================================================================// diff --git a/libmpcodecs/vf_crop.c b/libmpcodecs/vf_crop.c index ff27c5f085..d5d373513b 100644 --- a/libmpcodecs/vf_crop.c +++ b/libmpcodecs/vf_crop.c @@ -67,10 +67,10 @@ static int config(struct vf_instance_s* vf, return vf_next_config(vf,vf->priv->crop_w,vf->priv->crop_h,d_width,d_height,flags,outfmt); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; if (mpi->flags&MP_IMGFLAG_DRAW_CALLBACK) - return vf_next_put_image(vf,vf->dmpi); + return vf_next_put_image(vf,vf->dmpi, pts); dmpi=vf_get_image(vf->next,mpi->imgfmt, MP_IMGTYPE_EXPORT, 0, vf->priv->crop_w, vf->priv->crop_h); @@ -91,7 +91,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ } dmpi->stride[0]=mpi->stride[0]; dmpi->width=mpi->width; - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } static void start_slice(struct vf_instance_s* vf, mp_image_t *mpi){ diff --git a/libmpcodecs/vf_cropdetect.c b/libmpcodecs/vf_cropdetect.c index 04468349c6..d72c1dcb95 100644 --- a/libmpcodecs/vf_cropdetect.c +++ b/libmpcodecs/vf_cropdetect.c @@ -55,7 +55,7 @@ static int config(struct vf_instance_s* vf, return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; int bpp=mpi->bpp/8; int w,h,x,y,shrink_by; @@ -135,7 +135,7 @@ if(++vf->priv->fno>2){ // ignore first 2 frames - they may be empty } - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } static int query_format(struct vf_instance_s* vf, unsigned int fmt) { diff --git a/libmpcodecs/vf_decimate.c b/libmpcodecs/vf_decimate.c index ff58f9c5a3..0fc7bb9a5a 100644 --- a/libmpcodecs/vf_decimate.c +++ b/libmpcodecs/vf_decimate.c @@ -110,7 +110,7 @@ static int diff_to_drop(int hi, int lo, float frac, mp_image_t *old, mp_image_t new->w*(new->bpp/8), new->h, old->stride[0], new->stride[0]); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; @@ -143,7 +143,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) mpi->chroma_width, mpi->chroma_height, dmpi->stride[2], mpi->stride[2]); } - return vf_next_put_image(vf, dmpi); + return vf_next_put_image(vf, dmpi, pts); } static void uninit(struct vf_instance_s* vf) diff --git a/libmpcodecs/vf_delogo.c b/libmpcodecs/vf_delogo.c index 3f6d562195..a8d750d779 100644 --- a/libmpcodecs/vf_delogo.c +++ b/libmpcodecs/vf_delogo.c @@ -147,7 +147,7 @@ static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ mpi->flags|=MP_IMGFLAG_DIRECT; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; if(!(mpi->flags&MP_IMGFLAG_DIRECT)){ @@ -170,7 +170,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ vf_clone_mpi_attributes(dmpi, mpi); - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } static void uninit(struct vf_instance_s* vf){ diff --git a/libmpcodecs/vf_denoise3d.c b/libmpcodecs/vf_denoise3d.c index fa11d10c58..6c92bb555b 100644 --- a/libmpcodecs/vf_denoise3d.c +++ b/libmpcodecs/vf_denoise3d.c @@ -114,7 +114,7 @@ static void deNoise(unsigned char *Frame, // mpi->planes[x] -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ int cw= mpi->w >> mpi->chroma_x_shift; int ch= mpi->h >> mpi->chroma_y_shift; int W = mpi->w, H = mpi->h; @@ -147,7 +147,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ vf->priv->Coefs[3] + 256); vf->priv->pmpi=dmpi; // save reference image - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } //===========================================================================// diff --git a/libmpcodecs/vf_detc.c b/libmpcodecs/vf_detc.c index a18d30f312..40d68f880e 100644 --- a/libmpcodecs/vf_detc.c +++ b/libmpcodecs/vf_detc.c @@ -327,10 +327,10 @@ static int do_put_image(struct vf_instance_s* vf, mp_image_t *dmpi) } p->outframes++; - return vf_next_put_image(vf, dmpi); + return vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) { int ret=0; mp_image_t *dmpi; diff --git a/libmpcodecs/vf_dint.c b/libmpcodecs/vf_dint.c index 9408dd3855..58f08e6c19 100644 --- a/libmpcodecs/vf_dint.c +++ b/libmpcodecs/vf_dint.c @@ -62,7 +62,7 @@ static int config (struct vf_instance_s* vf, return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } -static int put_image (struct vf_instance_s* vf, mp_image_t *mpi) +static int put_image (struct vf_instance_s* vf, mp_image_t *mpi, double pts) { char rrow0[MAXROWSIZE]; char rrow1[MAXROWSIZE]; @@ -171,7 +171,7 @@ static int put_image (struct vf_instance_s* vf, mp_image_t *mpi) } vf->priv->was_dint = 0; // mp_msg (MSGT_VFILTER, MSGL_INFO, "DI:%d/%d ", vf->priv->rdfr, vf->priv->dfr); - return vf_next_put_image (vf, mpi); + return vf_next_put_image (vf, mpi, pts); } static int open (vf_instance_t *vf, char* args){ diff --git a/libmpcodecs/vf_divtc.c b/libmpcodecs/vf_divtc.c index 9c8b2c6575..849f694c09 100644 --- a/libmpcodecs/vf_divtc.c +++ b/libmpcodecs/vf_divtc.c @@ -235,7 +235,7 @@ static int match(struct vf_priv_s *p, int *diffs, return m; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi, *tmpi=0; int n, m, f, newphase; @@ -350,12 +350,12 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) imgop((void *)memcpy_pic, tmpi, mpi, 0); imgop(deghost_plane, tmpi, dmpi, p->deghost); imgop((void *)memcpy_pic, dmpi, mpi, 0); - return vf_next_put_image(vf, tmpi); + return vf_next_put_image(vf, tmpi, MP_NOPTS_VALUE); } } imgop((void *)memcpy_pic, dmpi, mpi, 0); - return vf_next_put_image(vf, dmpi); + return vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE); } static int analyze(struct vf_priv_s *p) diff --git a/libmpcodecs/vf_down3dright.c b/libmpcodecs/vf_down3dright.c index 488c7b26cf..5350903bae 100644 --- a/libmpcodecs/vf_down3dright.c +++ b/libmpcodecs/vf_down3dright.c @@ -79,7 +79,7 @@ static void toright(unsigned char *dst[3], unsigned char *src[3], } } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; @@ -93,7 +93,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) toright(dmpi->planes, mpi->planes, dmpi->stride, mpi->stride, mpi->w, mpi->h, vf->priv); - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } static int config(struct vf_instance_s* vf, diff --git a/libmpcodecs/vf_eq.c b/libmpcodecs/vf_eq.c index 721eae9765..6f1bf675c1 100644 --- a/libmpcodecs/vf_eq.c +++ b/libmpcodecs/vf_eq.c @@ -116,7 +116,7 @@ static void (*process)(unsigned char *dest, int dstride, unsigned char *src, int /* FIXME: add packed yuv version of process */ -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; @@ -142,7 +142,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) vf->priv->contrast); } - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } static int control(struct vf_instance_s* vf, int request, void* data) diff --git a/libmpcodecs/vf_eq2.c b/libmpcodecs/vf_eq2.c index f9aea4f223..9bb5ed7467 100644 --- a/libmpcodecs/vf_eq2.c +++ b/libmpcodecs/vf_eq2.c @@ -224,7 +224,7 @@ void apply_lut (eq2_param_t *par, unsigned char *dst, unsigned char *src, } static -int put_image (vf_instance_t *vf, mp_image_t *src) +int put_image (vf_instance_t *vf, mp_image_t *src, double pts) { unsigned i; vf_eq2_t *eq2; @@ -264,7 +264,7 @@ int put_image (vf_instance_t *vf, mp_image_t *src) } } - return vf_next_put_image (vf, dst); + return vf_next_put_image (vf, dst, pts); } static diff --git a/libmpcodecs/vf_expand.c b/libmpcodecs/vf_expand.c index 4ca020de57..1549b20681 100644 --- a/libmpcodecs/vf_expand.c +++ b/libmpcodecs/vf_expand.c @@ -329,7 +329,7 @@ static void draw_slice(struct vf_instance_s* vf, vf->priv->first_slice = 0; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ if(mpi->flags&MP_IMGFLAG_DIRECT || mpi->flags&MP_IMGFLAG_DRAW_CALLBACK){ vf->dmpi=mpi->priv; if(!vf->dmpi) { printf("Why do we get NULL \n"); return 0; } @@ -340,7 +340,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ // we've used DR, so we're ready... if(!(mpi->flags&MP_IMGFLAG_PLANAR)) vf->dmpi->planes[1] = mpi->planes[1]; // passthrough rgb8 palette - return vf_next_put_image(vf,vf->dmpi); + return vf_next_put_image(vf,vf->dmpi, pts); } // hope we'll get DR buffer: @@ -372,7 +372,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ #ifdef OSD_SUPPORT if(vf->priv->osd) draw_osd(vf,mpi->w,mpi->h); #endif - return vf_next_put_image(vf,vf->dmpi); + return vf_next_put_image(vf,vf->dmpi, pts); } //===========================================================================// diff --git a/libmpcodecs/vf_fame.c b/libmpcodecs/vf_fame.c index 56dfaf8abd..f5f7696a9d 100644 --- a/libmpcodecs/vf_fame.c +++ b/libmpcodecs/vf_fame.c @@ -45,7 +45,7 @@ static int config(struct vf_instance_s* vf, return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_MPEGPES); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ fame_yuv_t yuv; mp_image_t *dmpi; int out_size; @@ -75,7 +75,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ dmpi->planes[0]=(void*) &vf->priv->pes; - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, MP_NOPTS_VALUE); } //===========================================================================// diff --git a/libmpcodecs/vf_field.c b/libmpcodecs/vf_field.c index 68f68b160a..d6bd66478e 100644 --- a/libmpcodecs/vf_field.c +++ b/libmpcodecs/vf_field.c @@ -22,7 +22,7 @@ static int config(struct vf_instance_s* vf, return vf_next_config(vf,width,height/2,d_width,d_height,flags,outfmt); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, MP_IMGTYPE_EXPORT, MP_IMGFLAG_ACCEPT_STRIDE, mpi->width, mpi->height/2); @@ -40,7 +40,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ } else vf->dmpi->planes[1]=mpi->planes[1]; // passthru bgr8 palette!!! - return vf_next_put_image(vf,vf->dmpi); + return vf_next_put_image(vf,vf->dmpi, pts); } //===========================================================================// diff --git a/libmpcodecs/vf_fil.c b/libmpcodecs/vf_fil.c index 25e6656a17..f23a5ad2a0 100644 --- a/libmpcodecs/vf_fil.c +++ b/libmpcodecs/vf_fil.c @@ -47,10 +47,10 @@ static int config(struct vf_instance_s* vf, (d_width*vf->priv->stridefactor)>>1, 2*d_height/vf->priv->stridefactor, flags, outfmt); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ if(mpi->flags&MP_IMGFLAG_DIRECT){ // we've used DR, so we're ready... - return vf_next_put_image(vf,(mp_image_t*)mpi->priv); + return vf_next_put_image(vf,(mp_image_t*)mpi->priv, pts); } vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, @@ -68,7 +68,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ } else vf->dmpi->planes[1]=mpi->planes[1]; // passthru bgr8 palette!!! - return vf_next_put_image(vf,vf->dmpi); + return vf_next_put_image(vf,vf->dmpi, pts); } //===========================================================================// diff --git a/libmpcodecs/vf_filmdint.c b/libmpcodecs/vf_filmdint.c index b9235949f7..26896626e2 100644 --- a/libmpcodecs/vf_filmdint.c +++ b/libmpcodecs/vf_filmdint.c @@ -1137,7 +1137,7 @@ find_breaks(struct vf_priv_s *p, struct frame_stats *s) #define ITOC(X) (!(X) ? ' ' : (X) + ((X)>9 ? 'a'-10 : '0')) -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; struct vf_priv_s *p = vf->priv; @@ -1332,7 +1332,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) "" : " @@@@@@@@@@@@@@@@@"); p->merge_time += get_time() - diff_time; - return show_fields ? vf_next_put_image(vf, dmpi) : 0; + return show_fields ? vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE) : 0; } static int query_format(struct vf_instance_s* vf, unsigned int fmt) diff --git a/libmpcodecs/vf_flip.c b/libmpcodecs/vf_flip.c index 981c1df6c7..8a52df384d 100644 --- a/libmpcodecs/vf_flip.c +++ b/libmpcodecs/vf_flip.c @@ -41,12 +41,12 @@ static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ } } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ if(mpi->flags&MP_IMGFLAG_DIRECT){ // we've used DR, so we're ready... if(!(mpi->flags&MP_IMGFLAG_PLANAR)) ((mp_image_t*)mpi->priv)->planes[1] = mpi->planes[1]; // passthrough rgb8 palette - return vf_next_put_image(vf,(mp_image_t*)mpi->priv); + return vf_next_put_image(vf,(mp_image_t*)mpi->priv, pts); } vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, @@ -67,7 +67,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ } else vf->dmpi->planes[1]=mpi->planes[1]; // passthru bgr8 palette!!! - return vf_next_put_image(vf,vf->dmpi); + return vf_next_put_image(vf,vf->dmpi, pts); } //===========================================================================// diff --git a/libmpcodecs/vf_framestep.c b/libmpcodecs/vf_framestep.c index 62be7e70a0..ee438c5625 100644 --- a/libmpcodecs/vf_framestep.c +++ b/libmpcodecs/vf_framestep.c @@ -75,7 +75,7 @@ struct vf_priv_s { }; /* Filter handler */ -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; struct vf_priv_s *priv; @@ -125,7 +125,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) dmpi->height = mpi->height; /* Chain to next filter / output ... */ - return vf_next_put_image(vf, dmpi); + return vf_next_put_image(vf, dmpi, pts); } /* Skip the frame */ diff --git a/libmpcodecs/vf_fspp.c b/libmpcodecs/vf_fspp.c index f2c577ea2e..304db8faed 100644 --- a/libmpcodecs/vf_fspp.c +++ b/libmpcodecs/vf_fspp.c @@ -519,7 +519,7 @@ static void get_image(struct vf_instance_s* vf, mp_image_t *mpi) mpi->flags|=MP_IMGFLAG_DIRECT; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; if(!(mpi->flags&MP_IMGFLAG_DIRECT)){ @@ -564,7 +564,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) #ifdef HAVE_MMX2 if(gCpuCaps.hasMMX2) asm volatile ("sfence\n\t"); #endif - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } static void uninit(struct vf_instance_s* vf) diff --git a/libmpcodecs/vf_halfpack.c b/libmpcodecs/vf_halfpack.c index 9da32942ff..99b569a8b1 100644 --- a/libmpcodecs/vf_halfpack.c +++ b/libmpcodecs/vf_halfpack.c @@ -143,7 +143,7 @@ static void (*halfpack)(unsigned char *dst, unsigned char *src[3], int dststride, int srcstride[3], int w, int h); -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; @@ -164,7 +164,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) mpi->stride, mpi->w, mpi->h); } - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } static int config(struct vf_instance_s* vf, diff --git a/libmpcodecs/vf_harddup.c b/libmpcodecs/vf_harddup.c index 31e47ea123..eb7527a703 100644 --- a/libmpcodecs/vf_harddup.c +++ b/libmpcodecs/vf_harddup.c @@ -15,7 +15,7 @@ struct vf_priv_s { mp_image_t *last_mpi; }; -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; int ret; @@ -34,7 +34,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) dmpi->stride[2] = mpi->stride[2]; } - return vf_next_put_image(vf, dmpi); + return vf_next_put_image(vf, dmpi, pts); } static int control(struct vf_instance_s* vf, int request, void* data) @@ -46,7 +46,7 @@ static int control(struct vf_instance_s* vf, int request, void* data) // has been called earlier in the filter chain // since the last put_image. This is reasonable // because we're handling a duplicate frame! - if (put_image(vf, vf->priv->last_mpi)) + if (put_image(vf, vf->priv->last_mpi, MP_NOPTS_VALUE)) return CONTROL_TRUE; break; } diff --git a/libmpcodecs/vf_hqdn3d.c b/libmpcodecs/vf_hqdn3d.c index 9ce9464bfe..2c13f4b31d 100644 --- a/libmpcodecs/vf_hqdn3d.c +++ b/libmpcodecs/vf_hqdn3d.c @@ -207,7 +207,7 @@ static void deNoise(unsigned char *Frame, // mpi->planes[x] } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ int cw= mpi->w >> mpi->chroma_x_shift; int ch= mpi->h >> mpi->chroma_y_shift; int W = mpi->w, H = mpi->h; @@ -237,7 +237,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ vf->priv->Coefs[2], vf->priv->Coefs[3]); - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } //===========================================================================// diff --git a/libmpcodecs/vf_hue.c b/libmpcodecs/vf_hue.c index 4a1eae84fe..22024b9506 100644 --- a/libmpcodecs/vf_hue.c +++ b/libmpcodecs/vf_hue.c @@ -58,7 +58,7 @@ static void (*process)(uint8_t *udst, uint8_t *vdst, uint8_t *usrc, uint8_t *vsr /* FIXME: add packed yuv version of process */ -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; @@ -89,7 +89,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) vf->priv->hue, vf->priv->saturation); } - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } static int control(struct vf_instance_s* vf, int request, void* data) diff --git a/libmpcodecs/vf_il.c b/libmpcodecs/vf_il.c index dd5fa23f73..edc847ccff 100644 --- a/libmpcodecs/vf_il.c +++ b/libmpcodecs/vf_il.c @@ -77,7 +77,7 @@ static void interleave(uint8_t *dst, uint8_t *src, int w, int h, int dstStride, } } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ int w; FilterParam *luma = &vf->priv->lumaParam; FilterParam *chroma= &vf->priv->chromaParam; @@ -104,7 +104,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ dmpi->stride[2], mpi->stride[2], chroma->interleave, luma->swap); } - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } //===========================================================================// diff --git a/libmpcodecs/vf_ilpack.c b/libmpcodecs/vf_ilpack.c index fdc44b1fa5..d369e5e295 100644 --- a/libmpcodecs/vf_ilpack.c +++ b/libmpcodecs/vf_ilpack.c @@ -353,7 +353,7 @@ static void ilpack(unsigned char *dst, unsigned char *src[3], } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; @@ -364,7 +364,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) ilpack(dmpi->planes[0], mpi->planes, dmpi->stride[0], mpi->stride, mpi->w, mpi->h, vf->priv->pack); - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } static int config(struct vf_instance_s* vf, diff --git a/libmpcodecs/vf_ivtc.c b/libmpcodecs/vf_ivtc.c index cd95abb304..62bc749447 100644 --- a/libmpcodecs/vf_ivtc.c +++ b/libmpcodecs/vf_ivtc.c @@ -449,10 +449,10 @@ static int do_put_image(struct vf_instance_s* vf, mp_image_t *dmpi) } p->outframes++; - return vf_next_put_image(vf, dmpi); + return vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) { int ret=0; struct vf_priv_s *p = vf->priv; diff --git a/libmpcodecs/vf_kerndeint.c b/libmpcodecs/vf_kerndeint.c index 7cc5d46c61..f687b8942c 100644 --- a/libmpcodecs/vf_kerndeint.c +++ b/libmpcodecs/vf_kerndeint.c @@ -76,7 +76,7 @@ static inline int IsYUY2(mp_image_t *mpi) #define PLANAR_U 1 #define PLANAR_V 2 -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ int cw= mpi->w >> mpi->chroma_x_shift; int ch= mpi->h >> mpi->chroma_y_shift; int W = mpi->w, H = mpi->h; @@ -272,7 +272,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ } } - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } //===========================================================================// diff --git a/libmpcodecs/vf_lavc.c b/libmpcodecs/vf_lavc.c index 59f5c9cf46..4a7966e709 100644 --- a/libmpcodecs/vf_lavc.c +++ b/libmpcodecs/vf_lavc.c @@ -115,7 +115,7 @@ static int config(struct vf_instance_s* vf, return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_MPEGPES); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ mp_image_t* dmpi; int out_size; AVFrame *pic= vf->priv->pic; @@ -143,7 +143,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ dmpi->planes[0]=(unsigned char*)&vf->priv->pes; - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, MP_NOPTS_VALUE); } //===========================================================================// @@ -203,7 +203,7 @@ static int open(vf_instance_t *vf, char* args){ } #if LIBAVCODEC_BUILD >= 4754 lavc_venc_context.time_base.num = 1000*1001; - lavc_venc_context.time_base.den = (p_fps<1.0) ? 0 : (p_fps * lavc_venc_context.time_base.num); + lavc_venc_context.time_base.den = (p_fps<1.0) ? 1000*1001*25 : (p_fps * lavc_venc_context.time_base.num); #else #if LIBAVCODEC_BUILD >= 4662 lavc_venc_context.frame_rate_base = 1000*1001; diff --git a/libmpcodecs/vf_lavcdeint.c b/libmpcodecs/vf_lavcdeint.c index 36c5349e6e..73e9835dd6 100644 --- a/libmpcodecs/vf_lavcdeint.c +++ b/libmpcodecs/vf_lavcdeint.c @@ -103,7 +103,7 @@ config (struct vf_instance_s* vf, } static int -put_image (struct vf_instance_s* vf, mp_image_t *mpi) +put_image (struct vf_instance_s* vf, mp_image_t *mpi, double pts) { struct vf_priv_s *priv = vf->priv; mp_image_t* dmpi; @@ -135,7 +135,7 @@ put_image (struct vf_instance_s* vf, mp_image_t *mpi) return 0; } - return vf_next_put_image(vf, dmpi); + return vf_next_put_image(vf, dmpi, pts); } diff --git a/libmpcodecs/vf_mirror.c b/libmpcodecs/vf_mirror.c index 97b6dd5164..49e3bbc324 100644 --- a/libmpcodecs/vf_mirror.c +++ b/libmpcodecs/vf_mirror.c @@ -68,7 +68,7 @@ static void mirror(unsigned char* dst,unsigned char* src,int dststride,int srcst //===========================================================================// -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; // hope we'll get DR buffer: @@ -93,7 +93,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ dmpi->planes[1]=mpi->planes[1]; // passthrough rgb8 palette } - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } //===========================================================================// diff --git a/libmpcodecs/vf_noise.c b/libmpcodecs/vf_noise.c index baac914cf6..b3d6250633 100644 --- a/libmpcodecs/vf_noise.c +++ b/libmpcodecs/vf_noise.c @@ -333,7 +333,7 @@ static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ mpi->flags|=MP_IMGFLAG_DIRECT; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; if(!(mpi->flags&MP_IMGFLAG_DIRECT)){ @@ -359,7 +359,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ if(gCpuCaps.hasMMX2) asm volatile ("sfence\n\t"); #endif - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } static void uninit(struct vf_instance_s* vf){ diff --git a/libmpcodecs/vf_palette.c b/libmpcodecs/vf_palette.c index f3ee53dc10..e41b9e07d0 100644 --- a/libmpcodecs/vf_palette.c +++ b/libmpcodecs/vf_palette.c @@ -73,7 +73,7 @@ static int config(struct vf_instance_s* vf, return vf_next_config(vf,width,height,d_width,d_height,flags,vf->priv->fmt); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; // hope we'll get DR buffer: @@ -152,7 +152,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ } } - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } //===========================================================================// diff --git a/libmpcodecs/vf_perspective.c b/libmpcodecs/vf_perspective.c index 3d467c7b00..3d90cd644d 100644 --- a/libmpcodecs/vf_perspective.c +++ b/libmpcodecs/vf_perspective.c @@ -257,7 +257,7 @@ static inline void resampleLinear(uint8_t *dst, uint8_t *src, int w, int h, int } } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ int cw= mpi->w >> mpi->chroma_x_shift; int ch= mpi->h >> mpi->chroma_y_shift; @@ -283,7 +283,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ vf->priv, mpi->chroma_x_shift, mpi->chroma_y_shift); } - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } //===========================================================================// diff --git a/libmpcodecs/vf_phase.c b/libmpcodecs/vf_phase.c index 0014496632..65c4fc25db 100644 --- a/libmpcodecs/vf_phase.c +++ b/libmpcodecs/vf_phase.c @@ -178,7 +178,7 @@ static enum mode analyze_plane(unsigned char *old, unsigned char *new, return mode; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; int w; @@ -219,7 +219,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) &vf->priv->buf[2], mode); } - return vf_next_put_image(vf, dmpi); + return vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE); } static void uninit(struct vf_instance_s* vf) diff --git a/libmpcodecs/vf_pp.c b/libmpcodecs/vf_pp.c index 5b623c8102..08772cb9e5 100644 --- a/libmpcodecs/vf_pp.c +++ b/libmpcodecs/vf_pp.c @@ -112,7 +112,7 @@ static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ mpi->flags|=MP_IMGFLAG_DIRECT; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ if(!(mpi->flags&MP_IMGFLAG_DIRECT)){ // no DR, so get a new image! hope we'll get DR buffer: vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, @@ -137,7 +137,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ mpi->pict_type); #endif } - return vf_next_put_image(vf,vf->dmpi); + return vf_next_put_image(vf,vf->dmpi, pts); } //===========================================================================// diff --git a/libmpcodecs/vf_pp7.c b/libmpcodecs/vf_pp7.c index f0a744325c..4b3e039fff 100644 --- a/libmpcodecs/vf_pp7.c +++ b/libmpcodecs/vf_pp7.c @@ -369,7 +369,7 @@ static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ mpi->flags|=MP_IMGFLAG_DIRECT; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; if(mpi->flags&MP_IMGFLAG_DIRECT){ @@ -401,7 +401,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ if(gCpuCaps.hasMMX2) asm volatile ("sfence\n\t"); #endif - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } static void uninit(struct vf_instance_s* vf){ diff --git a/libmpcodecs/vf_pullup.c b/libmpcodecs/vf_pullup.c index d452a14617..af56791362 100644 --- a/libmpcodecs/vf_pullup.c +++ b/libmpcodecs/vf_pullup.c @@ -118,7 +118,7 @@ static void get_image(struct vf_instance_s* vf, mp_image_t *mpi) mpi->flags &= ~MP_IMGFLAG_DRAW_CALLBACK; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) { struct pullup_context *c = vf->priv->ctx; struct pullup_buffer *b; @@ -263,7 +263,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) dmpi->qstride = mpi->qstride; dmpi->qscale_type = mpi->qscale_type; } - return vf_next_put_image(vf, dmpi); + return vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE); } dmpi = vf_get_image(vf->next, mpi->imgfmt, MP_IMGTYPE_EXPORT, MP_IMGFLAG_ACCEPT_STRIDE, @@ -282,7 +282,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) dmpi->qstride = mpi->qstride; dmpi->qscale_type = mpi->qscale_type; } - ret = vf_next_put_image(vf, dmpi); + ret = vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE); pullup_release_frame(f); return ret; } diff --git a/libmpcodecs/vf_qp.c b/libmpcodecs/vf_qp.c index 898ca99582..e9355bf0ae 100644 --- a/libmpcodecs/vf_qp.c +++ b/libmpcodecs/vf_qp.c @@ -117,7 +117,7 @@ static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ mpi->flags|=MP_IMGFLAG_DIRECT; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; int x,y; @@ -157,7 +157,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ } } - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } static void uninit(struct vf_instance_s* vf){ diff --git a/libmpcodecs/vf_rectangle.c b/libmpcodecs/vf_rectangle.c index 9eb72ee661..361734369c 100644 --- a/libmpcodecs/vf_rectangle.c +++ b/libmpcodecs/vf_rectangle.c @@ -64,7 +64,7 @@ control(struct vf_instance_s* vf, int request, void *data) return 0; } static int -put_image(struct vf_instance_s* vf, mp_image_t* mpi){ +put_image(struct vf_instance_s* vf, mp_image_t* mpi, double pts){ mp_image_t* dmpi; unsigned int bpp = mpi->bpp / 8; unsigned int x, y, w, h; @@ -144,7 +144,7 @@ put_image(struct vf_instance_s* vf, mp_image_t* mpi){ p += dmpi->stride[0]; } } - return vf_next_put_image(vf, dmpi); + return vf_next_put_image(vf, dmpi, pts); } static int diff --git a/libmpcodecs/vf_remove_logo.c b/libmpcodecs/vf_remove_logo.c index 78751d90c7..a3a5e47eb3 100644 --- a/libmpcodecs/vf_remove_logo.c +++ b/libmpcodecs/vf_remove_logo.c @@ -771,7 +771,7 @@ static void convert_yv12(const vf_instance_t * const vf, const char * const sour * filter, has the logo removed by the filter, and is then sent to the next * filter. */ -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; dmpi=vf_get_image(vf->next,((vf_priv_s *)vf->priv)->fmt, @@ -810,7 +810,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ return 0; } - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } //===========================================================================// diff --git a/libmpcodecs/vf_rgb2bgr.c b/libmpcodecs/vf_rgb2bgr.c index fa64f9bb3d..5b63f55dd0 100644 --- a/libmpcodecs/vf_rgb2bgr.c +++ b/libmpcodecs/vf_rgb2bgr.c @@ -44,7 +44,7 @@ static int config(struct vf_instance_s* vf, return vf_next_config(vf,width,height,d_width,d_height,flags,vf->priv->fmt); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; // hope we'll get DR buffer: @@ -72,7 +72,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ rgb24tobgr24(mpi->planes[0],dmpi->planes[0],mpi->w*mpi->h*3); } - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } //===========================================================================// diff --git a/libmpcodecs/vf_rgbtest.c b/libmpcodecs/vf_rgbtest.c index 7862eb233d..f038bba622 100644 --- a/libmpcodecs/vf_rgbtest.c +++ b/libmpcodecs/vf_rgbtest.c @@ -86,7 +86,7 @@ static int config(struct vf_instance_s* vf, return vf_next_config(vf,width,height,d_width,d_height,flags,vf->priv->fmt); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; int x, y; @@ -108,7 +108,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ } } - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } //===========================================================================// diff --git a/libmpcodecs/vf_rotate.c b/libmpcodecs/vf_rotate.c index f45306fb03..01535d62a9 100644 --- a/libmpcodecs/vf_rotate.c +++ b/libmpcodecs/vf_rotate.c @@ -69,7 +69,7 @@ static int config(struct vf_instance_s* vf, return vf_next_config(vf,height,width,d_height,d_width,flags,outfmt); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; // hope we'll get DR buffer: @@ -94,7 +94,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ dmpi->planes[1] = mpi->planes[1]; // passthrough rgb8 palette } - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } //===========================================================================// diff --git a/libmpcodecs/vf_sab.c b/libmpcodecs/vf_sab.c index 4c697e11b9..e1f25228fd 100644 --- a/libmpcodecs/vf_sab.c +++ b/libmpcodecs/vf_sab.c @@ -236,7 +236,7 @@ if((x/32)&1){ } } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ int cw= mpi->w >> mpi->chroma_x_shift; int ch= mpi->h >> mpi->chroma_y_shift; @@ -250,7 +250,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ blur(dmpi->planes[1], mpi->planes[1], cw , ch , dmpi->stride[1], mpi->stride[1], &vf->priv->chroma); blur(dmpi->planes[2], mpi->planes[2], cw , ch , dmpi->stride[2], mpi->stride[2], &vf->priv->chroma); - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } //===========================================================================// diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c index 9bdee31a38..fc4ce1c48a 100644 --- a/libmpcodecs/vf_scale.c +++ b/libmpcodecs/vf_scale.c @@ -322,7 +322,7 @@ static void draw_slice(struct vf_instance_s* vf, scale(vf->priv->ctx, vf->priv->ctx2, src, stride, y, h, dmpi->planes, dmpi->stride, vf->priv->interlaced); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi=mpi->priv; // printf("vf_scale::put_image(): processing whole frame! dmpi=%p flag=%d\n", @@ -346,7 +346,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ if(vf->priv->palette) dmpi->planes[1]=vf->priv->palette; // export palette! - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } static int control(struct vf_instance_s* vf, int request, void* data){ diff --git a/libmpcodecs/vf_screenshot.c b/libmpcodecs/vf_screenshot.c index 8fbb4b5cba..a5fa120b9e 100644 --- a/libmpcodecs/vf_screenshot.c +++ b/libmpcodecs/vf_screenshot.c @@ -187,7 +187,7 @@ static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ mpi->priv=(void*)vf->dmpi; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi = (mp_image_t *)mpi->priv; @@ -220,7 +220,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) vf->priv->store_slices = 0; } - return vf_next_put_image(vf, dmpi); + return vf_next_put_image(vf, dmpi, pts); } int control (vf_instance_t *vf, int request, void *data) diff --git a/libmpcodecs/vf_smartblur.c b/libmpcodecs/vf_smartblur.c index 4c89dc17fa..b300e8aabe 100644 --- a/libmpcodecs/vf_smartblur.c +++ b/libmpcodecs/vf_smartblur.c @@ -184,7 +184,7 @@ static inline void blur(uint8_t *dst, uint8_t *src, int w, int h, int dstStride, } } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ int cw= mpi->w >> mpi->chroma_x_shift; int ch= mpi->h >> mpi->chroma_y_shift; FilterParam *f= &vf->priv; @@ -200,7 +200,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ blur(dmpi->planes[1], mpi->planes[1], cw , ch , dmpi->stride[1], mpi->stride[1], &vf->priv->chroma); blur(dmpi->planes[2], mpi->planes[2], cw , ch , dmpi->stride[2], mpi->stride[2], &vf->priv->chroma); - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } //===========================================================================// diff --git a/libmpcodecs/vf_softpulldown.c b/libmpcodecs/vf_softpulldown.c index ccba3a365b..9ce22e563d 100644 --- a/libmpcodecs/vf_softpulldown.c +++ b/libmpcodecs/vf_softpulldown.c @@ -33,7 +33,7 @@ static inline void *my_memcpy_pic(void * dst, void * src, int bytesPerLine, int return retval; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; int ret = 0; @@ -59,7 +59,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) } if (state == 0) { - ret = vf_next_put_image(vf, mpi); + ret = vf_next_put_image(vf, mpi, MP_NOPTS_VALUE); vf->priv->out++; if (flags & MP_IMGFIELD_REPEAT_FIRST) { my_memcpy_pic(dmpi->planes[0], @@ -95,10 +95,10 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) mpi->chroma_width, mpi->chroma_height/2, dmpi->stride[2]*2, mpi->stride[2]*2); } - ret = vf_next_put_image(vf, dmpi); + ret = vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE); vf->priv->out++; if (flags & MP_IMGFIELD_REPEAT_FIRST) { - ret |= vf_next_put_image(vf, mpi); + ret |= vf_next_put_image(vf, mpi, MP_NOPTS_VALUE); vf->priv->out++; state=0; } else { diff --git a/libmpcodecs/vf_softskip.c b/libmpcodecs/vf_softskip.c index dfbede5484..7559ce9a31 100644 --- a/libmpcodecs/vf_softskip.c +++ b/libmpcodecs/vf_softskip.c @@ -15,7 +15,7 @@ struct vf_priv_s { int skipflag; }; -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; @@ -34,7 +34,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) dmpi->stride[2] = mpi->stride[2]; } - return vf_next_put_image(vf, dmpi); + return vf_next_put_image(vf, dmpi, pts); } static int control(struct vf_instance_s* vf, int request, void* data) diff --git a/libmpcodecs/vf_spp.c b/libmpcodecs/vf_spp.c index a0f1e0b648..d58bbdd2aa 100644 --- a/libmpcodecs/vf_spp.c +++ b/libmpcodecs/vf_spp.c @@ -465,7 +465,7 @@ static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ mpi->flags|=MP_IMGFLAG_DIRECT; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; if(!(mpi->flags&MP_IMGFLAG_DIRECT)){ @@ -508,7 +508,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ if(gCpuCaps.hasMMX2) asm volatile ("sfence\n\t"); #endif - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } static void uninit(struct vf_instance_s* vf){ diff --git a/libmpcodecs/vf_swapuv.c b/libmpcodecs/vf_swapuv.c index c01e3ed49d..8dca3c968b 100644 --- a/libmpcodecs/vf_swapuv.c +++ b/libmpcodecs/vf_swapuv.c @@ -53,7 +53,7 @@ static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ mpi->priv=(void*)dmpi; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; if(mpi->flags&MP_IMGFLAG_DIRECT){ @@ -72,7 +72,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ vf_clone_mpi_attributes(dmpi, mpi); - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } //===========================================================================// diff --git a/libmpcodecs/vf_telecine.c b/libmpcodecs/vf_telecine.c index fb6080bedb..f75ccfa40f 100644 --- a/libmpcodecs/vf_telecine.c +++ b/libmpcodecs/vf_telecine.c @@ -30,7 +30,7 @@ static inline void *my_memcpy_pic(void * dst, void * src, int bytesPerLine, int return retval; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; int ret; @@ -58,7 +58,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) mpi->chroma_width, mpi->chroma_height/2, dmpi->stride[2]*2, mpi->stride[2]*2); } - ret = vf_next_put_image(vf, dmpi); + ret = vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE); case 1: case 2: memcpy_pic(dmpi->planes[0], mpi->planes[0], mpi->w, mpi->h, @@ -71,7 +71,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) mpi->chroma_width, mpi->chroma_height, dmpi->stride[2], mpi->stride[2]); } - return vf_next_put_image(vf, dmpi) || ret; + return vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE) || ret; case 3: my_memcpy_pic(dmpi->planes[0]+dmpi->stride[0], mpi->planes[0]+mpi->stride[0], mpi->w, mpi->h/2, @@ -86,7 +86,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) mpi->chroma_width, mpi->chroma_height/2, dmpi->stride[2]*2, mpi->stride[2]*2); } - ret = vf_next_put_image(vf, dmpi); + ret = vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE); my_memcpy_pic(dmpi->planes[0], mpi->planes[0], mpi->w, mpi->h/2, dmpi->stride[0]*2, mpi->stride[0]*2); if (mpi->flags & MP_IMGFLAG_PLANAR) { diff --git a/libmpcodecs/vf_test.c b/libmpcodecs/vf_test.c index ba4ffa1556..483dea79ef 100644 --- a/libmpcodecs/vf_test.c +++ b/libmpcodecs/vf_test.c @@ -268,7 +268,7 @@ static void ring2Test(uint8_t *dst, int stride, int off) } } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; int frame= vf->priv->frame_num; @@ -301,7 +301,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ frame++; vf->priv->frame_num= frame; - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } //===========================================================================// diff --git a/libmpcodecs/vf_tfields.c b/libmpcodecs/vf_tfields.c index f474d4a5df..1b26fb89b9 100644 --- a/libmpcodecs/vf_tfields.c +++ b/libmpcodecs/vf_tfields.c @@ -311,7 +311,7 @@ static void qpel_4tap_C(unsigned char *d, unsigned char *s, int w, int h, int ds static void (*qpel_li)(unsigned char *d, unsigned char *s, int w, int h, int ds, int ss, int up); static void (*qpel_4tap)(unsigned char *d, unsigned char *s, int w, int h, int ds, int ss, int up); -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) { int i; int ret=0; @@ -356,7 +356,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) dmpi->stride[1] = 2*mpi->stride[1]; dmpi->stride[2] = 2*mpi->stride[2]; } - ret |= vf_next_put_image(vf, dmpi); + ret |= vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE); if (!i) vf_next_control(vf, VFCTRL_FLIP_PAGE, NULL); } break; @@ -383,7 +383,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) deint(dmpi->planes[2], dmpi->stride[2], mpi->planes[2], mpi->stride[2], mpi->chroma_width, mpi->chroma_height, (i^!tff)); } - ret |= vf_next_put_image(vf, dmpi); + ret |= vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE); if (!i) vf_next_control(vf, VFCTRL_FLIP_PAGE, NULL); } break; @@ -406,7 +406,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) mpi->chroma_width, mpi->chroma_height/2, dmpi->stride[2], mpi->stride[2]*2, (i^!tff)); } - ret |= vf_next_put_image(vf, dmpi); + ret |= vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE); if (!i) vf_next_control(vf, VFCTRL_FLIP_PAGE, NULL); } break; diff --git a/libmpcodecs/vf_tile.c b/libmpcodecs/vf_tile.c index f02410d960..d174255003 100644 --- a/libmpcodecs/vf_tile.c +++ b/libmpcodecs/vf_tile.c @@ -93,7 +93,7 @@ static int config(struct vf_instance_s* vf, } /* Filter handler */ -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; struct vf_priv_s *priv; @@ -170,7 +170,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) /* Display the composition */ dmpi->width = xw; dmpi->height = yh; - return vf_next_put_image(vf, dmpi); + return vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE); } else { /* Skip the frame */ diff --git a/libmpcodecs/vf_tinterlace.c b/libmpcodecs/vf_tinterlace.c index 9e4dbcaf41..a02f10d0be 100644 --- a/libmpcodecs/vf_tinterlace.c +++ b/libmpcodecs/vf_tinterlace.c @@ -35,7 +35,7 @@ struct vf_priv_s { mp_image_t *dmpi; }; -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) { int ret = 0; mp_image_t *dmpi; @@ -74,16 +74,16 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) mpi->chroma_width, mpi->chroma_height, dmpi->stride[2]*2, mpi->stride[2]); } - ret = vf_next_put_image(vf, dmpi); + ret = vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE); } break; case 1: if (vf->priv->frame & 1) - ret = vf_next_put_image(vf, mpi); + ret = vf_next_put_image(vf, mpi, MP_NOPTS_VALUE); break; case 2: if ((vf->priv->frame & 1) == 0) - ret = vf_next_put_image(vf, mpi); + ret = vf_next_put_image(vf, mpi, MP_NOPTS_VALUE); break; case 3: dmpi = vf_get_image(vf->next, mpi->imgfmt, @@ -114,7 +114,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) dmpi->stride[2]*2, mpi->stride[2]); } } - ret = vf_next_put_image(vf, dmpi); + ret = vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE); break; } diff --git a/libmpcodecs/vf_unsharp.c b/libmpcodecs/vf_unsharp.c index e02e2331f3..13a2f6e13f 100644 --- a/libmpcodecs/vf_unsharp.c +++ b/libmpcodecs/vf_unsharp.c @@ -183,7 +183,7 @@ static void get_image( struct vf_instance_s* vf, mp_image_t *mpi ) { mpi->flags |= MP_IMGFLAG_DIRECT; } -static int put_image( struct vf_instance_s* vf, mp_image_t *mpi ) { +static int put_image( struct vf_instance_s* vf, mp_image_t *mpi, double pts) { mp_image_t *dmpi; if( !(mpi->flags & MP_IMGFLAG_DIRECT) ) @@ -206,7 +206,7 @@ static int put_image( struct vf_instance_s* vf, mp_image_t *mpi ) { asm volatile ("sfence\n\t"); #endif - return vf_next_put_image( vf, dmpi ); + return vf_next_put_image( vf, dmpi, pts); } static void uninit( struct vf_instance_s* vf ) { diff --git a/libmpcodecs/vf_uspp.c b/libmpcodecs/vf_uspp.c index 80f25e181f..21ad5d821d 100644 --- a/libmpcodecs/vf_uspp.c +++ b/libmpcodecs/vf_uspp.c @@ -275,7 +275,7 @@ static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ mpi->flags|=MP_IMGFLAG_DIRECT; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; if(!(mpi->flags&MP_IMGFLAG_DIRECT)){ @@ -307,7 +307,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ if(gCpuCaps.hasMMX2) asm volatile ("sfence\n\t"); #endif - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } static void uninit(struct vf_instance_s* vf){ diff --git a/libmpcodecs/vf_vo.c b/libmpcodecs/vf_vo.c index 380e55f30d..d967b05a8b 100644 --- a/libmpcodecs/vf_vo.c +++ b/libmpcodecs/vf_vo.c @@ -100,7 +100,7 @@ static void get_image(struct vf_instance_s* vf, } static int put_image(struct vf_instance_s* vf, - mp_image_t *mpi){ + mp_image_t *mpi, double pts){ if(!vo_config_count) return 0; // vo not configured? // first check, maybe the vo/vf plugin implements draw_image using mpi: if(video_out->control(VOCTRL_DRAW_IMAGE,mpi)==VO_TRUE) return 1; // done. diff --git a/libmpcodecs/vf_yuvcsp.c b/libmpcodecs/vf_yuvcsp.c index a033a302aa..7850eb747a 100644 --- a/libmpcodecs/vf_yuvcsp.c +++ b/libmpcodecs/vf_yuvcsp.c @@ -30,7 +30,7 @@ static inline int clamp_c(int x){ return (x > 240) ? 240 : (x < 16) ? 16 : x; } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ int i,j; uint8_t *y_in, *cb_in, *cr_in; uint8_t *y_out, *cb_out, *cr_out; @@ -58,7 +58,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ cr_out[i*vf->dmpi->stride[2]+j] = clamp_c(cr_in[i*mpi->stride[2]+j]); } - return vf_next_put_image(vf,vf->dmpi); + return vf_next_put_image(vf,vf->dmpi, pts); } //===========================================================================// diff --git a/libmpcodecs/vf_yuy2.c b/libmpcodecs/vf_yuy2.c index ac22e3721b..fe74b066fb 100644 --- a/libmpcodecs/vf_yuy2.c +++ b/libmpcodecs/vf_yuy2.c @@ -30,7 +30,7 @@ static int config(struct vf_instance_s* vf, return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_YUY2); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; // hope we'll get DR buffer: @@ -47,7 +47,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ vf_clone_mpi_attributes(dmpi, mpi); - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } //===========================================================================// diff --git a/libmpcodecs/vf_yvu9.c b/libmpcodecs/vf_yvu9.c index 6afc20e2a6..72d6c37903 100644 --- a/libmpcodecs/vf_yvu9.c +++ b/libmpcodecs/vf_yvu9.c @@ -27,7 +27,7 @@ static int config(struct vf_instance_s* vf, return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_YV12); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi; int y,w,h; @@ -57,7 +57,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ vf_clone_mpi_attributes(dmpi, mpi); - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } //===========================================================================// diff --git a/libmpcodecs/vf_zrmjpeg.c b/libmpcodecs/vf_zrmjpeg.c index 4f7932a569..eb9d816382 100644 --- a/libmpcodecs/vf_zrmjpeg.c +++ b/libmpcodecs/vf_zrmjpeg.c @@ -663,7 +663,7 @@ static int config(struct vf_instance_s* vf, int width, int height, int d_width, (priv->fields == 2) ? IMGFMT_ZRMJPEGIT : IMGFMT_ZRMJPEGNI); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ struct vf_priv_s *priv = vf->priv; int size = 0; int i; @@ -679,7 +679,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ MP_IMGTYPE_EXPORT, 0, mpi->w, mpi->h); dmpi->planes[0] = (uint8_t*)priv->buf; dmpi->planes[1] = (uint8_t*)size; - return vf_next_put_image(vf,dmpi); + return vf_next_put_image(vf,dmpi, pts); } static int query_format(struct vf_instance_s* vf, unsigned int fmt){ |