d2c336f892
Implements RTCAudioSourceStats members: - audioLevel - totalAudioEnergy - totalSamplesDuration In this CL description these are collectively referred to as the audio levels. The audio levels are removed from sending "track" stats (in Chrome, these are now reported as undefined instead of 0). Background: For sending tracks, audio levels were always reported as 0 in Chrome (https://crbug.com/736403), while audio levels were correctly reported for receiving tracks. This problem affected the standard getStats() but not the legacy getStats(), blocking some people from migrating. This was likely not a problem in native third_party/webrtc code because the delivery of audio frames from device to send-stream uses a different code path outside of chromium. A recent PR (https://github.com/w3c/webrtc-stats/pull/451) moved the send-side audio levels to the RTCAudioSourceStats, while keeping the receive-side audio levels on the "track" stats. This allows an implementation to report the audio levels even if samples are not sent onto the network (such as if an ICE connection has not been established yet), reflecting some of the current implementation. Changes: 1. Audio levels are added to RTCAudioSourceStats. Send-side audio "track" stats are left undefined. Receive-side audio "track" stats are not changed in this CL and continue to work. 2. Audio level computation is moved from the AudioState and AudioTransportImpl to the AudioSendStream. This is because a) the AudioTransportImpl::RecordedDataIsAvailable() code path is not exercised in chromium, and b) audio levels should, per-spec, not be calculated on a per-call basis, for which the AudioState is defined. 3. The audio level computation is now performed in AudioSendStream::SendAudioData(), a code path used by both native and chromium code. 4. Comments are added to document behavior of existing code, such as AudioLevel and AudioSendStream::SendAudioData(). Note: In this CL, just like before this CL, audio level is only calculated after an AudioSendStream has been created. This means that before an O/A negotiation, audio levels are unavailable. According to spec, if we have an audio source, we should have audio levels. An immediate solution to this would have been to calculate the audio level at pc/rtp_sender.cc. The problem is that the LocalAudioSinkAdapter::OnData() code path, while exercised in chromium, is not exercised in native code. The issue of calculating audio levels on a per-source bases rather than on a per-send stream basis is left to https://crbug.com/webrtc/10771, an existing "media-source" bug. This CL can be verified manually in Chrome at: https://codepen.io/anon/pen/vqRGyq Bug: chromium:736403, webrtc:10771 Change-Id: I8036cd9984f3b187c3177470a8c0d6670a201a5a Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/143789 Reviewed-by: Oskar Sundbom <ossu@webrtc.org> Reviewed-by: Stefan Holmer <stefan@webrtc.org> Commit-Queue: Henrik Boström <hbos@webrtc.org> Cr-Commit-Position: refs/heads/master@{#28480}
92 lines
2.7 KiB
C++
92 lines
2.7 KiB
C++
/*
|
|
* Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef AUDIO_AUDIO_STATE_H_
|
|
#define AUDIO_AUDIO_STATE_H_
|
|
|
|
#include <map>
|
|
#include <memory>
|
|
#include <unordered_set>
|
|
|
|
#include "audio/audio_transport_impl.h"
|
|
#include "audio/null_audio_poller.h"
|
|
#include "call/audio_state.h"
|
|
#include "rtc_base/constructor_magic.h"
|
|
#include "rtc_base/critical_section.h"
|
|
#include "rtc_base/ref_count.h"
|
|
#include "rtc_base/thread_checker.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class AudioSendStream;
|
|
class AudioReceiveStream;
|
|
|
|
namespace internal {
|
|
|
|
class AudioState : public webrtc::AudioState {
|
|
public:
|
|
explicit AudioState(const AudioState::Config& config);
|
|
~AudioState() override;
|
|
|
|
AudioProcessing* audio_processing() override;
|
|
AudioTransport* audio_transport() override;
|
|
|
|
void SetPlayout(bool enabled) override;
|
|
void SetRecording(bool enabled) override;
|
|
|
|
void SetStereoChannelSwapping(bool enable) override;
|
|
|
|
AudioDeviceModule* audio_device_module() {
|
|
RTC_DCHECK(config_.audio_device_module);
|
|
return config_.audio_device_module.get();
|
|
}
|
|
|
|
bool typing_noise_detected() const;
|
|
|
|
void AddReceivingStream(webrtc::AudioReceiveStream* stream);
|
|
void RemoveReceivingStream(webrtc::AudioReceiveStream* stream);
|
|
|
|
void AddSendingStream(webrtc::AudioSendStream* stream,
|
|
int sample_rate_hz,
|
|
size_t num_channels);
|
|
void RemoveSendingStream(webrtc::AudioSendStream* stream);
|
|
|
|
private:
|
|
void UpdateAudioTransportWithSendingStreams();
|
|
|
|
rtc::ThreadChecker thread_checker_;
|
|
rtc::ThreadChecker process_thread_checker_;
|
|
const webrtc::AudioState::Config config_;
|
|
bool recording_enabled_ = true;
|
|
bool playout_enabled_ = true;
|
|
|
|
// Transports mixed audio from the mixer to the audio device and
|
|
// recorded audio to the sending streams.
|
|
AudioTransportImpl audio_transport_;
|
|
|
|
// Null audio poller is used to continue polling the audio streams if audio
|
|
// playout is disabled so that audio processing still happens and the audio
|
|
// stats are still updated.
|
|
std::unique_ptr<NullAudioPoller> null_audio_poller_;
|
|
|
|
std::unordered_set<webrtc::AudioReceiveStream*> receiving_streams_;
|
|
struct StreamProperties {
|
|
int sample_rate_hz = 0;
|
|
size_t num_channels = 0;
|
|
};
|
|
std::map<webrtc::AudioSendStream*, StreamProperties> sending_streams_;
|
|
|
|
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioState);
|
|
};
|
|
} // namespace internal
|
|
} // namespace webrtc
|
|
|
|
#endif // AUDIO_AUDIO_STATE_H_
|