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

Side by Side Diff: webrtc/video/video_receive_stream.h

Issue 1663413003: Clean up of CongestionController. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 14 matching lines...) Expand all
25 #include "webrtc/video/vie_channel.h" 25 #include "webrtc/video/vie_channel.h"
26 #include "webrtc/video/vie_encoder.h" 26 #include "webrtc/video/vie_encoder.h"
27 #include "webrtc/video_encoder.h" 27 #include "webrtc/video_encoder.h"
28 #include "webrtc/video_receive_stream.h" 28 #include "webrtc/video_receive_stream.h"
29 29
30 namespace webrtc { 30 namespace webrtc {
31 31
32 class CallStats; 32 class CallStats;
33 class CongestionController; 33 class CongestionController;
34 class VoiceEngine; 34 class VoiceEngine;
35 class VieRemb;
35 36
36 namespace internal { 37 namespace internal {
37 38
38 class VideoReceiveStream : public webrtc::VideoReceiveStream, 39 class VideoReceiveStream : public webrtc::VideoReceiveStream,
39 public I420FrameCallback, 40 public I420FrameCallback,
40 public VideoRenderCallback, 41 public VideoRenderCallback,
41 public EncodedImageCallback { 42 public EncodedImageCallback {
42 public: 43 public:
43 VideoReceiveStream(int num_cpu_cores, 44 VideoReceiveStream(int num_cpu_cores,
44 CongestionController* congestion_controller, 45 CongestionController* congestion_controller,
45 const VideoReceiveStream::Config& config, 46 const VideoReceiveStream::Config& config,
46 webrtc::VoiceEngine* voice_engine, 47 webrtc::VoiceEngine* voice_engine,
47 ProcessThread* process_thread, 48 ProcessThread* process_thread,
48 CallStats* call_stats); 49 CallStats* call_stats,
50 VieRemb* remb);
49 ~VideoReceiveStream() override; 51 ~VideoReceiveStream() override;
50 52
51 // webrtc::ReceiveStream implementation. 53 // webrtc::ReceiveStream implementation.
52 void Start() override; 54 void Start() override;
53 void Stop() override; 55 void Stop() override;
54 void SignalNetworkState(NetworkState state) override; 56 void SignalNetworkState(NetworkState state) override;
55 bool DeliverRtcp(const uint8_t* packet, size_t length) override; 57 bool DeliverRtcp(const uint8_t* packet, size_t length) override;
56 bool DeliverRtp(const uint8_t* packet, 58 bool DeliverRtp(const uint8_t* packet,
57 size_t length, 59 size_t length,
58 const PacketTime& packet_time) override; 60 const PacketTime& packet_time) override;
(...skipping 18 matching lines...) Expand all
77 void SetSyncChannel(VoiceEngine* voice_engine, int audio_channel_id); 79 void SetSyncChannel(VoiceEngine* voice_engine, int audio_channel_id);
78 80
79 private: 81 private:
80 TransportAdapter transport_adapter_; 82 TransportAdapter transport_adapter_;
81 EncodedFrameCallbackAdapter encoded_frame_proxy_; 83 EncodedFrameCallbackAdapter encoded_frame_proxy_;
82 const VideoReceiveStream::Config config_; 84 const VideoReceiveStream::Config config_;
83 Clock* const clock_; 85 Clock* const clock_;
84 86
85 CongestionController* const congestion_controller_; 87 CongestionController* const congestion_controller_;
86 CallStats* const call_stats_; 88 CallStats* const call_stats_;
89 VieRemb* const remb_;
87 90
88 rtc::scoped_ptr<IncomingVideoStream> incoming_video_stream_; 91 rtc::scoped_ptr<IncomingVideoStream> incoming_video_stream_;
89 rtc::scoped_ptr<ReceiveStatisticsProxy> stats_proxy_; 92 rtc::scoped_ptr<ReceiveStatisticsProxy> stats_proxy_;
90 rtc::scoped_ptr<ViEChannel> vie_channel_; 93 rtc::scoped_ptr<ViEChannel> vie_channel_;
91 }; 94 };
92 } // namespace internal 95 } // namespace internal
93 } // namespace webrtc 96 } // namespace webrtc
94 97
95 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ 98 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698