slomo gst-plugins-bad: gst-plugins-bad/ gst-plugins-bad/gst/mxf/

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-bad
Changes by:     slomo
Date:           Fri Dec 05 2008  10:33:09 UTC

Log message:
* gst/mxf/mxfdemux.c:
(gst_mxf_demux_handle_header_metadata_resolve_references):
Generalize some lines of codes that are more or less the same
by a macro.

Modified files:
    .               : ChangeLog
    gst/mxf         : mxfdemux.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3790&r2=1.3791
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mxf/mxfdemux.c.diff?r1=1.27&r2=1.28

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v
retrieving revision 1.3790
retrieving revision 1.3791
diff -u -d -r1.3790 -r1.3791
--- ChangeLog	4 Dec 2008 20:11:16 -0000	1.3790
+++ ChangeLog	5 Dec 2008 10:32:53 -0000	1.3791
@@ -1,3 +1,10 @@
+2008-12-05  Sebastian Dröge  <[email protected]>
+
+	* gst/mxf/mxfdemux.c:
+	(gst_mxf_demux_handle_header_metadata_resolve_references):
+	Generalize some lines of codes that are more or less the same
+	by a macro.
 2008-12-04  Sebastian Dröge  <[email protected]>
 
 	* configure.ac:
Index: mxfdemux.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mxf/mxfdemux.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- mxfdemux.c	4 Dec 2008 09:26:25 -0000	1.27
+++ mxfdemux.c	5 Dec 2008 10:32:55 -0000	1.28
@@ -1165,76 +1165,38 @@
   /* Fill in demux->descriptor */
   demux->descriptor = g_ptr_array_new ();
-  if (demux->generic_descriptor) {
-    for (i = 0; i < demux->generic_descriptor->len; i++) {
-      g_ptr_array_add (demux->descriptor,
-          &g_array_index (demux->generic_descriptor,
-              MXFMetadataGenericDescriptor, i));
-    }
-  }
-  if (demux->file_descriptor) {
-    for (i = 0; i < demux->file_descriptor->len; i++) {
-          &g_array_index (demux->file_descriptor, MXFMetadataFileDescriptor,
-              i));
-  if (demux->generic_picture_essence_descriptor) {
-    for (i = 0; i < demux->generic_picture_essence_descriptor->len; i++) {
-          &g_array_index (demux->generic_picture_essence_descriptor,
-              MXFMetadataGenericPictureEssenceDescriptor, i));
-  if (demux->cdci_picture_essence_descriptor) {
-    for (i = 0; i < demux->cdci_picture_essence_descriptor->len; i++) {
-          &g_array_index (demux->cdci_picture_essence_descriptor,
-              MXFMetadataCDCIPictureEssenceDescriptor, i));
-  if (demux->rgba_picture_essence_descriptor) {
-    for (i = 0; i < demux->rgba_picture_essence_descriptor->len; i++) {
-          &g_array_index (demux->rgba_picture_essence_descriptor,
-              MXFMetadataRGBAPictureEssenceDescriptor, i));
-  if (demux->mpeg_video_descriptor) {
-    for (i = 0; i < demux->mpeg_video_descriptor->len; i++) {
-          &g_array_index (demux->mpeg_video_descriptor,
-              MXFMetadataMPEGVideoDescriptor, i));
-  if (demux->generic_sound_essence_descriptor) {
-    for (i = 0; i < demux->generic_sound_essence_descriptor->len; i++) {
-          &g_array_index (demux->generic_sound_essence_descriptor,
-              MXFMetadataGenericSoundEssenceDescriptor, i));
-  if (demux->wave_audio_essence_descriptor) {
-    for (i = 0; i < demux->wave_audio_essence_descriptor->len; i++) {
-          &g_array_index (demux->wave_audio_essence_descriptor,
-              MXFMetadataWaveAudioEssenceDescriptor, i));
-  if (demux->aes3_audio_essence_descriptor) {
-    for (i = 0; i < demux->aes3_audio_essence_descriptor->len; i++) {
-          &g_array_index (demux->aes3_audio_essence_descriptor,
-              MXFMetadataAES3AudioEssenceDescriptor, i));
-  if (demux->multiple_descriptor) {
-    for (i = 0; i < demux->multiple_descriptor->len; i++) {
-          &g_array_index (demux->multiple_descriptor,
-              MXFMetadataMultipleDescriptor, i));
+#define FILL_DESCRIPTOR_ARRAY(desc_array, TYPE) \
+  G_STMT_START { \
+    if (desc_array) { \
+      for (i = 0; i < desc_array->len; i++) { \
+        g_ptr_array_add (demux->descriptor, \
+	    &g_array_index (desc_array, TYPE, i)); \
+      } \
+    } \
+  } G_STMT_END
+  FILL_DESCRIPTOR_ARRAY (demux->generic_descriptor,
+      MXFMetadataGenericDescriptor);
+  FILL_DESCRIPTOR_ARRAY (demux->file_descriptor, MXFMetadataFileDescriptor);
+  FILL_DESCRIPTOR_ARRAY (demux->generic_picture_essence_descriptor,
+      MXFMetadataGenericPictureEssenceDescriptor);
+  FILL_DESCRIPTOR_ARRAY (demux->cdci_picture_essence_descriptor,
+      MXFMetadataCDCIPictureEssenceDescriptor);
+  FILL_DESCRIPTOR_ARRAY (demux->rgba_picture_essence_descriptor,
+      MXFMetadataRGBAPictureEssenceDescriptor);
+  FILL_DESCRIPTOR_ARRAY (demux->mpeg_video_descriptor,
+      MXFMetadataMPEGVideoDescriptor);
+  FILL_DESCRIPTOR_ARRAY (demux->generic_sound_essence_descriptor,
+      MXFMetadataGenericSoundEssenceDescriptor);
+  FILL_DESCRIPTOR_ARRAY (demux->wave_audio_essence_descriptor,
+      MXFMetadataWaveAudioEssenceDescriptor);
+  FILL_DESCRIPTOR_ARRAY (demux->aes3_audio_essence_descriptor,
+      MXFMetadataAES3AudioEssenceDescriptor);
+  FILL_DESCRIPTOR_ARRAY (demux->multiple_descriptor,
+      MXFMetadataMultipleDescriptor);
+#undef FILL_DESCRIPTOR_ARRAY
   /* Fill in demux->package */
   demux->package = g_ptr_array_new ();
@@ -1347,9 +1309,8 @@
           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;
         }

------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you.  Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/

_______________________________________________
gstreamer-cvs-verbose mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs-verbose