[0.6.89] Fix getting orientation bug when capture video

And remove unused fucntion

Change-Id: I0d5e7311d7715aaab12b9e65eae7605f5e1680ad

diff --git a/packaging/libmm-player.spec b/packaging/libmm-player.spec
index c8014963187f0b2443b08ff784813d9e473e9f4c..60836a0bda83c0cef3c56966003a6a13d6ba03ad 100644 (file)
--- a/packaging/libmm-player.spec
+++ b/packaging/libmm-player.spec
@@ -1,6 +1,6 @@
 Name:       libmm-player
 Summary:    Multimedia Framework Player Library
-Version:    0.6.88
+Version:    0.6.89
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0

diff --git a/src/include/mm_player.h b/src/include/mm_player.h
index ee1fd6b446fcc7801a4e6b3a4432cfc2b4e56a3e..2ff6b4162a425d489297579850b9a13501912507 100644 (file)
--- a/src/include/mm_player.h
+++ b/src/include/mm_player.h
@@ -1872,15 +1872,6 @@ int mm_player_set_video_share_master_clock(MMHandleType player, long long clock,
  */
 int mm_player_get_video_share_master_clock(MMHandleType player, long long *video_time, long long *media_clock, long long *audio_time);
 
-/**
- * This function is to get the content angle
- *
- * @param       player         [in]    handle of player
- * @param       angle          [out]   orignal angle from content
- * @return      This function returns zero on success, or negative value with error code.
- */
-int mm_player_get_video_rotate_angle(MMHandleType player, int *angle);
-
 /**
  * This function is to set download mode of video hub
  *

diff --git a/src/include/mm_player_priv.h b/src/include/mm_player_priv.h
index 2303b4e8d7b0e7f9d7fb41305cc0628b714a956e..81df92fdf3b2d4c4eff345c4886a37a240815135 100644 (file)
--- a/src/include/mm_player_priv.h
+++ b/src/include/mm_player_priv.h
@@ -937,7 +937,6 @@ int _mmplayer_set_video_hub_download_mode(MMHandleType hplayer, bool mode);
 int _mmplayer_use_system_clock(MMHandleType hplayer);
 int _mmplayer_set_video_share_master_clock(MMHandleType hplayer, long long clock, long long clock_delta, long long video_time, long long media_clock, long long audio_time);
 int _mmplayer_get_video_share_master_clock(MMHandleType hplayer, long long *video_time, long long *media_clock, long long *audio_time);
-int _mmplayer_get_video_rotate_angle(MMHandleType hplayer, int *angle);
 int _mmplayer_enable_sync_handler(MMHandleType hplayer, bool enable);
 int _mmplayer_set_file_buffering_path(MMHandleType hplayer, const char* file_path);
 int _mmplayer_set_uri(MMHandleType hplayer, const char* uri);

diff --git a/src/mm_player.c b/src/mm_player.c
index 13f86843f0473f4fdec9d8e983396d73b0a1dc41..ade4fbf9fafef1d61274d4473d474d12ffd9c6c3 100644 (file)
--- a/src/mm_player.c
+++ b/src/mm_player.c
@@ -795,22 +795,6 @@ int mm_player_get_video_share_master_clock(MMHandleType player,
        return result;
 }
 
-int mm_player_get_video_rotate_angle(MMHandleType player, int *angle)
-{
-       int result = MM_ERROR_NONE;
-
-       MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
-       MMPLAYER_RETURN_VAL_IF_FAIL(angle, MM_ERROR_COMMON_INVALID_ARGUMENT);
-
-       MMPLAYER_CMD_LOCK(player);
-
-       result = _mmplayer_get_video_rotate_angle(player, angle);
-
-       MMPLAYER_CMD_UNLOCK(player);
-
-       return result;
-}
-
 int mm_player_set_video_hub_download_mode(MMHandleType player, bool mode)
 {
        int result = MM_ERROR_NONE;

diff --git a/src/mm_player_capture.c b/src/mm_player_capture.c
index 10aabf5c831184e78a518b0a3833828c1f1ce9ca..42b59e0c367980c5b99792ff7c8843877de90ff0 100755 (executable)
--- a/src/mm_player_capture.c
+++ b/src/mm_player_capture.c
@@ -286,6 +286,7 @@ __mmplayer_capture_thread(gpointer data)
        unsigned char * linear_y_plane = NULL;
        unsigned char * linear_uv_plane = NULL;
        int orientation = 0;
+       int user_angle = 0;
        int ret = 0;
        int planes[MAX_BUFFER_PLANE] = {0, };
        unsigned char * p_buf = NULL;
@@ -472,13 +473,13 @@ __mmplayer_capture_thread(gpointer data)
                        }
                }
 
-               ret = _mmplayer_get_video_rotate_angle((MMHandleType)player, &orientation);
+               ret = __mmplayer_get_video_angle((MMHandleType)player, &user_angle, &orientation);
                if (ret != MM_ERROR_NONE) {
                        LOGE("failed to get rotation angle");
                        goto ERROR;
                }
 
-               LOGD("orientation value = %d", orientation);
+               LOGD("orientation value = %d user_angle = %d", orientation, user_angle);
 
                ret = __mmplayer_handle_orientation(player, orientation, MM_UTIL_IMG_FMT_RGB888);
                if (ret != MM_ERROR_NONE) {

diff --git a/src/mm_player_priv.c b/src/mm_player_priv.c
index 20b03d90b7a22b49b042b9c97c2cd340127d81fd..398297d070cd729b4cf2fe57d9657e954c84c14b 100644 (file)
--- a/src/mm_player_priv.c
+++ b/src/mm_player_priv.c
@@ -13728,32 +13728,6 @@ _mmplayer_get_video_share_master_clock(MMHandleType hplayer,
        return MM_ERROR_NONE;
 }
 
-int
-_mmplayer_get_video_rotate_angle(MMHandleType hplayer, int *angle)
-{
-       mm_player_t* player = (mm_player_t*) hplayer;
-       int org_angle = 0;
-
-       MMPLAYER_FENTER();
-
-       MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
-       MMPLAYER_RETURN_VAL_IF_FAIL(angle, MM_ERROR_COMMON_INVALID_ARGUMENT);
-
-       if (player->v_stream_caps) {
-               GstStructure *str = NULL;
-
-               str = gst_caps_get_structure(player->v_stream_caps, 0);
-               if (!gst_structure_get_int(str, "orientation", &org_angle))
-                       LOGD("missing 'orientation' field in video caps");
-       }
-
-       LOGD("orientation: %d", org_angle);
-       *angle = org_angle;
-
-       MMPLAYER_FLEAVE();
-       return MM_ERROR_NONE;
-}
-
 static gboolean
 __mmplayer_add_dump_buffer_probe(mm_player_t *player, GstElement *element)
 {