Snap for 12735943 from 55d49ff31a58708497efe39db85db3379c15bb65 to 25Q1-release (6e1affe3) · Commits · e / os / android_frameworks_av

aidl/com/android/media/permission/PermissionEnum.aidl

+2 −1

Original line number	Diff line number	Diff line
		@@ -38,5 +38,6 @@ enum PermissionEnum {
		CAPTURE_VOICE_COMMUNICATION_OUTPUT = 12,
		BLUETOOTH_CONNECT = 13,
		BYPASS_CONCURRENT_RECORD_AUDIO_RESTRICTION = 14,
		ENUM_SIZE = 15, // Not for actual usage, used by Java
		MODIFY_AUDIO_SETTINGS_PRIVILEGED = 15,
		ENUM_SIZE = 16, // Not for actual usage, used by Java
		}

media/libeffects/lvm/wrapper/Aidl/BundleContext.cpp

+20 −2

Original line number	Diff line number	Diff line
		@@ -93,7 +93,18 @@ void BundleContext::deInit() {
		RetCode BundleContext::setCommon(const Parameter::Common& common) {
		RetCode ret = EffectContext::setCommon(common);
		RETURN_VALUE_IF(ret != RetCode::SUCCESS, ret, " setCommonFailed");
		return init();
		if (mInstance) {
		LVM_ControlParams_t params;
		RETURN_VALUE_IF(LVM_SUCCESS != LVM_GetControlParameters(mInstance, &params),
		RetCode::ERROR_EFFECT_LIB_ERROR, "failGetControlParams");
		RETURN_VALUE_IF(RetCode::SUCCESS != applyCommonParameter(params),
		RetCode::ERROR_EFFECT_LIB_ERROR, " applyCommonParameterFailed");
		RETURN_VALUE_IF(LVM_SUCCESS != LVM_SetControlParameters(mInstance, &params),
		RetCode::ERROR_EFFECT_LIB_ERROR, "failSetControlParams");
		} else {
		RETURN_VALUE_IF(RetCode::SUCCESS != init(), RetCode::ERROR_EFFECT_LIB_ERROR, " initFailed");
		}
		return RetCode::SUCCESS;
		}

		RetCode BundleContext::enable() {
		@@ -605,7 +616,7 @@ RetCode BundleContext::setForcedDevice(
		return ret;
		}

		RetCode BundleContext::initControlParameter(LVM_ControlParams_t& params) const {
		RetCode BundleContext::applyCommonParameter(LVM_ControlParams_t& params) const {
		int outputChannelCount = ::aidl::android::hardware::audio::common::getChannelCount(
		mCommon.output.base.channelMask);
		auto outputChannelMaskConv = aidl2legacy_AudioChannelLayout_audio_channel_mask_t(
		@@ -627,6 +638,13 @@ RetCode BundleContext::initControlParameter(LVM_ControlParams_t& params) const {
		params.SourceFormat = LVM_MULTICHANNEL;
		}

		return RetCode::SUCCESS;
		}

		RetCode BundleContext::initControlParameter(LVM_ControlParams_t& params) const {
		RETURN_VALUE_IF(RetCode::SUCCESS != applyCommonParameter(params),
		RetCode::ERROR_EFFECT_LIB_ERROR, " applyCommonParameterFailed");

		/* General parameters */
		params.OperatingMode = LVM_MODE_ON;
		params.SpeakerType = LVM_HEADPHONES;

media/libeffects/lvm/wrapper/Aidl/BundleContext.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -135,6 +135,7 @@ class BundleContext final : public EffectContext {
		bool isBandLevelIndexInRange(const std::vector<Equalizer::BandLevel>& bandLevels) const;
		static LVM_EQNB_BandDef_t* getDefaultEqualizerBandDefs();
		static LVM_HeadroomBandDef_t* getDefaultEqualizerHeadroomBanDefs();
		RetCode applyCommonParameter(LVM_ControlParams_t& params) const;
		};

		} // namespace aidl::android::hardware::audio::effect

media/module/extractors/mpeg2/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -44,6 +44,7 @@ cc_library {

		shared_libs: [
		"libbase",
		"libutils",
		],

		header_libs: [
		@@ -70,7 +71,6 @@ cc_library {
		"libstagefright_foundation_without_imemory",
		"libstagefright_mpeg2extractor",
		"libstagefright_mpeg2support_nocrypto",
		"libutils",
		],

		apex_available: [

media/module/extractors/mpeg2/MPEG2PSExtractor.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -161,7 +161,7 @@ uint32_t MPEG2PSExtractor::flags() const {
		}

		status_t MPEG2PSExtractor::feedMore() {
		Mutex::Autolock autoLock(mLock);
		std::lock_guard<std::mutex> autoLock(mLock);

		// How much data we're reading at a time
		static const size_t kChunkSize = 8192;