Merge branch 'tizen_vault' into tizen

Change-Id: I15a4fc50b2e00cebb64c78a4a7b71d805ec3bf0c

diff --cc include/esplusplayer/decodedvideopacketex.h
index ad1aa858cefefbc8c622dd0b018586c7f7fa6a05,86eea3c961f823c8132ae211b4798d072eaa28d7..708e87672ddb38452a846b74dc4328825efb6f71
mode 100644,100755..100755
--- 1/include/esplusplayer/decodedvideopacketex.h
--- 2/include/esplusplayer/decodedvideopacketex.h
+++ b/include/esplusplayer/decodedvideopacketex.h
@@@ -29,7 -29,15 +29,15 @@@ namespace esplusplayer 
  class DecodedVideoPacketEx : private boost::noncopyable {
   public:
    using Ptr = std::unique_ptr<DecodedVideoPacketEx>;
- 
+   /**
+    * @brief      Create a new DecodedVideoPacketEx object.
+    * @param     [in] pts : timestamp of decoded packet.
+    * @param     [in] duration : duration of decoded packet.
+    * @param     [in] surface_data : surface data address which store the decoded data.
+    * @param     [in] scaler_index : the scaler index.
+    * @exception  None
 -   * @return     DecodedVideoPacketEx object. 
++   * @return     DecodedVideoPacketEx object.
+    */
    static Ptr Create(const uint64_t pts = 0, const uint64_t duration = 0,
                      tbm_surface_h surface_data = nullptr,
                      const void* scaler_index = nullptr);

diff --cc include/esplusplayer/elementary_stream.h
index 1bc1ce7b3ffef8ba242085eb8ea37863f46994da,dc2af2280c8887a9d3f2525b4485fcb4aaea760e..dc2af2280c8887a9d3f2525b4485fcb4aaea760e
mode 100644,100755..100644
--- 1/include/esplusplayer/elementary_stream.h
--- 2/include/esplusplayer/elementary_stream.h
+++ b/include/esplusplayer/elementary_stream.h

diff --cc include/esplusplayer/es_eventlistener.h
index 8ab97206250bf1adbb8ac3c5d717a17391ea702e,8bfe130c2706e1f36db763ccd9b7d350c7e99517..595216c23e56f6b102cff5a8df3fd92441353874
mode 100644,100755..100755
--- 1/include/esplusplayer/es_eventlistener.h
--- 2/include/esplusplayer/es_eventlistener.h
+++ b/include/esplusplayer/es_eventlistener.h

diff --cc include/esplusplayer/espacket.h
index 9d51c9f6dba4bd501282a31b521cc12ed01e8104,765b2eebb847ac357c12be2e9063460ca43d9b66..1222db5116c7c526189485bcd76302005d839cfe
mode 100644,100755..100755
--- 1/include/esplusplayer/espacket.h
--- 2/include/esplusplayer/espacket.h
+++ b/include/esplusplayer/espacket.h

diff --cc include/esplusplayer/track.h
index 51d1b1dfca9418e221a8233c7107e156186d42fa,5aeb543c0d9db780ac893ad187736e919b59a5ec..6d688322f5223926ecb8b32ba77cfb7b4cb8e27f
mode 100644,100755..100755
--- 1/include/esplusplayer/track.h
--- 2/include/esplusplayer/track.h
+++ b/include/esplusplayer/track.h

diff --cc include/esplusplayer_capi/esplusplayer_capi.h
index e683f9a5b1db880d98dc1576f5a37c3ccba3cd50,e7c0ad75eaf29c2b0e2b4c4c3ee37c23c70aa897..e7c0ad75eaf29c2b0e2b4c4c3ee37c23c70aa897
mode 100644,100755..100644
--- 1/include/esplusplayer_capi/esplusplayer_capi.h
--- 2/include/esplusplayer_capi/esplusplayer_capi.h
+++ b/include/esplusplayer_capi/esplusplayer_capi.h

diff --cc include/esplusplayer_capi/esplusplayer_internal.h
index 990985395327c6f30fea99145e8ae99b3f2d8db1,c90b7faf7cbb5442928967c434175d365901808f..5529ced16fe113eedc794fa5eb897dea34bc4a67
mode 100644,100755..100755
--- 1/include/esplusplayer_capi/esplusplayer_internal.h
--- 2/include/esplusplayer_capi/esplusplayer_internal.h
+++ b/include/esplusplayer_capi/esplusplayer_internal.h
@@@ -137,6 -148,16 +148,16 @@@ int get_size_of_esplusplayer_video_stre
   */
  int get_size_of_esplusplayer_drm_info(void);
  
 - * @return    int 
+ /**
+  * @brief     Set the mode of virtual mic
+  * @param     [in] handle : esplusplayer handle.
++ * @return    int
+  * @pre       None
+  * @post      None
+  * @exception   None
+  */
+ int esplusplayer_set_virtual_mic_mode(esplusplayer_handle handle);
+ 
  #ifdef __cplusplus
  }
  #endif

