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

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

Issue 2573593003: Rename RtpPayloadTypeRegistry::SetCodec() to ::AddCodec(). (Closed)
Patch Set: 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
« no previous file with comments | « webrtc/video/rtp_stream_receiver.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
319 VideoCodec codec = CreateDecoderVideoCodec(decoder); 319 VideoCodec codec = CreateDecoderVideoCodec(decoder);
320 RTC_CHECK(rtp_stream_receiver_.SetReceiveCodec(codec)); 320 RTC_CHECK(rtp_stream_receiver_.AddReceiveCodec(codec));
321 RTC_CHECK_EQ(VCM_OK, video_receiver_.RegisterReceiveCodec( 321 RTC_CHECK_EQ(VCM_OK, video_receiver_.RegisterReceiveCodec(
322 &codec, num_cpu_cores_, false)); 322 &codec, num_cpu_cores_, false));
323 } 323 }
324 324
325 video_stream_decoder_.reset(new VideoStreamDecoder( 325 video_stream_decoder_.reset(new VideoStreamDecoder(
326 &video_receiver_, &rtp_stream_receiver_, &rtp_stream_receiver_, 326 &video_receiver_, &rtp_stream_receiver_, &rtp_stream_receiver_,
327 rtp_stream_receiver_.IsRetransmissionsEnabled(), 327 rtp_stream_receiver_.IsRetransmissionsEnabled(),
328 rtp_stream_receiver_.IsUlpfecEnabled(), &stats_proxy_, renderer, 328 rtp_stream_receiver_.IsUlpfecEnabled(), &stats_proxy_, renderer,
329 config_.pre_render_callback)); 329 config_.pre_render_callback));
330 // Register the channel to receive stats updates. 330 // Register the channel to receive stats updates.
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 RequestKeyFrame(); 486 RequestKeyFrame();
487 } 487 }
488 } 488 }
489 489
490 void VideoReceiveStream::RequestKeyFrame() { 490 void VideoReceiveStream::RequestKeyFrame() {
491 rtp_stream_receiver_.RequestKeyFrame(); 491 rtp_stream_receiver_.RequestKeyFrame();
492 } 492 }
493 493
494 } // namespace internal 494 } // namespace internal
495 } // namespace webrtc 495 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/rtp_stream_receiver.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698