Convert IAAudioClient to AIDL (0412f73c) · Commits · e / os / android_frameworks_av

media/libaaudio/Android.bp

+2 −1

Original line number	Diff line number	Diff line
		@@ -32,5 +32,6 @@ ndk_library {
		cc_library_headers {
		name: "libaaudio_headers",
		export_include_dirs: ["include"],
		export_header_lib_headers: ["aaudio-aidl-cpp"],
		header_libs: ["aaudio-aidl-cpp"],
		}

media/libaaudio/src/Android.bp

+10 −1

Original line number	Diff line number	Diff line
		@@ -85,6 +85,7 @@ cc_library {
		"libcutils",
		"libutils",
		"libbinder",
		"aaudio-aidl-cpp",
		],

		cflags: [
		@@ -117,7 +118,6 @@ cc_library {
		"binding/AAudioBinderClient.cpp",
		"binding/AAudioStreamRequest.cpp",
		"binding/AAudioStreamConfiguration.cpp",
		"binding/IAAudioClient.cpp",
		"binding/IAAudioService.cpp",
		"binding/RingBufferParcelable.cpp",
		"binding/SharedMemoryParcelable.cpp",
		@@ -138,3 +138,12 @@ cc_library {
		misc_undefined: ["bounds"],
		},
		}

		aidl_interface {
		name: "aaudio-aidl",
		unstable: true,
		local_include_dir: "binding/aidl",
		srcs: [
		"binding/aidl/aaudio/IAAudioClient.aidl",
		],
		}

media/libaaudio/src/binding/AAudioBinderClient.h

+6 −3

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@
		#include <utils/Singleton.h>

		#include <aaudio/AAudio.h>
		#include "aaudio/BnAAudioClient.h"
		#include "AAudioServiceDefinitions.h"
		#include "AAudioServiceInterface.h"
		#include "binding/AAudioStreamRequest.h"
		@@ -48,7 +49,7 @@ public:

		void dropAAudioService();

		void registerClient(const android::sp<android::IAAudioClient>& client __unused) override {}
		void registerClient(const android::sp<IAAudioClient>& client __unused) override {}

		/**
		* @param request info needed to create the stream
		@@ -115,7 +116,7 @@ public:
		ALOGW("onStreamChange called!");
		}

		class AAudioClient : public android::IBinder::DeathRecipient , public android::BnAAudioClient
		class AAudioClient : public android::IBinder::DeathRecipient , public BnAAudioClient
		{
		public:
		AAudioClient(android::wp<AAudioBinderClient> aaudioBinderClient)
		@@ -132,11 +133,13 @@ public:
		}

		// implement BnAAudioClient
		void onStreamChange(aaudio_handle_t handle, int32_t opcode, int32_t value) {
		android::binder::Status onStreamChange(int32_t handle, int32_t opcode, int32_t value) {
		static_assert(std::is_same_v<aaudio_handle_t, int32_t>);
		android::sp<AAudioBinderClient> client = mBinderClient.promote();
		if (client.get() != nullptr) {
		client->onStreamChange(handle, opcode, value);
		}
		return android::binder::Status::ok();
		}
		private:
		android::wp<AAudioBinderClient> mBinderClient;

media/libaaudio/src/binding/AAudioServiceInterface.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,11 +20,11 @@
		#include <utils/StrongPointer.h>
		#include <media/AudioClient.h>

		#include "aaudio/IAAudioClient.h"
		#include "binding/AAudioServiceDefinitions.h"
		#include "binding/AAudioStreamRequest.h"
		#include "binding/AAudioStreamConfiguration.h"
		#include "binding/AudioEndpointParcelable.h"
		#include "binding/IAAudioClient.h"

		/**
		* This has the same methods as IAAudioService but without the Binder features.
		@@ -40,7 +40,7 @@ public:
		AAudioServiceInterface() {};
		virtual ~AAudioServiceInterface() = default;

		virtual void registerClient(const android::sp<android::IAAudioClient>& client) = 0;
		virtual void registerClient(const android::sp<IAAudioClient>& client) = 0;

		/**
		* @param request info needed to create the stream

media/libaaudio/src/binding/IAAudioClient.cpp

deleted100644 → 0

+0 −85

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 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 "AAudio"
		//#define LOG_NDEBUG 0
		#include <utils/Log.h>

		#include <aaudio/AAudio.h>

		#include "binding/AAudioBinderClient.h"
		#include "binding/AAudioServiceDefinitions.h"
		#include "binding/IAAudioClient.h"
		#include "utility/AAudioUtilities.h"

		namespace android {

		using aaudio::aaudio_handle_t;

		/**
		* This is used by the AAudio Service to talk to an AAudio Client.
		*
		* The order of parameters in the Parcels must match with code in AAudioClient.cpp.
		*/
		class BpAAudioClient : public BpInterface<IAAudioClient>
		{
		public:
		explicit BpAAudioClient(const sp<IBinder>& impl)
		: BpInterface<IAAudioClient>(impl)
		{
		}

		void onStreamChange(aaudio_handle_t handle, int32_t opcode, int32_t value) override {
		Parcel data, reply;
		data.writeInterfaceToken(IAAudioClient::getInterfaceDescriptor());
		data.writeInt32(handle);
		data.writeInt32(opcode);
		data.writeInt32(value);
		remote()->transact(ON_STREAM_CHANGE, data, &reply, IBinder::FLAG_ONEWAY);
		}

		};

		// Implement an interface to the service.
		IMPLEMENT_META_INTERFACE(AAudioClient, "IAAudioClient");

		// The order of parameters in the Parcels must match with code in BpAAudioClient

		status_t BnAAudioClient::onTransact(uint32_t code, const Parcel& data,
		Parcel* reply, uint32_t flags) {
		aaudio_handle_t streamHandle;
		int32_t opcode = 0;
		int32_t value = 0;
		ALOGV("BnAAudioClient::onTransact(%u) %u", code, flags);

		switch(code) {
		case ON_STREAM_CHANGE: {
		CHECK_INTERFACE(IAAudioClient, data, reply);
		data.readInt32(&streamHandle);
		data.readInt32(&opcode);
		data.readInt32(&value);
		onStreamChange(streamHandle, opcode, value);
		ALOGD("BnAAudioClient onStreamChange(%x, %d, %d)", streamHandle, opcode, value);
		return NO_ERROR;
		} break;

		default:
		// ALOGW("BnAAudioClient::onTransact not handled %u", code);
		return BBinder::onTransact(code, data, reply, flags);
		}
		}

		} /* namespace android */