diff --cc include/esplusplayer_capi/stream.h
index 14130f1435fd0c4f10766763d9070c91cc8e7056,14e445730c7b54b42200e1ce34e23023d0bd2d48..14e445730c7b54b42200e1ce34e23023d0bd2d48
mode 100644,100755..100644
--- 1/include/esplusplayer_capi/stream.h
--- 2/include/esplusplayer_capi/stream.h
+++ b/include/esplusplayer_capi/stream.h

diff --cc packaging/esplusplayer.spec
index 3fe7fca1d74a3bb1335b34ebfb07b961c506a5a1,836cb53882e02b10e7d752ac23a5c6406bcb7c31..f4308cf31f493e2d7d43ddb1c423c2149af4ac5f
mode 100644,100755..100755
--- 1/packaging/esplusplayer.spec
--- 2/packaging/esplusplayer.spec
+++ b/packaging/esplusplayer.spec
@@@ -8,11 -6,10 +8,11 @@@
  %bcond_with ESPLUSPLAYER_UT
  %endif
  #echo "Product Type: %{_vd_cfg_product_type}"
 +
  Name:       esplusplayer
  Summary:    new multimedia streaming player
- Version:    1.3.7
- Release:    6
+ Version:    1.4.0
+ Release:    0
  Group:      Multimedia/Libraries
  License:    Apache-2.0
  Source0:    %{name}-%{version}.tar.gz
@@@ -51,10 -48,11 +51,9 @@@ BuildRequires:  pkgconfig(icu-i18n
  BuildRequires:  pkgconfig(gio-2.0)
  BuildRequires:  pkgconfig(libtbm)
  
--BuildRequires:  pkgconfig(libtbm)
  BuildRequires:  pkgconfig(capi-system-info)
  
 -
 -%if ("%{sec_buildconf_product_lite_tizen}" == "n")
 +%if (("%{sec_buildconf_product_lite_tizen}" == "n") || %{with TIZEN_PUBLIC})
  # for ut
  BuildRequires:  gtest-devel
  BuildRequires:  pkgconfig(appcore-efl)

diff --cc src/esplusplayer/include_internal/esplayer/esplayer.h
Simple merge

diff --cc src/esplusplayer/src/elementary_stream.cpp
index baa321f6ffdd1faf915955cdc24f882a9709294b,cb098f7f1c4907ac15e9f7a7746002ac94b5621b..cb098f7f1c4907ac15e9f7a7746002ac94b5621b
mode 100644,100755..100644
--- 1/src/esplusplayer/src/elementary_stream.cpp
--- 2/src/esplusplayer/src/elementary_stream.cpp
+++ b/src/esplusplayer/src/elementary_stream.cpp

diff --cc src/esplusplayer/src/esplayer.cpp
index 260db003ecbdadccb9c978f3dd941438a98e2c11,d320e06724a1b5732d28b0b352305415e158ead1..549e33dd0714a31869df4e5545d064b7b95f55f1
mode 100644,100755..100644
--- 1/src/esplusplayer/src/esplayer.cpp
--- 2/src/esplusplayer/src/esplayer.cpp
+++ b/src/esplusplayer/src/esplayer.cpp

diff --cc src/esplusplayer/src/esplusplayer_capi.cpp
Simple merge

diff --cc src/mixer/include_internal/mixer/sys/tbminterface.h
Simple merge

diff --cc src/mixer/include_internal/mixer/tizen/tizenbuffermgr.h
Simple merge

diff --cc src/mixer/include_internal/mixer/tizen/tizenbufferphyaddraccessor.h
Simple merge

diff --cc src/mixer/src/sys/tbminterface.cpp
index 4a7d39f7824bfd0f7e64eef1f135bc8eb106c709,5ca1147089d66a119db4e9844907c02bc75dc1d9..bac98b60f44a23fefd1a94ff0b79c51c791d9fde
--- 1/src/mixer/src/sys/tbminterface.cpp
--- 2/src/mixer/src/sys/tbminterface.cpp
+++ b/src/mixer/src/sys/tbminterface.cpp
@@@ -51,16 -51,16 +51,16 @@@ BufferDefaultType TBMInterface::BoImpor
    return tbm_bo_import(bufmgr, key);
  }
  
