diff --git a/bundle.json b/bundle.json
index 59de4502abacc870d300e8e8defc8b8494f336fc..4222a801e966a4ccc7a0e9303cb9839dceea5ea0 100755
--- a/bundle.json
+++ b/bundle.json
@@ -34,6 +34,7 @@
"c_utils",
"distributed_hardware_fwk",
"drivers_interface_audio",
+ "drivers_interface_distributed_audio",
"dsoftbus",
"eventhandler",
"hdf_core",
diff --git a/distributedaudio.gni b/distributedaudio.gni
index 0b98805811c851b5d58cee508f53e5c048a070ec..2227a8bab4555b89dc8e3d52df9966a61ac215eb 100644
--- a/distributedaudio.gni
+++ b/distributedaudio.gni
@@ -32,9 +32,8 @@ audio_processor_path = "${services_path}/audioprocessor"
audio_transport_path = "${services_path}/audiotransport"
softbusadapter_path = "${services_path}/softbusadapter"
interfaces_path = "${distributedaudio_path}/interfaces"
-hdf_interfaces_path =
- "${distributedaudio_path}/hdf_interfaces/distributed_audio"
-hdf_service_path = "${distributedaudio_path}/hdf_service/distributed_audio"
+hdf_interfaces_path = "//drivers/interface/distributed_audio"
+hdf_service_path = "//drivers/peripheral/distributed_audio"
hdf_ser_aud_path = "${hdf_service_path}/hdi_service/audio/v1_0"
hdf_ser_aud_ext_path = "${hdf_service_path}/hdi_service/audio_ext/v1_0"
diff --git a/hdf_interfaces/distributed_audio/audio/v1_0/AudioTypes.idl b/hdf_interfaces/distributed_audio/audio/v1_0/AudioTypes.idl
deleted file mode 100644
index 830a0c5dda0ba844990382811b01d7b5e49cc1f9..0000000000000000000000000000000000000000
--- a/hdf_interfaces/distributed_audio/audio/v1_0/AudioTypes.idl
+++ /dev/null
@@ -1,484 +0,0 @@
-/*
- * Copyright (c) 2022-2023 Huawei Device Co., Ltd.
- * 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.
- */
-
-/**
- * @addtogroup HdiAudio
- * @{
- *
- * @brief Provides unified APIs for audio services to access audio drivers.
- *
- * An audio service can obtain an audio driver object or agent and then call APIs provided by this object or agent to
- * access different types of audio devices based on the audio IDs, thereby obtaining audio information,
- * subscribing to or unsubscribing from audio data, enabling or disabling an audio,
- * setting the audio data reporting mode, and setting audio options such as the accuracy and measurement range.
- *
- * @since 4.0
- * @version 1.0
- */
-
-package ohos.hdi.distributed_audio.audio.v1_0;
-
-/**
- * @brief Enumerates the audio port type.
- */
-enum AudioPortDirection {
- PORT_OUT = 1, /**< Output port */
- PORT_IN = 2, /**< Input port */
- PORT_OUT_IN = 3, /**< Input/output port, supporting both audio input and output */
-};
-
-/**
- * @brief Enumerates the pin of an audio adapter.
- */
-enum AudioPortPin {
- PIN_NONE = 0, /**< Invalid pin */
- PIN_OUT_SPEAKER = 1 << 0, /**< Speaker output pin */
- PIN_OUT_HEADSET = 1 << 1, /**< Wired headset pin for output */
- PIN_OUT_LINEOUT = 1 << 2, /**< Line-out pin */
- PIN_OUT_HDMI = 1 << 3, /**< HDMI output pin */
- PIN_OUT_USB = 1 << 4, /**< USB output pin */
- PIN_OUT_USB_EXT = 1 << 5, /**< Extended USB output pin*/
- PIN_OUT_EARPIECE = 1 << 5 | 1 << 4, /**< Earpiece output pin */
- PIN_OUT_BLUETOOTH_SCO = 1 << 6, /**< Bluetooth SCO output pin */
- PIN_OUT_DAUDIO_DEFAULT = 1 << 7, /**< Daudio default output pin */
- PIN_OUT_HEADPHONE = 1 << 8, /**< Wired headphone output pin*/
- PIN_OUT_USB_HEADSET = 1 << 9, /**< ARM USB out pin */
- PIN_IN_MIC = 1 << 27 | 1 << 0, /**< Microphone input pin */
- PIN_IN_HS_MIC = 1 << 27 | 1 << 1, /**< Wired headset microphone pin for input */
- PIN_IN_LINEIN = 1 << 27 | 1 << 2, /**< Line-in pin */
- PIN_IN_USB_EXT = 1 << 27 | 1 << 3, /**< Extended USB input pin*/
- PIN_IN_BLUETOOTH_SCO_HEADSET = 1 << 27 | 1 << 4, /**< Bluetooth SCO headset input pin */
- PIN_IN_DAUDIO_DEFAULT = 1 << 27 | 1 << 5, /**< Daudio default input pin */
- PIN_IN_USB_HEADSET = 1 << 27 | 1 << 6, /**< ARM USB input pin */
-};
-
-/**
- * @brief Enumerates the audio category.
- */
-enum AudioCategory {
- AUDIO_IN_MEDIA = 0, /**< Media */
- AUDIO_IN_COMMUNICATION = 1, /**< Communications */
- AUDIO_IN_RINGTONE = 2, /**< Ringtone */
- AUDIO_IN_CALL = 3, /**< Call */
- AUDIO_MMAP_NOIRQ = 4, /**< Mmap mode */
-};
-
-/**
- * @brief Enumerates the audio format.
- */
-enum AudioFormat {
- AUDIO_FORMAT_TYPE_PCM_8_BIT = 1 << 0, /**< 8-bit PCM */
- AUDIO_FORMAT_TYPE_PCM_16_BIT = 1 << 1, /**< 16-bit PCM */
- AUDIO_FORMAT_TYPE_PCM_24_BIT = 1 << 1 | 1 << 0, /**< 24-bit PCM */
- AUDIO_FORMAT_TYPE_PCM_32_BIT = 1 << 2, /**< 32-bit PCM */
- AUDIO_FORMAT_TYPE_AAC_MAIN = 1 << 24 | 1 << 0, /**< AAC main */
- AUDIO_FORMAT_TYPE_AAC_LC = 1 << 24 | 1 << 1, /**< AAC LC */
- AUDIO_FORMAT_TYPE_AAC_LD = 1 << 24 | 1 << 1 | 1 << 0, /**< AAC LD */
- AUDIO_FORMAT_TYPE_AAC_ELD = 1 << 24 | 1 << 2, /**< AAC ELD */
- AUDIO_FORMAT_TYPE_AAC_HE_V1 = 1 << 24 | 1 << 2 | 1 << 0, /**< AAC HE_V1 */
- AUDIO_FORMAT_TYPE_AAC_HE_V2 = 1 << 24 | 1 << 2 | 1 << 1, /**< AAC HE_V2 */
- AUDIO_FORMAT_TYPE_G711A = 1 << 25 | 1 << 0, /**< G711A */
- AUDIO_FORMAT_TYPE_G711U = 1 << 25 | 1 << 1, /**< G711u */
- AUDIO_FORMAT_TYPE_G726 = 1 << 25 | 1 << 1 | 1 << 0, /**< G726 */
-};
-
-/**
- * @brief Enumerates the audio channel mask.
- *
- * A mask describes an audio channel position.
- */
-enum AudioChannelMask {
- AUDIO_CHANNEL_FRONT_LEFT = 1, /**< Front left channel */
- AUDIO_CHANNEL_FRONT_RIGHT = 2, /**< Front right channel */
- AUDIO_CHANNEL_MONO = 1, /**< Mono channel */
- AUDIO_CHANNEL_STEREO = 3, /**< Stereo channel, consisting of front left and front right channels */
-};
-
-/**
- * @brief Enumerates masks of audio sampling rates.
- */
-enum AudioSampleRatesMask {
- AUDIO_SAMPLE_RATE_MASK_8000 = 1 << 0, /**< 8 kHz */
- AUDIO_SAMPLE_RATE_MASK_12000 = 1 << 1, /**< 12 kHz */
- AUDIO_SAMPLE_RATE_MASK_11025 = 1 << 2, /**< 11.025 kHz */
- AUDIO_SAMPLE_RATE_MASK_16000 = 1 << 3, /**< 16 kHz */
- AUDIO_SAMPLE_RATE_MASK_22050 = 1 << 4, /**< 22.050 kHz */
- AUDIO_SAMPLE_RATE_MASK_24000 = 1 << 5, /**< 24 kHz */
- AUDIO_SAMPLE_RATE_MASK_32000 = 1 << 6, /**< 32 kHz */
- AUDIO_SAMPLE_RATE_MASK_44100 = 1 << 7, /**< 44.1 kHz */
- AUDIO_SAMPLE_RATE_MASK_48000 = 1 << 8, /**< 48 kHz */
- AUDIO_SAMPLE_RATE_MASK_64000 = 1 << 9, /**< 64 kHz */
- AUDIO_SAMPLE_RATE_MASK_96000 = 1 << 10, /**< 96 kHz */
- AUDIO_SAMPLE_RATE_MASK_INVALID = 4294967295, /**< Invalid sampling rate */
-};
-
-/**
- * @brief Enumerates the passthrough data transmission mode of an audio port.
- */
-enum AudioPortPassthroughMode {
- PORT_PASSTHROUGH_LPCM = 1 << 0, /**< Stereo PCM */
- PORT_PASSTHROUGH_RAW = 1 << 1, /**< HDMI passthrough */
- PORT_PASSTHROUGH_HBR2LBR = 1 << 2, /**< Blu-ray next-generation audio output with reduced specifications */
- PORT_PASSTHROUGH_AUTO = 1 << 3, /**< Mode automatically matched based on the HDMI EDID */
-};
-
-/**
- * @brief Defines formats of raw audio samples.
- */
-enum AudioSampleFormat {
- /* 8 bits */
- AUDIO_SAMPLE_FORMAT_S8 = 0, /**< signed 8 bit sample */
- AUDIO_SAMPLE_FORMAT_S8P = 1, /**< signed 8 bit planar sample */
- AUDIO_SAMPLE_FORMAT_U8 = 2, /**< unsigned 8 bit sample */
- AUDIO_SAMPLE_FORMAT_U8P = 3, /**< unsigned 8 bit planar sample */
- /* 16 bits */
- AUDIO_SAMPLE_FORMAT_S16 = 4, /**< signed 16 bit sample */
- AUDIO_SAMPLE_FORMAT_S16P = 5, /**< signed 16 bit planar sample */
- AUDIO_SAMPLE_FORMAT_U16 = 6, /**< unsigned 16 bit sample */
- AUDIO_SAMPLE_FORMAT_U16P = 7, /**< unsigned 16 bit planar sample */
- /* 24 bits */
- AUDIO_SAMPLE_FORMAT_S24 = 8, /**< signed 24 bit sample */
- AUDIO_SAMPLE_FORMAT_S24P = 9, /**< signed 24 bit planar sample */
- AUDIO_SAMPLE_FORMAT_U24 = 10, /**< unsigned 24 bit sample */
- AUDIO_SAMPLE_FORMAT_U24P = 11, /**< unsigned 24 bit planar sample */
- /* 32 bits */
- AUDIO_SAMPLE_FORMAT_S32 = 12, /**< signed 32 bit sample */
- AUDIO_SAMPLE_FORMAT_S32P = 13, /**< signed 32 bit planar sample */
- AUDIO_SAMPLE_FORMAT_U32 = 14, /**< unsigned 32 bit sample */
- AUDIO_SAMPLE_FORMAT_U32P = 15, /**< unsigned 32 bit planar sample */
- /* 64 bits */
- AUDIO_SAMPLE_FORMAT_S64 = 16, /**< signed 64 bit sample */
- AUDIO_SAMPLE_FORMAT_S64P = 17, /**< signed 64 bit planar sample */
- AUDIO_SAMPLE_FORMAT_U64 = 18, /**< unsigned 64 bit sample */
- AUDIO_SAMPLE_FORMAT_U64P = 19, /**< unsigned 64 bit planar sample */
- /* float double */
- AUDIO_SAMPLE_FORMAT_F32 = 20, /**< float 32 bit sample */
- AUDIO_SAMPLE_FORMAT_F32P = 21, /**< float 32 bit planar sample */
- AUDIO_SAMPLE_FORMAT_F64 = 22, /**< double 64 bit sample */
- AUDIO_SAMPLE_FORMAT_F64P = 23, /**< double 64 bit planar sample */
-};
-
-/**
- * @brief Enumerates channel modes for audio rendering.
- *
- * @attention The following modes are set for rendering dual-channel audios. Others are not supported.
- */
-enum AudioChannelMode {
- AUDIO_CHANNEL_NORMAL = 0, /**< Normal mode. No processing is required. */
- AUDIO_CHANNEL_BOTH_LEFT = 1, /**< Two left channels */
- AUDIO_CHANNEL_BOTH_RIGHT = 2, /**< Two right channels */
- AUDIO_CHANNEL_EXCHANGE = 3, /**< Data exchange between the left and right channels. The left channel takes the audio
- * stream of the right channel, and the right channel takes that of the left channel.
- */
- AUDIO_CHANNEL_MIX = 4, /**< Mix of streams of the left and right channels */
- AUDIO_CHANNEL_LEFT_MUTE = 5, /**< Left channel muted. The stream of the right channel is output. */
- AUDIO_CHANNEL_RIGHT_MUTE = 6, /**< Right channel muted. The stream of the left channel is output. */
- AUDIO_CHANNEL_BOTH_MUTE = 7, /**< Both left and right channels are muted */
-};
-
-/**
- * @brief Enumerates the execution types of the DrainBuffer function.
- */
-enum AudioDrainNotifyType {
- AUDIO_DRAIN_NORMAL_MODE = 0, /**< The DrainBuffer function returns after all data finishes playback. */
- AUDIO_DRAIN_EARLY_MODE = 1, /**< The DrainBuffer function returns before all the data of the current track
- * finishes playback to reserve time for a smooth track switch by the audio service.
- */
-
-};
-
-/**
- * @brief Enumerates callback notification events.
- */
-enum AudioCallbackType {
- AUDIO_NONBLOCK_WRITE_COMPLETED = 0, /**< The non-block write is complete. */
- AUDIO_DRAIN_COMPLETED = 1, /**< The draining is complete. */
- AUDIO_FLUSH_COMPLETED = 2, /**< The flush is complete. */
- AUDIO_RENDER_FULL = 3, /**< The render buffer is full.*/
- AUDIO_ERROR_OCCUR = 4, /**< An error occurs.*/
-};
-
-/**
- * @brief Describes AudioPortRole.
- */
-enum AudioPortRole {
- AUDIO_PORT_UNASSIGNED_ROLE = 0, /**< Unassigned port role */
- AUDIO_PORT_SOURCE_ROLE = 1, /**< Assigned source role */
- AUDIO_PORT_SINK_ROLE = 2, /**< Assigned sink role */
-};
-
-/**
- * @brief Describes AudioPortType.
- */
-enum AudioPortType {
- AUDIO_PORT_UNASSIGNED_TYPE = 0, /**< Unassigned port type */
- AUDIO_PORT_DEVICE_TYPE = 1, /**< Assigned device type */
- AUDIO_PORT_MIX_TYPE = 2, /**< Assigned mix type */
- AUDIO_PORT_SESSION_TYPE = 3, /**< Assigned session type */
-};
-
-/**
- * @brief Describes AudioSessionType.
- */
-enum AudioSessionType {
- AUDIO_OUTPUT_STAGE_SESSION = 0, /**< Assigned output stage session */
- AUDIO_OUTPUT_MIX_SESSION = 1, /**< Assigned output mix session */
- AUDIO_ALLOCATE_SESSION = 2, /**< Assigned allocate session */
- AUDIO_INVALID_SESSION = 3, /**< Assigned invalid session */
-};
-
-/**
- * @brief Describes AudioDeviceType.
- */
-enum AudioDeviceType {
- AUDIO_LINEOUT = 1 << 0, /**< Assigned lineout device type */
- AUDIO_HEADPHONE = 1 << 1, /**< Assigned headphone device type */
- AUDIO_HEADSET = 1 << 2, /**< Assigned headset device type */
- AUDIO_USB_HEADSET = 1 << 3, /**< Assigned usb headset device type */
- AUDIO_USB_HEADPHONE = 1 << 4, /**< Assigned usb headphone device type */
- AUDIO_USBA_HEADSET = 1 << 5, /**< Assigned usba headset device type */
- AUDIO_USBA_HEADPHONE = 1 << 6, /**< Assigned usba headphone device type */
- AUDIO_PRIMARY_DEVICE = 1 << 7, /**< Assigned primary device type */
- AUDIO_USB_DEVICE = 1 << 8, /**< Assigned usb device type */
- AUDIO_A2DP_DEVICE = 1 << 9, /**< Assigned a2dp device type */
- AUDIO_HDMI_DEVICE = 1 << 10, /**< Assigned hdmi device type */
- AUDIO_ADAPTER_DEVICE = 1 << 11, /**< Assigned adapter device type */
- AUDIO_DEVICE_UNKNOWN, /**< Assigned unknown device type */
-};
-
-/**
- * @brief Describes AudioEventType.
- */
-enum AudioEventType {
- AUDIO_DEVICE_ADD = 1, /**< Assigned add device event type */
- AUDIO_DEVICE_REMOVE = 2, /**< Assigned remove device event type */
- AUDIO_LOAD_SUCCESS = 3, /**< Assigned load sucess event type */
- AUDIO_LOAD_FAILURE = 4, /**< Assigned load failure event type */
- AUDIO_UNLOAD = 5, /**< Assigned unload event type */
- AUDIO_SERVICE_VALID = 7, /**< Assigned valid service event type */
- AUDIO_SERVICE_INVALID = 8, /**< Assigned invalid service event type */
- AUDIO_CAPTURE_THRESHOLD = 9, /**< Assigned threshold capture event type */
- AUDIO_EVENT_UNKNOWN = 10, /**< Assigned unknown event type */
-};
-
-/**
- * @brief Enumerates the restricted key type of the parameters
- */
-enum AudioExtParamKey {
- AUDIO_EXT_PARAM_KEY_NONE = 0, /**< Distributed audio extra param key none */
- AUDIO_EXT_PARAM_KEY_VOLUME = 1, /**< Distributed audio extra param key volume event */
- AUDIO_EXT_PARAM_KEY_FOCUS = 2, /**< Distributed audio extra param key focus event */
- AUDIO_EXT_PARAM_KEY_BUTTON = 3, /**< Distributed audio extra param key media button event */
- AUDIO_EXT_PARAM_KEY_EFFECT = 4, /**< Distributed audio extra param key audio effect event */
- AUDIO_EXT_PARAM_KEY_STATUS = 5, /**< Distributed audio extra param key device status event */
- AUDIO_EXT_PARAM_KEY_USB_DEVICE = 101, /**< Check USB device type ARM or HIFI */
- AUDIO_EXT_PARAM_KEY_LOWPOWER = 1000, /**< Low power event type */
-};
-
-/**
- * @brief Describes status of audio deivce.@link enum AudioDeviceType
- */
-struct AudioDeviceStatus {
- unsigned int pnpStatus; /**< Audio pnp status */
-};
-
-/**
- * @brief Describes the audio scene.
- */
-union SceneDesc {
- unsigned int id; /**< Audio scene ID */
-};
-
-/**
- * @brief Defines the audio port.
- */
-struct AudioPort {
- enum AudioPortDirection dir; /**< Audio port type. For details, see {@link AudioPortDirection} */
- unsigned int portId; /**< Audio port ID */
- String portName; /**< Audio port name */
-};
-
-/**
- * @brief Defines the audio adapter descriptor.
- *
- * An audio adapter is a set of port drivers for a sound card, including the output and input ports.
- * One port corresponds to multiple pins, and each pin belongs to a physical component (such as a
- * speaker or a wired headset).
- */
-struct AudioAdapterDescriptor {
- String adapterName; /**< Name of the audio adapter */
- struct AudioPort[] ports; /**< List of ports supported by an audio adapter */
-};
-
-/**
- * @brief Defines the audio device descriptor.
- */
-struct AudioDeviceDescriptor {
- unsigned int portId; /**< Audio port ID */
- enum AudioPortPin pins; /**< Pins of audio ports (input and output). For details, see {@link AudioPortPin}. */
- String desc; /**< Audio device name */
-};
-
-/**
- * @brief Defines the audio scene descriptor.
- */
-struct AudioSceneDescriptor {
- union SceneDesc scene; /**< Describes the audio scene */
- struct AudioDeviceDescriptor desc; /**< Audio device descriptor */
-};
-
-/**
- * @brief Defines audio input type.
- */
-enum AudioInputType {
- AUDIO_INPUT_DEFAULT_TYPE = 0, /**< Assigned default input type */
- AUDIO_INPUT_MIC_TYPE = 1 << 0, /**< Assigned mic input type */
- AUDIO_INPUT_SPEECH_WAKEUP_TYPE = 1 << 1, /**< Assigned speech wakeup input type */
- AUDIO_INPUT_VOICE_COMMUNICATION_TYPE = 1 << 2, /**< Assigned voice communication input type */
- AUDIO_INPUT_VOICE_RECOGNITION_TYPE = 1 << 3, /**< Assigned voice recognition input type */
-};
-
-/**
- * @brief Defines audio sampling attributes.
- */
-struct AudioSampleAttributes {
- enum AudioCategory type; /**< Audio type. For details, see {@link AudioCategory} */
- boolean interleaved; /**< Interleaving flag of audio data */
- enum AudioFormat format; /**< Audio data format. For details, see {@link AudioFormat}. */
- unsigned int sampleRate; /**< Audio sampling rate */
- unsigned int channelCount; /**< Number of audio channels. For example, for the mono channel, the value is 1,
- * and for the stereo channel, the value is 2.
- */
- unsigned int period; /**< Audio sampling period */
- unsigned int frameSize; /**< Frame size of the audio data */
- boolean isBigEndian; /**< Big endian flag of audio data */
- boolean isSignedData; /**< Signed or unsigned flag of audio data */
- unsigned int startThreshold; /**< Audio render start threshold. */
- unsigned int stopThreshold; /**< Audio render stop threshold. */
- unsigned int silenceThreshold; /**< Audio capture buffer threshold. */
- int streamId; /**< Audio Identifier of render or capture */
- int sourceType; /**< Audio sourceType of render or capture */
-};
-
-/**
- * @brief Defines the audio timestamp, which is a substitute for POSIX timespec.
- */
-struct AudioTimeStamp {
- long tvSec; /**< Seconds */
- long tvNSec; /**< Nanoseconds */
-};
-
-/**
- * @brief Defines the sub-port capability.
- */
-struct AudioSubPortCapability {
- unsigned int portId; /**< Sub-port ID */
- String desc; /**< Sub-port name */
- enum AudioPortPassthroughMode mask; /**< Passthrough mode of data transmission. For details,
- * see {@link AudioPortPassthroughMode}.
- */
-};
-
-/**
- * @brief Defines the audio port capability.
- */
-struct AudioPortCapability {
- unsigned int deviceType; /**< Device type (output or input) */
- unsigned int deviceId; /**< Device ID used for device binding */
- boolean hardwareMode; /**< Whether to support device binding */
- unsigned int formatNum; /**< Number of the supported audio formats */
- enum AudioFormat[] formats; /**< Supported audio formats. For details, see {@link AudioFormat}. */
- unsigned int sampleRateMasks; /**< Supported audio sampling rates (8 kHz, 16 kHz, 32 kHz, and 48 kHz) */
- enum AudioChannelMask channelMasks; /**< Audio channel layout mask of the device. For details,
- * see {@link AudioChannelMask}.
- */
- unsigned int channelCount; /**< Supported maximum number of audio channels */
- struct AudioSubPortCapability[] subPorts; /**< List of supported sub-ports */
- enum AudioSampleFormat[] supportSampleFormats; /**< Supported audio sample formats. For details,
- * see {@link AudioSampleFormat}.
- */
-};
-
-/**
- * @brief Describes a mmap buffer.
- */
-struct AudioMmapBufferDescriptor {
- byte[] memoryAddress; /**< Pointer to the mmap buffer */
- FileDescriptor memoryFd; /**< File descriptor of the mmap buffer */
- int totalBufferFrames; /**< Total size of the mmap buffer (unit: frame )*/
- int transferFrameSize; /**< Transfer size (unit: frame) */
- int isShareable; /**< Whether the mmap buffer can be shared among processes */
- unsigned int offset; /**< off set */
- String filePath; /**< file path */
-};
-
-/**
- * @brief Describes AudioDevExtInfo.
- */
-struct AudioDevExtInfo {
- int moduleId; /**< Identifier of the module stream is attached to */
- enum AudioPortPin type; /**< Device type For details, see {@link AudioPortPin}. */
- String desc; /**< Address */
-};
-
-/**
- * @brief Describes AudioMixInfo.
- */
-struct AudioMixExtInfo {
- int moduleId; /**< Identifier of the module stream is attached to */
- int streamId; /**< Identifier of the capture or render passed by caller */
-};
-
-/**
- * @brief Describes AudioSessionExtInfo.
- */
-struct AudioSessionExtInfo {
- enum AudioSessionType sessionType; /**< Audio session type */
-};
-
-/**
- * @brief Describes AudioInfo.
- */
-struct AudioInfo {
- struct AudioDevExtInfo device; /* Specific Device Ext info */
- struct AudioMixExtInfo mix; /* Specific mix info */
- struct AudioSessionExtInfo session; /* session specific info */
-};
-
-/**
- * @brief Describes AudioRouteNode.
- */
-struct AudioRouteNode {
- int portId; /**< Audio port ID */
- enum AudioPortRole role; /**< Audio port as a sink or a source */
- enum AudioPortType type; /**< device, mix ... */
- struct AudioInfo ext; /**< The ext object */
-};
-
-/**
- * @brief Describes AudioRoute.
- */
-struct AudioRoute {
- struct AudioRouteNode[] sources; /**< List of sources */
- struct AudioRouteNode[] sinks; /**< List of sinks */
-};
-
-/**
- * @brief Describes AudioEvent.
- */
-struct AudioEvent {
- unsigned int eventType; /**< @link enum AudioEventType */
- unsigned int deviceType; /**< @link enum AudioDeviceType */
-};
diff --git a/hdf_interfaces/distributed_audio/audio/v1_0/BUILD.gn b/hdf_interfaces/distributed_audio/audio/v1_0/BUILD.gn
deleted file mode 100644
index 05f1c7e2f3b5a8eaa00919fd932e900d43823213..0000000000000000000000000000000000000000
--- a/hdf_interfaces/distributed_audio/audio/v1_0/BUILD.gn
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (c) 2022 Huawei Device Co., Ltd.
-# 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.
-
-import("//drivers/hdf_core/adapter/uhdf2/hdi.gni")
-hdi("daudio") {
- module_name = "daudio"
- sources = [
- "AudioTypes.idl",
- "IAudioAdapter.idl",
- "IAudioCallback.idl",
- "IAudioCapture.idl",
- "IAudioManager.idl",
- "IAudioRender.idl",
- ]
- language = "cpp"
- root = "ohos.hdi://foundation/distributedhardware/distributed_audio/hdf_interfaces/"
- subsystem_name = "distributedhardware"
- part_name = "drivers_interface_distributed_audio"
-}
diff --git a/hdf_interfaces/distributed_audio/audio/v1_0/IAudioAdapter.idl b/hdf_interfaces/distributed_audio/audio/v1_0/IAudioAdapter.idl
deleted file mode 100644
index 739a4fa32e269ef94d76efd73799ad1346ef26cb..0000000000000000000000000000000000000000
--- a/hdf_interfaces/distributed_audio/audio/v1_0/IAudioAdapter.idl
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2022-2023 Huawei Device Co., Ltd.
- * 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.
- */
-
-package ohos.hdi.distributed_audio.audio.v1_0;
-
-import ohos.hdi.distributed_audio.audio.v1_0.AudioTypes;
-import ohos.hdi.distributed_audio.audio.v1_0.IAudioCapture;
-import ohos.hdi.distributed_audio.audio.v1_0.IAudioRender;
-import ohos.hdi.distributed_audio.audio.v1_0.IAudioCallback;
-
-/**
- * @brief Provides audio adapter capabilities, including initializing ports, creating rendering and capturing tasks,
- * and obtaining the port capability set.
- *
- * @see IAudioRender
- * @see IAudioCapture
- * @since 4.0
- * @version 1.0
- */
-interface IAudioAdapter {
- InitAllPorts();
- CreateRender([in] struct AudioDeviceDescriptor desc, [in] struct AudioSampleAttributes attrs,
- [out] IAudioRender render, [out] unsigned int renderId);
- DestroyRender([in] unsigned int renderId);
- CreateCapture([in] struct AudioDeviceDescriptor desc, [in] struct AudioSampleAttributes attrs,
- [out] IAudioCapture capture, [out] unsigned int captureId);
- DestroyCapture([in] unsigned int captureId);
- GetPortCapability([in] struct AudioPort port, [out] struct AudioPortCapability capability);
- SetPassthroughMode([in] struct AudioPort port, [in] enum AudioPortPassthroughMode mode);
- GetPassthroughMode([in] struct AudioPort port, [out] enum AudioPortPassthroughMode mode);
- GetDeviceStatus([out] struct AudioDeviceStatus status);
- UpdateAudioRoute([in] struct AudioRoute route, [out] int routeHandle);
- ReleaseAudioRoute([in] int routeHandle);
- SetMicMute([in] boolean mute);
- GetMicMute([out] boolean mute);
- SetVoiceVolume([in] float volume);
- SetExtraParams([in] enum AudioExtParamKey key, [in] String condition, [in] String value);
- GetExtraParams([in] enum AudioExtParamKey key, [in] String condition, [out] String value);
- RegExtraParamObserver([in] IAudioCallback audioCallback, [in] byte cookie);
-}
\ No newline at end of file
diff --git a/hdf_interfaces/distributed_audio/audio/v1_0/IAudioCallback.idl b/hdf_interfaces/distributed_audio/audio/v1_0/IAudioCallback.idl
deleted file mode 100644
index 7e29d458d442e0d2204900cee956d573dc3a8b64..0000000000000000000000000000000000000000
--- a/hdf_interfaces/distributed_audio/audio/v1_0/IAudioCallback.idl
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2022-2023 Huawei Device Co., Ltd.
- * 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.
- */
-
-/**
- * @addtogroup HdiAudio
- * @{
- *
- * @brief Provides unified APIs for audio services to access audio drivers.
- *
- * An audio service can obtain an audio driver object or agent and then call APIs provided by this object or agent to
- * access different types of audio devices based on the audio IDs, thereby obtaining audio information,
- * subscribing to or unsubscribing from audio data, enabling or disabling an audio,
- * setting the audio data reporting mode, and setting audio options such as the accuracy and measurement range.
- *
- * @version 1.0
- */
-
-package ohos.hdi.distributed_audio.audio.v1_0;
-
-import ohos.hdi.distributed_audio.audio.v1_0.AudioTypes;
-
-/**
- * @brief Called when an event defined in {@link AudioCallbackType} occurs.
- *
- * @param AudioCallbackType Indicates the occurred event that triggers this callback.
- * @param reserved Indicates the pointer to a reserved field.
- * @param cookie Indicates the pointer to the cookie for data transmission.
- * @return Returns 0 if the callback is successfully executed; returns a negative value otherwise.
- * @see RegCallback
- */
-[callback] interface IAudioCallback {
- RenderCallback([in] enum AudioCallbackType type, [out] byte reserved, [out] byte cookie);
- ParamCallback([in] enum AudioExtParamKey key, [in] String condition, [in] String value, [out] byte reserved, [in] byte cookie);
-}
diff --git a/hdf_interfaces/distributed_audio/audio/v1_0/IAudioCapture.idl b/hdf_interfaces/distributed_audio/audio/v1_0/IAudioCapture.idl
deleted file mode 100644
index 51b6f0d30f36a72b5b39ae872c0c6b2a6200fd3b..0000000000000000000000000000000000000000
--- a/hdf_interfaces/distributed_audio/audio/v1_0/IAudioCapture.idl
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2022-2023 Huawei Device Co., Ltd.
- * 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.
- */
-
-package ohos.hdi.distributed_audio.audio.v1_0;
-
-import ohos.hdi.distributed_audio.audio.v1_0.AudioTypes;
-
-/**
- * @brief Provides capabilities for audio capturing, including controlling the capturing, setting audio attributes,
- * scenes, and volume, and capturing audio frames.
- * @since 4.0
- * @version 1.0
- */
-interface IAudioCapture {
- CaptureFrame([out] byte[] frame, [out] unsigned long replyBytes);
- GetCapturePosition([out] unsigned long frames, [out] struct AudioTimeStamp time);
- CheckSceneCapability([in] struct AudioSceneDescriptor scene, [out] boolean supported);
- SelectScene([in] struct AudioSceneDescriptor scene);
- SetMute([in] boolean mute);
- GetMute([out] boolean mute);
- SetVolume([in] float volume);
- GetVolume([out] float volume);
- GetGainThreshold([out] float min, [out] float max);
- GetGain([out] float gain);
- SetGain([in] float gain);
- GetFrameSize([out] unsigned long size);
- GetFrameCount([out] unsigned long count);
- SetSampleAttributes([in] struct AudioSampleAttributes attrs);
- GetSampleAttributes([out] struct AudioSampleAttributes attrs);
- GetCurrentChannelId([out] unsigned int channelId);
- SetExtraParams([in] String keyValueList);
- GetExtraParams([out] String keyValueList);
- ReqMmapBuffer([in] int reqSize, [out] struct AudioMmapBufferDescriptor desc);
- GetMmapPosition([out] unsigned long frames, [out] struct AudioTimeStamp time);
- AddAudioEffect([in] unsigned long effectid);
- RemoveAudioEffect([in] unsigned long effectid);
- GetFrameBufferSize([out] unsigned long bufferSize);
- Start();
- Stop();
- Pause();
- Resume();
- Flush();
- TurnStandbyMode();
- AudioDevDump([in] int range, [in] int fd);
- IsSupportsPauseAndResume([out] boolean supportPause, [out] boolean supportResume);
-}
\ No newline at end of file
diff --git a/hdf_interfaces/distributed_audio/audio/v1_0/IAudioManager.idl b/hdf_interfaces/distributed_audio/audio/v1_0/IAudioManager.idl
deleted file mode 100644
index 16061bf17d0f103cd3d5f659b94ba166dc778f86..0000000000000000000000000000000000000000
--- a/hdf_interfaces/distributed_audio/audio/v1_0/IAudioManager.idl
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2022-2023 Huawei Device Co., Ltd.
- * 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.
- */
-
-package ohos.hdi.distributed_audio.audio.v1_0;
-
-import ohos.hdi.distributed_audio.audio.v1_0.AudioTypes;
-import ohos.hdi.distributed_audio.audio.v1_0.IAudioAdapter;
-
-/**
- * @brief Manages audio adapters through a specific adapter driver program loaded based on the given audio
- * adapter descriptor.
- *
- * @see IAudioAdapter
- * @since 4.0
- * @version 1.0
- */
-interface IAudioManager {
- GetAllAdapters([out] struct AudioAdapterDescriptor[] descs);
- LoadAdapter([in] struct AudioAdapterDescriptor desc, [out] IAudioAdapter adapter);
- UnloadAdapter([in] String adapterName);
- ReleaseAudioManagerObject();
-}
diff --git a/hdf_interfaces/distributed_audio/audio/v1_0/IAudioRender.idl b/hdf_interfaces/distributed_audio/audio/v1_0/IAudioRender.idl
deleted file mode 100644
index c4a898bf1314a4a5b3ac34fef7158e600e20f61c..0000000000000000000000000000000000000000
--- a/hdf_interfaces/distributed_audio/audio/v1_0/IAudioRender.idl
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2022-2023 Huawei Device Co., Ltd.
- * 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.
- */
-
-package ohos.hdi.distributed_audio.audio.v1_0;
-
-import ohos.hdi.distributed_audio.audio.v1_0.AudioTypes;
-import ohos.hdi.distributed_audio.audio.v1_0.IAudioCallback;
-
-/**
- * @brief Provides capabilities for audio rendering, including controlling the rendering, setting audio attributes,
- * scenes, and volume, obtaining hardware latency, and rendering audio frames.
- *
- * @since 4.0
- * @version 1.0
- */
-interface IAudioRender {
- GetLatency([out] unsigned int ms);
- RenderFrame([in] byte[] frame, [out] unsigned long replyBytes);
- GetRenderPosition([out] unsigned long frames, [out] struct AudioTimeStamp time);
- SetRenderSpeed([in] float speed);
- GetRenderSpeed([out] float speed);
- SetChannelMode([in] enum AudioChannelMode mode);
- GetChannelMode([out] enum AudioChannelMode mode);
- RegCallback([in] IAudioCallback audioCallback, [in] byte cookie);
- DrainBuffer([out] enum AudioDrainNotifyType type);
- IsSupportsDrain([out] boolean support);
- CheckSceneCapability([in] struct AudioSceneDescriptor scene, [out] boolean supported);
- SelectScene([in] struct AudioSceneDescriptor scene);
- SetMute([in] boolean mute);
- GetMute([out] boolean mute);
- SetVolume([in] float volume);
- GetVolume([out] float volume);
- GetGainThreshold([out] float min, [out] float max);
- GetGain([out] float gain);
- SetGain([in] float gain);
- GetFrameSize([out] unsigned long size);
- GetFrameCount([out] unsigned long count);
- SetSampleAttributes([in] struct AudioSampleAttributes attrs);
- GetSampleAttributes([out] struct AudioSampleAttributes attrs);
- GetCurrentChannelId([out] unsigned int channelId);
- SetExtraParams([in] String keyValueList);
- GetExtraParams([out] String keyValueList);
- ReqMmapBuffer([in] int reqSize, [out] struct AudioMmapBufferDescriptor desc);
- GetMmapPosition([out] unsigned long frames, [out] struct AudioTimeStamp time);
- AddAudioEffect([in] unsigned long effectid);
- RemoveAudioEffect([in] unsigned long effectid);
- GetFrameBufferSize([out] unsigned long bufferSize);
- Start();
- Stop();
- Pause();
- Resume();
- Flush();
- TurnStandbyMode();
- AudioDevDump([in] int range, [in] int fd);
- IsSupportsPauseAndResume([out] boolean supportPause, [out] boolean supportResume);
-}
\ No newline at end of file
diff --git a/hdf_interfaces/distributed_audio/audioext/v1_0/BUILD.gn b/hdf_interfaces/distributed_audio/audioext/v1_0/BUILD.gn
deleted file mode 100644
index 7c8160df54e5aa0139ef663746e39d69fa7d25e0..0000000000000000000000000000000000000000
--- a/hdf_interfaces/distributed_audio/audioext/v1_0/BUILD.gn
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) 2022 Huawei Device Co., Ltd.
-# 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.
-
-import("//drivers/hdf_core/adapter/uhdf2/hdi.gni")
-hdi("daudioext") {
- module_name = "daudioext"
- sources = [
- "IDAudioCallback.idl",
- "IDAudioManager.idl",
- "Types.idl",
- ]
- language = "cpp"
- root = "ohos.hdi://foundation/distributedhardware/distributed_audio/hdf_interfaces/"
- subsystem_name = "distributedhardware"
- part_name = "drivers_interface_distributed_audio"
-}
diff --git a/hdf_interfaces/distributed_audio/audioext/v1_0/IDAudioCallback.idl b/hdf_interfaces/distributed_audio/audioext/v1_0/IDAudioCallback.idl
deleted file mode 100644
index b4f787c74dc56948a30b3986be291b3317fcfe76..0000000000000000000000000000000000000000
--- a/hdf_interfaces/distributed_audio/audioext/v1_0/IDAudioCallback.idl
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2022 Huawei Device Co., Ltd.
- * 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.
- */
-
-package ohos.hdi.distributed_audio.audioext.v1_0;
-
-import ohos.hdi.distributed_audio.audioext.v1_0.Types;
-
-[callback] interface IDAudioCallback {
- OpenDevice([in] String adpName, [in] int devId);
- CloseDevice([in] String adpName, [in] int devId);
- SetParameters([in] String adpName, [in] int devId, [in] struct AudioParameter param);
- NotifyEvent([in] String adpName, [in] int devId, [in] struct DAudioEvent event);
- WriteStreamData([in] String adpName, [in] int devId, [in] struct AudioData data);
- ReadStreamData([in] String adpName, [in] int devId, [out] struct AudioData data);
- ReadMmapPosition([in] String adpName, [in] int devId, [out] unsigned long frames, [out] struct CurrentTime time);
- RefreshAshmemInfo([in] String adpName, [in] int devId, [in] FileDescriptor fd, [in] int ashmemLength, [in] int lengthPerTrans);
-}
\ No newline at end of file
diff --git a/hdf_interfaces/distributed_audio/audioext/v1_0/IDAudioManager.idl b/hdf_interfaces/distributed_audio/audioext/v1_0/IDAudioManager.idl
deleted file mode 100644
index 9ea0f8bacd6c1b37b7bb6c80eabcbf43eebfdd42..0000000000000000000000000000000000000000
--- a/hdf_interfaces/distributed_audio/audioext/v1_0/IDAudioManager.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2022 Huawei Device Co., Ltd.
- * 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.
- */
-
-package ohos.hdi.distributed_audio.audioext.v1_0;
-
-import ohos.hdi.distributed_audio.audioext.v1_0.IDAudioCallback;
-import ohos.hdi.distributed_audio.audioext.v1_0.Types;
-
-interface IDAudioManager {
- RegisterAudioDevice([in] String adpName, [in] int devId, [in] String capability, [in] IDAudioCallback callbackObj);
- UnRegisterAudioDevice([in] String adpName, [in] int devId);
- NotifyEvent([in] String adpName, [in] int devId, [in] struct DAudioEvent event);
-}
\ No newline at end of file
diff --git a/hdf_interfaces/distributed_audio/audioext/v1_0/Types.idl b/hdf_interfaces/distributed_audio/audioext/v1_0/Types.idl
deleted file mode 100644
index 35b5c1fb6b8f382d42205c50922046c8b7f77681..0000000000000000000000000000000000000000
--- a/hdf_interfaces/distributed_audio/audioext/v1_0/Types.idl
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2022 Huawei Device Co., Ltd.
- * 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.
- */
-
-package ohos.hdi.distributed_audio.audioext.v1_0;
-enum PortOperationMode {
- NORMAL_MODE = 0,
- MMAP_MODE = 1,
-};
-struct AudioParameter {
- unsigned int format;
- unsigned int channelCount;
- unsigned int sampleRate;
- unsigned int period;
- unsigned int frameSize;
- unsigned int streamUsage;
- enum PortOperationMode renderFlags;
- enum PortOperationMode capturerFlags;
- String ext;
-};
-struct AudioData {
- struct AudioParameter param;
- byte[] data;
-};
-struct DAudioEvent {
- int type;
- String content;
-};
-struct CurrentTime {
- long tvSec;
- long tvNSec;
-};
\ No newline at end of file
diff --git a/hdf_interfaces/distributed_audio/bundle.json b/hdf_interfaces/distributed_audio/bundle.json
deleted file mode 100644
index 524bddbe4174bfe3eb05157d8d754b0921f4968c..0000000000000000000000000000000000000000
--- a/hdf_interfaces/distributed_audio/bundle.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "name": "@ohos/drivers_interface_distributed_audio",
- "description": "distributed audio device driver interface",
- "version": "4.0",
- "license": "Apache License 2.0",
- "segment": {
- "destPath": "foundation/distributedhardware/distributed_audio/hdf_interfaces/"
- },
- "component": {
- "name": "drivers_interface_distributed_audio",
- "subsystem": "distributedhardware",
- "adapted_system_type": [
- "standard"
- ],
- "rom": "675KB",
- "ram": "1024KB",
- "deps": {
- "components": [
- "ipc",
- "hdf_core",
- "hilog",
- "c_utils"
- ],
- "third_party": []
- },
- "build": {
- "sub_component": [
- "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audio/v1_0:daudio_idl_target",
- "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audioext/v1_0:daudioext_idl_target"
- ],
- "test": [
-
- ],
- "inner_kits": [{
- "name": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audio/v1_0:libdaudio_proxy_1.0",
- "header": {
- "header_files": [],
- "header_base": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audio"
- }
- },
- {
- "name": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audio/v1_0:libdaudio_stub_1.0",
- "header": {
- "header_files": [],
- "header_base": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audio"
- }
- },
- {
- "name": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audioext/v1_0:libdaudioext_proxy_1.0",
- "header": {
- "header_files": [],
- "header_base": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audioext"
- }
- },
- {
- "name": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audioext/v1_0:libdaudioext_stub_1.0",
- "header": {
- "header_files": [],
- "header_base": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audioext"
- }
- }
- ]
- }
- }
-}
\ No newline at end of file
diff --git a/hdf_service/distributed_audio/BUILD.gn b/hdf_service/distributed_audio/BUILD.gn
deleted file mode 100644
index 3e332e5e6576eec60d69ee50bc3d3a63192b624e..0000000000000000000000000000000000000000
--- a/hdf_service/distributed_audio/BUILD.gn
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2022 Huawei Device Co., Ltd.
-# 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.
-
-if (defined(ohos_lite)) {
- group("distributed_audio_entry") {
- deps = []
- }
-} else {
- group("distributed_audio_entry") {
- deps = [
- "./../../hdf_interfaces/distributed_audio/audio/v1_0:daudio_idl_target",
- "./../../hdf_interfaces/distributed_audio/audioext/v1_0:daudioext_idl_target",
- "./hdi_service/audio/v1_0:hdf_daudio_primary_service",
- "./hdi_service/audio_ext/v1_0:hdf_daudio_ext_service",
- ]
- }
-}
diff --git a/hdf_service/distributed_audio/bundle.json b/hdf_service/distributed_audio/bundle.json
deleted file mode 100644
index b6c6e78f85d88ac14708db84d063d61d990aef64..0000000000000000000000000000000000000000
--- a/hdf_service/distributed_audio/bundle.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
- "name": "@ohos/drivers_peripheral_distributed_audio",
- "description": "distributed audo device driver",
- "version": "4.0",
- "license": "Apache License 2.0",
- "segment": {
- "destPath": "foundation/distributedhardware/distributed_audio/hdf_service/"
- },
- "component": {
- "name": "drivers_peripheral_distributed_audio",
- "subsystem": "distributedhardware",
- "adapted_system_type": [
- "standard"
- ],
- "rom": "1000KB",
- "ram": "8000KB",
- "deps": {
- "components": [
- "c_utils",
- "drivers_interface_distributed_audio",
- "hdf_core",
- "hilog",
- "ipc"
- ],
- "third_party": [
- "cJSON"
- ]
- },
- "build": {
- "sub_component": [
- "//foundation/distributedhardware/distributed_audio/hdf_service/distributed_audio:distributed_audio_entry",
- "//foundation/distributedhardware/distributed_audio/hdf_service/distributed_audio/hdi_service/common:libdaudio_hdf_utils"
- ],
- "test": [
- "//foundation/distributedhardware/distributed_audio/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest:hdi_service_audio_test",
- "//foundation/distributedhardware/distributed_audio/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/test/unittest:hdi_service_audio_ext_test"
- ],
- "inner_kits": [{
- "name": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audio/v1_0:libdaudio_proxy_1.0",
- "header": {
- "header_files": [],
- "header_base": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audio"
- }
- },
- {
- "name": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audioext/v1_0:libdaudioext_proxy_1.0",
- "header": {
- "header_files": [],
- "header_base": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audioext"
- }
- }
- ]
- }
- }
-}
\ No newline at end of file
diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/BUILD.gn b/hdf_service/distributed_audio/hdi_service/audio/v1_0/BUILD.gn
deleted file mode 100644
index ec6968e92070820d91176a1aaedd334f02c6a3de..0000000000000000000000000000000000000000
--- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/BUILD.gn
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright (c) 2023 Huawei Device Co., Ltd.
-# 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.
-
-import("//build/ohos.gni")
-import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
-import("../../../../../distributedaudio.gni")
-
-ohos_shared_library("libaudio_manager_daudio_primary_service_1.0") {
- include_dirs = [
- "//third_party/cJSON",
- "${hdf_ser_aud_path}/include",
- "${hdf_service_path}/hdi_service/common/include",
- "${hdf_service_path}/hdi_service/common/log/include",
- "${hdf_service_path}/hdi_service/common/utils/include",
- ]
-
- if (distributed_audio_extension) {
- include_dirs +=
- [ "${distributedaudio_ext_path}/hdf_service_extension/include/" ]
- }
-
- sources = [
- "./src/audio_adapter_interface_impl.cpp",
- "./src/audio_capture_interface_impl.cpp",
- "./src/audio_manager_interface_impl.cpp",
- "./src/audio_render_interface_impl.cpp",
- ]
-
- if (distributed_audio_extension) {
- sources += [
- "${distributedaudio_ext_path}/hdf_service_extension/src/audio_capture_ext_impl.cpp",
- "${distributedaudio_ext_path}/hdf_service_extension/src/audio_render_ext_impl.cpp",
- ]
- }
-
- deps = [ "//third_party/cJSON:cjson" ]
- public_deps = [ "${hdf_service_path}/hdi_service/common:libdaudio_hdf_utils" ]
-
- external_deps = [
- "c_utils:utils",
- "drivers_interface_distributed_audio:libdaudio_stub_1.0",
- "drivers_interface_distributed_audio:libdaudioext_stub_1.0",
- "hdf_core:libhdf_host",
- "hdf_core:libhdf_utils",
- "hilog:libhilog",
- "ipc:ipc_single",
- ]
-
- if (distributed_audio_extension) {
- cflags = [ "-DDAUDIO_SUPPORT_EXTENSION" ]
- }
-
- defines = [
- "HI_LOG_ENABLE",
- "LOG_DOMAIN=0xD004100",
- ]
-
- if (build_variant == "root") {
- defines += [
- "DUMP_CAPTURE_FILE",
- "DUMP_RENDER_FILE",
- ]
- }
-
- install_images = [ chipset_base_dir ]
- subsystem_name = "distributedhardware"
- part_name = "drivers_peripheral_distributed_audio"
-}
-
-ohos_shared_library("libdaudio_primary_driver") {
- include_dirs = [ "${hdf_ser_aud_path}/include" ]
-
- sources = [ "./src/audio_driver.cpp" ]
-
- deps = [ "${hdf_ser_aud_path}:libaudio_manager_daudio_primary_service_1.0" ]
-
- external_deps = [
- "c_utils:utils",
- "drivers_interface_distributed_audio:libdaudio_stub_1.0",
- "drivers_interface_distributed_audio:libdaudioext_stub_1.0",
- "hdf_core:libhdf_host",
- "hdf_core:libhdf_ipc_adapter",
- "hdf_core:libhdf_utils",
- "hdf_core:libhdi",
- "hilog:libhilog",
- "ipc:ipc_single",
- ]
-
- shlib_type = "hdi"
- install_images = [ chipset_base_dir ]
- subsystem_name = "distributedhardware"
- part_name = "drivers_peripheral_distributed_audio"
-}
-
-group("hdf_daudio_primary_service") {
- deps = [
- ":libaudio_manager_daudio_primary_service_1.0",
- ":libdaudio_primary_driver",
- ]
-}
diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/include/audio_adapter_interface_impl.h b/hdf_service/distributed_audio/hdi_service/audio/v1_0/include/audio_adapter_interface_impl.h
deleted file mode 100644
index 5509e44c4951b010b20e74421315e1197032205f..0000000000000000000000000000000000000000
--- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/include/audio_adapter_interface_impl.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
- * 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.
- */
-
-#ifndef OHOS_AUDIO_ADAPTER_INTERFACE_IMPL_H
-#define OHOS_AUDIO_ADAPTER_INTERFACE_IMPL_H
-
-#include
-#include