move gchar * sourceName = gst_object_get_name(source);

Origin commit data
------------------
Branch: master
Commit: f9daec2090
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-10 (Fri, 10 Nov 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2017-11-10 16:17:40 +01:00
committed by TangoCash
parent b75c67db53
commit ce9bbe1248

View File

@@ -188,8 +188,6 @@ void playbinNotifySource(GObject *object, GParamSpec *param_spec, gpointer user_
GstBusSyncReply Gst_bus_call(GstBus *bus, GstMessage *msg, gpointer user_data) GstBusSyncReply Gst_bus_call(GstBus *bus, GstMessage *msg, gpointer user_data)
{ {
gchar * sourceName;
// source // source
GstObject * source; GstObject * source;
source = GST_MESSAGE_SRC(msg); source = GST_MESSAGE_SRC(msg);
@@ -197,8 +195,6 @@ GstBusSyncReply Gst_bus_call(GstBus *bus, GstMessage *msg, gpointer user_data)
if (!GST_IS_OBJECT(source)) if (!GST_IS_OBJECT(source))
return GST_BUS_DROP; return GST_BUS_DROP;
sourceName = gst_object_get_name(source);
switch (GST_MESSAGE_TYPE(msg)) switch (GST_MESSAGE_TYPE(msg))
{ {
case GST_MESSAGE_EOS: case GST_MESSAGE_EOS:
@@ -214,6 +210,7 @@ GstBusSyncReply Gst_bus_call(GstBus *bus, GstMessage *msg, gpointer user_data)
GError *err; GError *err;
gst_message_parse_error(msg, &err, &debug); gst_message_parse_error(msg, &err, &debug);
g_free (debug); g_free (debug);
gchar * sourceName = gst_object_get_name(source);
lt_info_c( "%s:%s - GST_MESSAGE_ERROR: %s (%i) from %s\n", FILENAME, __FUNCTION__, err->message, err->code, sourceName ); lt_info_c( "%s:%s - GST_MESSAGE_ERROR: %s (%i) from %s\n", FILENAME, __FUNCTION__, err->message, err->code, sourceName );
if ( err->domain == GST_STREAM_ERROR ) if ( err->domain == GST_STREAM_ERROR )
{ {
@@ -226,6 +223,8 @@ GstBusSyncReply Gst_bus_call(GstBus *bus, GstMessage *msg, gpointer user_data)
} }
} }
g_error_free(err); g_error_free(err);
if(sourceName)
g_free(sourceName);
end_eof = 1; // NOTE: just to exit end_eof = 1; // NOTE: just to exit
@@ -241,8 +240,12 @@ GstBusSyncReply Gst_bus_call(GstBus *bus, GstMessage *msg, gpointer user_data)
g_free (debug); g_free (debug);
if ( inf->domain == GST_STREAM_ERROR && inf->code == GST_STREAM_ERROR_DECODE ) if ( inf->domain == GST_STREAM_ERROR && inf->code == GST_STREAM_ERROR_DECODE )
{ {
gchar * sourceName = gst_object_get_name(source);
if ( g_strrstr(sourceName, "videosink") ) if ( g_strrstr(sourceName, "videosink") )
lt_info_c( "%s:%s - GST_MESSAGE_INFO: videosink\n", FILENAME, __FUNCTION__ ); //FIXME: how shall playback handle this event??? lt_info_c( "%s:%s - GST_MESSAGE_INFO: videosink\n", FILENAME, __FUNCTION__ ); //FIXME: how shall playback handle this event???
if(sourceName)
g_free(sourceName);
} }
g_error_free(inf); g_error_free(inf);
break; break;
@@ -393,8 +396,6 @@ GstBusSyncReply Gst_bus_call(GstBus *bus, GstMessage *msg, gpointer user_data)
default: default:
break; break;
} }
if(sourceName)
g_free(sourceName);
return GST_BUS_DROP; return GST_BUS_DROP;
} }