Snap for 11169761 from c74e2b85a48ed555330433b6a4b005021b416334 to 24Q1-release (14c3af53) · Commits · e / os / android_frameworks_av

PREUPLOAD.cfg

+3 −2

Original line number	Diff line number	Diff line
		@@ -9,7 +9,8 @@ clang_format = true
		[Builtin Hooks Options]
		# Only turn on clang-format check for the following subfolders.
		clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp
		media/libmediatranscoding/
		services/mediatranscoding/
		media/libaudioclient/tests/
		media/libaudiohal/tests/
		media/libmediatranscoding/
		services/camera/virtualcamera/
		services/mediatranscoding/

camera/camera_platform.aconfig

+6 −0

Original line number	Diff line number	Diff line
		@@ -35,3 +35,9 @@ flag {
		bug: "307409002"
		}

		flag {
		namespace: "camera_platform"
		name: "session_hal_buf_manager"
		description: "Enable or disable HAL buffer manager as requested by the camera HAL"
		bug: "311263114"
		}
		No newline at end of file

media/audio/aconfig/audioserver.aconfig

+14 −5

Original line number	Diff line number	Diff line
		@@ -5,13 +5,12 @@
		package: "com.android.media.audioserver"

		flag {
		name: "mutex_priority_inheritance"
		name: "direct_track_reprioritization"
		namespace: "media_audio"
		description:
		"Enable mutex priority inheritance in audioserver (std::mutex does not normally transfer "
		"priority from the blocked thread to the blocking thread). "
		"This feature helps reduce audio glitching caused by low priority blocking threads."
		bug: "209491695"
		"Modify opening a direct output on a mixport to disrupt existing clients instead "
		"of failing to open when resource limit is reached"
		bug: "294525897"
		}

		flag {
		@@ -20,3 +19,13 @@ flag {
		description: "Improve fdtostring implementation to properly handle timing out."
		bug: "306283018"
		}

		flag {
		name: "mutex_priority_inheritance"
		namespace: "media_audio"
		description:
		"Enable mutex priority inheritance in audioserver (std::mutex does not normally transfer "
		"priority from the blocked thread to the blocking thread). "
		"This feature helps reduce audio glitching caused by low priority blocking threads."
		bug: "209491695"
		}

media/libeffects/downmix/aidl/DownmixContext.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -66,8 +66,8 @@ IEffect::Status DownmixContext::lvmProcess(float* in, float* out, int samples) {
		LOG(DEBUG) << __func__ << " in " << in << " out " << out << " sample " << samples;
		IEffect::Status status = {EX_ILLEGAL_ARGUMENT, 0, 0};

		if (in == nullptr \|\| out == nullptr \|\| getInputFrameSize() != getOutputFrameSize() \|\|
		getInputFrameSize() == 0) {
		if (in == nullptr \|\| out == nullptr \|\|
		getCommon().input.frameCount != getCommon().output.frameCount \|\| getInputFrameSize() == 0) {
		return status;
		}

		@@ -112,7 +112,7 @@ IEffect::Status DownmixContext::lvmProcess(float* in, float* out, int samples) {
		void DownmixContext::init_params(const Parameter::Common& common) {
		// when configuring the effect, do not allow a blank or unsupported channel mask
		AudioChannelLayout channelMask = common.input.base.channelMask;
		if (isChannelMaskValid(channelMask)) {
		if (!isChannelMaskValid(channelMask)) {
		LOG(ERROR) << "Downmix_Configure error: input channel mask " << channelMask.toString()
		<< " not supported";
		} else {
		@@ -123,7 +123,7 @@ void DownmixContext::init_params(const Parameter::Common& common) {
		}

		bool DownmixContext::isChannelMaskValid(AudioChannelLayout channelMask) {
		if (channelMask.getTag() == AudioChannelLayout::layoutMask) return false;
		if (channelMask.getTag() != AudioChannelLayout::layoutMask) return false;
		int chMask = channelMask.get<AudioChannelLayout::layoutMask>();
		// check against unsupported channels (up to FCC_26)
		constexpr uint32_t MAXIMUM_CHANNEL_MASK = AudioChannelLayout::LAYOUT_22POINT2 \|

media/libmediaplayerservice/tests/DrmSessionManager_test.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -148,8 +148,8 @@ static const std::vector<uint8_t> kTestSessionId3{9, 0};
		class DrmSessionManagerTest : public ::testing::Test {
		public:
		DrmSessionManagerTest()
		: mService(::ndk::SharedRefBase::make<ResourceManagerService>
		(new FakeProcessInfo(), new FakeSystemCallback())),
		: mService(ResourceManagerService::Create(
		new FakeProcessInfo(), new FakeSystemCallback())),
		mDrmSessionManager(new DrmSessionManager(mService)),
		mTestDrm1(::ndk::SharedRefBase::make<FakeDrm>(
		kTestSessionId1, mDrmSessionManager)),