CVS Root: /cvs/gstreamer
Module: gst-plugins-bad
Changes by: slomo
Date: Sat Nov 22 2008 14:51:20 UTC
Log message:
* gst/mxf/mxfdemux.c: (gst_mxf_demux_push_src_event),
(gst_mxf_demux_handle_header_metadata_update_streams):
* gst/mxf/mxfparse.c: (gst_mxf_ul_hash),
(mxf_partition_pack_parse), (mxf_primer_pack_parse),
(mxf_metadata_preface_parse), (mxf_metadata_content_storage_parse),
(mxf_metadata_generic_package_parse),
(mxf_metadata_sequence_parse),
(mxf_metadata_generic_descriptor_parse),
(mxf_metadata_multiple_descriptor_parse):
Some more format string fixes and usage of guint instead of gint
where negative values don't make sense.
Modified files:
. : ChangeLog
gst/mxf : mxfdemux.c mxfparse.c
Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3726&r2=1.3727
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfdemux.c.diff?r1=1.2&r2=1.3
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfparse.c.diff?r1=1.2&r2=1.3
====Begin Diffs====
Index: mxfdemux.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/mxfdemux.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mxfdemux.c 22 Nov 2008 14:42:07 -0000 1.2
+++ mxfdemux.c 22 Nov 2008 14:51:06 -0000 1.3
@@ -43,19 +43,19 @@
);
static GstStaticPadTemplate audio_src_template =
-GST_STATIC_PAD_TEMPLATE ("audio_%d",
+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_%d",
+GST_STATIC_PAD_TEMPLATE ("video_%u",
static GstStaticPadTemplate data_src_template =
-GST_STATIC_PAD_TEMPLATE ("data_%d",
+GST_STATIC_PAD_TEMPLATE ("data_%u",
@@ -399,7 +399,7 @@
gst_mxf_demux_push_src_event (GstMXFDemux * demux, GstEvent * event)
{
gboolean ret = TRUE;
- gint i;
+ guint i;
GST_DEBUG_OBJECT (demux, "Pushing '%s' event downstream",
GST_EVENT_TYPE_NAME (event));
@@ -1127,8 +1127,9 @@
MXFMetadataEssenceContainerData, i);
for (j = 0; j < demux->content_storage.n_essence_container_data; j++) {
- if (mxf_ul_is_equal (&demux->content_storage.
- essence_container_data_uids[j], &data->instance_uid)) {
+ if (mxf_ul_is_equal (&demux->
+ content_storage.essence_container_data_uids[j],
+ &data->instance_uid)) {
demux->content_storage.essence_container_data[j] = data;
break;
}
@@ -1519,7 +1520,7 @@
GstMXFPad *pad = NULL;
GstCaps *caps = NULL;
- GST_DEBUG_OBJECT (demux, "Handling track %d", i);
+ GST_DEBUG_OBJECT (demux, "Handling track %u", i);
if (!track) {
GST_WARNING_OBJECT (demux, "Unresolved track");
@@ -1607,20 +1608,20 @@
case MXF_METADATA_TRACK_PICTURE_ESSENCE:
templ =
gst_element_class_get_pad_template (GST_ELEMENT_GET_CLASS (demux),
- "video_%d");
- pad_name = g_strdup_printf ("video_%d", source_track->track_id);
+ "video_%u");
+ pad_name = g_strdup_printf ("video_%u", source_track->track_id);
case MXF_METADATA_TRACK_SOUND_ESSENCE:
- "audio_%d");
- pad_name = g_strdup_printf ("audio_%d", source_track->track_id);
+ "audio_%u");
+ pad_name = g_strdup_printf ("audio_%u", source_track->track_id);
case MXF_METADATA_TRACK_DATA_ESSENCE:
- "data_%d");
- pad_name = g_strdup_printf ("data_%d", source_track->track_id);
+ "data_%u");
+ pad_name = g_strdup_printf ("data_%u", source_track->track_id);
default:
g_assert_not_reached ();
Index: mxfparse.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/mxfparse.c,v
--- mxfparse.c 22 Nov 2008 14:42:07 -0000 1.2
+++ mxfparse.c 22 Nov 2008 14:51:06 -0000 1.3
@@ -264,7 +264,7 @@
gst_mxf_ul_hash (const MXFUL * key)
guint32 ret = 0;
for (i = 0; i < 4; i++)
ret ^=
@@ -393,7 +393,7 @@
mxf_partition_pack_parse (const MXFUL * key, MXFPartitionPack * pack,
const guint8 * data, guint size)
gchar str[48];
g_return_val_if_fail (data != NULL, FALSE);
@@ -503,7 +503,7 @@
pack->n_essence_containers);
for (i = 0; i < pack->n_essence_containers; i++) {
- GST_DEBUG (" essence container %d = %s", i,
+ GST_DEBUG (" essence container %u = %s", i,
mxf_ul_to_string (&pack->essence_containers[i], str));
}
@@ -538,7 +538,7 @@
mxf_primer_pack_parse (const MXFUL * key, MXFPrimerPack * pack,
guint32 n;
@@ -682,7 +682,7 @@
guint16 tag, tag_size;
const guint8 *tag_data;
@@ -845,15 +845,15 @@
GST_DEBUG (" number of DM schemes = %u", preface->n_dm_schemes);
for (i = 0; i < preface->n_identifications; i++)
- GST_DEBUG (" identification %d = %s", i,
+ GST_DEBUG (" identification %u = %s", i,
mxf_ul_to_string (&preface->identifications_uids[i], str));
for (i = 0; i < preface->n_essence_containers; i++)
mxf_ul_to_string (&preface->essence_containers[i], str));
for (i = 0; i < preface->n_dm_schemes; i++)
- GST_DEBUG (" DM schemes %d = %s", i,
+ GST_DEBUG (" DM schemes %u = %s", i,
mxf_ul_to_string (&preface->dm_schemes[i], str));
return TRUE;
@@ -1036,7 +1036,7 @@
@@ -1124,10 +1124,10 @@
content_storage->n_essence_container_data);
for (i = 0; i < content_storage->n_packages; i++)
- GST_DEBUG (" package %i = %s", i,
+ GST_DEBUG (" package %u = %s", i,
mxf_ul_to_string (&content_storage->packages_uids[i], str));
- GST_DEBUG (" essence container data %i = %s", i,
+ GST_DEBUG (" essence container data %u = %s", i,
mxf_ul_to_string (&content_storage->essence_container_data_uids[i],
str));
@@ -1255,7 +1255,7 @@
gchar str[96];
@@ -1368,7 +1368,7 @@
GST_DEBUG (" number of tracks = %u", generic_package->n_tracks);
for (i = 0; i < generic_package->n_tracks; i++)
- GST_DEBUG (" track %d = %s", i,
+ GST_DEBUG (" track %u = %s", i,
mxf_ul_to_string (&generic_package->tracks_uids[i], str));
@@ -1561,7 +1561,7 @@
@@ -1642,7 +1642,7 @@
sequence->n_structural_components);
for (i = 0; i < sequence->n_structural_components; i++)
- GST_DEBUG (" structural component %d = %s", i,
+ GST_DEBUG (" structural component %u = %s", i,
mxf_ul_to_string (&sequence->structural_components_uids[i], str));
@@ -1837,7 +1837,7 @@
@@ -1899,7 +1899,7 @@
GST_DEBUG (" number of locators = %u", descriptor->n_locators);
for (i = 0; i < descriptor->n_locators; i++)
- GST_DEBUG (" locator %d = %s", i,
+ GST_DEBUG (" locator %u = %s", i,
mxf_ul_to_string (&descriptor->locators_uids[i], str));
@@ -2528,7 +2528,7 @@
@@ -2583,7 +2583,7 @@
GST_DEBUG ("Parsed multiple descriptor:");
GST_DEBUG (" number of sub descriptors = %u", descriptor->n_sub_descriptors);
for (i = 0; i < descriptor->n_sub_descriptors; i++)
- GST_DEBUG (" sub descriptor %d = %s", i,
+ GST_DEBUG (" sub descriptor %u = %s", i,
mxf_ul_to_string (&descriptor->sub_descriptors_uids[i], str));
Index: ChangeLog
RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v
retrieving revision 1.3726
retrieving revision 1.3727
diff -u -d -r1.3726 -r1.3727
--- ChangeLog 22 Nov 2008 14:42:04 -0000 1.3726
+++ ChangeLog 22 Nov 2008 14:51:04 -0000 1.3727
@@ -1,5 +1,19 @@
2008-11-22 Sebastian Dröge <[email protected]>
+ * gst/mxf/mxfdemux.c: (gst_mxf_demux_push_src_event),
+ (gst_mxf_demux_handle_header_metadata_update_streams):
+ * gst/mxf/mxfparse.c: (gst_mxf_ul_hash),
+ (mxf_partition_pack_parse), (mxf_primer_pack_parse),
+ (mxf_metadata_preface_parse), (mxf_metadata_content_storage_parse),
+ (mxf_metadata_generic_package_parse),
+ (mxf_metadata_sequence_parse),
+ (mxf_metadata_generic_descriptor_parse),
+ (mxf_metadata_multiple_descriptor_parse):
+ Some more format string fixes and usage of guint instead of gint
+ where negative values don't make sense.
+
+2008-11-22 Sebastian Dröge <[email protected]>
* gst/mxf/mxfaes-bwf.c:
(mxf_metadata_wave_audio_essence_descriptor_parse):
* gst/mxf/mxfaes-bwf.h:
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
gstreamer-cvs-verbose mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs-verbose
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.