[0.3.124] Add log for debug(close fd)

Change-Id: Ib75e36d1e2ad026571145adec713d05cdf9b0ad1

diff --git a/include/player_private.h b/include/player_private.h
index 7c023be..11e1d15 100644 (file)
--- a/include/player_private.h
+++ b/include/player_private.h
@@ -80,6 +80,16 @@ do { \
        } \
 } while (0)
 
+#define DEBUG_FD_NUM 10
+#define PLAYER_CLOSE_FD(fd) \
+do { \
+       if (fd > INVALID_DEFAULT_VALUE) { \
+               if (fd < DEBUG_FD_NUM) \
+                       LOGW("close tfd %d", fd); \
+               close(fd); \
+       } \
+} while (0)
+
 #define CONNECTION_RETRY 51
 #define CONNECTION_TIME_OUT 50 /* ms */
 #define CREATE_CB_TIME_OUT 400 /* ms */

diff --git a/packaging/capi-media-player.spec b/packaging/capi-media-player.spec
index a462131..57940a3 100644 (file)
--- a/packaging/capi-media-player.spec
+++ b/packaging/capi-media-player.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-player
 Summary:    A Media Player API
-Version:    0.3.123
+Version:    0.3.124
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/player.c b/src/player.c
index 3884d95..5541f2a 100644 (file)
--- a/src/player.c
+++ b/src/player.c
@@ -694,8 +694,8 @@ static void __capture_cb_handler(callback_cb_info_s *cb_info, _player_recv_data
        }
 
 EXIT:
-       if (recv_data->tfd[0] > INVALID_DEFAULT_VALUE)
-               close(recv_data->tfd[0]);
+       PLAYER_CLOSE_FD(recv_data->tfd[0]);
+
        memset(recv_data->tfd, INVALID_DEFAULT_VALUE, sizeof(recv_data->tfd));
 
        if (bo)
@@ -1008,10 +1008,9 @@ static void __media_packet_video_frame_cb_handler(callback_cb_info_s *cb_info, _
                media_packet_destroy(pkt);
        }
 
-       for (i = 0; i < MUSE_NUM_FD; i++) { /* if tsruf pool is enabled, bo_num can be zero. */
-               if (recv_data->tfd[i] > INVALID_DEFAULT_VALUE)
-                       close(recv_data->tfd[i]);
-       }
+       /* if tsruf pool is enabled, bo_num can be zero. */
+       for (i = 0; i < MUSE_NUM_FD; i++)
+               PLAYER_CLOSE_FD(recv_data->tfd[i]);
 
        for (i = 0; i < bo_num; i++) {
                if (bo[i])
@@ -1028,10 +1027,9 @@ ERROR:
        if (fin_data)
                g_free(fin_data);
 
-       for (i = 0; i < MUSE_NUM_FD; i++) { /* if tsruf pool is enabled, bo_num can be zero. */
-               if (recv_data->tfd[i] > INVALID_DEFAULT_VALUE)
-                       close(recv_data->tfd[i]);
-       }
+       /* if tsruf pool is enabled, bo_num can be zero. */
+       for (i = 0; i < MUSE_NUM_FD; i++)
+               PLAYER_CLOSE_FD(recv_data->tfd[i]);
 
        for (i = 0; i < bo_num; i++) {
                if (bo[i])
@@ -1134,8 +1132,8 @@ static void __media_packet_audio_frame_cb_handler(callback_cb_info_s *cb_info, _
        }
 
 EXIT:
-       if (recv_data->tfd[0] > INVALID_DEFAULT_VALUE)
-               close(recv_data->tfd[0]);
+       PLAYER_CLOSE_FD(recv_data->tfd[0]);
+
        memset(recv_data->tfd, INVALID_DEFAULT_VALUE, sizeof(recv_data->tfd));
 
        if (fmt)
@@ -2424,8 +2422,7 @@ int player_set_memory_buffer(player_h player, const void *data, int size)
        pc->push_media_stream = FALSE;
 
  EXIT:
-       if (tfd > INVALID_DEFAULT_VALUE)
-               close(tfd);
+       PLAYER_CLOSE_FD(tfd);
 
        tbm_bo_unref(bo);
 
@@ -3765,8 +3762,7 @@ EXIT:
 
        g_free(ret_buf);
 
-       if (tfd > INVALID_DEFAULT_VALUE)
-               close(tfd);
+       PLAYER_CLOSE_FD(tfd);
 
        if (CALLBACK_INFO(pc))
                pc->cb_info->tfd = INVALID_DEFAULT_VALUE;
@@ -4488,8 +4484,8 @@ int player_push_media_stream(player_h player, media_packet_h packet)
 
 #ifdef __UN_USED
 ERROR:
-       if (tfd > INVALID_DEFAULT_VALUE)
-               close(tfd);
+
+       PLAYER_CLOSE_FD(tfd);
 
        if (push_media.buf_type == PUSH_MEDIA_BUF_TYPE_TBM)
                tbm_bo_unref(bo);