zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deprecate and remove usage for WARNING log level

Browse Source 
Bug: webrtc:13362
Change-Id: Ida112158e4ac5f667e533a0ebfedb400c84df4d9
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/239124
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35425}
This commit is contained in:
Harald Alvestrand
2021-11-27 21:31:08 +00:00
committed by WebRTC LUCI CQ
parent 150503566c
commit ef5b21e637
34 changed files with 91 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sdk/android/src/jni/audio_device/aaudio_player.cc
View File

@ -158,7 +158,7 @@ void AAudioPlayer::OnErrorCallback(aaudio_result_t error) {
if (aaudio_.stream_state() == AAUDIO_STREAM_STATE_DISCONNECTED) {
// The stream is disconnected and any attempt to use it will return
// AAUDIO_ERROR_DISCONNECTED.
RTC_LOG(WARNING) << "Output stream disconnected";
RTC_LOG(LS_WARNING) << "Output stream disconnected";
// AAudio documentation states: "You should not close or reopen the stream
// from the callback, use another thread instead". A message is therefore
// sent to the main thread to do the restart operation.

2
sdk/android/src/jni/audio_device/aaudio_recorder.cc
View File

@ -148,7 +148,7 @@ void AAudioRecorder::OnErrorCallback(aaudio_result_t error) {
if (aaudio_.stream_state() == AAUDIO_STREAM_STATE_DISCONNECTED) {
// The stream is disconnected and any attempt to use it will return
// AAUDIO_ERROR_DISCONNECTED..
RTC_LOG(WARNING) << "Input stream disconnected => restart is required";
RTC_LOG(LS_WARNING) << "Input stream disconnected => restart is required";
// AAudio documentation states: "You should not close or reopen the stream
// from the callback, use another thread instead". A message is therefore
// sent to the main thread to do the restart operation.

4
sdk/android/src/jni/audio_device/aaudio_wrapper.cc
View File

@ -92,8 +92,8 @@ void ErrorCallback(AAudioStream* stream,
aaudio_result_t error) {
RTC_DCHECK(user_data);
AAudioWrapper* aaudio_wrapper = reinterpret_cast<AAudioWrapper*>(user_data);
RTC_LOG(WARNING) << "ErrorCallback: "
<< DirectionToString(aaudio_wrapper->direction());
RTC_LOG(LS_WARNING) << "ErrorCallback: "
<< DirectionToString(aaudio_wrapper->direction());
RTC_DCHECK(aaudio_wrapper->observer());
aaudio_wrapper->observer()->OnErrorCallback(error);
}

4
sdk/android/src/jni/audio_device/audio_device_module.cc
View File

@ -454,7 +454,7 @@ class AndroidAudioDeviceModule : public AudioDeviceModule {
// to call this method if that same state is not modified.
bool available = is_stereo_playout_supported_;
if (enable != available) {
RTC_LOG(WARNING) << "changing stereo playout not supported";
RTC_LOG(LS_WARNING) << "changing stereo playout not supported";
return -1;
}
return 0;
@ -481,7 +481,7 @@ class AndroidAudioDeviceModule : public AudioDeviceModule {
// to call this method if that same state is not modified.
bool available = is_stereo_record_supported_;
if (enable != available) {
RTC_LOG(WARNING) << "changing stereo recording not supported";
RTC_LOG(LS_WARNING) << "changing stereo recording not supported";
return -1;
}
return 0;

3
sdk/android/src/jni/audio_device/opensles_common.cc
View File

@ -113,7 +113,8 @@ SLObjectItf OpenSLEngineManager::GetOpenSLEngine() {
// If one already has been created, return existing object instead of
// creating a new.
if (engine_object_.Get() != nullptr) {
RTC_LOG(WARNING) << "The OpenSL ES engine object has already been created";
RTC_LOG(LS_WARNING)
<< "The OpenSL ES engine object has already been created";
return engine_object_.Get();
}
// Create the engine object in thread safe mode.