Mercurial > mplayer.hg
view xvmc_render.h @ 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 | 470cc9dc1b33 |
children | 691b830f095e |
line wrap: on
line source
#include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/Xatom.h> #include <X11/extensions/Xv.h> #include <X11/extensions/Xvlib.h> #include <X11/extensions/XvMClib.h> //the surface should be shown, video driver manipulate this #define MP_XVMC_STATE_DISPLAY_PENDING 1 //the surface is needed for prediction, codec manipulate this #define MP_XVMC_STATE_PREDICTION 2 //this surface is needed for subpicture rendering #define MP_XVMC_STATE_OSD_SOURCE 4 // 1337 IDCT MCo #define MP_XVMC_RENDER_MAGIC 0x1DC711C0 typedef struct{ //these are not changed by decoder! int magic; short * data_blocks; XvMCMacroBlock * mv_blocks; int total_number_of_mv_blocks; int total_number_of_data_blocks; int mc_type;//XVMC_MPEG1/2/4,XVMC_H263 without XVMC_IDCT int idct;//does we use IDCT acceleration? int chroma_format;//420,422,444 int unsigned_intra;//+-128 for intra pictures after clip XvMCSurface* p_surface;//pointer to rendered surface, never changed //these are changed by decoder //used by XvMCRenderSurface function XvMCSurface* p_past_surface;//pointer to the past surface XvMCSurface* p_future_surface;//pointer to the future prediction surface unsigned int picture_structure;//top/bottom fields or frame ! unsigned int flags;//XVMC_SECOND_FIELD - 1'st or 2'd field in the sequence unsigned int display_flags; //1,2 or 1+2 fields for XvMCPutSurface, //these are internal communication one int state;//0-free,1 Waiting to Display,2 Waiting for prediction int start_mv_blocks_num;//offset in the array for the current slice,updated by vo int filled_mv_blocks_num;//processed mv block in this slice,change by decoder int next_free_data_block_num;//used in add_mv_block, pointer to next free block //extensions void * p_osd_target_surface_render;//pointer to the surface where subpicture is rendered } xvmc_render_state_t;