buffer.h   buffer.h 
skipping to change at line 409 skipping to change at line 409
#define BUF_FLAG_GAPLESS_SW 0x1000 #define BUF_FLAG_GAPLESS_SW 0x1000
/* Amount of audio padding added by encoder (mp3, aac). These empty /* Amount of audio padding added by encoder (mp3, aac). These empty
* audio frames are causing a gap when switching between mp3 files. * audio frames are causing a gap when switching between mp3 files.
* decoder_info[1] carries amount of audio frames padded at the * decoder_info[1] carries amount of audio frames padded at the
* beginning of the buffer * beginning of the buffer
* decoder_info[2] carries amount of audio frames padded at the end of * decoder_info[2] carries amount of audio frames padded at the end of
* the buffer */ * the buffer */
#define BUF_FLAG_AUDIO_PADDING 0x2000 #define BUF_FLAG_AUDIO_PADDING 0x2000
/** decoder_info[4] has (mpeg_color_matrix << 1) | fullrange.
* Useful for raw YUV which cannot tell this otherwise.
* Valid until revoked or next stream. */
#define BUF_FLAG_COLOR_MATRIX 0x4000
/** /**
* \defgroup buffer_special Special buffer types: * \defgroup buffer_special Special buffer types:
* Sometimes there is a need to relay special information from a demuxer * Sometimes there is a need to relay special information from a demuxer
* to a video decoder. For example, some file types store palette data in * to a video decoder. For example, some file types store palette data in
* the file header independant of the video data. The special buffer type * the file header independant of the video data. The special buffer type
* offers a way to communicate this or any other custom, format-specific * offers a way to communicate this or any other custom, format-specific
* data to the decoder. * data to the decoder.
* *
* The interface was designed in a way that did not require an API * The interface was designed in a way that did not require an API
* version bump. To send a special buffer type, set a buffer's flags field * version bump. To send a special buffer type, set a buffer's flags field
 End of changes. 1 change blocks. 
0 lines changed or deleted 5 lines changed or added


 metronom.h   metronom.h 
skipping to change at line 220 skipping to change at line 220
/* /*
* metronom options * metronom options
*/ */
#define METRONOM_AV_OFFSET 2 #define METRONOM_AV_OFFSET 2
#define METRONOM_ADJ_VPTS_OFFSET 3 #define METRONOM_ADJ_VPTS_OFFSET 3
#define METRONOM_FRAME_DURATION 4 #define METRONOM_FRAME_DURATION 4
#define METRONOM_SPU_OFFSET 5 #define METRONOM_SPU_OFFSET 5
#define METRONOM_VPTS_OFFSET 6 #define METRONOM_VPTS_OFFSET 6
#define METRONOM_PREBUFFER 7 #define METRONOM_PREBUFFER 7
#define METRONOM_VPTS 8
/* METRONOM_LOCK can be used to lock metronom when multiple options needs t
o be fetched atomically (ex. VPTS_OFFSET and AV_OFFSET).
* example:
* metronom->set_option(metronom, METRONOM_LOCK, 1);
* vpts_offset = metronom->get_option(metronom, METRONOM_VPTS_OFFSET|METR
ONOM_NO_LOCK);
* av_offset = metronom->get_option(metronom, METRONOM_AV_OFFSET|METRON
OM_NO_LOCK);
* metronom->set_option(metronom, METRONOM_LOCK, 0);
*/
#define METRONOM_LOCK 9
#define METRONOM_NO_LOCK 0x8000
metronom_t *_x_metronom_init (int have_video, int have_audio, xine_t *xine) XINE_MALLOC XINE_PROTECTED; metronom_t *_x_metronom_init (int have_video, int have_audio, xine_t *xine) XINE_MALLOC XINE_PROTECTED;
/* FIXME: reorder this structure on the next cleanup to remove the dummies */ /* FIXME: reorder this structure on the next cleanup to remove the dummies */
struct metronom_clock_s { struct metronom_clock_s {
/* /*
* set/get options for clock, constants see below * set/get options for clock, constants see below
*/ */
void (*set_option) (metronom_clock_t *self, int option, int64_t value); void (*set_option) (metronom_clock_t *self, int option, int64_t value);
 End of changes. 1 change blocks. 
0 lines changed or deleted 13 lines changed or added


