| 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 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 // Do not acquire the lock of |video_receiver_| in this function. Decode | 162 // Do not acquire the lock of |video_receiver_| in this function. Decode |
| 163 // callback won't necessarily be called from the decoding thread. The decoding | 163 // callback won't necessarily be called from the decoding thread. The decoding |
| 164 // thread may have held the lock when calling VideoDecoder::Decode, Reset, or | 164 // thread may have held the lock when calling VideoDecoder::Decode, Reset, or |
| 165 // Release. Acquiring the same lock in the path of decode callback can deadlock. | 165 // Release. Acquiring the same lock in the path of decode callback can deadlock. |
| 166 int32_t ViEChannel::FrameToRender(VideoFrame& video_frame) { // NOLINT | 166 int32_t ViEChannel::FrameToRender(VideoFrame& video_frame) { // NOLINT |
| 167 rtc::CritScope lock(&crit_); | 167 rtc::CritScope lock(&crit_); |
| 168 | 168 |
| 169 if (pre_render_callback_) | 169 if (pre_render_callback_) |
| 170 pre_render_callback_->FrameCallback(&video_frame); | 170 pre_render_callback_->FrameCallback(&video_frame); |
| 171 | 171 |
| 172 // TODO(pbos): Remove stream id argument. | 172 incoming_video_stream_->OnFrame(video_frame); |
| 173 incoming_video_stream_->RenderFrame(0xFFFFFFFF, video_frame); | |
| 174 return 0; | 173 return 0; |
| 175 } | 174 } |
| 176 | 175 |
| 177 int32_t ViEChannel::ReceivedDecodedReferenceFrame( | 176 int32_t ViEChannel::ReceivedDecodedReferenceFrame( |
| 178 const uint64_t picture_id) { | 177 const uint64_t picture_id) { |
| 179 return rtp_rtcp_->SendRTCPReferencePictureSelection(picture_id); | 178 return rtp_rtcp_->SendRTCPReferencePictureSelection(picture_id); |
| 180 } | 179 } |
| 181 | 180 |
| 182 void ViEChannel::OnIncomingPayloadType(int payload_type) { | 181 void ViEChannel::OnIncomingPayloadType(int payload_type) { |
| 183 rtc::CritScope lock(&crit_); | 182 rtc::CritScope lock(&crit_); |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 258 rtc::CritScope lock(&crit_); | 257 rtc::CritScope lock(&crit_); |
| 259 receive_stats_callback_ = receive_statistics_proxy; | 258 receive_stats_callback_ = receive_statistics_proxy; |
| 260 } | 259 } |
| 261 | 260 |
| 262 void ViEChannel::SetIncomingVideoStream( | 261 void ViEChannel::SetIncomingVideoStream( |
| 263 IncomingVideoStream* incoming_video_stream) { | 262 IncomingVideoStream* incoming_video_stream) { |
| 264 rtc::CritScope lock(&crit_); | 263 rtc::CritScope lock(&crit_); |
| 265 incoming_video_stream_ = incoming_video_stream; | 264 incoming_video_stream_ = incoming_video_stream; |
| 266 } | 265 } |
| 267 } // namespace webrtc | 266 } // namespace webrtc |
| OLD | NEW |