From 4c283de7eec7c7fb2b5b7a9d907caab4c5d1836f Mon Sep 17 00:00:00 2001 From: liuyuehua1 Date: Wed, 10 Aug 2022 11:25:52 +0800 Subject: [PATCH 1/5] IWYU code rectification. Signed-off-by: liuyuehua1 Change-Id: I1faa899119b13f4dedbdbae177e4d17406ab0178 --- .../include/audio_capturer_file_source.h | 5 +-- .../include/capturer_source_adapter.h | 5 +-- .../include/i_audio_capturer_source.h | 6 +-- .../src/audio_capturer_file_source.cpp | 13 ++++--- .../src/capturer_source_adapter.c | 7 +--- .../src/i_audio_capturer_source.cpp | 12 +++--- .../include/audio_renderer_file_sink.h | 6 +-- .../include/audio_renderer_sink_intf.h | 2 + .../include/bluetooth_renderer_sink.h | 8 ++-- .../include/bluetooth_renderer_sink_intf.h | 2 + .../include/remote_audio_renderer_sink_intf.h | 2 + .../include/renderer_sink_adapter.h | 8 +--- .../src/audio_renderer_file_sink.cpp | 13 +++---- .../src/bluetooth_renderer_sink.cpp | 11 ++++-- .../audiorenderer/src/renderer_sink_adapter.c | 11 +++--- .../pulseaudio/src/modules/hdi/hdi_sink.c | 38 +++++++++++-------- .../pulseaudio/src/modules/hdi/hdi_source.c | 27 +++++++------ .../src/modules/hdi/module_hdi_sink.c | 8 ++-- .../src/modules/hdi/module_hdi_source.c | 8 ++-- .../pulseaudio/src/pulsecore/ltdl_stub.c | 3 +- .../bluetooth_a2dp_audio_src_observer_stub.h | 10 ++++- .../client/bluetooth_a2dp_src_observer.h | 5 ++- ...udio_capturer_state_change_listener_stub.h | 8 ++++ .../audio_client_tracker_callback_stub.h | 7 ++++ .../audio_ringermode_update_listener_stub.h | 7 ++++ .../audio_volume_key_event_callback_stub.h | 7 ++++ ...bluetooth_a2dp_audio_src_observer_stub.cpp | 8 ++++ ...io_capturer_state_change_listener_stub.cpp | 7 +++- .../audio_client_tracker_callback_stub.cpp | 2 + .../client/audio_device_descriptor.cpp | 7 ++++ .../audio_ringermode_update_listener_stub.cpp | 6 +-- .../audio_volume_key_event_callback_stub.cpp | 2 + .../test/audio_render_mode_callback_test.cpp | 13 +++++-- 33 files changed, 182 insertions(+), 102 deletions(-) diff --git a/frameworks/native/audiocapturer/include/audio_capturer_file_source.h b/frameworks/native/audiocapturer/include/audio_capturer_file_source.h index 52461ac845..f8217f6ecc 100644 --- a/frameworks/native/audiocapturer/include/audio_capturer_file_source.h +++ b/frameworks/native/audiocapturer/include/audio_capturer_file_source.h @@ -16,12 +16,11 @@ #ifndef AUDIO_CAPTURER_FILE_SOURCE_H #define AUDIO_CAPTURER_FILE_SOURCE_H +#include +#include #include "audio_info.h" #include "i_audio_capturer_source.h" -#include -#include - namespace OHOS { namespace AudioStandard { class AudioCapturerFileSource : public IAudioCapturerSource { diff --git a/frameworks/native/audiocapturer/include/capturer_source_adapter.h b/frameworks/native/audiocapturer/include/capturer_source_adapter.h index 76916b31de..9294a4c766 100644 --- a/frameworks/native/audiocapturer/include/capturer_source_adapter.h +++ b/frameworks/native/audiocapturer/include/capturer_source_adapter.h @@ -16,9 +16,8 @@ #ifndef CAPTURER_SOURCE_ADAPTER_H #define CAPTURER_SOURCE_ADAPTER_H -#include - -#include "i_audio_capturer_source_intf.h" +#include +#include "audio_types.h" #ifdef __cplusplus extern "C" { diff --git a/frameworks/native/audiocapturer/include/i_audio_capturer_source.h b/frameworks/native/audiocapturer/include/i_audio_capturer_source.h index c851eeaebc..51e7418359 100644 --- a/frameworks/native/audiocapturer/include/i_audio_capturer_source.h +++ b/frameworks/native/audiocapturer/include/i_audio_capturer_source.h @@ -16,11 +16,9 @@ #ifndef I_AUDIO_CAPTURER_SOURCE_H #define I_AUDIO_CAPTURER_SOURCE_H +#include #include "audio_info.h" -#include "audio_manager.h" - -#include -#include +#include "audio_types.h" namespace OHOS { namespace AudioStandard { diff --git a/frameworks/native/audiocapturer/src/audio_capturer_file_source.cpp b/frameworks/native/audiocapturer/src/audio_capturer_file_source.cpp index e329dba0fc..97014759a7 100644 --- a/frameworks/native/audiocapturer/src/audio_capturer_file_source.cpp +++ b/frameworks/native/audiocapturer/src/audio_capturer_file_source.cpp @@ -14,15 +14,16 @@ */ #include "audio_capturer_file_source.h" - -#include -#include -#include #include -#include - +#include "__config" #include "audio_errors.h" #include "audio_log.h" +#include "errno.h" +#include "iosfwd" +#include "limits.h" +#include "stdio.h" +#include "stdlib.h" +#include "string.h" using namespace std; diff --git a/frameworks/native/audiocapturer/src/capturer_source_adapter.c b/frameworks/native/audiocapturer/src/capturer_source_adapter.c index 56007e00cb..d5fd4cbfff 100644 --- a/frameworks/native/audiocapturer/src/capturer_source_adapter.c +++ b/frameworks/native/audiocapturer/src/capturer_source_adapter.c @@ -14,13 +14,10 @@ */ #include -#include - -#include "audio_types.h" - #include "capturer_source_adapter.h" - +#include #include "audio_log.h" +#include "i_audio_capturer_source_intf.h" #ifdef __cplusplus extern "C" { diff --git a/frameworks/native/audiocapturer/src/i_audio_capturer_source.cpp b/frameworks/native/audiocapturer/src/i_audio_capturer_source.cpp index fd3293262e..4fd8f3cc41 100644 --- a/frameworks/native/audiocapturer/src/i_audio_capturer_source.cpp +++ b/frameworks/native/audiocapturer/src/i_audio_capturer_source.cpp @@ -14,15 +14,17 @@ */ #include -#include +#include "i_audio_capturer_source.h" #include - +#include "__config" +#include "audio_capturer_file_source.h" +#include "audio_capturer_source.h" #include "audio_errors.h" #include "audio_log.h" -#include "audio_capturer_source.h" -#include "audio_capturer_file_source.h" +#include "iosfwd" #include "remote_audio_capturer_source.h" -#include "i_audio_capturer_source.h" +#include "string.h" + using namespace std; namespace OHOS { diff --git a/frameworks/native/audiorenderer/include/audio_renderer_file_sink.h b/frameworks/native/audiorenderer/include/audio_renderer_file_sink.h index 4b25ca22eb..56aa296a46 100644 --- a/frameworks/native/audiorenderer/include/audio_renderer_file_sink.h +++ b/frameworks/native/audiorenderer/include/audio_renderer_file_sink.h @@ -16,12 +16,10 @@ #ifndef AUDIO_RENDERER_FILE_SINK_H #define AUDIO_RENDERER_FILE_SINK_H -#include "audio_info.h" - +#include #include -#include -#include #include +#include "iosfwd" namespace OHOS { namespace AudioStandard { diff --git a/frameworks/native/audiorenderer/include/audio_renderer_sink_intf.h b/frameworks/native/audiorenderer/include/audio_renderer_sink_intf.h index 53534e3931..ad67e66f98 100644 --- a/frameworks/native/audiorenderer/include/audio_renderer_sink_intf.h +++ b/frameworks/native/audiorenderer/include/audio_renderer_sink_intf.h @@ -16,6 +16,8 @@ #ifndef AUDIO_RENDERER_SINK_INTF_H #define AUDIO_RENDERER_SINK_INTF_H +#include "audio_types.h" + #ifdef __cplusplus extern "C" { #endif diff --git a/frameworks/native/audiorenderer/include/bluetooth_renderer_sink.h b/frameworks/native/audiorenderer/include/bluetooth_renderer_sink.h index 00ecf0323c..cf1a7dde6a 100644 --- a/frameworks/native/audiorenderer/include/bluetooth_renderer_sink.h +++ b/frameworks/native/audiorenderer/include/bluetooth_renderer_sink.h @@ -16,11 +16,11 @@ #ifndef BLUETOOTH_RENDERER_SINK_H #define BLUETOOTH_RENDERER_SINK_H -#include "audio_info.h" +#include +#include "audio_adapter.h" #include "audio_proxy_manager.h" - -#include -#include +#include "audio_render.h" +#include "audio_types.h" namespace OHOS { namespace AudioStandard { diff --git a/frameworks/native/audiorenderer/include/bluetooth_renderer_sink_intf.h b/frameworks/native/audiorenderer/include/bluetooth_renderer_sink_intf.h index 0a9a7bf9e1..31678c657e 100644 --- a/frameworks/native/audiorenderer/include/bluetooth_renderer_sink_intf.h +++ b/frameworks/native/audiorenderer/include/bluetooth_renderer_sink_intf.h @@ -16,6 +16,8 @@ #ifndef BLUETOOTH_RENDERER_SINK_INTF_H #define BLUETOOTH_RENDERER_SINK_INTF_H +#include "audio_types.h" + #ifdef __cplusplus extern "C" { #endif diff --git a/frameworks/native/audiorenderer/include/remote_audio_renderer_sink_intf.h b/frameworks/native/audiorenderer/include/remote_audio_renderer_sink_intf.h index befaaadd4c..94da9787c8 100644 --- a/frameworks/native/audiorenderer/include/remote_audio_renderer_sink_intf.h +++ b/frameworks/native/audiorenderer/include/remote_audio_renderer_sink_intf.h @@ -16,6 +16,8 @@ #ifndef REMOTE_AUDIO_RENDERER_SINK_INTF_H #define REMOTE_AUDIO_RENDERER_SINK_INTF_H +#include "audio_types.h" + #ifdef __cplusplus extern "C" { #endif diff --git a/frameworks/native/audiorenderer/include/renderer_sink_adapter.h b/frameworks/native/audiorenderer/include/renderer_sink_adapter.h index 36b8b66e0f..57d731673a 100644 --- a/frameworks/native/audiorenderer/include/renderer_sink_adapter.h +++ b/frameworks/native/audiorenderer/include/renderer_sink_adapter.h @@ -16,12 +16,8 @@ #ifndef RENDERER_SINK_ADAPTER_H #define RENDERER_SINK_ADAPTER_H -#include - -#include -#include -#include -#include +#include +#include "audio_types.h" #ifdef __cplusplus extern "C" { diff --git a/frameworks/native/audiorenderer/src/audio_renderer_file_sink.cpp b/frameworks/native/audiorenderer/src/audio_renderer_file_sink.cpp index 6c9e0d560e..ef161e760c 100644 --- a/frameworks/native/audiorenderer/src/audio_renderer_file_sink.cpp +++ b/frameworks/native/audiorenderer/src/audio_renderer_file_sink.cpp @@ -14,16 +14,15 @@ */ #include "audio_renderer_file_sink.h" - -#include -#include -#include -#include #include -#include - +#include "__config" #include "audio_errors.h" +#include "audio_info.h" #include "audio_log.h" +#include "errno.h" +#include "limits.h" +#include "stdio.h" +#include "stdlib.h" using namespace std; diff --git a/frameworks/native/audiorenderer/src/bluetooth_renderer_sink.cpp b/frameworks/native/audiorenderer/src/bluetooth_renderer_sink.cpp index 10327e95e0..4bb39779ec 100644 --- a/frameworks/native/audiorenderer/src/bluetooth_renderer_sink.cpp +++ b/frameworks/native/audiorenderer/src/bluetooth_renderer_sink.cpp @@ -14,14 +14,17 @@ */ #include "bluetooth_renderer_sink.h" - -#include #include -#include #include - +#include +#include "__config" +#include "audio_control.h" #include "audio_errors.h" +#include "audio_info.h" #include "audio_log.h" +#include "audio_volume.h" +#include "iosfwd" +#include "string.h" using namespace std; using namespace OHOS::HDI::Audio_Bluetooth; diff --git a/frameworks/native/audiorenderer/src/renderer_sink_adapter.c b/frameworks/native/audiorenderer/src/renderer_sink_adapter.c index a4ac675a3c..29e2695b3e 100644 --- a/frameworks/native/audiorenderer/src/renderer_sink_adapter.c +++ b/frameworks/native/audiorenderer/src/renderer_sink_adapter.c @@ -14,13 +14,14 @@ */ #include -#include - -#include "audio_types.h" - #include "renderer_sink_adapter.h" - +#include #include "audio_log.h" +#include "audio_renderer_file_sink_intf.h" +#include "audio_renderer_sink_intf.h" +#include "bluetooth_renderer_sink_intf.h" +#include "remote_audio_renderer_sink_intf.h" +#include "string.h" #ifdef __cplusplus extern "C" { diff --git a/frameworks/native/pulseaudio/src/modules/hdi/hdi_sink.c b/frameworks/native/pulseaudio/src/modules/hdi/hdi_sink.c index df794c96e1..8e5eae6fb3 100644 --- a/frameworks/native/pulseaudio/src/modules/hdi/hdi_sink.c +++ b/frameworks/native/pulseaudio/src/modules/hdi/hdi_sink.c @@ -13,30 +13,38 @@ * limitations under the License. */ -#ifdef HAVE_CONFIG_H #include -#endif - -#include -#include -#include - -#include -#include - #include #include -#include #include - -#include #include -#include +#include +#include #include +#include #include #include - +#include +#include +#include +#include #include "audio_log.h" +#include "audio_types.h" +#include "inttypes.h" +#include "pulse/channelmap.h" +#include "pulse/def.h" +#include "pulse/gccmacro.h" +#include "pulse/proplist.h" +#include "pulse/sample.h" +#include "pulsecore/asyncmsgq.h" +#include "pulsecore/atomic.h" +#include "pulsecore/core.h" +#include "pulsecore/memblock.h" +#include "pulsecore/memchunk.h" +#include "pulsecore/msgobject.h" +#include "pulsecore/typedefs.h" +#include "stdbool.h" +#include "string.h" #define DEFAULT_SINK_NAME "hdi_output" #define DEFAULT_AUDIO_DEVICE_NAME "Speaker" diff --git a/frameworks/native/pulseaudio/src/modules/hdi/hdi_source.c b/frameworks/native/pulseaudio/src/modules/hdi/hdi_source.c index d2cf509b62..de1f77b2e2 100644 --- a/frameworks/native/pulseaudio/src/modules/hdi/hdi_source.c +++ b/frameworks/native/pulseaudio/src/modules/hdi/hdi_source.c @@ -14,32 +14,37 @@ */ #include - #ifdef HAVE_CONFIG_H #include #endif - #include #include #include #include - #include -#include -#include #include -#include #include #include #include #include -#include #include - -#include - -#include "capturer_source_adapter.h" +#include +#include +#include #include "audio_log.h" +#include "audio_types.h" +#include "capturer_source_adapter.h" +#include "inttypes.h" +#include "pulse/channelmap.h" +#include "pulse/def.h" +#include "pulse/proplist.h" +#include "pulse/sample.h" +#include "pulsecore/asyncmsgq.h" +#include "pulsecore/memblock.h" +#include "pulsecore/msgobject.h" +#include "pulsecore/source.h" +#include "pulsecore/typedefs.h" +#include "stdbool.h" #define DEFAULT_SOURCE_NAME "hdi_input" #define DEFAULT_DEVICE_CLASS "primary" diff --git a/frameworks/native/pulseaudio/src/modules/hdi/module_hdi_sink.c b/frameworks/native/pulseaudio/src/modules/hdi/module_hdi_sink.c index bd056227ae..5fe82027cf 100644 --- a/frameworks/native/pulseaudio/src/modules/hdi/module_hdi_sink.c +++ b/frameworks/native/pulseaudio/src/modules/hdi/module_hdi_sink.c @@ -13,13 +13,15 @@ * limitations under the License. */ -#ifdef HAVE_CONFIG_H #include -#endif - +#include #include #include #include +#include +#include "pulsecore/log.h" +#include "pulsecore/typedefs.h" +#include "stdbool.h" pa_sink *PaHdiSinkNew(pa_module *m, pa_modargs *ma, const char *driver); void PaHdiSinkFree(pa_sink *s); diff --git a/frameworks/native/pulseaudio/src/modules/hdi/module_hdi_source.c b/frameworks/native/pulseaudio/src/modules/hdi/module_hdi_source.c index 0119812399..24110a2c5c 100644 --- a/frameworks/native/pulseaudio/src/modules/hdi/module_hdi_source.c +++ b/frameworks/native/pulseaudio/src/modules/hdi/module_hdi_source.c @@ -13,14 +13,14 @@ * limitations under the License. */ -#ifdef HAVE_CONFIG_H #include -#endif - #include -#include #include #include +#include +#include "pulsecore/source.h" +#include "pulsecore/typedefs.h" +#include "stdbool.h" pa_source *pa_hdi_source_new(pa_module *m, pa_modargs *ma, const char *driver); diff --git a/frameworks/native/pulseaudio/src/pulsecore/ltdl_stub.c b/frameworks/native/pulseaudio/src/pulsecore/ltdl_stub.c index 0f798e7762..3a8a3b255e 100644 --- a/frameworks/native/pulseaudio/src/pulsecore/ltdl_stub.c +++ b/frameworks/native/pulseaudio/src/pulsecore/ltdl_stub.c @@ -15,9 +15,8 @@ #include "config.h" #include -#include - #include "ltdl.h" +#include "pulsecore/macro.h" #ifdef __aarch64__ #define SYSTEM_LIB_PATH "/system/lib64/" diff --git a/services/include/audio_bluetooth/client/bluetooth_a2dp_audio_src_observer_stub.h b/services/include/audio_bluetooth/client/bluetooth_a2dp_audio_src_observer_stub.h index ac8f141f46..c4a5eb3621 100644 --- a/services/include/audio_bluetooth/client/bluetooth_a2dp_audio_src_observer_stub.h +++ b/services/include/audio_bluetooth/client/bluetooth_a2dp_audio_src_observer_stub.h @@ -16,10 +16,16 @@ #ifndef OHOS_BLUETOOTH_A2DP_AUDIO_SRC_OBSERVER_STUB_H #define OHOS_BLUETOOTH_A2DP_AUDIO_SRC_OBSERVER_STUB_H +#include #include - -#include "iremote_stub.h" +#include "__functional_base" +#include "errors.h" #include "i_bluetooth_a2dp_src_observer.h" +#include "iremote_stub.h" +#include "message_option.h" +#include "message_parcel.h" +#include "nocopyable.h" +#include "refbase.h" namespace OHOS { namespace Bluetooth { diff --git a/services/include/audio_bluetooth/client/bluetooth_a2dp_src_observer.h b/services/include/audio_bluetooth/client/bluetooth_a2dp_src_observer.h index 6a38a9ac31..28aae5b9a5 100644 --- a/services/include/audio_bluetooth/client/bluetooth_a2dp_src_observer.h +++ b/services/include/audio_bluetooth/client/bluetooth_a2dp_src_observer.h @@ -16,8 +16,11 @@ #ifndef BLUETOOTH_A2DP_SRC_OBSERVER_H #define BLUETOOTH_A2DP_SRC_OBSERVER_H -#include "bluetooth_a2dp_audio_src_observer_stub.h" #include "audio_bluetooth_manager.h" +#include "bluetooth_a2dp_a2dpCodecInfo.h" +#include "bluetooth_a2dp_audio_src_observer_stub.h" +#include "bluetooth_types.h" +#include "raw_address.h" class BluetoothA2dpSrcObserver : public OHOS::Bluetooth::BluetoothA2dpAudioSrcObserverStub { public: diff --git a/services/include/audio_policy/client/audio_capturer_state_change_listener_stub.h b/services/include/audio_policy/client/audio_capturer_state_change_listener_stub.h index 9366be16fb..84b46eb3ed 100644 --- a/services/include/audio_policy/client/audio_capturer_state_change_listener_stub.h +++ b/services/include/audio_policy/client/audio_capturer_state_change_listener_stub.h @@ -16,8 +16,16 @@ #ifndef AUDIO_CAPTURER_STATE_CHANGE_LISTENER_STUB_H #define AUDIO_CAPTURER_STATE_CHANGE_LISTENER_STUB_H +#include +#include "audio_info.h" #include "audio_stream_manager.h" #include "i_standard_capturer_state_change_listener.h" +#include "iremote_stub.h" +#include "memory" +#include "message_option.h" +#include "message_parcel.h" +#include "refbase.h" +#include "vector" namespace OHOS { namespace AudioStandard { diff --git a/services/include/audio_policy/client/audio_client_tracker_callback_stub.h b/services/include/audio_policy/client/audio_client_tracker_callback_stub.h index b9fef89615..c816f4866e 100644 --- a/services/include/audio_policy/client/audio_client_tracker_callback_stub.h +++ b/services/include/audio_policy/client/audio_client_tracker_callback_stub.h @@ -16,8 +16,15 @@ #ifndef ST_AUDIO_CLIENT_TRACKER_CALLBACK_STUB_H #define ST_AUDIO_CLIENT_TRACKER_CALLBACK_STUB_H +#include +#include "audio_info.h" #include "audio_stream_manager.h" #include "i_standard_client_tracker.h" +#include "iremote_stub.h" +#include "memory" +#include "message_option.h" +#include "message_parcel.h" +#include "refbase.h" namespace OHOS { namespace AudioStandard { diff --git a/services/include/audio_policy/client/audio_ringermode_update_listener_stub.h b/services/include/audio_policy/client/audio_ringermode_update_listener_stub.h index 7f9d6b2f1f..213af23a5c 100644 --- a/services/include/audio_policy/client/audio_ringermode_update_listener_stub.h +++ b/services/include/audio_policy/client/audio_ringermode_update_listener_stub.h @@ -16,8 +16,15 @@ #ifndef AUDIO_RINGERMODE_UPDATE_LISTENER_STUB_H #define AUDIO_RINGERMODE_UPDATE_LISTENER_STUB_H +#include +#include "audio_info.h" #include "audio_system_manager.h" #include "i_standard_ringermode_update_listener.h" +#include "iremote_stub.h" +#include "memory" +#include "message_option.h" +#include "message_parcel.h" +#include "refbase.h" namespace OHOS { namespace AudioStandard { diff --git a/services/include/audio_policy/client/audio_volume_key_event_callback_stub.h b/services/include/audio_policy/client/audio_volume_key_event_callback_stub.h index 4704391f28..ad27184bb0 100644 --- a/services/include/audio_policy/client/audio_volume_key_event_callback_stub.h +++ b/services/include/audio_policy/client/audio_volume_key_event_callback_stub.h @@ -16,8 +16,15 @@ #ifndef ST_AUDIO_VOLUME_KEY_EVENT_CALLBACK_STUB_H #define ST_AUDIO_VOLUME_KEY_EVENT_CALLBACK_STUB_H +#include +#include "audio_info.h" #include "audio_system_manager.h" #include "i_audio_volume_key_event_callback.h" +#include "iremote_stub.h" +#include "memory" +#include "message_option.h" +#include "message_parcel.h" +#include "refbase.h" namespace OHOS { namespace AudioStandard { diff --git a/services/src/audio_bluetooth/client/bluetooth_a2dp_audio_src_observer_stub.cpp b/services/src/audio_bluetooth/client/bluetooth_a2dp_audio_src_observer_stub.cpp index 9e9820cf4f..4ec03cc72d 100644 --- a/services/src/audio_bluetooth/client/bluetooth_a2dp_audio_src_observer_stub.cpp +++ b/services/src/audio_bluetooth/client/bluetooth_a2dp_audio_src_observer_stub.cpp @@ -14,8 +14,16 @@ */ #include "bluetooth_a2dp_audio_src_observer_stub.h" +#include "bluetooth_a2dp_a2dpCodecInfo.h" #include "bluetooth_log.h" +#include "cstdint" +#include "iosfwd" +#include "ipc_object_stub.h" +#include "ipc_types.h" +#include "map" #include "raw_address.h" +#include "string" +#include "utility" namespace OHOS { namespace Bluetooth { diff --git a/services/src/audio_policy/client/audio_capturer_state_change_listener_stub.cpp b/services/src/audio_policy/client/audio_capturer_state_change_listener_stub.cpp index 740d333515..16c353c1fc 100644 --- a/services/src/audio_policy/client/audio_capturer_state_change_listener_stub.cpp +++ b/services/src/audio_policy/client/audio_capturer_state_change_listener_stub.cpp @@ -14,10 +14,13 @@ */ #include "audio_capturer_state_change_listener_stub.h" - +#include "__config" #include "audio_errors.h" -#include "audio_system_manager.h" #include "audio_log.h" +#include "iosfwd" +#include "ipc_object_stub.h" +#include "string" +#include "type_traits" using namespace std; diff --git a/services/src/audio_policy/client/audio_client_tracker_callback_stub.cpp b/services/src/audio_policy/client/audio_client_tracker_callback_stub.cpp index 7f5e05c24c..42497454ee 100644 --- a/services/src/audio_policy/client/audio_client_tracker_callback_stub.cpp +++ b/services/src/audio_policy/client/audio_client_tracker_callback_stub.cpp @@ -15,6 +15,8 @@ #include "audio_client_tracker_callback_stub.h" #include "audio_log.h" +#include "ipc_object_stub.h" +#include "string" namespace OHOS { namespace AudioStandard { diff --git a/services/src/audio_policy/client/audio_device_descriptor.cpp b/services/src/audio_policy/client/audio_device_descriptor.cpp index 6f46486c30..1885e96a4b 100644 --- a/services/src/audio_policy/client/audio_device_descriptor.cpp +++ b/services/src/audio_policy/client/audio_device_descriptor.cpp @@ -14,7 +14,14 @@ */ #include "audio_log.h" +#include +#include "audio_info.h" #include "audio_system_manager.h" +#include "iosfwd" +#include "new" +#include "parcel.h" +#include "refbase.h" +#include "string" namespace OHOS { namespace AudioStandard { diff --git a/services/src/audio_policy/client/audio_ringermode_update_listener_stub.cpp b/services/src/audio_policy/client/audio_ringermode_update_listener_stub.cpp index aa2c712653..6ca765f4ab 100644 --- a/services/src/audio_policy/client/audio_ringermode_update_listener_stub.cpp +++ b/services/src/audio_policy/client/audio_ringermode_update_listener_stub.cpp @@ -14,10 +14,10 @@ */ #include "audio_ringermode_update_listener_stub.h" - -#include "audio_errors.h" -#include "audio_system_manager.h" #include "audio_log.h" +#include "audio_system_manager.h" +#include "ipc_object_stub.h" +#include "string" namespace OHOS { namespace AudioStandard { diff --git a/services/src/audio_policy/client/audio_volume_key_event_callback_stub.cpp b/services/src/audio_policy/client/audio_volume_key_event_callback_stub.cpp index f2fe595407..28523ad327 100644 --- a/services/src/audio_policy/client/audio_volume_key_event_callback_stub.cpp +++ b/services/src/audio_policy/client/audio_volume_key_event_callback_stub.cpp @@ -15,6 +15,8 @@ #include "audio_volume_key_event_callback_stub.h" #include "audio_log.h" +#include "iosfwd" +#include "string" namespace OHOS { namespace AudioStandard { diff --git a/services/test/audio_render_mode_callback_test.cpp b/services/test/audio_render_mode_callback_test.cpp index 09c989d147..a635021795 100644 --- a/services/test/audio_render_mode_callback_test.cpp +++ b/services/test/audio_render_mode_callback_test.cpp @@ -14,12 +14,19 @@ */ #include +#include +#include #include -#include - -#include "audio_renderer.h" +#include "__config" +#include "audio_info.h" #include "audio_log.h" +#include "audio_renderer.h" +#include "limits.h" +#include "memory" #include "pcm2wav.h" +#include "stdio.h" +#include "stdlib.h" +#include "string.h" using namespace std; using namespace OHOS; -- Gitee From f42d57d09f6b8b4b9bd1b198d77258bff2430c56 Mon Sep 17 00:00:00 2001 From: liuyuehua1 Date: Thu, 11 Aug 2022 11:33:50 +0800 Subject: [PATCH 2/5] code format change. Signed-off-by: liuyuehua1 --- .../audiocapturer/src/audio_capturer_file_source.cpp | 11 +++++------ .../audiocapturer/src/i_audio_capturer_source.cpp | 3 +-- .../audiorenderer/include/audio_renderer_file_sink.h | 1 - .../include/audio_renderer_file_sink_intf.h | 2 ++ .../audiorenderer/src/audio_renderer_file_sink.cpp | 10 +++++----- .../audiorenderer/src/bluetooth_renderer_sink.cpp | 5 +++-- .../native/audiorenderer/src/renderer_sink_adapter.c | 4 ++-- .../audio_policy/client/audio_device_descriptor.cpp | 4 ++-- services/test/audio_render_mode_callback_test.cpp | 11 +++++------ 9 files changed, 25 insertions(+), 26 deletions(-) diff --git a/frameworks/native/audiocapturer/src/audio_capturer_file_source.cpp b/frameworks/native/audiocapturer/src/audio_capturer_file_source.cpp index 97014759a7..c751abbccf 100644 --- a/frameworks/native/audiocapturer/src/audio_capturer_file_source.cpp +++ b/frameworks/native/audiocapturer/src/audio_capturer_file_source.cpp @@ -13,17 +13,16 @@ * limitations under the License. */ -#include "audio_capturer_file_source.h" +#include "cstdio" +#include "cstdlib" #include +#include "cerrno" +#include "climits" #include "__config" +#include "audio_capturer_file_source.h" #include "audio_errors.h" #include "audio_log.h" -#include "errno.h" #include "iosfwd" -#include "limits.h" -#include "stdio.h" -#include "stdlib.h" -#include "string.h" using namespace std; diff --git a/frameworks/native/audiocapturer/src/i_audio_capturer_source.cpp b/frameworks/native/audiocapturer/src/i_audio_capturer_source.cpp index 4fd8f3cc41..4fdccfd349 100644 --- a/frameworks/native/audiocapturer/src/i_audio_capturer_source.cpp +++ b/frameworks/native/audiocapturer/src/i_audio_capturer_source.cpp @@ -14,16 +14,15 @@ */ #include -#include "i_audio_capturer_source.h" #include #include "__config" +#include "i_audio_capturer_source.h" #include "audio_capturer_file_source.h" #include "audio_capturer_source.h" #include "audio_errors.h" #include "audio_log.h" #include "iosfwd" #include "remote_audio_capturer_source.h" -#include "string.h" using namespace std; diff --git a/frameworks/native/audiorenderer/include/audio_renderer_file_sink.h b/frameworks/native/audiorenderer/include/audio_renderer_file_sink.h index 56aa296a46..0e88b827dc 100644 --- a/frameworks/native/audiorenderer/include/audio_renderer_file_sink.h +++ b/frameworks/native/audiorenderer/include/audio_renderer_file_sink.h @@ -16,7 +16,6 @@ #ifndef AUDIO_RENDERER_FILE_SINK_H #define AUDIO_RENDERER_FILE_SINK_H -#include #include #include #include "iosfwd" diff --git a/frameworks/native/audiorenderer/include/audio_renderer_file_sink_intf.h b/frameworks/native/audiorenderer/include/audio_renderer_file_sink_intf.h index 08c5f3e54c..f488a6d587 100644 --- a/frameworks/native/audiorenderer/include/audio_renderer_file_sink_intf.h +++ b/frameworks/native/audiorenderer/include/audio_renderer_file_sink_intf.h @@ -16,6 +16,8 @@ #ifndef AUDIO_RENDERER_FILE_SINK_INTF_H #define AUDIO_RENDERER_FILE_SINK_INTF_H +#include + #ifdef __cplusplus extern "C" { #endif diff --git a/frameworks/native/audiorenderer/src/audio_renderer_file_sink.cpp b/frameworks/native/audiorenderer/src/audio_renderer_file_sink.cpp index ef161e760c..fc62a1b844 100644 --- a/frameworks/native/audiorenderer/src/audio_renderer_file_sink.cpp +++ b/frameworks/native/audiorenderer/src/audio_renderer_file_sink.cpp @@ -13,16 +13,16 @@ * limitations under the License. */ -#include "audio_renderer_file_sink.h" +#include "cerrno" +#include "climits" +#include "cstdio" +#include "cstdlib" #include #include "__config" +#include "audio_renderer_file_sink.h" #include "audio_errors.h" #include "audio_info.h" #include "audio_log.h" -#include "errno.h" -#include "limits.h" -#include "stdio.h" -#include "stdlib.h" using namespace std; diff --git a/frameworks/native/audiorenderer/src/bluetooth_renderer_sink.cpp b/frameworks/native/audiorenderer/src/bluetooth_renderer_sink.cpp index 4bb39779ec..b3835ac45e 100644 --- a/frameworks/native/audiorenderer/src/bluetooth_renderer_sink.cpp +++ b/frameworks/native/audiorenderer/src/bluetooth_renderer_sink.cpp @@ -17,14 +17,15 @@ #include #include #include +#include "cstring" +#include "iosfwd" #include "__config" #include "audio_control.h" #include "audio_errors.h" #include "audio_info.h" #include "audio_log.h" #include "audio_volume.h" -#include "iosfwd" -#include "string.h" + using namespace std; using namespace OHOS::HDI::Audio_Bluetooth; diff --git a/frameworks/native/audiorenderer/src/renderer_sink_adapter.c b/frameworks/native/audiorenderer/src/renderer_sink_adapter.c index 29e2695b3e..d278916e95 100644 --- a/frameworks/native/audiorenderer/src/renderer_sink_adapter.c +++ b/frameworks/native/audiorenderer/src/renderer_sink_adapter.c @@ -14,14 +14,14 @@ */ #include -#include "renderer_sink_adapter.h" #include +#include "string.h" #include "audio_log.h" #include "audio_renderer_file_sink_intf.h" #include "audio_renderer_sink_intf.h" #include "bluetooth_renderer_sink_intf.h" #include "remote_audio_renderer_sink_intf.h" -#include "string.h" +#include "renderer_sink_adapter.h" #ifdef __cplusplus extern "C" { diff --git a/services/src/audio_policy/client/audio_device_descriptor.cpp b/services/src/audio_policy/client/audio_device_descriptor.cpp index 1885e96a4b..95bb225bb3 100644 --- a/services/src/audio_policy/client/audio_device_descriptor.cpp +++ b/services/src/audio_policy/client/audio_device_descriptor.cpp @@ -13,15 +13,15 @@ * limitations under the License. */ +#include +#include "string" #include "audio_log.h" -#include #include "audio_info.h" #include "audio_system_manager.h" #include "iosfwd" #include "new" #include "parcel.h" #include "refbase.h" -#include "string" namespace OHOS { namespace AudioStandard { diff --git a/services/test/audio_render_mode_callback_test.cpp b/services/test/audio_render_mode_callback_test.cpp index a635021795..e1afbc60e6 100644 --- a/services/test/audio_render_mode_callback_test.cpp +++ b/services/test/audio_render_mode_callback_test.cpp @@ -14,19 +14,18 @@ */ #include -#include -#include +#include "climits" +#include +#include +#include "cstdlib" +#include "cstring" #include #include "__config" #include "audio_info.h" #include "audio_log.h" #include "audio_renderer.h" -#include "limits.h" #include "memory" #include "pcm2wav.h" -#include "stdio.h" -#include "stdlib.h" -#include "string.h" using namespace std; using namespace OHOS; -- Gitee From 9dc90fe3349e7132e886c7ae919691ca6fc06910 Mon Sep 17 00:00:00 2001 From: liuyuehua1 Date: Thu, 11 Aug 2022 14:48:17 +0800 Subject: [PATCH 3/5] Adjust header file inclusion order. Signed-off-by: liuyuehua1 --- .../native/audiocapturer/src/audio_capturer_file_source.cpp | 4 ++-- frameworks/native/audiocapturer/src/capturer_source_adapter.c | 2 +- .../native/audiocapturer/src/i_audio_capturer_source.cpp | 2 +- .../native/audiorenderer/src/audio_renderer_file_sink.cpp | 4 ++-- services/src/audio_policy/client/audio_device_descriptor.cpp | 1 - services/test/audio_render_mode_callback_test.cpp | 4 ++-- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/frameworks/native/audiocapturer/src/audio_capturer_file_source.cpp b/frameworks/native/audiocapturer/src/audio_capturer_file_source.cpp index c751abbccf..44851502ab 100644 --- a/frameworks/native/audiocapturer/src/audio_capturer_file_source.cpp +++ b/frameworks/native/audiocapturer/src/audio_capturer_file_source.cpp @@ -13,16 +13,16 @@ * limitations under the License. */ +#include #include "cstdio" #include "cstdlib" -#include #include "cerrno" #include "climits" #include "__config" -#include "audio_capturer_file_source.h" #include "audio_errors.h" #include "audio_log.h" #include "iosfwd" +#include "audio_capturer_file_source.h" using namespace std; diff --git a/frameworks/native/audiocapturer/src/capturer_source_adapter.c b/frameworks/native/audiocapturer/src/capturer_source_adapter.c index d5fd4cbfff..59b4a26095 100644 --- a/frameworks/native/audiocapturer/src/capturer_source_adapter.c +++ b/frameworks/native/audiocapturer/src/capturer_source_adapter.c @@ -14,10 +14,10 @@ */ #include -#include "capturer_source_adapter.h" #include #include "audio_log.h" #include "i_audio_capturer_source_intf.h" +#include "capturer_source_adapter.h" #ifdef __cplusplus extern "C" { diff --git a/frameworks/native/audiocapturer/src/i_audio_capturer_source.cpp b/frameworks/native/audiocapturer/src/i_audio_capturer_source.cpp index 4fdccfd349..77a3e011b9 100644 --- a/frameworks/native/audiocapturer/src/i_audio_capturer_source.cpp +++ b/frameworks/native/audiocapturer/src/i_audio_capturer_source.cpp @@ -16,13 +16,13 @@ #include #include #include "__config" -#include "i_audio_capturer_source.h" #include "audio_capturer_file_source.h" #include "audio_capturer_source.h" #include "audio_errors.h" #include "audio_log.h" #include "iosfwd" #include "remote_audio_capturer_source.h" +#include "i_audio_capturer_source.h" using namespace std; diff --git a/frameworks/native/audiorenderer/src/audio_renderer_file_sink.cpp b/frameworks/native/audiorenderer/src/audio_renderer_file_sink.cpp index fc62a1b844..bb03334d24 100644 --- a/frameworks/native/audiorenderer/src/audio_renderer_file_sink.cpp +++ b/frameworks/native/audiorenderer/src/audio_renderer_file_sink.cpp @@ -13,16 +13,16 @@ * limitations under the License. */ +#include #include "cerrno" #include "climits" #include "cstdio" #include "cstdlib" -#include #include "__config" -#include "audio_renderer_file_sink.h" #include "audio_errors.h" #include "audio_info.h" #include "audio_log.h" +#include "audio_renderer_file_sink.h" using namespace std; diff --git a/services/src/audio_policy/client/audio_device_descriptor.cpp b/services/src/audio_policy/client/audio_device_descriptor.cpp index 95bb225bb3..2eb9ca9445 100644 --- a/services/src/audio_policy/client/audio_device_descriptor.cpp +++ b/services/src/audio_policy/client/audio_device_descriptor.cpp @@ -13,7 +13,6 @@ * limitations under the License. */ -#include #include "string" #include "audio_log.h" #include "audio_info.h" diff --git a/services/test/audio_render_mode_callback_test.cpp b/services/test/audio_render_mode_callback_test.cpp index e1afbc60e6..ce4e599225 100644 --- a/services/test/audio_render_mode_callback_test.cpp +++ b/services/test/audio_render_mode_callback_test.cpp @@ -14,12 +14,12 @@ */ #include -#include "climits" #include #include +#include +#include "climits" #include "cstdlib" #include "cstring" -#include #include "__config" #include "audio_info.h" #include "audio_log.h" -- Gitee From 3a416734ec43a35b7d7b54815d56653b2b65363b Mon Sep 17 00:00:00 2001 From: liuyuehua1 Date: Thu, 11 Aug 2022 17:15:59 +0800 Subject: [PATCH 4/5] Resolve compilation errors. Signed-off-by: liuyuehua1 --- .../native/audiocapturer/include/i_audio_capturer_source_intf.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frameworks/native/audiocapturer/include/i_audio_capturer_source_intf.h b/frameworks/native/audiocapturer/include/i_audio_capturer_source_intf.h index 969123efd9..c9c2cb4c2e 100644 --- a/frameworks/native/audiocapturer/include/i_audio_capturer_source_intf.h +++ b/frameworks/native/audiocapturer/include/i_audio_capturer_source_intf.h @@ -16,6 +16,8 @@ #ifndef I_AUDIO_CAPTURER_SINK_INTF_H #define I_AUDIO_CAPTURER_SINK_INTF_H +#include + #ifdef __cplusplus extern "C" { #endif -- Gitee From 0f539397d325a23534df558c04b200af3ae392fb Mon Sep 17 00:00:00 2001 From: liuyuehua1 Date: Thu, 11 Aug 2022 17:28:49 +0800 Subject: [PATCH 5/5] Resolve compilation errors. Signed-off-by: liuyuehua1 --- .../native/audiocapturer/include/i_audio_capturer_source_intf.h | 1 + 1 file changed, 1 insertion(+) diff --git a/frameworks/native/audiocapturer/include/i_audio_capturer_source_intf.h b/frameworks/native/audiocapturer/include/i_audio_capturer_source_intf.h index c9c2cb4c2e..220cead113 100644 --- a/frameworks/native/audiocapturer/include/i_audio_capturer_source_intf.h +++ b/frameworks/native/audiocapturer/include/i_audio_capturer_source_intf.h @@ -17,6 +17,7 @@ #define I_AUDIO_CAPTURER_SINK_INTF_H #include +#include "audio_types.h" #ifdef __cplusplus extern "C" { -- Gitee