diff options
| author | Andreas Huber <andih@google.com> | 2012-04-03 13:32:16 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2012-04-03 14:16:07 -0700 |
| commit | 0e97fc248eaea7b4c95053618ddedf0af638110e (patch) | |
| tree | bbc77815591f6f4ffecc7e42e55a7bab89c9049e | |
| parent | 4a727e342134f409c2cf7cf2f77dbe9c15128337 (diff) | |
| download | frameworks_base-0e97fc248eaea7b4c95053618ddedf0af638110e.zip frameworks_base-0e97fc248eaea7b4c95053618ddedf0af638110e.tar.gz frameworks_base-0e97fc248eaea7b4c95053618ddedf0af638110e.tar.bz2 | |
More DRM/crypto support.
related-to-bug: 6275919
Change-Id: I9179c03f1f91f939afcb3b1c6514a200bf586c93
| -rw-r--r-- | media/java/android/media/MediaCodec.java | 1 | ||||
| -rw-r--r-- | media/jni/android_media_MediaCodec.cpp | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java index d06e302..7629d60 100644 --- a/media/java/android/media/MediaCodec.java +++ b/media/java/android/media/MediaCodec.java @@ -83,7 +83,6 @@ public class MediaCodec public native final void release(); public static int CONFIGURE_FLAG_ENCODE = 1; - public static int CONFIGURE_FLAG_SECURE = 2; /** Configures a component. * @param format A map of string/value pairs describing the input format diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp index 04d7c22..4b7a811 100644 --- a/media/jni/android_media_MediaCodec.cpp +++ b/media/jni/android_media_MediaCodec.cpp @@ -29,6 +29,7 @@ #include <gui/Surface.h> #include <gui/SurfaceTextureClient.h> +#include <media/ICrypto.h> #include <media/stagefright/MediaCodec.h> #include <media/stagefright/foundation/ABuffer.h> #include <media/stagefright/foundation/ADebug.h> @@ -102,7 +103,7 @@ status_t JMediaCodec::configure( if (surfaceTexture != NULL) { client = new SurfaceTextureClient(surfaceTexture); } - return mCodec->configure(format, client, flags); + return mCodec->configure(format, client, NULL /* crypto */, flags); } status_t JMediaCodec::start() { @@ -387,7 +388,7 @@ static jint android_media_MediaCodec_dequeueOutputBuffer( if (codec == NULL) { jniThrowException(env, "java/lang/IllegalStateException", NULL); - return NULL; + return 0; } size_t index; |