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

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

Issue 2453243003: Remove voe::Channel::StopReceive() and associated logic. (Closed)
Patch Set: comment Created 4 years, 1 month 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/test/call_test.cc ('k') | webrtc/voice_engine/channel.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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 "webrtc/video/video_quality_test.h" 10 #include "webrtc/video/video_quality_test.h"
(...skipping 1348 matching lines...) Expand 10 before | Expand all | Expand 10 after
1359 1359
1360 // Start sending and receiving video. 1360 // Start sending and receiving video.
1361 video_receive_stream->Start(); 1361 video_receive_stream->Start();
1362 video_send_stream_->Start(); 1362 video_send_stream_->Start();
1363 capturer_->Start(); 1363 capturer_->Start();
1364 1364
1365 if (params_.audio.enabled) { 1365 if (params_.audio.enabled) {
1366 // Start receiving audio. 1366 // Start receiving audio.
1367 audio_receive_stream->Start(); 1367 audio_receive_stream->Start();
1368 EXPECT_EQ(0, voe.base->StartPlayout(voe.receive_channel_id)); 1368 EXPECT_EQ(0, voe.base->StartPlayout(voe.receive_channel_id));
1369 EXPECT_EQ(0, voe.base->StartReceive(voe.receive_channel_id));
1370 1369
1371 // Start sending audio. 1370 // Start sending audio.
1372 audio_send_stream_->Start(); 1371 audio_send_stream_->Start();
1373 EXPECT_EQ(0, voe.base->StartSend(voe.send_channel_id)); 1372 EXPECT_EQ(0, voe.base->StartSend(voe.send_channel_id));
1374 } 1373 }
1375 1374
1376 test::PressEnterToContinue(); 1375 test::PressEnterToContinue();
1377 1376
1378 if (params_.audio.enabled) { 1377 if (params_.audio.enabled) {
1379 // Stop sending audio. 1378 // Stop sending audio.
1380 EXPECT_EQ(0, voe.base->StopSend(voe.send_channel_id)); 1379 EXPECT_EQ(0, voe.base->StopSend(voe.send_channel_id));
1381 audio_send_stream_->Stop(); 1380 audio_send_stream_->Stop();
1382 1381
1383 // Stop receiving audio. 1382 // Stop receiving audio.
1384 EXPECT_EQ(0, voe.base->StopReceive(voe.receive_channel_id));
1385 EXPECT_EQ(0, voe.base->StopPlayout(voe.receive_channel_id)); 1383 EXPECT_EQ(0, voe.base->StopPlayout(voe.receive_channel_id));
1386 audio_receive_stream->Stop(); 1384 audio_receive_stream->Stop();
1387 } 1385 }
1388 1386
1389 // Stop receiving and sending video. 1387 // Stop receiving and sending video.
1390 capturer_->Stop(); 1388 capturer_->Stop();
1391 video_send_stream_->Stop(); 1389 video_send_stream_->Stop();
1392 video_receive_stream->Stop(); 1390 video_receive_stream->Stop();
1393 1391
1394 call->DestroyVideoReceiveStream(video_receive_stream); 1392 call->DestroyVideoReceiveStream(video_receive_stream);
(...skipping 28 matching lines...) Expand all
1423 std::ostringstream str; 1421 std::ostringstream str;
1424 str << receive_logs_++; 1422 str << receive_logs_++;
1425 std::string path = 1423 std::string path =
1426 params_.video.encoded_frame_base_path + "." + str.str() + ".recv.ivf"; 1424 params_.video.encoded_frame_base_path + "." + str.str() + ".recv.ivf";
1427 stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path), 1425 stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path),
1428 10000000); 1426 10000000);
1429 } 1427 }
1430 } 1428 }
1431 1429
1432 } // namespace webrtc 1430 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/test/call_test.cc ('k') | webrtc/voice_engine/channel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698