| 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 video_receiver_->RegisterDecoderTimingCallback(nullptr); | 68 video_receiver_->RegisterDecoderTimingCallback(nullptr); |
| 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) { // NOLINT | 78 int32_t VideoStreamDecoder::FrameToRender(VideoFrame& video_frame, |
| 79 rtc::Optional<uint8_t> qp) { |
| 79 if (pre_render_callback_) { | 80 if (pre_render_callback_) { |
| 80 // Post processing is not supported if the frame is backed by a texture. | 81 // Post processing is not supported if the frame is backed by a texture. |
| 81 if (!video_frame.video_frame_buffer()->native_handle()) { | 82 if (!video_frame.video_frame_buffer()->native_handle()) { |
| 82 pre_render_callback_->FrameCallback(&video_frame); | 83 pre_render_callback_->FrameCallback(&video_frame); |
| 83 } | 84 } |
| 84 } | 85 } |
| 85 | 86 |
| 87 receive_stats_callback_->OnDecodedFrame(qp); |
| 86 incoming_video_stream_->OnFrame(video_frame); | 88 incoming_video_stream_->OnFrame(video_frame); |
| 87 | 89 |
| 88 return 0; | 90 return 0; |
| 89 } | 91 } |
| 90 | 92 |
| 91 int32_t VideoStreamDecoder::ReceivedDecodedReferenceFrame( | 93 int32_t VideoStreamDecoder::ReceivedDecodedReferenceFrame( |
| 92 const uint64_t picture_id) { | 94 const uint64_t picture_id) { |
| 93 RTC_NOTREACHED(); | 95 RTC_NOTREACHED(); |
| 94 return 0; | 96 return 0; |
| 95 } | 97 } |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 | 136 |
| 135 void VideoStreamDecoder::OnCompleteFrame(bool is_keyframe, size_t size_bytes) {} | 137 void VideoStreamDecoder::OnCompleteFrame(bool is_keyframe, size_t size_bytes) {} |
| 136 | 138 |
| 137 void VideoStreamDecoder::OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) { | 139 void VideoStreamDecoder::OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) { |
| 138 video_receiver_->SetReceiveChannelParameters(max_rtt_ms); | 140 video_receiver_->SetReceiveChannelParameters(max_rtt_ms); |
| 139 | 141 |
| 140 rtc::CritScope lock(&crit_); | 142 rtc::CritScope lock(&crit_); |
| 141 last_rtt_ms_ = avg_rtt_ms; | 143 last_rtt_ms_ = avg_rtt_ms; |
| 142 } | 144 } |
| 143 } // namespace webrtc | 145 } // namespace webrtc |
| OLD | NEW |