[1.0.1] Remove unused reference to fix mem leak 34/309234/1
authorEunhye Choi <eunhae1.choi@samsung.com>
Mon, 8 Apr 2024 01:53:46 +0000 (10:53 +0900)
committerEunhye Choi <eunhae1.choi@samsung.com>
Mon, 8 Apr 2024 01:53:46 +0000 (10:53 +0900)
Change-Id: I78b8acaf533629eae7d16508f44e2cd21c8fc098

packaging/libmm-player.spec
src/include/mm_player_priv.h
src/mm_player_gst.c
src/mm_player_priv.c

index b743301..18b2808 100644 (file)
@@ -1,6 +1,6 @@
 Name:       libmm-player
 Summary:    Multimedia Framework Player Library
-Version:    1.0.0
+Version:    1.0.1
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0
index 1861ffc..c5fbb44 100644 (file)
@@ -764,10 +764,6 @@ typedef struct {
        GCond subtitle_info_cond;
        GMutex subtitle_info_mutex;
 
-       /* stream collection */
-       GstStreamCollection *collection;
-       guint stream_notify_id;
-
        mmplayer_track_t track[MM_PLAYER_TRACK_TYPE_MAX];
 
        guint internal_text_idx;
index ea1bb61..01bf26a 100644 (file)
@@ -1936,30 +1936,6 @@ __mmplayer_dump_collection(GstStreamCollection * collection)
 }
 
 static void
-__mmplayer_stream_notify_cb(GstStreamCollection *collection,
-                       GstStream *stream, GParamSpec *pspec, gpointer data)
-{
-       LOGD ("Got stream-notify from stream %s for %s (collection %p)\n",
-                               gst_stream_get_stream_id(stream), pspec->name, collection);
-       if (g_str_equal(pspec->name, "caps")) {
-               GstCaps *caps = gst_stream_get_caps(stream);
-               MMPLAYER_LOG_GST_CAPS_TYPE(caps);
-               gst_caps_unref(caps);
-       }
-
-#ifdef __DEBUG__
-       if (g_str_equal (pspec->name, "tags")) {
-               GstTagList *tags = gst_stream_get_tags(stream);
-               if (tags) {
-                       LOGD ("  tags:\n");
-                       gst_tag_list_foreach(tags, __mmplayer_print_tag_foreach, GUINT_TO_POINTER(MMPLAYER_TAG_INDENT));
-                       gst_tag_list_unref(tags);
-               }
-       }
-#endif
-}
-
-static void
 __mmplayer_gst_bus_msg_callback(GstMessage *msg, gpointer data)
 {
        mmplayer_t *player = (mmplayer_t *)(data);
@@ -2071,15 +2047,6 @@ __mmplayer_gst_bus_msg_callback(GstMessage *msg, gpointer data)
                gst_message_parse_stream_collection(msg, &collection);
                if (collection) {
                        __mmplayer_dump_collection(collection);
-                       if (player->collection && player->stream_notify_id) {
-                               g_signal_handler_disconnect(player->collection, player->stream_notify_id);
-                               player->stream_notify_id = 0;
-                       }
-                       gst_object_replace((GstObject **)&player->collection, (GstObject *)collection);
-                       if (player->collection) {
-                               player->stream_notify_id = g_signal_connect(player->collection, "stream-notify",
-                                                       (GCallback)__mmplayer_stream_notify_cb, player);
-                       }
                        gst_object_unref(collection);
                }
        } break;
@@ -2100,7 +2067,7 @@ __mmplayer_gst_bus_msg_callback(GstMessage *msg, gpointer data)
                                        gst_object_unref(stream);
                                        break;
                                }
-                               LOGD ("  Stream #%d : %s\n", i, gst_stream_get_stream_id(stream));
+                               LOGD("  Stream #%d : %s\n", i, gst_stream_get_stream_id(stream));
                                if (player->track[type].active_track_index == INVALID_TRACK_INDEX) {
                                        int stream_index = INVALID_TRACK_INDEX;
                                        if (_mmplayer_get_track_index(player, type, stream, &stream_index) == MM_ERROR_NONE) {
index ba9208a..dd05d4c 100644 (file)
@@ -1297,11 +1297,11 @@ __mmplayer_gst_make_selector(mmplayer_t *player, main_element_id_e elem_idx, mmp
                LOGE("failed to add selector to pipeline");
 
                if (player->track[stream_type].block_id != 0)
-                 gst_pad_remove_probe (srcpad, player->track[stream_type].block_id);
+                 gst_pad_remove_probe(srcpad, player->track[stream_type].block_id);
                player->track[stream_type].block_id = 0;
 
                if (player->track[stream_type].event_probe_id != 0)
-                 gst_pad_remove_probe (srcpad, player->track[stream_type].event_probe_id);
+                 gst_pad_remove_probe(srcpad, player->track[stream_type].event_probe_id);
                player->track[stream_type].event_probe_id = 0;
 
                gst_object_unref(GST_OBJECT(srcpad));