[brasero/gnome-2-26] Fix #582461 – Brasero hangs at normalizing tracks

[Philippe Rouquier <philippr src gnome org>]

commit abb976fbd7d6834814091288325ac80d8f83c223
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Mon Jun 29 09:28:57 2009 +0200

    Fix #582461 â?? Brasero hangs at normalizing tracks

 src/plugins/transcode/burn-normalize.c |  411 ++++++++++++++++----------------
 1 files changed, 206 insertions(+), 205 deletions(-)
---
diff --git a/src/plugins/transcode/burn-normalize.c b/src/plugins/transcode/burn-normalize.c
index 9ba967d..aadcd64 100755
--- a/src/plugins/transcode/burn-normalize.c
+++ b/src/plugins/transcode/burn-normalize.c
@@ -48,7 +48,6 @@ struct _BraseroNormalizePrivate
 	GstElement *analysis;
 	GstElement *decode;
 	GstElement *resample;
-	GstElement *source;
 
 	GSList *tracks;
 	BraseroTrack *track;
@@ -69,79 +68,248 @@ brasero_normalize_bus_messages (GstBus *bus,
 				GstMessage *msg,
 				BraseroNormalize *normalize);
 
+static void
+brasero_normalize_stop_pipeline (BraseroNormalize *normalize)
+{
+	BraseroNormalizePrivate *priv;
+
+	priv = BRASERO_NORMALIZE_PRIVATE (normalize);
+	if (!priv->pipeline)
+		return;
+
+	gst_element_set_state (priv->pipeline, GST_STATE_NULL);
+	gst_object_unref (GST_OBJECT (priv->pipeline));
+	priv->pipeline = NULL;
+	priv->resample = NULL;
+	priv->analysis = NULL;
+	priv->decode = NULL;
+}
+
+static void
+brasero_normalize_new_decoded_pad_cb (GstElement *decode,
+				      GstPad *pad,
+				      gboolean arg2,
+				      BraseroNormalize *normalize)
+{
+	GstPad *sink;
+	GstCaps *caps;
+	GstStructure *structure;
+	BraseroNormalizePrivate *priv;
+
+	priv = BRASERO_NORMALIZE_PRIVATE (normalize);
+
+	sink = gst_element_get_pad (priv->resample, "sink");
+	if (GST_PAD_IS_LINKED (sink)) {
+		BRASERO_JOB_LOG (normalize, "New decoded pad already linked");
+		return;
+	}
+
+	/* make sure we only have audio */
+	caps = gst_pad_get_caps (pad);
+	if (!caps)
+		return;
+
+	structure = gst_caps_get_structure (caps, 0);
+	if (structure && g_strrstr (gst_structure_get_name (structure), "audio")) {
+		if (gst_pad_link (pad, sink) != GST_PAD_LINK_OK) {
+			BRASERO_JOB_LOG (normalize, "New decoded pad can't be linked");
+			brasero_job_error (BRASERO_JOB (normalize), NULL);
+		}
+		else
+			BRASERO_JOB_LOG (normalize, "New decoded pad linked");
+	}
+	else
+		BRASERO_JOB_LOG (normalize, "New decoded pad with unsupported stream time");
+		
+	gst_object_unref (sink);
+	gst_caps_unref (caps);
+}
+
 static gboolean
