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

Side by Side Diff: source/libvpx/vp8/decoder/onyxd_int.h

Issue 12807010: libvpx: Fix pull from upstream (Closed) Base URL: https://src.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 7 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 | « source/libvpx/vp8/decoder/dboolhuff.c ('k') | source/libvpx/vp8/encoder/onyx_if.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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 MB_OVERLAP *overlaps; 115 MB_OVERLAP *overlaps;
116 /* the mb num from which modes and mvs (first partition) are corrupt */ 116 /* the mb num from which modes and mvs (first partition) are corrupt */
117 unsigned int mvs_corrupt_from_mb; 117 unsigned int mvs_corrupt_from_mb;
118 #endif 118 #endif
119 int ec_enabled; 119 int ec_enabled;
120 int ec_active; 120 int ec_active;
121 int decoded_key_frame; 121 int decoded_key_frame;
122 int independent_partitions; 122 int independent_partitions;
123 int frame_corrupt_residual; 123 int frame_corrupt_residual;
124 124
125 const unsigned char *decrypt_key;
125 } VP8D_COMP; 126 } VP8D_COMP;
126 127
127 int vp8_decode_frame(VP8D_COMP *cpi); 128 int vp8_decode_frame(VP8D_COMP *cpi);
128 129
129 int vp8_create_decoder_instances(struct frame_buffers *fb, VP8D_CONFIG *oxcf); 130 int vp8_create_decoder_instances(struct frame_buffers *fb, VP8D_CONFIG *oxcf);
130 int vp8_remove_decoder_instances(struct frame_buffers *fb); 131 int vp8_remove_decoder_instances(struct frame_buffers *fb);
131 132
132 #if CONFIG_DEBUG 133 #if CONFIG_DEBUG
133 #define CHECK_MEM_ERROR(lval,expr) do {\ 134 #define CHECK_MEM_ERROR(lval,expr) do {\
134 lval = (expr); \ 135 lval = (expr); \
135 if(!lval) \ 136 if(!lval) \
136 vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR,\ 137 vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR,\
137 "Failed to allocate "#lval" at %s:%d", \ 138 "Failed to allocate "#lval" at %s:%d", \
138 __FILE__,__LINE__);\ 139 __FILE__,__LINE__);\
139 } while(0) 140 } while(0)
140 #else 141 #else
141 #define CHECK_MEM_ERROR(lval,expr) do {\ 142 #define CHECK_MEM_ERROR(lval,expr) do {\
142 lval = (expr); \ 143 lval = (expr); \
143 if(!lval) \ 144 if(!lval) \
144 vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR,\ 145 vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR,\
145 "Failed to allocate "#lval);\ 146 "Failed to allocate "#lval);\
146 } while(0) 147 } while(0)
147 #endif 148 #endif
148 149
149 #endif // ONYXD_INT_H_ 150 #endif // ONYXD_INT_H_
OLDNEW
« no previous file with comments | « source/libvpx/vp8/decoder/dboolhuff.c ('k') | source/libvpx/vp8/encoder/onyx_if.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698