[0.3.80] Merge branch 'tizen_4.0' into 'tizen'

- Add stream info feature
- ACR-1119, ACR-1131
- Add internal api to select codec type

Change-Id: I025550dceed552fe13378fe0a018bcebd8bee6a9

diff --cc include/player.h
Simple merge

diff --cc include/player_internal.h
Simple merge

diff --cc packaging/capi-media-player.spec
index c3aa3c77b6a8382bc3f8afd1b999d116329956d2,8f43c5bc0e33e035b0acc66572fca8df683d905d..78b39d7dcf646206ebafbb836ae35534f58a2fa6
--- 1/packaging/capi-media-player.spec
--- 2/packaging/capi-media-player.spec
+++ b/packaging/capi-media-player.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:       capi-media-player
  Summary:    A Media Player API
--Version:    0.3.79
++Version:    0.3.80
  Release:    0
  Group:      Multimedia/API
  License:    Apache-2.0

diff --cc src/player.c
Simple merge

diff --cc test/player_test.c
index 38370e9f09ae2eca2837458313a81a180dbb9124,fc1c6e9b027ce3fdb115e52de10c138b700d185c..27ff13b1df535d18cb279c1f5ba74d6b485b1ffb
--- 1/test/player_test.c
--- 2/test/player_test.c
+++ b/test/player_test.c
@@@ -166,12 -152,7 +166,13 @@@ enum 
        CURRENT_STATUS_SET_AUDIO_ONLY,
        CURRENT_STATUS_SET_PRE_BUFFERING_SIZE,
        CURRENT_STATUS_SET_RE_BUFFERING_SIZE,
 +      CURRENT_STATUS_VIDEO360_SET_ENABLE,
 +      CURRENT_STATUS_VIDEO360_SET_DOV,
 +      CURRENT_STATUS_VIDEO360_SET_DOV1,
 +      CURRENT_STATUS_VIDEO360_SET_FOV,
 +      CURRENT_STATUS_VIDEO360_SET_FOV1,
 +      CURRENT_STATUS_VIDEO360_SET_ZOOM,
+       CURRENT_STATUS_VIDEO_CODEC_TYPE,
  };
  
  typedef struct {
@@@ -2374,18 -2186,8 +2399,20 @@@ static void displaymenu(
                g_print("*** set pre buffering size (ms) \n");
        } else if (g_menu_state == CURRENT_STATUS_SET_RE_BUFFERING_SIZE) {
                g_print("*** set re buffering size (ms) \n");
 +      } else if (g_menu_state == CURRENT_STATUS_VIDEO360_SET_ENABLE) {
 +              g_print("*** input video 360 status (0: disabled (full panorama), 1: enabled)\n");
 +      } else if (g_menu_state == CURRENT_STATUS_VIDEO360_SET_DOV) {
 +              g_print("*** input direction of view yaw angle (+/- 180 deg.)\n");
 +      } else if (g_menu_state == CURRENT_STATUS_VIDEO360_SET_DOV1) {
 +              g_print("*** input direction of view pitch angle (+/- 90 deg.)\n");
 +      } else if (g_menu_state == CURRENT_STATUS_VIDEO360_SET_FOV) {
 +              g_print("*** input horizontal field of view angle (1~360 deg.)\n");
 +      } else if (g_menu_state == CURRENT_STATUS_VIDEO360_SET_FOV1) {
 +              g_print("*** input vertical field of view angle (1~180 deg.)\n");
 +      } else if (g_menu_state == CURRENT_STATUS_VIDEO360_SET_ZOOM) {
 +              g_print("*** input zoom factor.(1.0~10.0, where 1.0 - no zoom, actual image) \n");
+       } else if (g_menu_state == CURRENT_STATUS_VIDEO_CODEC_TYPE) {
+               g_print("*** set video codec type (1: HW, 2: SW) \n");
        } else {
                g_print("*** unknown status.\n");
                quit_program();
@@@ -2646,46 -2446,13 +2673,53 @@@ static void interpret(char *cmd
                        reset_menu_state();
                }
                break;
 +      case CURRENT_STATUS_VIDEO360_SET_ENABLE:
 +              {
 +                      int enable = atoi(cmd);
 +                      video360_set_enable(enable);
 +                      reset_menu_state();
 +              }
 +              break;
 +      case CURRENT_STATUS_VIDEO360_SET_DOV:
 +              {
 +                      value1 = atoi(cmd);
 +                      g_menu_state = CURRENT_STATUS_VIDEO360_SET_DOV1;
 +              }
 +              break;
 +      case CURRENT_STATUS_VIDEO360_SET_DOV1:
 +              {
 +                      value2 = atoi(cmd);
 +                      video360_set_dov(value1, value2);
 +                      reset_menu_state();
 +              }
 +              break;
 +      case CURRENT_STATUS_VIDEO360_SET_FOV:
 +              {
 +                      value1 = atoi(cmd);
 +                      g_menu_state = CURRENT_STATUS_VIDEO360_SET_FOV1;
 +              }
 +              break;
 +      case CURRENT_STATUS_VIDEO360_SET_FOV1:
 +              {
 +                      value2 = atoi(cmd);
 +                      video360_set_fov(value1, value2);
 +                      reset_menu_state();
 +              }
 +              break;
 +      case CURRENT_STATUS_VIDEO360_SET_ZOOM:
 +              {
 +                      float zoom = atof(cmd);
 +                      video360_set_zoom(zoom);
 +                      reset_menu_state();
 +              }
 +              break;
+       case CURRENT_STATUS_VIDEO_CODEC_TYPE:
+               {
+                       int value = atoi(cmd);
+                       set_video_codec_type(value);
+                       reset_menu_state();
+               }
+               break;
  
        }