Merge branch 'main' into ci/gilbok-lee/update_public

diff --cc include/esplusplayer_capi/esplusplayer_capi.h
index 8b07515ec293450ff867bb81ba7b047ebb467fc6,4f26314596f8988e50a31d9dd68bd60dae452f5b..51861bdd5555484d2f801f6a0eb9b29fca2d5409
mode 100644,100755..100755
--- 1/include/esplusplayer_capi/esplusplayer_capi.h
--- 2/include/esplusplayer_capi/esplusplayer_capi.h
+++ b/include/esplusplayer_capi/esplusplayer_capi.h

diff --cc packaging/esplusplayer.spec
index 6f7f179d10655c9096353c935f339ce135a83d13,38ed4e38cfd010e66d922e0faa29387a9d12c245..a14219d1c7dcd696917fcb84e6c90d86515accb7
--- 1/packaging/esplusplayer.spec
--- 2/packaging/esplusplayer.spec
+++ b/packaging/esplusplayer.spec
@@@ -8,8 -7,8 +8,7 @@@
  #echo "Product Type: %{_vd_cfg_product_type}"
  Name:       esplusplayer
  Summary:    new multimedia streaming player
- Version:    1.3.3
- Release:    1
+ Version:    1.3.7
 -Release:    0
  Group:      Multimedia/Libraries
  License:    Apache-2.0
  Source0:    %{name}-%{version}.tar.gz

diff --cc src/esplusplayer/CMakeLists.txt
index e31120d43b5947efee3821732975f2dd2e83e72c,dc95d9c93d17f90d59200d105fb852aa94d592b8..6a62e6a15df64f79bd76b9ed69996ead8dc46bcc
--- 1/src/esplusplayer/CMakeLists.txt
--- 2/src/esplusplayer/CMakeLists.txt
+++ b/src/esplusplayer/CMakeLists.txt
@@@ -21,15 -21,11 +21,16 @@@ SET(${fw_name}_CXXFLAGS "-Wall -Werror 
  
  SET(dependents "gstreamer-1.0 glib-2.0 dlog"
                 "boost"
 -               "tv-resource-manager"
                 "elementary ecore ecore-wl2"
-                "jsoncpp")
+                "jsoncpp"
+                "drmdecrypt")
  
 +IF(${TIZEN_PUBLIC} STREQUAL "OFF")
 +SET(dependents ${dependents} "tv-resource-manager")
 +ELSE(${TIZEN_PUBLIC} STREQUAL "OFF")
 +SET(dependents ${dependents} "capi-media-sound-manager")
 +ENDIF(${TIZEN_PUBLIC} STREQUAL "OFF")
 +
  INCLUDE(FindPkgConfig)
  
  IF(CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l)

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

diff --cc src/esplusplayer/src/esplayer.cpp
index fa1922e98a0abca0756328252b2e78ce4e1869cf,a022e131f3a01740bb8177bb8890cbf442d6be79..9096ef64adacb0c0f2d68a91c8a72658aa5d3143
mode 100644,100755..100755
--- 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/plusplayer-core/src/trackrendereradapter_utils.cpp
index 8bdbdc5a814e4df98cdf9e17f956dce9121e4472,5666638f3ccf57c7c8cd1a488a8df76207d7ef7a..bde13506c0187b2f82ceb2b7937ba4eea4ddbe33
mode 100644,100755..100755
--- 1/src/plusplayer-core/src/trackrendereradapter_utils.cpp
--- 2/src/plusplayer-core/src/trackrendereradapter_utils.cpp
+++ b/src/plusplayer-core/src/trackrendereradapter_utils.cpp