commit cac873bd4ad6ffc8587e3d77fece5abcf2804f4f
author Pannag Sanketi <psanketi@google.com> Mon Jul 25 17:20:50 2011 -0700
committer Pannag Sanketi <psanketi@google.com> Mon Jul 25 17:38:15 2011 -0700
tree b1eca99095ee19c9cc5d1f002f44e7dcd093fc11
parent 47a7c68ac862ecfc68f35a63b330cbda7131cd66

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

diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java
index 72069ac..8f5d0e5 100644
--- a/media/java/android/media/MediaRecorder.java
+++ b/media/java/android/media/MediaRecorder.java
@@ -176,6 +176,8 @@
         public static final int DEFAULT = 0;
         /** Camera video source */
         public static final int CAMERA = 1;
+        /** @hide */
+        public static final int GRALLOC_BUFFER = 2;
     }
 
     /**

media/jni/android_media_MediaRecorder.cpp

diff --git a/media/jni/android_media_MediaRecorder.cpp b/media/jni/android_media_MediaRecorder.cpp
index 922f7ed..e1d3219 100644
--- a/media/jni/android_media_MediaRecorder.cpp
+++ b/media/jni/android_media_MediaRecorder.cpp
@@ -127,7 +127,7 @@
     return false;
 }
 
-sp<MediaRecorder> getMediaRecorder(JNIEnv* env, jobject thiz)
+static sp<MediaRecorder> getMediaRecorder(JNIEnv* env, jobject thiz)
 {
     Mutex::Autolock l(sLock);
     MediaRecorder* const p = (MediaRecorder*)env->GetIntField(thiz, fields.context);