mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-07-28 09:15:08 +00:00
gst/avi/gstavidemux.c: Moved win32 variant of GST_DEBUG_CATEGORY_EXTERN to gstinfo.h. Fixed indentation and spacing.
Original commit message from CVS: * gst/avi/gstavidemux.c: (gst_avi_demux_read_subindexes), (gst_avi_demux_parse_stream): Moved win32 variant of GST_DEBUG_CATEGORY_EXTERN to gstinfo.h. Fixed indentation and spacing.
This commit is contained in:
parent
bfd753e07d
commit
c0514b0209
|
@ -1,3 +1,10 @@
|
||||||
|
2006-07-25 Stefan Kost <ensonic@users.sf.net>
|
||||||
|
|
||||||
|
* gst/avi/gstavidemux.c: (gst_avi_demux_read_subindexes),
|
||||||
|
(gst_avi_demux_parse_stream):
|
||||||
|
Moved win32 variant of GST_DEBUG_CATEGORY_EXTERN to gstinfo.h. Fixed
|
||||||
|
indentation and spacing.
|
||||||
|
|
||||||
2006-07-24 Tim-Philipp Müller <tim at centricular dot net>
|
2006-07-24 Tim-Philipp Müller <tim at centricular dot net>
|
||||||
|
|
||||||
* docs/plugins/Makefile.am:
|
* docs/plugins/Makefile.am:
|
||||||
|
|
|
@ -56,53 +56,42 @@
|
||||||
GST_DEBUG_CATEGORY_STATIC (avidemux_debug);
|
GST_DEBUG_CATEGORY_STATIC (avidemux_debug);
|
||||||
#define GST_CAT_DEFAULT avidemux_debug
|
#define GST_CAT_DEFAULT avidemux_debug
|
||||||
|
|
||||||
#ifndef WIN32
|
|
||||||
GST_DEBUG_CATEGORY_EXTERN (GST_CAT_EVENT);
|
GST_DEBUG_CATEGORY_EXTERN (GST_CAT_EVENT);
|
||||||
#else
|
|
||||||
extern
|
|
||||||
_declspec (dllimport)
|
|
||||||
GstDebugCategory *GST_CAT_EVENT;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static GstStaticPadTemplate sink_templ = GST_STATIC_PAD_TEMPLATE ("sink",
|
static GstStaticPadTemplate sink_templ = GST_STATIC_PAD_TEMPLATE ("sink",
|
||||||
GST_PAD_SINK,
|
GST_PAD_SINK,
|
||||||
GST_PAD_ALWAYS,
|
GST_PAD_ALWAYS,
|
||||||
GST_STATIC_CAPS ("video/x-msvideo")
|
GST_STATIC_CAPS ("video/x-msvideo")
|
||||||
);
|
);
|
||||||
|
|
||||||
static void gst_avi_demux_base_init (GstAviDemuxClass * klass);
|
static void gst_avi_demux_base_init (GstAviDemuxClass * klass);
|
||||||
static void gst_avi_demux_class_init (GstAviDemuxClass * klass);
|
static void gst_avi_demux_class_init (GstAviDemuxClass * klass);
|
||||||
static void gst_avi_demux_init (GstAviDemux * avi);
|
static void gst_avi_demux_init (GstAviDemux * avi);
|
||||||
|
|
||||||
static void gst_avi_demux_reset (GstAviDemux * avi);
|
static void gst_avi_demux_reset (GstAviDemux * avi);
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
static const GstEventMask *gst_avi_demux_get_event_mask (GstPad * pad);
|
static const GstEventMask *gst_avi_demux_get_event_mask (GstPad * pad);
|
||||||
#endif
|
#endif
|
||||||
static gboolean gst_avi_demux_handle_src_event (GstPad * pad,
|
static gboolean gst_avi_demux_handle_src_event (GstPad * pad, GstEvent * event);
|
||||||
GstEvent * event);
|
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
static const GstFormat *gst_avi_demux_get_src_formats (GstPad * pad);
|
static const GstFormat *gst_avi_demux_get_src_formats (GstPad * pad);
|
||||||
#endif
|
#endif
|
||||||
static const GstQueryType *gst_avi_demux_get_src_query_types (GstPad *
|
static const GstQueryType *gst_avi_demux_get_src_query_types (GstPad * pad);
|
||||||
pad);
|
static gboolean gst_avi_demux_handle_src_query (GstPad * pad, GstQuery * query);
|
||||||
static gboolean gst_avi_demux_handle_src_query (GstPad * pad,
|
static gboolean gst_avi_demux_src_convert (GstPad * pad, GstFormat src_format,
|
||||||
GstQuery * query);
|
gint64 src_value, GstFormat * dest_format, gint64 * dest_value);
|
||||||
static gboolean gst_avi_demux_src_convert (GstPad * pad,
|
|
||||||
GstFormat src_format, gint64 src_value, GstFormat * dest_format,
|
|
||||||
gint64 * dest_value);
|
|
||||||
|
|
||||||
static gboolean gst_avi_demux_handle_seek (GstAviDemux * avi,
|
static gboolean gst_avi_demux_handle_seek (GstAviDemux * avi, gboolean update);
|
||||||
gboolean update);
|
static void gst_avi_demux_loop (GstPad * pad);
|
||||||
static void gst_avi_demux_loop (GstPad * pad);
|
static gboolean gst_avi_demux_sink_activate (GstPad * sinkpad);
|
||||||
static gboolean gst_avi_demux_sink_activate (GstPad * sinkpad);
|
static gboolean gst_avi_demux_sink_activate_pull (GstPad * sinkpad,
|
||||||
static gboolean gst_avi_demux_sink_activate_pull (GstPad * sinkpad,
|
|
||||||
gboolean active);
|
gboolean active);
|
||||||
static GstStateChangeReturn gst_avi_demux_change_state (GstElement *
|
static GstStateChangeReturn gst_avi_demux_change_state (GstElement * element,
|
||||||
element, GstStateChange transition);
|
GstStateChange transition);
|
||||||
|
|
||||||
static GstElementClass *parent_class = NULL;
|
static GstElementClass *parent_class = NULL;
|
||||||
|
|
||||||
GType
|
GType
|
||||||
gst_avi_demux_get_type (void)
|
gst_avi_demux_get_type (void)
|
||||||
|
@ -287,7 +276,6 @@ gst_avi_demux_index_entry_for_time (GstAviDemux * avi,
|
||||||
return last_entry;
|
return last_entry;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
static const GstFormat *
|
static const GstFormat *
|
||||||
gst_avi_demux_get_src_formats (GstPad * pad)
|
gst_avi_demux_get_src_formats (GstPad * pad)
|
||||||
|
@ -969,6 +957,8 @@ gst_avi_demux_read_subindexes (GstAviDemux * avi,
|
||||||
GstBuffer *buf;
|
GstBuffer *buf;
|
||||||
gint i, n;
|
gint i, n;
|
||||||
|
|
||||||
|
GST_DEBUG_OBJECT (avi, "gst_avi_demux_read_subindexes");
|
||||||
|
|
||||||
for (n = 0; n < avi->num_streams; n++) {
|
for (n = 0; n < avi->num_streams; n++) {
|
||||||
avi_stream_context *stream = &avi->stream[n];
|
avi_stream_context *stream = &avi->stream[n];
|
||||||
|
|
||||||
|
@ -1039,7 +1029,6 @@ gst_avi_demux_parse_stream (GstElement * element, GstBuffer * buf)
|
||||||
} else if (!gst_riff_parse_strh (element, sub, &stream->strh))
|
} else if (!gst_riff_parse_strh (element, sub, &stream->strh))
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
|
|
||||||
/* read strf */
|
/* read strf */
|
||||||
if (!gst_riff_parse_chunk (element, buf, &offset, &tag, &sub) ||
|
if (!gst_riff_parse_chunk (element, buf, &offset, &tag, &sub) ||
|
||||||
tag != GST_RIFF_TAG_strf) {
|
tag != GST_RIFF_TAG_strf) {
|
||||||
|
|
Loading…
Reference in a new issue