| 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 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 337 call_stats_->DeregisterStatsObserver(video_stream_decoder_.get()); | 337 call_stats_->DeregisterStatsObserver(video_stream_decoder_.get()); |
| 338 video_stream_decoder_.reset(); | 338 video_stream_decoder_.reset(); |
| 339 incoming_video_stream_.reset(); | 339 incoming_video_stream_.reset(); |
| 340 transport_adapter_.Disable(); | 340 transport_adapter_.Disable(); |
| 341 } | 341 } |
| 342 | 342 |
| 343 VideoReceiveStream::Stats VideoReceiveStream::GetStats() const { | 343 VideoReceiveStream::Stats VideoReceiveStream::GetStats() const { |
| 344 return stats_proxy_.GetStats(); | 344 return stats_proxy_.GetStats(); |
| 345 } | 345 } |
| 346 | 346 |
| 347 rtc::Optional<TimingFrameInfo> |
| 348 VideoReceiveStream::GetAndResetTimingFrameInfo() { |
| 349 return stats_proxy_.GetAndResetTimingFrameInfo(); |
| 350 } |
| 351 |
| 347 void VideoReceiveStream::EnableEncodedFrameRecording(rtc::PlatformFile file, | 352 void VideoReceiveStream::EnableEncodedFrameRecording(rtc::PlatformFile file, |
| 348 size_t byte_limit) { | 353 size_t byte_limit) { |
| 349 { | 354 { |
| 350 rtc::CritScope lock(&ivf_writer_lock_); | 355 rtc::CritScope lock(&ivf_writer_lock_); |
| 351 if (file == rtc::kInvalidPlatformFileValue) { | 356 if (file == rtc::kInvalidPlatformFileValue) { |
| 352 ivf_writer_.reset(); | 357 ivf_writer_.reset(); |
| 353 } else { | 358 } else { |
| 354 ivf_writer_ = IvfFileWriter::Wrap(rtc::File(file), byte_limit); | 359 ivf_writer_ = IvfFileWriter::Wrap(rtc::File(file), byte_limit); |
| 355 } | 360 } |
| 356 } | 361 } |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 512 if (stream_is_active && !receiving_keyframe) { | 517 if (stream_is_active && !receiving_keyframe) { |
| 513 LOG(LS_WARNING) << "No decodable frame in " << kMaxWaitForFrameMs | 518 LOG(LS_WARNING) << "No decodable frame in " << kMaxWaitForFrameMs |
| 514 << " ms, requesting keyframe."; | 519 << " ms, requesting keyframe."; |
| 515 RequestKeyFrame(); | 520 RequestKeyFrame(); |
| 516 } | 521 } |
| 517 } | 522 } |
| 518 return true; | 523 return true; |
| 519 } | 524 } |
| 520 } // namespace internal | 525 } // namespace internal |
| 521 } // namespace webrtc | 526 } // namespace webrtc |
| OLD | NEW |