summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-08-10 13:03:24 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-10 13:03:24 -0700
commit96d8a6f8ec2b28841ccfafcdf8813cd940d99f18 (patch)
tree19d51183da151b81239963b6b9038d16f79b4d6e /media/libstagefright
parentfd545de7cd43d6335eb3e44df36336728a8e1e4c (diff)
parent422e3f749697ee264ea377bf92e6b65912ba7978 (diff)
downloadframeworks_base-96d8a6f8ec2b28841ccfafcdf8813cd940d99f18.zip
frameworks_base-96d8a6f8ec2b28841ccfafcdf8813cd940d99f18.tar.gz
frameworks_base-96d8a6f8ec2b28841ccfafcdf8813cd940d99f18.tar.bz2
Merge "Revert "Notify the OMX component that it's going to be used in "secure" mode.""
Diffstat (limited to 'media/libstagefright')
-rwxr-xr-xmedia/libstagefright/OMXCodec.cpp23
1 files changed, 0 insertions, 23 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 5327f3b..a4f3922 100755
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -720,32 +720,9 @@ status_t OMXCodec::configureCodec(const sp<MetaData> &meta) {
}
}
- if (mFlags & kUseSecureInputBuffers) {
- (void)enableSecureMode();
- }
-
return OK;
}
-status_t OMXCodec::enableSecureMode() {
- OMX_INDEXTYPE index;
-
- status_t err =
- mOMX->getExtensionIndex(
- mNode, "OMX.google.android.index.enableSecureMode", &index);
-
- if (err != OK) {
- return err;
- }
-
- EnableSecureModeParams params;
- InitOMXParams(&params);
-
- params.bEnableSecureMode = OMX_TRUE;
-
- return mOMX->setConfig(mNode, index, &params, sizeof(params));
-}
-
void OMXCodec::setMinBufferSize(OMX_U32 portIndex, OMX_U32 size) {
OMX_PARAM_PORTDEFINITIONTYPE def;
InitOMXParams(&def);