Remove unused metric in overuse detector.
BUG=
R=stefan@webrtc.org
Review URL: https://codereview.webrtc.org/1237963002 .
Cr-Commit-Position: refs/heads/master@{#9590}
diff --git a/webrtc/video_engine/overuse_frame_detector.h b/webrtc/video_engine/overuse_frame_detector.h
index 5198293..4791cee 100644
--- a/webrtc/video_engine/overuse_frame_detector.h
+++ b/webrtc/video_engine/overuse_frame_detector.h
@@ -106,18 +106,13 @@
CpuOveruseMetrics()
: capture_jitter_ms(-1),
avg_encode_time_ms(-1),
- encode_usage_percent(-1),
- capture_queue_delay_ms_per_s(-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.
- int capture_queue_delay_ms_per_s; // The current time delay between an
- // incoming captured frame until the frame
- // is being processed. The delay is
- // expressed in ms delay per second.
};
class CpuOveruseMetricsObserver {
@@ -161,9 +156,6 @@
// 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);
@@ -171,7 +163,6 @@
void FrameSent(int64_t capture_time_ms);
// Only public for testing.
- int CaptureQueueDelayMsPerS() const;
int LastProcessingTimeMs() const;
int FramesInQueue() const;
@@ -182,7 +173,6 @@
private:
class EncodeTimeAvg;
class SendProcessingUsage;
- class CaptureQueueDelay;
class FrameQueue;
void UpdateCpuOveruseMetrics() EXCLUSIVE_LOCKS_REQUIRED(crit_);
@@ -247,9 +237,6 @@
int64_t last_sample_time_ms_; // Only accessed by one thread.
- const rtc::scoped_ptr<CaptureQueueDelay> capture_queue_delay_
- GUARDED_BY(crit_);
-
rtc::ThreadChecker processing_thread_;
DISALLOW_COPY_AND_ASSIGN(OveruseFrameDetector);