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

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

Issue 3008983002: Change reporting of timing frames conditions in GetStats on receive side (Closed)
Patch Set: Implement Tommi@ comments 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_receive_stream.h ('k') | no next file » | 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 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 call_stats_->DeregisterStatsObserver(video_stream_decoder_.get()); 239 call_stats_->DeregisterStatsObserver(video_stream_decoder_.get());
240 video_stream_decoder_.reset(); 240 video_stream_decoder_.reset();
241 incoming_video_stream_.reset(); 241 incoming_video_stream_.reset();
242 transport_adapter_.Disable(); 242 transport_adapter_.Disable();
243 } 243 }
244 244
245 VideoReceiveStream::Stats VideoReceiveStream::GetStats() const { 245 VideoReceiveStream::Stats VideoReceiveStream::GetStats() const {
246 return stats_proxy_.GetStats(); 246 return stats_proxy_.GetStats();
247 } 247 }
248 248
249 rtc::Optional<TimingFrameInfo>
250 VideoReceiveStream::GetAndResetTimingFrameInfo() {
251 return stats_proxy_.GetAndResetTimingFrameInfo();
252 }
253
254 void VideoReceiveStream::EnableEncodedFrameRecording(rtc::PlatformFile file, 249 void VideoReceiveStream::EnableEncodedFrameRecording(rtc::PlatformFile file,
255 size_t byte_limit) { 250 size_t byte_limit) {
256 { 251 {
257 rtc::CritScope lock(&ivf_writer_lock_); 252 rtc::CritScope lock(&ivf_writer_lock_);
258 if (file == rtc::kInvalidPlatformFileValue) { 253 if (file == rtc::kInvalidPlatformFileValue) {
259 ivf_writer_.reset(); 254 ivf_writer_.reset();
260 } else { 255 } else {
261 ivf_writer_ = IvfFileWriter::Wrap(rtc::File(file), byte_limit); 256 ivf_writer_ = IvfFileWriter::Wrap(rtc::File(file), byte_limit);
262 } 257 }
263 } 258 }
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 if (stream_is_active && !receiving_keyframe) { 437 if (stream_is_active && !receiving_keyframe) {
443 LOG(LS_WARNING) << "No decodable frame in " << wait_ms 438 LOG(LS_WARNING) << "No decodable frame in " << wait_ms
444 << " ms, requesting keyframe."; 439 << " ms, requesting keyframe.";
445 RequestKeyFrame(); 440 RequestKeyFrame();
446 } 441 }
447 } 442 }
448 return true; 443 return true;
449 } 444 }
450 } // namespace internal 445 } // namespace internal
451 } // namespace webrtc 446 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/video_receive_stream.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698