Merge "Frameworks/base: Wall Werror in media/jni" (6957369d) · Commits · e / os / android_frameworks_base

media/jni/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ LOCAL_C_INCLUDES += \
		$(PV_INCLUDES) \
		$(JNI_H_INCLUDE)

		LOCAL_CFLAGS +=
		LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code

		LOCAL_MODULE:= libmedia_jni

media/jni/android_media_AmrInputStream.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ struct GsmAmrEncoderState {
		};

		static jlong android_media_AmrInputStream_GsmAmrEncoderNew
		(JNIEnv *env, jclass clazz) {
		(JNIEnv env, jclass / clazz */) {
		GsmAmrEncoderState* gae = new GsmAmrEncoderState();
		if (gae == NULL) {
		jniThrowRuntimeException(env, "Out of memory");
		@@ -59,7 +59,7 @@ static jlong android_media_AmrInputStream_GsmAmrEncoderNew
		}

		static void android_media_AmrInputStream_GsmAmrEncoderInitialize
		(JNIEnv *env, jclass clazz, jlong gae) {
		(JNIEnv env, jclass / clazz */, jlong gae) {
		GsmAmrEncoderState state = (GsmAmrEncoderState ) gae;
		int32_t nResult = AMREncodeInit(&state->mEncState, &state->mSidState, false);
		if (nResult != OK) {
		@@ -69,7 +69,7 @@ static void android_media_AmrInputStream_GsmAmrEncoderInitialize
		}

		static jint android_media_AmrInputStream_GsmAmrEncoderEncode
		(JNIEnv *env, jclass clazz,
		(JNIEnv env, jclass / clazz */,
		jlong gae, jbyteArray pcm, jint pcmOffset, jbyteArray amr, jint amrOffset) {

		jbyte inBuf[BYTES_PER_FRAME];
		@@ -105,7 +105,7 @@ static jint android_media_AmrInputStream_GsmAmrEncoderEncode
		}

		static void android_media_AmrInputStream_GsmAmrEncoderCleanup
		(JNIEnv *env, jclass clazz, jlong gae) {
		(JNIEnv* /* env /, jclass / clazz */, jlong gae) {
		GsmAmrEncoderState state = (GsmAmrEncoderState ) gae;
		AMREncodeExit(&state->mEncState, &state->mSidState);
		state->mEncState = NULL;
		@@ -113,7 +113,7 @@ static void android_media_AmrInputStream_GsmAmrEncoderCleanup
		}

		static void android_media_AmrInputStream_GsmAmrEncoderDelete
		(JNIEnv *env, jclass clazz, jlong gae) {
		(JNIEnv* /* env /, jclass / clazz */, jlong gae) {
		delete (GsmAmrEncoderState*)gae;
		}

media/jni/android_media_ImageReader.cpp

+0 −1

Original line number	Diff line number	Diff line
		@@ -502,7 +502,6 @@ static jint Image_imageGetPixelStride(JNIEnv* env, CpuConsumer::LockedBuffer* bu
		case HAL_PIXEL_FORMAT_Y8:
		// Single plane 8bpp data.
		ALOG_ASSERT(idx == 0, "Wrong index: %d", idx);
		pixelStride;
		break;
		case HAL_PIXEL_FORMAT_YV12:
		pixelStride = 1;

media/jni/android_media_MediaCodecList.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ static sp<IMediaCodecList> getCodecList(JNIEnv *env) {
		}

		static jint android_media_MediaCodecList_getCodecCount(
		JNIEnv *env, jobject thiz) {
		JNIEnv env, jobject / thiz */) {
		sp<IMediaCodecList> mcl = getCodecList(env);
		if (mcl == NULL) {
		// Runtime exception already pending.
		@@ -52,7 +52,7 @@ static jint android_media_MediaCodecList_getCodecCount(
		}

		static jstring android_media_MediaCodecList_getCodecName(
		JNIEnv *env, jobject thiz, jint index) {
		JNIEnv env, jobject / thiz */, jint index) {
		sp<IMediaCodecList> mcl = getCodecList(env);
		if (mcl == NULL) {
		// Runtime exception already pending.
		@@ -70,7 +70,7 @@ static jstring android_media_MediaCodecList_getCodecName(
		}

		static jint android_media_MediaCodecList_findCodecByName(
		JNIEnv *env, jobject thiz, jstring name) {
		JNIEnv env, jobject / thiz */, jstring name) {
		if (name == NULL) {
		jniThrowException(env, "java/lang/IllegalArgumentException", NULL);
		return -ENOENT;
		@@ -95,7 +95,7 @@ static jint android_media_MediaCodecList_findCodecByName(
		}

		static jboolean android_media_MediaCodecList_isEncoder(
		JNIEnv *env, jobject thiz, jint index) {
		JNIEnv env, jobject / thiz */, jint index) {
		sp<IMediaCodecList> mcl = getCodecList(env);
		if (mcl == NULL) {
		// Runtime exception already pending.
		@@ -112,7 +112,7 @@ static jboolean android_media_MediaCodecList_isEncoder(
		}

		static jarray android_media_MediaCodecList_getSupportedTypes(
		JNIEnv *env, jobject thiz, jint index) {
		JNIEnv env, jobject / thiz */, jint index) {
		sp<IMediaCodecList> mcl = getCodecList(env);
		if (mcl == NULL) {
		// Runtime exception already pending.
		@@ -144,7 +144,7 @@ static jarray android_media_MediaCodecList_getSupportedTypes(
		}

		static jobject android_media_MediaCodecList_getCodecCapabilities(
		JNIEnv *env, jobject thiz, jint index, jstring type) {
		JNIEnv env, jobject / thiz */, jint index, jstring type) {
		if (type == NULL) {
		jniThrowException(env, "java/lang/IllegalArgumentException", NULL);
		return NULL;
		@@ -262,7 +262,7 @@ static jobject android_media_MediaCodecList_getCodecCapabilities(
		return caps;
		}

		static void android_media_MediaCodecList_native_init(JNIEnv *env) {
		static void android_media_MediaCodecList_native_init(JNIEnv* /* env */) {
		}

		static JNINativeMethod gMethods[] = {

media/jni/android_media_MediaCrypto.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -224,7 +224,7 @@ static void android_media_MediaCrypto_native_finalize(
		}

		static jboolean android_media_MediaCrypto_isCryptoSchemeSupportedNative(
		JNIEnv *env, jobject thiz, jbyteArray uuidObj) {
		JNIEnv env, jobject / thiz */, jbyteArray uuidObj) {
		jsize uuidLength = env->GetArrayLength(uuidObj);

		if (uuidLength != 16) {