webrtc_m130/webrtc/video_engine/overuse_frame_detector.h

248 lines
9.3 KiB
C
Raw Normal View History

/*
* 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"
Reland 8203 "Reducing locking in OveruseFrameDetect..." The issue that was causing the thread checker to report error, turned out to be unrelated. > Revert 8203 "Reducing locking in OveruseFrameDetector and increa..." > > 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 TBR=tommi@webrtc.org BUG= Review URL: https://webrtc-codereview.appspot.com/35029004 Cr-Commit-Position: refs/heads/master@{#8287} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8287 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-08 18:27:46 +00:00
#include "webrtc/base/criticalsection.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/exp_filter.h"
#include "webrtc/base/thread_annotations.h"
Reland 8203 "Reducing locking in OveruseFrameDetect..." The issue that was causing the thread checker to report error, turned out to be unrelated. > Revert 8203 "Reducing locking in OveruseFrameDetector and increa..." > > 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 TBR=tommi@webrtc.org BUG= Review URL: https://webrtc-codereview.appspot.com/35029004 Cr-Commit-Position: refs/heads/master@{#8287} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8287 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-08 18:27:46 +00:00
#include "webrtc/base/thread_checker.h"
#include "webrtc/modules/interface/module.h"
namespace webrtc {
class Clock;
// CpuOveruseObserver is called when a system overuse is detected and
// VideoEngine cannot keep up the encoding frequency.
class CpuOveruseObserver {
public:
// Called as soon as an overuse is detected.
virtual void OveruseDetected() = 0;
// Called periodically when the system is not overused any longer.
virtual void NormalUsage() = 0;
protected:
virtual ~CpuOveruseObserver() {}
};
struct CpuOveruseOptions {
CpuOveruseOptions()
: enable_capture_jitter_method(false),
low_capture_jitter_threshold_ms(20.0f),
high_capture_jitter_threshold_ms(30.0f),
enable_encode_usage_method(true),
low_encode_usage_threshold_percent(55),
high_encode_usage_threshold_percent(85),
low_encode_time_rsd_threshold(-1),
high_encode_time_rsd_threshold(-1),
enable_extended_processing_usage(true),
frame_timeout_interval_ms(1500),
min_frame_samples(120),
min_process_count(3),
high_threshold_consecutive_count(2) {}
// Method based on inter-arrival jitter of captured frames.
bool enable_capture_jitter_method;
float low_capture_jitter_threshold_ms; // Threshold for triggering underuse.
float high_capture_jitter_threshold_ms; // Threshold for triggering overuse.
// Method based on encode time of frames.
bool enable_encode_usage_method;
int low_encode_usage_threshold_percent; // Threshold for triggering underuse.
int high_encode_usage_threshold_percent; // Threshold for triggering overuse.
// TODO(asapersson): Remove options, not used.
int low_encode_time_rsd_threshold; // Additional threshold for triggering
// underuse (used in addition to
// threshold above if configured).
int high_encode_time_rsd_threshold; // Additional threshold for triggering
// overuse (used in addition to
// threshold above if configured).
bool enable_extended_processing_usage; // Include a larger time span (in
// addition to encode time) for
// measuring the processing time of a
// frame.
// General settings.
int frame_timeout_interval_ms; // The maximum allowed interval between two
// frames before resetting estimations.
int min_frame_samples; // The minimum number of frames required.
int min_process_count; // The number of initial process times required before
// triggering an overuse/underuse.
int high_threshold_consecutive_count; // The number of consecutive checks
// above the high threshold before
// triggering an overuse.
bool Equals(const CpuOveruseOptions& o) const {
return enable_capture_jitter_method == o.enable_capture_jitter_method &&
low_capture_jitter_threshold_ms == o.low_capture_jitter_threshold_ms &&
high_capture_jitter_threshold_ms ==
o.high_capture_jitter_threshold_ms &&
enable_encode_usage_method == o.enable_encode_usage_method &&
low_encode_usage_threshold_percent ==
o.low_encode_usage_threshold_percent &&
high_encode_usage_threshold_percent ==
o.high_encode_usage_threshold_percent &&
low_encode_time_rsd_threshold == o.low_encode_time_rsd_threshold &&
high_encode_time_rsd_threshold == o.high_encode_time_rsd_threshold &&
enable_extended_processing_usage ==
o.enable_extended_processing_usage &&
frame_timeout_interval_ms == o.frame_timeout_interval_ms &&
min_frame_samples == o.min_frame_samples &&
min_process_count == o.min_process_count &&
high_threshold_consecutive_count == o.high_threshold_consecutive_count;
}
};
struct CpuOveruseMetrics {
CpuOveruseMetrics()
: capture_jitter_ms(-1),
avg_encode_time_ms(-1),
encode_usage_percent(-1) {}
int capture_jitter_ms; // The current estimated jitter in ms based on
// incoming captured frames.
int avg_encode_time_ms; // The average encode time in ms.
int encode_usage_percent; // The average encode time divided by the average
// time difference between incoming captured frames.
};
class CpuOveruseMetricsObserver {
public:
virtual ~CpuOveruseMetricsObserver() {}
virtual void CpuOveruseMetricsUpdated(const CpuOveruseMetrics& metrics) = 0;
};
// TODO(pbos): Move this somewhere appropriate.
class Statistics {
public:
explicit Statistics(const CpuOveruseOptions& options);
void AddSample(float sample_ms);
void Reset();
float Mean() const;
float StdDev() const;
uint64_t Count() const;
private:
float InitialMean() const;
float InitialVariance() const;
float sum_;
uint64_t count_;
const CpuOveruseOptions options_;
rtc::scoped_ptr<rtc::ExpFilter> filtered_samples_;
rtc::scoped_ptr<rtc::ExpFilter> filtered_variance_;
};
// Use to detect system overuse based on jitter in incoming frames.
class OveruseFrameDetector : public Module {
public:
OveruseFrameDetector(Clock* clock,
const CpuOveruseOptions& options,
CpuOveruseObserver* overuse_observer,
CpuOveruseMetricsObserver* metrics_observer);
~OveruseFrameDetector();
// Called for each captured frame.
void FrameCaptured(int width, int height, int64_t capture_time_ms);
// Called for each encoded frame.
void FrameEncoded(int encode_time_ms);
// Called for each sent frame.
void FrameSent(int64_t capture_time_ms);
// Only public for testing.
int LastProcessingTimeMs() const;
int FramesInQueue() const;
// Implements Module.
int64_t TimeUntilNextProcess() override;
int32_t Process() override;
private:
class EncodeTimeAvg;
class SendProcessingUsage;
class FrameQueue;
void UpdateCpuOveruseMetrics() EXCLUSIVE_LOCKS_REQUIRED(crit_);
Reland 8203 "Reducing locking in OveruseFrameDetect..." The issue that was causing the thread checker to report error, turned out to be unrelated. > Revert 8203 "Reducing locking in OveruseFrameDetector and increa..." > > 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 TBR=tommi@webrtc.org BUG= Review URL: https://webrtc-codereview.appspot.com/35029004 Cr-Commit-Position: refs/heads/master@{#8287} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8287 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-08 18:27:46 +00:00
// TODO(asapersson): This method is only used on one thread, so it shouldn't
// need a guard.
void AddProcessingTime(int elapsed_ms) EXCLUSIVE_LOCKS_REQUIRED(crit_);
Reland 8203 "Reducing locking in OveruseFrameDetect..." The issue that was causing the thread checker to report error, turned out to be unrelated. > Revert 8203 "Reducing locking in OveruseFrameDetector and increa..." > > 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 TBR=tommi@webrtc.org BUG= Review URL: https://webrtc-codereview.appspot.com/35029004 Cr-Commit-Position: refs/heads/master@{#8287} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8287 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-08 18:27:46 +00:00
// TODO(asapersson): This method is always called on the processing thread.
// If locking is required, consider doing that locking inside the
// implementation and reduce scope as much as possible. We should also
// see if we can avoid calling out to other methods while holding the lock.
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_);
Reland 8203 "Reducing locking in OveruseFrameDetect..." The issue that was causing the thread checker to report error, turned out to be unrelated. > Revert 8203 "Reducing locking in OveruseFrameDetector and increa..." > > 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 TBR=tommi@webrtc.org BUG= Review URL: https://webrtc-codereview.appspot.com/35029004 Cr-Commit-Position: refs/heads/master@{#8287} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8287 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-08 18:27:46 +00:00
// Protecting all members except const and those that are only accessed on the
// processing thread.
// TODO(asapersson): See if we can reduce locking. As is, video frame
// processing contends with reading stats and the processing thread.
mutable rtc::CriticalSection crit_;
const CpuOveruseOptions options_;
// Observer getting overuse reports.
CpuOveruseObserver* const observer_;
// Stats metrics.
CpuOveruseMetricsObserver* const metrics_observer_;
CpuOveruseMetrics metrics_ GUARDED_BY(crit_);
Clock* const clock_;
Reland 8203 "Reducing locking in OveruseFrameDetect..." The issue that was causing the thread checker to report error, turned out to be unrelated. > Revert 8203 "Reducing locking in OveruseFrameDetector and increa..." > > 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 TBR=tommi@webrtc.org BUG= Review URL: https://webrtc-codereview.appspot.com/35029004 Cr-Commit-Position: refs/heads/master@{#8287} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8287 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-08 18:27:46 +00:00
int64_t next_process_time_; // Only accessed on the processing thread.
int64_t num_process_times_ GUARDED_BY(crit_);
Statistics capture_deltas_ GUARDED_BY(crit_);
int64_t last_capture_time_ GUARDED_BY(crit_);
Reland 8203 "Reducing locking in OveruseFrameDetect..." The issue that was causing the thread checker to report error, turned out to be unrelated. > Revert 8203 "Reducing locking in OveruseFrameDetector and increa..." > > 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 TBR=tommi@webrtc.org BUG= Review URL: https://webrtc-codereview.appspot.com/35029004 Cr-Commit-Position: refs/heads/master@{#8287} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8287 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-08 18:27:46 +00:00
// These six members are only accessed on the processing thread.
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_; // Only accessed by one thread.
Reland 8203 "Reducing locking in OveruseFrameDetect..." The issue that was causing the thread checker to report error, turned out to be unrelated. > Revert 8203 "Reducing locking in OveruseFrameDetector and increa..." > > 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 TBR=tommi@webrtc.org BUG= Review URL: https://webrtc-codereview.appspot.com/35029004 Cr-Commit-Position: refs/heads/master@{#8287} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8287 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-08 18:27:46 +00:00
// TODO(asapersson): Can these be regular members (avoid separate heap
// allocs)?
const rtc::scoped_ptr<EncodeTimeAvg> encode_time_ GUARDED_BY(crit_);
const rtc::scoped_ptr<SendProcessingUsage> usage_ GUARDED_BY(crit_);
const rtc::scoped_ptr<FrameQueue> frame_queue_ GUARDED_BY(crit_);
int64_t last_sample_time_ms_; // Only accessed by one thread.
Reland 8203 "Reducing locking in OveruseFrameDetect..." The issue that was causing the thread checker to report error, turned out to be unrelated. > Revert 8203 "Reducing locking in OveruseFrameDetector and increa..." > > 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 TBR=tommi@webrtc.org BUG= Review URL: https://webrtc-codereview.appspot.com/35029004 Cr-Commit-Position: refs/heads/master@{#8287} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8287 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-08 18:27:46 +00:00
rtc::ThreadChecker processing_thread_;
DISALLOW_COPY_AND_ASSIGN(OveruseFrameDetector);
};
} // namespace webrtc
#endif // WEBRTC_VIDEO_ENGINE_OVERUSE_FRAME_DETECTOR_H_