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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 // thread may have held the lock when calling VideoDecoder::Decode, Reset, or | 77 // thread may have held the lock when calling VideoDecoder::Decode, Reset, or |
78 // Release. Acquiring the same lock in the path of decode callback can deadlock. | 78 // Release. Acquiring the same lock in the path of decode callback can deadlock. |
79 int32_t VideoStreamDecoder::FrameToRender(VideoFrame& video_frame) { // NOLINT | 79 int32_t VideoStreamDecoder::FrameToRender(VideoFrame& video_frame) { // NOLINT |
80 if (pre_render_callback_) { | 80 if (pre_render_callback_) { |
81 // 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. |
82 if (!video_frame.video_frame_buffer()->native_handle()) { | 82 if (!video_frame.video_frame_buffer()->native_handle()) { |
83 pre_render_callback_->FrameCallback(&video_frame); | 83 pre_render_callback_->FrameCallback(&video_frame); |
84 } | 84 } |
85 } | 85 } |
86 | 86 |
87 if (incoming_video_stream_) | 87 incoming_video_stream_->OnFrame(video_frame); |
88 incoming_video_stream_->OnFrame(video_frame); | |
89 | 88 |
90 return 0; | 89 return 0; |
91 } | 90 } |
92 | 91 |
93 int32_t VideoStreamDecoder::ReceivedDecodedReferenceFrame( | 92 int32_t VideoStreamDecoder::ReceivedDecodedReferenceFrame( |
94 const uint64_t picture_id) { | 93 const uint64_t picture_id) { |
95 RTC_NOTREACHED(); | 94 RTC_NOTREACHED(); |
96 return 0; | 95 return 0; |
97 } | 96 } |
98 | 97 |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 jitter_buffer_ms, min_playout_delay_ms, render_delay_ms, last_rtt); | 135 jitter_buffer_ms, min_playout_delay_ms, render_delay_ms, last_rtt); |
137 } | 136 } |
138 | 137 |
139 void VideoStreamDecoder::OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) { | 138 void VideoStreamDecoder::OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) { |
140 video_receiver_->SetReceiveChannelParameters(max_rtt_ms); | 139 video_receiver_->SetReceiveChannelParameters(max_rtt_ms); |
141 | 140 |
142 rtc::CritScope lock(&crit_); | 141 rtc::CritScope lock(&crit_); |
143 last_rtt_ms_ = avg_rtt_ms; | 142 last_rtt_ms_ = avg_rtt_ms; |
144 } | 143 } |
145 } // namespace webrtc | 144 } // namespace webrtc |
OLD | NEW |