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

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

Issue 13849011: libvpx: Pull from upstream (Closed) Base URL: https://src.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 7 years, 8 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/vpx/vp8cx.h ('k') | source/libvpx/vpx/vpx_integer.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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 * by the last decode 62 * by the last decode
63 */ 63 */
64 VP8D_GET_LAST_REF_USED, 64 VP8D_GET_LAST_REF_USED,
65 65
66 /** decryption key to protect encoded data buffer before decoding, 66 /** decryption key to protect encoded data buffer before decoding,
67 * pointer to 32 byte array which is copied, so the array passed 67 * pointer to 32 byte array which is copied, so the array passed
68 * does not need to be preserved 68 * does not need to be preserved
69 */ 69 */
70 VP8_SET_DECRYPT_KEY, 70 VP8_SET_DECRYPT_KEY,
71 71
72 /** For testing. */
73 VP9_INVERT_TILE_DECODE_ORDER,
74
72 VP8_DECODER_CTRL_ID_MAX 75 VP8_DECODER_CTRL_ID_MAX
73 }; 76 };
74 77
75 78
76 /*!\brief VP8 decoder control function parameter type 79 /*!\brief VP8 decoder control function parameter type
77 * 80 *
78 * Defines the data types that VP8D control functions take. Note that 81 * Defines the data types that VP8D control functions take. Note that
79 * additional common controls are defined in vp8.h 82 * additional common controls are defined in vp8.h
80 * 83 *
81 */ 84 */
82 85
83 86
84 VPX_CTRL_USE_TYPE(VP8D_GET_LAST_REF_UPDATES, int *) 87 VPX_CTRL_USE_TYPE(VP8D_GET_LAST_REF_UPDATES, int *)
85 VPX_CTRL_USE_TYPE(VP8D_GET_FRAME_CORRUPTED, int *) 88 VPX_CTRL_USE_TYPE(VP8D_GET_FRAME_CORRUPTED, int *)
86 VPX_CTRL_USE_TYPE(VP8D_GET_LAST_REF_USED, int *) 89 VPX_CTRL_USE_TYPE(VP8D_GET_LAST_REF_USED, int *)
87 VPX_CTRL_USE_TYPE(VP8_SET_DECRYPT_KEY, const unsigned char *) 90 VPX_CTRL_USE_TYPE(VP8_SET_DECRYPT_KEY, const unsigned char *)
91 VPX_CTRL_USE_TYPE(VP9_INVERT_TILE_DECODE_ORDER, int)
88 92
89 /*! @} - end defgroup vp8_decoder */ 93 /*! @} - end defgroup vp8_decoder */
90 94
91 95
92 #include "vpx_codec_impl_bottom.h" 96 #include "vpx_codec_impl_bottom.h"
93 #endif 97 #endif
OLDNEW
« no previous file with comments | « source/libvpx/vpx/vp8cx.h ('k') | source/libvpx/vpx/vpx_integer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698