Mercurial > mplayer.hg
view libmpcodecs/vf_flip.c @ 24589:9118be6575da
demux_audio.c: Fix timestamp handling
The code calculated the pts values of audio packets by adding the length
of the current packet to the pts of the previous one. The length of the
previous packet should be added instead. This broke WAV timestamps near
the end of the stream where a short packet occurs.
Change the code to store the pts of the next packet instead of the last
one. This fixes the WAV timestamps and allows some simplifications.
MP3 timestamps are not affected as packets are always treated as
constant decoded length, and FLAC timestamps still have worse problems
(FLAC is treated as as if it was constant bitrate even though it isn't).
Also store the timestamps as double instead of float.
author | uau |
---|---|
date | Mon, 24 Sep 2007 21:49:56 +0000 |
parents | 20aca9baf5d8 |
children | 00fff9a3b735 |
line wrap: on
line source
#include <stdio.h> #include <stdlib.h> #include <string.h> #include "config.h" #include "mp_msg.h" #include "mp_image.h" #include "vf.h" #include "libvo/video_out.h" //===========================================================================// static int config(struct vf_instance_s* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ flags&=~VOFLAG_FLIPPING; // remove the FLIP flag return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ if(mpi->flags&MP_IMGFLAG_ACCEPT_STRIDE){ // try full DR ! vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, mpi->type, mpi->flags, mpi->width, mpi->height); // set up mpi as a upside-down image of dmpi: mpi->planes[0]=vf->dmpi->planes[0]+ vf->dmpi->stride[0]*(vf->dmpi->height-1); mpi->stride[0]=-vf->dmpi->stride[0]; if(mpi->flags&MP_IMGFLAG_PLANAR){ mpi->planes[1]=vf->dmpi->planes[1]+ vf->dmpi->stride[1]*((vf->dmpi->height>>mpi->chroma_y_shift)-1); mpi->stride[1]=-vf->dmpi->stride[1]; mpi->planes[2]=vf->dmpi->planes[2]+ vf->dmpi->stride[2]*((vf->dmpi->height>>mpi->chroma_y_shift)-1); mpi->stride[2]=-vf->dmpi->stride[2]; } mpi->flags|=MP_IMGFLAG_DIRECT; mpi->priv=(void*)vf->dmpi; } } 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, pts); } vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, MP_IMGTYPE_EXPORT, MP_IMGFLAG_ACCEPT_STRIDE, mpi->width, mpi->height); // set up mpi as a upside-down image of dmpi: vf->dmpi->planes[0]=mpi->planes[0]+ mpi->stride[0]*(mpi->height-1); vf->dmpi->stride[0]=-mpi->stride[0]; if(vf->dmpi->flags&MP_IMGFLAG_PLANAR){ vf->dmpi->planes[1]=mpi->planes[1]+ mpi->stride[1]*((mpi->height>>mpi->chroma_y_shift)-1); vf->dmpi->stride[1]=-mpi->stride[1]; vf->dmpi->planes[2]=mpi->planes[2]+ mpi->stride[2]*((mpi->height>>mpi->chroma_y_shift)-1); vf->dmpi->stride[2]=-mpi->stride[2]; } else vf->dmpi->planes[1]=mpi->planes[1]; // passthru bgr8 palette!!! return vf_next_put_image(vf,vf->dmpi, pts); } //===========================================================================// static int open(vf_instance_t *vf, char* args){ vf->config=config; vf->get_image=get_image; vf->put_image=put_image; vf->default_reqs=VFCAP_ACCEPT_STRIDE; return 1; } vf_info_t vf_info_flip = { "flip image upside-down", "flip", "A'rpi", "", open, NULL }; //===========================================================================//