From 489435cbac3d73444120a71f028623d7b277173c Mon Sep 17 00:00:00 2001 From: zhanganxiang Date: Mon, 18 Aug 2025 20:07:27 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=BE=93=E5=85=A5=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=94=AF=E6=8C=81=E4=BC=A0=E5=85=A5UID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanganxiang --- api/@ohos.multimedia.audio.d.ts | 77 ++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/api/@ohos.multimedia.audio.d.ts b/api/@ohos.multimedia.audio.d.ts index bd12578b0d..52e4d753ea 100644 --- a/api/@ohos.multimedia.audio.d.ts +++ b/api/@ohos.multimedia.audio.d.ts @@ -1007,6 +1007,30 @@ declare namespace audio { SPEAKER = 2 } + /** + * Enumerates the device select strategy. + * @enum { number } + * @syscap SystemCapability.Multimedia.Audio.Device + * @systemapi + * @since 21 + */ + enum AudioDevcieSelectStrategy { + /** + * The default follow device select strategy. + * @syscap SystemCapability.Multimedia.Audio.Device + * @systemapi + * @since 21 + */ + DEFAULT_SELECT_STRATEGY = 0, + /** + * The independent device select strategy.. + * @syscap SystemCapability.Multimedia.Audio.Device + * @systemapi + * @since 21 + */ + INDEPENDENT_SELECT_STRATEGY = 1, + } + /** * Enumerates ringer modes. * @enum { number } @@ -3719,7 +3743,17 @@ declare namespace audio { * @systemapi * @since 9 */ - selectOutputDeviceByFilter(filter: AudioRendererFilter, outputAudioDevices: AudioDeviceDescriptors): Promise; + /** + * Select the output device with desired AudioRenderer. This method uses a promise to return the result. + * @param { AudioRendererFilter } filter - Filter for AudioRenderer. + * @param { AudioDeviceDescriptors } outputAudioDevices - Audio device description. + * @param { AudioDevcieSelectStrategy } [strategy] - Audio device select strategy. + * @returns { Promise } Promise used to return the result. + * @syscap SystemCapability.Multimedia.Audio.Device + * @systemapi + * @since 9 + */ + selectOutputDeviceByFilter(filter: AudioRendererFilter, outputAudioDevices: AudioDeviceDescriptors, strategy?: AudioDevcieSelectStrategy): Promise; /** * Select the input device. This method uses an asynchronous callback to return the result. @@ -3806,6 +3840,19 @@ declare namespace audio { */ getPreferOutputDeviceForRendererInfo(rendererInfo: AudioRendererInfo): Promise; + /** + * Get output device for target audio renderer info and application. + * @param { AudioRendererInfo } rendererInfo - Audio renderer information. + * @param { number } uid - The uid of target application. + * @returns { Promise } Promise used to return the result. + * @throws { BusinessError } 6800101 - Parameter verification failed. Return by promise. + * @throws { BusinessError } 6800301 - Audio client call audio audio service error, System error. + * @syscap SystemCapability.Multimedia.Audio.Device + * @systemapi + * @since 21 + */ + getPreferOutputDeviceForRendererInfoAndUid(rendererInfo: AudioRendererInfo, uid: number): Promise; + /** * Gets preferred output device for target audio renderer info. * @param { AudioRendererInfo } rendererInfo - Audio renderer information. @@ -3900,6 +3947,34 @@ declare namespace audio { */ off(type: 'preferOutputDeviceChangeForRendererInfo', callback?: Callback): void; + /** + * Subscribes to prefer output device change events. When prefer device for target audio renderer info changes, + * registered clients will receive the callback. + * @param { 'preferOutputDeviceChangeForRendererInfoAndUid' } type - Type of the event to listen for. Only the + * preferOutputDeviceChangeForRendererInfoAndUid event is supported. + * @param { AudioRendererInfo } rendererInfo - Audio renderer information. + * @param { number } uid - The uid of target application. + * @param { Callback } callback - Callback used to obtain the changed prefer devices information. + * @throws { BusinessError } 6800101 - Parameter verification failed. + * @throws { BusinessError } 6800301 - Audio client call audio audio service error, System error. + * @syscap SystemCapability.Multimedia.Audio.Device + * @systemapi + * @since 21 + */ + on(type: 'preferOutputDeviceChangeForRendererInfoAndUid', rendererInfo: AudioRendererInfo, uid: number, allback: Callback): void; + + /** + * UnSubscribes to prefer output device change events. + * @param { 'preferOutputDeviceChangeForRendererInfoAndUid' } type - Type of the event to listen for. Only the + * preferOutputDeviceChangeForRendererInfoAndUid event is supported. + * @param { Callback } callback - Callback used to obtain the changed prefer devices in subscribe. + * @throws { BusinessError } 6800301 - Audio client call audio audio service error, System error. + * @syscap SystemCapability.Multimedia.Audio.Device + * @systemapi + * @since 21 + */ + off(type: 'preferOutputDeviceChangeForRendererInfoAndUid', callback?: Callback): void; + /** * Get input device for target audio capturer info. * @param { AudioCapturerInfo } capturerInfo - Audio capturer information. -- Gitee From ab069b313c6e897353d6e4859786600b3fc9b95f Mon Sep 17 00:00:00 2001 From: zhanganxiang Date: Mon, 18 Aug 2025 20:14:20 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=BE=93=E5=85=A5=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=94=AF=E6=8C=81=E4=BC=A0=E5=85=A5UID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanganxiang --- api/@ohos.multimedia.audio.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/@ohos.multimedia.audio.d.ts b/api/@ohos.multimedia.audio.d.ts index 52e4d753ea..48bb89f6cb 100644 --- a/api/@ohos.multimedia.audio.d.ts +++ b/api/@ohos.multimedia.audio.d.ts @@ -3751,7 +3751,7 @@ declare namespace audio { * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi - * @since 9 + * @since 21 */ selectOutputDeviceByFilter(filter: AudioRendererFilter, outputAudioDevices: AudioDeviceDescriptors, strategy?: AudioDevcieSelectStrategy): Promise; -- Gitee From f65a26aba0a269dda4756d7ee9f4f7b85483caa9 Mon Sep 17 00:00:00 2001 From: zhanganxiang Date: Mon, 18 Aug 2025 20:47:51 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=BE=93=E5=85=A5=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=94=AF=E6=8C=81=E4=BC=A0=E5=85=A5UID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanganxiang --- api/@ohos.multimedia.audio.d.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/api/@ohos.multimedia.audio.d.ts b/api/@ohos.multimedia.audio.d.ts index 48bb89f6cb..a161ba6739 100644 --- a/api/@ohos.multimedia.audio.d.ts +++ b/api/@ohos.multimedia.audio.d.ts @@ -3743,17 +3743,22 @@ declare namespace audio { * @systemapi * @since 9 */ + selectOutputDeviceByFilter(filter: AudioRendererFilter, outputAudioDevices: AudioDeviceDescriptors): Promise; + /** * Select the output device with desired AudioRenderer. This method uses a promise to return the result. * @param { AudioRendererFilter } filter - Filter for AudioRenderer. * @param { AudioDeviceDescriptors } outputAudioDevices - Audio device description. - * @param { AudioDevcieSelectStrategy } [strategy] - Audio device select strategy. + * @param { AudioDevcieSelectStrategy } strategy - Audio device select strategy. * @returns { Promise } Promise used to return the result. + * @throws { BusinessError } 202 - Not system App. + * @throws { BusinessError } 6800101 - Parameter verification failed. + * @throws { BusinessError } 6800301 - Audio client call audio audio service error, System error. * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi * @since 21 */ - selectOutputDeviceByFilter(filter: AudioRendererFilter, outputAudioDevices: AudioDeviceDescriptors, strategy?: AudioDevcieSelectStrategy): Promise; + selectOutputDeviceByFilter(filter: AudioRendererFilter, outputAudioDevices: AudioDeviceDescriptors, strategy: AudioDevcieSelectStrategy): Promise; /** * Select the input device. This method uses an asynchronous callback to return the result. @@ -3845,6 +3850,7 @@ declare namespace audio { * @param { AudioRendererInfo } rendererInfo - Audio renderer information. * @param { number } uid - The uid of target application. * @returns { Promise } Promise used to return the result. + * @throws { BusinessError } 202 - Not system App. * @throws { BusinessError } 6800101 - Parameter verification failed. Return by promise. * @throws { BusinessError } 6800301 - Audio client call audio audio service error, System error. * @syscap SystemCapability.Multimedia.Audio.Device @@ -3955,19 +3961,21 @@ declare namespace audio { * @param { AudioRendererInfo } rendererInfo - Audio renderer information. * @param { number } uid - The uid of target application. * @param { Callback } callback - Callback used to obtain the changed prefer devices information. + * @throws { BusinessError } 202 - Not system App. * @throws { BusinessError } 6800101 - Parameter verification failed. * @throws { BusinessError } 6800301 - Audio client call audio audio service error, System error. * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi * @since 21 */ - on(type: 'preferOutputDeviceChangeForRendererInfoAndUid', rendererInfo: AudioRendererInfo, uid: number, allback: Callback): void; + on(type: 'preferOutputDeviceChangeForRendererInfoAndUid', rendererInfo: AudioRendererInfo, uid: number, callback: Callback): void; /** * UnSubscribes to prefer output device change events. * @param { 'preferOutputDeviceChangeForRendererInfoAndUid' } type - Type of the event to listen for. Only the * preferOutputDeviceChangeForRendererInfoAndUid event is supported. - * @param { Callback } callback - Callback used to obtain the changed prefer devices in subscribe. + * @param { Callback } [callback] - Callback used to obtain the changed prefer devices in subscribe. + * @throws { BusinessError } 202 - Not system App. * @throws { BusinessError } 6800301 - Audio client call audio audio service error, System error. * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi -- Gitee From 5579a82bf748d4e69b96803cc20f62b1fa376514 Mon Sep 17 00:00:00 2001 From: zhanganxiang Date: Tue, 19 Aug 2025 09:55:56 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=BE=93=E5=87=BA=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=94=AF=E6=8C=81=E4=BC=A0=E5=85=A5UID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanganxiang --- api/@ohos.multimedia.audio.d.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/api/@ohos.multimedia.audio.d.ts b/api/@ohos.multimedia.audio.d.ts index a161ba6739..0824610fa2 100644 --- a/api/@ohos.multimedia.audio.d.ts +++ b/api/@ohos.multimedia.audio.d.ts @@ -3753,7 +3753,7 @@ declare namespace audio { * @returns { Promise } Promise used to return the result. * @throws { BusinessError } 202 - Not system App. * @throws { BusinessError } 6800101 - Parameter verification failed. - * @throws { BusinessError } 6800301 - Audio client call audio audio service error, System error. + * @throws { BusinessError } 6800301 - Audio client call audio service error, System error. * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi * @since 21 @@ -3852,7 +3852,7 @@ declare namespace audio { * @returns { Promise } Promise used to return the result. * @throws { BusinessError } 202 - Not system App. * @throws { BusinessError } 6800101 - Parameter verification failed. Return by promise. - * @throws { BusinessError } 6800301 - Audio client call audio audio service error, System error. + * @throws { BusinessError } 6800301 - Audio client call audio service error, System error. * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi * @since 21 @@ -3963,7 +3963,7 @@ declare namespace audio { * @param { Callback } callback - Callback used to obtain the changed prefer devices information. * @throws { BusinessError } 202 - Not system App. * @throws { BusinessError } 6800101 - Parameter verification failed. - * @throws { BusinessError } 6800301 - Audio client call audio audio service error, System error. + * @throws { BusinessError } 6800301 - Audio client call audio service error, System error. * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi * @since 21 @@ -3976,7 +3976,7 @@ declare namespace audio { * preferOutputDeviceChangeForRendererInfoAndUid event is supported. * @param { Callback } [callback] - Callback used to obtain the changed prefer devices in subscribe. * @throws { BusinessError } 202 - Not system App. - * @throws { BusinessError } 6800301 - Audio client call audio audio service error, System error. + * @throws { BusinessError } 6800301 - Audio client call audio service error, System error. * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi * @since 21 -- Gitee From a0032854cfe8f1d4d6c79f42ae4b1daeaec546c0 Mon Sep 17 00:00:00 2001 From: zhanganxiang Date: Tue, 19 Aug 2025 11:36:18 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E8=BE=93=E5=87=BA=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=94=AF=E6=8C=81=E4=BC=A0=E5=85=A5UID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanganxiang --- api/@ohos.multimedia.audio.d.ts | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/api/@ohos.multimedia.audio.d.ts b/api/@ohos.multimedia.audio.d.ts index 0824610fa2..ec90a9ec3f 100644 --- a/api/@ohos.multimedia.audio.d.ts +++ b/api/@ohos.multimedia.audio.d.ts @@ -3847,8 +3847,7 @@ declare namespace audio { /** * Get output device for target audio renderer info and application. - * @param { AudioRendererInfo } rendererInfo - Audio renderer information. - * @param { number } uid - The uid of target application. + * @param { AudioRendererFilter } filter - Filter for AudioRenderer. * @returns { Promise } Promise used to return the result. * @throws { BusinessError } 202 - Not system App. * @throws { BusinessError } 6800101 - Parameter verification failed. Return by promise. @@ -3857,7 +3856,7 @@ declare namespace audio { * @systemapi * @since 21 */ - getPreferOutputDeviceForRendererInfoAndUid(rendererInfo: AudioRendererInfo, uid: number): Promise; + getPreferOutputDeviceByFilter(filter: AudioRendererFilter): Promise; /** * Gets preferred output device for target audio renderer info. @@ -3956,10 +3955,9 @@ declare namespace audio { /** * Subscribes to prefer output device change events. When prefer device for target audio renderer info changes, * registered clients will receive the callback. - * @param { 'preferOutputDeviceChangeForRendererInfoAndUid' } type - Type of the event to listen for. Only the - * preferOutputDeviceChangeForRendererInfoAndUid event is supported. - * @param { AudioRendererInfo } rendererInfo - Audio renderer information. - * @param { number } uid - The uid of target application. + * @param { 'preferOutputDeviceChangeByFilter' } type - Type of the event to listen for. Only the + * preferOutputDeviceChangeByFilter event is supported. + * @param { AudioRendererFilter } filter - Filter for AudioRenderer. * @param { Callback } callback - Callback used to obtain the changed prefer devices information. * @throws { BusinessError } 202 - Not system App. * @throws { BusinessError } 6800101 - Parameter verification failed. @@ -3968,12 +3966,12 @@ declare namespace audio { * @systemapi * @since 21 */ - on(type: 'preferOutputDeviceChangeForRendererInfoAndUid', rendererInfo: AudioRendererInfo, uid: number, callback: Callback): void; + on(type: 'preferOutputDeviceChangeByFilter', filter: AudioRendererFilter, callback: Callback): void; /** * UnSubscribes to prefer output device change events. - * @param { 'preferOutputDeviceChangeForRendererInfoAndUid' } type - Type of the event to listen for. Only the - * preferOutputDeviceChangeForRendererInfoAndUid event is supported. + * @param { 'preferOutputDeviceChangeByFilter' } type - Type of the event to listen for. Only the + * preferOutputDeviceChangeByFilter event is supported. * @param { Callback } [callback] - Callback used to obtain the changed prefer devices in subscribe. * @throws { BusinessError } 202 - Not system App. * @throws { BusinessError } 6800301 - Audio client call audio service error, System error. @@ -3981,7 +3979,7 @@ declare namespace audio { * @systemapi * @since 21 */ - off(type: 'preferOutputDeviceChangeForRendererInfoAndUid', callback?: Callback): void; + off(type: 'preferOutputDeviceChangeByFilter', callback?: Callback): void; /** * Get input device for target audio capturer info. -- Gitee From 233f412245c887d4fedf3dbbc688d291041bfac8 Mon Sep 17 00:00:00 2001 From: zhanganxiang Date: Thu, 28 Aug 2025 14:30:08 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E8=BE=93=E5=85=A5=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=94=AF=E6=8C=81=E4=BC=A0=E5=85=A5UID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanganxiang --- api/@ohos.multimedia.audio.d.ts | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/api/@ohos.multimedia.audio.d.ts b/api/@ohos.multimedia.audio.d.ts index ec90a9ec3f..b997f446c6 100644 --- a/api/@ohos.multimedia.audio.d.ts +++ b/api/@ohos.multimedia.audio.d.ts @@ -1021,14 +1021,14 @@ declare namespace audio { * @systemapi * @since 21 */ - DEFAULT_SELECT_STRATEGY = 0, + SELECT_STRATEGY_DEFAULT = 0, /** * The independent device select strategy.. * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi * @since 21 */ - INDEPENDENT_SELECT_STRATEGY = 1, + SELECT_STRATEGY_INDEPENDENT = 1, } /** @@ -3845,19 +3845,6 @@ declare namespace audio { */ getPreferOutputDeviceForRendererInfo(rendererInfo: AudioRendererInfo): Promise; - /** - * Get output device for target audio renderer info and application. - * @param { AudioRendererFilter } filter - Filter for AudioRenderer. - * @returns { Promise } Promise used to return the result. - * @throws { BusinessError } 202 - Not system App. - * @throws { BusinessError } 6800101 - Parameter verification failed. Return by promise. - * @throws { BusinessError } 6800301 - Audio client call audio service error, System error. - * @syscap SystemCapability.Multimedia.Audio.Device - * @systemapi - * @since 21 - */ - getPreferOutputDeviceByFilter(filter: AudioRendererFilter): Promise; - /** * Gets preferred output device for target audio renderer info. * @param { AudioRendererInfo } rendererInfo - Audio renderer information. -- Gitee From 783a82d7416c27f95efdb872f83d954df07eb934 Mon Sep 17 00:00:00 2001 From: zhanganxiang Date: Thu, 28 Aug 2025 14:53:24 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=BE=93=E5=85=A5=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=94=AF=E6=8C=81=E4=BC=A0=E5=85=A5UID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanganxiang --- api/@ohos.multimedia.audio.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/@ohos.multimedia.audio.d.ts b/api/@ohos.multimedia.audio.d.ts index b997f446c6..4d2d670d57 100644 --- a/api/@ohos.multimedia.audio.d.ts +++ b/api/@ohos.multimedia.audio.d.ts @@ -3953,7 +3953,7 @@ declare namespace audio { * @systemapi * @since 21 */ - on(type: 'preferOutputDeviceChangeByFilter', filter: AudioRendererFilter, callback: Callback): void; + on(type: 'preferredOutputDeviceChangeByFilter', filter: AudioRendererFilter, callback: Callback): void; /** * UnSubscribes to prefer output device change events. @@ -3966,7 +3966,7 @@ declare namespace audio { * @systemapi * @since 21 */ - off(type: 'preferOutputDeviceChangeByFilter', callback?: Callback): void; + off(type: 'preferredOutputDeviceChangeByFilter', callback?: Callback): void; /** * Get input device for target audio capturer info. -- Gitee