 version.h   version.h 
skipping to change at line 24 skipping to change at line 24
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*/ */
/* static info - which libxine release this header came from */ /* static info - which libxine release this header came from */
#define XINE_MAJOR_VERSION 1 #define XINE_MAJOR_VERSION 1
#define XINE_MINOR_VERSION 2 #define XINE_MINOR_VERSION 2
#define XINE_SUB_VERSION 2 #define XINE_SUB_VERSION 3
#define XINE_VERSION "1.2.2" #define XINE_VERSION "1.2.3"
 End of changes. 1 change blocks. 
0 lines changed or deleted 0 lines changed or added


 video_out.h   video_out.h 
skipping to change at line 268 skipping to change at line 268
#define VO_PROP_BUFS_IN_FIFO 17 /* read-only */ #define VO_PROP_BUFS_IN_FIFO 17 /* read-only */
#define VO_PROP_NUM_STREAMS 18 /* read-only */ #define VO_PROP_NUM_STREAMS 18 /* read-only */
#define VO_PROP_OUTPUT_WIDTH 19 /* read-only */ #define VO_PROP_OUTPUT_WIDTH 19 /* read-only */
#define VO_PROP_OUTPUT_HEIGHT 20 /* read-only */ #define VO_PROP_OUTPUT_HEIGHT 20 /* read-only */
#define VO_PROP_OUTPUT_XOFFSET 21 /* read-only */ #define VO_PROP_OUTPUT_XOFFSET 21 /* read-only */
#define VO_PROP_OUTPUT_YOFFSET 22 /* read-only */ #define VO_PROP_OUTPUT_YOFFSET 22 /* read-only */
#define VO_PROP_SHARPNESS 24 #define VO_PROP_SHARPNESS 24
#define VO_PROP_NOISE_REDUCTION 25 #define VO_PROP_NOISE_REDUCTION 25
#define VO_PROP_BUFS_TOTAL 26 /* read-only */ #define VO_PROP_BUFS_TOTAL 26 /* read-only */
#define VO_PROP_BUFS_FREE 27 /* read-only */ #define VO_PROP_BUFS_FREE 27 /* read-only */
#define VO_NUM_PROPERTIES 28 #define VO_PROP_MAX_VIDEO_WIDTH 28 /* read-only */
#define VO_PROP_MAX_VIDEO_HEIGHT 29 /* read-only */
#define VO_NUM_PROPERTIES 30
/* number of colors in the overlay palette. Currently limited to 256 /* number of colors in the overlay palette. Currently limited to 256
at most, because some alphablend functions use an 8-bit index into at most, because some alphablend functions use an 8-bit index into
the palette. This should probably be classified as a bug. */ the palette. This should probably be classified as a bug. */
#define OVL_PALETTE_SIZE 256 #define OVL_PALETTE_SIZE 256
#define OVL_MAX_OPACITY 0x0f #define OVL_MAX_OPACITY 0x0f
/* number of recent frames to keep in memory /* number of recent frames to keep in memory
these frames are needed by some deinterlace algorithms these frames are needed by some deinterlace algorithms
skipping to change at line 293 skipping to change at line 295
/* get_frame flags */ /* get_frame flags */
#define VO_TOP_FIELD 1 #define VO_TOP_FIELD 1
#define VO_BOTTOM_FIELD 2 #define VO_BOTTOM_FIELD 2
#define VO_BOTH_FIELDS (VO_TOP_FIELD | VO_BOTTOM_FIELD) #define VO_BOTH_FIELDS (VO_TOP_FIELD | VO_BOTTOM_FIELD)
#define VO_PAN_SCAN_FLAG 4 #define VO_PAN_SCAN_FLAG 4
#define VO_INTERLACED_FLAG 8 #define VO_INTERLACED_FLAG 8
#define VO_NEW_SEQUENCE_FLAG 16 /* set after MPEG2 Sequence Header Code (us ed by XvMC) */ #define VO_NEW_SEQUENCE_FLAG 16 /* set after MPEG2 Sequence Header Code (us ed by XvMC) */
#define VO_CHROMA_422 32 /* used by VDPAU, default is chroma_420 */ #define VO_CHROMA_422 32 /* used by VDPAU, default is chroma_420 */
#define VO_STILL_IMAGE 64 #define VO_STILL_IMAGE 64
/* ((mpeg_color_matrix << 1) | color_range) inside frame.flags bits 11-8 */
#define VO_FULLRANGE 0x100
#define VO_GET_FLAGS_CM(flags) ((flags >> 8) & 15)
#define VO_SET_FLAGS_CM(cm,flags) flags = ((flags) & ~0xf00) | (((cm) & 15)
<< 8)
/* video driver capabilities */ /* video driver capabilities */
#define VO_CAP_YV12 0x00000001 /* driver can handle YUV 4 :2:0 pictures */ #define VO_CAP_YV12 0x00000001 /* driver can handle YUV 4 :2:0 pictures */
#define VO_CAP_YUY2 0x00000002 /* driver can handle YUY2 pictures */ #define VO_CAP_YUY2 0x00000002 /* driver can handle YUY2 pictures */
#define VO_CAP_XVMC_MOCOMP 0x00000004 /* driver can use XvMC mot ion compensation */ #define VO_CAP_XVMC_MOCOMP 0x00000004 /* driver can use XvMC mot ion compensation */
#define VO_CAP_XVMC_IDCT 0x00000008 /* driver can use XvMC idc t acceleration */ #define VO_CAP_XVMC_IDCT 0x00000008 /* driver can use XvMC idc t acceleration */
#define VO_CAP_UNSCALED_OVERLAY 0x00000010 /* driver can blend overla y at output resolution */ #define VO_CAP_UNSCALED_OVERLAY 0x00000010 /* driver can blend overla y at output resolution */
#define VO_CAP_CROP 0x00000020 /* driver can crop */ #define VO_CAP_CROP 0x00000020 /* driver can crop */
#define VO_CAP_XXMC 0x00000040 /* driver can use extended XvMC */ #define VO_CAP_XXMC 0x00000040 /* driver can use extended XvMC */
#define VO_CAP_VDPAU_H264 0x00000080 /* driver can use VDPAU fo r H264 */ #define VO_CAP_VDPAU_H264 0x00000080 /* driver can use VDPAU fo r H264 */
#define VO_CAP_VDPAU_MPEG12 0x00000100 /* driver can use VDPAU fo r mpeg1/2 */ #define VO_CAP_VDPAU_MPEG12 0x00000100 /* driver can use VDPAU fo r mpeg1/2 */
#define VO_CAP_VDPAU_VC1 0x00000200 /* driver can use VDPAU fo r VC1 */ #define VO_CAP_VDPAU_VC1 0x00000200 /* driver can use VDPAU fo r VC1 */
#define VO_CAP_VDPAU_MPEG4 0x00000400 /* driver can use VDPAU fo r mpeg4-part2 */ #define VO_CAP_VDPAU_MPEG4 0x00000400 /* driver can use VDPAU fo r mpeg4-part2 */
#define VO_CAP_VAAPI 0x00000800 /* driver can use VAAPI */
#define VO_CAP_COLOR_MATRIX 0x00004000 /* driver can use alternat
ive yuv->rgb matrices */
#define VO_CAP_FULLRANGE 0x00008000 /* driver handles fullrang
e yuv */
#define VO_CAP_HUE 0x00010000 #define VO_CAP_HUE 0x00010000
#define VO_CAP_SATURATION 0x00020000 #define VO_CAP_SATURATION 0x00020000
#define VO_CAP_CONTRAST 0x00040000 #define VO_CAP_CONTRAST 0x00040000
#define VO_CAP_BRIGHTNESS 0x00080000 #define VO_CAP_BRIGHTNESS 0x00080000
#define VO_CAP_COLORKEY 0x00100000 #define VO_CAP_COLORKEY 0x00100000
#define VO_CAP_AUTOPAINT_COLORKEY 0x00200000 #define VO_CAP_AUTOPAINT_COLORKEY 0x00200000
#define VO_CAP_ZOOM_X 0x00400000 #define VO_CAP_ZOOM_X 0x00400000
#define VO_CAP_ZOOM_Y 0x00800000 #define VO_CAP_ZOOM_Y 0x00800000
#define VO_CAP_CUSTOM_EXTENT_OVERLAY 0x01000000 /* driver can blend custom extent overlay to output extent */ #define VO_CAP_CUSTOM_EXTENT_OVERLAY 0x01000000 /* driver can blend custom extent overlay to output extent */
#define VO_CAP_ARGB_LAYER_OVERLAY 0x02000000 /* driver supports true co lor overlay */ #define VO_CAP_ARGB_LAYER_OVERLAY 0x02000000 /* driver supports true co lor overlay */
 End of changes. 3 change blocks. 
1 lines changed or deleted 14 lines changed or added


