mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 09:55:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

more template fixes

Browse source
This commit is contained in:
Wim Taymans 2011-11-04 16:40:59 +01:00
parent 7481b07261
commit 85c1707fcf
5 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gst/asfdemux/gstasfdemux.c
View file

@ -53,13 +53,13 @@ GST_STATIC_PAD_TEMPLATE ("sink",
);
static GstStaticPadTemplate audio_src_template =
GST_STATIC_PAD_TEMPLATE ("audio_%02d",
GST_STATIC_PAD_TEMPLATE ("audio_%u",
GST_PAD_SRC,
GST_PAD_SOMETIMES,
GST_STATIC_CAPS_ANY);
static GstStaticPadTemplate video_src_template =
GST_STATIC_PAD_TEMPLATE ("video_%02d",
GST_STATIC_PAD_TEMPLATE ("video_%u",
GST_PAD_SRC,
GST_PAD_SOMETIMES,
GST_STATIC_CAPS_ANY);
@ -2179,7 +2179,7 @@ gst_asf_demux_add_audio_stream (GstASFDemux * demux,
size_left = audio->size;
/* Create the audio pad */
name = g_strdup_printf ("audio_%02d", demux->num_audio_streams);
name = g_strdup_printf ("audio_%u", demux->num_audio_streams);
src_pad = gst_pad_new_from_static_template (&audio_src_template, name);
g_free (name);
@ -2236,7 +2236,7 @@ gst_asf_demux_add_video_stream (GstASFDemux * demux,
gint size_left = video->size - 40;
/* Create the video pad */
name = g_strdup_printf ("video_%02d", demux->num_video_streams);
name = g_strdup_printf ("video_%u", demux->num_video_streams);
src_pad = gst_pad_new_from_static_template (&video_src_template, name);
g_free (name);
@ -2349,7 +2349,7 @@ gst_asf_demux_parse_stream_object (GstASFDemux * demux, guint8 * data,
flags = gst_asf_demux_get_uint16 (&data, &size);
stream_id = flags & 0x7f;
is_encrypted = !!((flags & 0x8000) << 15);
is_encrypted = ! !((flags & 0x8000) << 15);
unknown = gst_asf_demux_get_uint32 (&data, &size);
GST_DEBUG_OBJECT (demux, "Found stream %u, time_offset=%" GST_TIME_FORMAT,
@ -2957,8 +2957,8 @@ gst_asf_demux_process_file (GstASFDemux * demux, guint8 * data, guint64 size)
max_pktsize = gst_asf_demux_get_uint32 (&data, &size);
min_bitrate = gst_asf_demux_get_uint32 (&data, &size);
demux->broadcast = !!(flags & 0x01);
demux->seekable = !!(flags & 0x02);
demux->broadcast = ! !(flags & 0x01);
demux->seekable = ! !(flags & 0x02);
GST_DEBUG_OBJECT (demux, "min_pktsize = %u", min_pktsize);
GST_DEBUG_OBJECT (demux, "flags::broadcast = %d", demux->broadcast);

6
gst/mpegstream/gstdvddemux.c
View file

@ -97,7 +97,7 @@ GST_STATIC_PAD_TEMPLATE ("current_video",
VIDEO_CAPS);
static GstStaticPadTemplate audio_template =
GST_STATIC_PAD_TEMPLATE ("dvd_audio_%02d",
GST_STATIC_PAD_TEMPLATE ("dvd_audio_%u",
GST_PAD_SRC,
GST_PAD_SOMETIMES,
AUDIO_CAPS);
@ -109,7 +109,7 @@ GST_STATIC_PAD_TEMPLATE ("current_audio",
AUDIO_CAPS);
static GstStaticPadTemplate subpicture_template =
GST_STATIC_PAD_TEMPLATE ("subpicture_%d",
GST_STATIC_PAD_TEMPLATE ("subpicture_%u",
GST_PAD_SRC,
GST_PAD_SOMETIMES,
SUBPICTURE_CAPS);
@ -527,7 +527,7 @@ gst_dvd_demux_get_audio_stream (GstMPEGDemux * mpeg_demux,
str = (GstMPEGStream *) lpcm_str;
}
name = g_strdup_printf ("audio_%02d", stream_nr);
name = g_strdup_printf ("audio_%u", stream_nr);
DEMUX_CLASS (dvd_demux)->init_stream (mpeg_demux, type, str, stream_nr,
name, DEMUX_CLASS (dvd_demux)->audio_template);
/* update caps */

12
gst/mpegstream/gstmpegdemux.c
View file

@ -53,7 +53,7 @@ static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
);
static GstStaticPadTemplate video_template =
GST_STATIC_PAD_TEMPLATE ("video_%02d",
GST_STATIC_PAD_TEMPLATE ("video_%u",
GST_PAD_SRC,
GST_PAD_SOMETIMES,
GST_STATIC_CAPS ("video/mpeg, "
@ -61,7 +61,7 @@ GST_STATIC_PAD_TEMPLATE ("video_%02d",
);
static GstStaticPadTemplate audio_template =
GST_STATIC_PAD_TEMPLATE ("audio_%02d",
GST_STATIC_PAD_TEMPLATE ("audio_%u",
GST_PAD_SRC,
GST_PAD_SOMETIMES,
GST_STATIC_CAPS ("audio/mpeg, " "mpegversion = (int) 1"
@ -70,7 +70,7 @@ GST_STATIC_PAD_TEMPLATE ("audio_%02d",
);
static GstStaticPadTemplate private_template =
GST_STATIC_PAD_TEMPLATE ("private_%d",
GST_STATIC_PAD_TEMPLATE ("private_%u",
GST_PAD_SRC,
GST_PAD_SOMETIMES,
GST_STATIC_CAPS_ANY);
@ -347,7 +347,7 @@ gst_mpeg_demux_get_video_stream (GstMPEGDemux * mpeg_demux,
video_str = g_new0 (GstMPEGVideoStream, 1);
str = (GstMPEGStream *) video_str;
name = g_strdup_printf ("video_%02d", stream_nr);
name = g_strdup_printf ("video_%u", stream_nr);
CLASS (mpeg_demux)->init_stream (mpeg_demux, type, str, stream_nr, name,
CLASS (mpeg_demux)->video_template);
g_free (name);
@ -422,7 +422,7 @@ gst_mpeg_demux_get_audio_stream (GstMPEGDemux * mpeg_demux,
if (str == NULL) {
str = g_new0 (GstMPEGStream, 1);
name = g_strdup_printf ("audio_%02d", stream_nr);
name = g_strdup_printf ("audio_%u", stream_nr);
CLASS (mpeg_demux)->init_stream (mpeg_demux, type, str, stream_nr, name,
CLASS (mpeg_demux)->audio_template);
g_free (name);
@ -479,7 +479,7 @@ gst_mpeg_demux_get_private_stream (GstMPEGDemux * mpeg_demux,
str = mpeg_demux->private_stream[stream_nr];
if (str == NULL) {
name = g_strdup_printf ("private_%d", stream_nr + 1);
name = g_strdup_printf ("private_%u", stream_nr + 1);
str = g_new0 (GstMPEGStream, 1);
CLASS (mpeg_demux)->init_stream (mpeg_demux, type, str, stream_nr, name,
CLASS (mpeg_demux)->private_template);

8
gst/realmedia/rmdemux.c
View file

@ -112,13 +112,13 @@ GST_STATIC_PAD_TEMPLATE ("sink",
);
static GstStaticPadTemplate gst_rmdemux_videosrc_template =
GST_STATIC_PAD_TEMPLATE ("video_%02d",
GST_STATIC_PAD_TEMPLATE ("video_%u",
GST_PAD_SRC,
GST_PAD_SOMETIMES,
GST_STATIC_CAPS_ANY);
static GstStaticPadTemplate gst_rmdemux_audiosrc_template =
GST_STATIC_PAD_TEMPLATE ("audio_%02d",
GST_STATIC_PAD_TEMPLATE ("audio_%u",
GST_PAD_SRC,
GST_PAD_SOMETIMES,
GST_STATIC_CAPS_ANY);
@ -1295,7 +1295,7 @@ gst_rmdemux_add_stream (GstRMDemux * rmdemux, GstRMDemuxStream * stream)
int version = 0;
if (stream->subtype == GST_RMDEMUX_STREAM_VIDEO) {
char *name = g_strdup_printf ("video_%02d", rmdemux->n_video_streams);
char *name = g_strdup_printf ("video_%u", rmdemux->n_video_streams);
stream->pad =
gst_pad_new_from_static_template (&gst_rmdemux_videosrc_template, name);
@ -1343,7 +1343,7 @@ gst_rmdemux_add_stream (GstRMDemux * rmdemux, GstRMDemuxStream * stream)
rmdemux->n_video_streams++;
} else if (stream->subtype == GST_RMDEMUX_STREAM_AUDIO) {
char *name = g_strdup_printf ("audio_%02d", rmdemux->n_audio_streams);
char *name = g_strdup_printf ("audio_%u", rmdemux->n_audio_streams);
stream->pad =
gst_pad_new_from_static_template (&gst_rmdemux_audiosrc_template, name);

4
gst/realmedia/rmdemux.h
View file

@ -83,8 +83,8 @@ struct _GstRMDemux {
GstPad *sinkpad;
GSList *streams;
int n_video_streams;
int n_audio_streams;
guint n_video_streams;
guint n_audio_streams;
GstAdapter *adapter;
gboolean have_pads;