Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am be8fbb8f: Merge "Remove unused field from MediaMuxer"

Browse Source 
* commit 'be8fbb8fb63fddac2310dfbafa2594ed165b16b1':
  Remove unused field from MediaMuxer
This commit is contained in:
Narayan Kamath
2013-12-18 10:14:45 -08:00
committed by Android Git Automerger
parent 39d7630234 be8fbb8fb6
commit 4dd5c37711
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/java/android/media/MediaMuxer.java
View File

@@ -65,8 +65,6 @@ import java.util.Map;
final public class MediaMuxer { final public class MediaMuxer {
private long mNativeContext;
static { static {
System.loadLibrary("media_jni"); System.loadLibrary("media_jni");
} }

7
media/jni/android_media_MediaMuxer.cpp
View File

@@ -31,7 +31,6 @@
namespace android { namespace android {
struct fields_t { struct fields_t {
jfieldID context;
jmethodID arrayID; jmethodID arrayID;
}; };
@@ -252,12 +251,6 @@ int register_android_media_MediaMuxer(JNIEnv *env) {
int err = AndroidRuntime::registerNativeMethods(env, int err = AndroidRuntime::registerNativeMethods(env,
"android/media/MediaMuxer", gMethods, NELEM(gMethods)); "android/media/MediaMuxer", gMethods, NELEM(gMethods));
jclass clazz = env->FindClass("android/media/MediaMuxer");
CHECK(clazz != NULL);
gFields.context = env->GetFieldID(clazz, "mNativeContext", "J");
CHECK(gFields.context != NULL);
jclass byteBufClass = env->FindClass("java/nio/ByteBuffer"); jclass byteBufClass = env->FindClass("java/nio/ByteBuffer");
CHECK(byteBufClass != NULL); CHECK(byteBufClass != NULL);