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