Snap for 12537680 from d1ba95ce0984e4d88f2f0ad5cf17b06cfdda2a4a to 25Q1-release (de6e38f4) · Commits · e / os / android_frameworks_av

media/audio/aconfig/Android.bp

+6 −0

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

		cc_aconfig_library {
		name: "android.media.audio-aconfig-cc",
		aconfig_declarations: "android.media.audio-aconfig",
		defaults: ["audio-aconfig-cc-defaults"],
		}

		cc_aconfig_library {
		name: "android.media.audiopolicy-aconfig-cc",
		aconfig_declarations: "android.media.audiopolicy-aconfig",

+18 −0

Original line number	Diff line number	Diff line
		# Top level framework (android.media) flags
		# Only add flags here which must be included in framework.jar
		# Flags used in both framework.jar and native can be added here
		#
		# Please add flags in alphabetical order.

		@@ -22,6 +23,15 @@ flag {
		bug: "302323921"
		}

		flag {
		name: "concurrent_audio_record_bypass_permission"
		namespace: "media_audio"
		description:
		"New privileged permission to allow bypassing concurrent audio"
		"capture rules."
		bug: "374751406"
		}

		flag{
		name: "enable_ringtone_haptics_customization"
		namespace: "media_audio"
		@@ -144,6 +154,14 @@ flag {
		is_fixed_read_only: true
		}

		flag {
		name: "routed_device_ids"
		namespace: "media_audio"
		description:
		"Enable Java and native functions to get"
		"multiple routed device ids"
		bug: "367816690"
		}

		# TODO remove
		flag {

+5 −0

Original line number	Diff line number	Diff line
		@@ -466,6 +466,7 @@ static int MapC2ComplexityToAOMSpeed (int c2Complexity) {

		aom_codec_err_t C2SoftAomEnc::setupCodecParameters() {
		aom_codec_err_t codec_return = AOM_CODEC_OK;
		const int maxIntraBitratePct = mBitrateControlMode == AOM_CBR ? 300 : 450;

		codec_return = aom_codec_control(mCodecContext, AV1E_SET_TARGET_SEQ_LEVEL_IDX, mAV1EncLevel);
		if (codec_return != AOM_CODEC_OK) goto BailOut;
		@@ -492,6 +493,10 @@ aom_codec_err_t C2SoftAomEnc::setupCodecParameters() {
		codec_return = aom_codec_control(mCodecContext, AV1E_SET_AQ_MODE, 3);
		if (codec_return != AOM_CODEC_OK) goto BailOut;

		codec_return = aom_codec_control(mCodecContext, AOME_SET_MAX_INTRA_BITRATE_PCT,
		maxIntraBitratePct);
		if (codec_return != AOM_CODEC_OK) goto BailOut;

		codec_return = aom_codec_control(mCodecContext, AV1E_SET_COEFF_COST_UPD_FREQ, 3);
		if (codec_return != AOM_CODEC_OK) goto BailOut;

+1 −0

Original line number	Diff line number	Diff line
		@@ -66,6 +66,7 @@ cc_fuzz {
		"libmedia_helper",
		"libmediametrics",
		"libprocessgroup",
		"libprocessgroup_util",
		"mediametricsservice-aidl-cpp",
		"shared-file-region-aidl-cpp",
		],

+1 −0