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

Side by Side Diff: media/video/capture/video_capture_device.cc

Issue 1124723006: VideoCaptureDeviceLinux: Add support for SPLANE+DMABUF V4L2 type capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "media/video/capture/video_capture_device.h" 5 #include "media/video/capture/video_capture_device.h"
6 6
7 #include "base/i18n/timezone.h" 7 #include "base/i18n/timezone.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 9
10 namespace media { 10 namespace media {
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 capture_api_class_(api_type) {} 67 capture_api_class_(api_type) {}
68 #endif 68 #endif
69 69
70 VideoCaptureDevice::Name::~Name() {} 70 VideoCaptureDevice::Name::~Name() {}
71 71
72 #if defined(OS_LINUX) 72 #if defined(OS_LINUX)
73 const char* VideoCaptureDevice::Name::GetCaptureApiTypeString() const { 73 const char* VideoCaptureDevice::Name::GetCaptureApiTypeString() const {
74 switch (capture_api_type()) { 74 switch (capture_api_type()) {
75 case V4L2_SINGLE_PLANE: 75 case V4L2_SINGLE_PLANE:
76 return "V4L2 SPLANE"; 76 return "V4L2 SPLANE";
77 case V4L2_MULTI_PLANE: 77 case V4L2_SINGLE_PLANE_DMABUF:
78 return "V4L2 SPLANE DMA-BUF";
79 case V4L2_MULTI_PLANE:
78 return "V4L2 MPLANE"; 80 return "V4L2 MPLANE";
79 default: 81 default:
80 NOTREACHED() << "Unknown Video Capture API type!"; 82 NOTREACHED() << "Unknown Video Capture API type!";
81 return "Unknown API"; 83 return "Unknown API";
82 } 84 }
83 } 85 }
84 #elif defined(OS_WIN) 86 #elif defined(OS_WIN)
85 const char* VideoCaptureDevice::Name::GetCaptureApiTypeString() const { 87 const char* VideoCaptureDevice::Name::GetCaptureApiTypeString() const {
86 switch(capture_api_type()) { 88 switch(capture_api_type()) {
87 case MEDIA_FOUNDATION: 89 case MEDIA_FOUNDATION:
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 const char** countries_using_60Hz_end = 148 const char** countries_using_60Hz_end =
147 countries_using_60Hz + arraysize(countries_using_60Hz); 149 countries_using_60Hz + arraysize(countries_using_60Hz);
148 if (std::find(countries_using_60Hz, countries_using_60Hz_end, 150 if (std::find(countries_using_60Hz, countries_using_60Hz_end,
149 current_country) == countries_using_60Hz_end) { 151 current_country) == countries_using_60Hz_end) {
150 return kPowerLine50Hz; 152 return kPowerLine50Hz;
151 } 153 }
152 return kPowerLine60Hz; 154 return kPowerLine60Hz;
153 } 155 }
154 156
155 } // namespace media 157 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698