diff options
| -rw-r--r-- | docs/design/part-events.txt | 21 | ||||
| -rw-r--r-- | docs/gst/gstreamer-sections.txt | 13 | ||||
| -rw-r--r-- | gst/gst.c | 2 | ||||
| -rw-r--r-- | gst/gstbuffer.h | 3 | ||||
| -rw-r--r-- | gst/gstevent.c | 220 | ||||
| -rw-r--r-- | gst/gstevent.h | 31 | ||||
| -rw-r--r-- | libs/gst/base/gstcollectpads.c | 1 | ||||
| -rw-r--r-- | libs/gst/check/gstconsistencychecker.c | 1 | ||||
| -rw-r--r-- | tests/check/gst/gstevent.c | 71 | ||||
| -rw-r--r-- | win32/common/config.h | 7 | ||||
| -rw-r--r-- | win32/common/gstenumtypes.c | 25 | ||||
| -rw-r--r-- | win32/common/gstenumtypes.h | 2 | ||||
| -rw-r--r-- | win32/common/libgstreamer.def | 8 |
13 files changed, 6 insertions, 399 deletions
diff --git a/docs/design/part-events.txt b/docs/design/part-events.txt index c8ffde6da..001e8b7ef 100644 --- a/docs/design/part-events.txt +++ b/docs/design/part-events.txt @@ -13,7 +13,6 @@ Different types of events exist to implement various functionalities. GST_EVENT_FLUSH_START: data is to be discarded GST_EVENT_FLUSH_STOP: data is allowed again GST_EVENT_CAPS: Format information about the following buffers - GST_EVENT_STREAM_CONFIG: Stream config: stream headers and codec setup data GST_EVENT_SEGMENT: Timing information for the following buffers GST_EVENT_TAG: Stream metadata. GST_EVENT_BUFFERSIZE: Buffer size requirements @@ -142,26 +141,6 @@ goes to PLAYING. A FLUSH_STOP event on an element flushes the EOS state and all pending EOS messages. -GST_EVENT_STREAM_CONFIG -~~~~~~~~~~~~~~~~~~~~~~~ - -A stream config event is sent downstream by an element to pass stream headers -or codec/stream setup data to elements downstream. - -Stream headers are buffers that are to be pre-pended to a stream to create -a valid decodable bitstream. This is useful for e.g. network elements who -will send such stream headers first when a new client connects in the middle -of a streaming session. The stream headers and the current data will then -create a valid decodable stream. Stream headers are usually also sent as -buffers at the beginning of a stream in addition to the rest of the stream -data. - -Setup data is codec config data that must be communicated outside of the -data stream and is required by the consumer / downstream element in order -to interpret the data stream correctly. Prepending it to the data stream is -usually not allowed and will not yield a valid stream. - - SEGMENT ~~~~~~~ diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt index 64fcf0fcc..e57a18347 100644 --- a/docs/gst/gstreamer-sections.txt +++ b/docs/gst/gstreamer-sections.txt @@ -1010,17 +1010,6 @@ gst_event_new_reconfigure gst_event_new_caps gst_event_parse_caps -GstStreamConfigFlags -gst_event_new_stream_config -gst_event_parse_stream_config - -gst_event_set_stream_config_setup_data -gst_event_parse_stream_config_setup_data - -gst_event_add_stream_config_header -gst_event_get_n_stream_config_headers -gst_event_parse_nth_stream_config_header - gst_event_new_toc gst_event_parse_toc @@ -1057,8 +1046,6 @@ gst_seek_type_get_type gst_seek_flags_get_type gst_qos_type_get_type gst_event_type_flags_get_type -GST_TYPE_STREAM_CONFIG_FLAGS -gst_stream_config_flags_get_type </SECTION> <SECTION> @@ -687,7 +687,6 @@ init_post (GOptionContext * context, GOptionGroup * group, gpointer data, g_type_class_ref (gst_event_type_get_type ()); g_type_class_ref (gst_seek_type_get_type ()); g_type_class_ref (gst_seek_flags_get_type ()); - g_type_class_ref (gst_stream_config_flags_get_type ()); g_type_class_ref (gst_qos_type_get_type ()); g_type_class_ref (gst_format_get_type ()); g_type_class_ref (gst_debug_level_get_type ()); @@ -1053,7 +1052,6 @@ gst_deinit (void) g_type_class_unref (g_type_class_peek (gst_parse_flags_get_type ())); g_type_class_unref (g_type_class_peek (gst_resource_error_get_type ())); g_type_class_unref (g_type_class_peek (gst_search_mode_get_type ())); - g_type_class_unref (g_type_class_peek (gst_stream_config_flags_get_type ())); g_type_class_unref (g_type_class_peek (gst_stream_error_get_type ())); g_type_class_unref (g_type_class_peek (gst_stream_status_type_get_type ())); g_type_class_unref (g_type_class_peek (gst_structure_change_type_get_type diff --git a/gst/gstbuffer.h b/gst/gstbuffer.h index 4b7b7a08d..49ad3d546 100644 --- a/gst/gstbuffer.h +++ b/gst/gstbuffer.h @@ -184,8 +184,7 @@ typedef struct _GstBufferPool GstBufferPool; * video this is typically the end of a frame boundary, for audio * this is usually the start of a talkspurt. * @GST_BUFFER_FLAG_HEADER: the buffer contains header information that is - * needed to decode the following data. The buffer - * is also part of the headers of the STREAM_CONFIG event. + * needed to decode the following data. * @GST_BUFFER_FLAG_GAP: the buffer has been created to fill a gap in the * stream and contains media neutral data (elements can * switch to optimized code path that ignores the buffer diff --git a/gst/gstevent.c b/gst/gstevent.c index 99c9239cf..188325dc2 100644 --- a/gst/gstevent.c +++ b/gst/gstevent.c @@ -110,7 +110,6 @@ static GstEventQuarks event_quarks[] = { {GST_EVENT_FLUSH_STOP, "flush-stop", 0}, {GST_EVENT_STREAM_START, "stream-start", 0}, {GST_EVENT_CAPS, "caps", 0}, - {GST_EVENT_STREAM_CONFIG, "stream-config", 0}, {GST_EVENT_SEGMENT, "segment", 0}, {GST_EVENT_TAG, "tag", 0}, {GST_EVENT_TOC, "toc", 0}, @@ -660,225 +659,6 @@ gst_event_parse_caps (GstEvent * event, GstCaps ** caps) } /** - * gst_event_new_stream_config: - * @flags: the stream config flags - * - * Create a new STREAM CONFIG event. The stream config event travels - * downstream synchronized with the buffer flow and contains stream - * configuration information for the stream, such as stream-headers - * or setup-data. It is optional and should be sent after the CAPS - * event. - * - * Returns: (transfer full): the new STREAM CONFIG event. - */ -GstEvent * -gst_event_new_stream_config (GstStreamConfigFlags flags) -{ - GstEvent *event; - - GST_CAT_INFO (GST_CAT_EVENT, "creating stream info event, flags=0x%x", flags); - - event = gst_event_new_custom (GST_EVENT_STREAM_CONFIG, - gst_structure_new_id (GST_QUARK (EVENT_STREAM_CONFIG), - GST_QUARK (FLAGS), GST_TYPE_STREAM_CONFIG_FLAGS, flags, NULL)); - - return event; -} - -/** - * gst_event_parse_stream_config: - * @event: The event to parse - * @flags: (out): a pointer to a variable to store the stream config flags - * - * Get the stream config flags from @event. - */ -void -gst_event_parse_stream_config (GstEvent * event, GstStreamConfigFlags * flags) -{ - GstStructure *structure; - - g_return_if_fail (GST_IS_EVENT (event)); - g_return_if_fail (GST_EVENT_TYPE (event) == GST_EVENT_STREAM_CONFIG); - - structure = GST_EVENT_STRUCTURE (event); - if (G_LIKELY (flags != NULL)) { - *flags = - g_value_get_enum (gst_structure_id_get_value (structure, - GST_QUARK (FLAGS))); - } -} - -/** - * gst_event_set_stream_config_setup_data: - * @event: a stream config event - * @buf: a #GstBuffer with setup data - * - * Set setup data on the stream info event to signal out of bound setup data - * to downstream elements. Unlike stream headers, setup data contains data - * that is required to interpret the data stream, but is not valid as-is - * inside the data stream and thus can't just be prepended to or inserted - * into the data stream. - */ -void -gst_event_set_stream_config_setup_data (GstEvent * event, GstBuffer * buf) -{ - GstStructure *s; - - g_return_if_fail (GST_IS_EVENT (event)); - g_return_if_fail (GST_EVENT_TYPE (event) == GST_EVENT_STREAM_CONFIG); - g_return_if_fail (GST_IS_BUFFER (buf) && gst_buffer_get_size (buf) > 0); - - s = GST_EVENT_STRUCTURE (event); - gst_structure_id_set (s, GST_QUARK (SETUP_DATA), GST_TYPE_BUFFER, buf, NULL); -} - -/** - * gst_event_parse_stream_config_setup_data: - * @event: a stream config event - * @buf: (out) (transfer none): location where to store the #GstBuffer with setup data - * - * Extracts the setup data buffer from the stream info event. Will store - * %NULL in @buf if the event contains no setup data. The buffer returned - * will remain valid as long as @event remains valid. The caller should - * acquire a reference to to @buf if needed. - * - * Returns: TRUE if @event contained setup data and @buf has been set, - * otherwise FALSE. - */ -gboolean -gst_event_parse_stream_config_setup_data (GstEvent * event, GstBuffer ** buf) -{ - const GValue *val; - GstStructure *s; - - g_return_val_if_fail (GST_IS_EVENT (event), FALSE); - g_return_val_if_fail (GST_EVENT_TYPE (event) == GST_EVENT_STREAM_CONFIG, - FALSE); - g_return_val_if_fail (buf != NULL, FALSE); - - s = GST_EVENT_STRUCTURE (event); - val = gst_structure_id_get_value (s, GST_QUARK (SETUP_DATA)); - if (val != NULL) - *buf = g_value_get_boxed (val); - else - *buf = NULL; - - return (*buf != NULL); -} - -/** - * gst_event_add_stream_config_header: - * @event: a stream config event - * @buf: a #GstBuffer with stream header data - * - * Adds a stream header to the stream info event to signal stream headers to - * to downstream elements such as multifilesink, tcpserversink etc. Stream - * headers can be and should usually be prepended to the data stream at any - * point in the stream (which requires a streamable format), e.g. to a new - * client connecting, or when starting a new file segment. stream header - * buffers will all be used together in the order they were added to the - * stream config event. Stream headers are sent as buffers at the beginning - * of the data flow in addition to the stream config event. Elements that - * care about stream headers need to make sure that they don't insert or - * interpret these header buffers twice if they interpret them. - */ -void -gst_event_add_stream_config_header (GstEvent * event, GstBuffer * buf) -{ - GstStructure *s; - GValue buf_val = { 0, }; - GValue *val; - - g_return_if_fail (GST_IS_EVENT (event)); - g_return_if_fail (GST_EVENT_TYPE (event) == GST_EVENT_STREAM_CONFIG); - g_return_if_fail (GST_IS_BUFFER (buf) && gst_buffer_get_size (buf) > 0); - - g_value_init (&buf_val, GST_TYPE_BUFFER); - g_value_set_boxed (&buf_val, buf); - - s = GST_EVENT_STRUCTURE (event); - val = (GValue *) gst_structure_id_get_value (s, GST_QUARK (STREAM_HEADERS)); - if (val == NULL) { - GValue new_array = { 0, }; - - g_value_init (&new_array, GST_TYPE_ARRAY); - gst_value_array_append_value (&new_array, &buf_val); - gst_structure_id_take_value (s, GST_QUARK (STREAM_HEADERS), &new_array); - } else { - gst_value_array_append_value (val, &buf_val); - } - g_value_unset (&buf_val); -} - -/** - * gst_event_get_n_stream_config_headers: - * @event: a stream config event - * - * Extract the number of stream header buffers. - * - * Returns: the number of stream header buffers attached to the stream info - * @event. - */ -guint -gst_event_get_n_stream_config_headers (GstEvent * event) -{ - const GValue *val; - GstStructure *s; - guint num = 0; - - g_return_val_if_fail (GST_IS_EVENT (event), 0); - g_return_val_if_fail (GST_EVENT_TYPE (event) == GST_EVENT_STREAM_CONFIG, 0); - - s = GST_EVENT_STRUCTURE (event); - val = gst_structure_id_get_value (s, GST_QUARK (STREAM_HEADERS)); - - if (val != NULL) - num = gst_value_array_get_size (val); - - return num; -} - -/** - * gst_event_parse_nth_stream_config_header: - * @event: a stream config event - * @index: number of the stream header to retrieve - * @buf: (out) (transfer none): location where to store the n-th stream - * header #GstBuffer - * - * Retrieves the n-th stream header buffer attached to the stream config - * event and stores it in @buf. Will store %NULL in @buf if there is no such - * stream header. - * - * Returns: TRUE if @event contained a stream header at @index and @buf has - * been set, otherwise FALSE. - */ -gboolean -gst_event_parse_nth_stream_config_header (GstEvent * event, guint index, - GstBuffer ** buf) -{ - const GValue *val, *buf_val; - GstStructure *s; - GstBuffer *ret = NULL; - - g_return_val_if_fail (GST_IS_EVENT (event), FALSE); - g_return_val_if_fail (GST_EVENT_TYPE (event) == GST_EVENT_STREAM_CONFIG, - FALSE); - g_return_val_if_fail (buf != NULL, FALSE); - - s = GST_EVENT_STRUCTURE (event); - val = gst_structure_id_get_value (s, GST_QUARK (STREAM_HEADERS)); - - if (val != NULL) { - buf_val = gst_value_array_get_value (val, index); - if (buf_val != NULL) - ret = g_value_get_boxed (buf_val); - } - - *buf = ret; - return (ret != NULL); -} - -/** * gst_event_new_segment: * @segment: (transfer none): a #GstSegment * diff --git a/gst/gstevent.h b/gst/gstevent.h index 39af2705a..7907a69d4 100644 --- a/gst/gstevent.h +++ b/gst/gstevent.h @@ -83,8 +83,6 @@ typedef enum { * other serialized event and only sent at the start of a new stream, * not after flushing seeks. * @GST_EVENT_CAPS: #GstCaps event. Notify the pad of a new media type. - * @GST_EVENT_STREAM_CONFIG: (unimplemented) contains configuration information for the stream, - * for example stream-headers and codec-data. * @GST_EVENT_SEGMENT: A new media segment follows in the dataflow. The * segment events contains information for clipping buffers and * converting buffer timestamps to running-time and @@ -143,7 +141,6 @@ typedef enum { /* downstream serialized events */ GST_EVENT_STREAM_START = GST_EVENT_MAKE_TYPE (40, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | FLAG(STICKY)), GST_EVENT_CAPS = GST_EVENT_MAKE_TYPE (50, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | FLAG(STICKY)), - GST_EVENT_STREAM_CONFIG = GST_EVENT_MAKE_TYPE (60, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | FLAG(STICKY)), GST_EVENT_SEGMENT = GST_EVENT_MAKE_TYPE (70, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | FLAG(STICKY)), GST_EVENT_TAG = GST_EVENT_MAKE_TYPE (80, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | FLAG(STICKY) | FLAG(STICKY_MULTI)), GST_EVENT_BUFFERSIZE = GST_EVENT_MAKE_TYPE (90, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | FLAG(STICKY)), @@ -368,17 +365,6 @@ typedef enum { } GstQOSType; /** - * GstStreamConfigFlags: - * @GST_STREAM_CONFIG_FLAG_NONE: no flags set - * - * GstStreamConfigFlags are flags passed with the stream config event, see - * gst_event_new_stream_config(). - */ -typedef enum { - GST_STREAM_CONFIG_FLAG_NONE = 0 -} GstStreamConfigFlags; - -/** * GstEvent: * @mini_object: the parent structure * @type: the #GstEventType of the event @@ -496,23 +482,6 @@ void gst_event_parse_gap (GstEvent * event, GstEvent * gst_event_new_caps (GstCaps *caps) G_GNUC_MALLOC; void gst_event_parse_caps (GstEvent *event, GstCaps **caps); -/* Stream config */ -GstEvent * gst_event_new_stream_config (GstStreamConfigFlags flags) G_GNUC_MALLOC; - -void gst_event_parse_stream_config (GstEvent * event, GstStreamConfigFlags * flags); - - -void gst_event_set_stream_config_setup_data (GstEvent * event, GstBuffer * buf); - -gboolean gst_event_parse_stream_config_setup_data (GstEvent * event, GstBuffer ** buf); - - -void gst_event_add_stream_config_header (GstEvent * event, GstBuffer * buf); - -guint gst_event_get_n_stream_config_headers (GstEvent * event); - -gboolean gst_event_parse_nth_stream_config_header (GstEvent * event, guint index, GstBuffer ** buf); - /* segment event */ GstEvent* gst_event_new_segment (const GstSegment *segment) G_GNUC_MALLOC; void gst_event_parse_segment (GstEvent *event, const GstSegment **segment); diff --git a/libs/gst/base/gstcollectpads.c b/libs/gst/base/gstcollectpads.c index 03b19f0c7..c69623179 100644 --- a/libs/gst/base/gstcollectpads.c +++ b/libs/gst/base/gstcollectpads.c @@ -1755,7 +1755,6 @@ gst_collect_pads_event_default (GstCollectPads * pads, GstCollectData * data, } break; case GST_EVENT_CAPS: - case GST_EVENT_STREAM_CONFIG: goto eat; default: /* forward other events */ diff --git a/libs/gst/check/gstconsistencychecker.c b/libs/gst/check/gstconsistencychecker.c index 46c3a5646..48b25262f 100644 --- a/libs/gst/check/gstconsistencychecker.c +++ b/libs/gst/check/gstconsistencychecker.c @@ -96,7 +96,6 @@ source_pad_data_cb (GstPad * pad, GstPadProbeInfo * info, GST_DEBUG_PAD_NAME (pad)); consist->saw_stream_start = TRUE; break; - case GST_EVENT_STREAM_CONFIG: case GST_EVENT_CAPS: /* ok to have these before segment event */ /* FIXME check order more precisely, if so spec'ed somehow ? */ diff --git a/tests/check/gst/gstevent.c b/tests/check/gst/gstevent.c index fc215f228..246a71185 100644 --- a/tests/check/gst/gstevent.c +++ b/tests/check/gst/gstevent.c @@ -109,77 +109,6 @@ GST_START_TEST (create_events) gst_event_unref (event); } - /* STREAM CONFIG */ - { - GstStreamConfigFlags flags = 0x987654; - GstBuffer *buf, *cd, *sh1, *sh2; - gpointer dummy; - - event = gst_event_new_stream_config (GST_STREAM_CONFIG_FLAG_NONE); - - gst_event_parse_stream_config (event, &flags); - fail_unless_equals_int (flags, GST_STREAM_CONFIG_FLAG_NONE); - - fail_unless_equals_int (gst_event_get_n_stream_config_headers (event), 0); - - /* set buf to something random but guaranteed to be non-NULL */ - buf = (GstBuffer *) & dummy; - gst_event_parse_stream_config_setup_data (event, &buf); - fail_unless (buf == NULL); - - buf = (GstBuffer *) & dummy; - gst_event_parse_nth_stream_config_header (event, 0, &buf); - fail_unless (buf == NULL); - - buf = (GstBuffer *) & dummy; - gst_event_parse_nth_stream_config_header (event, 98416, &buf); - fail_unless (buf == NULL); - - ASSERT_CRITICAL (gst_event_set_stream_config_setup_data (event, NULL)); - ASSERT_CRITICAL (gst_event_add_stream_config_header (event, NULL)); - - cd = gst_buffer_new_wrapped_full (0, (gpointer) "SetMeUpScottie", 14, 0, 14, - NULL, NULL); - gst_event_set_stream_config_setup_data (event, cd); - gst_buffer_unref (cd); - - buf = (GstBuffer *) & dummy; - gst_event_parse_nth_stream_config_header (event, 0, &buf); - fail_unless (buf == NULL); - gst_event_parse_stream_config_setup_data (event, &buf); - fail_unless (buf == cd); - fail_unless (GST_IS_BUFFER (buf)); - - gst_event_unref (event); - - event = gst_event_new_stream_config (GST_STREAM_CONFIG_FLAG_NONE); - fail_unless_equals_int (gst_event_get_n_stream_config_headers (event), 0); - sh1 = - gst_buffer_new_wrapped_full (0, (gpointer) "Strea", 5, 0, 5, NULL, - NULL); - gst_event_add_stream_config_header (event, sh1); - gst_buffer_unref (sh1); - fail_unless_equals_int (gst_event_get_n_stream_config_headers (event), 1); - sh2 = - gst_buffer_new_wrapped_full (0, (gpointer) "mHeader", 7, 0, 7, NULL, - NULL); - gst_event_add_stream_config_header (event, sh2); - gst_buffer_unref (sh2); - fail_unless_equals_int (gst_event_get_n_stream_config_headers (event), 2); - - buf = (GstBuffer *) & dummy; - gst_event_parse_nth_stream_config_header (event, 1, &buf); - fail_unless (buf == sh2); - fail_unless (GST_IS_BUFFER (buf)); - - buf = (GstBuffer *) & dummy; - gst_event_parse_nth_stream_config_header (event, 0, &buf); - fail_unless (buf == sh1); - fail_unless (GST_IS_BUFFER (buf)); - - gst_event_unref (event); - } - /* TAGS */ { GstTagList *taglist = gst_tag_list_new_empty (); diff --git a/win32/common/config.h b/win32/common/config.h index 586353f61..5aa21051f 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -62,7 +62,7 @@ #define GST_PACKAGE_ORIGIN "Unknown package origin" /* GStreamer package release date/time for plugins as YYYY-MM-DD */ -#define GST_PACKAGE_RELEASE_DATETIME "2012-08-08T15:16Z" +#define GST_PACKAGE_RELEASE_DATETIME "2012-09-10T07:42Z" /* location of the installed gst-plugin-scanner */ #define GST_PLUGIN_SCANNER_INSTALLED LIBDIR "\\gst-plugin-scanner" @@ -394,11 +394,6 @@ # endif #endif -/* Enable large inode numbers on Mac OS X 10.5. */ -#ifndef _DARWIN_USE_64_BIT_INODE -# define _DARWIN_USE_64_BIT_INODE 1 -#endif - /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS diff --git a/win32/common/gstenumtypes.c b/win32/common/gstenumtypes.c index 517f84e47..5c5b3f180 100644 --- a/win32/common/gstenumtypes.c +++ b/win32/common/gstenumtypes.c @@ -591,8 +591,6 @@ gst_event_type_get_type (void) {C_ENUM (GST_EVENT_FLUSH_STOP), "GST_EVENT_FLUSH_STOP", "flush-stop"}, {C_ENUM (GST_EVENT_STREAM_START), "GST_EVENT_STREAM_START", "stream-start"}, {C_ENUM (GST_EVENT_CAPS), "GST_EVENT_CAPS", "caps"}, - {C_ENUM (GST_EVENT_STREAM_CONFIG), "GST_EVENT_STREAM_CONFIG", - "stream-config"}, {C_ENUM (GST_EVENT_SEGMENT), "GST_EVENT_SEGMENT", "segment"}, {C_ENUM (GST_EVENT_TAG), "GST_EVENT_TAG", "tag"}, {C_ENUM (GST_EVENT_BUFFERSIZE), "GST_EVENT_BUFFERSIZE", "buffersize"}, @@ -649,24 +647,6 @@ gst_qos_type_get_type (void) return (GType) id; } -GType -gst_stream_config_flags_get_type (void) -{ - static gsize id = 0; - static const GEnumValue values[] = { - {C_ENUM (GST_STREAM_CONFIG_FLAG_NONE), "GST_STREAM_CONFIG_FLAG_NONE", - "none"}, - {0, NULL, NULL} - }; - - if (g_once_init_enter (&id)) { - GType tmp = g_enum_register_static ("GstStreamConfigFlags", values); - g_once_init_leave (&id, tmp); - } - - return (GType) id; -} - /* enumerations from "gstformat.h" */ GType gst_format_get_type (void) @@ -824,7 +804,8 @@ gst_message_type_get_type (void) "segment-start"}, {C_FLAGS (GST_MESSAGE_SEGMENT_DONE), "GST_MESSAGE_SEGMENT_DONE", "segment-done"}, - {C_FLAGS (GST_MESSAGE_DURATION), "GST_MESSAGE_DURATION", "duration"}, + {C_FLAGS (GST_MESSAGE_DURATION_CHANGED), "GST_MESSAGE_DURATION_CHANGED", + "duration-changed"}, {C_FLAGS (GST_MESSAGE_LATENCY), "GST_MESSAGE_LATENCY", "latency"}, {C_FLAGS (GST_MESSAGE_ASYNC_START), "GST_MESSAGE_ASYNC_START", "async-start"}, @@ -1145,6 +1126,8 @@ gst_pad_link_check_get_type (void) {C_FLAGS (GST_PAD_LINK_CHECK_TEMPLATE_CAPS), "GST_PAD_LINK_CHECK_TEMPLATE_CAPS", "template-caps"}, {C_FLAGS (GST_PAD_LINK_CHECK_CAPS), "GST_PAD_LINK_CHECK_CAPS", "caps"}, + {C_FLAGS (GST_PAD_LINK_CHECK_DEFAULT), "GST_PAD_LINK_CHECK_DEFAULT", + "default"}, {0, NULL, NULL} }; diff --git a/win32/common/gstenumtypes.h b/win32/common/gstenumtypes.h index 9f2566d83..c15314f4d 100644 --- a/win32/common/gstenumtypes.h +++ b/win32/common/gstenumtypes.h @@ -81,8 +81,6 @@ GType gst_event_type_get_type (void); #define GST_TYPE_EVENT_TYPE (gst_event_type_get_type()) GType gst_qos_type_get_type (void); #define GST_TYPE_QOS_TYPE (gst_qos_type_get_type()) -GType gst_stream_config_flags_get_type (void); -#define GST_TYPE_STREAM_CONFIG_FLAGS (gst_stream_config_flags_get_type()) /* enumerations from "gstformat.h" */ GType gst_format_get_type (void); diff --git a/win32/common/libgstreamer.def b/win32/common/libgstreamer.def index 81f88ad36..b4ff163ca 100644 --- a/win32/common/libgstreamer.def +++ b/win32/common/libgstreamer.def @@ -427,9 +427,7 @@ EXPORTS gst_element_unlink_many gst_element_unlink_pads gst_error_get_message - gst_event_add_stream_config_header gst_event_copy_segment - gst_event_get_n_stream_config_headers gst_event_get_seqnum gst_event_get_structure gst_event_get_type @@ -450,7 +448,6 @@ EXPORTS gst_event_new_segment_done gst_event_new_sink_message gst_event_new_step - gst_event_new_stream_config gst_event_new_stream_start gst_event_new_tag gst_event_new_toc @@ -460,21 +457,17 @@ EXPORTS gst_event_parse_flush_stop gst_event_parse_gap gst_event_parse_latency - gst_event_parse_nth_stream_config_header gst_event_parse_qos gst_event_parse_seek gst_event_parse_segment gst_event_parse_segment_done gst_event_parse_sink_message gst_event_parse_step - gst_event_parse_stream_config - gst_event_parse_stream_config_setup_data gst_event_parse_stream_start gst_event_parse_tag gst_event_parse_toc gst_event_parse_toc_select gst_event_set_seqnum - gst_event_set_stream_config_setup_data gst_event_type_flags_get_type gst_event_type_get_flags gst_event_type_get_name @@ -985,7 +978,6 @@ EXPORTS gst_static_pad_template_get gst_static_pad_template_get_caps gst_static_pad_template_get_type - gst_stream_config_flags_get_type gst_stream_error_get_type gst_stream_error_quark gst_stream_status_type_get_type |