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

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

Issue 958693004: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 years, 10 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 | « source/libvpx/vp9/vp9dx.mk ('k') | source/libvpx/vpx/vpx_frame_buffer.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 /* 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 */ 69 */
70 VP8D_GET_LAST_REF_USED, 70 VP8D_GET_LAST_REF_USED,
71 71
72 /** decryption function to decrypt encoded buffer data immediately 72 /** decryption function to decrypt encoded buffer data immediately
73 * before decoding. Takes a vpx_decrypt_init, which contains 73 * before decoding. Takes a vpx_decrypt_init, which contains
74 * a callback function and opaque context pointer. 74 * a callback function and opaque context pointer.
75 */ 75 */
76 VPXD_SET_DECRYPTOR, 76 VPXD_SET_DECRYPTOR,
77 VP8D_SET_DECRYPTOR = VPXD_SET_DECRYPTOR, 77 VP8D_SET_DECRYPTOR = VPXD_SET_DECRYPTOR,
78 78
79 /** control function to get the display dimensions for the current frame. */ 79 /** control function to get the dimensions that the current frame is decoded
80 * at. This may be different to the intended display size for the frame as
81 * specified in the wrapper or frame header (see VP9D_GET_DISPLAY_SIZE). */
82 VP9D_GET_FRAME_SIZE,
83
84 /** control function to get the current frame's intended display dimensions
85 * (as specified in the wrapper or frame header). This may be different to
86 * the decoded dimensions of this frame (see VP9D_GET_FRAME_SIZE). */
80 VP9D_GET_DISPLAY_SIZE, 87 VP9D_GET_DISPLAY_SIZE,
81 88
82 /** control function to get the bit depth of the stream. */ 89 /** control function to get the bit depth of the stream. */
83 VP9D_GET_BIT_DEPTH, 90 VP9D_GET_BIT_DEPTH,
84 91
85 /** control function to set the byte alignment of the planes in the reference 92 /** control function to set the byte alignment of the planes in the reference
86 * buffers. Valid values are power of 2, from 32 to 1024. A value of 0 sets 93 * buffers. Valid values are power of 2, from 32 to 1024. A value of 0 sets
87 * legacy alignment. I.e. Y plane is aligned to 32 bytes, U plane directly 94 * legacy alignment. I.e. Y plane is aligned to 32 bytes, U plane directly
88 * follows Y plane, and V plane directly follows U plane. Default value is 0. 95 * follows Y plane, and V plane directly follows U plane. Default value is 0.
89 */ 96 */
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 */ 140 */
134 141
135 142
136 VPX_CTRL_USE_TYPE(VP8D_GET_LAST_REF_UPDATES, int *) 143 VPX_CTRL_USE_TYPE(VP8D_GET_LAST_REF_UPDATES, int *)
137 VPX_CTRL_USE_TYPE(VP8D_GET_FRAME_CORRUPTED, int *) 144 VPX_CTRL_USE_TYPE(VP8D_GET_FRAME_CORRUPTED, int *)
138 VPX_CTRL_USE_TYPE(VP8D_GET_LAST_REF_USED, int *) 145 VPX_CTRL_USE_TYPE(VP8D_GET_LAST_REF_USED, int *)
139 VPX_CTRL_USE_TYPE(VPXD_SET_DECRYPTOR, vpx_decrypt_init *) 146 VPX_CTRL_USE_TYPE(VPXD_SET_DECRYPTOR, vpx_decrypt_init *)
140 VPX_CTRL_USE_TYPE(VP8D_SET_DECRYPTOR, vpx_decrypt_init *) 147 VPX_CTRL_USE_TYPE(VP8D_SET_DECRYPTOR, vpx_decrypt_init *)
141 VPX_CTRL_USE_TYPE(VP9D_GET_DISPLAY_SIZE, int *) 148 VPX_CTRL_USE_TYPE(VP9D_GET_DISPLAY_SIZE, int *)
142 VPX_CTRL_USE_TYPE(VP9D_GET_BIT_DEPTH, unsigned int *) 149 VPX_CTRL_USE_TYPE(VP9D_GET_BIT_DEPTH, unsigned int *)
150 VPX_CTRL_USE_TYPE(VP9D_GET_FRAME_SIZE, int *)
143 VPX_CTRL_USE_TYPE(VP9_INVERT_TILE_DECODE_ORDER, int) 151 VPX_CTRL_USE_TYPE(VP9_INVERT_TILE_DECODE_ORDER, int)
144 152
145 /*! @} - end defgroup vp8_decoder */ 153 /*! @} - end defgroup vp8_decoder */
146 154
147 #ifdef __cplusplus 155 #ifdef __cplusplus
148 } // extern "C" 156 } // extern "C"
149 #endif 157 #endif
150 158
151 #endif // VPX_VP8DX_H_ 159 #endif // VPX_VP8DX_H_
OLDNEW
« no previous file with comments | « source/libvpx/vp9/vp9dx.mk ('k') | source/libvpx/vpx/vpx_frame_buffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698