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

Side by Side Diff: source/libvpx/vpx/vpx_image.h

Issue 375983002: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « source/libvpx/vpx/vpx_codec.h ('k') | source/libvpx/vpxdec.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved. 2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 #define IMG_FMT_I420 VPX_IMG_FMT_I420 /**< \deprecated Use #VPX_IMG_ FMT_I420 */ 96 #define IMG_FMT_I420 VPX_IMG_FMT_I420 /**< \deprecated Use #VPX_IMG_ FMT_I420 */
97 #define IMG_FMT_VPXYV12 VPX_IMG_FMT_VPXYV12 /**< \deprecated Use #VPX_IMG_ FMT_VPXYV12 */ 97 #define IMG_FMT_VPXYV12 VPX_IMG_FMT_VPXYV12 /**< \deprecated Use #VPX_IMG_ FMT_VPXYV12 */
98 #define IMG_FMT_VPXI420 VPX_IMG_FMT_VPXI420 /**< \deprecated Use #VPX_IMG_ FMT_VPXI420 */ 98 #define IMG_FMT_VPXI420 VPX_IMG_FMT_VPXI420 /**< \deprecated Use #VPX_IMG_ FMT_VPXI420 */
99 #endif /* VPX_CODEC_DISABLE_COMPAT */ 99 #endif /* VPX_CODEC_DISABLE_COMPAT */
100 100
101 /**\brief Image Descriptor */ 101 /**\brief Image Descriptor */
102 typedef struct vpx_image { 102 typedef struct vpx_image {
103 vpx_img_fmt_t fmt; /**< Image Format */ 103 vpx_img_fmt_t fmt; /**< Image Format */
104 104
105 /* Image storage dimensions */ 105 /* Image storage dimensions */
106 unsigned int w; /**< Stored image width */ 106 unsigned int w; /**< Stored image width */
107 unsigned int h; /**< Stored image height */ 107 unsigned int h; /**< Stored image height */
108 unsigned int bit_depth; /**< Stored image bit-depth */
108 109
109 /* Image display dimensions */ 110 /* Image display dimensions */
110 unsigned int d_w; /**< Displayed image width */ 111 unsigned int d_w; /**< Displayed image width */
111 unsigned int d_h; /**< Displayed image height */ 112 unsigned int d_h; /**< Displayed image height */
112 113
113 /* Chroma subsampling info */ 114 /* Chroma subsampling info */
114 unsigned int x_chroma_shift; /**< subsampling order, X */ 115 unsigned int x_chroma_shift; /**< subsampling order, X */
115 unsigned int y_chroma_shift; /**< subsampling order, Y */ 116 unsigned int y_chroma_shift; /**< subsampling order, Y */
116 117
117 /* Image data pointers. */ 118 /* Image data pointers. */
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 * 241 *
241 * \param[in] img Image descriptor 242 * \param[in] img Image descriptor
242 */ 243 */
243 void vpx_img_free(vpx_image_t *img); 244 void vpx_img_free(vpx_image_t *img);
244 245
245 #ifdef __cplusplus 246 #ifdef __cplusplus
246 } // extern "C" 247 } // extern "C"
247 #endif 248 #endif
248 249
249 #endif // VPX_VPX_IMAGE_H_ 250 #endif // VPX_VPX_IMAGE_H_
OLDNEW
« no previous file with comments | « source/libvpx/vpx/vpx_codec.h ('k') | source/libvpx/vpxdec.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698