Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0b1b2a32: Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1

Browse Source 
* commit '0b1b2a3212cc6c96959e009a9705f94f2ed8b4f4':
  Bug 4159373 Use HDCP debug settings
This commit is contained in:
Glenn Kasten
2011-03-23 17:06:12 -07:00
committed by Android Git Automerger
parent 503735099d 0b1b2a3212
commit 503f4daf01
1 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
media/libstagefright/AwesomePlayer.cpp
View File

@@ -14,6 +14,8 @@
* limitations under the License. * limitations under the License.
*/ */
#define DEBUG_HDCP
//#define LOG_NDEBUG 0 //#define LOG_NDEBUG 0
#define LOG_TAG "AwesomePlayer" #define LOG_TAG "AwesomePlayer"
#include <utils/Log.h> #include <utils/Log.h>
@@ -50,6 +52,8 @@
#include <media/stagefright/foundation/ALooper.h> #include <media/stagefright/foundation/ALooper.h>
#include <media/stagefright/foundation/AMessage.h> #include <media/stagefright/foundation/AMessage.h>
#include <cutils/properties.h>
#define USE_SURFACE_ALLOC 1 #define USE_SURFACE_ALLOC 1
#define FRAME_DROP_FREQ 0 #define FRAME_DROP_FREQ 0
@@ -1192,9 +1196,42 @@ status_t AwesomePlayer::initVideoDecoder(uint32_t flags) {
// (USE_SURFACE_ALLOC && (mSurface != 0) && // (USE_SURFACE_ALLOC && (mSurface != 0) &&
// (mSurface->getFlags() & ISurfaceComposer::eProtectedByApp)) // (mSurface->getFlags() & ISurfaceComposer::eProtectedByApp))
// will be true, but that part is already handled by SurfaceFlinger. // will be true, but that part is already handled by SurfaceFlinger.
#ifdef DEBUG_HDCP
// For debugging, we allow a system property to control the protected usage.
// In case of uninitialized or unexpected property, we default to "DRM only".
bool setProtectionBit = false;
char value[PROPERTY_VALUE_MAX];
if (property_get("persist.sys.hdcp_checking", value, NULL)) {
if (!strcmp(value, "never")) {
// nop
} else if (!strcmp(value, "always")) {
setProtectionBit = true;
} else if (!strcmp(value, "drm-only")) {
if (mDecryptHandle != NULL) {
setProtectionBit = true;
}
// property value is empty, or unexpected value
} else {
if (mDecryptHandle != NULL) {
setProtectionBit = true;
}
}
// can' read property value
} else {
if (mDecryptHandle != NULL) {
setProtectionBit = true;
}
}
// note that usage bit is already cleared, so no need to clear it in the "else" case
if (setProtectionBit) {
flags |= OMXCodec::kEnableGrallocUsageProtected;
}
#else
if (mDecryptHandle != NULL) { if (mDecryptHandle != NULL) {
flags |= OMXCodec::kEnableGrallocUsageProtected; flags |= OMXCodec::kEnableGrallocUsageProtected;
} }
#endif
LOGV("initVideoDecoder flags=0x%x", flags); LOGV("initVideoDecoder flags=0x%x", flags);
mVideoSource = OMXCodec::Create( mVideoSource = OMXCodec::Create(
mClient.interface(), mVideoTrack->getFormat(), mClient.interface(), mVideoTrack->getFormat(),