Mercurial > mplayer.hg
view xvmc_render.h @ 14843:bbb693d3b130
Fix the ogg fourcc nightmare!!!
The problem: once upon a time, windows idiots decided to try to store
vorbis-in-ogg-in-avi. Of course this failed miserably, but they used
the audio format tag 0xfffe for "extended" to do this. Later someone
working on MPlayer somehow decided 0xfffe was the format for vorbis,
which is nonsense, and now that's conflicting with real wav files with
extended audio format. This patch changes demux_ogg (and mkv) to use
sane fourcc's for vorbis and theora and gets rid of the 0xfffe
nonsense so hopefully wav files with extended audio will work now.
If there are problems, we'll have to find workarounds...and drive an
18-wheeler full of cola thru the house of whoever wrote this 0xfffe
nonsense in MPlayer to begin with...
author | rfelker |
---|---|
date | Sun, 27 Feb 2005 18:11:17 +0000 |
parents | 7ab88b24cb81 |
children | 470cc9dc1b33 |
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 int reserved1[12];//future extenstions (e.g. gmc,qpel) void * p_osd_target_surface_render;//pointer to the surface where subpicture is rendered 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 } xvmc_render_state_t;