| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 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 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 306 incoming_video_stream_.reset( | 306 incoming_video_stream_.reset( |
| 307 new IncomingVideoStream(config_.render_delay_ms, this)); | 307 new IncomingVideoStream(config_.render_delay_ms, this)); |
| 308 renderer = incoming_video_stream_.get(); | 308 renderer = incoming_video_stream_.get(); |
| 309 } | 309 } |
| 310 } | 310 } |
| 311 RTC_DCHECK(renderer != nullptr); | 311 RTC_DCHECK(renderer != nullptr); |
| 312 | 312 |
| 313 for (const Decoder& decoder : config_.decoders) { | 313 for (const Decoder& decoder : config_.decoders) { |
| 314 video_receiver_.RegisterExternalDecoder(decoder.decoder, | 314 video_receiver_.RegisterExternalDecoder(decoder.decoder, |
| 315 decoder.payload_type); | 315 decoder.payload_type); |
| 316 // TODO(johan): make Decoder.codec_params accessible for RtpStreamReceiver | |
| 317 // which holds H264SpsPpsTracker | |
| 318 VideoCodec codec = CreateDecoderVideoCodec(decoder); | 316 VideoCodec codec = CreateDecoderVideoCodec(decoder); |
| 319 RTC_CHECK(rtp_stream_receiver_.AddReceiveCodec(codec)); | 317 RTC_CHECK( |
| 318 rtp_stream_receiver_.AddReceiveCodec(codec, decoder.codec_params)); |
| 320 RTC_CHECK_EQ(VCM_OK, video_receiver_.RegisterReceiveCodec( | 319 RTC_CHECK_EQ(VCM_OK, video_receiver_.RegisterReceiveCodec( |
| 321 &codec, num_cpu_cores_, false)); | 320 &codec, num_cpu_cores_, false)); |
| 322 } | 321 } |
| 323 | 322 |
| 324 video_stream_decoder_.reset(new VideoStreamDecoder( | 323 video_stream_decoder_.reset(new VideoStreamDecoder( |
| 325 &video_receiver_, &rtp_stream_receiver_, &rtp_stream_receiver_, | 324 &video_receiver_, &rtp_stream_receiver_, &rtp_stream_receiver_, |
| 326 rtp_stream_receiver_.IsRetransmissionsEnabled(), | 325 rtp_stream_receiver_.IsRetransmissionsEnabled(), |
| 327 rtp_stream_receiver_.IsUlpfecEnabled(), &stats_proxy_, renderer, | 326 rtp_stream_receiver_.IsUlpfecEnabled(), &stats_proxy_, renderer, |
| 328 config_.pre_render_callback)); | 327 config_.pre_render_callback)); |
| 329 // Register the channel to receive stats updates. | 328 // Register the channel to receive stats updates. |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 485 RequestKeyFrame(); | 484 RequestKeyFrame(); |
| 486 } | 485 } |
| 487 } | 486 } |
| 488 | 487 |
| 489 void VideoReceiveStream::RequestKeyFrame() { | 488 void VideoReceiveStream::RequestKeyFrame() { |
| 490 rtp_stream_receiver_.RequestKeyFrame(); | 489 rtp_stream_receiver_.RequestKeyFrame(); |
| 491 } | 490 } |
| 492 | 491 |
| 493 } // namespace internal | 492 } // namespace internal |
| 494 } // namespace webrtc | 493 } // namespace webrtc |
| OLD | NEW |