Broke tests in Chrome for some reason: [ RUN ] WebRtcAecDumpBrowserTest.CallWithAecDump [80131:1287:0129/074432:30561723987517:ERROR:vt_video_decode_accelerator.cc(132)] Failed to create VTDecompressionSession: codecOpenErr (-8973) [80129:1287:0129/074432:30562276677373:INFO:CONSOLE(64)] "Looking at video in element remote-view-1", source: http://127.0.0.1:61401/media/webrtc_test_utilities.js (64) [80129:1287:0129/074432:30562281435788:INFO:CONSOLE(64)] "Looking at video in element remote-view-2", source: http://127.0.0.1:61401/media/webrtc_test_utilities.js (64) [80129:1287:0129/074432:30562315329399:INFO:CONSOLE(800)] "Negotiating call...", source: http://127.0.0.1:61401/media/peerconnection-call.html (800) [80133:29187:0129/074432:30562402039578:FATAL:overuse_frame_detector.cc(388)] Check failed: processing_thread_.CalledOnValidThread(). 0 libbase.dylib 0x000000010dfd688f base::debug::StackTrace::StackTrace() + 47 1 libbase.dylib 0x000000010dfd68e3 base::debug::StackTrace::StackTrace() + 35 2 libbase.dylib 0x000000010e030076 logging::LogMessage::~LogMessage() + 70 3 libbase.dylib 0x000000010e02f0c3 logging::LogMessage::~LogMessage() + 35 4 libcontent.dylib 0x000000011d8c0cd5 webrtc::OveruseFrameDetector::TimeUntilNextProcess() + 245 5 libcontent.dylib 0x000000011d31ddfd webrtc::ProcessThreadImpl::Process() + 525 6 libcontent.dylib 0x000000011d31d836 webrtc::ProcessThreadImpl::Run(void*) + 38 7 libcontent.dylib 0x000000011d10c390 webrtc::ThreadPosix::Run() + 288 8 libcontent.dylib 0x000000011d10c076 webrtc::StartThread(void*) + 38 9 libsystem_pthread.dylib 0x00007fff8e667899 _pthread_body + 138 10 libsystem_pthread.dylib 0x00007fff8e66772a _pthread_struct_init + 0 11 libsystem_pthread.dylib 0x00007fff8e66bfc9 thread_start + 13 > Reducing locking in OveruseFrameDetector and increasing constness. > > I also added a few TODOs there to see what we can do to reduce the chance of contention. > To catch regressions, I've started using the ThreadChecker class on the processing thread but it might also be a good idea to add similar checks for other known threads such as the thread we receive frames on. I'm sure we can reduce locking even further. > > BUG=2822 > R=asapersson@webrtc.org > > Review URL: https://webrtc-codereview.appspot.com/33129004 TBR=tommi@webrtc.org Review URL: https://webrtc-codereview.appspot.com/34079004 Cr-Commit-Position: refs/heads/master@{#8206} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8206 4adac7df-926f-26a2-2b94-8c16560cd09d
161 lines
5.2 KiB
C++
161 lines
5.2 KiB
C++
/*
|
|
* Copyright (c) 2013 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 WEBRTC_VIDEO_ENGINE_OVERUSE_FRAME_DETECTOR_H_
|
|
#define WEBRTC_VIDEO_ENGINE_OVERUSE_FRAME_DETECTOR_H_
|
|
|
|
#include "webrtc/base/constructormagic.h"
|
|
#include "webrtc/base/exp_filter.h"
|
|
#include "webrtc/base/thread_annotations.h"
|
|
#include "webrtc/modules/interface/module.h"
|
|
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
|
|
#include "webrtc/video_engine/include/vie_base.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class Clock;
|
|
class CpuOveruseObserver;
|
|
class CriticalSectionWrapper;
|
|
|
|
// TODO(pbos): Move this somewhere appropriate.
|
|
class Statistics {
|
|
public:
|
|
Statistics();
|
|
|
|
void AddSample(float sample_ms);
|
|
void Reset();
|
|
void SetOptions(const CpuOveruseOptions& options);
|
|
|
|
float Mean() const;
|
|
float StdDev() const;
|
|
uint64_t Count() const;
|
|
|
|
private:
|
|
float InitialMean() const;
|
|
float InitialVariance() const;
|
|
|
|
float sum_;
|
|
uint64_t count_;
|
|
CpuOveruseOptions options_;
|
|
scoped_ptr<rtc::ExpFilter> filtered_samples_;
|
|
scoped_ptr<rtc::ExpFilter> filtered_variance_;
|
|
};
|
|
|
|
// Use to detect system overuse based on jitter in incoming frames.
|
|
class OveruseFrameDetector : public Module {
|
|
public:
|
|
explicit OveruseFrameDetector(Clock* clock);
|
|
~OveruseFrameDetector();
|
|
|
|
// Registers an observer receiving overuse and underuse callbacks. Set
|
|
// 'observer' to NULL to disable callbacks.
|
|
void SetObserver(CpuOveruseObserver* observer);
|
|
|
|
// Sets options for overuse detection.
|
|
void SetOptions(const CpuOveruseOptions& options);
|
|
|
|
// Called for each captured frame.
|
|
void FrameCaptured(int width, int height, int64_t capture_time_ms);
|
|
|
|
// Called when the processing of a captured frame is started.
|
|
void FrameProcessingStarted();
|
|
|
|
// Called for each encoded frame.
|
|
void FrameEncoded(int encode_time_ms);
|
|
|
|
// Called for each sent frame.
|
|
void FrameSent(int64_t capture_time_ms);
|
|
|
|
// Accessors.
|
|
|
|
// Returns CpuOveruseMetrics where
|
|
// capture_jitter_ms: The estimated jitter based on incoming captured frames.
|
|
// avg_encode_time_ms: Running average of reported encode time
|
|
// (FrameEncoded()). Only used for stats.
|
|
// TODO(asapersson): Rename metric.
|
|
// encode_usage_percent: The average processing time of a frame on the
|
|
// send-side divided by the average time difference
|
|
// between incoming captured frames.
|
|
// capture_queue_delay_ms_per_s: The current time delay between an incoming
|
|
// captured frame (FrameCaptured()) until the
|
|
// frame is being processed
|
|
// (FrameProcessingStarted()). (Note: if a new
|
|
// frame is received before an old frame has
|
|
// been processed, the old frame is skipped).
|
|
// The delay is expressed in ms delay per sec.
|
|
// Only used for stats.
|
|
void GetCpuOveruseMetrics(CpuOveruseMetrics* metrics) const;
|
|
|
|
// Only public for testing.
|
|
int CaptureQueueDelayMsPerS() const;
|
|
int LastProcessingTimeMs() const;
|
|
int FramesInQueue() const;
|
|
|
|
// Implements Module.
|
|
virtual int64_t TimeUntilNextProcess() OVERRIDE;
|
|
virtual int32_t Process() OVERRIDE;
|
|
|
|
private:
|
|
class EncodeTimeAvg;
|
|
class SendProcessingUsage;
|
|
class CaptureQueueDelay;
|
|
class FrameQueue;
|
|
|
|
void AddProcessingTime(int elapsed_ms) EXCLUSIVE_LOCKS_REQUIRED(crit_);
|
|
|
|
bool IsOverusing() EXCLUSIVE_LOCKS_REQUIRED(crit_);
|
|
bool IsUnderusing(int64_t time_now) EXCLUSIVE_LOCKS_REQUIRED(crit_);
|
|
|
|
bool FrameTimeoutDetected(int64_t now) const EXCLUSIVE_LOCKS_REQUIRED(crit_);
|
|
bool FrameSizeChanged(int num_pixels) const EXCLUSIVE_LOCKS_REQUIRED(crit_);
|
|
|
|
void ResetAll(int num_pixels) EXCLUSIVE_LOCKS_REQUIRED(crit_);
|
|
|
|
// Protecting all members.
|
|
scoped_ptr<CriticalSectionWrapper> crit_;
|
|
|
|
// Observer getting overuse reports.
|
|
CpuOveruseObserver* observer_ GUARDED_BY(crit_);
|
|
|
|
CpuOveruseOptions options_ GUARDED_BY(crit_);
|
|
|
|
Clock* const clock_;
|
|
int64_t next_process_time_;
|
|
int64_t num_process_times_ GUARDED_BY(crit_);
|
|
|
|
Statistics capture_deltas_ GUARDED_BY(crit_);
|
|
int64_t last_capture_time_ GUARDED_BY(crit_);
|
|
|
|
int64_t last_overuse_time_;
|
|
int checks_above_threshold_;
|
|
int num_overuse_detections_;
|
|
|
|
int64_t last_rampup_time_;
|
|
bool in_quick_rampup_;
|
|
int current_rampup_delay_ms_;
|
|
|
|
// Number of pixels of last captured frame.
|
|
int num_pixels_ GUARDED_BY(crit_);
|
|
|
|
int64_t last_encode_sample_ms_ GUARDED_BY(crit_);
|
|
scoped_ptr<EncodeTimeAvg> encode_time_ GUARDED_BY(crit_);
|
|
scoped_ptr<SendProcessingUsage> usage_ GUARDED_BY(crit_);
|
|
scoped_ptr<FrameQueue> frame_queue_ GUARDED_BY(crit_);
|
|
int64_t last_sample_time_ms_ GUARDED_BY(crit_);
|
|
|
|
scoped_ptr<CaptureQueueDelay> capture_queue_delay_ GUARDED_BY(crit_);
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(OveruseFrameDetector);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_VIDEO_ENGINE_OVERUSE_FRAME_DETECTOR_H_
|