From cac873bd4ad6ffc8587e3d77fece5abcf2804f4f Mon Sep 17 00:00:00 2001 From: Pannag Sanketi Date: Mon, 25 Jul 2011 17:20:50 -0700 Subject: Fixing up Mediarecorder for MFF For using the MediaRecorder in MFF (Mobile Filter Framework), getMediaRecorder method in mediarecorder jni was earlier changed to a non static method. Changed it back to a static method. Also, added a new source type to MediaRecorder.VideoSource for recording GRalloc buffers. Change-Id: I031fad45c12b0ac9602d9e451d4767e95a86234d --- media/java/android/media/MediaRecorder.java | 2 ++ media/jni/android_media_MediaRecorder.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java index 72069ac19a90..8f5d0e508651 100644 --- a/media/java/android/media/MediaRecorder.java +++ b/media/java/android/media/MediaRecorder.java @@ -176,6 +176,8 @@ public class MediaRecorder public static final int DEFAULT = 0; /** Camera video source */ public static final int CAMERA = 1; + /** @hide */ + public static final int GRALLOC_BUFFER = 2; } /** diff --git a/media/jni/android_media_MediaRecorder.cpp b/media/jni/android_media_MediaRecorder.cpp index 922f7edcb721..e1d3219cadbf 100644 --- a/media/jni/android_media_MediaRecorder.cpp +++ b/media/jni/android_media_MediaRecorder.cpp @@ -127,7 +127,7 @@ static bool process_media_recorder_call(JNIEnv *env, status_t opStatus, const ch return false; } -sp getMediaRecorder(JNIEnv* env, jobject thiz) +static sp getMediaRecorder(JNIEnv* env, jobject thiz) { Mutex::Autolock l(sLock); MediaRecorder* const p = (MediaRecorder*)env->GetIntField(thiz, fields.context); -- cgit v1.2.3-59-g8ed1b