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

Unified Diff: webrtc/video_engine/vie_channel_group.h

Issue 1419803002: Rename ChannelGroup to CongestionController and move to webrtc/call/. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase Created 5 years, 2 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
Index: webrtc/video_engine/vie_channel_group.h
diff --git a/webrtc/video_engine/vie_channel_group.h b/webrtc/video_engine/vie_channel_group.h
deleted file mode 100644
index d26ee108440c63da95ca9a04fc58bc76ae0b9dd6..0000000000000000000000000000000000000000
--- a/webrtc/video_engine/vie_channel_group.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2012 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_VIE_CHANNEL_GROUP_H_
-#define WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_GROUP_H_
-
-#include <list>
-#include <map>
-#include <set>
-#include <vector>
-
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/scoped_ptr.h"
-#include "webrtc/base/socket.h"
-#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
-#include "webrtc/video_receive_stream.h"
-#include "webrtc/video_send_stream.h"
-
-namespace webrtc {
-
-class BitrateAllocator;
-class CallStats;
-class Config;
-class PacedSender;
-class PacketRouter;
-class ProcessThread;
-class RemoteBitrateEstimator;
-class RemoteEstimatorProxy;
-class RtpRtcp;
-class SendStatisticsProxy;
-class TransportFeedbackAdapter;
-class ViEEncoder;
-class VieRemb;
-
-// Channel group contains data common for several channels. All channels in the
-// group are assumed to send/receive data to the same end-point.
-class ChannelGroup : public BitrateObserver {
- public:
- ChannelGroup(ProcessThread* process_thread, CallStats* call_stats);
- ~ChannelGroup();
- void AddEncoder(ViEEncoder* encoder);
- void RemoveEncoder(ViEEncoder* encoder);
- void SetBweBitrates(int min_bitrate_bps,
- int start_bitrate_bps,
- int max_bitrate_bps);
-
- void SetChannelRembStatus(bool sender, bool receiver, RtpRtcp* rtp_module);
-
- void SignalNetworkState(NetworkState state);
-
- BitrateController* GetBitrateController() const;
- RemoteBitrateEstimator* GetRemoteBitrateEstimator(bool send_side_bwe) const;
- int64_t GetPacerQueuingDelayMs() const;
- PacedSender* pacer() const { return pacer_.get(); }
- PacketRouter* packet_router() const { return packet_router_.get(); }
- BitrateAllocator* bitrate_allocator() const {
- return bitrate_allocator_.get(); }
- TransportFeedbackObserver* GetTransportFeedbackObserver();
- RtcpIntraFrameObserver* GetRtcpIntraFrameObserver() const;
-
- // Implements BitrateObserver.
- void OnNetworkChanged(uint32_t target_bitrate_bps,
- uint8_t fraction_loss,
- int64_t rtt) override;
-
- void OnSentPacket(const rtc::SentPacket& sent_packet);
-
- private:
- rtc::scoped_ptr<VieRemb> remb_;
- rtc::scoped_ptr<BitrateAllocator> bitrate_allocator_;
- rtc::scoped_ptr<PacketRouter> packet_router_;
- rtc::scoped_ptr<PacedSender> pacer_;
- rtc::scoped_ptr<RemoteBitrateEstimator> remote_bitrate_estimator_;
- rtc::scoped_ptr<RemoteEstimatorProxy> remote_estimator_proxy_;
-
- mutable rtc::CriticalSection encoder_crit_;
- std::vector<ViEEncoder*> encoders_ GUARDED_BY(encoder_crit_);
-
- // Registered at construct time and assumed to outlive this class.
- ProcessThread* const process_thread_;
- CallStats* const call_stats_;
-
- rtc::scoped_ptr<ProcessThread> pacer_thread_;
-
- rtc::scoped_ptr<BitrateController> bitrate_controller_;
- rtc::scoped_ptr<TransportFeedbackAdapter> transport_feedback_adapter_;
- int min_bitrate_bps_;
-};
-
-} // namespace webrtc
-
-#endif // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_GROUP_H_

Powered by Google App Engine
This is Rietveld 408576698