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

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

Issue 2789843002: Delete VieRemb class, move functionality to PacketRouter. (Closed)
Patch Set: Delete obsolete suppression for PacketRouterTest.SendTransportFeedback. Created 3 years, 8 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/video_receive_stream.cc ('k') | webrtc/video/video_send_stream.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 2017 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2017 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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 h264_decoder.decoder = &mock_h264_video_decoder_; 86 h264_decoder.decoder = &mock_h264_video_decoder_;
87 config_.decoders.push_back(h264_decoder); 87 config_.decoders.push_back(h264_decoder);
88 VideoReceiveStream::Decoder null_decoder; 88 VideoReceiveStream::Decoder null_decoder;
89 null_decoder.payload_type = 98; 89 null_decoder.payload_type = 98;
90 null_decoder.payload_name = "null"; 90 null_decoder.payload_name = "null";
91 null_decoder.decoder = &mock_null_video_decoder_; 91 null_decoder.decoder = &mock_null_video_decoder_;
92 config_.decoders.push_back(null_decoder); 92 config_.decoders.push_back(null_decoder);
93 93
94 video_receive_stream_.reset(new webrtc::internal::VideoReceiveStream( 94 video_receive_stream_.reset(new webrtc::internal::VideoReceiveStream(
95 kDefaultNumCpuCores, 95 kDefaultNumCpuCores,
96 &packet_router_, config_.Copy(), process_thread_.get(), &call_stats_, 96 &packet_router_, config_.Copy(), process_thread_.get(), &call_stats_));
97 nullptr)); // remb
98 } 97 }
99 98
100 protected: 99 protected:
101 webrtc::test::ScopedFieldTrials override_field_trials_; 100 webrtc::test::ScopedFieldTrials override_field_trials_;
102 VideoReceiveStream::Config config_; 101 VideoReceiveStream::Config config_;
103 CallStats call_stats_; 102 CallStats call_stats_;
104 MockVideoDecoder mock_h264_video_decoder_; 103 MockVideoDecoder mock_h264_video_decoder_;
105 MockVideoDecoder mock_null_video_decoder_; 104 MockVideoDecoder mock_null_video_decoder_;
106 cricket::FakeVideoRenderer fake_renderer_; 105 cricket::FakeVideoRenderer fake_renderer_;
107 MockTransport mock_transport_; 106 MockTransport mock_transport_;
(...skipping 23 matching lines...) Expand all
131 video_receive_stream_->Start(); 130 video_receive_stream_->Start();
132 EXPECT_CALL(mock_h264_video_decoder_, Decode(_, false, _, _, _)); 131 EXPECT_CALL(mock_h264_video_decoder_, Decode(_, false, _, _, _));
133 EXPECT_EQ(true, 132 EXPECT_EQ(true,
134 video_receive_stream_->OnRecoveredPacket(rtppacket.data(), 133 video_receive_stream_->OnRecoveredPacket(rtppacket.data(),
135 rtppacket.size())); 134 rtppacket.size()));
136 EXPECT_CALL(mock_h264_video_decoder_, Release()); 135 EXPECT_CALL(mock_h264_video_decoder_, Release());
137 // Make sure the decoder thread had a chance to run. 136 // Make sure the decoder thread had a chance to run.
138 init_decode_event_.Wait(kDefaultTimeOutMs); 137 init_decode_event_.Wait(kDefaultTimeOutMs);
139 } 138 }
140 } // namespace webrtc 139 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/video_receive_stream.cc ('k') | webrtc/video/video_send_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698