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

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

Issue 554673004: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 3 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/svc_context.h ('k') | source/libvpx/vpx/vpx_codec.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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 /** decryption function to decrypt encoded buffer data immediately 68 /** decryption function to decrypt encoded buffer data immediately
69 * before decoding. Takes a vpx_decrypt_init, which contains 69 * before decoding. Takes a vpx_decrypt_init, which contains
70 * a callback function and opaque context pointer. 70 * a callback function and opaque context pointer.
71 */ 71 */
72 VPXD_SET_DECRYPTOR, 72 VPXD_SET_DECRYPTOR,
73 VP8D_SET_DECRYPTOR = VPXD_SET_DECRYPTOR, 73 VP8D_SET_DECRYPTOR = VPXD_SET_DECRYPTOR,
74 74
75 /** control function to get the display dimensions for the current frame. */ 75 /** control function to get the display dimensions for the current frame. */
76 VP9D_GET_DISPLAY_SIZE, 76 VP9D_GET_DISPLAY_SIZE,
77 77
78 /** control function to get the bit depth of the stream. */
79 VP9D_GET_BIT_DEPTH,
80
78 /** For testing. */ 81 /** For testing. */
79 VP9_INVERT_TILE_DECODE_ORDER, 82 VP9_INVERT_TILE_DECODE_ORDER,
80 83
81 VP8_DECODER_CTRL_ID_MAX 84 VP8_DECODER_CTRL_ID_MAX
82 }; 85 };
83 86
84 /** Decrypt n bytes of data from input -> output, using the decrypt_state 87 /** Decrypt n bytes of data from input -> output, using the decrypt_state
85 * passed in VPXD_SET_DECRYPTOR. 88 * passed in VPXD_SET_DECRYPTOR.
86 */ 89 */
87 typedef void (*vpx_decrypt_cb)(void *decrypt_state, const unsigned char *input, 90 typedef void (*vpx_decrypt_cb)(void *decrypt_state, const unsigned char *input,
(...skipping 23 matching lines...) Expand all
111 * 114 *
112 */ 115 */
113 116
114 117
115 VPX_CTRL_USE_TYPE(VP8D_GET_LAST_REF_UPDATES, int *) 118 VPX_CTRL_USE_TYPE(VP8D_GET_LAST_REF_UPDATES, int *)
116 VPX_CTRL_USE_TYPE(VP8D_GET_FRAME_CORRUPTED, int *) 119 VPX_CTRL_USE_TYPE(VP8D_GET_FRAME_CORRUPTED, int *)
117 VPX_CTRL_USE_TYPE(VP8D_GET_LAST_REF_USED, int *) 120 VPX_CTRL_USE_TYPE(VP8D_GET_LAST_REF_USED, int *)
118 VPX_CTRL_USE_TYPE(VPXD_SET_DECRYPTOR, vpx_decrypt_init *) 121 VPX_CTRL_USE_TYPE(VPXD_SET_DECRYPTOR, vpx_decrypt_init *)
119 VPX_CTRL_USE_TYPE(VP8D_SET_DECRYPTOR, vpx_decrypt_init *) 122 VPX_CTRL_USE_TYPE(VP8D_SET_DECRYPTOR, vpx_decrypt_init *)
120 VPX_CTRL_USE_TYPE(VP9D_GET_DISPLAY_SIZE, int *) 123 VPX_CTRL_USE_TYPE(VP9D_GET_DISPLAY_SIZE, int *)
124 VPX_CTRL_USE_TYPE(VP9D_GET_BIT_DEPTH, unsigned int *)
121 VPX_CTRL_USE_TYPE(VP9_INVERT_TILE_DECODE_ORDER, int) 125 VPX_CTRL_USE_TYPE(VP9_INVERT_TILE_DECODE_ORDER, int)
122 126
123 /*! @} - end defgroup vp8_decoder */ 127 /*! @} - end defgroup vp8_decoder */
124 128
125 #ifdef __cplusplus 129 #ifdef __cplusplus
126 } // extern "C" 130 } // extern "C"
127 #endif 131 #endif
128 132
129 #endif // VPX_VP8DX_H_ 133 #endif // VPX_VP8DX_H_
OLDNEW
« no previous file with comments | « source/libvpx/vpx/svc_context.h ('k') | source/libvpx/vpx/vpx_codec.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698