OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2016 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 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
270 timing_->set_min_playout_delay(playout_delay.min_ms); | 270 timing_->set_min_playout_delay(playout_delay.min_ms); |
271 | 271 |
272 if (playout_delay.max_ms >= 0) | 272 if (playout_delay.max_ms >= 0) |
273 timing_->set_max_playout_delay(playout_delay.max_ms); | 273 timing_->set_max_playout_delay(playout_delay.max_ms); |
274 } | 274 } |
275 | 275 |
276 int FrameBuffer::InsertFrame(std::unique_ptr<FrameObject> frame) { | 276 int FrameBuffer::InsertFrame(std::unique_ptr<FrameObject> frame) { |
277 TRACE_EVENT0("webrtc", "FrameBuffer::InsertFrame"); | 277 TRACE_EVENT0("webrtc", "FrameBuffer::InsertFrame"); |
278 RTC_DCHECK(frame); | 278 RTC_DCHECK(frame); |
279 if (stats_callback_) | 279 if (stats_callback_) |
280 stats_callback_->OnCompleteFrame(frame->is_keyframe(), frame->size()); | 280 stats_callback_->OnCompleteFrame(frame->is_keyframe(), frame->size(), |
| 281 frame->contentType()); |
281 FrameKey key(frame->picture_id, frame->spatial_layer); | 282 FrameKey key(frame->picture_id, frame->spatial_layer); |
282 | 283 |
283 rtc::CritScope lock(&crit_); | 284 rtc::CritScope lock(&crit_); |
284 | 285 |
285 int last_continuous_picture_id = | 286 int last_continuous_picture_id = |
286 last_continuous_frame_it_ == frames_.end() | 287 last_continuous_frame_it_ == frames_.end() |
287 ? -1 | 288 ? -1 |
288 : last_continuous_frame_it_->first.picture_id; | 289 : last_continuous_frame_it_->first.picture_id; |
289 | 290 |
290 if (!ValidReferences(*frame)) { | 291 if (!ValidReferences(*frame)) { |
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
559 frames_.clear(); | 560 frames_.clear(); |
560 last_decoded_frame_it_ = frames_.end(); | 561 last_decoded_frame_it_ = frames_.end(); |
561 last_continuous_frame_it_ = frames_.end(); | 562 last_continuous_frame_it_ = frames_.end(); |
562 next_frame_it_ = frames_.end(); | 563 next_frame_it_ = frames_.end(); |
563 num_frames_history_ = 0; | 564 num_frames_history_ = 0; |
564 num_frames_buffered_ = 0; | 565 num_frames_buffered_ = 0; |
565 } | 566 } |
566 | 567 |
567 } // namespace video_coding | 568 } // namespace video_coding |
568 } // namespace webrtc | 569 } // namespace webrtc |
OLD | NEW |