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

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

Issue 1014943005: Android CaptureAPI Types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed android_webview changes. 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
« no previous file with comments | « content/browser/media/media_internals.cc ('k') | media/base/android/BUILD.gn » ('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 (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) || defined(OS_LINUX) || \
113 defined(OS_ANDROID)
113 TEST_F(MediaInternalsVideoCaptureDeviceTest, 114 TEST_F(MediaInternalsVideoCaptureDeviceTest,
114 AllCaptureApiTypesHaveProperStringRepresentation) { 115 AllCaptureApiTypesHaveProperStringRepresentation) {
115 typedef media::VideoCaptureDevice::Name VideoCaptureDeviceName; 116 typedef media::VideoCaptureDevice::Name VideoCaptureDeviceName;
116 typedef std::map<VideoCaptureDeviceName::CaptureApiType, std::string> 117 typedef std::map<VideoCaptureDeviceName::CaptureApiType, std::string>
117 CaptureApiTypeStringMap; 118 CaptureApiTypeStringMap;
118 CaptureApiTypeStringMap m; 119 CaptureApiTypeStringMap m;
119 #if defined(OS_LINUX) 120 #if defined(OS_LINUX)
120 m[VideoCaptureDeviceName::V4L2_SINGLE_PLANE] = "V4L2 SPLANE"; 121 m[VideoCaptureDeviceName::V4L2_SINGLE_PLANE] = "V4L2 SPLANE";
121 m[VideoCaptureDeviceName::V4L2_MULTI_PLANE] = "V4L2 MPLANE"; 122 m[VideoCaptureDeviceName::V4L2_MULTI_PLANE] = "V4L2 MPLANE";
122 #elif defined(OS_WIN) 123 #elif defined(OS_WIN)
123 m[VideoCaptureDeviceName::MEDIA_FOUNDATION] = "Media Foundation"; 124 m[VideoCaptureDeviceName::MEDIA_FOUNDATION] = "Media Foundation";
124 m[VideoCaptureDeviceName::DIRECT_SHOW] = "Direct Show"; 125 m[VideoCaptureDeviceName::DIRECT_SHOW] = "Direct Show";
125 m[VideoCaptureDeviceName::DIRECT_SHOW_WDM_CROSSBAR] = 126 m[VideoCaptureDeviceName::DIRECT_SHOW_WDM_CROSSBAR] =
126 "Direct Show WDM Crossbar"; 127 "Direct Show WDM Crossbar";
127 #elif defined(OS_MACOSX) 128 #elif defined(OS_MACOSX)
128 m[VideoCaptureDeviceName::AVFOUNDATION] = "AV Foundation"; 129 m[VideoCaptureDeviceName::AVFOUNDATION] = "AV Foundation";
129 m[VideoCaptureDeviceName::QTKIT] = "QTKit"; 130 m[VideoCaptureDeviceName::QTKIT] = "QTKit";
130 m[VideoCaptureDeviceName::DECKLINK] = "DeckLink"; 131 m[VideoCaptureDeviceName::DECKLINK] = "DeckLink";
132 #elif defined(OS_ANDROID)
133 m[VideoCaptureDeviceName::API1] = "Camera API1";
134 m[VideoCaptureDeviceName::API2_LEGACY] = "Camera API2 Legacy";
135 m[VideoCaptureDeviceName::API2_FULL] = "Camera API2 Full";
136 m[VideoCaptureDeviceName::API2_LIMITED] = "Camera API2 Limited";
137 m[VideoCaptureDeviceName::TANGO] = "Tango API";
131 #endif 138 #endif
132 EXPECT_EQ(media::VideoCaptureDevice::Name::API_TYPE_UNKNOWN, m.size()); 139 EXPECT_EQ(media::VideoCaptureDevice::Name::API_TYPE_UNKNOWN, m.size());
133 for (CaptureApiTypeStringMap::iterator it = m.begin(); it != m.end(); ++it) { 140 for (CaptureApiTypeStringMap::iterator it = m.begin(); it != m.end(); ++it) {
134 const VideoCaptureDeviceName device_name("dummy", "dummy", it->first); 141 const VideoCaptureDeviceName device_name("dummy", "dummy", it->first);
135 EXPECT_EQ(it->second, device_name.GetCaptureApiTypeString()); 142 EXPECT_EQ(it->second, device_name.GetCaptureApiTypeString());
136 } 143 }
137 } 144 }
138 #endif 145 #endif
139 146
140 TEST_F(MediaInternalsVideoCaptureDeviceTest, 147 TEST_F(MediaInternalsVideoCaptureDeviceTest,
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 #if defined(OS_MACOSX) 179 #if defined(OS_MACOSX)
173 media::VideoCaptureDevice::Name("dummy", "dummy", 180 media::VideoCaptureDevice::Name("dummy", "dummy",
174 media::VideoCaptureDevice::Name::QTKIT), 181 media::VideoCaptureDevice::Name::QTKIT),
175 #elif defined(OS_WIN) 182 #elif defined(OS_WIN)
176 media::VideoCaptureDevice::Name("dummy", "dummy", 183 media::VideoCaptureDevice::Name("dummy", "dummy",
177 media::VideoCaptureDevice::Name::DIRECT_SHOW), 184 media::VideoCaptureDevice::Name::DIRECT_SHOW),
178 #elif defined(OS_LINUX) 185 #elif defined(OS_LINUX)
179 media::VideoCaptureDevice::Name( 186 media::VideoCaptureDevice::Name(
180 "dummy", "/dev/dummy", 187 "dummy", "/dev/dummy",
181 media::VideoCaptureDevice::Name::V4L2_SINGLE_PLANE), 188 media::VideoCaptureDevice::Name::V4L2_SINGLE_PLANE),
189 #elif defined(OS_ANDROID)
190 media::VideoCaptureDevice::Name("dummy", "dummy",
191 media::VideoCaptureDevice::Name::API2_LEGACY),
182 #else 192 #else
183 media::VideoCaptureDevice::Name("dummy", "dummy"), 193 media::VideoCaptureDevice::Name("dummy", "dummy"),
184 #endif 194 #endif
185 formats); 195 formats);
186 media::VideoCaptureDeviceInfos device_infos{}; 196 media::VideoCaptureDeviceInfos device_infos{};
187 device_infos.push_back(device_info); 197 device_infos.push_back(device_info);
188 198
189 // When updating video capture capabilities, the update will serialize 199 // When updating video capture capabilities, the update will serialize
190 // a JSON array of objects to string. So here, the |UpdateCallbackImpl| will 200 // 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 201 // deserialize the first object in the array. This means we have to have
192 // exactly one device_info in the |device_infos|. 202 // exactly one device_info in the |device_infos|.
193 media_internals_->UpdateVideoCaptureDeviceCapabilities(device_infos); 203 media_internals_->UpdateVideoCaptureDeviceCapabilities(device_infos);
194 204
195 #if defined(OS_LINUX) 205 #if defined(OS_LINUX)
196 ExpectString("id", "/dev/dummy"); 206 ExpectString("id", "/dev/dummy");
197 #else 207 #else
198 ExpectString("id", "dummy"); 208 ExpectString("id", "dummy");
199 #endif 209 #endif
200 ExpectString("name", "dummy"); 210 ExpectString("name", "dummy");
201 base::ListValue expected_list; 211 base::ListValue expected_list;
202 expected_list.AppendString(format_hd.ToString()); 212 expected_list.AppendString(format_hd.ToString());
203 ExpectListOfStrings("formats", expected_list); 213 ExpectListOfStrings("formats", expected_list);
204 #if defined(OS_LINUX) 214 #if defined(OS_LINUX)
205 ExpectString("captureApi", "V4L2 SPLANE"); 215 ExpectString("captureApi", "V4L2 SPLANE");
206 #elif defined(OS_WIN) 216 #elif defined(OS_WIN)
207 ExpectString("captureApi", "Direct Show"); 217 ExpectString("captureApi", "Direct Show");
208 #elif defined(OS_MACOSX) 218 #elif defined(OS_MACOSX)
209 ExpectString("captureApi", "QTKit"); 219 ExpectString("captureApi", "QTKit");
220 #elif defined(OS_ANDROID)
221 ExpectString("captureApi", "Camera API2 Legacy");
210 #endif 222 #endif
211 } 223 }
212 224
213 class MediaInternalsAudioLogTest 225 class MediaInternalsAudioLogTest
214 : public MediaInternalsTestBase, 226 : public MediaInternalsTestBase,
215 public testing::TestWithParam<media::AudioLogFactory::AudioComponent> { 227 public testing::TestWithParam<media::AudioLogFactory::AudioComponent> {
216 public: 228 public:
217 MediaInternalsAudioLogTest() : 229 MediaInternalsAudioLogTest() :
218 update_cb_(base::Bind(&MediaInternalsAudioLogTest::UpdateCallbackImpl, 230 update_cb_(base::Bind(&MediaInternalsAudioLogTest::UpdateCallbackImpl,
219 base::Unretained(this))), 231 base::Unretained(this))),
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 ExpectStatus("closed"); 301 ExpectStatus("closed");
290 } 302 }
291 303
292 INSTANTIATE_TEST_CASE_P( 304 INSTANTIATE_TEST_CASE_P(
293 MediaInternalsAudioLogTest, MediaInternalsAudioLogTest, testing::Values( 305 MediaInternalsAudioLogTest, MediaInternalsAudioLogTest, testing::Values(
294 media::AudioLogFactory::AUDIO_INPUT_CONTROLLER, 306 media::AudioLogFactory::AUDIO_INPUT_CONTROLLER,
295 media::AudioLogFactory::AUDIO_OUTPUT_CONTROLLER, 307 media::AudioLogFactory::AUDIO_OUTPUT_CONTROLLER,
296 media::AudioLogFactory::AUDIO_OUTPUT_STREAM)); 308 media::AudioLogFactory::AUDIO_OUTPUT_STREAM));
297 309
298 } // namespace content 310 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/media_internals.cc ('k') | media/base/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698