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

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

Issue 1815983003: Remove deprecated QTKit Video Capture Support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 typedef std::map<VideoCaptureDeviceName::CaptureApiType, std::string> 120 typedef std::map<VideoCaptureDeviceName::CaptureApiType, std::string>
121 CaptureApiTypeStringMap; 121 CaptureApiTypeStringMap;
122 CaptureApiTypeStringMap m; 122 CaptureApiTypeStringMap m;
123 #if defined(OS_LINUX) 123 #if defined(OS_LINUX)
124 m[VideoCaptureDeviceName::V4L2_SINGLE_PLANE] = "V4L2 SPLANE"; 124 m[VideoCaptureDeviceName::V4L2_SINGLE_PLANE] = "V4L2 SPLANE";
125 #elif defined(OS_WIN) 125 #elif defined(OS_WIN)
126 m[VideoCaptureDeviceName::MEDIA_FOUNDATION] = "Media Foundation"; 126 m[VideoCaptureDeviceName::MEDIA_FOUNDATION] = "Media Foundation";
127 m[VideoCaptureDeviceName::DIRECT_SHOW] = "Direct Show"; 127 m[VideoCaptureDeviceName::DIRECT_SHOW] = "Direct Show";
128 #elif defined(OS_MACOSX) 128 #elif defined(OS_MACOSX)
129 m[VideoCaptureDeviceName::AVFOUNDATION] = "AV Foundation"; 129 m[VideoCaptureDeviceName::AVFOUNDATION] = "AV Foundation";
130 m[VideoCaptureDeviceName::QTKIT] = "QTKit";
131 m[VideoCaptureDeviceName::DECKLINK] = "DeckLink"; 130 m[VideoCaptureDeviceName::DECKLINK] = "DeckLink";
132 #elif defined(OS_ANDROID) 131 #elif defined(OS_ANDROID)
133 m[VideoCaptureDeviceName::API1] = "Camera API1"; 132 m[VideoCaptureDeviceName::API1] = "Camera API1";
134 m[VideoCaptureDeviceName::API2_LEGACY] = "Camera API2 Legacy"; 133 m[VideoCaptureDeviceName::API2_LEGACY] = "Camera API2 Legacy";
135 m[VideoCaptureDeviceName::API2_FULL] = "Camera API2 Full"; 134 m[VideoCaptureDeviceName::API2_FULL] = "Camera API2 Full";
136 m[VideoCaptureDeviceName::API2_LIMITED] = "Camera API2 Limited"; 135 m[VideoCaptureDeviceName::API2_LIMITED] = "Camera API2 Limited";
137 m[VideoCaptureDeviceName::TANGO] = "Tango API"; 136 m[VideoCaptureDeviceName::TANGO] = "Tango API";
138 #endif 137 #endif
139 EXPECT_EQ(media::VideoCaptureDevice::Name::API_TYPE_UNKNOWN, m.size()); 138 EXPECT_EQ(media::VideoCaptureDevice::Name::API_TYPE_UNKNOWN, m.size());
140 for (CaptureApiTypeStringMap::iterator it = m.begin(); it != m.end(); ++it) { 139 for (CaptureApiTypeStringMap::iterator it = m.begin(); it != m.end(); ++it) {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 const int kHeight = 720; 172 const int kHeight = 720;
174 const float kFrameRate = 30.0f; 173 const float kFrameRate = 30.0f;
175 const media::VideoPixelFormat kPixelFormat = 174 const media::VideoPixelFormat kPixelFormat =
176 media::PIXEL_FORMAT_I420; 175 media::PIXEL_FORMAT_I420;
177 const media::VideoCaptureFormat format_hd({kWidth, kHeight}, 176 const media::VideoCaptureFormat format_hd({kWidth, kHeight},
178 kFrameRate, kPixelFormat); 177 kFrameRate, kPixelFormat);
179 media::VideoCaptureFormats formats{}; 178 media::VideoCaptureFormats formats{};
180 formats.push_back(format_hd); 179 formats.push_back(format_hd);
181 const media::VideoCaptureDeviceInfo device_info( 180 const media::VideoCaptureDeviceInfo device_info(
182 #if defined(OS_MACOSX) 181 #if defined(OS_MACOSX)
183 media::VideoCaptureDevice::Name("dummy", "dummy", 182 media::VideoCaptureDevice::Name(
184 media::VideoCaptureDevice::Name::QTKIT), 183 "dummy", "dummy", media::VideoCaptureDevice::Name::AVFOUNDATION),
tommi (sloooow) - chröme 2016/03/20 22:37:44 does this mean the test never ran with avfoundatio
perkj_chrome 2016/03/21 09:45:40 It fills the device_info struct used by the test.
185 #elif defined(OS_WIN) 184 #elif defined(OS_WIN)
186 media::VideoCaptureDevice::Name("dummy", "dummy", 185 media::VideoCaptureDevice::Name("dummy", "dummy",
187 media::VideoCaptureDevice::Name::DIRECT_SHOW), 186 media::VideoCaptureDevice::Name::DIRECT_SHOW),
188 #elif defined(OS_LINUX) 187 #elif defined(OS_LINUX)
189 media::VideoCaptureDevice::Name( 188 media::VideoCaptureDevice::Name(
190 "dummy", "/dev/dummy", 189 "dummy", "/dev/dummy",
191 media::VideoCaptureDevice::Name::V4L2_SINGLE_PLANE), 190 media::VideoCaptureDevice::Name::V4L2_SINGLE_PLANE),
192 #elif defined(OS_ANDROID) 191 #elif defined(OS_ANDROID)
193 media::VideoCaptureDevice::Name("dummy", "dummy", 192 media::VideoCaptureDevice::Name("dummy", "dummy",
194 media::VideoCaptureDevice::Name::API2_LEGACY), 193 media::VideoCaptureDevice::Name::API2_LEGACY),
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 ExpectStatus("closed"); 306 ExpectStatus("closed");
308 } 307 }
309 308
310 INSTANTIATE_TEST_CASE_P( 309 INSTANTIATE_TEST_CASE_P(
311 MediaInternalsAudioLogTest, MediaInternalsAudioLogTest, testing::Values( 310 MediaInternalsAudioLogTest, MediaInternalsAudioLogTest, testing::Values(
312 media::AudioLogFactory::AUDIO_INPUT_CONTROLLER, 311 media::AudioLogFactory::AUDIO_INPUT_CONTROLLER,
313 media::AudioLogFactory::AUDIO_OUTPUT_CONTROLLER, 312 media::AudioLogFactory::AUDIO_OUTPUT_CONTROLLER,
314 media::AudioLogFactory::AUDIO_OUTPUT_STREAM)); 313 media::AudioLogFactory::AUDIO_OUTPUT_STREAM));
315 314
316 } // namespace content 315 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698