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

Side by Side Diff: content/browser/webrtc/webrtc_media_recorder_browsertest.cc

Issue 2622273006: Revert of MediaRecorder: use VideoTrackRecorder::GetPreferredCodecId() when available (Closed)
Patch Set: Created 3 years, 11 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 | « no previous file | content/renderer/media/media_recorder_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 {true, "video/x-matroska;codecs=AVC1"}, 25 {true, "video/x-matroska;codecs=AVC1"},
26 {false, ""}, // Instructs the platform to choose any accelerated codec.
27 {false, "video/webm;codecs=VP8"}, 26 {false, "video/webm;codecs=VP8"},
28 {false, "video/webm;codecs=VP9"}, 27 {false, "video/webm;codecs=VP9"},
29 {false, "video/x-matroska;codecs=AVC1"}, 28 {false, "video/x-matroska;codecs=AVC1"},
30 }; 29 };
31 30
32 } // namespace 31 } // namespace
33 32
34 namespace content { 33 namespace content {
35 34
36 // This class tests the recording of a media stream. 35 // This class tests the recording of a media stream.
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 RemovingTrackFromMediaStreamFiresErrorEvent) { 162 RemovingTrackFromMediaStreamFiresErrorEvent) {
164 MakeTypicalCall("testRemovingTrackFromMediaStreamFiresErrorEvent();", 163 MakeTypicalCall("testRemovingTrackFromMediaStreamFiresErrorEvent();",
165 kMediaRecorderHtmlFile); 164 kMediaRecorderHtmlFile);
166 } 165 }
167 166
168 INSTANTIATE_TEST_CASE_P(, 167 INSTANTIATE_TEST_CASE_P(,
169 WebRtcMediaRecorderTest, 168 WebRtcMediaRecorderTest,
170 testing::ValuesIn(kEncodingParameters)); 169 testing::ValuesIn(kEncodingParameters));
171 170
172 } // namespace content 171 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/media_recorder_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698