openharmony/multimedia_audio_standard
1
0
Fork 0
mirror of https://github.com/openharmony/multimedia_audio_standard.git synced 2026-06-30 22:17:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

audo standard to audio framework

Browse Source 
Signed-off-by: Anoop Kant <anoop.kant@huawei.com>
This commit is contained in:
Anoop Kant
2022-05-31 19:27:23 +05:30
parent 9ad9c9c210
commit 73076cf105
33 changed files with 463 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+10 -10
View File
@@ -45,7 +45,7 @@ Pulse code modulation \(PCM\) is a method used to digitally represent sampled an
The structure of the repository directory is as follows:
```
/foundation/multimedia/audio_standard # Audio code
/foundation/multimedia/audio_framework # Audio code
├── frameworks # Framework code
│ ├── native # Internal Native API Implementation.
| | Pulseaudio, libsndfile build configuration and pulseaudio-hdi modules
@@ -202,7 +202,7 @@ Interrupt aware applications will have more details accessible via AudioRenderer
Provided the basic playback usecase above.
Please refer [**audio_renderer.h**](https://gitee.com/openharmony/multimedia_audio_standard/blob/master/interfaces/inner_api/native/audiorenderer/include/audio_renderer.h) and [**audio_info.h**](https://gitee.com/openharmony/multimedia_audio_standard/blob/master/interfaces/inner_api/native/audiocommon/include/audio_info.h) for more such useful APIs.
Please refer [**audio_renderer.h**](https://gitee.com/openharmony/multimedia_audio_framework/blob/master/interfaces/inner_api/native/audiorenderer/include/audio_renderer.h) and [**audio_info.h**](https://gitee.com/openharmony/multimedia_audio_framework/blob/master/interfaces/inner_api/native/audiocommon/include/audio_info.h) for more such useful APIs.
### Audio Recording<a name="audio-recording"></a>
@@ -298,10 +298,10 @@ You can use the APIs provided in this repository for your application to record
11. Call the audioCapturer->**Stop**() function on the AudioCapturer instance to stop the recording.
12. After the recording task is complete, call the audioCapturer->**Release**() function on the AudioCapturer instance to release the stream resources.
Provided the basic recording usecase above. Please refer [**audio_capturer.h**](https://gitee.com/openharmony/multimedia_audio_standard/blob/master/interfaces/inner_api/native/audiocapturer/include/audio_capturer.h) and [**audio_info.h**](https://gitee.com/openharmony/multimedia_audio_standard/blob/master/interfaces/inner_api/native/audiocommon/include/audio_info.h) for more APIs.
Provided the basic recording usecase above. Please refer [**audio_capturer.h**](https://gitee.com/openharmony/multimedia_audio_framework/blob/master/interfaces/inner_api/native/audiocapturer/include/audio_capturer.h) and [**audio_info.h**](https://gitee.com/openharmony/multimedia_audio_framework/blob/master/interfaces/inner_api/native/audiocommon/include/audio_info.h) for more APIs.
### Audio Management<a name="audio-management"></a>
You can use the APIs provided in [**audio_system_manager.h**](https://gitee.com/openharmony/multimedia_audio_standard/blob/master/interfaces/inner_api/native/audiomanager/include/audio_system_manager.h) to control volume and device.
You can use the APIs provided in [**audio_system_manager.h**](https://gitee.com/openharmony/multimedia_audio_framework/blob/master/interfaces/inner_api/native/audiomanager/include/audio_system_manager.h) to control volume and device.
1. Use **GetInstance** API to get **AudioSystemManager** instance.
```
AudioSystemManager *audioSystemMgr = AudioSystemManager::GetInstance();
@@ -322,7 +322,7 @@ You can use the APIs provided in [**audio_system_manager.h**](https://gitee.com/
```
int32_t result = audioSystemMgr->SetMute(streamType, true);
bool isMute = audioSystemMgr->IsStreamMute(streamType);
5. Use **SetRingerMode** and **GetRingerMode** APIs to set and get ringer modes. Refer **AudioRingerMode** enum in [**audio_info.h**](https://gitee.com/openharmony/multimedia_audio_standard/blob/master/interfaces/inner_api/native/audiocommon/include/audio_info.h) for supported ringer modes.
5. Use **SetRingerMode** and **GetRingerMode** APIs to set and get ringer modes. Refer **AudioRingerMode** enum in [**audio_info.h**](https://gitee.com/openharmony/multimedia_audio_framework/blob/master/interfaces/inner_api/native/audiocommon/include/audio_info.h) for supported ringer modes.
```
int32_t result = audioSystemMgr->SetRingerMode(RINGER_MODE_SILENT);
AudioRingerMode ringMode = audioSystemMgr->GetRingerMode();
@@ -333,7 +333,7 @@ You can use the APIs provided in [**audio_system_manager.h**](https://gitee.com/
bool isMicMute = audioSystemMgr->IsMicrophoneMute();
```
#### Device control
7. Use **GetDevices**, **deviceType_** and **deviceRole_** APIs to get audio I/O devices information. For DeviceFlag, DeviceType and DeviceRole enums refer [**audio_info.h**](https://gitee.com/openharmony/multimedia_audio_standard/blob/master/interfaces/inner_api/native/audiocommon/include/audio_info.h).
7. Use **GetDevices**, **deviceType_** and **deviceRole_** APIs to get audio I/O devices information. For DeviceFlag, DeviceType and DeviceRole enums refer [**audio_info.h**](https://gitee.com/openharmony/multimedia_audio_framework/blob/master/interfaces/inner_api/native/audiocommon/include/audio_info.h).
```
DeviceFlag deviceFlag = ALL_DEVICES_FLAG;
vector<sptr<AudioDeviceDescriptor>> audioDeviceDescriptors = audioSystemMgr->GetDevices(deviceFlag);
@@ -400,7 +400,7 @@ You can use the APIs provided in [**audio_system_manager.h**](https://gitee.com/
audioSystemMgr->SetDeviceChangeCallback(callback);
```
10. Other useful APIs such as **IsStreamActive**, **SetAudioParameter** and **GetAudioParameter** are also provided. Please refer [**audio_system_manager.h**](https://gitee.com/openharmony/multimedia_audio_standard/blob/master/interfaces/inner_api/native/audiomanager/include/audio_system_manager.h) for more details
10. Other useful APIs such as **IsStreamActive**, **SetAudioParameter** and **GetAudioParameter** are also provided. Please refer [**audio_system_manager.h**](https://gitee.com/openharmony/multimedia_audio_framework/blob/master/interfaces/inner_api/native/audiomanager/include/audio_system_manager.h) for more details
11. Applications can register for change in system volume using **AudioManagerNapi::On**. Here when an application registers to volume change event, whenever there is change in volume, the application is notified with following parameters:
volumeType : The AudioVolumeType for which volume is updated
@@ -426,14 +426,14 @@ updateUi : Whether the volume change details need to be shown or not. (If volume
int32_t result = audioSystemMgr->SetAudioScene(AUDIO_SCENE_PHONE_CALL);
AudioScene audioScene = audioSystemMgr->GetAudioScene();
```
Please refer **AudioScene** enum in [**audio_info.h**](https://gitee.com/openharmony/multimedia_audio_standard/blob/master/interfaces/inner_api/native/audiocommon/include/audio_info.h) for supported audio scenes.
Please refer **AudioScene** enum in [**audio_info.h**](https://gitee.com/openharmony/multimedia_audio_framework/blob/master/interfaces/inner_api/native/audiocommon/include/audio_info.h) for supported audio scenes.
#### JavaScript Usage:
JavaScript apps can use the APIs provided by audio manager to control the volume and the device.\
Please refer [**js-apis-audio.md**](https://gitee.com/openharmony/docs/blob/master/en/application-dev/reference/apis/js-apis-audio.md#audiomanager) for complete JavaScript APIs available for audio manager.
### Ringtone Management<a name="ringtone-management"></a>
You can use the APIs provided in [**iringtone_sound_manager.h**](https://gitee.com/openharmony/multimedia_audio_standard/blob/master/interfaces/inner_api/native/audioringtone/include/iringtone_sound_manager.h) and [**iringtone_player.h**](https://gitee.com/openharmony/multimedia_audio_standard/blob/master/interfaces/inner_api/native/audioringtone/include/iringtone_player.h) for ringtone playback functions.
You can use the APIs provided in [**iringtone_sound_manager.h**](https://gitee.com/openharmony/multimedia_audio_framework/blob/master/interfaces/inner_api/native/audioringtone/include/iringtone_sound_manager.h) and [**iringtone_player.h**](https://gitee.com/openharmony/multimedia_audio_framework/blob/master/interfaces/inner_api/native/audioringtone/include/iringtone_player.h) for ringtone playback functions.
1. Use **CreateRingtoneManager** API to get **IRingtoneSoundManager** instance.
```
std::shared_ptr<IRingtoneSoundManager> ringtoneManagerClient = RingtoneFactory::CreateRingtoneManager();
@@ -479,4 +479,4 @@ Currently following are the list of device types supported by audio subsystem.
## Repositories Involved<a name="repositories-involved"></a>
[multimedia\_audio\_standard](https://gitee.com/openharmony/multimedia_audio_standard)
[multimedia\_audio\_standard](https://gitee.com/openharmony/multimedia_audio_framework)
bundle.json
+46 -46
View File
@@ -1,23 +1,23 @@
{
"name": "@ohos/audio_standard",
"name": "@ohos/audio_framework",
"description": "Audio standard provides managers and provides the audio resources to application for play/record audio",
"version": "3.1",
"license": "Apache License 2.0",
"publishAs": "code-segment",
"segment": {
"destPath": "foundation/multimedia/audio_standard"
"destPath": "foundation/multimedia/audio_framework"
},
"dirs": {},
"scripts": {},
"component": {
"name": "multimedia_audio_standard",
"name": "multimedia_audio_framework",
"subsystem": "multimedia",
"syscap": [],
"features": [],
"adapted_system_type": [ "standard" ],
"rom": "",
"ram": "",
"hisysevent_config": [ "//foundation/multimedia/audio_standard/hisysevent.yaml" ],
"hisysevent_config": [ "//foundation/multimedia/audio_framework/hisysevent.yaml" ],
"deps": {
"components": [
"ability_manager",
@@ -37,75 +37,75 @@
},
"build": {
"sub_component": [
"//foundation/multimedia/audio_standard/services:audio_service",
"//foundation/multimedia/audio_standard/services:pulseaudio.rc",
"//foundation/multimedia/audio_standard/sa_profile:audio_service_sa_profile",
"//foundation/multimedia/audio_standard/interfaces/kits/js/audio_manager:audio",
"//foundation/multimedia/audio_standard/interfaces/kits/js/audio_manager:audio_js",
"//foundation/multimedia/audio_standard/frameworks/native/pulseaudio:pulseaudio_packages",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager:audio_client_test_packages",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocapturer:audio_capturer_test_packages",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager:audio_multichannel_test",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiorenderer:audio_renderer_test",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiorenderer:audio_render_mode_callback_test",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiorenderer:audio_voip_test",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiorenderer:audio_interrupt_test",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiorenderer:interrupt_multi_renderer_test",
"//foundation/multimedia/audio_standard/services:audio_policy_service_packages",
"//foundation/multimedia/audio_standard/sa_profile:audio_policy_service_sa_profile",
"//foundation/multimedia/audio_standard/frameworks/native/audiopolicy:audio_policy_test",
"//foundation/multimedia/audio_standard/frameworks/native/audiocapturer:audio_capturer_source",
"//foundation/multimedia/audio_standard/frameworks/native/audiorenderer:audio_renderer_sink",
"//foundation/multimedia/audio_standard/frameworks/native/audiorenderer:bluetooth_renderer_sink",
"//foundation/multimedia/audio_standard/frameworks/native/audiorenderer:renderer_sink_adapter",
"//foundation/multimedia/audio_standard/frameworks/native/audioadapter:pulse_audio_service_adapter",
"//foundation/multimedia/audio_standard/frameworks/native/opensles:opensles",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/opensles:audio_opensles_test",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/opensles:audio_opensles_capture_test"
"//foundation/multimedia/audio_framework/services:audio_service",
"//foundation/multimedia/audio_framework/services:pulseaudio.rc",
"//foundation/multimedia/audio_framework/sa_profile:audio_service_sa_profile",
"//foundation/multimedia/audio_framework/interfaces/kits/js/audio_manager:audio",
"//foundation/multimedia/audio_framework/interfaces/kits/js/audio_manager:audio_js",
"//foundation/multimedia/audio_framework/frameworks/native/pulseaudio:pulseaudio_packages",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiomanager:audio_client_test_packages",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocapturer:audio_capturer_test_packages",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiomanager:audio_multichannel_test",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiorenderer:audio_renderer_test",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiorenderer:audio_render_mode_callback_test",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiorenderer:audio_voip_test",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiorenderer:audio_interrupt_test",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiorenderer:interrupt_multi_renderer_test",
"//foundation/multimedia/audio_framework/services:audio_policy_service_packages",
"//foundation/multimedia/audio_framework/sa_profile:audio_policy_service_sa_profile",
"//foundation/multimedia/audio_framework/frameworks/native/audiopolicy:audio_policy_test",
"//foundation/multimedia/audio_framework/frameworks/native/audiocapturer:audio_capturer_source",
"//foundation/multimedia/audio_framework/frameworks/native/audiorenderer:audio_renderer_sink",
"//foundation/multimedia/audio_framework/frameworks/native/audiorenderer:bluetooth_renderer_sink",
"//foundation/multimedia/audio_framework/frameworks/native/audiorenderer:renderer_sink_adapter",
"//foundation/multimedia/audio_framework/frameworks/native/audioadapter:pulse_audio_service_adapter",
"//foundation/multimedia/audio_framework/frameworks/native/opensles:opensles",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/opensles:audio_opensles_test",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/opensles:audio_opensles_capture_test"
],
"inner_kits": [
{
"type": "none",
"name": "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager:audio_client",
"name": "//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiomanager:audio_client",
"header": {
"header_files": [
"audio_system_manager.h",
"audio_info.h"
],
"header_base": [
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include"
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiomanager/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include"
]
}
},
{
"type": "none",
"name": "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocapturer:audio_capturer",
"name": "//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocapturer:audio_capturer",
"header": {
"header_files": [
"audio_capturer.h",
"audio_info.h"
],
"header_base": [
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocapturer/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include"
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocapturer/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include"
]
}
},
{
"type": "none",
"name": "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiorenderer:audio_renderer",
"name": "//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiorenderer:audio_renderer",
"header": {
"header_files": [
"audio_renderer.h",
"audio_info.h"
],
"header_base": "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiorenderer/include"
"header_base": "//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiorenderer/include"
}
},
{
"type": "none",
"name": "//foundation/multimedia/audio_standard/interfaces/kits/js/audio_manager:audio",
"name": "//foundation/multimedia/audio_framework/interfaces/kits/js/audio_manager:audio",
"header": {
"header_files": [
"audio_manager_napi.h",
@@ -114,28 +114,28 @@
"audio_parameters_napi.h"
],
"header_base": [
"//foundation/multimedia/audio_standard/interfaces/kits/js/audio_manager/include",
"//foundation/multimedia/audio_standard/interfaces/kits/js/audio_capturer/include",
"//foundation/multimedia/audio_standard/interfaces/kits/js/audio_renderer/include"
"//foundation/multimedia/audio_framework/interfaces/kits/js/audio_manager/include",
"//foundation/multimedia/audio_framework/interfaces/kits/js/audio_capturer/include",
"//foundation/multimedia/audio_framework/interfaces/kits/js/audio_renderer/include"
]
}
},
{
"type": "none",
"name": "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audioringtone:audio_ringtone_client",
"name": "//foundation/multimedia/audio_framework/interfaces/inner_api/native/audioringtone:audio_ringtone_client",
"header": {
"header_files": [
"iringtone_player.h",
"iringtone_sound_manager.h"
],
"header_base": "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audioringtone/include"
"header_base": "//foundation/multimedia/audio_framework/interfaces/inner_api/native/audioringtone/include"
}
}
],
"test": [
"//foundation/multimedia/audio_standard/test:audio_unit_test",
"//foundation/multimedia/audio_standard/test:audio_module_test",
"//foundation/multimedia/audio_standard/test:audio_fuzz_test"
"//foundation/multimedia/audio_framework/test:audio_unit_test",
"//foundation/multimedia/audio_framework/test:audio_module_test",
"//foundation/multimedia/audio_framework/test:audio_fuzz_test"
]
}
}
frameworks/native/audioadapter/BUILD.gn
+7 -7
View File
@@ -15,15 +15,15 @@ import("//build/ohos.gni")
ohos_shared_library("pulse_audio_service_adapter") {
install_enable = true
sources = [ "//foundation/multimedia/audio_standard/frameworks/native/audioadapter/src/pulse_audio_service_adapter_impl.cpp" ]
sources = [ "//foundation/multimedia/audio_framework/frameworks/native/audioadapter/src/pulse_audio_service_adapter_impl.cpp" ]
cflags = [ "-fPIC" ]
cflags += [ "-Wall" ]
cflags_cc = cflags
include_dirs = [
"//foundation/multimedia/audio_standard/frameworks/native/audioadapter/include",
"//foundation/multimedia/audio_standard/frameworks/native/pulseaudio/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_framework/frameworks/native/audioadapter/include",
"//foundation/multimedia/audio_framework/frameworks/native/pulseaudio/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//third_party/libxml2/include",
"//third_party/pulseaudio/src",
"//third_party/pulseaudio/confgure/src",
@@ -34,7 +34,7 @@ ohos_shared_library("pulse_audio_service_adapter") {
public_configs = [ ":audio_external_library_config" ]
deps = [
"//foundation/multimedia/audio_standard/frameworks/native/pulseaudio/src/pulse:pulse",
"//foundation/multimedia/audio_framework/frameworks/native/pulseaudio/src/pulse:pulse",
"//third_party/libxml2:xml2",
"//utils/native/base:utils",
]
@@ -43,10 +43,10 @@ ohos_shared_library("pulse_audio_service_adapter") {
"hisysevent_native:libhisysevent",
"hiviewdfx_hilog_native:libhilog",
]
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
subsystem_name = "multimedia"
}
config("audio_external_library_config") {
include_dirs = [ "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include" ]
include_dirs = [ "//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include" ]
}
frameworks/native/audiocapturer/BUILD.gn
+15 -15
View File
@@ -16,7 +16,7 @@ import("//drivers/adapter/uhdf2/uhdf.gni")
ohos_shared_library("audio_capturer_source") {
install_enable = true
sources = [ "//foundation/multimedia/audio_standard/frameworks/native/audiocapturer/src/audio_capturer_source.cpp" ]
sources = [ "//foundation/multimedia/audio_framework/frameworks/native/audiocapturer/src/audio_capturer_source.cpp" ]
cflags = [ "-fPIC" ]
cflags += [ "-Wall" ]
if ("${product_name}" == "m40") {
@@ -25,8 +25,8 @@ ohos_shared_library("audio_capturer_source") {
cflags_cc = cflags
include_dirs = [
"//foundation/multimedia/audio_standard/frameworks/native/audiocapturer/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiocapturer/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//utils/native/base/include",
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
"//drivers/peripheral/audio/interfaces/include",
@@ -50,14 +50,14 @@ ohos_shared_library("audio_capturer_source") {
[ "//drivers/peripheral/audio/hal/hdi_binder/proxy:hdi_audio_client" ]
}
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
subsystem_name = "multimedia"
}
ohos_shared_library("audio_capturer_file_source") {
install_enable = true
sources = [ "//foundation/multimedia/audio_standard/frameworks/native/audiocapturer/src/audio_capturer_file_source.cpp" ]
sources = [ "//foundation/multimedia/audio_framework/frameworks/native/audiocapturer/src/audio_capturer_file_source.cpp" ]
cflags = [ "-fPIC" ]
cflags += [ "-Wall" ]
@@ -66,8 +66,8 @@ ohos_shared_library("audio_capturer_file_source") {
include_dirs = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiocapturer/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiocapturer/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//utils/native/base/include",
]
@@ -78,14 +78,14 @@ ohos_shared_library("audio_capturer_file_source") {
"//utils/native/base:utils",
]
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
subsystem_name = "multimedia"
}
ohos_shared_library("capturer_source_adapter") {
install_enable = true
sources = [ "//foundation/multimedia/audio_standard/frameworks/native/audiocapturer/src/capturer_source_adapter.c" ]
sources = [ "//foundation/multimedia/audio_framework/frameworks/native/audiocapturer/src/capturer_source_adapter.c" ]
cflags = [ "-fPIC" ]
cflags += [ "-Wall" ]
@@ -95,8 +95,8 @@ ohos_shared_library("capturer_source_adapter") {
include_dirs = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
"//drivers/peripheral/audio/interfaces/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiocapturer/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiocapturer/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//third_party/bounds_checking_function:libsec_static",
"//utils/native/base:utils",
]
@@ -105,14 +105,14 @@ ohos_shared_library("capturer_source_adapter") {
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/multimedia/audio_standard/frameworks/native/audiocapturer:audio_capturer_file_source",
"//foundation/multimedia/audio_standard/frameworks/native/audiocapturer:audio_capturer_source",
"//foundation/multimedia/audio_framework/frameworks/native/audiocapturer:audio_capturer_file_source",
"//foundation/multimedia/audio_framework/frameworks/native/audiocapturer:audio_capturer_source",
]
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
subsystem_name = "multimedia"
}
config("audio_external_library_config") {
include_dirs = [ "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include" ]
include_dirs = [ "//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include" ]
}
frameworks/native/audiopolicy/BUILD.gn
+18 -18
View File
@@ -15,15 +15,15 @@ import("//build/ohos.gni")
config("audio_policy_public_config") {
include_dirs = [
"//foundation/multimedia/audio_standard/services/include",
"//foundation/multimedia/audio_standard/services/include/audio_service/client",
"//foundation/multimedia/audio_framework/services/include",
"//foundation/multimedia/audio_framework/services/include/audio_service/client",
"//foundation/distributedschedule/safwk/services/safwk/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiopolicy/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager/include",
"//foundation/multimedia/audio_standard/services/include/audio_policy/common",
"//foundation/multimedia/audio_standard/services/include/audio_policy/server",
"//foundation/multimedia/audio_standard/services/include/audio_policy/client",
"//foundation/multimedia/audio_framework/frameworks/native/audiopolicy/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiomanager/include",
"//foundation/multimedia/audio_framework/services/include/audio_policy/common",
"//foundation/multimedia/audio_framework/services/include/audio_policy/server",
"//foundation/multimedia/audio_framework/services/include/audio_policy/client",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//foundation/multimedia/image/mock/native/include/foundation/multimedia/image/mock/native/include",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include",
@@ -46,12 +46,12 @@ config("audio_policy_public_config") {
ohos_shared_library("audio_policy_client") {
install_enable = true
sources = [
"//foundation/multimedia/audio_standard/services/src/audio_policy/client/audio_device_descriptor.cpp",
"//foundation/multimedia/audio_standard/services/src/audio_policy/client/audio_policy_manager.cpp",
"//foundation/multimedia/audio_standard/services/src/audio_policy/client/audio_policy_manager_listener_stub.cpp",
"//foundation/multimedia/audio_standard/services/src/audio_policy/client/audio_policy_proxy.cpp",
"//foundation/multimedia/audio_standard/services/src/audio_policy/client/audio_ringermode_update_listener_stub.cpp",
"//foundation/multimedia/audio_standard/services/src/audio_policy/client/audio_volume_key_event_callback_stub.cpp",
"//foundation/multimedia/audio_framework/services/src/audio_policy/client/audio_device_descriptor.cpp",
"//foundation/multimedia/audio_framework/services/src/audio_policy/client/audio_policy_manager.cpp",
"//foundation/multimedia/audio_framework/services/src/audio_policy/client/audio_policy_manager_listener_stub.cpp",
"//foundation/multimedia/audio_framework/services/src/audio_policy/client/audio_policy_proxy.cpp",
"//foundation/multimedia/audio_framework/services/src/audio_policy/client/audio_ringermode_update_listener_stub.cpp",
"//foundation/multimedia/audio_framework/services/src/audio_policy/client/audio_volume_key_event_callback_stub.cpp",
]
public_configs = [ ":audio_policy_public_config" ]
@@ -65,23 +65,23 @@ ohos_shared_library("audio_policy_client") {
"samgr_standard:samgr_proxy",
]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
ohos_executable("audio_policy_test") {
install_enable = false
sources = [ "//foundation/multimedia/audio_standard/services/test/audio_policy_test.cpp" ]
sources = [ "//foundation/multimedia/audio_framework/services/test/audio_policy_test.cpp" ]
configs = [ ":audio_policy_public_config" ]
deps = [
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager:audio_client",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiomanager:audio_client",
"//third_party/bounds_checking_function:libsec_static",
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
subsystem_name = "multimedia"
}
frameworks/native/audiorenderer/BUILD.gn
+29 -29
View File
@@ -17,7 +17,7 @@ import("//drivers/adapter/uhdf2/uhdf.gni")
ohos_shared_library("audio_renderer_sink") {
install_enable = true
sources = [ "//foundation/multimedia/audio_standard/frameworks/native/audiorenderer/src/audio_renderer_sink.cpp" ]
sources = [ "//foundation/multimedia/audio_framework/frameworks/native/audiorenderer/src/audio_renderer_sink.cpp" ]
cflags = [ "-fPIC" ]
cflags += [ "-Wall" ]
@@ -27,8 +27,8 @@ ohos_shared_library("audio_renderer_sink") {
cflags_cc = cflags
include_dirs = [
"//foundation/multimedia/audio_standard/frameworks/native/audiorenderer/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiorenderer/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//utils/native/base/include",
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
"//drivers/peripheral/audio/interfaces/include",
@@ -54,14 +54,14 @@ ohos_shared_library("audio_renderer_sink") {
[ "//drivers/peripheral/audio/hal/hdi_binder/proxy:hdi_audio_client" ]
}
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
subsystem_name = "multimedia"
}
ohos_shared_library("bluetooth_renderer_sink") {
install_enable = true
sources = [ "//foundation/multimedia/audio_standard/frameworks/native/audiorenderer/src/bluetooth_renderer_sink.cpp" ]
sources = [ "//foundation/multimedia/audio_framework/frameworks/native/audiorenderer/src/bluetooth_renderer_sink.cpp" ]
cflags = [ "-fPIC" ]
cflags += [ "-Wall" ]
@@ -69,8 +69,8 @@ ohos_shared_library("bluetooth_renderer_sink") {
cflags_cc = cflags
include_dirs = [
"//foundation/multimedia/audio_standard/frameworks/native/audiorenderer/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiorenderer/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//utils/native/base/include",
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
"//drivers/peripheral/bluetooth/audio/interfaces/include",
@@ -90,14 +90,14 @@ ohos_shared_library("bluetooth_renderer_sink") {
"//utils/native/base:utils",
]
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
subsystem_name = "multimedia"
}
ohos_shared_library("audio_renderer_file_sink") {
install_enable = true
sources = [ "//foundation/multimedia/audio_standard/frameworks/native/audiorenderer/src/audio_renderer_file_sink.cpp" ]
sources = [ "//foundation/multimedia/audio_framework/frameworks/native/audiorenderer/src/audio_renderer_file_sink.cpp" ]
cflags = [ "-fPIC" ]
cflags += [ "-Wall" ]
@@ -106,8 +106,8 @@ ohos_shared_library("audio_renderer_file_sink") {
include_dirs = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiorenderer/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiorenderer/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//utils/native/base/include",
]
@@ -118,16 +118,16 @@ ohos_shared_library("audio_renderer_file_sink") {
"//utils/native/base:utils",
]
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
subsystem_name = "multimedia"
}
ohos_shared_library("audio_bluetooth_client") {
install_enable = true
sources = [
"//foundation/multimedia/audio_standard/services/src/audio_bluetooth/client/audio_bluetooth_manager.cpp",
"//foundation/multimedia/audio_standard/services/src/audio_bluetooth/client/bluetooth_a2dp_audio_src_observer_stub.cpp",
"//foundation/multimedia/audio_standard/services/src/audio_bluetooth/client/bluetooth_a2dp_src_observer.cpp",
"//foundation/multimedia/audio_framework/services/src/audio_bluetooth/client/audio_bluetooth_manager.cpp",
"//foundation/multimedia/audio_framework/services/src/audio_bluetooth/client/bluetooth_a2dp_audio_src_observer_stub.cpp",
"//foundation/multimedia/audio_framework/services/src/audio_bluetooth/client/bluetooth_a2dp_src_observer.cpp",
]
include_dirs = [
@@ -136,10 +136,10 @@ ohos_shared_library("audio_bluetooth_client") {
"//foundation/communication/bluetooth/interfaces/inner_api/include/c_header",
"//foundation/communication/bluetooth/services/bluetooth/common/",
"//foundation/communication/bluetooth/services/bluetooth/ipc/include",
"//foundation/multimedia/audio_standard/services/include/audio_policy/server/service/interface",
"//foundation/multimedia/audio_standard/services/include/audio_bluetooth/client",
"//foundation/multimedia/audio_standard/frameworks/native/audiorenderer/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_framework/services/include/audio_policy/server/service/interface",
"//foundation/multimedia/audio_framework/services/include/audio_bluetooth/client",
"//foundation/multimedia/audio_framework/frameworks/native/audiorenderer/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//utils/native/base/include",
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
"//drivers/peripheral/bluetooth/audio/interfaces/include",
@@ -154,7 +154,7 @@ ohos_shared_library("audio_bluetooth_client") {
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/communication/bluetooth/services/bluetooth/ipc:btipc_static",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
"//foundation/multimedia/audio_standard/frameworks/native/audiorenderer:bluetooth_renderer_sink",
"//foundation/multimedia/audio_framework/frameworks/native/audiorenderer:bluetooth_renderer_sink",
"//utils/native/base:utils",
]
@@ -165,14 +165,14 @@ ohos_shared_library("audio_bluetooth_client") {
"samgr_standard:samgr_proxy",
]
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
subsystem_name = "multimedia"
}
ohos_shared_library("renderer_sink_adapter") {
install_enable = true
sources = [ "//foundation/multimedia/audio_standard/frameworks/native/audiorenderer/src/renderer_sink_adapter.c" ]
sources = [ "//foundation/multimedia/audio_framework/frameworks/native/audiorenderer/src/renderer_sink_adapter.c" ]
cflags = [ "-fPIC" ]
cflags += [ "-Wall" ]
@@ -182,8 +182,8 @@ ohos_shared_library("renderer_sink_adapter") {
include_dirs = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
"//drivers/peripheral/audio/interfaces/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiorenderer/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiorenderer/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//third_party/bounds_checking_function:libsec_static",
"//utils/native/base:utils",
]
@@ -192,15 +192,15 @@ ohos_shared_library("renderer_sink_adapter") {
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/multimedia/audio_standard/frameworks/native/audiorenderer:audio_renderer_file_sink",
"//foundation/multimedia/audio_standard/frameworks/native/audiorenderer:audio_renderer_sink",
"//foundation/multimedia/audio_standard/frameworks/native/audiorenderer:bluetooth_renderer_sink",
"//foundation/multimedia/audio_framework/frameworks/native/audiorenderer:audio_renderer_file_sink",
"//foundation/multimedia/audio_framework/frameworks/native/audiorenderer:audio_renderer_sink",
"//foundation/multimedia/audio_framework/frameworks/native/audiorenderer:bluetooth_renderer_sink",
]
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
subsystem_name = "multimedia"
}
config("audio_external_library_config") {
include_dirs = [ "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include" ]
include_dirs = [ "//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include" ]
}
frameworks/native/libsnd/BUILD.gn
+2 -2
View File
@@ -131,12 +131,12 @@ ohos_source_set("sndfile_sources") {
configs = [ ":sndfile_config" ]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
ohos_shared_library("sndfile") {
deps = [ ":sndfile_sources" ]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
frameworks/native/opensles/BUILD.gn
+36 -36
View File
@@ -18,17 +18,17 @@ opensles_dir = "//third_party/openSLES"
config("audio_config") {
include_dirs = [
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiorenderer/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiorenderer/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocapturer/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiocapturer/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiostream/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiosession/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager/include",
"//foundation/multimedia/audio_standard/services/include",
"//foundation/multimedia/audio_standard/services/include/audio_service/client",
"//foundation/multimedia/audio_standard/services/test",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiorenderer/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiorenderer/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocapturer/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiocapturer/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiostream/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiosession/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiomanager/include",
"//foundation/multimedia/audio_framework/services/include",
"//foundation/multimedia/audio_framework/services/include/audio_service/client",
"//foundation/multimedia/audio_framework/services/test",
"//utils/native/base/include",
"$pulseaudio_dir/src",
"$pulseaudio_dir/confgure/src",
@@ -43,41 +43,41 @@ config("audio_config") {
ohos_shared_library("opensles") {
include_dirs = [
"$opensles_dir/api/1.0.1",
"//foundation/multimedia/audio_standard/frameworks/native/opensles/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/andiorenderer/include/",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/andiocapturer/include/",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/andiomanager/include/",
"//foundation/multimedia/audio_framework/frameworks/native/opensles/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/andiorenderer/include/",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/andiocapturer/include/",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/andiomanager/include/",
]
configs = [ ":audio_config" ]
sources = [
"$opensles_dir/api/1.0.1/OpenSLES_IID.c",
"//foundation/multimedia/audio_standard/frameworks/native/opensles/src/adapter/audiocapturer_adapter.cpp",
"//foundation/multimedia/audio_standard/frameworks/native/opensles/src/adapter/audioplayer_adapter.cpp",
"//foundation/multimedia/audio_standard/frameworks/native/opensles/src/adapter/readorwritecallback_adapter.cpp",
"//foundation/multimedia/audio_standard/frameworks/native/opensles/src/itf/engine_itf.cpp",
"//foundation/multimedia/audio_standard/frameworks/native/opensles/src/itf/object_itf.cpp",
"//foundation/multimedia/audio_standard/frameworks/native/opensles/src/itf/openharmony_buffer_queue_itf.cpp",
"//foundation/multimedia/audio_standard/frameworks/native/opensles/src/itf/play_itf.cpp",
"//foundation/multimedia/audio_standard/frameworks/native/opensles/src/itf/record_itf.cpp",
"//foundation/multimedia/audio_standard/frameworks/native/opensles/src/itf/volume_itf.cpp",
"//foundation/multimedia/audio_standard/frameworks/native/opensles/src/obj/audiocapturer_obj.cpp",
"//foundation/multimedia/audio_standard/frameworks/native/opensles/src/obj/audioplayer_obj.cpp",
"//foundation/multimedia/audio_standard/frameworks/native/opensles/src/obj/engine_obj.cpp",
"//foundation/multimedia/audio_standard/frameworks/native/opensles/src/obj/output_mix_obj.cpp",
"//foundation/multimedia/audio_standard/frameworks/native/opensles/src/util/OpenSLES_OpenHarmony_IID.cpp",
"//foundation/multimedia/audio_standard/frameworks/native/opensles/src/util/builder.cpp",
"//foundation/multimedia/audio_standard/frameworks/native/opensles/src/util/table_struct.cpp",
"//foundation/multimedia/audio_framework/frameworks/native/opensles/src/adapter/audiocapturer_adapter.cpp",
"//foundation/multimedia/audio_framework/frameworks/native/opensles/src/adapter/audioplayer_adapter.cpp",
"//foundation/multimedia/audio_framework/frameworks/native/opensles/src/adapter/readorwritecallback_adapter.cpp",
"//foundation/multimedia/audio_framework/frameworks/native/opensles/src/itf/engine_itf.cpp",
"//foundation/multimedia/audio_framework/frameworks/native/opensles/src/itf/object_itf.cpp",
"//foundation/multimedia/audio_framework/frameworks/native/opensles/src/itf/openharmony_buffer_queue_itf.cpp",
"//foundation/multimedia/audio_framework/frameworks/native/opensles/src/itf/play_itf.cpp",
"//foundation/multimedia/audio_framework/frameworks/native/opensles/src/itf/record_itf.cpp",
"//foundation/multimedia/audio_framework/frameworks/native/opensles/src/itf/volume_itf.cpp",
"//foundation/multimedia/audio_framework/frameworks/native/opensles/src/obj/audiocapturer_obj.cpp",
"//foundation/multimedia/audio_framework/frameworks/native/opensles/src/obj/audioplayer_obj.cpp",
"//foundation/multimedia/audio_framework/frameworks/native/opensles/src/obj/engine_obj.cpp",
"//foundation/multimedia/audio_framework/frameworks/native/opensles/src/obj/output_mix_obj.cpp",
"//foundation/multimedia/audio_framework/frameworks/native/opensles/src/util/OpenSLES_OpenHarmony_IID.cpp",
"//foundation/multimedia/audio_framework/frameworks/native/opensles/src/util/builder.cpp",
"//foundation/multimedia/audio_framework/frameworks/native/opensles/src/util/table_struct.cpp",
]
cflags = [ "-Werror" ]
deps = [
"//foundation/multimedia/audio_standard:libsl",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocapturer:audio_capturer",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager:audio_client",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiorenderer:audio_renderer",
"//foundation/multimedia/audio_framework:libsl",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocapturer:audio_capturer",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiomanager:audio_client",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiorenderer:audio_renderer",
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
@@ -85,5 +85,5 @@ ohos_shared_library("opensles") {
output_name = "OpenSLES"
output_extension = "so"
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
frameworks/native/pulseaudio/BUILD.gn
+2 -2
View File
@@ -14,9 +14,9 @@
import("//build/ohos.gni")
pulseaudio_build_path =
"//foundation/multimedia/audio_standard/frameworks/native/pulseaudio"
"//foundation/multimedia/audio_framework/frameworks/native/pulseaudio"
libsndfile_build_path =
"//foundation/multimedia/audio_standard/frameworks/native/libsnd"
"//foundation/multimedia/audio_framework/frameworks/native/libsnd"
group("pulseaudio_packages") {
deps = [
frameworks/native/pulseaudio/src/BUILD.gn
+7 -7
View File
@@ -15,10 +15,10 @@ import("//build/ohos.gni")
pulseaudio_dir = "//third_party/pulseaudio"
pulseaudio_build_path =
"//foundation/multimedia/audio_standard/frameworks/native/pulseaudio"
"//foundation/multimedia/audio_framework/frameworks/native/pulseaudio"
libsndfile_dir = "//third_party/libsnd"
libsndfile_build_path =
"//foundation/multimedia/audio_standard/frameworks/native/libsnd"
"//foundation/multimedia/audio_framework/frameworks/native/libsnd"
config("pulsecommon_config") {
visibility = [ ":*" ]
@@ -121,7 +121,7 @@ ohos_source_set("pulsecommon_sources") {
configs = [ ":pulsecommon_config" ]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
ohos_shared_library("pulsecommon") {
@@ -133,26 +133,26 @@ ohos_shared_library("pulsecommon") {
external_deps = [ "init:libbegetutil" ]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
ohos_prebuilt_etc("pa_daemon_config") {
source = "$pulseaudio_dir/conf/daemon.conf"
subsystem_name = "multimedia"
module_install_dir = "etc/pulse"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
ohos_prebuilt_etc("pa_default_config") {
source = "$pulseaudio_dir/conf/default.pa"
subsystem_name = "multimedia"
module_install_dir = "etc/pulse"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
ohos_prebuilt_etc("pa_client_config") {
source = "$pulseaudio_dir/conf/client.conf"
subsystem_name = "multimedia"
module_install_dir = "etc/pulse"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
frameworks/native/pulseaudio/src/daemon/BUILD.gn
+3 -3
View File
@@ -14,7 +14,7 @@
import("//build/ohos.gni")
pulseaudio_build_path =
"//foundation/multimedia/audio_standard/frameworks/native/pulseaudio"
"//foundation/multimedia/audio_framework/frameworks/native/pulseaudio"
pulseaudio_dir = "//third_party/pulseaudio"
config("daemon_config") {
@@ -48,7 +48,7 @@ ohos_source_set("pulseaudio_sources") {
configs = [ ":daemon_config" ]
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
subsystem_name = "multimedia"
}
@@ -61,6 +61,6 @@ ohos_shared_library("pulseaudio") {
"$pulseaudio_build_path/src/pulsecore:pulsecore",
]
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
subsystem_name = "multimedia"
}
frameworks/native/pulseaudio/src/modules/BUILD.gn
+8 -8
View File
@@ -15,7 +15,7 @@ import("//build/ohos.gni")
pulseaudio_dir = "//third_party/pulseaudio"
pulseaudio_build_path =
"//foundation/multimedia/audio_standard/frameworks/native/pulseaudio"
"//foundation/multimedia/audio_framework/frameworks/native/pulseaudio"
group("modules") {
deps = [
@@ -71,7 +71,7 @@ ohos_shared_library("module-native-protocol-fd") {
]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
ohos_shared_library("module-native-protocol-tcp") {
@@ -92,7 +92,7 @@ ohos_shared_library("module-native-protocol-tcp") {
]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
ohos_shared_library("module-native-protocol-unix") {
@@ -113,7 +113,7 @@ ohos_shared_library("module-native-protocol-unix") {
]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
ohos_shared_library("module-cli-protocol-unix") {
@@ -134,7 +134,7 @@ ohos_shared_library("module-cli-protocol-unix") {
]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
ohos_shared_library("module-pipe-sink") {
@@ -148,7 +148,7 @@ ohos_shared_library("module-pipe-sink") {
deps = [ ":common_deps" ]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
ohos_shared_library("module-pipe-source") {
@@ -164,7 +164,7 @@ ohos_shared_library("module-pipe-source") {
deps = [ ":common_deps" ]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
ohos_shared_library("module-suspend-on-idle") {
@@ -180,5 +180,5 @@ ohos_shared_library("module-suspend-on-idle") {
deps = [ ":common_deps" ]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
frameworks/native/pulseaudio/src/modules/hdi/BUILD.gn
+8 -8
View File
@@ -15,7 +15,7 @@ import("//build/ohos.gni")
pulseaudio_dir = "//third_party/pulseaudio"
pulseaudio_build_path =
"//foundation/multimedia/audio_standard/frameworks/native/pulseaudio"
"//foundation/multimedia/audio_framework/frameworks/native/pulseaudio"
config("hdi_config") {
visibility = [ ":*" ]
@@ -27,9 +27,9 @@ config("hdi_config") {
"$pulseaudio_build_path/src",
"$pulseaudio_build_path/include",
"//drivers/peripheral/audio/interfaces/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiocapturer/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiorenderer/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiocapturer/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiorenderer/include",
"//utils/native/base/include",
]
@@ -61,13 +61,13 @@ ohos_shared_library("module-hdi-sink") {
"$pulseaudio_build_path/src:pulsecommon",
"$pulseaudio_build_path/src/pulse:pulse",
"$pulseaudio_build_path/src/pulsecore:pulsecore",
"//foundation/multimedia/audio_standard/frameworks/native/audiorenderer:renderer_sink_adapter",
"//foundation/multimedia/audio_framework/frameworks/native/audiorenderer:renderer_sink_adapter",
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
ohos_shared_library("module-hdi-source") {
@@ -84,12 +84,12 @@ ohos_shared_library("module-hdi-source") {
"$pulseaudio_build_path/src:pulsecommon",
"$pulseaudio_build_path/src/pulse:pulse",
"$pulseaudio_build_path/src/pulsecore:pulsecore",
"//foundation/multimedia/audio_standard/frameworks/native/audiocapturer:capturer_source_adapter",
"//foundation/multimedia/audio_framework/frameworks/native/audiocapturer:capturer_source_adapter",
"//third_party/bounds_checking_function:libsec_static",
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
frameworks/native/pulseaudio/src/pulse/BUILD.gn
+5 -5
View File
@@ -15,7 +15,7 @@ import("//build/ohos.gni")
pulseaudio_dir = "//third_party/pulseaudio"
pulseaudio_build_path =
"//foundation/multimedia/audio_standard/frameworks/native/pulseaudio"
"//foundation/multimedia/audio_framework/frameworks/native/pulseaudio"
config("pulse_config") {
visibility = [ ":*" ]
@@ -75,7 +75,7 @@ ohos_source_set("pulse_sources") {
configs = [ ":pulse_config" ]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
ohos_shared_library("pulse") {
@@ -85,7 +85,7 @@ ohos_shared_library("pulse") {
]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
ohos_shared_library("pulse-simple") {
@@ -99,7 +99,7 @@ ohos_shared_library("pulse-simple") {
]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
ohos_shared_library("pulse-mainloop-glib") {
@@ -112,5 +112,5 @@ ohos_shared_library("pulse-mainloop-glib") {
]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
frameworks/native/pulseaudio/src/pulsecore/BUILD.gn
+7 -7
View File
@@ -15,10 +15,10 @@ import("//build/ohos.gni")
pulseaudio_dir = "//third_party/pulseaudio"
pulseaudio_build_path =
"//foundation/multimedia/audio_standard/frameworks/native/pulseaudio"
"//foundation/multimedia/audio_framework/frameworks/native/pulseaudio"
libsndfile_dir = "//third_party/libsnd"
libsndfile_build_path =
"//foundation/multimedia/audio_standard/frameworks/native/libsnd"
"//foundation/multimedia/audio_framework/frameworks/native/libsnd"
config("pulsecore_config") {
visibility = [ ":*" ]
@@ -113,7 +113,7 @@ ohos_source_set("pulsecore_sources") {
configs = [ ":pulsecore_config" ]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
ohos_shared_library("pulsecore") {
@@ -124,7 +124,7 @@ ohos_shared_library("pulsecore") {
]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
config("modules_internal_lib_config") {
@@ -159,7 +159,7 @@ ohos_shared_library("cli") {
]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
ohos_shared_library("protocol-cli") {
@@ -174,7 +174,7 @@ ohos_shared_library("protocol-cli") {
]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
ohos_shared_library("protocol-native") {
@@ -188,5 +188,5 @@ ohos_shared_library("protocol-native") {
]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
frameworks/native/pulseaudio/src/utils/BUILD.gn
+5 -5
View File
@@ -15,10 +15,10 @@ import("//build/ohos.gni")
pulseaudio_dir = "//third_party/pulseaudio"
pulseaudio_build_path =
"//foundation/multimedia/audio_standard/frameworks/native/pulseaudio"
"//foundation/multimedia/audio_framework/frameworks/native/pulseaudio"
libsndfile_dir = "//third_party/libsnd"
libsndfile_build_path =
"//foundation/multimedia/audio_standard/frameworks/native/libsnd"
"//foundation/multimedia/audio_framework/frameworks/native/libsnd"
config("pulseutils_config") {
visibility = [ ":*" ]
@@ -53,7 +53,7 @@ ohos_executable("pacat") {
]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
ohos_executable("pactl") {
@@ -67,7 +67,7 @@ ohos_executable("pactl") {
"$pulseaudio_build_path/src/pulse:pulse",
]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
ohos_executable("pacmd") {
@@ -83,5 +83,5 @@ ohos_executable("pacmd") {
]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
interfaces/inner_api/native/audiocapturer/BUILD.gn
+14 -14
View File
@@ -21,13 +21,13 @@ group("audio_capturer_test_packages") {
config("audio_capturer_config") {
include_dirs = [
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocapturer/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiocapturer/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiosession/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiostream/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_standard/services/include",
"//foundation/multimedia/audio_standard/services/include/audio_service/client",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocapturer/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiocapturer/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiosession/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiostream/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_framework/services/include",
"//foundation/multimedia/audio_framework/services/include/audio_service/client",
"$pulseaudio_dir/src",
"$pulseaudio_dir/confgure/src",
]
@@ -43,33 +43,33 @@ ohos_shared_library("audio_capturer") {
configs = [ ":audio_capturer_config" ]
sources = [ "//foundation/multimedia/audio_standard/frameworks/native/audiocapturer/src/audio_capturer.cpp" ]
sources = [ "//foundation/multimedia/audio_framework/frameworks/native/audiocapturer/src/audio_capturer.cpp" ]
deps = [ "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager:audio_client" ]
deps = [ "//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiomanager:audio_client" ]
public_configs = [ ":audio_external_library_config" ]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
subsystem_name = "multimedia"
}
config("audio_external_library_config") {
include_dirs = [ "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocapturer/include" ]
include_dirs = [ "//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocapturer/include" ]
}
ohos_executable("audio_capturer_test") {
install_enable = false
sources = [ "//foundation/multimedia/audio_standard/services/test/audio_capturer_test.cpp" ]
sources = [ "//foundation/multimedia/audio_framework/services/test/audio_capturer_test.cpp" ]
configs = [ ":audio_capturer_config" ]
deps = [ "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocapturer:audio_capturer" ]
deps = [ "//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocapturer:audio_capturer" ]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
subsystem_name = "multimedia"
}
interfaces/inner_api/native/audiocommon/include/audio_log.h
+1 -1
View File
@@ -23,7 +23,7 @@
#undef LOG_DOMAIN
#undef LOG_TAG
#define LOG_DOMAIN 0xD002B00
#define LOG_TAG "AudioStandard"
#define LOG_TAG "AudioFramework"
#define FILENAME (__builtin_strrchr(__FILE__, '/') ? __builtin_strrchr(__FILE__, '/') + 1 : __FILE__)
interfaces/inner_api/native/audiomanager/BUILD.gn
+28 -27
View File
@@ -16,7 +16,7 @@ import("//drivers/adapter/uhdf2/uhdf.gni")
pulseaudio_dir = "//third_party/pulseaudio"
pulseaudio_build_path =
"//foundation/multimedia/audio_standard/frameworks/native/pulseaudio"
"//foundation/multimedia/audio_framework/frameworks/native/pulseaudio"
group("audio_client_test_packages") {
deps = [
@@ -27,17 +27,17 @@ group("audio_client_test_packages") {
config("audio_client_public_config") {
include_dirs = [
"//foundation/multimedia/audio_standard/frameworks/native/audiopolicy/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiosession/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiostream/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocapturer/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiorenderer/include",
"//foundation/multimedia/audio_standard/services/include",
"//foundation/multimedia/audio_standard/services/include/audio_service/client",
"//foundation/multimedia/audio_standard/services/include/audio_policy/client",
"//foundation/multimedia/audio_standard/services/include/audio_policy/common",
"//foundation/multimedia/audio_framework/frameworks/native/audiopolicy/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiosession/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiostream/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocapturer/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiomanager/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiorenderer/include",
"//foundation/multimedia/audio_framework/services/include",
"//foundation/multimedia/audio_framework/services/include/audio_service/client",
"//foundation/multimedia/audio_framework/services/include/audio_policy/client",
"//foundation/multimedia/audio_framework/services/include/audio_policy/common",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//utils/system/safwk/native/include",
"//utils/native/base/include",
@@ -61,18 +61,18 @@ config("audio_client_public_config") {
ohos_shared_library("audio_client") {
install_enable = true
sources = [
"//foundation/multimedia/audio_standard/services/src/audio_service/client/audio_manager_proxy.cpp",
"//foundation/multimedia/audio_standard/services/src/audio_service/client/audio_service_client.cpp",
"//foundation/multimedia/audio_standard/services/src/audio_service/client/audio_session.cpp",
"//foundation/multimedia/audio_standard/services/src/audio_service/client/audio_stream.cpp",
"//foundation/multimedia/audio_standard/services/src/audio_service/client/audio_system_manager.cpp",
"//foundation/multimedia/audio_framework/services/src/audio_service/client/audio_manager_proxy.cpp",
"//foundation/multimedia/audio_framework/services/src/audio_service/client/audio_service_client.cpp",
"//foundation/multimedia/audio_framework/services/src/audio_service/client/audio_session.cpp",
"//foundation/multimedia/audio_framework/services/src/audio_service/client/audio_stream.cpp",
"//foundation/multimedia/audio_framework/services/src/audio_service/client/audio_system_manager.cpp",
]
public_configs = [ ":audio_client_public_config" ]
deps = [
"//foundation/multimedia/audio_standard/frameworks/native/audiopolicy:audio_policy_client",
"//foundation/multimedia/audio_standard/frameworks/native/pulseaudio/src/pulse:pulse",
"//foundation/multimedia/audio_framework/frameworks/native/audiopolicy:audio_policy_client",
"//foundation/multimedia/audio_framework/frameworks/native/pulseaudio/src/pulse:pulse",
"//third_party/bounds_checking_function:libsec_static",
"//utils/native/base:utils",
]
@@ -84,14 +84,14 @@ ohos_shared_library("audio_client") {
"samgr_standard:samgr_proxy",
]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
ohos_executable("playback_test") {
install_enable = false
sources = [
"//foundation/multimedia/audio_standard/services/test/playback_test.cpp",
"//foundation/multimedia/audio_framework/services/test/playback_test.cpp",
]
configs = [ ":audio_client_public_config" ]
@@ -100,15 +100,16 @@ ohos_executable("playback_test") {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
subsystem_name = "multimedia"
}
ohos_executable("record_test") {
install_enable = false
sources =
[ "//foundation/multimedia/audio_standard/services/test/record_test.cpp" ]
sources = [
"//foundation/multimedia/audio_framework/services/test/record_test.cpp",
]
configs = [ ":audio_client_public_config" ]
@@ -116,14 +117,14 @@ ohos_executable("record_test") {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
subsystem_name = "multimedia"
}
ohos_executable("audio_multichannel_test") {
install_enable = false
sources = [ "//foundation/multimedia/audio_standard/services/test/audio_multichannel_test.cpp" ]
sources = [ "//foundation/multimedia/audio_framework/services/test/audio_multichannel_test.cpp" ]
configs = [ ":audio_client_public_config" ]
@@ -131,6 +132,6 @@ ohos_executable("audio_multichannel_test") {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
subsystem_name = "multimedia"
}
interfaces/inner_api/native/audiorenderer/BUILD.gn
+35 -35
View File
@@ -17,15 +17,15 @@ pulseaudio_dir = "//third_party/pulseaudio"
config("audio_renderer_config") {
include_dirs = [
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiorenderer/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiorenderer/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiosession/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiostream/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager/include",
"//foundation/multimedia/audio_standard/services/include",
"//foundation/multimedia/audio_standard/services/include/audio_service/client",
"//foundation/multimedia/audio_standard/services/test",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiorenderer/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiorenderer/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiosession/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiostream/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiomanager/include",
"//foundation/multimedia/audio_framework/services/include",
"//foundation/multimedia/audio_framework/services/include/audio_service/client",
"//foundation/multimedia/audio_framework/services/test",
"//utils/native/base/include",
"$pulseaudio_dir/src",
"$pulseaudio_dir/confgure/src",
@@ -42,11 +42,11 @@ ohos_shared_library("audio_renderer") {
configs = [ ":audio_renderer_config" ]
sources = [ "//foundation/multimedia/audio_standard/frameworks/native/audiorenderer/src/audio_renderer.cpp" ]
sources = [ "//foundation/multimedia/audio_framework/frameworks/native/audiorenderer/src/audio_renderer.cpp" ]
deps = [
"//foundation/multimedia/audio_standard/frameworks/native/audiopolicy:audio_policy_client",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager:audio_client",
"//foundation/multimedia/audio_framework/frameworks/native/audiopolicy:audio_policy_client",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiomanager:audio_client",
"//utils/native/base:utils",
]
@@ -54,14 +54,14 @@ ohos_shared_library("audio_renderer") {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
subsystem_name = "multimedia"
}
ohos_executable("audio_renderer_test") {
install_enable = false
sources = [ "//foundation/multimedia/audio_standard/services/test/audio_renderer_test.cpp" ]
sources = [ "//foundation/multimedia/audio_framework/services/test/audio_renderer_test.cpp" ]
configs = [ ":audio_renderer_config" ]
@@ -69,14 +69,14 @@ ohos_executable("audio_renderer_test") {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
subsystem_name = "multimedia"
}
ohos_executable("audio_render_mode_callback_test") {
install_enable = false
sources = [ "//foundation/multimedia/audio_standard/services/test/audio_render_mode_callback_test.cpp" ]
sources = [ "//foundation/multimedia/audio_framework/services/test/audio_render_mode_callback_test.cpp" ]
configs = [ ":audio_renderer_config" ]
@@ -84,7 +84,7 @@ ohos_executable("audio_render_mode_callback_test") {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
subsystem_name = "multimedia"
}
@@ -92,19 +92,19 @@ ohos_executable("audio_voip_test") {
install_enable = false
sources = [
"//foundation/multimedia/audio_standard/services/test/audio_voip_test.cpp",
"//foundation/multimedia/audio_framework/services/test/audio_voip_test.cpp",
]
include_dirs = [
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocapturer/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiocapturer/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiorenderer/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiorenderer/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiosession/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiostream/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_standard/services/include",
"//foundation/multimedia/audio_standard/services/include/audio_service/client",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocapturer/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiocapturer/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiorenderer/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiorenderer/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiosession/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiostream/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_framework/services/include",
"//foundation/multimedia/audio_framework/services/include/audio_service/client",
"//utils/native/base/include",
"$pulseaudio_dir/src",
"$pulseaudio_dir/confgure/src",
@@ -119,37 +119,37 @@ ohos_executable("audio_voip_test") {
deps = [
":audio_renderer",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocapturer:audio_capturer",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocapturer:audio_capturer",
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
subsystem_name = "multimedia"
}
ohos_executable("audio_interrupt_test") {
install_enable = false
sources = [ "//foundation/multimedia/audio_standard/services/test/audio_interrupt_test.cpp" ]
sources = [ "//foundation/multimedia/audio_framework/services/test/audio_interrupt_test.cpp" ]
configs = [ ":audio_renderer_config" ]
deps = [
":audio_renderer",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager:audio_client",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiomanager:audio_client",
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
subsystem_name = "multimedia"
}
ohos_executable("interrupt_multi_renderer_test") {
install_enable = false
sources = [ "//foundation/multimedia/audio_standard/services/test/interrupt_multi_renderer_test.cpp" ]
sources = [ "//foundation/multimedia/audio_framework/services/test/interrupt_multi_renderer_test.cpp" ]
configs = [ ":audio_renderer_config" ]
@@ -157,10 +157,10 @@ ohos_executable("interrupt_multi_renderer_test") {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
subsystem_name = "multimedia"
}
config("audio_external_library_config") {
include_dirs = [ "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiorenderer/include" ]
include_dirs = [ "//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiorenderer/include" ]
}
interfaces/inner_api/native/audioringtone/BUILD.gn
+8 -8
View File
@@ -12,19 +12,19 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/multimedia/audio_standard/multimedia_aafwk.gni")
import("//foundation/multimedia/audio_framework/multimedia_aafwk.gni")
ohos_shared_library("audio_ringtone_client") {
install_enable = true
sources = [ "//foundation/multimedia/audio_standard/services/src/audio_service/client/audio_ringtone_manager.cpp" ]
sources = [ "//foundation/multimedia/audio_framework/services/src/audio_service/client/audio_ringtone_manager.cpp" ]
public_configs = [ ":ringtone_external_library_config" ]
include_dirs = [
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audioringtone/include",
"//foundation/multimedia/audio_standard/frameworks/native/ringtoneplayer/include",
"//foundation/multimedia/audio_standard/services/include/audio_service/client",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audioringtone/include",
"//foundation/multimedia/audio_framework/frameworks/native/ringtoneplayer/include",
"//foundation/multimedia/audio_framework/services/include/audio_service/client",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/media_library/interfaces/inner_api/media_library_helper/include",
"//foundation/distributeddatamgr/appdatamgr/interfaces/inner_api/native/rdb/include",
"//foundation/distributeddatamgr/appdatamgr/frameworks/native/rdb/include",
@@ -53,9 +53,9 @@ ohos_shared_library("audio_ringtone_client") {
]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
config("ringtone_external_library_config") {
include_dirs = [ "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audioringtone/include" ]
include_dirs = [ "//foundation/multimedia/audio_framework/interfaces/inner_api/native/audioringtone/include" ]
}
interfaces/inner_api/native/opensles/BUILD.gn
+20 -20
View File
@@ -18,17 +18,17 @@ opensles_dir = "//third_party/openSLES"
config("audio_operation_config") {
include_dirs = [
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiorenderer/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiorenderer/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocapturer/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiocapturer/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiostream/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiosession/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager/include",
"//foundation/multimedia/audio_standard/services/include",
"//foundation/multimedia/audio_standard/services/include/audio_service/client",
"//foundation/multimedia/audio_standard/services/test",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiorenderer/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiorenderer/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocapturer/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiocapturer/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiostream/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiosession/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiomanager/include",
"//foundation/multimedia/audio_framework/services/include",
"//foundation/multimedia/audio_framework/services/include/audio_service/client",
"//foundation/multimedia/audio_framework/services/test",
"//utils/native/base/include",
"$pulseaudio_dir/src",
"$pulseaudio_dir/confgure/src",
@@ -42,7 +42,7 @@ config("audio_operation_config") {
config("audio_opensles_config") {
include_dirs = [
"//foundation/multimedia/audio_standard/frameworks/native/opensles/include",
"//foundation/multimedia/audio_framework/frameworks/native/opensles/include",
"$opensles_dir/api/1.0.1",
]
}
@@ -50,7 +50,7 @@ config("audio_opensles_config") {
ohos_executable("audio_opensles_test") {
install_enable = false
sources = [ "//foundation/multimedia/audio_standard/services/test/audio_opensles_test.cpp" ]
sources = [ "//foundation/multimedia/audio_framework/services/test/audio_opensles_test.cpp" ]
configs = [
":audio_opensles_config",
@@ -58,20 +58,20 @@ ohos_executable("audio_opensles_test") {
]
deps = [
"//foundation/multimedia/audio_standard:libsl",
"//foundation/multimedia/audio_standard/frameworks/native/opensles:opensles",
"//foundation/multimedia/audio_framework:libsl",
"//foundation/multimedia/audio_framework/frameworks/native/opensles:opensles",
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
subsystem_name = "multimedia"
}
ohos_executable("audio_opensles_capture_test") {
install_enable = false
sources = [ "//foundation/multimedia/audio_standard/services/test/audio_opensles_capture_test.cpp" ]
sources = [ "//foundation/multimedia/audio_framework/services/test/audio_opensles_capture_test.cpp" ]
configs = [
":audio_opensles_config",
@@ -79,12 +79,12 @@ ohos_executable("audio_opensles_capture_test") {
]
deps = [
"//foundation/multimedia/audio_standard:libsl",
"//foundation/multimedia/audio_standard/frameworks/native/opensles:opensles",
"//foundation/multimedia/audio_framework:libsl",
"//foundation/multimedia/audio_framework/frameworks/native/opensles:opensles",
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
subsystem_name = "multimedia"
}
interfaces/kits/js/audio_manager/BUILD.gn
+38 -38
View File
@@ -13,10 +13,10 @@
import("//build/ohos.gni")
import("//build/ohos/ace/ace.gni")
import("//foundation/multimedia/audio_standard/multimedia_aafwk.gni")
import("//foundation/multimedia/audio_framework/multimedia_aafwk.gni")
js_declaration("audio_js") {
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
sources = [ "./@ohos.multimedia.audio.d.ts" ]
}
@@ -31,41 +31,41 @@ ohos_shared_library("audio") {
include_dirs = [
"${aafwk_kits_path}/ability/native/include",
"//foundation/arkui/napi/interfaces/kits",
"//foundation/multimedia/audio_standard/interfaces/kits/js/audio_manager/include",
"//foundation/multimedia/audio_standard/frameworks/js/napi/audio_capturer/include",
"//foundation/multimedia/audio_standard/frameworks/js/napi/audio_common/include",
"//foundation/multimedia/audio_standard/frameworks/js/napi/audio_manager/include",
"//foundation/multimedia/audio_standard/frameworks/js/napi/audio_renderer/include",
"//foundation/multimedia/audio_standard/interfaces/kits/js/audio_manager/include",
"//foundation/multimedia/audio_standard/interfaces/kits/js/audio_capturer/include",
"//foundation/multimedia/audio_standard/interfaces/kits/js/audio_renderer/include",
"//foundation/multimedia/audio_standard/interfaces/kits/js/ringtone_manager/include",
"//foundation/multimedia/audio_standard/frameworks/inner_api/audiosoundmanager/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audioringtone/include",
"//foundation/multimedia/audio_framework/interfaces/kits/js/audio_manager/include",
"//foundation/multimedia/audio_framework/frameworks/js/napi/audio_capturer/include",
"//foundation/multimedia/audio_framework/frameworks/js/napi/audio_common/include",
"//foundation/multimedia/audio_framework/frameworks/js/napi/audio_manager/include",
"//foundation/multimedia/audio_framework/frameworks/js/napi/audio_renderer/include",
"//foundation/multimedia/audio_framework/interfaces/kits/js/audio_manager/include",
"//foundation/multimedia/audio_framework/interfaces/kits/js/audio_capturer/include",
"//foundation/multimedia/audio_framework/interfaces/kits/js/audio_renderer/include",
"//foundation/multimedia/audio_framework/interfaces/kits/js/ringtone_manager/include",
"//foundation/multimedia/audio_framework/frameworks/inner_api/audiosoundmanager/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audioringtone/include",
"//third_party/libuv/include",
]
sources = [
"//foundation/multimedia/audio_standard/frameworks/js/napi/audio_capturer/src/audio_capturer_callback_napi.cpp",
"//foundation/multimedia/audio_standard/frameworks/js/napi/audio_capturer/src/audio_capturer_napi.cpp",
"//foundation/multimedia/audio_standard/frameworks/js/napi/audio_capturer/src/audio_parameters_napi.cpp",
"//foundation/multimedia/audio_standard/frameworks/js/napi/audio_capturer/src/capturer_period_position_callback_napi.cpp",
"//foundation/multimedia/audio_standard/frameworks/js/napi/audio_capturer/src/capturer_position_callback_napi.cpp",
"//foundation/multimedia/audio_standard/frameworks/js/napi/audio_common/src/audio_common_napi.cpp",
"//foundation/multimedia/audio_standard/frameworks/js/napi/audio_manager/src/audio_manager_callback_napi.cpp",
"//foundation/multimedia/audio_standard/frameworks/js/napi/audio_manager/src/audio_manager_interrupt_callback_napi.cpp",
"//foundation/multimedia/audio_standard/frameworks/js/napi/audio_manager/src/audio_manager_napi.cpp",
"//foundation/multimedia/audio_standard/frameworks/js/napi/audio_manager/src/audio_ringermode_callback_napi.cpp",
"//foundation/multimedia/audio_standard/frameworks/js/napi/audio_manager/src/audio_volume_key_event_napi.cpp",
"//foundation/multimedia/audio_standard/frameworks/js/napi/audio_renderer/src/audio_renderer_callback_napi.cpp",
"//foundation/multimedia/audio_standard/frameworks/js/napi/audio_renderer/src/audio_renderer_napi.cpp",
"//foundation/multimedia/audio_standard/frameworks/js/napi/audio_renderer/src/renderer_period_position_callback_napi.cpp",
"//foundation/multimedia/audio_standard/frameworks/js/napi/audio_renderer/src/renderer_position_callback_napi.cpp",
"//foundation/multimedia/audio_standard/frameworks/js/napi/ringtone_manager/src/audio_renderer_info_napi.cpp",
"//foundation/multimedia/audio_standard/frameworks/js/napi/ringtone_manager/src/ringtone_options_napi.cpp",
"//foundation/multimedia/audio_standard/frameworks/js/napi/ringtone_manager/src/ringtone_player_napi.cpp",
"//foundation/multimedia/audio_standard/frameworks/js/napi/ringtone_manager/src/system_sound_manager_napi.cpp",
"//foundation/multimedia/audio_framework/frameworks/js/napi/audio_capturer/src/audio_capturer_callback_napi.cpp",
"//foundation/multimedia/audio_framework/frameworks/js/napi/audio_capturer/src/audio_capturer_napi.cpp",
"//foundation/multimedia/audio_framework/frameworks/js/napi/audio_capturer/src/audio_parameters_napi.cpp",
"//foundation/multimedia/audio_framework/frameworks/js/napi/audio_capturer/src/capturer_period_position_callback_napi.cpp",
"//foundation/multimedia/audio_framework/frameworks/js/napi/audio_capturer/src/capturer_position_callback_napi.cpp",
"//foundation/multimedia/audio_framework/frameworks/js/napi/audio_common/src/audio_common_napi.cpp",
"//foundation/multimedia/audio_framework/frameworks/js/napi/audio_manager/src/audio_manager_callback_napi.cpp",
"//foundation/multimedia/audio_framework/frameworks/js/napi/audio_manager/src/audio_manager_interrupt_callback_napi.cpp",
"//foundation/multimedia/audio_framework/frameworks/js/napi/audio_manager/src/audio_manager_napi.cpp",
"//foundation/multimedia/audio_framework/frameworks/js/napi/audio_manager/src/audio_ringermode_callback_napi.cpp",
"//foundation/multimedia/audio_framework/frameworks/js/napi/audio_manager/src/audio_volume_key_event_napi.cpp",
"//foundation/multimedia/audio_framework/frameworks/js/napi/audio_renderer/src/audio_renderer_callback_napi.cpp",
"//foundation/multimedia/audio_framework/frameworks/js/napi/audio_renderer/src/audio_renderer_napi.cpp",
"//foundation/multimedia/audio_framework/frameworks/js/napi/audio_renderer/src/renderer_period_position_callback_napi.cpp",
"//foundation/multimedia/audio_framework/frameworks/js/napi/audio_renderer/src/renderer_position_callback_napi.cpp",
"//foundation/multimedia/audio_framework/frameworks/js/napi/ringtone_manager/src/audio_renderer_info_napi.cpp",
"//foundation/multimedia/audio_framework/frameworks/js/napi/ringtone_manager/src/ringtone_options_napi.cpp",
"//foundation/multimedia/audio_framework/frameworks/js/napi/ringtone_manager/src/ringtone_player_napi.cpp",
"//foundation/multimedia/audio_framework/frameworks/js/napi/ringtone_manager/src/system_sound_manager_napi.cpp",
]
deps = [
@@ -73,10 +73,10 @@ ohos_shared_library("audio") {
"//base/global/resource_management/frameworks/resmgr:global_resmgr",
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/arkui/napi:ace_napi",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocapturer:audio_capturer",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager:audio_client",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiorenderer:audio_renderer",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audioringtone:audio_ringtone_client",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocapturer:audio_capturer",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiomanager:audio_client",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiorenderer:audio_renderer",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audioringtone:audio_ringtone_client",
"//utils/native/base:utils",
]
@@ -88,6 +88,6 @@ ohos_shared_library("audio") {
"ipc:ipc_core",
]
relative_install_dir = "module/multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
subsystem_name = "multimedia"
}
sa_profile/BUILD.gn
+2 -2
View File
@@ -16,11 +16,11 @@ import("//build/ohos/sa_profile/sa_profile.gni")
ohos_sa_profile("audio_service_sa_profile") {
sources = [ "3001.xml" ]
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
ohos_sa_profile("audio_policy_service_sa_profile") {
sources = [ "3009.xml" ]
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
services/BUILD.gn
+49 -49
View File
@@ -15,12 +15,12 @@ import("//build/ohos.gni")
import("//drivers/adapter/uhdf2/uhdf.gni")
AUDIO_POLICY_SERVER_DIR =
"//foundation/multimedia/audio_standard/services/src/audio_policy/server"
"//foundation/multimedia/audio_framework/services/src/audio_policy/server"
ohos_prebuilt_etc("pulseaudio.rc") {
source = "etc/pulseaudio.cfg"
relative_install_dir = "init"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
subsystem_name = "multimedia"
}
@@ -30,10 +30,10 @@ config("audio_service_config") {
include_dirs = [
"include",
"include/audio_service/server",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiocapturer/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiorenderer/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiocapturer/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiorenderer/include",
"//drivers/peripheral/audio/interfaces/include",
]
@@ -53,10 +53,10 @@ ohos_shared_library("audio_service") {
configs = [ ":audio_service_config" ]
deps = [
"//foundation/multimedia/audio_standard/frameworks/native/audiocapturer:audio_capturer_source",
"//foundation/multimedia/audio_standard/frameworks/native/audiorenderer:audio_renderer_sink",
"//foundation/multimedia/audio_standard/frameworks/native/pulseaudio/src/daemon:pulseaudio",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager:audio_client",
"//foundation/multimedia/audio_framework/frameworks/native/audiocapturer:audio_capturer_source",
"//foundation/multimedia/audio_framework/frameworks/native/audiorenderer:audio_renderer_sink",
"//foundation/multimedia/audio_framework/frameworks/native/pulseaudio/src/daemon:pulseaudio",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiomanager:audio_client",
"//utils/native/base:utils",
]
@@ -69,7 +69,7 @@ ohos_shared_library("audio_service") {
]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
group("audio_policy_service_packages") {
@@ -84,30 +84,30 @@ group("audio_policy_service_packages") {
ohos_prebuilt_etc("audio_policy.rc") {
source = "etc/audio_policy.cfg"
relative_install_dir = "init"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
subsystem_name = "multimedia"
}
config("audio_policy_public_config") {
include_dirs = [
"//drivers/peripheral/audio/interfaces/include",
"//foundation/multimedia/audio_standard/services/include",
"//foundation/multimedia/audio_standard/services/include/audio_service/client",
"//foundation/multimedia/audio_framework/services/include",
"//foundation/multimedia/audio_framework/services/include/audio_service/client",
"//foundation/distributedschedule/safwk/services/safwk/include",
"//foundation/multimedia/audio_standard/frameworks/native/audioadapter/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiopolicy/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager/include",
"//foundation/multimedia/audio_standard/services/include/audio_policy/server/service/common",
"//foundation/multimedia/audio_standard/services/include/audio_policy/server/service/config",
"//foundation/multimedia/audio_standard/services/include/audio_policy/server/service/interface",
"//foundation/multimedia/audio_standard/services/include/audio_policy/server/service/listener",
"//foundation/multimedia/audio_standard/services/include/audio_policy/server/service/manager",
"//foundation/multimedia/audio_standard/services/include/audio_policy/server/service",
"//foundation/multimedia/audio_standard/services/include/audio_policy/common",
"//foundation/multimedia/audio_standard/services/include/audio_policy/server",
"//foundation/multimedia/audio_standard/services/include/audio_policy/client",
"//foundation/multimedia/audio_standard/services/include/audio_bluetooth/client",
"//foundation/multimedia/audio_framework/frameworks/native/audioadapter/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiopolicy/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiomanager/include",
"//foundation/multimedia/audio_framework/services/include/audio_policy/server/service/common",
"//foundation/multimedia/audio_framework/services/include/audio_policy/server/service/config",
"//foundation/multimedia/audio_framework/services/include/audio_policy/server/service/interface",
"//foundation/multimedia/audio_framework/services/include/audio_policy/server/service/listener",
"//foundation/multimedia/audio_framework/services/include/audio_policy/server/service/manager",
"//foundation/multimedia/audio_framework/services/include/audio_policy/server/service",
"//foundation/multimedia/audio_framework/services/include/audio_policy/common",
"//foundation/multimedia/audio_framework/services/include/audio_policy/server",
"//foundation/multimedia/audio_framework/services/include/audio_policy/client",
"//foundation/multimedia/audio_framework/services/include/audio_bluetooth/client",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include",
"//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/include",
@@ -116,7 +116,7 @@ config("audio_policy_public_config") {
"//third_party/pulseaudio/src",
"//third_party/pulseaudio/confgure/src",
"//third_party/pulseaudio/include",
"//foundation/multimedia/audio_standard/frameworks/native/pulseaudio/include",
"//foundation/multimedia/audio_framework/frameworks/native/pulseaudio/include",
"//utils/system/safwk/native/include",
"//utils/native/base/include",
"//third_party/bounds_checking_function/include",
@@ -127,7 +127,7 @@ config("audio_policy_public_config") {
"//foundation/communication/bluetooth/interfaces/inner_api/include/c_header",
"//foundation/communication/bluetooth/services/bluetooth/ipc/include",
"//foundation/communication/bluetooth/services/bluetooth/common/",
"//foundation/multimedia/audio_standard/frameworks/native/audiorenderer/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiorenderer/include",
]
cflags = [
@@ -144,12 +144,12 @@ config("audio_policy_public_config") {
ohos_shared_library("audio_dump") {
install_enable = true
sources = [ "//foundation/multimedia/audio_standard/services/src/audio_policy/server/audio_service_dump.cpp" ]
sources = [ "//foundation/multimedia/audio_framework/services/src/audio_policy/server/audio_service_dump.cpp" ]
public_configs = [ ":audio_policy_public_config" ]
deps = [
"//foundation/multimedia/audio_standard/frameworks/native/pulseaudio/src/pulse:pulse",
"//foundation/multimedia/audio_framework/frameworks/native/pulseaudio/src/pulse:pulse",
"//third_party/bounds_checking_function:libsec_static",
"//utils/native/base:utils",
]
@@ -157,24 +157,24 @@ ohos_shared_library("audio_dump") {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
ohos_shared_library("audio_policy_service") {
install_enable = true
sources = [
"//foundation/multimedia/audio_standard/services/src/audio_policy/client/audio_device_descriptor.cpp",
"//foundation/multimedia/audio_standard/services/src/audio_policy/server/audio_policy_manager_listener_proxy.cpp",
"//foundation/multimedia/audio_standard/services/src/audio_policy/server/audio_policy_manager_stub.cpp",
"//foundation/multimedia/audio_standard/services/src/audio_policy/server/audio_policy_server.cpp",
"//foundation/multimedia/audio_standard/services/src/audio_policy/server/audio_ringermode_update_listener_proxy.cpp",
"//foundation/multimedia/audio_standard/services/src/audio_policy/server/audio_volume_key_event_callback_proxy.cpp",
"//foundation/multimedia/audio_standard/services/src/audio_policy/server/service/audio_policy_service.cpp",
"//foundation/multimedia/audio_standard/services/src/audio_policy/server/service/config/audio_focus_parser.cpp",
"//foundation/multimedia/audio_standard/services/src/audio_policy/server/service/config/xml_parser.cpp",
"//foundation/multimedia/audio_standard/services/src/audio_policy/server/service/listener/device_status_listener.cpp",
"//foundation/multimedia/audio_standard/services/src/audio_policy/server/service/manager/audio_adapter_manager.cpp",
"//foundation/multimedia/audio_standard/services/src/audio_policy/server/service/src/audio_policy_service_proxy.cpp",
"//foundation/multimedia/audio_framework/services/src/audio_policy/client/audio_device_descriptor.cpp",
"//foundation/multimedia/audio_framework/services/src/audio_policy/server/audio_policy_manager_listener_proxy.cpp",
"//foundation/multimedia/audio_framework/services/src/audio_policy/server/audio_policy_manager_stub.cpp",
"//foundation/multimedia/audio_framework/services/src/audio_policy/server/audio_policy_server.cpp",
"//foundation/multimedia/audio_framework/services/src/audio_policy/server/audio_ringermode_update_listener_proxy.cpp",
"//foundation/multimedia/audio_framework/services/src/audio_policy/server/audio_volume_key_event_callback_proxy.cpp",
"//foundation/multimedia/audio_framework/services/src/audio_policy/server/service/audio_policy_service.cpp",
"//foundation/multimedia/audio_framework/services/src/audio_policy/server/service/config/audio_focus_parser.cpp",
"//foundation/multimedia/audio_framework/services/src/audio_policy/server/service/config/xml_parser.cpp",
"//foundation/multimedia/audio_framework/services/src/audio_policy/server/service/listener/device_status_listener.cpp",
"//foundation/multimedia/audio_framework/services/src/audio_policy/server/service/manager/audio_adapter_manager.cpp",
"//foundation/multimedia/audio_framework/services/src/audio_policy/server/service/src/audio_policy_service_proxy.cpp",
]
public_configs = [ ":audio_policy_public_config" ]
@@ -188,9 +188,9 @@ ohos_shared_library("audio_policy_service") {
"//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core",
"//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata:distributeddata_inner",
"//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter:distributeddata_adapter",
"//foundation/multimedia/audio_standard/frameworks/native/audioadapter:pulse_audio_service_adapter",
"//foundation/multimedia/audio_standard/frameworks/native/audiorenderer:audio_bluetooth_client",
"//foundation/multimedia/audio_standard/services:audio_dump",
"//foundation/multimedia/audio_framework/frameworks/native/audioadapter:pulse_audio_service_adapter",
"//foundation/multimedia/audio_framework/frameworks/native/audiorenderer:audio_bluetooth_client",
"//foundation/multimedia/audio_framework/services:audio_dump",
"//third_party/libxml2:xml2",
"//utils/native/base:utils",
]
@@ -205,7 +205,7 @@ ohos_shared_library("audio_policy_service") {
"samgr_standard:samgr_proxy",
]
subsystem_name = "multimedia"
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
ohos_prebuilt_etc("audio_interrupt_policy_config") {
@@ -214,5 +214,5 @@ ohos_prebuilt_etc("audio_interrupt_policy_config") {
subsystem_name = "multimedia"
relative_install_dir = "audio"
install_images = [ chipset_base_dir ]
part_name = "multimedia_audio_standard"
part_name = "multimedia_audio_framework"
}
test/fuzztest/audiomanager_fuzzer/BUILD.gn
+6 -7
View File
@@ -16,14 +16,13 @@ import("//build/config/features.gni")
import("//build/test.gni")
##############################fuzztest##########################################
ohos_fuzztest("AudioManagerFuzzTest") {
module_out_path = "multimedia_audio_standard/audiomanager"
fuzz_config_file =
"//foundation/multimedia/audio_standard/test/fuzztest/audiomanager_fuzzer"
module_out_path = "multimedia_audio_framework/audiomanager"
fuzz_config_file = "//foundation/multimedia/audio_framework/test/fuzztest/audiomanager_fuzzer"
include_dirs = [
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_standard/frameworks/native/common/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiomanager/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_framework/frameworks/native/common/include",
]
cflags = [
@@ -36,7 +35,7 @@ ohos_fuzztest("AudioManagerFuzzTest") {
sources = [ "audio_manager_fuzzer.cpp" ]
deps = [
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager:audio_client",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiomanager:audio_client",
"//utils/native/base:utils",
]
}
test/moduletest/audiopolicy/BUILD.gn
+4 -4
View File
@@ -13,7 +13,7 @@
import("//build/test.gni")
module_output_path = "multimedia_audio_standard/audio_policy"
module_output_path = "multimedia_audio_framework/audio_policy"
group("moduletest") {
testonly = true
@@ -25,15 +25,15 @@ ohos_moduletest("audio_policy_module_test") {
module_out_path = module_output_path
include_dirs = [
"./1.0/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiomanager/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
]
sources = [ "1.0/src/audio_policy_test.cpp" ]
deps = [
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager:audio_client",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiomanager:audio_client",
"//utils/native/base:utils",
]
}
test/unittest/capturer_test/BUILD.gn
+4 -4
View File
@@ -13,14 +13,14 @@
import("//build/test.gni")
module_output_path = "multimedia_audio_standard/audio_capturer"
module_output_path = "multimedia_audio_framework/audio_capturer"
ohos_unittest("audio_capturer_unit_test") {
module_out_path = module_output_path
include_dirs = [
"./include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_standard/frameworks/native/common/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_framework/frameworks/native/common/include",
]
cflags = [
@@ -30,5 +30,5 @@ ohos_unittest("audio_capturer_unit_test") {
sources = [ "src/audio_capturer_unit_test.cpp" ]
deps = [ "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocapturer:audio_capturer" ]
deps = [ "//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocapturer:audio_capturer" ]
}
test/unittest/manager_test/BUILD.gn
+5 -5
View File
@@ -13,14 +13,14 @@
import("//build/test.gni")
module_output_path = "multimedia_audio_standard/audio_manager"
module_output_path = "multimedia_audio_framework/audio_manager"
ohos_unittest("audio_manager_unit_test") {
module_out_path = module_output_path
include_dirs = [
"./include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_standard/frameworks/native/common/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_framework/frameworks/native/common/include",
]
cflags = [
@@ -31,8 +31,8 @@ ohos_unittest("audio_manager_unit_test") {
sources = [ "src/audio_manager_unit_test.cpp" ]
deps = [
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager:audio_client",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiorenderer:audio_renderer",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiomanager:audio_client",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiorenderer:audio_renderer",
"//utils/native/base:utils",
]
}
test/unittest/opensles_capture_test/BUILD.gn
+15 -15
View File
@@ -13,24 +13,24 @@
import("//build/test.gni")
module_output_path = "multimedia_audio_standard/audio_opensles"
module_output_path = "multimedia_audio_framework/audio_opensles"
pulseaudio_dir = "//third_party/pulseaudio"
opensles_dir = "//third_party/openSLES"
config("audio_capture_config") {
include_dirs = [
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiorenderer/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiorenderer/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocapturer/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiocapturer/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiopolicy/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiostream/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiosession/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager/include",
"//foundation/multimedia/audio_standard/services/include",
"//foundation/multimedia/audio_standard/services/include/audio_service/client",
"//foundation/multimedia/audio_standard/services/test",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiorenderer/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiorenderer/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocapturer/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiocapturer/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiopolicy/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiostream/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiosession/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiomanager/include",
"//foundation/multimedia/audio_framework/services/include",
"//foundation/multimedia/audio_framework/services/include/audio_service/client",
"//foundation/multimedia/audio_framework/services/test",
"//utils/native/base/include",
"$pulseaudio_dir/src",
"$pulseaudio_dir/confgure/src",
@@ -44,7 +44,7 @@ config("audio_capture_config") {
config("audio_opensles_config") {
include_dirs = [
"//foundation/multimedia/audio_standard/frameworks/native/opensles/include",
"//foundation/multimedia/audio_framework/frameworks/native/opensles/include",
"$opensles_dir/api/1.0.1",
]
}
@@ -60,7 +60,7 @@ ohos_unittest("audio_opensles_capture_unit_test") {
sources = [ "src/audio_opensles_capture_unit_test.cpp" ]
deps = [ "//foundation/multimedia/audio_standard/frameworks/native/opensles:opensles" ]
deps = [ "//foundation/multimedia/audio_framework/frameworks/native/opensles:opensles" ]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}
test/unittest/opensles_test/BUILD.gn
+17 -17
View File
@@ -13,24 +13,24 @@
import("//build/test.gni")
module_output_path = "multimedia_audio_standard/audio_opensles"
module_output_path = "multimedia_audio_framework/audio_opensles"
pulseaudio_dir = "//third_party/pulseaudio"
opensles_dir = "//third_party/openSLES"
config("audio_renderer_config") {
include_dirs = [
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiorenderer/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiorenderer/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocapturer/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiocapturer/include",
"//foundation/multimedia/audio_standard/frameworks/native/audiopolicy/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiostream/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiosession/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager/include",
"//foundation/multimedia/audio_standard/services/include",
"//foundation/multimedia/audio_standard/services/include/audio_service/client",
"//foundation/multimedia/audio_standard/services/test",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiorenderer/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiorenderer/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocapturer/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiocapturer/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiopolicy/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiostream/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiosession/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiomanager/include",
"//foundation/multimedia/audio_framework/services/include",
"//foundation/multimedia/audio_framework/services/include/audio_service/client",
"//foundation/multimedia/audio_framework/services/test",
"//utils/native/base/include",
"$pulseaudio_dir/src",
"$pulseaudio_dir/confgure/src",
@@ -44,7 +44,7 @@ config("audio_renderer_config") {
config("audio_opensles_config") {
include_dirs = [
"//foundation/multimedia/audio_standard/frameworks/native/opensles/include",
"//foundation/multimedia/audio_framework/frameworks/native/opensles/include",
"$opensles_dir/api/1.0.1",
]
}
@@ -52,7 +52,7 @@ config("audio_opensles_config") {
ohos_unittest("audio_opensles_unit_test") {
module_out_path = module_output_path
include_dirs = [
"//foundation/multimedia/audio_standard/frameworks/native/audiopolicy/include",
"//foundation/multimedia/audio_framework/frameworks/native/audiopolicy/include",
"./include",
]
@@ -63,9 +63,9 @@ ohos_unittest("audio_opensles_unit_test") {
sources = [ "src/audio_opensles_unit_test.cpp" ]
deps = [ "//foundation/multimedia/audio_standard/frameworks/native/opensles:opensles" ]
deps = [ "//foundation/multimedia/audio_framework/frameworks/native/opensles:opensles" ]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
resource_config_file = "//foundation/multimedia/audio_standard/test/resource/audio_renderer/ohos_test.xml"
resource_config_file = "//foundation/multimedia/audio_framework/test/resource/audio_renderer/ohos_test.xml"
}
test/unittest/renderer_test/BUILD.gn
+5 -5
View File
@@ -13,14 +13,14 @@
import("//build/test.gni")
module_output_path = "multimedia_audio_standard/audio_renderer"
module_output_path = "multimedia_audio_framework/audio_renderer"
ohos_unittest("audio_renderer_unit_test") {
module_out_path = module_output_path
include_dirs = [
"./include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_standard/frameworks/native/common/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_framework/frameworks/native/common/include",
]
cflags = [
@@ -30,7 +30,7 @@ ohos_unittest("audio_renderer_unit_test") {
sources = [ "src/audio_renderer_unit_test.cpp" ]
deps = [ "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiorenderer:audio_renderer" ]
deps = [ "//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiorenderer:audio_renderer" ]
resource_config_file = "//foundation/multimedia/audio_standard/test/resource/audio_renderer/ohos_test.xml"
resource_config_file = "//foundation/multimedia/audio_framework/test/resource/audio_renderer/ohos_test.xml"
}
test/unittest/volume_change_test/BUILD.gn
+4 -4
View File
@@ -13,14 +13,14 @@
import("//build/test.gni")
module_output_path = "multimedia_audio_standard/audio_volume_change"
module_output_path = "multimedia_audio_framework/audio_volume_change"
ohos_unittest("audio_volume_change_unit_test") {
module_out_path = module_output_path
include_dirs = [
"./include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager/include",
"//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiomanager/include",
"//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
]
@@ -31,6 +31,6 @@ ohos_unittest("audio_volume_change_unit_test") {
sources = [ "src/audio_volume_change_unit_test.cpp" ]
deps = [ "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager:audio_client" ]
deps = [ "//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiomanager:audio_client" ]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
}