
This reverts commit 9973933d2e606d64fcdc753acb9ba3afd6e30569. Reason for revert: breaking downstream projects and not reviewed by direct owners Original change's description: > Reland "Add plumbing of RtpPacketInfos to each AudioFrame as input for SourceTracker." > > This reverts commit 24192c267a40eb7d6b1850489ccdbf7a84f8ff0f. > > Reason for revert: Analyzed the performance regression in more detail. > > Most of the regression comes from the extra RtpPacketInfos-related memory allocations in every `NetEq::GetAudio()` call. Commit 1796a820f60cb9429bf4bcf13a40a41794ac8fb0 has removed roughly 2/3rds of the extra allocations from the impacted perf tests. Remaining perf impact is expected to be about "8 microseconds of CPU time per second" on the Linux benchmarking machines and "15 us per second" on Windows/Mac. > > There are options to optimize further but they are unlikely worth doing. Note for example that `NetEqPerformanceTest` uses the PCM codec while the real-world use cases would likely use the much heavier Opus codec. The numbers from `OpusSpeedTest` and `NetEqPerformanceTest` suggest that Opus decoding is about 10x as expensive as NetEq overall. > > Original change's description: > > Revert "Add plumbing of RtpPacketInfos to each AudioFrame as input for SourceTracker." > > > > This reverts commit 3e8ef940fe86cf6285afb80e68d2a0bedc631b9f. > > > > Reason for revert: This CL causes a performance regression in NetEq, see https://bugs.chromium.org/p/chromium/issues/detail?id=982260. > > > > Original change's description: > > > Add plumbing of RtpPacketInfos to each AudioFrame as input for SourceTracker. > > > > > > This change adds the plumbing of RtpPacketInfo from ChannelReceive::OnRtpPacket() to ChannelReceive::GetAudioFrameWithInfo() for audio. It is a step towards replacing the non-spec compliant ContributingSources that updates itself at packet-receive time, with the spec-compliant SourceTracker that will update itself at frame-delivery-to-track time. > > > > > > Bug: webrtc:10668 > > > Change-Id: I03385d6865bbc7bfbef7634f88de820a934f787a > > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/139890 > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Reviewed-by: Minyue Li <minyue@webrtc.org> > > > Commit-Queue: Chen Xing <chxg@google.com> > > > Cr-Commit-Position: refs/heads/master@{#28434} > > > > TBR=kwiberg@webrtc.org,stefan@webrtc.org,minyue@webrtc.org,chxg@google.com > > > > Bug: webrtc:10668, chromium:982260 > > Change-Id: I5e2cfde78c59d1123e21869564d76ed3f6193a5c > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/145339 > > Reviewed-by: Ivo Creusen <ivoc@webrtc.org> > > Commit-Queue: Ivo Creusen <ivoc@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#28561} > > TBR=kwiberg@webrtc.org,stefan@webrtc.org,ivoc@webrtc.org,minyue@webrtc.org,chxg@google.com > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:10668, chromium:982260 > Change-Id: Ie375a0b327ee368317bf3a04b2f1415c3a974470 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/146707 > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > Commit-Queue: Chen Xing <chxg@google.com> > Cr-Commit-Position: refs/heads/master@{#28664} TBR=kwiberg@webrtc.org,stefan@webrtc.org,ivoc@webrtc.org,minyue@webrtc.org,chxg@google.com Change-Id: I652cb0814d83b514d3bee34e65ca3bb693099b22 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:10668, chromium:982260 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/146712 Reviewed-by: Alessio Bazzica <alessiob@webrtc.org> Commit-Queue: Alessio Bazzica <alessiob@webrtc.org> Cr-Commit-Position: refs/heads/master@{#28671}
141 lines
5.3 KiB
C++
141 lines
5.3 KiB
C++
/*
|
|
* Copyright (c) 2018 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 API_AUDIO_AUDIO_FRAME_H_
|
|
#define API_AUDIO_AUDIO_FRAME_H_
|
|
|
|
#include <stddef.h>
|
|
#include <stdint.h>
|
|
|
|
#include "api/audio/channel_layout.h"
|
|
#include "rtc_base/constructor_magic.h"
|
|
|
|
namespace webrtc {
|
|
|
|
/* This class holds up to 120 ms of super-wideband (32 kHz) stereo audio. It
|
|
* allows for adding and subtracting frames while keeping track of the resulting
|
|
* states.
|
|
*
|
|
* Notes
|
|
* - This is a de-facto api, not designed for external use. The AudioFrame class
|
|
* is in need of overhaul or even replacement, and anyone depending on it
|
|
* should be prepared for that.
|
|
* - The total number of samples is samples_per_channel_ * num_channels_.
|
|
* - Stereo data is interleaved starting with the left channel.
|
|
*/
|
|
class AudioFrame {
|
|
public:
|
|
// Using constexpr here causes linker errors unless the variable also has an
|
|
// out-of-class definition, which is impractical in this header-only class.
|
|
// (This makes no sense because it compiles as an enum value, which we most
|
|
// certainly cannot take the address of, just fine.) C++17 introduces inline
|
|
// variables which should allow us to switch to constexpr and keep this a
|
|
// header-only class.
|
|
enum : size_t {
|
|
// Stereo, 32 kHz, 120 ms (2 * 32 * 120)
|
|
// Stereo, 192 kHz, 20 ms (2 * 192 * 20)
|
|
kMaxDataSizeSamples = 7680,
|
|
kMaxDataSizeBytes = kMaxDataSizeSamples * sizeof(int16_t),
|
|
};
|
|
|
|
enum VADActivity { kVadActive = 0, kVadPassive = 1, kVadUnknown = 2 };
|
|
enum SpeechType {
|
|
kNormalSpeech = 0,
|
|
kPLC = 1,
|
|
kCNG = 2,
|
|
kPLCCNG = 3,
|
|
kUndefined = 4
|
|
};
|
|
|
|
AudioFrame();
|
|
|
|
// Resets all members to their default state.
|
|
void Reset();
|
|
// Same as Reset(), but leaves mute state unchanged. Muting a frame requires
|
|
// the buffer to be zeroed on the next call to mutable_data(). Callers
|
|
// intending to write to the buffer immediately after Reset() can instead use
|
|
// ResetWithoutMuting() to skip this wasteful zeroing.
|
|
void ResetWithoutMuting();
|
|
|
|
void UpdateFrame(uint32_t timestamp,
|
|
const int16_t* data,
|
|
size_t samples_per_channel,
|
|
int sample_rate_hz,
|
|
SpeechType speech_type,
|
|
VADActivity vad_activity,
|
|
size_t num_channels = 1);
|
|
|
|
void CopyFrom(const AudioFrame& src);
|
|
|
|
// Sets a wall-time clock timestamp in milliseconds to be used for profiling
|
|
// of time between two points in the audio chain.
|
|
// Example:
|
|
// t0: UpdateProfileTimeStamp()
|
|
// t1: ElapsedProfileTimeMs() => t1 - t0 [msec]
|
|
void UpdateProfileTimeStamp();
|
|
// Returns the time difference between now and when UpdateProfileTimeStamp()
|
|
// was last called. Returns -1 if UpdateProfileTimeStamp() has not yet been
|
|
// called.
|
|
int64_t ElapsedProfileTimeMs() const;
|
|
|
|
// data() returns a zeroed static buffer if the frame is muted.
|
|
// mutable_frame() always returns a non-static buffer; the first call to
|
|
// mutable_frame() zeros the non-static buffer and marks the frame unmuted.
|
|
const int16_t* data() const;
|
|
int16_t* mutable_data();
|
|
|
|
// Prefer to mute frames using AudioFrameOperations::Mute.
|
|
void Mute();
|
|
// Frame is muted by default.
|
|
bool muted() const;
|
|
|
|
size_t max_16bit_samples() const { return kMaxDataSizeSamples; }
|
|
size_t samples_per_channel() const { return samples_per_channel_; }
|
|
size_t num_channels() const { return num_channels_; }
|
|
ChannelLayout channel_layout() const { return channel_layout_; }
|
|
int sample_rate_hz() const { return sample_rate_hz_; }
|
|
|
|
// RTP timestamp of the first sample in the AudioFrame.
|
|
uint32_t timestamp_ = 0;
|
|
// Time since the first frame in milliseconds.
|
|
// -1 represents an uninitialized value.
|
|
int64_t elapsed_time_ms_ = -1;
|
|
// NTP time of the estimated capture time in local timebase in milliseconds.
|
|
// -1 represents an uninitialized value.
|
|
int64_t ntp_time_ms_ = -1;
|
|
size_t samples_per_channel_ = 0;
|
|
int sample_rate_hz_ = 0;
|
|
size_t num_channels_ = 0;
|
|
ChannelLayout channel_layout_ = CHANNEL_LAYOUT_NONE;
|
|
SpeechType speech_type_ = kUndefined;
|
|
VADActivity vad_activity_ = kVadUnknown;
|
|
// Monotonically increasing timestamp intended for profiling of audio frames.
|
|
// Typically used for measuring elapsed time between two different points in
|
|
// the audio path. No lock is used to save resources and we are thread safe
|
|
// by design. Also, absl::optional is not used since it will cause a "complex
|
|
// class/struct needs an explicit out-of-line destructor" build error.
|
|
int64_t profile_timestamp_ms_ = 0;
|
|
|
|
private:
|
|
// A permanently zeroed out buffer to represent muted frames. This is a
|
|
// header-only class, so the only way to avoid creating a separate empty
|
|
// buffer per translation unit is to wrap a static in an inline function.
|
|
static const int16_t* empty_data();
|
|
|
|
int16_t data_[kMaxDataSizeSamples];
|
|
bool muted_ = true;
|
|
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(AudioFrame);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // API_AUDIO_AUDIO_FRAME_H_
|