- int TBMInterface::GAScale(tbm_bufmgr bufmgr, GraphicsGAScaleInfo* info) {
-   return Gfx_GA_Scale(bufmgr, info);
+ int TBMInterface::GAScale(tbm_bufmgr bufmgr, ppi_graphics_control_ga_scale_info_s* info) {
+   return ppi_graphics_control_ga_scale(bufmgr, info) == 0 ? 1 : 0;
  }
  
- int TBMInterface::GACopy(tbm_bufmgr bufmgr, GraphicsGABltRopInfo* info) {
-   return Gfx_GA_BltRop(bufmgr, info);
+ int TBMInterface::GACopy(tbm_bufmgr bufmgr, ppi_graphics_control_ga_blt_rop_info_s* info) {
+   return ppi_graphics_control_ga_bltrop(bufmgr, info) == 0 ? 1 : 0;
  }
  
- int TBMInterface::GAFill(tbm_bufmgr bufmgr, GraphicsGAFillRectInfo* info) {
-   return Gfx_GA_FillRect(bufmgr, info);
+ int TBMInterface::GAFill(tbm_bufmgr bufmgr, ppi_graphics_control_ga_fill_rect_info_s* info) {
+   return ppi_graphics_control_ga_fillrect(bufmgr, info) == 0 ? 1 : 0;
  }
  }  // namespace tizen
 -}  // namespace esplusplayer
 +}  // namespace esplusplayer

diff --cc src/plusplayer-core/src/trackrendereradapter.cpp
Simple merge

diff --cc ut/src/utils/utility.cpp
index 518f74f1c40f3498c579d7bd22965eafb6cf85ed,5c5fe3b155e3e7d9b4a617ffd3b6803234e08e19..935da1b568efd1d8f22d987ed4751e7d9b9b0b56
mode 100644,100755..100755
--- 1/ut/src/utils/utility.cpp
--- 2/ut/src/utils/utility.cpp
+++ b/ut/src/utils/utility.cpp
@@@ -39,10 -25,12 +39,12 @@@
  #include <capi-system-info/system_info.h>
  #include <capi-system-info/system_info_key.h>
  #include <system-type/system_type_enum.h>
 -
 +#include "ivideocapture.hpp"
  #include "capi-video-capture.h"
- #include "iaudio-control.hpp"
- #include "diagnosis-audio-control.hpp"
+ #include <ppi-diagnosis-audio-control.h>
+ 
+ #include <ppi-audio-control.h>
+ #include "ivideocapture.hpp"
  #endif
  
  using namespace std;
@@@ -505,17 -492,17 +507,18 @@@ int Utility::CheckYUV(int x, int y) 
    LOGE("Y value : %d", (int)ybuff[position]);
    return (int)ybuff[position];
  }
 +#endif
  
 +#ifndef TIZEN_FEATURE_PUBLIC
  bool Utility::IsAudioDisconnected() {
    TZTVAudioSource src = AUDIO_SOURCE_MAX;
-   EXPECT_EQ(audioControl->getMainOutSourceSelect(&src), 0);
+   EXPECT_EQ(ppi_audio_control_get_main_out_source_select(&src), 0);
    return (src != AUDIO_MULTIMEDIA_DEC0);
  }
 -
  bool Utility::IsAudioMute() {
    long audioMute = 0;
-   EXPECT_EQ(audioDiagnoser->Diagnosis_GetBoolean(0, "main out mute", &audioMute), 0);
+   EXPECT_EQ(
+       ppi_diagnosis_audio_control_diagnosis_get_boolean(0, "main out mute", &audioMute), 0);
    return (audioMute != 0);
  }
  #endif