Merge "Clean up mediametadataretriever_default_rgba8888 flag" into main (817428e7) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+0 −19

Original line number	Original line	Diff line number	Diff line
	@@ -1292,25 +1292,6 @@ java_aconfig_library {
	defaults: ["framework-minus-apex-aconfig-java-defaults"],		defaults: ["framework-minus-apex-aconfig-java-defaults"],
	}		}

	// Media
	aconfig_declarations {
	name: "android.media.playback.flags-aconfig",
	package: "com.android.media.playback.flags",
	container: "system",
	srcs: ["media/jni/playback_flags.aconfig"],
	}

	cc_aconfig_library {
	name: "android.media.playback.flags-aconfig-cc",
	aconfig_declarations: "android.media.playback.flags-aconfig",
	}

	java_aconfig_library {
	name: "android.media.playback.flags-aconfig-java",
	aconfig_declarations: "android.media.playback.flags-aconfig",
	defaults: ["framework-minus-apex-aconfig-java-defaults"],
	}

	// DevicePolicy		// DevicePolicy
	aconfig_declarations {		aconfig_declarations {
	name: "device_policy_aconfig_flags",		name: "device_policy_aconfig_flags",

media/jni/Android.bp

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -103,7 +103,6 @@ cc_library_shared {
	"libstagefright_persistentsurface",		"libstagefright_persistentsurface",
	"libui",		"libui",
	"libutils",		"libutils",
	"server_configurable_flags",
	],		],

	header_libs: [		header_libs: [
	@@ -114,7 +113,6 @@ cc_library_shared {
	static_libs: [		static_libs: [
	"android.companion.virtualdevice.flags-aconfig-cc",		"android.companion.virtualdevice.flags-aconfig-cc",
	"android.media.codec-aconfig-cc",		"android.media.codec-aconfig-cc",
	"android.media.playback.flags-aconfig-cc",
	"libgrallocusage",		"libgrallocusage",
	"libmedia_midiiowrapper",		"libmedia_midiiowrapper",
	],		],

media/jni/android_media_MediaMetadataRetriever.cpp

+3 −10

Original line number	Original line	Diff line number	Diff line
	@@ -35,9 +35,7 @@
	#include "android_media_MediaDataSource.h"		#include "android_media_MediaDataSource.h"
	#include "android_media_Streams.h"		#include "android_media_Streams.h"
	#include "android_util_Binder.h"		#include "android_util_Binder.h"
	#include <com_android_media_playback_flags.h>

	namespace playback_flags = com::android::media::playback::flags;
	using namespace android;		using namespace android;

	struct fields_t {		struct fields_t {
	@@ -343,10 +341,9 @@ static jobject getBitmapFromVideoFrame(
	return jBitmap;		return jBitmap;
	}		}

	static AndroidBitmapFormat getColorFormat(JNIEnv *env, jobject options,		static AndroidBitmapFormat getColorFormat(JNIEnv *env, jobject options) {
	AndroidBitmapFormat defaultPreferred = ANDROID_BITMAP_FORMAT_RGBA_8888) {
	if (options == NULL) {		if (options == NULL) {
	return defaultPreferred;		return ANDROID_BITMAP_FORMAT_RGBA_8888;
	}		}

	ScopedLocalRef<jobject> inConfig(env, env->GetObjectField(options, fields.inPreferredConfig));		ScopedLocalRef<jobject> inConfig(env, env->GetObjectField(options, fields.inPreferredConfig));
	@@ -377,11 +374,7 @@ static jobject android_media_MediaMetadataRetriever_getFrameAtTime(
	return NULL;		return NULL;
	}		}

	AndroidBitmapFormat defaultColorFormat =		AndroidBitmapFormat colorFormat = getColorFormat(env, params);
	playback_flags::mediametadataretriever_default_rgba8888()
	? ANDROID_BITMAP_FORMAT_RGBA_8888
	: ANDROID_BITMAP_FORMAT_RGB_565;
	AndroidBitmapFormat colorFormat = getColorFormat(env, params, defaultColorFormat);

	// Call native method to retrieve a video frame		// Call native method to retrieve a video frame
	VideoFrame *videoFrame = NULL;		VideoFrame *videoFrame = NULL;

media/jni/playback_flags.aconfig

deleted100644 → 0

+0 −9

Original line number	Original line	Diff line number	Diff line
	package: "com.android.media.playback.flags"
	container: "system"

	flag {
	name: "mediametadataretriever_default_rgba8888"
	namespace: "media_solutions"
	description: "Change MediaMetadataRetriever to use RGBA8888 for bitmap handling by default."
	bug: "298965955"
	}

media/tests/MediaFrameworkTest/Android.bp

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -20,8 +20,6 @@ android_test {
	"androidx.test.ext.junit",		"androidx.test.ext.junit",
	"androidx.test.rules",		"androidx.test.rules",
	"android-ex-camera2",		"android-ex-camera2",
	"android.media.playback.flags-aconfig-java",
	"flag-junit",
	"testng",		"testng",
	"truth",		"truth",
	"collector-device-lib-platform",		"collector-device-lib-platform",