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

Side by Side Diff: media/base/video_frame.h

Issue 148553003: Clean up histogram'd media enum max values. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix naming collision Created 6 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_decoder_config.cc ('k') | media/base/video_frame.cc » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef MEDIA_BASE_VIDEO_FRAME_H_ 5 #ifndef MEDIA_BASE_VIDEO_FRAME_H_
6 #define MEDIA_BASE_VIDEO_FRAME_H_ 6 #define MEDIA_BASE_VIDEO_FRAME_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/md5.h" 9 #include "base/md5.h"
10 #include "base/memory/shared_memory.h" 10 #include "base/memory/shared_memory.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 UNKNOWN = 0, // Unknown format value. 45 UNKNOWN = 0, // Unknown format value.
46 YV12 = 1, // 12bpp YVU planar 1x1 Y, 2x2 VU samples 46 YV12 = 1, // 12bpp YVU planar 1x1 Y, 2x2 VU samples
47 YV16 = 2, // 16bpp YVU planar 1x1 Y, 2x1 VU samples 47 YV16 = 2, // 16bpp YVU planar 1x1 Y, 2x1 VU samples
48 I420 = 3, // 12bpp YVU planar 1x1 Y, 2x2 UV samples. 48 I420 = 3, // 12bpp YVU planar 1x1 Y, 2x2 UV samples.
49 YV12A = 4, // 20bpp YUVA planar 1x1 Y, 2x2 VU, 1x1 A samples. 49 YV12A = 4, // 20bpp YUVA planar 1x1 Y, 2x2 VU, 1x1 A samples.
50 #if defined(VIDEO_HOLE) 50 #if defined(VIDEO_HOLE)
51 HOLE = 5, // Hole frame. 51 HOLE = 5, // Hole frame.
52 #endif // defined(VIDEO_HOLE) 52 #endif // defined(VIDEO_HOLE)
53 NATIVE_TEXTURE = 6, // Native texture. Pixel-format agnostic. 53 NATIVE_TEXTURE = 6, // Native texture. Pixel-format agnostic.
54 YV12J = 7, // JPEG color range version of YV12 54 YV12J = 7, // JPEG color range version of YV12
55 HISTOGRAM_MAX, // Must always be greatest. 55 FORMAT_MAX = YV12J, // Must always be equal to largest entry logged.
56 }; 56 };
57 57
58 // Returns the name of a Format as a string. 58 // Returns the name of a Format as a string.
59 static std::string FormatToString(Format format); 59 static std::string FormatToString(Format format);
60 60
61 // Creates a new frame in system memory with given parameters. Buffers for 61 // Creates a new frame in system memory with given parameters. Buffers for
62 // the frame are allocated but not initialized. 62 // the frame are allocated but not initialized.
63 // |coded_size| is the width and height of the frame data in pixels. 63 // |coded_size| is the width and height of the frame data in pixels.
64 // |visible_rect| is the visible portion of |coded_size|, after cropping (if 64 // |visible_rect| is the visible portion of |coded_size|, after cropping (if
65 // any) is applied. 65 // any) is applied.
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 base::TimeDelta timestamp_; 276 base::TimeDelta timestamp_;
277 277
278 const bool end_of_stream_; 278 const bool end_of_stream_;
279 279
280 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoFrame); 280 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoFrame);
281 }; 281 };
282 282
283 } // namespace media 283 } // namespace media
284 284
285 #endif // MEDIA_BASE_VIDEO_FRAME_H_ 285 #endif // MEDIA_BASE_VIDEO_FRAME_H_
OLDNEW
« no previous file with comments | « media/base/video_decoder_config.cc ('k') | media/base/video_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698