-brasero_normalize_set_next_track (BraseroJob *job,
-				  BraseroTrack *track,
+brasero_normalize_build_pipeline (BraseroNormalize *normalize,
+                                  const gchar *uri,
+                                  GstElement *analysis,
 				  GError **error)
 {
-	gchar *uri;
 	GstBus *bus = NULL;
 	GstElement *source;
+	GstElement *decode;
+	GstElement *pipeline;
+	GstElement *sink = NULL;
+	GstElement *convert = NULL;
+	GstElement *resample = NULL;
 	BraseroNormalizePrivate *priv;
 
-	priv = BRASERO_NORMALIZE_PRIVATE (job);
+	priv = BRASERO_NORMALIZE_PRIVATE (normalize);
 
-	/* destroy previous source */
-	if (priv->source) {
-		gst_element_unlink (priv->source, priv->decode);
-		gst_bin_remove (GST_BIN (priv->pipeline), priv->source);
-		priv->source = NULL;
-	}
+	BRASERO_JOB_LOG (normalize, "Creating new pipeline");
 
-	/* create a new one */
-	uri = brasero_track_get_audio_source (track, TRUE);
+	/* create filesrc ! decodebin ! audioresample ! audioconvert ! rganalysis ! fakesink */
+	pipeline = gst_pipeline_new (NULL);
+	priv->pipeline = pipeline;
+
+	/* a new source is created */
 	source = gst_element_make_from_uri (GST_URI_SRC, uri, NULL);
 	if (source == NULL) {
-		g_free (uri);
 		g_set_error (error,
 			     BRASERO_BURN_ERROR,
 			     BRASERO_BURN_ERROR_GENERAL,
 			     _("%s element could not be created"),
 			     "\"Source\"");
-		return FALSE;
+		goto error;
 	}
 	gst_bin_add (GST_BIN (priv->pipeline), source);
 	g_object_set (source,
 		      "typefind", FALSE,
 		      NULL);
 
-	priv->source = source;
-	if (!gst_element_link_many (source, priv->decode, NULL)) {
-		BRASERO_JOB_LOG (job, "Elements could not be linked");
-		return FALSE;
+	/* decode */
+	decode = gst_element_factory_make ("decodebin", NULL);
+	if (decode == NULL) {
+		g_set_error (error,
+			     BRASERO_BURN_ERROR,
+			     BRASERO_BURN_ERROR_GENERAL,
+			     _("%s element could not be created"),
+			     "\"Decodebin\"");
+		goto error;
+	}
+	gst_bin_add (GST_BIN (pipeline), decode);
+	priv->decode = decode;
+
+	if (!gst_element_link (source, decode)) {
+		BRASERO_JOB_LOG (normalize, "Elements could not be linked");
+		goto error;
 	}
 
-	/* reconnect to the bus */	
+	/* audioconvert */
+	convert = gst_element_factory_make ("audioconvert", NULL);
+	if (convert == NULL) {
+		g_set_error (error,
+			     BRASERO_BURN_ERROR,
+			     BRASERO_BURN_ERROR_GENERAL,
+			     _("%s element could not be created"),
+			     "\"Audioconvert\"");
+		goto error;
+	}
+	gst_bin_add (GST_BIN (pipeline), convert);
+
+	/* audioresample */
+	resample = gst_element_factory_make ("audioresample", NULL);
+	if (resample == NULL) {
+		g_set_error (error,
+			     BRASERO_BURN_ERROR,
+			     BRASERO_BURN_ERROR_GENERAL,
+			     _("%s element could not be created"),
+			     "\"Audioresample\"");
+		goto error;
+	}
+	gst_bin_add (GST_BIN (pipeline), resample);
+	priv->resample = resample;
+
+	/* rganalysis: set the number of tracks to be expected */
+	priv->analysis = analysis;
+	gst_bin_add (GST_BIN (pipeline), analysis);
+
+	/* sink */
+	sink = gst_element_factory_make ("fakesink", NULL);
+	if (!sink) {
+		g_set_error (error,
+			     BRASERO_BURN_ERROR,
+			     BRASERO_BURN_ERROR_GENERAL,
+			     _("%s element could not be created"),
+			     "\"Fakesink\"");
+		goto error;
+	}
+	gst_bin_add (GST_BIN (pipeline), sink);
+	g_object_set (sink,
+		      "sync", FALSE,
+		      NULL);
+
+	/* link everything */
+	g_signal_connect (G_OBJECT (decode),
+			  "new-decoded-pad",
+			  G_CALLBACK (brasero_normalize_new_decoded_pad_cb),
+			  normalize);
+	gst_element_link_many (resample,
+			       convert,
+			       analysis,
+			       sink,
+			       NULL);
+
+	/* connect to the bus */	
 	bus = gst_pipeline_get_bus (GST_PIPELINE (priv->pipeline));
 	gst_bus_add_watch (bus,
 			   (GstBusFunc) brasero_normalize_bus_messages,
-			   job);
+			   normalize);
 	gst_object_unref (bus);
 
-	priv->track = track;
-
-	BRASERO_JOB_LOG (job, "Analysing track %s", uri);
-	g_free (uri);
+	gst_element_set_state (priv->pipeline, GST_STATE_PLAYING);
 
 	return TRUE;
+
+error:
+
+	if (error && (*error))
+		BRASERO_JOB_LOG (normalize,
+				 "can't create object : %s \n",
+				 (*error)->message);
+
+	gst_object_unref (GST_OBJECT (pipeline));
+	return FALSE;
 }
 
-static void
-brasero_normalize_stop_pipeline (BraseroNormalize *normalize)
+static gboolean
+brasero_normalize_set_next_track (BraseroJob *job,
+				  BraseroTrack *track,
+				  GError **error)
 {
+	gchar *uri;
+	GstElement *analysis;
 	BraseroNormalizePrivate *priv;
 
-	priv = BRASERO_NORMALIZE_PRIVATE (normalize);
-	if (!priv->pipeline)
-		return;
+	priv = BRASERO_NORMALIZE_PRIVATE (job);
 
-	gst_element_set_state (priv->pipeline, GST_STATE_NULL);
-	gst_object_unref (GST_OBJECT (priv->pipeline));
-	priv->pipeline = NULL;
-	priv->resample = NULL;
-	priv->analysis = NULL;
-	priv->decode = NULL;
-	priv->source = NULL;
+	if (!priv->analysis) {
+		analysis = gst_element_factory_make ("rganalysis", NULL);
+		if (analysis == NULL) {
+			g_set_error (error,
+				     BRASERO_BURN_ERROR,
+				     BRASERO_BURN_ERROR_GENERAL,
+				     _("%s element could not be created"),
+				     "\"Rganalysis\"");
+			return FALSE;
+		}
+
+		g_object_set (analysis,
+			      "num-tracks", g_slist_length (priv->tracks),
+			      NULL);
+	}
+	else {
+		/* destroy previous pipeline but save our plugin */
+		analysis = g_object_ref (priv->analysis);
+
+		/* NOTE: why lock state? because otherwise analysis would lose all 
+		 * information about tracks already analysed by going into the NULL
+		 * state. */
+		gst_element_set_locked_state (analysis, TRUE);
+		gst_bin_remove (GST_BIN (priv->pipeline), analysis);
+		brasero_normalize_stop_pipeline (BRASERO_NORMALIZE (job));
+		gst_element_set_locked_state (analysis, FALSE);
+	}
+
+	/* create a new one */
+	priv->track = track;
+	uri = brasero_track_get_audio_source (track, TRUE);
+	BRASERO_JOB_LOG (job, "Analysing track %s", uri);
+
+	if (!brasero_normalize_build_pipeline (BRASERO_NORMALIZE (job), uri, analysis, error)) {
+		g_free (uri);
+		return FALSE;
+	}
+
+	g_free (uri);
+
+	return TRUE;
 }
 
 static BraseroBurnResult
@@ -251,22 +419,14 @@ brasero_normalize_song_end_reached (BraseroNormalize *normalize)
 	}
 
 	/* jump to next track */
