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

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

Issue 2315073002: Handle frames sent from peer connection in VideoTrackRecorder (Closed)
Patch Set: Created 4 years, 3 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/video_track_recorder.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"
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 MakeTypicalCall("testIllegalStartInPausedStateThrowsDOMError();", 141 MakeTypicalCall("testIllegalStartInPausedStateThrowsDOMError();",
142 kMediaRecorderHtmlFile); 142 kMediaRecorderHtmlFile);
143 } 143 }
144 144
145 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, 145 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
146 MediaRecorderIllegalRequestDataThrowsDOMError) { 146 MediaRecorderIllegalRequestDataThrowsDOMError) {
147 MakeTypicalCall("testIllegalRequestDataThrowsDOMError();", 147 MakeTypicalCall("testIllegalRequestDataThrowsDOMError();",
148 kMediaRecorderHtmlFile); 148 kMediaRecorderHtmlFile);
149 } 149 }
150 150
151 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, MediaRecorderPeerConnection) { 151 IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, MediaRecorderPeerConnection) {
152 MakeTypicalCall("testRecordRemotePeerConnection();", kMediaRecorderHtmlFile); 152 MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator);
153 MakeTypicalCall(base::StringPrintf("testRecordRemotePeerConnection(\"%s\");",
154 GetParam().video_codec.c_str()),
155 kMediaRecorderHtmlFile);
153 } 156 }
154 157
155 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, 158 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
156 AddingTrackToMediaStreamFiresErrorEvent) { 159 AddingTrackToMediaStreamFiresErrorEvent) {
157 MakeTypicalCall("testAddingTrackToMediaStreamFiresErrorEvent();", 160 MakeTypicalCall("testAddingTrackToMediaStreamFiresErrorEvent();",
158 kMediaRecorderHtmlFile); 161 kMediaRecorderHtmlFile);
159 } 162 }
160 163
161 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, 164 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
162 RemovingTrackFromMediaStreamFiresErrorEvent) { 165 RemovingTrackFromMediaStreamFiresErrorEvent) {
163 MakeTypicalCall("testRemovingTrackFromMediaStreamFiresErrorEvent();", 166 MakeTypicalCall("testRemovingTrackFromMediaStreamFiresErrorEvent();",
164 kMediaRecorderHtmlFile); 167 kMediaRecorderHtmlFile);
165 } 168 }
166 169
167 INSTANTIATE_TEST_CASE_P(, 170 INSTANTIATE_TEST_CASE_P(,
168 WebRtcMediaRecorderTest, 171 WebRtcMediaRecorderTest,
169 testing::ValuesIn(kEncodingParameters)); 172 testing::ValuesIn(kEncodingParameters));
170 173
171 } // namespace content 174 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/video_track_recorder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698