| Index: chrome/browser/media/webrtc/webrtc_browsertest.cc
|
| diff --git a/chrome/browser/media/webrtc/webrtc_browsertest.cc b/chrome/browser/media/webrtc/webrtc_browsertest.cc
|
| index 3fce9260e8440e0fe129b4ba80f1171dab72e51e..70b5ba70770472f6680cefe54d931c46dc3cd439 100644
|
| --- a/chrome/browser/media/webrtc/webrtc_browsertest.cc
|
| +++ b/chrome/browser/media/webrtc/webrtc_browsertest.cc
|
| @@ -52,6 +52,7 @@ class WebRtcBrowserTest : public WebRtcTestBase {
|
|
|
| void RunsAudioVideoWebRTCCallInTwoTabs(
|
| const std::string& video_codec = WebRtcTestBase::kUseDefaultVideoCodec,
|
| + bool prefer_hw_video_codec = false,
|
| const std::string& offer_cert_keygen_alg =
|
| WebRtcTestBase::kUseDefaultCertKeygen,
|
| const std::string& answer_cert_keygen_alg =
|
| @@ -62,8 +63,8 @@ class WebRtcBrowserTest : public WebRtcTestBase {
|
| SetupPeerconnectionWithLocalStream(right_tab_, answer_cert_keygen_alg);
|
|
|
| if (!video_codec.empty()) {
|
| - SetDefaultVideoCodec(left_tab_, video_codec);
|
| - SetDefaultVideoCodec(right_tab_, video_codec);
|
| + SetDefaultVideoCodec(left_tab_, video_codec, prefer_hw_video_codec);
|
| + SetDefaultVideoCodec(right_tab_, video_codec, prefer_hw_video_codec);
|
| }
|
| NegotiateCall(left_tab_, right_tab_);
|
|
|
| @@ -137,7 +138,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
|
| "(test \"OK\")";
|
| return;
|
| }
|
| - RunsAudioVideoWebRTCCallInTwoTabs("H264");
|
| + RunsAudioVideoWebRTCCallInTwoTabs("H264", true /* prefer_hw_video_codec */);
|
| }
|
|
|
| #endif // BUILDFLAG(RTC_USE_H264)
|
| @@ -160,15 +161,15 @@ IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, TestWebAudioMediaStream) {
|
| IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
|
| RunsAudioVideoWebRTCCallInTwoTabsOfferRsaAnswerRsa) {
|
| RunsAudioVideoWebRTCCallInTwoTabs(WebRtcTestBase::kUseDefaultVideoCodec,
|
| - kKeygenAlgorithmRsa,
|
| - kKeygenAlgorithmRsa);
|
| + false /* prefer_hw_video_codec */,
|
| + kKeygenAlgorithmRsa, kKeygenAlgorithmRsa);
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
|
| RunsAudioVideoWebRTCCallInTwoTabsOfferEcdsaAnswerEcdsa) {
|
| - RunsAudioVideoWebRTCCallInTwoTabs(WebRtcTestBase::kUseDefaultVideoCodec,
|
| - kKeygenAlgorithmEcdsa,
|
| - kKeygenAlgorithmEcdsa);
|
| + RunsAudioVideoWebRTCCallInTwoTabs(
|
| + WebRtcTestBase::kUseDefaultVideoCodec, false /* prefer_hw_video_codec */,
|
| + kKeygenAlgorithmEcdsa, kKeygenAlgorithmEcdsa);
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(
|
| @@ -186,15 +187,15 @@ IN_PROC_BROWSER_TEST_F(
|
| IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
|
| RunsAudioVideoWebRTCCallInTwoTabsOfferRsaAnswerEcdsa) {
|
| RunsAudioVideoWebRTCCallInTwoTabs(WebRtcTestBase::kUseDefaultVideoCodec,
|
| - kKeygenAlgorithmRsa,
|
| - kKeygenAlgorithmEcdsa);
|
| + false /* prefer_hw_video_codec */,
|
| + kKeygenAlgorithmRsa, kKeygenAlgorithmEcdsa);
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
|
| RunsAudioVideoWebRTCCallInTwoTabsOfferEcdsaAnswerRsa) {
|
| RunsAudioVideoWebRTCCallInTwoTabs(WebRtcTestBase::kUseDefaultVideoCodec,
|
| - kKeygenAlgorithmEcdsa,
|
| - kKeygenAlgorithmRsa);
|
| + false /* prefer_hw_video_codec */,
|
| + kKeygenAlgorithmEcdsa, kKeygenAlgorithmRsa);
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
|
|
|