OLD | NEW |
---|---|
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 15 matching lines...) Expand all Loading... | |
26 #include "webrtc/video/vie_channel.h" | 26 #include "webrtc/video/vie_channel.h" |
27 #include "webrtc/video/vie_encoder.h" | 27 #include "webrtc/video/vie_encoder.h" |
28 #include "webrtc/video_encoder.h" | 28 #include "webrtc/video_encoder.h" |
29 #include "webrtc/video_receive_stream.h" | 29 #include "webrtc/video_receive_stream.h" |
30 | 30 |
31 namespace webrtc { | 31 namespace webrtc { |
32 | 32 |
33 class CallStats; | 33 class CallStats; |
34 class CongestionController; | 34 class CongestionController; |
35 class VoiceEngine; | 35 class VoiceEngine; |
36 class VieRemb; | |
36 | 37 |
37 namespace internal { | 38 namespace internal { |
38 | 39 |
39 class VideoReceiveStream : public webrtc::VideoReceiveStream, | 40 class VideoReceiveStream : public webrtc::VideoReceiveStream, |
40 public I420FrameCallback, | 41 public I420FrameCallback, |
41 public VideoRenderCallback, | 42 public VideoRenderCallback, |
42 public EncodedImageCallback { | 43 public EncodedImageCallback { |
43 public: | 44 public: |
44 VideoReceiveStream(int num_cpu_cores, | 45 VideoReceiveStream(int num_cpu_cores, |
45 CongestionController* congestion_controller, | 46 CongestionController* congestion_controller, |
46 const VideoReceiveStream::Config& config, | 47 const VideoReceiveStream::Config& config, |
47 webrtc::VoiceEngine* voice_engine, | 48 webrtc::VoiceEngine* voice_engine, |
48 ProcessThread* process_thread, | 49 ProcessThread* process_thread, |
49 CallStats* call_stats); | 50 CallStats* call_stats, |
51 VieRemb* remb); | |
the sun
2016/02/08 10:39:23
For the audio streams, I've created a shared Audio
stefan-webrtc
2016/02/08 13:30:54
Possibly. pbos, what's your opinion on this?
| |
50 ~VideoReceiveStream() override; | 52 ~VideoReceiveStream() override; |
51 | 53 |
52 // webrtc::ReceiveStream implementation. | 54 // webrtc::ReceiveStream implementation. |
53 void Start() override; | 55 void Start() override; |
54 void Stop() override; | 56 void Stop() override; |
55 void SignalNetworkState(NetworkState state) override; | 57 void SignalNetworkState(NetworkState state) override; |
56 bool DeliverRtcp(const uint8_t* packet, size_t length) override; | 58 bool DeliverRtcp(const uint8_t* packet, size_t length) override; |
57 bool DeliverRtp(const uint8_t* packet, | 59 bool DeliverRtp(const uint8_t* packet, |
58 size_t length, | 60 size_t length, |
59 const PacketTime& packet_time) override; | 61 const PacketTime& packet_time) override; |
(...skipping 19 matching lines...) Expand all Loading... | |
79 | 81 |
80 private: | 82 private: |
81 TransportAdapter transport_adapter_; | 83 TransportAdapter transport_adapter_; |
82 EncodedFrameCallbackAdapter encoded_frame_proxy_; | 84 EncodedFrameCallbackAdapter encoded_frame_proxy_; |
83 const VideoReceiveStream::Config config_; | 85 const VideoReceiveStream::Config config_; |
84 ProcessThread* const process_thread_; | 86 ProcessThread* const process_thread_; |
85 Clock* const clock_; | 87 Clock* const clock_; |
86 | 88 |
87 CongestionController* const congestion_controller_; | 89 CongestionController* const congestion_controller_; |
88 CallStats* const call_stats_; | 90 CallStats* const call_stats_; |
91 VieRemb* const remb_; | |
89 | 92 |
90 rtc::scoped_ptr<VideoCodingModule> vcm_; | 93 rtc::scoped_ptr<VideoCodingModule> vcm_; |
91 IncomingVideoStream incoming_video_stream_; | 94 IncomingVideoStream incoming_video_stream_; |
92 ReceiveStatisticsProxy stats_proxy_; | 95 ReceiveStatisticsProxy stats_proxy_; |
93 ViEChannel vie_channel_; | 96 ViEChannel vie_channel_; |
94 }; | 97 }; |
95 } // namespace internal | 98 } // namespace internal |
96 } // namespace webrtc | 99 } // namespace webrtc |
97 | 100 |
98 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ | 101 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ |
OLD | NEW |