Skip to content

More logging for WebRTC-AEC3 #4407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 25, 2025
Merged

More logging for WebRTC-AEC3 #4407

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 56 additions & 1 deletion pjmedia/src/pjmedia/echo_webrtc_aec3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,18 @@
#include "modules/audio_processing/ns/noise_suppressor.h"
#include "modules/audio_processing/gain_controller2.h"
#include "modules/audio_processing/audio_buffer.h"
#include "rtc_base/logging.h"

using namespace webrtc;

#include "echo_internal.h"

#define THIS_FILE "echo_webrtc_aec3.cpp"

#define TRACE_WEBRTC 0

class PjLogSink;

typedef struct webrtc_ec
{
unsigned options;
Expand All @@ -58,9 +63,44 @@ typedef struct webrtc_ec
GainController2 *agc;
AudioBuffer *cap_buf;
AudioBuffer *rend_buf;

PjLogSink *log_sink;
} webrtc_ec;


class PjLogSink : public rtc::LogSink
{
public:
void OnLogMessage(const std::string& message,
rtc::LoggingSeverity severity) override
{
/* Trim new line */
std::string s = message;
s.erase(s.find_last_not_of("\n\r")+1);

switch (severity) {
case rtc::LoggingSeverity::LS_ERROR:
PJ_LOG(3, ("webrtc-aec3", "%s", s.c_str()));
break;
case rtc::LoggingSeverity::LS_WARNING:
PJ_LOG(4,("webrtc-aec3", "%s", s.c_str()));
break;
default:
PJ_LOG(5,("webrtc-aec3", "%s", s.c_str()));
break;
}
}

void OnLogMessage(const std::string& message) override
{
/* Trim new line */
std::string s = message;
s.erase(s.find_last_not_of("\n\r")+1);

PJ_LOG(5,("webrtc-aec3", "%s", s.c_str()));
}
};

/*
* Create the AEC.
*/
Expand Down Expand Up @@ -95,6 +135,12 @@ PJ_DEF(pj_status_t) webrtc_aec3_create(pj_pool_t *pool,
echo->clock_rate = clock_rate;
echo->frame_length = clock_rate/100;
echo->num_bands = clock_rate/16000;

#if TRACE_WEBRTC
echo->log_sink = new PjLogSink();
rtc::LogMessage::AddLogToStream(echo->log_sink,
rtc::LoggingSeverity::LS_INFO);
#endif

echo->aec = new EchoCanceller3(EchoCanceller3Config(), clock_rate,
channel_count, channel_count);
Expand All @@ -109,6 +155,7 @@ PJ_DEF(pj_status_t) webrtc_aec3_create(pj_pool_t *pool,
/* Valid values are 6, 12, 18, 21 dB */
cfg.target_level = NsConfig::SuppressionLevel::k12dB;
echo->ns = new NoiseSuppressor(cfg, clock_rate, channel_count);
PJ_LOG(5, (THIS_FILE, "WebRTC AEC3 has noise suppressor enabled"));
}

if (options & PJMEDIA_ECHO_USE_GAIN_CONTROLLER) {
Expand All @@ -117,8 +164,10 @@ PJ_DEF(pj_status_t) webrtc_aec3_create(pj_pool_t *pool,

AudioProcessing::Config::GainController2 cfg;
cfg.adaptive_digital.enabled = true;
if (GainController2::Validate(cfg))
if (GainController2::Validate(cfg)) {
echo->agc->ApplyConfig(cfg);
PJ_LOG(5, (THIS_FILE, "WebRTC AEC3 has AGC enabled"));
}
}

/* Done */
Expand Down Expand Up @@ -157,6 +206,12 @@ PJ_DEF(pj_status_t) webrtc_aec3_destroy(void *state )
echo->rend_buf = NULL;
}

if (echo->log_sink) {
rtc::LogMessage::RemoveLogToStream(echo->log_sink);
delete echo->log_sink;
echo->log_sink = NULL;
}

#if WEBRTC_LINUX == 1 && defined(WEBRTC_ARCH_ARM_V7)
delete echo;
#endif
Expand Down
Loading