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

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

Issue 3012853002: Update thread annotiation macros to use RTC_ prefix (Closed)
Patch Set: Rebase Created 3 years, 3 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/video/video_quality_test.cc ('k') | webrtc/video/video_send_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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 127
128 std::unique_ptr<VCMTiming> timing_; // Jitter buffer experiment. 128 std::unique_ptr<VCMTiming> timing_; // Jitter buffer experiment.
129 vcm::VideoReceiver video_receiver_; 129 vcm::VideoReceiver video_receiver_;
130 std::unique_ptr<rtc::VideoSinkInterface<VideoFrame>> incoming_video_stream_; 130 std::unique_ptr<rtc::VideoSinkInterface<VideoFrame>> incoming_video_stream_;
131 ReceiveStatisticsProxy stats_proxy_; 131 ReceiveStatisticsProxy stats_proxy_;
132 RtpVideoStreamReceiver rtp_video_stream_receiver_; 132 RtpVideoStreamReceiver rtp_video_stream_receiver_;
133 std::unique_ptr<VideoStreamDecoder> video_stream_decoder_; 133 std::unique_ptr<VideoStreamDecoder> video_stream_decoder_;
134 RtpStreamsSynchronizer rtp_stream_sync_; 134 RtpStreamsSynchronizer rtp_stream_sync_;
135 135
136 rtc::CriticalSection ivf_writer_lock_; 136 rtc::CriticalSection ivf_writer_lock_;
137 std::unique_ptr<IvfFileWriter> ivf_writer_ GUARDED_BY(ivf_writer_lock_); 137 std::unique_ptr<IvfFileWriter> ivf_writer_ RTC_GUARDED_BY(ivf_writer_lock_);
138 138
139 // Members for the new jitter buffer experiment. 139 // Members for the new jitter buffer experiment.
140 std::unique_ptr<VCMJitterEstimator> jitter_estimator_; 140 std::unique_ptr<VCMJitterEstimator> jitter_estimator_;
141 std::unique_ptr<video_coding::FrameBuffer> frame_buffer_; 141 std::unique_ptr<video_coding::FrameBuffer> frame_buffer_;
142 142
143 std::unique_ptr<RtpStreamReceiverInterface> media_receiver_; 143 std::unique_ptr<RtpStreamReceiverInterface> media_receiver_;
144 std::unique_ptr<RtpStreamReceiverInterface> rtx_receiver_; 144 std::unique_ptr<RtpStreamReceiverInterface> rtx_receiver_;
145 145
146 // Whenever we are in an undecodable state (stream has just started or due to 146 // Whenever we are in an undecodable state (stream has just started or due to
147 // a decoding error) we require a keyframe to restart the stream. 147 // a decoding error) we require a keyframe to restart the stream.
148 bool keyframe_required_ = true; 148 bool keyframe_required_ = true;
149 149
150 // If we have successfully decoded any frame. 150 // If we have successfully decoded any frame.
151 bool frame_decoded_ = false; 151 bool frame_decoded_ = false;
152 }; 152 };
153 } // namespace internal 153 } // namespace internal
154 } // namespace webrtc 154 } // namespace webrtc
155 155
156 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ 156 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_
OLDNEW
« no previous file with comments | « webrtc/video/video_quality_test.cc ('k') | webrtc/video/video_send_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698