Merge changes from topic "bt-audio-aidl-default-impl" am: ed699821de (cbd9ede9) · Commits · e / os / android_hardware_interfaces

bluetooth/audio/aidl/Android.bp

+4 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,10 @@ aidl_interface {
		vndk: {
		enabled: true,
		},
		apex_available: [
		"//apex_available:platform",
		"com.android.bluetooth",
		],
		},
		},
		}

bluetooth/audio/aidl/default/A2dpOffloadAudioProvider.cpp

0 → 100644

+71 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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 "BTAudioProviderA2dpHW"

		#include "A2dpOffloadAudioProvider.h"

		#include <BluetoothAudioCodecs.h>
		#include <BluetoothAudioSessionReport.h>
		#include <android-base/logging.h>

		namespace aidl {
		namespace android {
		namespace hardware {
		namespace bluetooth {
		namespace audio {

		A2dpOffloadAudioProvider::A2dpOffloadAudioProvider() {
		session_type_ = SessionType::A2DP_HARDWARE_OFFLOAD_ENCODING_DATAPATH;
		}

		bool A2dpOffloadAudioProvider::isValid(const SessionType& session_type) {
		return (session_type == session_type_);
		}

		ndk::ScopedAStatus A2dpOffloadAudioProvider::startSession(
		const std::shared_ptr<IBluetoothAudioPort>& host_if,
		const AudioConfiguration& audio_config, DataMQDesc* _aidl_return) {
		if (audio_config.getTag() != AudioConfiguration::a2dpConfig) {
		LOG(WARNING) << __func__ << " - Invalid Audio Configuration="
		<< audio_config.toString();
		*_aidl_return = DataMQDesc();
		return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
		}
		if (!BluetoothAudioCodecs::IsOffloadCodecConfigurationValid(
		session_type_, audio_config.get<AudioConfiguration::a2dpConfig>())) {
		LOG(WARNING) << __func__ << " - Invalid Audio Configuration="
		<< audio_config.toString();
		*_aidl_return = DataMQDesc();
		return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
		}
		return BluetoothAudioProvider::startSession(host_if, audio_config,
		_aidl_return);
		}

		ndk::ScopedAStatus A2dpOffloadAudioProvider::onSessionReady(
		DataMQDesc* _aidl_return) {
		*_aidl_return = DataMQDesc();
		BluetoothAudioSessionReport::OnSessionStarted(session_type_, stack_iface_,
		nullptr, *audio_config_);
		return ndk::ScopedAStatus::ok();
		}

		} // namespace audio
		} // namespace bluetooth
		} // namespace hardware
		} // namespace android
		} // namespace aidl
		No newline at end of file

bluetooth/audio/aidl/default/A2dpOffloadAudioProvider.h

0 → 100644

+45 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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.
		*/

		#pragma once

		#include "BluetoothAudioProvider.h"

		namespace aidl {
		namespace android {
		namespace hardware {
		namespace bluetooth {
		namespace audio {

		class A2dpOffloadAudioProvider : public BluetoothAudioProvider {
		public:
		A2dpOffloadAudioProvider();

		bool isValid(const SessionType& session_type) override;

		ndk::ScopedAStatus startSession(
		const std::shared_ptr<IBluetoothAudioPort>& host_if,
		const AudioConfiguration& audio_config, DataMQDesc* _aidl_return);

		private:
		ndk::ScopedAStatus onSessionReady(DataMQDesc* _aidl_return) override;
		};

		} // namespace audio
		} // namespace bluetooth
		} // namespace hardware
		} // namespace android
		} // namespace aidl

bluetooth/audio/aidl/default/A2dpSoftwareAudioProvider.cpp

0 → 100644

