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

Side by Side Diff: media/base/video_capture_types.cc

Issue 921683004: Revert: Issue 545053002: Add still image capture interface for VideoCaptureDevice. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased (media/video/capture/video_capture_types.* went to media/base) 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 | « media/base/video_capture_types.h ('k') | media/video/capture/video_capture_device.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 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/base/video_capture_types.h" 5 #include "media/base/video_capture_types.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "media/base/limits.h" 9 #include "media/base/limits.h"
10 10
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 return "TEXTURE"; 94 return "TEXTURE";
95 case PIXEL_FORMAT_MAX: 95 case PIXEL_FORMAT_MAX:
96 break; 96 break;
97 } 97 }
98 NOTREACHED() << "Invalid VideoPixelFormat provided: " << format; 98 NOTREACHED() << "Invalid VideoPixelFormat provided: " << format;
99 return ""; 99 return "";
100 } 100 }
101 101
102 VideoCaptureParams::VideoCaptureParams() 102 VideoCaptureParams::VideoCaptureParams()
103 : resolution_change_policy(RESOLUTION_POLICY_FIXED) {} 103 : resolution_change_policy(RESOLUTION_POLICY_FIXED) {}
104
105 ImageCaptureFormat::ImageCaptureFormat() : pixel_format(PIXEL_FORMAT_UNKNOWN) {
106 }
107
108 ImageCaptureFormat::ImageCaptureFormat(const gfx::Size& frame_size,
109 VideoPixelFormat pixel_format)
110 : frame_size(frame_size), pixel_format(pixel_format) {
111 }
112
113 } // namespace media 104 } // namespace media
OLDNEW
« no previous file with comments | « media/base/video_capture_types.h ('k') | media/video/capture/video_capture_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698