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

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

Issue 2528993002: Revert of Remove RTPPayloadStrategy and simplify RTPPayloadRegistry (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/modules/video_coding/test/rtp_player.cc ('k') | webrtc/voice_engine/channel.cc » ('j') | 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) 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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 video_coding::OnCompleteFrameCallback* complete_frame_callback, 99 video_coding::OnCompleteFrameCallback* complete_frame_callback,
100 VCMTiming* timing) 100 VCMTiming* timing)
101 : clock_(Clock::GetRealTimeClock()), 101 : clock_(Clock::GetRealTimeClock()),
102 config_(*config), 102 config_(*config),
103 video_receiver_(video_receiver), 103 video_receiver_(video_receiver),
104 remote_bitrate_estimator_(remote_bitrate_estimator), 104 remote_bitrate_estimator_(remote_bitrate_estimator),
105 packet_router_(packet_router), 105 packet_router_(packet_router),
106 remb_(remb), 106 remb_(remb),
107 process_thread_(process_thread), 107 process_thread_(process_thread),
108 ntp_estimator_(clock_), 108 ntp_estimator_(clock_),
109 rtp_payload_registry_(RTPPayloadStrategy::CreateStrategy(false)),
109 rtp_header_parser_(RtpHeaderParser::Create()), 110 rtp_header_parser_(RtpHeaderParser::Create()),
110 rtp_receiver_(RtpReceiver::CreateVideoReceiver(clock_, 111 rtp_receiver_(RtpReceiver::CreateVideoReceiver(clock_,
111 this, 112 this,
112 this, 113 this,
113 &rtp_payload_registry_)), 114 &rtp_payload_registry_)),
114 rtp_receive_statistics_(ReceiveStatistics::Create(clock_)), 115 rtp_receive_statistics_(ReceiveStatistics::Create(clock_)),
115 ulpfec_receiver_(UlpfecReceiver::Create(this)), 116 ulpfec_receiver_(UlpfecReceiver::Create(this)),
116 receiving_(false), 117 receiving_(false),
117 restored_packet_in_use_(false), 118 restored_packet_in_use_(false),
118 last_packet_log_ms_(-1), 119 last_packet_log_ms_(-1),
(...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 const std::string& extension, int id) { 637 const std::string& extension, int id) {
637 // One-byte-extension local identifiers are in the range 1-14 inclusive. 638 // One-byte-extension local identifiers are in the range 1-14 inclusive.
638 RTC_DCHECK_GE(id, 1); 639 RTC_DCHECK_GE(id, 1);
639 RTC_DCHECK_LE(id, 14); 640 RTC_DCHECK_LE(id, 14);
640 RTC_DCHECK(RtpExtension::IsSupportedForVideo(extension)); 641 RTC_DCHECK(RtpExtension::IsSupportedForVideo(extension));
641 RTC_CHECK(rtp_header_parser_->RegisterRtpHeaderExtension( 642 RTC_CHECK(rtp_header_parser_->RegisterRtpHeaderExtension(
642 StringToRtpExtensionType(extension), id)); 643 StringToRtpExtensionType(extension), id));
643 } 644 }
644 645
645 } // namespace webrtc 646 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/test/rtp_player.cc ('k') | webrtc/voice_engine/channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698