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

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

Issue 2649973005: Inform jitter buffer about FlexFEC protection. (Closed)
Patch Set: Take 2. Created 3 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 namespace internal { 42 namespace internal {
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: 50 public:
51 VideoReceiveStream(int num_cpu_cores, 51 VideoReceiveStream(int num_cpu_cores,
52 bool protected_by_flexfec,
52 CongestionController* congestion_controller, 53 CongestionController* congestion_controller,
53 PacketRouter* packet_router, 54 PacketRouter* packet_router,
54 VideoReceiveStream::Config config, 55 VideoReceiveStream::Config config,
55 webrtc::VoiceEngine* voice_engine, 56 webrtc::VoiceEngine* voice_engine,
56 ProcessThread* process_thread, 57 ProcessThread* process_thread,
57 CallStats* call_stats, 58 CallStats* call_stats,
58 VieRemb* remb); 59 VieRemb* remb);
59 ~VideoReceiveStream() override; 60 ~VideoReceiveStream() override;
60 61
61 const Config& config() const { return config_; } 62 const Config& config() const { return config_; }
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 void OnCompleteFrame( 104 void OnCompleteFrame(
104 std::unique_ptr<video_coding::FrameObject> frame) override; 105 std::unique_ptr<video_coding::FrameObject> frame) override;
105 106
106 private: 107 private:
107 static bool DecodeThreadFunction(void* ptr); 108 static bool DecodeThreadFunction(void* ptr);
108 void Decode(); 109 void Decode();
109 110
110 TransportAdapter transport_adapter_; 111 TransportAdapter transport_adapter_;
111 const VideoReceiveStream::Config config_; 112 const VideoReceiveStream::Config config_;
112 const int num_cpu_cores_; 113 const int num_cpu_cores_;
114 const bool protected_by_flexfec_;
113 ProcessThread* const process_thread_; 115 ProcessThread* const process_thread_;
114 Clock* const clock_; 116 Clock* const clock_;
115 117
116 rtc::PlatformThread decode_thread_; 118 rtc::PlatformThread decode_thread_;
117 119
118 CongestionController* const congestion_controller_; 120 CongestionController* const congestion_controller_;
119 CallStats* const call_stats_; 121 CallStats* const call_stats_;
120 122
121 std::unique_ptr<VCMTiming> timing_; // Jitter buffer experiment. 123 std::unique_ptr<VCMTiming> timing_; // Jitter buffer experiment.
122 vcm::VideoReceiver video_receiver_; 124 vcm::VideoReceiver video_receiver_;
123 std::unique_ptr<rtc::VideoSinkInterface<VideoFrame>> incoming_video_stream_; 125 std::unique_ptr<rtc::VideoSinkInterface<VideoFrame>> incoming_video_stream_;
124 ReceiveStatisticsProxy stats_proxy_; 126 ReceiveStatisticsProxy stats_proxy_;
125 RtpStreamReceiver rtp_stream_receiver_; 127 RtpStreamReceiver rtp_stream_receiver_;
126 std::unique_ptr<VideoStreamDecoder> video_stream_decoder_; 128 std::unique_ptr<VideoStreamDecoder> video_stream_decoder_;
127 RtpStreamsSynchronizer rtp_stream_sync_; 129 RtpStreamsSynchronizer rtp_stream_sync_;
128 130
129 rtc::CriticalSection ivf_writer_lock_; 131 rtc::CriticalSection ivf_writer_lock_;
130 std::unique_ptr<IvfFileWriter> ivf_writer_ GUARDED_BY(ivf_writer_lock_); 132 std::unique_ptr<IvfFileWriter> ivf_writer_ GUARDED_BY(ivf_writer_lock_);
131 133
132 // Members for the new jitter buffer experiment. 134 // Members for the new jitter buffer experiment.
133 std::unique_ptr<VCMJitterEstimator> jitter_estimator_; 135 std::unique_ptr<VCMJitterEstimator> jitter_estimator_;
134 std::unique_ptr<video_coding::FrameBuffer> frame_buffer_; 136 std::unique_ptr<video_coding::FrameBuffer> frame_buffer_;
135 }; 137 };
136 } // namespace internal 138 } // namespace internal
137 } // namespace webrtc 139 } // namespace webrtc
138 140
139 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ 141 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698