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

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

Issue 3010983002: Revert of Use RtxReceiveStream. (Closed)
Patch Set: Created 3 years, 3 months 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/BUILD.gn ('k') | webrtc/video/rtp_video_stream_receiver.h » ('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) 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 #include <algorithm> 10 #include <algorithm>
(...skipping 1166 matching lines...) Expand 10 before | Expand all | Expand 10 after
1177 send_config->rtp.ulpfec.red_payload_type; 1177 send_config->rtp.ulpfec.red_payload_type;
1178 (*receive_configs)[0].rtp.ulpfec.red_rtx_payload_type = 1178 (*receive_configs)[0].rtp.ulpfec.red_rtx_payload_type =
1179 send_config->rtp.ulpfec.red_rtx_payload_type; 1179 send_config->rtp.ulpfec.red_rtx_payload_type;
1180 } 1180 }
1181 1181
1182 if (retransmission_ssrc_ == kSendRtxSsrcs[0]) { 1182 if (retransmission_ssrc_ == kSendRtxSsrcs[0]) {
1183 send_config->rtp.rtx.ssrcs.push_back(kSendRtxSsrcs[0]); 1183 send_config->rtp.rtx.ssrcs.push_back(kSendRtxSsrcs[0]);
1184 send_config->rtp.rtx.payload_type = kSendRtxPayloadType; 1184 send_config->rtp.rtx.payload_type = kSendRtxPayloadType;
1185 (*receive_configs)[0].rtp.rtx_ssrc = kSendRtxSsrcs[0]; 1185 (*receive_configs)[0].rtp.rtx_ssrc = kSendRtxSsrcs[0];
1186 (*receive_configs)[0] 1186 (*receive_configs)[0]
1187 .rtp.rtx_associated_payload_types[(payload_type_ == kRedPayloadType) 1187 .rtp.rtx_associated_payload_types[kSendRtxPayloadType] =
1188 ? kRtxRedPayloadType
1189 : kSendRtxPayloadType] =
1190 payload_type_; 1188 payload_type_;
1191 } 1189 }
1192 // Configure encoding and decoding with VP8, since generic packetization 1190 // Configure encoding and decoding with VP8, since generic packetization
1193 // doesn't support FEC with NACK. 1191 // doesn't support FEC with NACK.
1194 RTC_DCHECK_EQ(1, (*receive_configs)[0].decoders.size()); 1192 RTC_DCHECK_EQ(1, (*receive_configs)[0].decoders.size());
1195 send_config->encoder_settings.encoder = encoder_.get(); 1193 send_config->encoder_settings.encoder = encoder_.get();
1196 send_config->encoder_settings.payload_name = "VP8"; 1194 send_config->encoder_settings.payload_name = "VP8";
1197 (*receive_configs)[0].decoders[0].payload_name = "VP8"; 1195 (*receive_configs)[0].decoders[0].payload_name = "VP8";
1198 } 1196 }
1199 1197
(...skipping 3824 matching lines...) Expand 10 before | Expand all | Expand 10 after
5024 std::unique_ptr<VideoEncoder> encoder_; 5022 std::unique_ptr<VideoEncoder> encoder_;
5025 std::unique_ptr<VideoDecoder> decoder_; 5023 std::unique_ptr<VideoDecoder> decoder_;
5026 rtc::CriticalSection crit_; 5024 rtc::CriticalSection crit_;
5027 int recorded_frames_ GUARDED_BY(crit_); 5025 int recorded_frames_ GUARDED_BY(crit_);
5028 } test(this); 5026 } test(this);
5029 5027
5030 RunBaseTest(&test); 5028 RunBaseTest(&test);
5031 } 5029 }
5032 5030
5033 } // namespace webrtc 5031 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/BUILD.gn ('k') | webrtc/video/rtp_video_stream_receiver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698