OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/macros.h" | 6 #include "base/macros.h" |
7 #include "base/strings/stringprintf.h" | 7 #include "base/strings/stringprintf.h" |
8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "content/browser/webrtc/webrtc_content_browsertest_base.h" | 9 #include "content/browser/webrtc/webrtc_content_browsertest_base.h" |
10 #include "content/public/common/content_switches.h" | 10 #include "content/public/common/content_switches.h" |
11 #include "content/public/test/browser_test_utils.h" | 11 #include "content/public/test/browser_test_utils.h" |
12 #include "content/public/test/content_browser_test_utils.h" | 12 #include "content/public/test/content_browser_test_utils.h" |
13 #include "media/base/media_switches.h" | 13 #include "media/base/media_switches.h" |
14 | 14 |
15 namespace { | 15 namespace { |
16 | 16 |
17 static const char kMediaRecorderHtmlFile[] = "/media/mediarecorder_test.html"; | 17 static const char kMediaRecorderHtmlFile[] = "/media/mediarecorder_test.html"; |
18 | 18 |
19 static struct EncodingParameters { | 19 static struct EncodingParameters { |
20 bool disable_accelerator; | 20 bool disable_accelerator; |
21 std::string mime_type; | 21 std::string mime_type; |
22 } const kEncodingParameters[] = { | 22 } const kEncodingParameters[] = { |
23 {true, "video/webm;codecs=VP8"}, | 23 {true, "video/webm;codecs=VP8"}, |
24 {true, "video/webm;codecs=VP9"}, | 24 {true, "video/webm;codecs=VP9"}, |
25 #if !defined(OS_ANDROID) | |
mcasas
2017/04/17 20:10:38
Don't use negative conditions: they are hard to re
braveyao
2017/04/18 16:15:38
Done.
| |
26 // OpenH264 is not supported on Android. | |
25 {true, "video/x-matroska;codecs=AVC1"}, | 27 {true, "video/x-matroska;codecs=AVC1"}, |
28 #endif | |
26 {false, ""}, // Instructs the platform to choose any accelerated codec. | 29 {false, ""}, // Instructs the platform to choose any accelerated codec. |
27 {false, "video/webm;codecs=VP8"}, | 30 {false, "video/webm;codecs=VP8"}, |
28 {false, "video/webm;codecs=VP9"}, | 31 {false, "video/webm;codecs=VP9"}, |
29 {false, "video/x-matroska;codecs=AVC1"}, | 32 {false, "video/x-matroska;codecs=AVC1"}, |
30 }; | 33 }; |
31 | 34 |
32 } // namespace | 35 } // namespace |
33 | 36 |
34 namespace content { | 37 namespace content { |
35 | 38 |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
184 RemovingTrackFromMediaStreamFiresErrorEvent) { | 187 RemovingTrackFromMediaStreamFiresErrorEvent) { |
185 MakeTypicalCall("testRemovingTrackFromMediaStreamFiresErrorEvent();", | 188 MakeTypicalCall("testRemovingTrackFromMediaStreamFiresErrorEvent();", |
186 kMediaRecorderHtmlFile); | 189 kMediaRecorderHtmlFile); |
187 } | 190 } |
188 | 191 |
189 INSTANTIATE_TEST_CASE_P(, | 192 INSTANTIATE_TEST_CASE_P(, |
190 WebRtcMediaRecorderTest, | 193 WebRtcMediaRecorderTest, |
191 testing::ValuesIn(kEncodingParameters)); | 194 testing::ValuesIn(kEncodingParameters)); |
192 | 195 |
193 } // namespace content | 196 } // namespace content |
OLD | NEW |