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

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

Issue 2712683002: Add |protected_by_flexfec| flag to VideoReceiveStream::Config. (Closed)
Patch Set: Rebase. Created 3 years, 9 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
« no previous file with comments | « webrtc/media/engine/webrtcvideoengine2.cc ('k') | webrtc/video/video_receive_stream.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 class VideoReceiveStream : public webrtc::VideoReceiveStream, 44 class VideoReceiveStream : public webrtc::VideoReceiveStream,
45 public rtc::VideoSinkInterface<VideoFrame>, 45 public rtc::VideoSinkInterface<VideoFrame>,
46 public EncodedImageCallback, 46 public EncodedImageCallback,
47 public NackSender, 47 public NackSender,
48 public KeyFrameRequestSender, 48 public KeyFrameRequestSender,
49 public video_coding::OnCompleteFrameCallback, 49 public video_coding::OnCompleteFrameCallback,
50 public Syncable { 50 public Syncable {
51 public: 51 public:
52 VideoReceiveStream(int num_cpu_cores, 52 VideoReceiveStream(int num_cpu_cores,
53 bool protected_by_flexfec,
54 PacketRouter* packet_router, 53 PacketRouter* packet_router,
55 VideoReceiveStream::Config config, 54 VideoReceiveStream::Config config,
56 ProcessThread* process_thread, 55 ProcessThread* process_thread,
57 CallStats* call_stats, 56 CallStats* call_stats,
58 VieRemb* remb); 57 VieRemb* remb);
59 ~VideoReceiveStream() override; 58 ~VideoReceiveStream() override;
60 59
61 const Config& config() const { return config_; } 60 const Config& config() const { return config_; }
62 61
63 void SignalNetworkState(NetworkState state); 62 void SignalNetworkState(NetworkState state);
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 private: 111 private:
113 static bool DecodeThreadFunction(void* ptr); 112 static bool DecodeThreadFunction(void* ptr);
114 bool Decode(); 113 bool Decode();
115 114
116 rtc::ThreadChecker worker_thread_checker_; 115 rtc::ThreadChecker worker_thread_checker_;
117 rtc::ThreadChecker module_process_thread_checker_; 116 rtc::ThreadChecker module_process_thread_checker_;
118 117
119 TransportAdapter transport_adapter_; 118 TransportAdapter transport_adapter_;
120 const VideoReceiveStream::Config config_; 119 const VideoReceiveStream::Config config_;
121 const int num_cpu_cores_; 120 const int num_cpu_cores_;
122 const bool protected_by_flexfec_;
123 ProcessThread* const process_thread_; 121 ProcessThread* const process_thread_;
124 Clock* const clock_; 122 Clock* const clock_;
125 123
126 rtc::PlatformThread decode_thread_; 124 rtc::PlatformThread decode_thread_;
127 125
128 CallStats* const call_stats_; 126 CallStats* const call_stats_;
129 127
130 std::unique_ptr<VCMTiming> timing_; // Jitter buffer experiment. 128 std::unique_ptr<VCMTiming> timing_; // Jitter buffer experiment.
131 vcm::VideoReceiver video_receiver_; 129 vcm::VideoReceiver video_receiver_;
132 std::unique_ptr<rtc::VideoSinkInterface<VideoFrame>> incoming_video_stream_; 130 std::unique_ptr<rtc::VideoSinkInterface<VideoFrame>> incoming_video_stream_;
133 ReceiveStatisticsProxy stats_proxy_; 131 ReceiveStatisticsProxy stats_proxy_;
134 RtpStreamReceiver rtp_stream_receiver_; 132 RtpStreamReceiver rtp_stream_receiver_;
135 std::unique_ptr<VideoStreamDecoder> video_stream_decoder_; 133 std::unique_ptr<VideoStreamDecoder> video_stream_decoder_;
136 RtpStreamsSynchronizer rtp_stream_sync_; 134 RtpStreamsSynchronizer rtp_stream_sync_;
137 135
138 rtc::CriticalSection ivf_writer_lock_; 136 rtc::CriticalSection ivf_writer_lock_;
139 std::unique_ptr<IvfFileWriter> ivf_writer_ GUARDED_BY(ivf_writer_lock_); 137 std::unique_ptr<IvfFileWriter> ivf_writer_ GUARDED_BY(ivf_writer_lock_);
140 138
141 // Members for the new jitter buffer experiment. 139 // Members for the new jitter buffer experiment.
142 std::unique_ptr<VCMJitterEstimator> jitter_estimator_; 140 std::unique_ptr<VCMJitterEstimator> jitter_estimator_;
143 std::unique_ptr<video_coding::FrameBuffer> frame_buffer_; 141 std::unique_ptr<video_coding::FrameBuffer> frame_buffer_;
144 }; 142 };
145 } // namespace internal 143 } // namespace internal
146 } // namespace webrtc 144 } // namespace webrtc
147 145
148 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ 146 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_
OLDNEW
« no previous file with comments | « webrtc/media/engine/webrtcvideoengine2.cc ('k') | webrtc/video/video_receive_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698