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

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

Issue 762513002: Fix PPIXEL_FORMAT_NV21 returned string (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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 | no next file » | 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/video/capture/video_capture_types.h" 5 #include "media/video/capture/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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 return "YUY2"; 48 return "YUY2";
49 case PIXEL_FORMAT_UYVY: 49 case PIXEL_FORMAT_UYVY:
50 return "UYUY"; 50 return "UYUY";
51 case PIXEL_FORMAT_RGB24: 51 case PIXEL_FORMAT_RGB24:
52 return "RGB24"; 52 return "RGB24";
53 case PIXEL_FORMAT_ARGB: 53 case PIXEL_FORMAT_ARGB:
54 return "ARGB"; 54 return "ARGB";
55 case PIXEL_FORMAT_MJPEG: 55 case PIXEL_FORMAT_MJPEG:
56 return "MJPEG"; 56 return "MJPEG";
57 case PIXEL_FORMAT_NV21: 57 case PIXEL_FORMAT_NV21:
58 return "YV12"; 58 return "NV21";
59 case PIXEL_FORMAT_YV12: 59 case PIXEL_FORMAT_YV12:
60 return "YV12"; 60 return "YV12";
61 case PIXEL_FORMAT_TEXTURE: 61 case PIXEL_FORMAT_TEXTURE:
62 return "TEXTURE"; 62 return "TEXTURE";
63 case PIXEL_FORMAT_MAX: 63 case PIXEL_FORMAT_MAX:
64 break; 64 break;
65 } 65 }
66 NOTREACHED() << "Invalid VideoPixelFormat provided: " << format; 66 NOTREACHED() << "Invalid VideoPixelFormat provided: " << format;
67 return ""; 67 return "";
68 } 68 }
69 69
70 VideoCaptureParams::VideoCaptureParams() 70 VideoCaptureParams::VideoCaptureParams()
71 : resolution_change_policy(RESOLUTION_POLICY_FIXED) {} 71 : resolution_change_policy(RESOLUTION_POLICY_FIXED) {}
72 72
73 ImageCaptureFormat::ImageCaptureFormat() : pixel_format(PIXEL_FORMAT_UNKNOWN) { 73 ImageCaptureFormat::ImageCaptureFormat() : pixel_format(PIXEL_FORMAT_UNKNOWN) {
74 } 74 }
75 75
76 ImageCaptureFormat::ImageCaptureFormat(const gfx::Size& frame_size, 76 ImageCaptureFormat::ImageCaptureFormat(const gfx::Size& frame_size,
77 VideoPixelFormat pixel_format) 77 VideoPixelFormat pixel_format)
78 : frame_size(frame_size), pixel_format(pixel_format) { 78 : frame_size(frame_size), pixel_format(pixel_format) {
79 } 79 }
80 80
81 } // namespace media 81 } // namespace media
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698