Merge "Refactor AudioPolicyManager" (c1b3bc0c) · Commits · e / os / android_frameworks_av

media/mediaserver/main_mediaserver.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@
		#include "CameraService.h"
		#include "MediaLogService.h"
		#include "MediaPlayerService.h"
		#include "AudioPolicyService.h"
		#include "service/AudioPolicyService.h"
		#include "SoundTriggerHwService.h"

		using namespace android;

services/audiopolicy/Android.mk

+16 −8

Original line number	Diff line number	Diff line
		@@ -3,19 +3,19 @@ LOCAL_PATH:= $(call my-dir)
		include $(CLEAR_VARS)

		LOCAL_SRC_FILES:= \
		AudioPolicyService.cpp \
		AudioPolicyEffects.cpp
		service/AudioPolicyService.cpp \
		service/AudioPolicyEffects.cpp

		ifeq ($(USE_LEGACY_AUDIO_POLICY), 1)
		LOCAL_SRC_FILES += \
		AudioPolicyInterfaceImplLegacy.cpp \
		AudioPolicyClientImplLegacy.cpp
		service/AudioPolicyInterfaceImplLegacy.cpp \
		service/AudioPolicyClientImplLegacy.cpp

		LOCAL_CFLAGS += -DUSE_LEGACY_AUDIO_POLICY
		else
		LOCAL_SRC_FILES += \
		AudioPolicyInterfaceImpl.cpp \
		AudioPolicyClientImpl.cpp
		service/AudioPolicyInterfaceImpl.cpp \
		service/AudioPolicyClientImpl.cpp
		endif

		LOCAL_C_INCLUDES := \
		@@ -53,7 +53,15 @@ ifneq ($(USE_LEGACY_AUDIO_POLICY), 1)
		include $(CLEAR_VARS)

		LOCAL_SRC_FILES:= \
		AudioPolicyManager.cpp
		managerdefault/AudioPolicyManager.cpp \
		managerdefault/ConfigParsingUtils.cpp \
		managerdefault/Devices.cpp \
		managerdefault/Gains.cpp \
		managerdefault/HwModule.cpp \
		managerdefault/IOProfile.cpp \
		managerdefault/Ports.cpp \
		managerdefault/AudioInputDescriptor.cpp \
		managerdefault/AudioOutputDescriptor.cpp

		LOCAL_SHARED_LIBRARIES := \
		libcutils \
		@@ -73,7 +81,7 @@ ifneq ($(USE_CUSTOM_AUDIO_POLICY), 1)
		include $(CLEAR_VARS)

		LOCAL_SRC_FILES:= \
		AudioPolicyFactory.cpp
		manager/AudioPolicyFactory.cpp

		LOCAL_SHARED_LIBRARIES := \
		libaudiopolicymanagerdefault

services/audiopolicy/AudioPolicyFactory.cpp→services/audiopolicy/manager/AudioPolicyFactory.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		#include "AudioPolicyManager.h"
		#include "managerdefault/AudioPolicyManager.h"

		namespace android {

services/audiopolicy/managerdefault/ApmImplDefinitions.h

0 → 100644

+32 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2015 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		namespace android {

		enum routing_strategy {
		STRATEGY_MEDIA,
		STRATEGY_PHONE,
		STRATEGY_SONIFICATION,
		STRATEGY_SONIFICATION_RESPECTFUL,
		STRATEGY_DTMF,
		STRATEGY_ENFORCED_AUDIBLE,
		STRATEGY_TRANSMITTED_THROUGH_SPEAKER,
		STRATEGY_ACCESSIBILITY,
		STRATEGY_REROUTING,
		NUM_STRATEGIES
		};

		}; //namespace android

services/audiopolicy/managerdefault/AudioInputDescriptor.cpp

0 → 100644

+100 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2015 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#define LOG_TAG "APM::AudioInputDescriptor"
		//#define LOG_NDEBUG 0

		#include "AudioPolicyManager.h"

		namespace android {

		AudioInputDescriptor::AudioInputDescriptor(const sp<IOProfile>& profile)
		: mId(0), mIoHandle(0),
		mDevice(AUDIO_DEVICE_NONE), mPolicyMix(NULL), mPatchHandle(0), mRefCount(0),
		mInputSource(AUDIO_SOURCE_DEFAULT), mProfile(profile), mIsSoundTrigger(false)
		{
		if (profile != NULL) {
		mSamplingRate = profile->pickSamplingRate();
		mFormat = profile->pickFormat();
		mChannelMask = profile->pickChannelMask();
		if (profile->mGains.size() > 0) {
		profile->mGains[0]->getDefaultConfig(&mGain);
		}
		}
		}

		void AudioInputDescriptor::toAudioPortConfig(
		struct audio_port_config *dstConfig,
		const struct audio_port_config *srcConfig) const
		{
		ALOG_ASSERT(mProfile != 0,
		"toAudioPortConfig() called on input with null profile %d", mIoHandle);
		dstConfig->config_mask = AUDIO_PORT_CONFIG_SAMPLE_RATE\|AUDIO_PORT_CONFIG_CHANNEL_MASK\|
		AUDIO_PORT_CONFIG_FORMAT\|AUDIO_PORT_CONFIG_GAIN;
		if (srcConfig != NULL) {
		dstConfig->config_mask \|= srcConfig->config_mask;
		}

		AudioPortConfig::toAudioPortConfig(dstConfig, srcConfig);

		dstConfig->id = mId;
		dstConfig->role = AUDIO_PORT_ROLE_SINK;
		dstConfig->type = AUDIO_PORT_TYPE_MIX;
		dstConfig->ext.mix.hw_module = mProfile->mModule->mHandle;
		dstConfig->ext.mix.handle = mIoHandle;
		dstConfig->ext.mix.usecase.source = mInputSource;
		}

		void AudioInputDescriptor::toAudioPort(
		struct audio_port *port) const
		{
		ALOG_ASSERT(mProfile != 0, "toAudioPort() called on input with null profile %d", mIoHandle);

		mProfile->toAudioPort(port);
		port->id = mId;
		toAudioPortConfig(&port->active_config);
		port->ext.mix.hw_module = mProfile->mModule->mHandle;
		port->ext.mix.handle = mIoHandle;
		port->ext.mix.latency_class = AUDIO_LATENCY_NORMAL;
		}

		status_t AudioInputDescriptor::dump(int fd)
		{
		const size_t SIZE = 256;
		char buffer[SIZE];
		String8 result;

		snprintf(buffer, SIZE, " ID: %d\n", mId);
		result.append(buffer);
		snprintf(buffer, SIZE, " Sampling rate: %d\n", mSamplingRate);
		result.append(buffer);
		snprintf(buffer, SIZE, " Format: %d\n", mFormat);
		result.append(buffer);
		snprintf(buffer, SIZE, " Channels: %08x\n", mChannelMask);
		result.append(buffer);
		snprintf(buffer, SIZE, " Devices %08x\n", mDevice);
		result.append(buffer);
		snprintf(buffer, SIZE, " Ref Count %d\n", mRefCount);
		result.append(buffer);
		snprintf(buffer, SIZE, " Open Ref Count %d\n", mOpenRefCount);
		result.append(buffer);

		write(fd, result.string(), result.size());

		return NO_ERROR;
		}

		}; //namespace android