Merge branch 'tizen_vault' into tizen

Change-Id: Iff977748e15088635edca2c395da2b9a0a45cea8

diff --cc config/esplusplayer.ini
Simple merge

diff --cc include/esplusplayer/elementary_stream.h
index 8413478,1bc1ce7..1bc1ce7
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/types/resource.h
index 4ff5c8d,1e75c5b..1e75c5b
mode 100644,100755..100644
--- 1/include/esplusplayer/types/resource.h
--- 2/include/esplusplayer/types/resource.h
+++ b/include/esplusplayer/types/resource.h

diff --cc include/esplusplayer_capi/esplusplayer_capi.h
index 6e8e3c2,e683f9a..e683f9a
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/stream.h
index 2251149,14130f1..14130f1
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 7265f60,a14219d..cdf38a8
--- 1/packaging/esplusplayer.spec
--- 2/packaging/esplusplayer.spec
+++ b/packaging/esplusplayer.spec
@@@ -7,11 -6,9 +7,11 @@@
  %bcond_with ESPLUSPLAYER_UT
  %endif
  #echo "Product Type: %{_vd_cfg_product_type}"
 +
  Name:       esplusplayer
  Summary:    new multimedia streaming player
- Version:    1.2.1
- Release:    2
+ Version:    1.3.7
++Release:    1
  Group:      Multimedia/Libraries
  License:    Apache-2.0
  Source0:    %{name}-%{version}.tar.gz

diff --cc src/esplusplayer/CMakeLists.txt
Simple merge

diff --cc src/esplusplayer/include_internal/esplayer/decoded_pkt_list.h
index 9ad81f9,172f17f..9839302
--- 1/src/esplusplayer/include_internal/esplayer/decoded_pkt_list.h
--- 2/src/esplusplayer/include_internal/esplayer/decoded_pkt_list.h
+++ b/src/esplusplayer/include_internal/esplayer/decoded_pkt_list.h
@@@ -37,8 -37,8 +37,8 @@@ void DecodedPacketDeleter(esplusplayer_
    if (packet == nullptr || packet->surface_data == nullptr) return;
  #else
    if (packet == nullptr) return;
 -  if (packet->private_data) {  // hw dec
 +  if (packet->private_data) { // hw dec
-     gst_buffer_unref((GstBuffer *)packet->private_data);
+     gst_buffer_unref((GstBuffer*)packet->private_data);
      packet->private_data = nullptr;
    }
    if (packet->surface_data == nullptr) return;

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

diff --cc src/esplusplayer/src/elementary_stream.cpp
index b8c1db7,baa321f..baa321f
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 5ac49bb,9024959..dfcb4de
mode 100644,100755..100644
--- 1/src/esplusplayer/src/esplayer.cpp
--- 2/src/esplusplayer/src/esplayer.cpp
+++ b/src/esplusplayer/src/esplayer.cpp
@@@ -1685,6 -1678,19 +1682,21 @@@ PacketSubmitStatus EsPlayer::SubmitEncr
      MakeGstBufferForEncryptedPacket_(gstbuffer, packet, drm_info);
      return PacketSubmitStatus::kSuccess;
    };
++#ifndef TIZEN_FEATURE_PUBLIC
+   if (!key_system_acquired_ && drm_info.handle != 0) {
+     key_system_ = eme::IEME::getKeySystemName(drm_info.handle);
+     LOG_INFO("KeySystemName :: [%s] ", key_system_.c_str());
+     if (!state_manager_
+              .GetPreparingState()) {  // if the stream comes with clean data at
+                                       // the beginning, re-post kpi when we get
+                                       // key system.
+       kpi::CodecLogger logger;
+       kpi::EsCodecLoggerKeys event_keys = MakeKpiKeys_();
+       logger.SendKpi(true, event_keys);
+     }
+     key_system_acquired_ = true;
+   }
++#endif
    return SubmitPacketCommon_(packet, submitpacket_op);
  }
  // LCOV_EXCL_STOP

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

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

diff --cc src/plusplayer-core/src/trackrendereradapter_utils.cpp
index 1d429e6,dbbc312..dbbc312
mode 100644,100755..100644
--- 1/src/plusplayer-core/src/trackrendereradapter_utils.cpp
--- 2/src/plusplayer-core/src/trackrendereradapter_utils.cpp
+++ b/src/plusplayer-core/src/trackrendereradapter_utils.cpp