 xine.h   xine.h 
skipping to change at line 459 skipping to change at line 459
int xine_get_current_frame_data (xine_stream_t *stream, int xine_get_current_frame_data (xine_stream_t *stream,
xine_current_frame_data_t *data, xine_current_frame_data_t *data,
int flags) XINE_PROTECTED; int flags) XINE_PROTECTED;
/* xine image formats */ /* xine image formats */
#define XINE_IMGFMT_YV12 (('2'<<24)|('1'<<16)|('V'<<8)|'Y') #define XINE_IMGFMT_YV12 (('2'<<24)|('1'<<16)|('V'<<8)|'Y')
#define XINE_IMGFMT_YUY2 (('2'<<24)|('Y'<<16)|('U'<<8)|'Y') #define XINE_IMGFMT_YUY2 (('2'<<24)|('Y'<<16)|('U'<<8)|'Y')
#define XINE_IMGFMT_XVMC (('C'<<24)|('M'<<16)|('v'<<8)|'X') #define XINE_IMGFMT_XVMC (('C'<<24)|('M'<<16)|('v'<<8)|'X')
#define XINE_IMGFMT_XXMC (('C'<<24)|('M'<<16)|('x'<<8)|'X') #define XINE_IMGFMT_XXMC (('C'<<24)|('M'<<16)|('x'<<8)|'X')
#define XINE_IMGFMT_VDPAU (('A'<<24)|('P'<<16)|('D'<<8)|'V') #define XINE_IMGFMT_VDPAU (('A'<<24)|('P'<<16)|('D'<<8)|'V')
#define XINE_IMGFMT_VAAPI (('P'<<24)|('A'<<16)|('A'<<8)|'V')
/* get current xine's virtual presentation timestamp (1/90000 sec) /* get current xine's virtual presentation timestamp (1/90000 sec)
* note: this is mostly internal data. * note: this is mostly internal data.
* one can use vpts with xine_osd_show() and xine_osd_hide(). * one can use vpts with xine_osd_show() and xine_osd_hide().
*/ */
int64_t xine_get_current_vpts(xine_stream_t *stream) XINE_PROTECTED; int64_t xine_get_current_vpts(xine_stream_t *stream) XINE_PROTECTED;
/* /*
* Continuous video frame grabbing feature. * Continuous video frame grabbing feature.
* *
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 xineutils.h   xineutils.h 
skipping to change at line 306 skipping to change at line 306
extern int y_b_table[256] XINE_PROTECTED; extern int y_b_table[256] XINE_PROTECTED;
extern int u_r_table[256] XINE_PROTECTED; extern int u_r_table[256] XINE_PROTECTED;
extern int u_g_table[256] XINE_PROTECTED; extern int u_g_table[256] XINE_PROTECTED;
extern int u_b_table[256] XINE_PROTECTED; extern int u_b_table[256] XINE_PROTECTED;
extern int v_r_table[256] XINE_PROTECTED; extern int v_r_table[256] XINE_PROTECTED;
extern int v_g_table[256] XINE_PROTECTED; extern int v_g_table[256] XINE_PROTECTED;
extern int v_b_table[256] XINE_PROTECTED; extern int v_b_table[256] XINE_PROTECTED;
/* TJ. direct sliced rgb -> yuy2 conversion */
extern void *rgb2yuy2_alloc (int color_matrix, const char *format) XINE_PRO
TECTED;
extern void rgb2yuy2_free (void *rgb2yuy2) XINE_PROTECTED;
extern void rgb2yuy2_slice (void *rgb2yuy2, const uint8_t *in, int ipitch,
uint8_t *out, int opitch,
int width, int height) XINE_PROTECTED;
extern void rgb2yuy2_palette (void *rgb2yuy2, const uint8_t *pal, int num_
colors, int bits_per_pixel)
XINE_PROTECTED;
/* frame copying functions */ /* frame copying functions */
extern void yv12_to_yv12 extern void yv12_to_yv12
(const unsigned char *y_src, int y_src_pitch, unsigned char *y_dst, int y _dst_pitch, (const unsigned char *y_src, int y_src_pitch, unsigned char *y_dst, int y _dst_pitch,
const unsigned char *u_src, int u_src_pitch, unsigned char *u_dst, int u _dst_pitch, const unsigned char *u_src, int u_src_pitch, unsigned char *u_dst, int u _dst_pitch,
const unsigned char *v_src, int v_src_pitch, unsigned char *v_dst, int v _dst_pitch, const unsigned char *v_src, int v_src_pitch, unsigned char *v_dst, int v _dst_pitch,
int width, int height) XINE_PROTECTED; int width, int height) XINE_PROTECTED;
extern void yuy2_to_yuy2 extern void yuy2_to_yuy2
(const unsigned char *src, int src_pitch, (const unsigned char *src, int src_pitch,
unsigned char *dst, int dst_pitch, unsigned char *dst, int dst_pitch,
int width, int height) XINE_PROTECTED; int width, int height) XINE_PROTECTED;
 End of changes. 1 change blocks. 
0 lines changed or deleted 11 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/