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

Adding time profiling support to AudioFrame

Browse Source 
See https://codereview.webrtc.org/3012183002/ for more background.

Bug: webrtc:8206
Change-Id: I638bc30a44d036826b7caccaab254916093fe357
Reviewed-on: https://webrtc-review.googlesource.com/1584
Commit-Queue: Henrik Andreassson <henrika@webrtc.org>
Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#19946}
This commit is contained in:
henrika
2017-09-25 15:48:43 +02:00
committed by Commit Bot
parent b22184e240
commit fb08994947
1 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
modules/include/module_common_types.h
View File

@ -26,6 +26,7 @@
#include "rtc_base/constructormagic.h" #include "rtc_base/constructormagic.h"
#include "rtc_base/deprecation.h" #include "rtc_base/deprecation.h"
#include "rtc_base/safe_conversions.h" #include "rtc_base/safe_conversions.h"
#include "rtc_base/timeutils.h"
#include "typedefs.h" // NOLINT(build/include) #include "typedefs.h" // NOLINT(build/include)
namespace webrtc { namespace webrtc {
@ -336,6 +337,17 @@ class AudioFrame {
void CopyFrom(const AudioFrame& src); 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. // 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() always returns a non-static buffer; the first call to
// mutable_frame() zeros the non-static buffer and marks the frame unmuted. // mutable_frame() zeros the non-static buffer and marks the frame unmuted.
@ -368,6 +380,12 @@ class AudioFrame {
size_t num_channels_ = 0; size_t num_channels_ = 0;
SpeechType speech_type_ = kUndefined; SpeechType speech_type_ = kUndefined;
VADActivity vad_activity_ = kVadUnknown; 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, rtc::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: private:
// A permamently zeroed out buffer to represent muted frames. This is a // A permamently zeroed out buffer to represent muted frames. This is a
@ -407,6 +425,7 @@ inline void AudioFrame::ResetWithoutMuting() {
num_channels_ = 0; num_channels_ = 0;
speech_type_ = kUndefined; speech_type_ = kUndefined;
vad_activity_ = kVadUnknown; vad_activity_ = kVadUnknown;
profile_timestamp_ms_ = 0;
} }
inline void AudioFrame::UpdateFrame(int id, inline void AudioFrame::UpdateFrame(int id,
@ -457,6 +476,18 @@ inline void AudioFrame::CopyFrom(const AudioFrame& src) {
} }
} }
inline void AudioFrame::UpdateProfileTimeStamp() {
profile_timestamp_ms_ = rtc::TimeMillis();
}
inline int64_t AudioFrame::ElapsedProfileTimeMs() const {
if (profile_timestamp_ms_ == 0) {
// Profiling has not been activated.
return -1;
}
return rtc::TimeSince(profile_timestamp_ms_);
}
inline const int16_t* AudioFrame::data() const { inline const int16_t* AudioFrame::data() const {
return muted_ ? empty_data() : data_; return muted_ ? empty_data() : data_;
} }