[tracker/gstreamer-with-dlna-0.10: 10/12] tracker-extract, gstreamer: avoid code duplication

[Carlos Garnacho <carlosg src gnome org>]

commit 9c69204e4175dc585a9750eff8d95d79bc201feb
Author: Aleksander Morgado <aleksander lanedo com>
Date:   Wed Jul 13 11:57:53 2011 +0200

    tracker-extract,gstreamer: avoid code duplication

 src/tracker-extract/tracker-extract-gstreamer.c |  186 +++++++++--------------
 1 files changed, 73 insertions(+), 113 deletions(-)
---
diff --git a/src/tracker-extract/tracker-extract-gstreamer.c b/src/tracker-extract/tracker-extract-gstreamer.c
index a007a43..3571347 100644
--- a/src/tracker-extract/tracker-extract-gstreamer.c
+++ b/src/tracker-extract/tracker-extract-gstreamer.c
@@ -170,15 +170,10 @@ static void extract_gstreamer_guess (const gchar          *uri,
 static void tagreadbin_extract_stream_metadata (MetadataExtractor    *extractor,
                                                 const gchar          *uri,
                                                 TrackerSparqlBuilder *metadata);
-#elif defined(GSTREAMER_BACKEND_DECODEBIN2)
-static void decodebin2_extract_stream_metadata (MetadataExtractor    *extractor,
-                                                const gchar          *uri,
-                                                TrackerSparqlBuilder *metadata);
-#elif defined(GSTREAMER_BACKEND_DISCOVERER) ||	  \
-	defined(GSTREAMER_BACKEND_GUPNP_DLNA)
-static void discoverer_extract_stream_metadata (MetadataExtractor    *extractor,
-                                                const gchar          *uri,
-                                                TrackerSparqlBuilder *metadata);
+#else /* DECODEBIN2/DISCOVERER/GUPnP-DLNA */
+static void common_extract_stream_metadata (MetadataExtractor    *extractor,
+                                            const gchar          *uri,
+                                            TrackerSparqlBuilder *metadata);
 #endif
 
 static TrackerExtractData data[] = {
@@ -463,7 +458,8 @@ extract_metadata (MetadataExtractor      *extractor,
 
 		/* Try to guess content type */
 		if (extractor->mime == EXTRACT_MIME_GUESS) {
-#if defined(GSTREAMER_BACKEND_TAGREADBIN) || defined(GSTREAMER_BACKEND_DECODEBIN2)
+#if defined(GSTREAMER_BACKEND_TAGREADBIN) ||	  \
+	defined(GSTREAMER_BACKEND_DECODEBIN2)
 			char *video_codec = NULL, *audio_codec = NULL;
 
 			gst_tag_list_get_string (extractor->tagcache, GST_TAG_VIDEO_CODEC, &video_codec);
@@ -828,10 +824,8 @@ extract_metadata (MetadataExtractor      *extractor,
 
 #if defined(GSTREAMER_BACKEND_TAGREADBIN)
 	tagreadbin_extract_stream_metadata (extractor, uri, metadata);
-#elif defined(GSTREAMER_BACKEND_DECODEBIN2)
-	decodebin2_extract_stream_metadata (extractor, uri, metadata);
-#else /* DISCOVERER/GUPnP-DLNA */
-	discoverer_extract_stream_metadata (extractor, uri, metadata);
+#else /* DECODEBIN2/DISCOVERER/GUPnP-DLNA */
+	common_extract_stream_metadata (extractor, uri, metadata);
 #endif
 
 	if (extractor->mime == EXTRACT_MIME_AUDIO) {
@@ -839,6 +833,71 @@ extract_metadata (MetadataExtractor      *extractor,
 	}
 }
 
+#if defined(GSTREAMER_BACKEND_DISCOVERER) ||	  \
+	defined(GSTREAMER_BACKEND_DECODEBIN2) ||      \
+	defined(GSTREAMER_BACKEND_GUPNP_DLNA)
+static void
+common_extract_stream_metadata (MetadataExtractor    *extractor,
+                                const gchar          *uri,
+                                TrackerSparqlBuilder *metadata)
+{
+	if (extractor->mime == EXTRACT_MIME_AUDIO ||
+		extractor->mime == EXTRACT_MIME_VIDEO) {
+		if (extractor->audio_channels >= 0) {
+			tracker_sparql_builder_predicate (metadata, "nfo:channels");
+			tracker_sparql_builder_object_int64 (metadata, extractor->audio_channels);
+		}
+
+		if (extractor->audio_samplerate >= 0) {
+			tracker_sparql_builder_predicate (metadata, "nfo:sampleRate");
+			tracker_sparql_builder_object_int64 (metadata, extractor->audio_samplerate);
+		}
+
+		if (extractor->duration >= 0) {
+			tracker_sparql_builder_predicate (metadata, "nfo:duration");
+			tracker_sparql_builder_object_int64 (metadata, extractor->duration);
+		}
+	}
+
+	if (extractor->mime == EXTRACT_MIME_VIDEO) {
+		if (extractor->video_fps >= 0) {
+			tracker_sparql_builder_predicate (metadata, "nfo:frameRate");
+			tracker_sparql_builder_object_double (metadata, (gdouble)extractor->video_fps);
+		}
+	}
+
+	if (extractor->mime == EXTRACT_MIME_IMAGE ||
+		extractor->mime == EXTRACT_MIME_SVG ||
+	    extractor->mime == EXTRACT_MIME_VIDEO) {
+
+		if (extractor->width) {
+			tracker_sparql_builder_predicate (metadata, "nfo:width");
+			tracker_sparql_builder_object_int64 (metadata, extractor->width);
+		}
+
+		if (extractor->height >= 0) {
+			tracker_sparql_builder_predicate (metadata, "nfo:height");
+			tracker_sparql_builder_object_int64 (metadata, extractor->height);
+		}
+
+		if (extractor->aspect_ratio >= 0) {
+			tracker_sparql_builder_predicate (metadata, "nfo:aspectRatio");
+			tracker_sparql_builder_object_double (metadata, (gdouble)extractor->aspect_ratio);
+		}
+	}
+
+#if defined(GSTREAMER_BACKEND_GUPNP_DLNA)
+	if (extractor->dlna_profile) {
+		tracker_sparql_builder_predicate (metadata, "nmm:dlnaProfile");
+		tracker_sparql_builder_object_string (metadata, extractor->dlna_profile);
+	} else {
+		g_debug ("No DLNA profile for file '%s'", uri);
+	}
+#endif
+}
+
+#endif
+
 /* ----------------------- Discoverer/GUPnP-DLNA specific implementation --------------- */
 
 #if defined(GSTREAMER_BACKEND_DISCOVERER) ||	  \
@@ -971,64 +1030,6 @@ discoverer_init_and_run (MetadataExtractor *extractor,
 	return TRUE;
 }
 
-static void
-discoverer_extract_stream_metadata (MetadataExtractor    *extractor,
-                                    const gchar          *uri,
-                                    TrackerSparqlBuilder *metadata)
-{
-	if (extractor->mime == EXTRACT_MIME_AUDIO ||
-		extractor->mime == EXTRACT_MIME_VIDEO) {
-		if (extractor->audio_channels >= 0) {
-			tracker_sparql_builder_predicate (metadata, "nfo:channels");
-			tracker_sparql_builder_object_int64 (metadata, extractor->audio_channels);
-		}
-
-		if (extractor->audio_samplerate >= 0) {
-			tracker_sparql_builder_predicate (metadata, "nfo:sampleRate");
-			tracker_sparql_builder_object_int64 (metadata, extractor->audio_samplerate);
-		}
-
-		if (extractor->duration >= 0) {
-			tracker_sparql_builder_predicate (metadata, "nfo:duration");
-			tracker_sparql_builder_object_int64 (metadata, extractor->duration);
-		}
-	}
-
-	if (extractor->mime == EXTRACT_MIME_VIDEO) {
-		if (extractor->video_fps >= 0) {
-			tracker_sparql_builder_predicate (metadata, "nfo:frameRate");
-			tracker_sparql_builder_object_double (metadata, (gdouble)extractor->video_fps);
-		}
-	}
-
-	if (extractor->mime == EXTRACT_MIME_IMAGE ||
-		extractor->mime == EXTRACT_MIME_SVG ||
-	    extractor->mime == EXTRACT_MIME_VIDEO) {
-
-		if (extractor->width) {
-			tracker_sparql_builder_predicate (metadata, "nfo:width");
-			tracker_sparql_builder_object_int64 (metadata, extractor->width);
-		}
-
-		if (extractor->height >= 0) {
-			tracker_sparql_builder_predicate (metadata, "nfo:height");
-			tracker_sparql_builder_object_int64 (metadata, extractor->height);
-		}
-
-		if (extractor->aspect_ratio >= 0) {
-			tracker_sparql_builder_predicate (metadata, "nfo:aspectRatio");
-			tracker_sparql_builder_object_double (metadata, (gdouble)extractor->aspect_ratio);
-		}
-	}
-
-#if defined(GSTREAMER_BACKEND_GUPNP_DLNA)
-	if (extractor->dlna_profile) {
-		tracker_sparql_builder_predicate (metadata, "nmm:dlnaProfile");
-		tracker_sparql_builder_object_string (metadata, extractor->dlna_profile);
-	}
-#endif
-}
-
 #endif /* defined(GSTREAMER_BACKEND_DISCOVERER) || defined(GSTREAMER_BACKEND_GUPNP_DLNA) */
 
 /* --------------- Common Tagreadbin and Decodebin2 implementation ---------- */
@@ -1198,47 +1199,6 @@ add_uint_info (TrackerSparqlBuilder *metadata,
 }
 
 static void
-decodebin2_extract_stream_metadata (MetadataExtractor    *extractor,
-                                    const gchar          *uri,
-                                    TrackerSparqlBuilder *metadata)
-{
-	if (extractor->mime != EXTRACT_MIME_IMAGE &&
-	    extractor->mime != EXTRACT_MIME_SVG) {
-		if (extractor->audio_channels >= 0) {
-			add_uint_info (metadata, uri, "nfo:channels", extractor->audio_channels);
-		}
-
-		if (extractor->audio_samplerate >= 0) {
-			add_uint_info (metadata, uri, "nfo:sampleRate", extractor->audio_samplerate);
-		}
-
-		if (extractor->duration >= 0) {
-			add_int64_info (metadata, uri, "nfo:duration", extractor->duration);
-		}
-	} else {
-		if (extractor->aspect_ratio >= 0) {
-			add_uint_info (metadata, uri, "nfo:aspectRatio", (uint)extractor->aspect_ratio);
-		}
-	}
-
-	if (extractor->height >= 0) {
-		add_uint_info (metadata, uri, "nfo:height", extractor->height);
-	}
-
-	if (extractor->width >= 0) {
-		add_uint_info (metadata, uri, "nfo:width", extractor->width);
-	}
-
-	if (extractor->mime == EXTRACT_MIME_VIDEO) {
-		if (extractor->video_fps >= 0) {
-			add_uint_info (metadata,
-			               uri, "nfo:frameRate",
-			               extractor->video_fps);
-		}
-	}
-}
-
-static void
 decodebin2_unlink_fsink (void *obj,
                          void *data)
 {