Merge "Revert "Notify the OMX component that it's going to be used in "secure" mode.""
diff --git a/include/media/stagefright/HardwareAPI.h b/include/media/stagefright/HardwareAPI.h
index d785c48..32eed3f 100644
--- a/include/media/stagefright/HardwareAPI.h
+++ b/include/media/stagefright/HardwareAPI.h
@@ -73,16 +73,6 @@
OMX_BOOL bStoreMetaData;
};
-// A pointer to this struct is passed to OMX_SetParameter() when the extension
-// index "OMX.google.android.index.enableSecureMode"
-// is given.
-//
-struct EnableSecureModeParams {
- OMX_U32 nSize;
- OMX_VERSIONTYPE nVersion;
- OMX_BOOL bEnableSecureMode;
-};
-
// A pointer to this struct is passed to OMX_SetParameter when the extension
// index for the 'OMX.google.android.index.useAndroidNativeBuffer' extension is
// given. This call will only be performed if a prior call was made with the
diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h
index 2a1b3d8..2932744 100644
--- a/include/media/stagefright/OMXCodec.h
+++ b/include/media/stagefright/OMXCodec.h
@@ -319,8 +319,6 @@
void initOutputFormat(const sp<MetaData> &inputFormat);
status_t initNativeWindow();
- status_t enableSecureMode();
-
void dumpPortStatus(OMX_U32 portIndex);
status_t configureCodec(const sp<MetaData> &meta);
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 @@
}
}
- 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(¶ms);
-
- params.bEnableSecureMode = OMX_TRUE;
-
- return mOMX->setConfig(mNode, index, ¶ms, sizeof(params));
-}
-
void OMXCodec::setMinBufferSize(OMX_U32 portIndex, OMX_U32 size) {
OMX_PARAM_PORTDEFINITIONTYPE def;
InitOMXParams(&def);