diff --git a/win32/common/_stdint.h b/win32/common/_stdint.h index 21ec7c91a6..9a21635360 100644 --- a/win32/common/_stdint.h +++ b/win32/common/_stdint.h @@ -2,7 +2,7 @@ #define _GST_PLUGINS_BASE__STDINT_H 1 #ifndef _GENERATED_STDINT_H #define _GENERATED_STDINT_H "gst-plugins-base 0.11.0.2" -/* generated using gnu compiler gcc (Ubuntu/Linaro 4.4.4-14ubuntu5) 4.4.5 */ +/* generated using gnu compiler gcc (Gentoo 4.5.3-r1 p1.0, pie-0.4.5) 4.5.3 */ #define _STDINT_HAVE_STDINT_H 1 #include #endif diff --git a/win32/common/audio-enumtypes.c b/win32/common/audio-enumtypes.c index 6dfd85dfa9..84b8a80513 100644 --- a/win32/common/audio-enumtypes.c +++ b/win32/common/audio-enumtypes.c @@ -40,6 +40,20 @@ gst_audio_channel_position_get_type (void) "GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT", "side-left"}, {GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, "GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT", "side-right"}, + {GST_AUDIO_CHANNEL_POSITION_TOP_CENTER, + "GST_AUDIO_CHANNEL_POSITION_TOP_CENTER", "top-center"}, + {GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_LEFT, + "GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_LEFT", "top-front-left"}, + {GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_RIGHT, + "GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_RIGHT", "top-front-right"}, + {GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_CENTER, + "GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_CENTER", "top-front-center"}, + {GST_AUDIO_CHANNEL_POSITION_TOP_REAR_LEFT, + "GST_AUDIO_CHANNEL_POSITION_TOP_REAR_LEFT", "top-rear-left"}, + {GST_AUDIO_CHANNEL_POSITION_TOP_REAR_RIGHT, + "GST_AUDIO_CHANNEL_POSITION_TOP_REAR_RIGHT", "top-rear-right"}, + {GST_AUDIO_CHANNEL_POSITION_TOP_REAR_CENTER, + "GST_AUDIO_CHANNEL_POSITION_TOP_REAR_CENTER", "top-rear-center"}, {GST_AUDIO_CHANNEL_POSITION_NONE, "GST_AUDIO_CHANNEL_POSITION_NONE", "none"}, {GST_AUDIO_CHANNEL_POSITION_NUM, "GST_AUDIO_CHANNEL_POSITION_NUM", "num"}, @@ -98,8 +112,7 @@ gst_buffer_format_type_get_type (void) static volatile gsize g_define_type_id__volatile = 0; if (g_once_init_enter (&g_define_type_id__volatile)) { static const GEnumValue values[] = { - {GST_BUFTYPE_LINEAR, "GST_BUFTYPE_LINEAR", "linear"}, - {GST_BUFTYPE_FLOAT, "GST_BUFTYPE_FLOAT", "float"}, + {GST_BUFTYPE_RAW, "GST_BUFTYPE_RAW", "raw"}, {GST_BUFTYPE_MU_LAW, "GST_BUFTYPE_MU_LAW", "mu-law"}, {GST_BUFTYPE_A_LAW, "GST_BUFTYPE_A_LAW", "a-law"}, {GST_BUFTYPE_IMA_ADPCM, "GST_BUFTYPE_IMA_ADPCM", "ima-adpcm"}, @@ -119,59 +132,3 @@ gst_buffer_format_type_get_type (void) } return g_define_type_id__volatile; } - -GType -gst_buffer_format_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { - static const GEnumValue values[] = { - {GST_UNKNOWN, "GST_UNKNOWN", "unknown"}, - {GST_S8, "GST_S8", "s8"}, - {GST_U8, "GST_U8", "u8"}, - {GST_S16_LE, "GST_S16_LE", "s16-le"}, - {GST_S16_BE, "GST_S16_BE", "s16-be"}, - {GST_U16_LE, "GST_U16_LE", "u16-le"}, - {GST_U16_BE, "GST_U16_BE", "u16-be"}, - {GST_S24_LE, "GST_S24_LE", "s24-le"}, - {GST_S24_BE, "GST_S24_BE", "s24-be"}, - {GST_U24_LE, "GST_U24_LE", "u24-le"}, - {GST_U24_BE, "GST_U24_BE", "u24-be"}, - {GST_S32_LE, "GST_S32_LE", "s32-le"}, - {GST_S32_BE, "GST_S32_BE", "s32-be"}, - {GST_U32_LE, "GST_U32_LE", "u32-le"}, - {GST_U32_BE, "GST_U32_BE", "u32-be"}, - {GST_S24_3LE, "GST_S24_3LE", "s24-3le"}, - {GST_S24_3BE, "GST_S24_3BE", "s24-3be"}, - {GST_U24_3LE, "GST_U24_3LE", "u24-3le"}, - {GST_U24_3BE, "GST_U24_3BE", "u24-3be"}, - {GST_S20_3LE, "GST_S20_3LE", "s20-3le"}, - {GST_S20_3BE, "GST_S20_3BE", "s20-3be"}, - {GST_U20_3LE, "GST_U20_3LE", "u20-3le"}, - {GST_U20_3BE, "GST_U20_3BE", "u20-3be"}, - {GST_S18_3LE, "GST_S18_3LE", "s18-3le"}, - {GST_S18_3BE, "GST_S18_3BE", "s18-3be"}, - {GST_U18_3LE, "GST_U18_3LE", "u18-3le"}, - {GST_U18_3BE, "GST_U18_3BE", "u18-3be"}, - {GST_FLOAT32_LE, "GST_FLOAT32_LE", "float32-le"}, - {GST_FLOAT32_BE, "GST_FLOAT32_BE", "float32-be"}, - {GST_FLOAT64_LE, "GST_FLOAT64_LE", "float64-le"}, - {GST_FLOAT64_BE, "GST_FLOAT64_BE", "float64-be"}, - {GST_MU_LAW, "GST_MU_LAW", "mu-law"}, - {GST_A_LAW, "GST_A_LAW", "a-law"}, - {GST_IMA_ADPCM, "GST_IMA_ADPCM", "ima-adpcm"}, - {GST_MPEG, "GST_MPEG", "mpeg"}, - {GST_GSM, "GST_GSM", "gsm"}, - {GST_IEC958, "GST_IEC958", "iec958"}, - {GST_AC3, "GST_AC3", "ac3"}, - {GST_EAC3, "GST_EAC3", "eac3"}, - {GST_DTS, "GST_DTS", "dts"}, - {GST_MPEG2_AAC, "GST_MPEG2_AAC", "mpeg2-aac"}, - {GST_MPEG4_AAC, "GST_MPEG4_AAC", "mpeg4-aac"}, - {0, NULL, NULL} - }; - GType g_define_type_id = g_enum_register_static ("GstBufferFormat", values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - return g_define_type_id__volatile; -} diff --git a/win32/common/audio-enumtypes.h b/win32/common/audio-enumtypes.h index bc0db4697f..3ace3cb723 100644 --- a/win32/common/audio-enumtypes.h +++ b/win32/common/audio-enumtypes.h @@ -19,8 +19,6 @@ GType gst_ring_buffer_seg_state_get_type (void); #define GST_TYPE_RING_BUFFER_SEG_STATE (gst_ring_buffer_seg_state_get_type()) GType gst_buffer_format_type_get_type (void); #define GST_TYPE_BUFFER_FORMAT_TYPE (gst_buffer_format_type_get_type()) -GType gst_buffer_format_get_type (void); -#define GST_TYPE_BUFFER_FORMAT (gst_buffer_format_get_type()) G_END_DECLS #endif /* __GST_AUDIO_ENUM_TYPES_H__ */ diff --git a/win32/common/config.h b/win32/common/config.h index 88edf0e150..cd5ee1562f 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -81,7 +81,7 @@ #define GST_PACKAGE_ORIGIN "Unknown package origin" /* GStreamer package release date/time for plugins as YYYY-MM-DD */ -#define GST_PACKAGE_RELEASE_DATETIME "2011-08-03T09:53Z" +#define GST_PACKAGE_RELEASE_DATETIME "2011-08-25T15:33Z" /* Define to enable ALSA (used by alsa). */ #undef HAVE_ALSA diff --git a/win32/common/interfaces-enumtypes.c b/win32/common/interfaces-enumtypes.c index 9cb315dd11..84e968e4b9 100644 --- a/win32/common/interfaces-enumtypes.c +++ b/win32/common/interfaces-enumtypes.c @@ -15,7 +15,7 @@ #include "tunernorm.h" #include "tunerchannel.h" #include "videoorientation.h" -#include "xoverlay.h" +#include "videooverlay.h" /* enumerations from "colorbalance.h" */ GType diff --git a/win32/common/video-enumtypes.c b/win32/common/video-enumtypes.c index 11d716a800..1ad3740157 100644 --- a/win32/common/video-enumtypes.c +++ b/win32/common/video-enumtypes.c @@ -96,7 +96,7 @@ gst_video_flags_get_type (void) static const GFlagsValue values[] = { {GST_VIDEO_FLAG_NONE, "GST_VIDEO_FLAG_NONE", "none"}, {GST_VIDEO_FLAG_INTERLACED, "GST_VIDEO_FLAG_INTERLACED", "interlaced"}, - {GST_VIDEO_FLAG_TTF, "GST_VIDEO_FLAG_TTF", "ttf"}, + {GST_VIDEO_FLAG_TFF, "GST_VIDEO_FLAG_TFF", "tff"}, {GST_VIDEO_FLAG_RFF, "GST_VIDEO_FLAG_RFF", "rff"}, {GST_VIDEO_FLAG_ONEFIELD, "GST_VIDEO_FLAG_ONEFIELD", "onefield"}, {GST_VIDEO_FLAG_TELECINE, "GST_VIDEO_FLAG_TELECINE", "telecine"}, @@ -108,3 +108,147 @@ gst_video_flags_get_type (void) } return g_define_type_id__volatile; } + +GType +gst_video_chroma_site_get_type (void) +{ + static volatile gsize g_define_type_id__volatile = 0; + if (g_once_init_enter (&g_define_type_id__volatile)) { + static const GFlagsValue values[] = { + {GST_VIDEO_CHROMA_SITE_UNKNOWN, "GST_VIDEO_CHROMA_SITE_UNKNOWN", + "unknown"}, + {GST_VIDEO_CHROMA_SITE_NONE, "GST_VIDEO_CHROMA_SITE_NONE", "none"}, + {GST_VIDEO_CHROMA_SITE_H_COSITED, "GST_VIDEO_CHROMA_SITE_H_COSITED", + "h-cosited"}, + {GST_VIDEO_CHROMA_SITE_V_COSITED, "GST_VIDEO_CHROMA_SITE_V_COSITED", + "v-cosited"}, + {GST_VIDEO_CHROMA_SITE_ALT_LINE, "GST_VIDEO_CHROMA_SITE_ALT_LINE", + "alt-line"}, + {GST_VIDEO_CHROMA_SITE_COSITED, "GST_VIDEO_CHROMA_SITE_COSITED", + "cosited"}, + {GST_VIDEO_CHROMA_SITE_JPEG, "GST_VIDEO_CHROMA_SITE_JPEG", "jpeg"}, + {GST_VIDEO_CHROMA_SITE_MPEG2, "GST_VIDEO_CHROMA_SITE_MPEG2", "mpeg2"}, + {GST_VIDEO_CHROMA_SITE_DV, "GST_VIDEO_CHROMA_SITE_DV", "dv"}, + {0, NULL, NULL} + }; + GType g_define_type_id = + g_flags_register_static ("GstVideoChromaSite", values); + g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); + } + return g_define_type_id__volatile; +} + +GType +gst_video_color_range_get_type (void) +{ + static volatile gsize g_define_type_id__volatile = 0; + if (g_once_init_enter (&g_define_type_id__volatile)) { + static const GEnumValue values[] = { + {GST_VIDEO_COLOR_RANGE_UNKNOWN, "GST_VIDEO_COLOR_RANGE_UNKNOWN", + "unknown"}, + {GST_VIDEO_COLOR_RANGE_0_255, "GST_VIDEO_COLOR_RANGE_0_255", "0-255"}, + {GST_VIDEO_COLOR_RANGE_16_235, "GST_VIDEO_COLOR_RANGE_16_235", "16-235"}, + {0, NULL, NULL} + }; + GType g_define_type_id = + g_enum_register_static ("GstVideoColorRange", values); + g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); + } + return g_define_type_id__volatile; +} + +GType +gst_video_color_matrix_get_type (void) +{ + static volatile gsize g_define_type_id__volatile = 0; + if (g_once_init_enter (&g_define_type_id__volatile)) { + static const GEnumValue values[] = { + {GST_VIDEO_COLOR_MATRIX_UNKNOWN, "GST_VIDEO_COLOR_MATRIX_UNKNOWN", + "unknown"}, + {GST_VIDEO_COLOR_MATRIX_RGB, "GST_VIDEO_COLOR_MATRIX_RGB", "rgb"}, + {GST_VIDEO_COLOR_MATRIX_BT709, "GST_VIDEO_COLOR_MATRIX_BT709", "bt709"}, + {GST_VIDEO_COLOR_MATRIX_BT601, "GST_VIDEO_COLOR_MATRIX_BT601", "bt601"}, + {GST_VIDEO_COLOR_MATRIX_SMPTE240M, "GST_VIDEO_COLOR_MATRIX_SMPTE240M", + "smpte240m"}, + {0, NULL, NULL} + }; + GType g_define_type_id = + g_enum_register_static ("GstVideoColorMatrix", values); + g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); + } + return g_define_type_id__volatile; +} + +GType +gst_video_transfer_function_get_type (void) +{ + static volatile gsize g_define_type_id__volatile = 0; + if (g_once_init_enter (&g_define_type_id__volatile)) { + static const GEnumValue values[] = { + {GST_VIDEO_TRANSFER_UNKNOWN, "GST_VIDEO_TRANSFER_UNKNOWN", "unknown"}, + {GST_VIDEO_TRANSFER_GAMMA10, "GST_VIDEO_TRANSFER_GAMMA10", "gamma10"}, + {GST_VIDEO_TRANSFER_GAMMA18, "GST_VIDEO_TRANSFER_GAMMA18", "gamma18"}, + {GST_VIDEO_TRANSFER_GAMMA20, "GST_VIDEO_TRANSFER_GAMMA20", "gamma20"}, + {GST_VIDEO_TRANSFER_GAMMA22, "GST_VIDEO_TRANSFER_GAMMA22", "gamma22"}, + {GST_VIDEO_TRANSFER_BT709, "GST_VIDEO_TRANSFER_BT709", "bt709"}, + {GST_VIDEO_TRANSFER_SMPTE240M, "GST_VIDEO_TRANSFER_SMPTE240M", + "smpte240m"}, + {GST_VIDEO_TRANSFER_SRGB, "GST_VIDEO_TRANSFER_SRGB", "srgb"}, + {GST_VIDEO_TRANSFER_GAMMA28, "GST_VIDEO_TRANSFER_GAMMA28", "gamma28"}, + {0, NULL, NULL} + }; + GType g_define_type_id = + g_enum_register_static ("GstVideoTransferFunction", values); + g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); + } + return g_define_type_id__volatile; +} + +GType +gst_video_color_primaries_get_type (void) +{ + static volatile gsize g_define_type_id__volatile = 0; + if (g_once_init_enter (&g_define_type_id__volatile)) { + static const GEnumValue values[] = { + {GST_VIDEO_COLOR_PRIMARIES_UNKNOWN, "GST_VIDEO_COLOR_PRIMARIES_UNKNOWN", + "unknown"}, + {GST_VIDEO_COLOR_PRIMARIES_BT709, "GST_VIDEO_COLOR_PRIMARIES_BT709", + "bt709"}, + {GST_VIDEO_COLOR_PRIMARIES_BT470M, "GST_VIDEO_COLOR_PRIMARIES_BT470M", + "bt470m"}, + {GST_VIDEO_COLOR_PRIMARIES_BT470BG, "GST_VIDEO_COLOR_PRIMARIES_BT470BG", + "bt470bg"}, + {GST_VIDEO_COLOR_PRIMARIES_SMPTE170M, + "GST_VIDEO_COLOR_PRIMARIES_SMPTE170M", "smpte170m"}, + {GST_VIDEO_COLOR_PRIMARIES_SMPTE240M, + "GST_VIDEO_COLOR_PRIMARIES_SMPTE240M", "smpte240m"}, + {0, NULL, NULL} + }; + GType g_define_type_id = + g_enum_register_static ("GstVideoColorPrimaries", values); + g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); + } + return g_define_type_id__volatile; +} + +GType +gst_video_buffer_flags_get_type (void) +{ + static volatile gsize g_define_type_id__volatile = 0; + if (g_once_init_enter (&g_define_type_id__volatile)) { + static const GFlagsValue values[] = { + {GST_VIDEO_BUFFER_FLAG_TFF, "GST_VIDEO_BUFFER_FLAG_TFF", "tff"}, + {GST_VIDEO_BUFFER_FLAG_RFF, "GST_VIDEO_BUFFER_FLAG_RFF", "rff"}, + {GST_VIDEO_BUFFER_FLAG_ONEFIELD, "GST_VIDEO_BUFFER_FLAG_ONEFIELD", + "onefield"}, + {GST_VIDEO_BUFFER_FLAG_PROGRESSIVE, "GST_VIDEO_BUFFER_FLAG_PROGRESSIVE", + "progressive"}, + {GST_VIDEO_BUFFER_FLAG_LAST, "GST_VIDEO_BUFFER_FLAG_LAST", "last"}, + {0, NULL, NULL} + }; + GType g_define_type_id = + g_flags_register_static ("GstVideoBufferFlags", values); + g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); + } + return g_define_type_id__volatile; +} diff --git a/win32/common/video-enumtypes.h b/win32/common/video-enumtypes.h index eae444d70d..dd1805d955 100644 --- a/win32/common/video-enumtypes.h +++ b/win32/common/video-enumtypes.h @@ -15,6 +15,18 @@ GType gst_video_format_flags_get_type (void); #define GST_TYPE_VIDEO_FORMAT_FLAGS (gst_video_format_flags_get_type()) GType gst_video_flags_get_type (void); #define GST_TYPE_VIDEO_FLAGS (gst_video_flags_get_type()) +GType gst_video_chroma_site_get_type (void); +#define GST_TYPE_VIDEO_CHROMA_SITE (gst_video_chroma_site_get_type()) +GType gst_video_color_range_get_type (void); +#define GST_TYPE_VIDEO_COLOR_RANGE (gst_video_color_range_get_type()) +GType gst_video_color_matrix_get_type (void); +#define GST_TYPE_VIDEO_COLOR_MATRIX (gst_video_color_matrix_get_type()) +GType gst_video_transfer_function_get_type (void); +#define GST_TYPE_VIDEO_TRANSFER_FUNCTION (gst_video_transfer_function_get_type()) +GType gst_video_color_primaries_get_type (void); +#define GST_TYPE_VIDEO_COLOR_PRIMARIES (gst_video_color_primaries_get_type()) +GType gst_video_buffer_flags_get_type (void); +#define GST_TYPE_VIDEO_BUFFER_FLAGS (gst_video_buffer_flags_get_type()) G_END_DECLS #endif /* __GST_VIDEO_ENUM_TYPES_H__ */