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

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

Issue 1685713003: Remove V4L2CaptureDelegate{Single,Multi}Plane, VCD::Client::OnIncomingCapturedYuvData() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: perkj@ comments and reverted change to WeakPtr Created 4 years, 10 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/browser/renderer_host/media/video_capture_device_client.h » ('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 <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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ 115 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
116 defined(OS_ANDROID) 116 defined(OS_ANDROID)
117 TEST_F(MediaInternalsVideoCaptureDeviceTest, 117 TEST_F(MediaInternalsVideoCaptureDeviceTest,
118 AllCaptureApiTypesHaveProperStringRepresentation) { 118 AllCaptureApiTypesHaveProperStringRepresentation) {
119 typedef media::VideoCaptureDevice::Name VideoCaptureDeviceName; 119 typedef media::VideoCaptureDevice::Name VideoCaptureDeviceName;
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 m[VideoCaptureDeviceName::V4L2_MULTI_PLANE] = "V4L2 MPLANE";
126 #elif defined(OS_WIN) 125 #elif defined(OS_WIN)
127 m[VideoCaptureDeviceName::MEDIA_FOUNDATION] = "Media Foundation"; 126 m[VideoCaptureDeviceName::MEDIA_FOUNDATION] = "Media Foundation";
128 m[VideoCaptureDeviceName::DIRECT_SHOW] = "Direct Show"; 127 m[VideoCaptureDeviceName::DIRECT_SHOW] = "Direct Show";
129 #elif defined(OS_MACOSX) 128 #elif defined(OS_MACOSX)
130 m[VideoCaptureDeviceName::AVFOUNDATION] = "AV Foundation"; 129 m[VideoCaptureDeviceName::AVFOUNDATION] = "AV Foundation";
131 m[VideoCaptureDeviceName::QTKIT] = "QTKit"; 130 m[VideoCaptureDeviceName::QTKIT] = "QTKit";
132 m[VideoCaptureDeviceName::DECKLINK] = "DeckLink"; 131 m[VideoCaptureDeviceName::DECKLINK] = "DeckLink";
133 #elif defined(OS_ANDROID) 132 #elif defined(OS_ANDROID)
134 m[VideoCaptureDeviceName::API1] = "Camera API1"; 133 m[VideoCaptureDeviceName::API1] = "Camera API1";
135 m[VideoCaptureDeviceName::API2_LEGACY] = "Camera API2 Legacy"; 134 m[VideoCaptureDeviceName::API2_LEGACY] = "Camera API2 Legacy";
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 ExpectStatus("closed"); 307 ExpectStatus("closed");
309 } 308 }
310 309
311 INSTANTIATE_TEST_CASE_P( 310 INSTANTIATE_TEST_CASE_P(
312 MediaInternalsAudioLogTest, MediaInternalsAudioLogTest, testing::Values( 311 MediaInternalsAudioLogTest, MediaInternalsAudioLogTest, testing::Values(
313 media::AudioLogFactory::AUDIO_INPUT_CONTROLLER, 312 media::AudioLogFactory::AUDIO_INPUT_CONTROLLER,
314 media::AudioLogFactory::AUDIO_OUTPUT_CONTROLLER, 313 media::AudioLogFactory::AUDIO_OUTPUT_CONTROLLER,
315 media::AudioLogFactory::AUDIO_OUTPUT_STREAM)); 314 media::AudioLogFactory::AUDIO_OUTPUT_STREAM));
316 315
317 } // namespace content 316 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/media/video_capture_device_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698