From 9efd080fa28604cd378afd20a689c2a05df8bcf2 Mon Sep 17 00:00:00 2001 From: Jakob Ivarsson Date: Tue, 24 Oct 2023 13:31:55 +0200 Subject: [PATCH] Implement GetStats in Android ADM. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Calls the AudioOutput implementation of GetStats, which is currently not implemented. Bug: webrtc:14653 Change-Id: Ieaf0e0c030a95d23c8950ff9038a64426142a789 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/324800 Commit-Queue: Jakob Ivarsson‎ Reviewed-by: Henrik Andreassson Cr-Commit-Position: refs/heads/main@{#41003} --- sdk/android/src/jni/audio_device/audio_device_module.cc | 6 ++++++ sdk/android/src/jni/audio_device/audio_device_module.h | 3 +++ 2 files changed, 9 insertions(+) diff --git a/sdk/android/src/jni/audio_device/audio_device_module.cc b/sdk/android/src/jni/audio_device/audio_device_module.cc index 3742d89dde..3c910b850c 100644 --- a/sdk/android/src/jni/audio_device/audio_device_module.cc +++ b/sdk/android/src/jni/audio_device/audio_device_module.cc @@ -575,6 +575,12 @@ class AndroidAudioDeviceModule : public AudioDeviceModule { return output_->GetPlayoutUnderrunCount(); } + absl::optional GetStats() const override { + if (!initialized_) + return absl::nullopt; + return output_->GetStats(); + } + int32_t AttachAudioBuffer() { RTC_DLOG(LS_INFO) << __FUNCTION__; output_->AttachAudioBuffer(audio_device_buffer_.get()); diff --git a/sdk/android/src/jni/audio_device/audio_device_module.h b/sdk/android/src/jni/audio_device/audio_device_module.h index 9ec73de873..e8acc9031e 100644 --- a/sdk/android/src/jni/audio_device/audio_device_module.h +++ b/sdk/android/src/jni/audio_device/audio_device_module.h @@ -66,6 +66,9 @@ class AudioOutput { virtual absl::optional MinSpeakerVolume() const = 0; virtual void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) = 0; virtual int GetPlayoutUnderrunCount() = 0; + virtual absl::optional GetStats() const { + return absl::nullopt; + } }; // Extract an android.media.AudioManager from an android.content.Context.