| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 video_receiver_->RegisterDecoderTimingCallback(nullptr); | 66 video_receiver_->RegisterDecoderTimingCallback(nullptr); |
| 67 video_receiver_->RegisterReceiveStatisticsCallback(nullptr); | 67 video_receiver_->RegisterReceiveStatisticsCallback(nullptr); |
| 68 video_receiver_->RegisterFrameTypeCallback(nullptr); | 68 video_receiver_->RegisterFrameTypeCallback(nullptr); |
| 69 video_receiver_->RegisterReceiveCallback(nullptr); | 69 video_receiver_->RegisterReceiveCallback(nullptr); |
| 70 } | 70 } |
| 71 | 71 |
| 72 // Do not acquire the lock of |video_receiver_| in this function. Decode | 72 // Do not acquire the lock of |video_receiver_| in this function. Decode |
| 73 // callback won't necessarily be called from the decoding thread. The decoding | 73 // callback won't necessarily be called from the decoding thread. The decoding |
| 74 // thread may have held the lock when calling VideoDecoder::Decode, Reset, or | 74 // thread may have held the lock when calling VideoDecoder::Decode, Reset, or |
| 75 // Release. Acquiring the same lock in the path of decode callback can deadlock. | 75 // Release. Acquiring the same lock in the path of decode callback can deadlock. |
| 76 int32_t VideoStreamDecoder::FrameToRender(VideoFrame& video_frame) { // NOLINT | 76 int32_t VideoStreamDecoder::FrameToRender(VideoFrame& video_frame, |
| 77 rtc::Optional<uint8_t> qp) { |
| 78 receive_stats_callback_->OnDecodedFrame(qp); |
| 77 incoming_video_stream_->OnFrame(video_frame); | 79 incoming_video_stream_->OnFrame(video_frame); |
| 80 |
| 78 return 0; | 81 return 0; |
| 79 } | 82 } |
| 80 | 83 |
| 81 int32_t VideoStreamDecoder::ReceivedDecodedReferenceFrame( | 84 int32_t VideoStreamDecoder::ReceivedDecodedReferenceFrame( |
| 82 const uint64_t picture_id) { | 85 const uint64_t picture_id) { |
| 83 RTC_NOTREACHED(); | 86 RTC_NOTREACHED(); |
| 84 return 0; | 87 return 0; |
| 85 } | 88 } |
| 86 | 89 |
| 87 void VideoStreamDecoder::OnIncomingPayloadType(int payload_type) { | 90 void VideoStreamDecoder::OnIncomingPayloadType(int payload_type) { |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 | 127 |
| 125 void VideoStreamDecoder::OnCompleteFrame(bool is_keyframe, size_t size_bytes) {} | 128 void VideoStreamDecoder::OnCompleteFrame(bool is_keyframe, size_t size_bytes) {} |
| 126 | 129 |
| 127 void VideoStreamDecoder::OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) { | 130 void VideoStreamDecoder::OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) { |
| 128 video_receiver_->SetReceiveChannelParameters(max_rtt_ms); | 131 video_receiver_->SetReceiveChannelParameters(max_rtt_ms); |
| 129 | 132 |
| 130 rtc::CritScope lock(&crit_); | 133 rtc::CritScope lock(&crit_); |
| 131 last_rtt_ms_ = avg_rtt_ms; | 134 last_rtt_ms_ = avg_rtt_ms; |
| 132 } | 135 } |
| 133 } // namespace webrtc | 136 } // namespace webrtc |
| OLD | NEW |