summaryrefslogtreecommitdiff
path: root/video_engine/vie_remb.h
diff options
context:
space:
mode:
authorstefan@webrtc.org <stefan@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-02-01 14:33:42 +0000
committerstefan@webrtc.org <stefan@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-02-01 14:33:42 +0000
commit2a5dbce193b4ee594f0bb66c4f1a2bb24f31e621 (patch)
tree7243924ec4896e092c1b988a0f1c926bfee0f1d8 /video_engine/vie_remb.h
parente515356466ba55bd87de4d4383825c13f086ed1b (diff)
downloadwebrtc-2a5dbce193b4ee594f0bb66c4f1a2bb24f31e621.tar.gz
Break out RemoteBitrateEstimator from RtpRtcp module and make RemoteBitrateEstimator::Process trigger new REMB messages.
Also make sure RTT is computed independently of whether it's time to send RTCP messages or not. BUG=1298 Review URL: https://webrtc-codereview.appspot.com/1060005 git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3455 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'video_engine/vie_remb.h')
-rw-r--r--video_engine/vie_remb.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/video_engine/vie_remb.h b/video_engine/vie_remb.h
index 0ad36ca4..5365b7fd 100644
--- a/video_engine/vie_remb.h
+++ b/video_engine/vie_remb.h
@@ -26,9 +26,9 @@ class CriticalSectionWrapper;
class ProcessThread;
class RtpRtcp;
-class VieRemb : public RemoteBitrateObserver, public Module {
+class VieRemb : public RemoteBitrateObserver {
public:
- explicit VieRemb(ProcessThread* process_thread);
+ VieRemb();
~VieRemb();
// Called to add a receive channel to include in the REMB packet.
@@ -54,15 +54,9 @@ class VieRemb : public RemoteBitrateObserver, public Module {
virtual void OnReceiveBitrateChanged(std::vector<unsigned int>* ssrcs,
unsigned int bitrate);
- // Implements Module.
- virtual WebRtc_Word32 ChangeUniqueId(const WebRtc_Word32 id);
- virtual WebRtc_Word32 TimeUntilNextProcess();
- virtual WebRtc_Word32 Process();
-
private:
typedef std::list<RtpRtcp*> RtpModules;
- ProcessThread* process_thread_;
scoped_ptr<CriticalSectionWrapper> list_crit_;
// The last time a REMB was sent.
@@ -78,7 +72,6 @@ class VieRemb : public RemoteBitrateObserver, public Module {
// The last bitrate update.
unsigned int bitrate_;
std::vector<unsigned int> ssrcs_;
- int64_t bitrate_update_time_ms_;
};
} // namespace webrtc