| Index: webrtc/video/video_quality_test.cc | 
| diff --git a/webrtc/video/video_quality_test.cc b/webrtc/video/video_quality_test.cc | 
| index f9440ad86c9441e41cf4dcc7758b1c1bfdc36ff5..72eb3a48e1b117b233f1e9b74549731568afc14f 100644 | 
| --- a/webrtc/video/video_quality_test.cc | 
| +++ b/webrtc/video/video_quality_test.cc | 
| @@ -28,6 +28,7 @@ | 
| #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" | 
| #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" | 
| #include "webrtc/system_wrappers/include/cpu_info.h" | 
| +#include "webrtc/test/encoder_settings.h" | 
| #include "webrtc/test/layer_filtering_transport.h" | 
| #include "webrtc/test/run_loop.h" | 
| #include "webrtc/test/statistics.h" | 
| @@ -1012,7 +1013,8 @@ void VideoQualityTest::SetupCommon(Transport* send_transport, | 
|  | 
| video_encoder_config_.min_transmit_bitrate_bps = | 
| params_.common.min_transmit_bps; | 
| -  video_encoder_config_.streams = params_.ss.streams; | 
| +  test::FillEncoderConfiguration(params_.ss.streams.size(), | 
| +                                 &video_encoder_config_); | 
| video_encoder_config_.spatial_layers = params_.ss.spatial_layers; | 
|  | 
| CreateMatchingReceiveConfigs(recv_transport); | 
| @@ -1311,7 +1313,7 @@ void VideoQualityTest::RunWithRenderers(const Params& params) { | 
| if (params_.audio_video_sync) | 
| audio_config.sync_group = kSyncGroup; | 
|  | 
| -    audio_receive_stream =call->CreateAudioReceiveStream(audio_config); | 
| +    audio_receive_stream = call->CreateAudioReceiveStream(audio_config); | 
|  | 
| const CodecInst kOpusInst = {120, "OPUS", 48000, 960, 2, 64000}; | 
| EXPECT_EQ(0, voe.codec->SetSendCodec(voe.send_channel_id, kOpusInst)); | 
|  |