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 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
311 // Do not acquire the lock of |vcm_| in this function. Decode callback won't | 311 // Do not acquire the lock of |vcm_| in this function. Decode callback won't |
312 // necessarily be called from the decoding thread. The decoding thread may have | 312 // necessarily be called from the decoding thread. The decoding thread may have |
313 // held the lock when calling VideoDecoder::Decode, Reset, or Release. Acquiring | 313 // held the lock when calling VideoDecoder::Decode, Reset, or Release. Acquiring |
314 // the same lock in the path of decode callback can deadlock. | 314 // the same lock in the path of decode callback can deadlock. |
315 int32_t ViEChannel::FrameToRender(VideoFrame& video_frame) { // NOLINT | 315 int32_t ViEChannel::FrameToRender(VideoFrame& video_frame) { // NOLINT |
316 rtc::CritScope lock(&crit_); | 316 rtc::CritScope lock(&crit_); |
317 | 317 |
318 if (pre_render_callback_ != NULL) | 318 if (pre_render_callback_ != NULL) |
319 pre_render_callback_->FrameCallback(&video_frame); | 319 pre_render_callback_->FrameCallback(&video_frame); |
320 | 320 |
321 // TODO(pbos): Remove stream id argument. | 321 incoming_video_stream_->OnFrame(video_frame); |
322 incoming_video_stream_->RenderFrame(0xFFFFFFFF, video_frame); | |
323 return 0; | 322 return 0; |
324 } | 323 } |
325 | 324 |
326 int32_t ViEChannel::ReceivedDecodedReferenceFrame( | 325 int32_t ViEChannel::ReceivedDecodedReferenceFrame( |
327 const uint64_t picture_id) { | 326 const uint64_t picture_id) { |
328 return rtp_rtcp_modules_[0]->SendRTCPReferencePictureSelection(picture_id); | 327 return rtp_rtcp_modules_[0]->SendRTCPReferencePictureSelection(picture_id); |
329 } | 328 } |
330 | 329 |
331 void ViEChannel::OnIncomingPayloadType(int payload_type) { | 330 void ViEChannel::OnIncomingPayloadType(int payload_type) { |
332 rtc::CritScope lock(&crit_); | 331 rtc::CritScope lock(&crit_); |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
506 rtc::CritScope lock(&crit_); | 505 rtc::CritScope lock(&crit_); |
507 receive_stats_callback_ = receive_statistics_proxy; | 506 receive_stats_callback_ = receive_statistics_proxy; |
508 } | 507 } |
509 | 508 |
510 void ViEChannel::SetIncomingVideoStream( | 509 void ViEChannel::SetIncomingVideoStream( |
511 IncomingVideoStream* incoming_video_stream) { | 510 IncomingVideoStream* incoming_video_stream) { |
512 rtc::CritScope lock(&crit_); | 511 rtc::CritScope lock(&crit_); |
513 incoming_video_stream_ = incoming_video_stream; | 512 incoming_video_stream_ = incoming_video_stream; |
514 } | 513 } |
515 } // namespace webrtc | 514 } // namespace webrtc |
OLD | NEW |