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

Side by Side Diff: source/libvpx/vp8/decoder/decodeframe.c

Issue 812033011: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 5 years, 11 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/vp8/common/postproc.c ('k') | source/libvpx/vp8/decoder/decodemv.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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 } 94 }
95 } 95 }
96 96
97 static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, 97 static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd,
98 unsigned int mb_idx) 98 unsigned int mb_idx)
99 { 99 {
100 MB_PREDICTION_MODE mode; 100 MB_PREDICTION_MODE mode;
101 int i; 101 int i;
102 #if CONFIG_ERROR_CONCEALMENT 102 #if CONFIG_ERROR_CONCEALMENT
103 int corruption_detected = 0; 103 int corruption_detected = 0;
104 #else
105 (void)mb_idx;
104 #endif 106 #endif
105 107
106 if (xd->mode_info_context->mbmi.mb_skip_coeff) 108 if (xd->mode_info_context->mbmi.mb_skip_coeff)
107 { 109 {
108 vp8_reset_mb_tokens_context(xd); 110 vp8_reset_mb_tokens_context(xd);
109 } 111 }
110 else if (!vp8dx_bool_error(xd->current_bc)) 112 else if (!vp8dx_bool_error(xd->current_bc))
111 { 113 {
112 int eobtotal; 114 int eobtotal;
113 eobtotal = vp8_decode_mb_tokens(pbi, xd); 115 eobtotal = vp8_decode_mb_tokens(pbi, xd);
(...skipping 1274 matching lines...) Expand 10 before | Expand all | Expand 10 after
1388 FILE *f = fopen("decompressor.VP8", "ab"); 1390 FILE *f = fopen("decompressor.VP8", "ab");
1389 unsigned int size = pbi->bc2.pos + pbi->bc.pos + 8; 1391 unsigned int size = pbi->bc2.pos + pbi->bc.pos + 8;
1390 fwrite((void *) &size, 4, 1, f); 1392 fwrite((void *) &size, 4, 1, f);
1391 fwrite((void *) pbi->Source, size, 1, f); 1393 fwrite((void *) pbi->Source, size, 1, f);
1392 fclose(f); 1394 fclose(f);
1393 } 1395 }
1394 #endif 1396 #endif
1395 1397
1396 return 0; 1398 return 0;
1397 } 1399 }
OLDNEW
« no previous file with comments | « source/libvpx/vp8/common/postproc.c ('k') | source/libvpx/vp8/decoder/decodemv.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698