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

diff --cc include/esplusplayer_capi/buffer.h
index 039e8450e6ec9653291ceb78a5f060025fb7ad0b,5e754d6948f8655870904c3ea61893743f6d90af..07c8b42f7cbf1bf09f8058de6f78d0c79466801f
mode 100644,100755..100755
--- 1/include/esplusplayer_capi/buffer.h
--- 2/include/esplusplayer_capi/buffer.h
+++ b/include/esplusplayer_capi/buffer.h
@@@ -54,7 -54,7 +55,7 @@@ typedef enum esplusplayer_decoded_video
    ESPLUSPLAYER_DECODED_VIDEO_FRAME_BUFFER_TYPE_REFERENCE,
    ESPLUSPLAYER_DECODED_VIDEO_FRAME_BUFFER_TYPE_SCALE,
    ESPLUSPLAYER_DECODED_VIDEO_FRAME_BUFFER_TYPE_MANUAL_COPY
- };
 -}esplusplayer_decoded_video_frame_buffer_type;
++} esplusplayer_decoded_video_frame_buffer_type;
  
  /**
   * @brief  Enumerations for buffer size option
@@@ -74,7 -74,7 +75,7 @@@ typedef enum esplusplayer_buffer_optio
    ESPLUSPLAYER_BUFFER_VIDEO_MAX_BYTE_SIZE,
    ESPLUSPLAYER_BUFFER_AUDIO_MIN_BYTE_THRESHOLD,
    ESPLUSPLAYER_BUFFER_VIDEO_MIN_BYTE_THRESHOLD
- };
 -}esplusplayer_buffer_option;
++} esplusplayer_buffer_option;
  
  /**
   * @brief  video decoded buffer struct

diff --cc include/esplusplayer_capi/espacket.h
index dd09982decc0d12f3d865e481754cf540215f0bc,2a2d52a1d97734b03c949c8a79f826eb972471e2..adcb85995ce70d70cfd3253d0e52955519ba88d0
mode 100644,100755..100755
--- 1/include/esplusplayer_capi/espacket.h
--- 2/include/esplusplayer_capi/espacket.h
+++ b/include/esplusplayer_capi/espacket.h

diff --cc include/esplusplayer_capi/esplusplayer_capi.h
index 4d7165d660fea45653baf13073c355eb42155f79,d3d90fa3730943877eeab4954b6b0b0286d563b0..8aed81183fa452601c8e1fdbd0cb92d4790ca4a5
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 include/esplusplayer_capi/event.h
index da393f3c117ac6259b67a2e27169a171a700c9a8,e3ac69a393900e4fc491f6121ca82a0aba37c10d..ea9bb1c0ffce890e6f9f0058cbbe1e75bef65025
mode 100644,100755..100755
--- 1/include/esplusplayer_capi/event.h
--- 2/include/esplusplayer_capi/event.h
+++ b/include/esplusplayer_capi/event.h

diff --cc include/esplusplayer_capi/matroska_color.h
index eb78eb912a455d05376b785b1bc9de00e0179590,e97b28582df07d541ca17efc97dc9312f93815c0..02198477026c12a5757754c1b43ed671737e79c9
mode 100644,100755..100755
--- 1/include/esplusplayer_capi/matroska_color.h
--- 2/include/esplusplayer_capi/matroska_color.h
+++ b/include/esplusplayer_capi/matroska_color.h

diff --cc packaging/esplusplayer.spec
index c95ea5c50a748929f165b9344efa1b3a3e8c2ffc,7befee2efa4f2da1b9350fc7f7605fa38b415b03..dd2ed22865328a88b9f1464993b72b67e9f88688
--- 1/packaging/esplusplayer.spec
--- 2/packaging/esplusplayer.spec
+++ b/packaging/esplusplayer.spec
@@@ -25,22 -24,7 +25,19 @@@ BuildRequires:  pkgconfig(elementary
  BuildRequires:  pkgconfig(ecore)
  BuildRequires:  pkgconfig(evas)
  BuildRequires:  pkgconfig(ecore-wl2)
 +%if %{with TIZEN_PUBLIC}
 +BuildRequires:  pkgconfig(libtrackrenderer)
 +%else
  BuildRequires:  pkgconfig(tv-resource-manager)
- BuildRequires:  pkgconfig(libavoc)
- %else
- BuildRequires:  pkgconfig(libavoc-av)
 +BuildRequires:  pkgconfig(drmdecrypt)
 +BuildRequires:  pkgconfig(context-aware-api)
 +%if ("%{_vd_cfg_product_type}" != "AUDIO")
 +BuildRequires:  pkgconfig(graphics-control)
 +%endif
 +BuildRequires:  pkgconfig(capi-trackrenderer-tv)
 +BuildRequires:  pkgconfig(logger)
 +%endif
 +
  BuildRequires:  pkgconfig(libtzplatform-config)
  BuildRequires:  pkgconfig(jsoncpp)
  BuildRequires:  pkgconfig(icu-i18n)

diff --cc src/esplusplayer/CMakeLists.txt
index b050e3d4819ec0f6d0fcf2b2d031437e3b905c68,a5b4b5429c6f71233fbb696372b96b20dc7c6ef9..c1fb7378eb80c43fba9354c35acdb04f13312366
--- 1/src/esplusplayer/CMakeLists.txt
--- 2/src/esplusplayer/CMakeLists.txt
+++ b/src/esplusplayer/CMakeLists.txt
@@@ -24,15 -24,7 +24,10 @@@ SET(dependents "gstreamer-1.0 glib-2.0 
                 "elementary ecore ecore-wl2"
                 "jsoncpp")
  
- IF(${PRODUCT_TYPE_AUDIO} STREQUAL "no")
- SET(dependents ${dependents} "libavoc")
- ELSE(${PRODUCT_TYPE_AUDIO} STREQUAL "no")
- SET(dependents ${dependents} "libavoc-av")
- ENDIF(${PRODUCT_TYPE_AUDIO} STREQUAL "no")
 +IF(${TIZEN_PUBLIC} STREQUAL "OFF")
 +SET(dependents ${dependents} ""tv-resource-manager"")
 +ENDIF(${TIZEN_PUBLIC} STREQUAL "OFF")
 +
  INCLUDE(FindPkgConfig)
  
  IF(CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l)

diff --cc src/esplusplayer/src/esplayer.cpp
index 18ffd5eb393765bfa343421f550648228bab3a69,fc6e9407caea9e96670f30cf145db5e1588e1811..e48918156b97d65c0412920dd6b7d62a97ac9b79
--- 1/src/esplusplayer/src/esplayer.cpp
--- 2/src/esplusplayer/src/esplayer.cpp
+++ b/src/esplusplayer/src/esplayer.cpp
@@@ -16,18 -16,9 +16,11 @@@
  #include <sstream>
  #include <thread>
  
- #ifndef TIZEN_FEATURE_PUBLIC
- #ifdef SOUNDBAR_PRODUCT
- #include "avoc_av_audio.h"
- #else
- #include "avoc.h"
- #endif
- #endif
  #include "core/gst_utils.h"
  #include "core/track_util.h"
 +#ifndef TIZEN_FEATURE_PUBLIC
  #include "core/utils/caf_logger.h"
 +#endif
  #include "core/utils/performance_checker.h"
  #include "core/utils/plusplayer_cfg.h"
  #include "core/utils/plusplayer_log.h"

diff --cc src/plusplayer-core/include_internal/core/trackrendereradapter.h
index e7f3793ec537f6525033a6571384930751afa20b,6611a159394eab6f16fa1d0d7836e4685eacd68d..3de2c90b62e71b23d72f91b9f8ba46c853e98976
mode 100755,100644..100644
--- 1/src/plusplayer-core/include_internal/core/trackrendereradapter.h
--- 2/src/plusplayer-core/include_internal/core/trackrendereradapter.h
+++ b/src/plusplayer-core/include_internal/core/trackrendereradapter.h

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

diff --cc ut/src/utils/utility.cpp
Simple merge