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

Side by Side Diff: content/browser/media/media_internals_unittest.cc

Issue 1031583002: Revert of Linux Video Capture: Add V4L2VideoCaptureDelegate{Single,Multi}Plane. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "content/browser/media/media_internals.h" 5 #include "content/browser/media/media_internals.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/json/json_reader.h" 9 #include "base/json/json_reader.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 } 102 }
103 103
104 ~MediaInternalsVideoCaptureDeviceTest() override { 104 ~MediaInternalsVideoCaptureDeviceTest() override {
105 media_internals_->RemoveUpdateCallback(update_cb_); 105 media_internals_->RemoveUpdateCallback(update_cb_);
106 } 106 }
107 107
108 protected: 108 protected:
109 MediaInternals::UpdateCallback update_cb_; 109 MediaInternals::UpdateCallback update_cb_;
110 }; 110 };
111 111
112 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) 112 #if defined(OS_WIN) || defined(OS_MACOSX)
113 TEST_F(MediaInternalsVideoCaptureDeviceTest, 113 TEST_F(MediaInternalsVideoCaptureDeviceTest,
114 AllCaptureApiTypesHaveProperStringRepresentation) { 114 AllCaptureApiTypesHaveProperStringRepresentation) {
115 typedef media::VideoCaptureDevice::Name VideoCaptureDeviceName; 115 typedef media::VideoCaptureDevice::Name VideoCaptureDeviceName;
116 typedef std::map<VideoCaptureDeviceName::CaptureApiType, std::string> 116 typedef std::map<VideoCaptureDeviceName::CaptureApiType, std::string>
117 CaptureApiTypeStringMap; 117 CaptureApiTypeStringMap;
118 CaptureApiTypeStringMap m; 118 CaptureApiTypeStringMap m;
119 #if defined(OS_LINUX) 119 #if defined(OS_WIN)
120 m[VideoCaptureDeviceName::V4L2_SINGLE_PLANE] = "V4L2 SPLANE";
121 m[VideoCaptureDeviceName::V4L2_MULTI_PLANE] = "V4L2 MPLANE";
122 #elif defined(OS_WIN)
123 m[VideoCaptureDeviceName::MEDIA_FOUNDATION] = "Media Foundation"; 120 m[VideoCaptureDeviceName::MEDIA_FOUNDATION] = "Media Foundation";
124 m[VideoCaptureDeviceName::DIRECT_SHOW] = "Direct Show"; 121 m[VideoCaptureDeviceName::DIRECT_SHOW] = "Direct Show";
125 m[VideoCaptureDeviceName::DIRECT_SHOW_WDM_CROSSBAR] = 122 m[VideoCaptureDeviceName::DIRECT_SHOW_WDM_CROSSBAR] =
126 "Direct Show WDM Crossbar"; 123 "Direct Show WDM Crossbar";
127 #elif defined(OS_MACOSX) 124 #elif defined(OS_MACOSX)
128 m[VideoCaptureDeviceName::AVFOUNDATION] = "AV Foundation"; 125 m[VideoCaptureDeviceName::AVFOUNDATION] = "AV Foundation";
129 m[VideoCaptureDeviceName::QTKIT] = "QTKit"; 126 m[VideoCaptureDeviceName::QTKIT] = "QTKit";
130 m[VideoCaptureDeviceName::DECKLINK] = "DeckLink"; 127 m[VideoCaptureDeviceName::DECKLINK] = "DeckLink";
131 #endif 128 #endif
132 EXPECT_EQ(media::VideoCaptureDevice::Name::API_TYPE_UNKNOWN, m.size()); 129 EXPECT_EQ(media::VideoCaptureDevice::Name::API_TYPE_UNKNOWN, m.size());
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 kFrameRate, kPixelFormat); 165 kFrameRate, kPixelFormat);
169 media::VideoCaptureFormats formats{}; 166 media::VideoCaptureFormats formats{};
170 formats.push_back(format_hd); 167 formats.push_back(format_hd);
171 const media::VideoCaptureDeviceInfo device_info( 168 const media::VideoCaptureDeviceInfo device_info(
172 #if defined(OS_MACOSX) 169 #if defined(OS_MACOSX)
173 media::VideoCaptureDevice::Name("dummy", "dummy", 170 media::VideoCaptureDevice::Name("dummy", "dummy",
174 media::VideoCaptureDevice::Name::QTKIT), 171 media::VideoCaptureDevice::Name::QTKIT),
175 #elif defined(OS_WIN) 172 #elif defined(OS_WIN)
176 media::VideoCaptureDevice::Name("dummy", "dummy", 173 media::VideoCaptureDevice::Name("dummy", "dummy",
177 media::VideoCaptureDevice::Name::DIRECT_SHOW), 174 media::VideoCaptureDevice::Name::DIRECT_SHOW),
178 #elif defined(OS_LINUX) 175 #elif defined(OS_LINUX) || defined(OS_CHROMEOS)
179 media::VideoCaptureDevice::Name( 176 media::VideoCaptureDevice::Name("dummy", "/dev/dummy"),
180 "dummy", "/dev/dummy",
181 media::VideoCaptureDevice::Name::V4L2_SINGLE_PLANE),
182 #else 177 #else
183 media::VideoCaptureDevice::Name("dummy", "dummy"), 178 media::VideoCaptureDevice::Name("dummy", "dummy"),
184 #endif 179 #endif
185 formats); 180 formats);
186 media::VideoCaptureDeviceInfos device_infos{}; 181 media::VideoCaptureDeviceInfos device_infos{};
187 device_infos.push_back(device_info); 182 device_infos.push_back(device_info);
188 183
189 // When updating video capture capabilities, the update will serialize 184 // When updating video capture capabilities, the update will serialize
190 // a JSON array of objects to string. So here, the |UpdateCallbackImpl| will 185 // a JSON array of objects to string. So here, the |UpdateCallbackImpl| will
191 // deserialize the first object in the array. This means we have to have 186 // deserialize the first object in the array. This means we have to have
192 // exactly one device_info in the |device_infos|. 187 // exactly one device_info in the |device_infos|.
193 media_internals_->UpdateVideoCaptureDeviceCapabilities(device_infos); 188 media_internals_->UpdateVideoCaptureDeviceCapabilities(device_infos);
194 189
195 #if defined(OS_LINUX) 190 #if defined(OS_LINUX) || defined(OS_CHROMEOS)
196 ExpectString("id", "/dev/dummy"); 191 ExpectString("id", "/dev/dummy");
197 #else 192 #else
198 ExpectString("id", "dummy"); 193 ExpectString("id", "dummy");
199 #endif 194 #endif
200 ExpectString("name", "dummy"); 195 ExpectString("name", "dummy");
201 base::ListValue expected_list; 196 base::ListValue expected_list;
202 expected_list.AppendString(format_hd.ToString()); 197 expected_list.AppendString(format_hd.ToString());
203 ExpectListOfStrings("formats", expected_list); 198 ExpectListOfStrings("formats", expected_list);
204 #if defined(OS_LINUX) 199 #if defined(OS_MACOSX)
205 ExpectString("captureApi", "V4L2 SPLANE"); 200 ExpectString("captureApi", "QTKit");
206 #elif defined(OS_WIN) 201 #elif defined(OS_WIN)
207 ExpectString("captureApi", "Direct Show"); 202 ExpectString("captureApi", "Direct Show");
208 #elif defined(OS_MACOSX)
209 ExpectString("captureApi", "QTKit");
210 #endif 203 #endif
211 } 204 }
212 205
213 class MediaInternalsAudioLogTest 206 class MediaInternalsAudioLogTest
214 : public MediaInternalsTestBase, 207 : public MediaInternalsTestBase,
215 public testing::TestWithParam<media::AudioLogFactory::AudioComponent> { 208 public testing::TestWithParam<media::AudioLogFactory::AudioComponent> {
216 public: 209 public:
217 MediaInternalsAudioLogTest() : 210 MediaInternalsAudioLogTest() :
218 update_cb_(base::Bind(&MediaInternalsAudioLogTest::UpdateCallbackImpl, 211 update_cb_(base::Bind(&MediaInternalsAudioLogTest::UpdateCallbackImpl,
219 base::Unretained(this))), 212 base::Unretained(this))),
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 ExpectStatus("closed"); 282 ExpectStatus("closed");
290 } 283 }
291 284
292 INSTANTIATE_TEST_CASE_P( 285 INSTANTIATE_TEST_CASE_P(
293 MediaInternalsAudioLogTest, MediaInternalsAudioLogTest, testing::Values( 286 MediaInternalsAudioLogTest, MediaInternalsAudioLogTest, testing::Values(
294 media::AudioLogFactory::AUDIO_INPUT_CONTROLLER, 287 media::AudioLogFactory::AUDIO_INPUT_CONTROLLER,
295 media::AudioLogFactory::AUDIO_OUTPUT_CONTROLLER, 288 media::AudioLogFactory::AUDIO_OUTPUT_CONTROLLER,
296 media::AudioLogFactory::AUDIO_OUTPUT_STREAM)); 289 media::AudioLogFactory::AUDIO_OUTPUT_STREAM));
297 290
298 } // namespace content 291 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/media_internals.cc ('k') | content/browser/renderer_host/media/video_capture_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698