[0.2.73] add interface to get spherical info

Change-Id: I70f70616e169bdb8d760d3cd1fe6f86066f1ccd4

diff --git a/legacy/include/legacy_player.h b/legacy/include/legacy_player.h
index ce4411de13577653d370db0d0e68dd8d498eed35..ac2b7a44db7ed48ceed8a35ccc956476c58714fe 100644 (file)
--- a/legacy/include/legacy_player.h
+++ b/legacy/include/legacy_player.h
@@ -2218,6 +2218,7 @@ int legacy_player_set_streaming_buffering_time(player_h player, int buffer_ms, i
 int legacy_player_get_streaming_buffering_time(player_h player, int *buffer_ms, int *rebuffer_ms);
 
 /* 360 video display */
+int legacy_player_360_is_content_spherical(player_h player, bool *is_spherical);
 int legacy_player_360_set_enable(player_h player, bool enable);
 int legacy_player_360_is_enabled(player_h player, bool *enabled);
 int legacy_player_360_set_direction_of_view(player_h player, float yaw, float pitch);

diff --git a/legacy/src/legacy_player.c b/legacy/src/legacy_player.c
index 87a545e880ca3e188f64c9a9115153554e743c42..c53932686bfd42500d95ff706a9f454e3dff68c0 100644 (file)
--- a/legacy/src/legacy_player.c
+++ b/legacy/src/legacy_player.c
@@ -2902,6 +2902,26 @@ int legacy_player_get_streaming_buffering_time(player_h player, int *buffer_ms,
        }
 }
 
+int legacy_player_360_is_content_spherical(player_h player, bool *is_spherical)
+{
+       PLAYER_INSTANCE_CHECK(player);
+       PLAYER_NULL_ARG_CHECK(is_spherical);
+
+       player_s *handle = (player_s *)player;
+
+       if (!__player_state_validate(handle, PLAYER_STATE_READY)) {
+               LOGE("PLAYER_ERROR_INVALID_STATE (0x%08x) : current state - %d", PLAYER_ERROR_INVALID_STATE, handle->state);
+               return PLAYER_ERROR_INVALID_STATE;
+       }
+
+       int ret = mm_player_360_is_content_spherical(handle->mm_handle, is_spherical);
+       if (ret != MM_ERROR_NONE) {
+               return __player_convert_error_code(ret, (char *)__FUNCTION__);
+       } else {
+               return PLAYER_ERROR_NONE;
+       }
+}
+
 int legacy_player_360_set_enable(player_h player, bool enable)
 {
        PLAYER_INSTANCE_CHECK(player);
@@ -2922,6 +2942,8 @@ int legacy_player_360_set_enable(player_h player, bool enable)
 int legacy_player_360_is_enabled(player_h player, bool *enabled)
 {
        PLAYER_INSTANCE_CHECK(player);
+       PLAYER_NULL_ARG_CHECK(enabled);
+
        player_s *handle = (player_s *)player;
 
        if (!__player_state_validate(handle, PLAYER_STATE_IDLE)) {

diff --git a/muse/api.list b/muse/api.list
index 26ff34215a334735bafc144dd10ce0cdcb650598..c648e374e202d57a4b4eba44d120c1b1b86c4ecc 100644 (file)
--- a/muse/api.list
+++ b/muse/api.list
@@ -85,6 +85,7 @@ set_audio_only
 is_audio_only
 set_streaming_buffering_time
 get_streaming_buffering_time
+360_is_content_spherical
 360_set_enable
 360_is_enabled
 360_set_direction_of_view

diff --git a/muse/src/muse_player.c b/muse/src/muse_player.c
index 5c561d330998e9b9a642c5fffd3bda3f571e41c8..065975ddfcab7a57a6138019ed43c08aff3a7645 100644 (file)
--- a/muse/src/muse_player.c
+++ b/muse/src/muse_player.c
@@ -3137,6 +3137,21 @@ int player_disp_get_streaming_buffering_time(muse_module_h module)
        return ret;
 }
 
+int player_disp_360_is_content_spherical(muse_module_h module)
+{
+       int ret = PLAYER_ERROR_NONE;
+       muse_player_api_e api = MUSE_PLAYER_API_360_IS_CONTENT_SPHERICAL;
+       muse_player_handle_s *muse_player = NULL;
+       bool val;
+
+       muse_player = (muse_player_handle_s *)muse_server_ipc_get_handle(module);
+
+       ret = legacy_player_360_is_content_spherical(muse_player->player_handle, &val);
+
+       player_msg_return1(api, ret, module, INT, val);
+       return ret;
+}
+
 int player_disp_360_set_enable(muse_module_h module)
 {
        int ret = PLAYER_ERROR_NONE;

diff --git a/packaging/mmsvc-player.spec b/packaging/mmsvc-player.spec
index 8215e06c6aa3d4f3b6d601a60f2b8e30a89e27ed..ab557935352d497095ce87cc9caaeb1e48523179 100644 (file)
--- a/packaging/mmsvc-player.spec
+++ b/packaging/mmsvc-player.spec
@@ -1,6 +1,6 @@
 Name:       mmsvc-player
 Summary:    A Media Player module for muse server
-Version:    0.2.72
+Version:    0.2.73
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0