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

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

Issue 1090273006: Revert of VideoCapture: add support for GpuMemoryBuffer allocation and lifetime mgmt in VideoCaptureBufferPool (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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/fake_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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 break; 42 break;
43 case PIXEL_FORMAT_UYVY: 43 case PIXEL_FORMAT_UYVY:
44 case PIXEL_FORMAT_YUY2: 44 case PIXEL_FORMAT_YUY2:
45 result_frame_size *= 2; 45 result_frame_size *= 2;
46 break; 46 break;
47 case PIXEL_FORMAT_RGB24: 47 case PIXEL_FORMAT_RGB24:
48 result_frame_size *= 3; 48 result_frame_size *= 3;
49 break; 49 break;
50 case PIXEL_FORMAT_RGB32: 50 case PIXEL_FORMAT_RGB32:
51 case PIXEL_FORMAT_ARGB: 51 case PIXEL_FORMAT_ARGB:
52 // GpuMemoryBuffer is an endianness-agnostic 32bpp pixel format until
53 // http://crbug.com/439520 is closed.
54 case PIXEL_FORMAT_GPUMEMORYBUFFER:
55 result_frame_size *= 4; 52 result_frame_size *= 4;
56 break; 53 break;
57 case PIXEL_FORMAT_MJPEG: 54 case PIXEL_FORMAT_MJPEG:
58 case PIXEL_FORMAT_TEXTURE: 55 case PIXEL_FORMAT_TEXTURE:
59 result_frame_size = 0; 56 result_frame_size = 0;
60 break; 57 break;
61 default: // Sizes for the rest of the formats are unknown. 58 default: // Sizes for the rest of the formats are unknown.
62 NOTREACHED() << "Unknown pixel format provided."; 59 NOTREACHED() << "Unknown pixel format provided.";
63 break; 60 break;
64 } 61 }
(...skipping 26 matching lines...) Expand all
91 case PIXEL_FORMAT_MJPEG: 88 case PIXEL_FORMAT_MJPEG:
92 return "MJPEG"; 89 return "MJPEG";
93 case PIXEL_FORMAT_NV12: 90 case PIXEL_FORMAT_NV12:
94 return "NV12"; 91 return "NV12";
95 case PIXEL_FORMAT_NV21: 92 case PIXEL_FORMAT_NV21:
96 return "NV21"; 93 return "NV21";
97 case PIXEL_FORMAT_YV12: 94 case PIXEL_FORMAT_YV12:
98 return "YV12"; 95 return "YV12";
99 case PIXEL_FORMAT_TEXTURE: 96 case PIXEL_FORMAT_TEXTURE:
100 return "TEXTURE"; 97 return "TEXTURE";
101 case PIXEL_FORMAT_GPUMEMORYBUFFER:
102 return "GPUMEMORYBUFFER";
103 case PIXEL_FORMAT_MAX: 98 case PIXEL_FORMAT_MAX:
104 break; 99 break;
105 } 100 }
106 NOTREACHED() << "Invalid VideoPixelFormat provided: " << format; 101 NOTREACHED() << "Invalid VideoPixelFormat provided: " << format;
107 return ""; 102 return "";
108 } 103 }
109 104
110 VideoCaptureParams::VideoCaptureParams() 105 VideoCaptureParams::VideoCaptureParams()
111 : resolution_change_policy(RESOLUTION_POLICY_FIXED) {} 106 : resolution_change_policy(RESOLUTION_POLICY_FIXED) {}
112 } // namespace media 107 } // namespace media
OLDNEW
« no previous file with comments | « media/base/video_capture_types.h ('k') | media/video/capture/fake_video_capture_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698