-	/* NOTE: why lock state? because otherwise analysis would lose all 
-	 * information about tracks already analysed by going into the NULL
-	 * state. */
-	gst_element_set_locked_state (priv->analysis, TRUE);
-	gst_element_set_state (priv->pipeline, GST_STATE_NULL);
+
 
 	track = priv->tracks->data;
 	priv->tracks = g_slist_remove (priv->tracks, track);
 	if (!brasero_normalize_set_next_track (BRASERO_JOB (normalize), track, &error)) {
-		gst_element_set_locked_state (priv->analysis, FALSE);
 		brasero_job_error (BRASERO_JOB (normalize), error);
 		return;
 	}
-
-	gst_element_set_state (priv->pipeline, GST_STATE_PLAYING);
-	gst_element_set_locked_state (priv->analysis, FALSE);
 }
 
 static gboolean
@@ -311,157 +471,6 @@ brasero_normalize_bus_messages (GstBus *bus,
 	return TRUE;
 }
 
-static void
-brasero_normalize_new_decoded_pad_cb (GstElement *decode,
-				      GstPad *pad,
-				      gboolean arg2,
-				      BraseroNormalize *normalize)
-{
-	GstPad *sink;
-	GstCaps *caps;
-	GstStructure *structure;
-	BraseroNormalizePrivate *priv;
-
-	priv = BRASERO_NORMALIZE_PRIVATE (normalize);
-
-	sink = gst_element_get_pad (priv->resample, "sink");
-	if (GST_PAD_IS_LINKED (sink)) {
-		BRASERO_JOB_LOG (normalize, "New decoded pad already linked");
-		return;
-	}
-
-	/* make sure we only have audio */
-	caps = gst_pad_get_caps (pad);
-	if (!caps)
-		return;
-
-	structure = gst_caps_get_structure (caps, 0);
-	if (structure && g_strrstr (gst_structure_get_name (structure), "audio")) {
-		if (gst_pad_link (pad, sink) != GST_PAD_LINK_OK) {
-			BRASERO_JOB_LOG (normalize, "New decoded pad can't be linked");
-			brasero_job_error (BRASERO_JOB (normalize), NULL);
-		}
-		else
-			BRASERO_JOB_LOG (normalize, "New decoded pad linked");
-	}
-	else
-		BRASERO_JOB_LOG (normalize, "New decoded pad with unsupported stream time");
-		
-	gst_object_unref (sink);
-	gst_caps_unref (caps);
-}
-
-static gboolean
-brasero_normalize_build_pipeline (BraseroNormalize *normalize,
-				  GError **error)
-{
-	GstElement *decode;
-	GstElement *pipeline;
-	GstElement *sink = NULL;
-	GstElement *convert = NULL;
-	GstElement *analysis = NULL;
-	GstElement *resample = NULL;
-	BraseroNormalizePrivate *priv;
-
-	priv = BRASERO_NORMALIZE_PRIVATE (normalize);
-
-	BRASERO_JOB_LOG (normalize, "Creating new pipeline");
-
-	/* create filesrc ! decodebin ! audioresample ! audioconvert ! rganalysis ! fakesink */
-	pipeline = gst_pipeline_new (NULL);
-	priv->pipeline = pipeline;
-
-	/* NOTE: a new source is created at start of every track */
-
-	/* decode */
-	decode = gst_element_factory_make ("decodebin", NULL);
-	if (decode == NULL) {
-		g_set_error (error,
-			     BRASERO_BURN_ERROR,
-			     BRASERO_BURN_ERROR_GENERAL,
-			     _("%s element could not be created"),
-			     "\"Decodebin\"");
-		goto error;
-	}
-	gst_bin_add (GST_BIN (pipeline), decode);
-	priv->decode = decode;
-
-	/* audioconvert */
-	convert = gst_element_factory_make ("audioconvert", NULL);
-	if (convert == NULL) {
-		g_set_error (error,
-			     BRASERO_BURN_ERROR,
-			     BRASERO_BURN_ERROR_GENERAL,
-			     _("%s element could not be created"),
-			     "\"Audioconvert\"");
-		goto error;
-	}
-	gst_bin_add (GST_BIN (pipeline), convert);
-
-	/* audioresample */
-	resample = gst_element_factory_make ("audioresample", NULL);
-	if (resample == NULL) {
-		g_set_error (error,
-			     BRASERO_BURN_ERROR,
-			     BRASERO_BURN_ERROR_GENERAL,
-			     _("%s element could not be created"),
-			     "\"Audioresample\"");
-		goto error;
-	}
-	gst_bin_add (GST_BIN (pipeline), resample);
-	priv->resample = resample;
-
-	/* rganalysis: set the number of tracks to be expected */
-	analysis = gst_element_factory_make ("rganalysis", NULL);
-	if (analysis == NULL) {
-		g_set_error (error,
-			     BRASERO_BURN_ERROR,
-			     BRASERO_BURN_ERROR_GENERAL,
-			     _("%s element could not be created"),
-			     "\"Rganalysis\"");
-		goto error;
-	}
-	priv->analysis = analysis;
-	gst_bin_add (GST_BIN (pipeline), analysis);
-
-	/* sink */
-	sink = gst_element_factory_make ("fakesink", NULL);
-	if (!sink) {
-		g_set_error (error,
-			     BRASERO_BURN_ERROR,
-			     BRASERO_BURN_ERROR_GENERAL,
-			     _("%s element could not be created"),
-			     "\"Fakesink\"");
-		goto error;
-	}
-	gst_bin_add (GST_BIN (pipeline), sink);
-	g_object_set (sink,
-		      "sync", FALSE,
-		      NULL);
-
-	/* link everything */
-	g_signal_connect (G_OBJECT (decode),
-			  "new-decoded-pad",
-			  G_CALLBACK (brasero_normalize_new_decoded_pad_cb),
-			  normalize);
-	gst_element_link_many (resample,
-			       convert,
-			       analysis,
-			       sink,
-			       NULL);
-	return TRUE;
-
-error:
-
-	if (error && (*error))
-		BRASERO_JOB_LOG (normalize,
-				 "can't create object : %s \n",
-				 (*error)->message);
-
-	gst_object_unref (GST_OBJECT (pipeline));
-	return FALSE;
-}
-
 static BraseroBurnResult
 brasero_normalize_start (BraseroJob *job,
 			 GError **error)
@@ -483,13 +492,6 @@ brasero_normalize_start (BraseroJob *job,
 	track = priv->tracks->data;
 	priv->tracks = g_slist_remove (priv->tracks, track);
 
-	if (!brasero_normalize_build_pipeline (BRASERO_NORMALIZE (job), error))
-		return BRASERO_BURN_ERR;
-
-	g_object_set (priv->analysis,
-		      "num-tracks", g_slist_length (priv->tracks),
-		      NULL);
-
 	if (!brasero_normalize_set_next_track (job, track, error))
 		return BRASERO_BURN_ERR;
 
@@ -498,7 +500,6 @@ brasero_normalize_start (BraseroJob *job,
 					BRASERO_BURN_ACTION_ANALYSING,
 					_("Normalizing tracks"),
 					FALSE);
-	gst_element_set_state (priv->pipeline, GST_STATE_PLAYING);
 
 	return BRASERO_BURN_OK;
 }