Snap for 6170127 from 694901763dc900e284ca66117983490b0e284397 to rvc-release (6e5d923a) · Commits · e / os / android_frameworks_av

camera/ndk/NdkCameraMetadata.cpp

+13 −6

Original line number	Diff line number	Diff line
		@@ -50,24 +50,31 @@ bool InitJni(JNIEnv* env) {
		if (cameraMetadataClazz == nullptr) {
		return false;
		}
		android_hardware_camera2_CameraMetadata_getNativeMetadataPtr =
		const jmethodID cameraMetadata_getNativeMetadataPtr =
		env->GetMethodID(cameraMetadataClazz, "getNativeMetadataPtr", "()J");
		if (android_hardware_camera2_CameraMetadata_getNativeMetadataPtr == nullptr) {
		if (cameraMetadata_getNativeMetadataPtr == nullptr) {
		return false;
		}

		android_hardware_camera2_CameraCharacteristics_clazz = env->FindClass(
		const jclass cameraCharacteristics_clazz = env->FindClass(
		android_hardware_camera2_CameraCharacteristics_jniClassName);
		if (android_hardware_camera2_CameraCharacteristics_clazz == nullptr) {
		if (cameraCharacteristics_clazz == nullptr) {
		return false;
		}

		android_hardware_camera2_CaptureResult_clazz = env->FindClass(
		const jclass captureResult_clazz = env->FindClass(
		android_hardware_camera2_CaptureResult_jniClassName);
		if (android_hardware_camera2_CaptureResult_clazz == nullptr) {
		if (captureResult_clazz == nullptr) {
		return false;
		}

		android_hardware_camera2_CameraMetadata_getNativeMetadataPtr =
		cameraMetadata_getNativeMetadataPtr;
		android_hardware_camera2_CameraCharacteristics_clazz =
		static_cast<jclass>(env->NewGlobalRef(cameraCharacteristics_clazz));
		android_hardware_camera2_CaptureResult_clazz =
		static_cast<jclass>(env->NewGlobalRef(captureResult_clazz));

		return true;
		}();
		return ok;

+1 −0

Original line number	Diff line number	Diff line
		@@ -400,6 +400,7 @@ const AudioFlagConverter::Table AudioFlagConverter::mTable[] = {
		MAKE_STRING_FROM_ENUM(AUDIO_FLAG_LOW_LATENCY),
		MAKE_STRING_FROM_ENUM(AUDIO_FLAG_DEEP_BUFFER),
		MAKE_STRING_FROM_ENUM(AUDIO_FLAG_NO_MEDIA_PROJECTION),
		MAKE_STRING_FROM_ENUM(AUDIO_FLAG_MUTE_HAPTIC),
		MAKE_STRING_FROM_ENUM(AUDIO_FLAG_NO_SYSTEM_CAPTURE),
		MAKE_STRING_FROM_ENUM(AUDIO_FLAG_CAPTURE_PRIVATE),
		TERMINATOR

+3 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,9 @@
		// for that string to the caller. The caller is responsible for calling free()
		// on that pointer when done using the value.

		#include <sys/cdefs.h>
		#include <sys/types.h>

		__BEGIN_DECLS

		// internally re-cast to the behind-the-scenes C++ class instance

+1 −1

Original line number	Diff line number	Diff line
		@@ -2518,7 +2518,7 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) {
		// format as necessary.
		int32_t flags = 0;
		(void) buffer->meta()->findInt32("flags", &flags);
		if (flags & BUFFER_FLAG_CODECCONFIG) {
		if ((flags & BUFFER_FLAG_CODECCONFIG) && !(mFlags & kFlagIsSecure)) {
		status_t err =
		amendOutputFormatWithCodecSpecificData(buffer);

0 → 100644

+47 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		cc_test {
		name: "Mpeg4H263DecoderTest",
		gtest: true,

		srcs: [
		"Mpeg4H263DecoderTest.cpp",
		],

		shared_libs: [
		"liblog",
		],

		static_libs: [
		"libstagefright_m4vh263dec",
		"libstagefright_foundation",
		],

		cflags: [
		"-DOSCL_IMPORT_REF=",
		"-Werror",
		"-Wall",
		],

		sanitize: {
		misc_undefined: [
		"unsigned-integer-overflow",
		"signed-integer-overflow",
		],
		cfi: true,
		},
		}