Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(233)

Side by Side Diff: webrtc/video/video_receive_stream.cc

Issue 2565173009: Wire up H264 fmtp sprop-parameter-sets with H264SpsPpsTracker. (Closed)
Patch Set: Added comment. Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 incoming_video_stream_.reset( 308 incoming_video_stream_.reset(
309 new IncomingVideoStream(config_.render_delay_ms, this)); 309 new IncomingVideoStream(config_.render_delay_ms, this));
310 renderer = incoming_video_stream_.get(); 310 renderer = incoming_video_stream_.get();
311 } 311 }
312 } 312 }
313 RTC_DCHECK(renderer != nullptr); 313 RTC_DCHECK(renderer != nullptr);
314 314
315 for (const Decoder& decoder : config_.decoders) { 315 for (const Decoder& decoder : config_.decoders) {
316 video_receiver_.RegisterExternalDecoder(decoder.decoder, 316 video_receiver_.RegisterExternalDecoder(decoder.decoder,
317 decoder.payload_type); 317 decoder.payload_type);
318 318 // TODO(johan): make Decoder.codec_params accessible for RtpStreamReceiver
319 // which holds H264SpsPpsTracker
319 VideoCodec codec = CreateDecoderVideoCodec(decoder); 320 VideoCodec codec = CreateDecoderVideoCodec(decoder);
320 RTC_CHECK(rtp_stream_receiver_.AddReceiveCodec(codec)); 321 RTC_CHECK(rtp_stream_receiver_.AddReceiveCodec(codec));
321 RTC_CHECK_EQ(VCM_OK, video_receiver_.RegisterReceiveCodec( 322 RTC_CHECK_EQ(VCM_OK, video_receiver_.RegisterReceiveCodec(
322 &codec, num_cpu_cores_, false)); 323 &codec, num_cpu_cores_, false));
323 } 324 }
324 325
325 video_stream_decoder_.reset(new VideoStreamDecoder( 326 video_stream_decoder_.reset(new VideoStreamDecoder(
326 &video_receiver_, &rtp_stream_receiver_, &rtp_stream_receiver_, 327 &video_receiver_, &rtp_stream_receiver_, &rtp_stream_receiver_,
327 rtp_stream_receiver_.IsRetransmissionsEnabled(), 328 rtp_stream_receiver_.IsRetransmissionsEnabled(),
328 rtp_stream_receiver_.IsUlpfecEnabled(), &stats_proxy_, renderer, 329 rtp_stream_receiver_.IsUlpfecEnabled(), &stats_proxy_, renderer,
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 RequestKeyFrame(); 487 RequestKeyFrame();
487 } 488 }
488 } 489 }
489 490
490 void VideoReceiveStream::RequestKeyFrame() { 491 void VideoReceiveStream::RequestKeyFrame() {
491 rtp_stream_receiver_.RequestKeyFrame(); 492 rtp_stream_receiver_.RequestKeyFrame();
492 } 493 }
493 494
494 } // namespace internal 495 } // namespace internal
495 } // namespace webrtc 496 } // namespace webrtc
OLDNEW
« webrtc/video/rtp_stream_receiver.cc ('K') | « webrtc/video/rtp_stream_receiver.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698