Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2708)

Unified Diff: webrtc/video/send_statistics_proxy.h

Issue 1354143004: Remove callback_cs_ in ViEEncoder. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webrtc/video/send_statistics_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/send_statistics_proxy.h
diff --git a/webrtc/video/send_statistics_proxy.h b/webrtc/video/send_statistics_proxy.h
index 6c6a0bab95261163652f45550824a599c0f31595..3510ded0825dc385619fe8fb9dbdc88aa9ac0144 100644
--- a/webrtc/video/send_statistics_proxy.h
+++ b/webrtc/video/send_statistics_proxy.h
@@ -33,7 +33,6 @@ class SendStatisticsProxy : public CpuOveruseMetricsObserver,
public StreamDataCountersCallback,
public BitrateStatisticsObserver,
public FrameCountObserver,
- public ViEEncoderObserver,
public VideoEncoderRateObserver,
public SendSideDelayObserver {
public:
@@ -55,6 +54,8 @@ class SendStatisticsProxy : public CpuOveruseMetricsObserver,
// From VideoEncoderRateObserver.
void OnSetRates(uint32_t bitrate_bps, int framerate) override;
+ void OnOutgoingRate(uint32_t framerate, uint32_t bitrate);
+ void OnSuspendChange(bool is_suspended);
void OnInactiveSsrc(uint32_t ssrc);
protected:
@@ -81,13 +82,6 @@ class SendStatisticsProxy : public CpuOveruseMetricsObserver,
void FrameCountUpdated(const FrameCounts& frame_counts,
uint32_t ssrc) override;
- // From ViEEncoderObserver.
- void OutgoingRate(const int video_channel,
- const unsigned int framerate,
- const unsigned int bitrate) override;
-
- void SuspendChange(int video_channel, bool is_suspended) override;
-
void SendSideDelayUpdated(int avg_delay_ms,
int max_delay_ms,
uint32_t ssrc) override;
« no previous file with comments | « no previous file | webrtc/video/send_statistics_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698