+100 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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 "BTAudioProviderA2dpSW"

		#include "A2dpSoftwareAudioProvider.h"

		#include <BluetoothAudioCodecs.h>
		#include <BluetoothAudioSessionReport.h>
		#include <android-base/logging.h>

		namespace aidl {
		namespace android {
		namespace hardware {
		namespace bluetooth {
		namespace audio {

		// Here the buffer size is based on SBC
		static constexpr uint32_t kPcmFrameSize = 4; // 16 bits per sample / stereo
		// SBC is 128, and here we choose the LCM of 16, 24, and 32
		static constexpr uint32_t kPcmFrameCount = 96;
		static constexpr uint32_t kRtpFrameSize = kPcmFrameSize * kPcmFrameCount;
		// The max counts by 1 tick (20ms) for SBC is about 7. Since using 96 for the
		// PCM counts, here we just choose a greater number
		static constexpr uint32_t kRtpFrameCount = 10;
		static constexpr uint32_t kBufferSize = kRtpFrameSize * kRtpFrameCount;
		static constexpr uint32_t kBufferCount = 2; // double buffer
		static constexpr uint32_t kDataMqSize = kBufferSize * kBufferCount;

		A2dpSoftwareAudioProvider::A2dpSoftwareAudioProvider()
		: BluetoothAudioProvider(), data_mq_(nullptr) {
		LOG(INFO) << __func__ << " - size of audio buffer " << kDataMqSize
		<< " byte(s)";
		std::unique_ptr<DataMQ> data_mq(
		new DataMQ(kDataMqSize, /* EventFlag */ true));
		if (data_mq && data_mq->isValid()) {
		data_mq_ = std::move(data_mq);
		session_type_ = SessionType::A2DP_SOFTWARE_ENCODING_DATAPATH;
		} else {
		ALOGE_IF(!data_mq, "failed to allocate data MQ");
		ALOGE_IF(data_mq && !data_mq->isValid(), "data MQ is invalid");
		}
		}

		bool A2dpSoftwareAudioProvider::isValid(const SessionType& sessionType) {
		return (sessionType == session_type_ && data_mq_ && data_mq_->isValid());
		}

		ndk::ScopedAStatus A2dpSoftwareAudioProvider::startSession(
		const std::shared_ptr<IBluetoothAudioPort>& host_if,
		const AudioConfiguration& audio_config, DataMQDesc* _aidl_return) {
		if (audio_config.getTag() != AudioConfiguration::pcmConfig) {
		LOG(WARNING) << __func__ << " - Invalid Audio Configuration="
		<< audio_config.toString();
		*_aidl_return = DataMQDesc();
		return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
		}
		const PcmConfiguration& pcm_config =
		audio_config.get<AudioConfiguration::pcmConfig>();
		if (!BluetoothAudioCodecs::IsSoftwarePcmConfigurationValid(pcm_config)) {
		LOG(WARNING) << __func__ << " - Unsupported PCM Configuration="
		<< pcm_config.toString();
		*_aidl_return = DataMQDesc();
		return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
		}

		return BluetoothAudioProvider::startSession(host_if, audio_config,
		_aidl_return);
		}

		ndk::ScopedAStatus A2dpSoftwareAudioProvider::onSessionReady(
		DataMQDesc* _aidl_return) {
		if (data_mq_ == nullptr \|\| !data_mq_->isValid()) {
		*_aidl_return = DataMQDesc();
		return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
		}
		*_aidl_return = data_mq_->dupeDesc();
		BluetoothAudioSessionReport::OnSessionStarted(session_type_, stack_iface_,
		_aidl_return, *audio_config_);
		return ndk::ScopedAStatus::ok();
		}

		} // namespace audio
		} // namespace bluetooth
		} // namespace hardware
		} // namespace android
		} // namespace aidl
		No newline at end of file

bluetooth/audio/aidl/default/A2dpSoftwareAudioProvider.h

0 → 100644

+48 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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.
		*/

		#pragma once

		#include "BluetoothAudioProvider.h"

		namespace aidl {
		namespace android {
		namespace hardware {
		namespace bluetooth {
		namespace audio {

		class A2dpSoftwareAudioProvider : public BluetoothAudioProvider {
		public:
		A2dpSoftwareAudioProvider();

		bool isValid(const SessionType& sessionType) override;

		ndk::ScopedAStatus startSession(
		const std::shared_ptr<IBluetoothAudioPort>& host_if,
		const AudioConfiguration& audio_config, DataMQDesc* _aidl_return);

		private:
		// audio data queue for software encoding
		std::unique_ptr<DataMQ> data_mq_;

		ndk::ScopedAStatus onSessionReady(DataMQDesc* _aidl_return) override;
		};

		} // namespace audio
		} // namespace bluetooth
		} // namespace hardware
		} // namespace android
		} // namespace aidl