Snap for 12580585 from 50cae8d9bc2492080de224f9620cad2c498289ee to 25Q1-release (29176a3d) · Commits · e / os / android_frameworks_av

camera/camera2/OutputConfiguration.cpp

+10 −3

Original line number	Diff line number	Diff line
		@@ -102,6 +102,12 @@ int OutputConfiguration::getMirrorMode(sp<IGraphicBufferProducer> surface) const
		return mMirrorMode;
		}

		if (mGbps.size() != mMirrorModeForProducers.size()) {
		ALOGE("%s: mGbps size doesn't match mMirrorModeForProducers: %zu vs %zu",
		__FUNCTION__, mGbps.size(), mMirrorModeForProducers.size());
		return mMirrorMode;
		}

		// Use per-producer mirror mode if available.
		for (size_t i = 0; i < mGbps.size(); i++) {
		if (mGbps[i] == surface) {
		@@ -350,6 +356,7 @@ OutputConfiguration::OutputConfiguration(sp<IGraphicBufferProducer>& gbp, int ro
		mStreamUseCase = ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_DEFAULT;
		mTimestampBase = TIMESTAMP_BASE_DEFAULT;
		mMirrorMode = MIRROR_MODE_AUTO;
		mMirrorModeForProducers.push_back(mMirrorMode);
		mUseReadoutTimestamp = false;
		mFormat = HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED;
		mDataspace = 0;
		@@ -367,9 +374,9 @@ OutputConfiguration::OutputConfiguration(
		mColorSpace(ANDROID_REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_UNSPECIFIED),
		mStreamUseCase(ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_DEFAULT),
		mTimestampBase(TIMESTAMP_BASE_DEFAULT),
		mMirrorMode(MIRROR_MODE_AUTO), mUseReadoutTimestamp(false),
		mFormat(HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED), mDataspace(0),
		mUsage(0) { }
		mMirrorMode(MIRROR_MODE_AUTO), mMirrorModeForProducers(gbps.size(), mMirrorMode),
		mUseReadoutTimestamp(false), mFormat(HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED),
		mDataspace(0), mUsage(0) { }

		status_t OutputConfiguration::writeToParcel(android::Parcel* parcel) const {

media/audio/aconfig/audio_framework.aconfig

+11 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,17 @@ flag {
		bug: "374751406"
		}

		flag {
		name: "enable_multichannel_group_device"
		namespace: "media_audio"
		description:
		"Enable new audio device type for wireless connected speaker group"
		"supporting multichannel content."
		is_exported: true
		is_fixed_read_only: true
		bug: "344031109"
		}

		flag{
		name: "enable_ringtone_haptics_customization"
		namespace: "media_audio"

media/codec2/sfplugin/CCodecBufferChannel.cpp

+27 −23

Original line number	Diff line number	Diff line
		@@ -335,7 +335,7 @@ CCodecBufferChannel::~CCodecBufferChannel() {

		void CCodecBufferChannel::setComponent(
		const std::shared_ptr<Codec2Client::Component> &component) {
		mComponent = component;
		std::atomic_store(&mComponent, component);
		mComponentName = component->getName() + StringPrintf("#%d", int(uintptr_t(component.get()) % 997));
		mName = mComponentName.c_str();
		}
		@@ -351,7 +351,7 @@ status_t CCodecBufferChannel::setInputSurface(
		inputSurface->numProcessingBuffersBalance = 0;
		inputSurface->surface = surface;
		mHasInputSurface = true;
		return inputSurface->surface->connect(mComponent);
		return inputSurface->surface->connect(std::atomic_load(&mComponent));
		}

		status_t CCodecBufferChannel::signalEndOfInputStream() {
		@@ -547,7 +547,7 @@ status_t CCodecBufferChannel::queueInputBufferInternal(
		now);
		}
		}
		err = mComponent->queue(&items);
		err = std::atomic_load(&mComponent)->queue(&items);
		}
		if (err != C2_OK) {
		Mutexed<PipelineWatcher>::Locked watcher(mPipelineWatcher);
		@@ -1457,7 +1457,7 @@ status_t CCodecBufferChannel::renderOutputBuffer(
		qbi.setSurfaceDamage(Region::INVALID_REGION); // we don't have dirty regions
		qbi.getFrameTimestamps = true; // we need to know when a frame is rendered
		IGraphicBufferProducer::QueueBufferOutput qbo;
		status_t result = mComponent->queueToOutputSurface(block, qbi, &qbo);
		status_t result = std::atomic_load(&mComponent)->queueToOutputSurface(block, qbi, &qbo);
		if (result != OK) {
		ALOGI("[%s] queueBuffer failed: %d", mName, result);
		if (result == NO_INIT) {
		@@ -1596,7 +1596,7 @@ int64_t CCodecBufferChannel::getRenderTimeNs(const TrackedFrame& frame) {

		void CCodecBufferChannel::pollForRenderedBuffers() {
		FrameEventHistoryDelta delta;
		mComponent->pollForRenderedFrames(&delta);
		std::atomic_load(&mComponent)->pollForRenderedFrames(&delta);
		processRenderedFrames(delta);
		}

		@@ -1605,7 +1605,7 @@ void CCodecBufferChannel::onBufferReleasedFromOutputSurface(uint32_t generation)
		// knowing the internal state of CCodec/CCodecBufferChannel,
		// prevent mComponent from being destroyed by holding the shared reference
		// during this interface being executed.
		std::shared_ptr<Codec2Client::Component> comp = mComponent;
		std::shared_ptr<Codec2Client::Component> comp = std::atomic_load(&mComponent);
		if (comp) {
		SurfaceCallbackHandler::GetInstance().post(
		SurfaceCallbackHandler::ON_BUFFER_RELEASED, comp, generation);
		@@ -1617,7 +1617,7 @@ void CCodecBufferChannel::onBufferAttachedToOutputSurface(uint32_t generation) {
		// knowing the internal state of CCodec/CCodecBufferChannel,
		// prevent mComponent from being destroyed by holding the shared reference
		// during this interface being executed.
		std::shared_ptr<Codec2Client::Component> comp = mComponent;
		std::shared_ptr<Codec2Client::Component> comp = std::atomic_load(&mComponent);
		if (comp) {
		SurfaceCallbackHandler::GetInstance().post(
		SurfaceCallbackHandler::ON_BUFFER_ATTACHED, comp, generation);
		@@ -1691,7 +1691,7 @@ status_t CCodecBufferChannel::start(
		C2ActualPipelineDelayTuning pipelineDelay(0);
		C2SecureModeTuning secureMode(C2Config::SM_UNPROTECTED);

		c2_status_t err = mComponent->query(
		c2_status_t err = std::atomic_load(&mComponent)->query(
		{
		&iStreamFormat,
		&oStreamFormat,
		@@ -1722,7 +1722,7 @@ status_t CCodecBufferChannel::start(
		size_t numOutputSlots = outputDelayValue + kSmoothnessFactor;

		// TODO: get this from input format
		bool secure = mComponent->getName().find(".secure") != std::string::npos;
		bool secure = std::atomic_load(&mComponent)->getName().find(".secure") != std::string::npos;

		// secure mode is a static parameter (shall not change in the executing state)
		mSendEncryptedInfoBuffer = secureMode.value == C2Config::SM_READ_PROTECTED_WITH_ENCRYPTED;
		@@ -1768,7 +1768,7 @@ status_t CCodecBufferChannel::start(
		channelCount.invalidate();
		pcmEncoding.invalidate();
		}
		err = mComponent->query(stackParams,
		err = std::atomic_load(&mComponent)->query(stackParams,
		{ C2PortAllocatorsTuning::input::PARAM_TYPE },
		C2_DONT_BLOCK,
		&params);
		@@ -1929,7 +1929,7 @@ status_t CCodecBufferChannel::start(
		// query C2PortAllocatorsTuning::output from component, or use default allocator if
		// unsuccessful.
		std::vector<std::unique_ptr<C2Param>> params;
		err = mComponent->query({ },
		err = std::atomic_load(&mComponent)->query({ },
		{ C2PortAllocatorsTuning::output::PARAM_TYPE },
		C2_DONT_BLOCK,
		&params);
		@@ -1957,7 +1957,7 @@ status_t CCodecBufferChannel::start(
		// if unsuccessful.
		if (outputSurface) {
		params.clear();
		err = mComponent->query({ },
		err = std::atomic_load(&mComponent)->query({ },
		{ C2PortSurfaceAllocatorTuning::output::PARAM_TYPE },
		C2_DONT_BLOCK,
		&params);
		@@ -1988,7 +1988,7 @@ status_t CCodecBufferChannel::start(
		}

		if ((poolMask >> pools->outputAllocatorId) & 1) {
		err = mComponent->createBlockPool(
		err = std::atomic_load(&mComponent)->createBlockPool(
		pools->outputAllocatorId, &pools->outputPoolId, &pools->outputPoolIntf);
		ALOGI("[%s] Created output block pool with allocatorID %u => poolID %llu - %s",
		mName, pools->outputAllocatorId,
		@@ -2009,7 +2009,8 @@ status_t CCodecBufferChannel::start(
		C2PortBlockPoolsTuning::output::AllocUnique({ pools->outputPoolId });

		std::vector<std::unique_ptr<C2SettingResult>> failures;
		err = mComponent->config({ poolIdsTuning.get() }, C2_MAY_BLOCK, &failures);
		err = std::atomic_load(&mComponent)->config(
		{ poolIdsTuning.get() }, C2_MAY_BLOCK, &failures);
		ALOGD("[%s] Configured output block pool ids %llu => %s",
		mName, (unsigned long long)poolIdsTuning->m.values[0], asString(err));
		outputPoolId_ = pools->outputPoolId;
		@@ -2017,7 +2018,7 @@ status_t CCodecBufferChannel::start(

		if (prevOutputPoolId != C2BlockPool::BASIC_LINEAR
		&& prevOutputPoolId != C2BlockPool::BASIC_GRAPHIC) {
		c2_status_t err = mComponent->destroyBlockPool(prevOutputPoolId);
		c2_status_t err = std::atomic_load(&mComponent)->destroyBlockPool(prevOutputPoolId);
		if (err != C2_OK) {
		ALOGW("Failed to clean up previous block pool %llu - %s (%d)\n",
		(unsigned long long) prevOutputPoolId, asString(err), err);
		@@ -2049,7 +2050,7 @@ status_t CCodecBufferChannel::start(

		// Try to set output surface to created block pool if given.
		if (outputSurface) {
		mComponent->setOutputSurface(
		std::atomic_load(&mComponent)->setOutputSurface(
		outputPoolId_,
		outputSurface,
		outputGeneration,
		@@ -2058,7 +2059,7 @@ status_t CCodecBufferChannel::start(
		// configure CPU read consumer usage
		C2StreamUsageTuning::output outputUsage{0u, C2MemoryUsage::CPU_READ};
		std::vector<std::unique_ptr<C2SettingResult>> failures;
		err = mComponent->config({ &outputUsage }, C2_MAY_BLOCK, &failures);
		err = std::atomic_load(&mComponent)->config({ &outputUsage }, C2_MAY_BLOCK, &failures);
		// do not print error message for now as most components may not yet
		// support this setting
		ALOGD_IF(err != C2_BAD_INDEX, "[%s] Configured output usage [%#llx]",
		@@ -2180,7 +2181,8 @@ status_t CCodecBufferChannel::requestInitialInputBuffers(
		}
		C2StreamBufferTypeSetting::output oStreamFormat(0u);
		C2PrependHeaderModeSetting prepend(PREPEND_HEADER_TO_NONE);
		c2_status_t err = mComponent->query({ &oStreamFormat, &prepend }, {}, C2_DONT_BLOCK, nullptr);
		c2_status_t err = std::atomic_load(&mComponent)->query(
		{ &oStreamFormat, &prepend }, {}, C2_DONT_BLOCK, nullptr);
		if (err != C2_OK && err != C2_BAD_INDEX) {
		return UNKNOWN_ERROR;
		}
		@@ -2198,7 +2200,7 @@ status_t CCodecBufferChannel::requestInitialInputBuffers(
		now);
		}
		}
		err = mComponent->queue(&flushedConfigs);
		err = std::atomic_load(&mComponent)->queue(&flushedConfigs);
		if (err != C2_OK) {
		ALOGW("[%s] Error while queueing a flushed config", mName);
		return UNKNOWN_ERROR;
		@@ -2249,7 +2251,8 @@ void CCodecBufferChannel::stopUseOutputSurface(bool pushBlankBuffer) {
		Mutexed<BlockPools>::Locked pools(mBlockPools);
		outputPoolId = pools->outputPoolId;
		}
		if (mComponent) mComponent->stopUsingOutputSurface(outputPoolId);
		std::shared_ptr<Codec2Client::Component> comp = std::atomic_load(&mComponent);
		if (comp) comp->stopUsingOutputSurface(outputPoolId);

		if (pushBlankBuffer) {
		sp<ANativeWindow> anw = static_cast<ANativeWindow *>(surface.get());
		@@ -2283,7 +2286,8 @@ void CCodecBufferChannel::reset() {

		void CCodecBufferChannel::release() {
		mInfoBuffers.clear();
		mComponent.reset();
		std::shared_ptr<Codec2Client::Component> nullComp;
		std::atomic_store(&mComponent, nullComp);
		mInputAllocator.reset();
		mOutputSurface.lock()->surface.clear();
		{
		@@ -2605,7 +2609,7 @@ bool CCodecBufferChannel::handleWork(
		}
		}
		if (maxDequeueCount > 0) {
		mComponent->setOutputSurfaceMaxDequeueCount(maxDequeueCount);
		std::atomic_load(&mComponent)->setOutputSurfaceMaxDequeueCount(maxDequeueCount);
		}
		}

		@@ -2853,7 +2857,7 @@ status_t CCodecBufferChannel::setSurface(const sp<Surface> &newSurface,
		}

		if (outputPoolIntf) {
		if (mComponent->setOutputSurface(
		if (std::atomic_load(&mComponent)->setOutputSurface(
		outputPoolId,
		producer,
		generation,

services/audioflinger/Tracks.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -1090,7 +1090,7 @@ void Track::appendDump(String8& result, bool active) const
		result.appendFormat("%7s %7u/%7u %7u %7u %2s 0x%03X "
		"%08X %08X %6u "
		"%2u %3x %2x "
		"%5.2g %5.2g %5.2g %5.2g%c %11.2g %12s"
		"%5.2g %5.2g %5.2g %5.2g%c %11.2g %10s "
		"%08X %6zu%c %6zu %c %9u%c %7u %10s %12s",
		active ? "yes" : "no",
		mClient ? mClient->pid() : getpid() ,

services/audiopolicy/enginedefault/src/Engine.cpp

+22 −38

Original line number	Diff line number	Diff line
		@@ -156,41 +156,22 @@ status_t Engine::setForceUse(audio_policy_force_use_t usage, audio_policy_forced
		return EngineBase::setForceUse(usage, config);
		}

		bool Engine::isBtScoActive(DeviceVector& availableOutputDevices,
		const SwAudioOutputCollection &outputs) const {
		bool Engine::isBtScoActive(DeviceVector& availableOutputDevices) const {
		// SCO is considered active if:
		// 1) a SCO device is connected
		// 2) the preferred device for PHONE strategy is BT SCO: this is controlled only by java
		// AudioService and is only true if the SCO audio link as been confirmed active by BT.
		if (availableOutputDevices.getDevicesFromTypes(getAudioDeviceOutAllScoSet()).isEmpty()) {
		return false;
		}
		// SCO is active if:
		// 1) we are in a call and SCO is the preferred device for PHONE strategy
		if (isInCall() && audio_is_bluetooth_out_sco_device(

		if (!audio_is_bluetooth_out_sco_device(
		getPreferredDeviceTypeForLegacyStrategy(availableOutputDevices, STRATEGY_PHONE))) {
		return true;
		return false;
		}

		// 2) A strategy for which the preferred device is SCO is active
		for (const auto &ps : getOrderedProductStrategies()) {
		if (outputs.isStrategyActive(ps) &&
		!getPreferredAvailableDevicesForProductStrategy(availableOutputDevices, ps)
		.getDevicesFromTypes(getAudioDeviceOutAllScoSet()).isEmpty()) {
		return true;
		}
		}
		// 3) a ringtone is active and SCO is used for ringing
		if (outputs.isActiveLocally(toVolumeSource(AUDIO_STREAM_RING))
		&& (getForceUse(AUDIO_POLICY_FORCE_FOR_VIBRATE_RINGING)
		== AUDIO_POLICY_FORCE_BT_SCO)) {
		return true;
		}
		// 4) an active input is routed from SCO
		DeviceVector availableInputDevices = getApmObserver()->getAvailableInputDevices();
		const auto &inputs = getApmObserver()->getInputs();
		if (inputs.activeInputsCountOnDevices(availableInputDevices.getDevicesFromType(
		AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET)) > 0) {
		return true;
		}
		return false;
		}

		void Engine::filterOutputDevicesForStrategy(legacy_strategy strategy,
		DeviceVector& availableOutputDevices,
		@@ -200,7 +181,7 @@ void Engine::filterOutputDevicesForStrategy(legacy_strategy strategy,

		if (com::android::media::audioserver::use_bt_sco_for_media()) {
		// remove A2DP and LE Audio devices whenever BT SCO is in use
		if (isBtScoActive(availableOutputDevices, outputs)) {
		if (isBtScoActive(availableOutputDevices)) {
		availableOutputDevices.remove(
		availableOutputDevices.getDevicesFromTypes(getAudioDeviceOutAllA2dpSet()));
		availableOutputDevices.remove(
		@@ -486,21 +467,24 @@ DeviceVector Engine::getDevicesForStrategyInt(legacy_strategy strategy,
		// Get the last connected device of wired and bluetooth a2dp
		devices2 = availableOutputDevices.getFirstDevicesFromTypes(
		getLastRemovableMediaDevices(GROUP_NONE, excludedDevices));
		} else {
		// Get the last connected device of wired except bluetooth a2dp
		devices2 = availableOutputDevices.getFirstDevicesFromTypes(
		getLastRemovableMediaDevices(GROUP_WIRED, excludedDevices));
		}
		}

		if (com::android::media::audioserver::use_bt_sco_for_media()) {
		if (devices2.isEmpty() && isBtScoActive(availableOutputDevices, outputs)) {
		if (isBtScoActive(availableOutputDevices)
		&& !(devices2.getDevicesFromTypes(
		getAudioDeviceOutAllA2dpSet()).isEmpty()
		&& devices2.getDevicesFromTypes(
		getAudioDeviceOutAllBleSet()).isEmpty())) {
		devices2 = availableOutputDevices.getFirstDevicesFromTypes(
		{ AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT,
		AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET,
		AUDIO_DEVICE_OUT_BLUETOOTH_SCO});
		}
		}
		} else {
		// Get the last connected device of wired except bluetooth a2dp
		devices2 = availableOutputDevices.getFirstDevicesFromTypes(
		getLastRemovableMediaDevices(GROUP_WIRED, excludedDevices));
		}
		}

		if ((devices2.isEmpty()) &&
		(getForceUse(AUDIO_POLICY_FORCE_FOR_DOCK) == AUDIO_POLICY_FORCE_ANALOG_DOCK)) {