mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-27 07:23:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

gstreamer playback: fix possible segfaults

Browse Source
This commit is contained in:
TangoCash
2017-11-07 13:21:24 +01:00
committed by Jacek Jendrzej
parent f170c38f10
commit a811b733d4
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libarmbox/playback_gst.cpp
View File

@@ -290,7 +290,8 @@ GstBusSyncReply Gst_bus_call(GstBus *bus, GstMessage *msg, gpointer user_data)
lt_info_c("%s:%s - /tmp/.id3coverart %d bytes written\n", FILENAME, __FUNCTION__, ret); lt_info_c("%s:%s - /tmp/.id3coverart %d bytes written\n", FILENAME, __FUNCTION__, ret);
} }
} }
gst_tag_list_unref(tags); if (tags)
gst_tag_list_unref(tags);
lt_debug_c( "%s:%s - GST_MESSAGE_INFO: update info tags\n", FILENAME, __FUNCTION__); //FIXME: how shall playback handle this event??? lt_debug_c( "%s:%s - GST_MESSAGE_INFO: update info tags\n", FILENAME, __FUNCTION__); //FIXME: how shall playback handle this event???
break; break;
} }
@@ -461,7 +462,8 @@ void cPlayback::Close(void)
// disconnect sync handler callback // disconnect sync handler callback
GstBus * bus = gst_pipeline_get_bus(GST_PIPELINE (m_gst_playbin)); GstBus * bus = gst_pipeline_get_bus(GST_PIPELINE (m_gst_playbin));
gst_bus_set_sync_handler(bus, NULL, NULL, NULL); gst_bus_set_sync_handler(bus, NULL, NULL, NULL);
gst_object_unref(bus); if (bus)
gst_object_unref(bus);
lt_info( "%s:%s - GST bus handler closed\n", FILENAME, __FUNCTION__); lt_info( "%s:%s - GST bus handler closed\n", FILENAME, __FUNCTION__);
} }
@@ -520,7 +522,8 @@ bool cPlayback::Start(char *filename, int /*vpid*/, int /*vtype*/, int /*apid*/,
mAudioStream = 0; mAudioStream = 0;
init_jump = -1; init_jump = -1;
gst_tag_list_unref(m_stream_tags); if (m_stream_tags)
gst_tag_list_unref(m_stream_tags);
m_stream_tags = NULL; m_stream_tags = NULL;
unlink("/tmp/.id3coverart"); unlink("/tmp/.id3coverart");
@@ -594,7 +597,8 @@ bool cPlayback::Start(char *filename, int /*vpid*/, int /*vtype*/, int /*apid*/,
//gstbus handler //gstbus handler
GstBus * bus = gst_pipeline_get_bus( GST_PIPELINE(m_gst_playbin) ); GstBus * bus = gst_pipeline_get_bus( GST_PIPELINE(m_gst_playbin) );
gst_bus_set_sync_handler(bus, Gst_bus_call, NULL, NULL); gst_bus_set_sync_handler(bus, Gst_bus_call, NULL, NULL);
gst_object_unref(bus); if (bus)
gst_object_unref(bus);
first = true; first = true;
@@ -896,7 +900,8 @@ void cPlayback::FindAllPids(int *apids, unsigned int *ac3flags, unsigned int *nu
g_signal_emit_by_name (m_gst_playbin, "get-audio-pad", i, &pad); g_signal_emit_by_name (m_gst_playbin, "get-audio-pad", i, &pad);
GstCaps * caps = gst_pad_get_current_caps(pad); GstCaps * caps = gst_pad_get_current_caps(pad);
gst_object_unref(pad); if (pad)
gst_object_unref(pad);
if (!caps) if (!caps)
continue; continue;
@@ -938,7 +943,8 @@ void cPlayback::FindAllPids(int *apids, unsigned int *ac3flags, unsigned int *nu
//return atPCM; //return atPCM;
ac3flags[i] = 0; ac3flags[i] = 0;
gst_caps_unref(caps); if (caps)
gst_caps_unref(caps);
//(ac3flags[i] > 2) ? ac3flags[i] = 1 : ac3flags[i] = 0; //(ac3flags[i] > 2) ? ac3flags[i] = 1 : ac3flags[i] = 0;