From 77f213a70a5ce5bd928b0c81109aeee410c1b490 Mon Sep 17 00:00:00 2001 From: vb6174 Date: Wed, 10 Aug 2022 09:57:01 +0800 Subject: [PATCH] fix: add audio IDL I Signed-off-by: vb6174 --- audio/v1_0/BUILD.gn | 10 +++++----- audio/v1_0/{AudioAdapter.idl => IAudioAdapter.idl} | 10 +++++----- audio/v1_0/{AudioCallback.idl => IAudioCallback.idl} | 2 +- audio/v1_0/{AudioCapture.idl => IAudioCapture.idl} | 2 +- audio/v1_0/{AudioManager.idl => IAudioManager.idl} | 6 +++--- audio/v1_0/{AudioRender.idl => IAudioRender.idl} | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) rename audio/v1_0/{AudioAdapter.idl => IAudioAdapter.idl} (83%) rename audio/v1_0/{AudioCallback.idl => IAudioCallback.idl} (97%) rename audio/v1_0/{AudioCapture.idl => IAudioCapture.idl} (98%) rename audio/v1_0/{AudioManager.idl => IAudioManager.idl} (84%) rename audio/v1_0/{AudioRender.idl => IAudioRender.idl} (94%) diff --git a/audio/v1_0/BUILD.gn b/audio/v1_0/BUILD.gn index 4a7bb68f..545cbc28 100644 --- a/audio/v1_0/BUILD.gn +++ b/audio/v1_0/BUILD.gn @@ -23,12 +23,12 @@ if (defined(ohos_lite)) { module_name = "audio_service" sources = [ - "AudioAdapter.idl", - "AudioCallback.idl", - "AudioCapture.idl", - "AudioManager.idl", - "AudioRender.idl", "AudioTypes.idl", + "IAudioAdapter.idl", + "IAudioCallback.idl", + "IAudioCapture.idl", + "IAudioManager.idl", + "IAudioRender.idl", ] language = "c" diff --git a/audio/v1_0/AudioAdapter.idl b/audio/v1_0/IAudioAdapter.idl similarity index 83% rename from audio/v1_0/AudioAdapter.idl rename to audio/v1_0/IAudioAdapter.idl index 8a13cb86..9268c46d 100644 --- a/audio/v1_0/AudioAdapter.idl +++ b/audio/v1_0/IAudioAdapter.idl @@ -16,14 +16,14 @@ package ohos.hdi.audio.v1_0; import ohos.hdi.audio.v1_0.AudioTypes; -import ohos.hdi.audio.v1_0.AudioRender; -import ohos.hdi.audio.v1_0.AudioCapture; +import ohos.hdi.audio.v1_0.IAudioRender; +import ohos.hdi.audio.v1_0.IAudioCapture; -interface AudioAdapter { +interface IAudioAdapter { InitAllPorts(); - CreateRender([in] struct AudioDeviceDescriptor desc, [in] struct AudioSampleAttributes attrs, [out] AudioRender render); + CreateRender([in] struct AudioDeviceDescriptor desc, [in] struct AudioSampleAttributes attrs, [out] IAudioRender render); DestroyRender(); - CreateCapture([in] struct AudioDeviceDescriptor desc, [in] struct AudioSampleAttributes attrs, [out] AudioCapture capture); + CreateCapture([in] struct AudioDeviceDescriptor desc, [in] struct AudioSampleAttributes attrs, [out] IAudioCapture capture); DestroyCapture(); GetPortCapability([in] struct AudioPort port, [out] struct AudioPortCapability capability); SetPassthroughMode([in] struct AudioPort port, [in] enum AudioPortPassthroughMode mode); diff --git a/audio/v1_0/AudioCallback.idl b/audio/v1_0/IAudioCallback.idl similarity index 97% rename from audio/v1_0/AudioCallback.idl rename to audio/v1_0/IAudioCallback.idl index 3fd8e4b7..c617e1b2 100644 --- a/audio/v1_0/AudioCallback.idl +++ b/audio/v1_0/IAudioCallback.idl @@ -40,6 +40,6 @@ import ohos.hdi.audio.v1_0.AudioTypes; * @return Returns 0 if the callback is successfully executed; returns a negative value otherwise. * @see RegCallback */ -[callback] interface AudioCallback { +[callback] interface IAudioCallback { RenderCallback([in] enum AudioCallbackType type, [out] byte reserved, [out] byte cookie); } diff --git a/audio/v1_0/AudioCapture.idl b/audio/v1_0/IAudioCapture.idl similarity index 98% rename from audio/v1_0/AudioCapture.idl rename to audio/v1_0/IAudioCapture.idl index d2f7bd40..b83caaa1 100644 --- a/audio/v1_0/AudioCapture.idl +++ b/audio/v1_0/IAudioCapture.idl @@ -17,7 +17,7 @@ package ohos.hdi.audio.v1_0; import ohos.hdi.audio.v1_0.AudioTypes; -interface AudioCapture { +interface IAudioCapture { CaptureFrame([out] byte[] frame, [in] unsigned long requestBytes); GetCapturePosition([out] unsigned long frames, [out] struct AudioTimeStamp time); CheckSceneCapability([in] struct AudioSceneDescriptor scene, [out] boolean supported); diff --git a/audio/v1_0/AudioManager.idl b/audio/v1_0/IAudioManager.idl similarity index 84% rename from audio/v1_0/AudioManager.idl rename to audio/v1_0/IAudioManager.idl index 47c25540..f868abf4 100644 --- a/audio/v1_0/AudioManager.idl +++ b/audio/v1_0/IAudioManager.idl @@ -16,11 +16,11 @@ package ohos.hdi.audio.v1_0; import ohos.hdi.audio.v1_0.AudioTypes; -import ohos.hdi.audio.v1_0.AudioAdapter; +import ohos.hdi.audio.v1_0.IAudioAdapter; -interface AudioManager { +interface IAudioManager { GetAllAdapters([out] struct AudioAdapterDescriptor[] descs); - LoadAdapter([in] struct AudioAdapterDescriptor desc, [out] AudioAdapter adapter); + LoadAdapter([in] struct AudioAdapterDescriptor desc, [out] IAudioAdapter adapter); UnloadAdapter([in] String adapterName); ReleaseAudioManagerObject(); } diff --git a/audio/v1_0/AudioRender.idl b/audio/v1_0/IAudioRender.idl similarity index 94% rename from audio/v1_0/AudioRender.idl rename to audio/v1_0/IAudioRender.idl index 37ae4759..0712c090 100644 --- a/audio/v1_0/AudioRender.idl +++ b/audio/v1_0/IAudioRender.idl @@ -16,9 +16,9 @@ package ohos.hdi.audio.v1_0; import ohos.hdi.audio.v1_0.AudioTypes; -import ohos.hdi.audio.v1_0.AudioCallback; +import ohos.hdi.audio.v1_0.IAudioCallback; -interface AudioRender { +interface IAudioRender { GetLatency([out] unsigned int ms); RenderFrame([in] byte[] frame, [out] unsigned long replyBytes); GetRenderPosition([out] unsigned long frames, [out] struct AudioTimeStamp time); @@ -26,7 +26,7 @@ interface AudioRender { GetRenderSpeed([out] float speed); SetChannelMode([in] enum AudioChannelMode mode); GetChannelMode([out] enum AudioChannelMode mode); - RegCallback([in] AudioCallback audioCallback, [in] byte cookie); + RegCallback([in] IAudioCallback audioCallback, [in] byte cookie); DrainBuffer([out] enum AudioDrainNotifyType type); CheckSceneCapability([in] struct AudioSceneDescriptor scene, [out] boolean supported); SelectScene([in] struct AudioSceneDescriptor scene); -- Gitee