Disable external decryption path

Change-Id: I4b01b6b2d6c8230d8dad9151f00b0d4421bf8802

diff --git a/packaging/esplusplayer.spec b/packaging/esplusplayer.spec
index cac14c4bad975e0421b23e88f81e05c9b5e33858..a228b8a2cd5cc3fe0468202f91defe4b5603e291 100644 (file)
--- a/packaging/esplusplayer.spec
+++ b/packaging/esplusplayer.spec
@@ -1,5 +1,6 @@
 #%bcond_with : disable ESPLUSPLAYER_UT by default, %bcond_without : enable ESPLUSPLAYER_UT
 %bcond_without TIZEN_PUBLIC
+%bcond_without TIZEN_PUBLIC_DRM
 
 %if ("%{_vd_cfg_product_type}" != "AUDIO")
 %bcond_without ESPLUSPLAYER_UT
@@ -11,7 +12,7 @@
 Name:       esplusplayer
 Summary:    new multimedia streaming player
 Version:    1.3.7
-Release:    4
+Release:    5
 Group:      Multimedia/Libraries
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
@@ -148,6 +149,12 @@ export CXXFLAGS+=" -Wno-deprecated-declarations"
 %if %{with TIZEN_PUBLIC}
 export CFLAGS+=" -DTIZEN_FEATURE_PUBLIC -DSYSCONFDIR=\\\"%{_hal_sysconfdir}\\\""
 export CXXFLAGS+=" -DTIZEN_FEATURE_PUBLIC -DSYSCONFDIR=\\\"%{_hal_sysconfdir}\\\""
+
+%if %{with TIZEN_PUBLIC_DRM}
+export CFLAGS+=" -DTIZEN_FEATURE_PUBLIC_DRM"
+export CXXFLAGS+=" -DTIZEN_FEATURE_PUBLIC_DRM"
+%endif
+
 %define TIZEN_PUBLIC ON
 %define USE_MIXER no
 %else

diff --git a/src/esplusplayer/src/esplayer.cpp b/src/esplusplayer/src/esplayer.cpp
index 94a1825f0475e43d1e20b5117c8f2d2c826353a8..260db003ecbdadccb9c978f3dd941438a98e2c11 100644 (file)
--- a/src/esplusplayer/src/esplayer.cpp
+++ b/src/esplusplayer/src/esplayer.cpp
@@ -1154,7 +1154,12 @@ bool EsPlayer::SetSubmitDataType(SubmitDataType type) {
   submit_data_type_ = type;
   drm_property_.type = drm::Type::kPlayready;
   // TODO: following SubmitDataType, need to set external_decryption
-  drm_property_.external_decryption = true;
+  drm_property_.external_decryption =
+#ifdef TIZEN_FEATURE_PUBLIC_DRM
+    false; // In public, we don't use TrustZone.
+#else
+    true;
+#endif
   drm::Property drm_property = drm_property_;
   trackrenderer_->SetDrm(drm_property);
   return true;