| OLD | NEW |
| 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 | 47 |
| 48 YV12_BUFFER_CONFIG *dec_fb_ref[NUM_YV12_BUFFERS]; | 48 YV12_BUFFER_CONFIG *dec_fb_ref[NUM_YV12_BUFFERS]; |
| 49 | 49 |
| 50 DECLARE_ALIGNED(16, VP8_COMMON, common); | 50 DECLARE_ALIGNED(16, VP8_COMMON, common); |
| 51 | 51 |
| 52 /* the last partition will be used for the modes/mvs */ | 52 /* the last partition will be used for the modes/mvs */ |
| 53 vp8_reader mbc[MAX_PARTITIONS]; | 53 vp8_reader mbc[MAX_PARTITIONS]; |
| 54 | 54 |
| 55 VP8D_CONFIG oxcf; | 55 VP8D_CONFIG oxcf; |
| 56 | 56 |
| 57 | 57 FRAGMENT_DATA fragments; |
| 58 const unsigned char *fragments[MAX_PARTITIONS]; | |
| 59 unsigned int fragment_sizes[MAX_PARTITIONS]; | |
| 60 unsigned int num_fragments; | |
| 61 | 58 |
| 62 #if CONFIG_MULTITHREAD | 59 #if CONFIG_MULTITHREAD |
| 63 /* variable for threading */ | 60 /* variable for threading */ |
| 64 | 61 |
| 65 volatile int b_multithreaded_rd; | 62 volatile int b_multithreaded_rd; |
| 66 int max_threads; | 63 int max_threads; |
| 67 int current_mb_col_main; | 64 int current_mb_col_main; |
| 68 unsigned int decoding_thread_count; | 65 unsigned int decoding_thread_count; |
| 69 int allocated_decoding_thread_count; | 66 int allocated_decoding_thread_count; |
| 70 | 67 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 96 vp8_prob prob_gf; | 93 vp8_prob prob_gf; |
| 97 vp8_prob prob_skip_false; | 94 vp8_prob prob_skip_false; |
| 98 | 95 |
| 99 #if CONFIG_ERROR_CONCEALMENT | 96 #if CONFIG_ERROR_CONCEALMENT |
| 100 MB_OVERLAP *overlaps; | 97 MB_OVERLAP *overlaps; |
| 101 /* the mb num from which modes and mvs (first partition) are corrupt */ | 98 /* the mb num from which modes and mvs (first partition) are corrupt */ |
| 102 unsigned int mvs_corrupt_from_mb; | 99 unsigned int mvs_corrupt_from_mb; |
| 103 #endif | 100 #endif |
| 104 int ec_enabled; | 101 int ec_enabled; |
| 105 int ec_active; | 102 int ec_active; |
| 106 int input_fragments; | |
| 107 int decoded_key_frame; | 103 int decoded_key_frame; |
| 108 int independent_partitions; | 104 int independent_partitions; |
| 109 int frame_corrupt_residual; | 105 int frame_corrupt_residual; |
| 110 | 106 |
| 111 } VP8D_COMP; | 107 } VP8D_COMP; |
| 112 | 108 |
| 113 int vp8_decode_frame(VP8D_COMP *cpi); | 109 int vp8_decode_frame(VP8D_COMP *cpi); |
| 114 | 110 |
| 115 #if CONFIG_DEBUG | 111 #if CONFIG_DEBUG |
| 116 #define CHECK_MEM_ERROR(lval,expr) do {\ | 112 #define CHECK_MEM_ERROR(lval,expr) do {\ |
| 117 lval = (expr); \ | 113 lval = (expr); \ |
| 118 if(!lval) \ | 114 if(!lval) \ |
| 119 vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR,\ | 115 vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR,\ |
| 120 "Failed to allocate "#lval" at %s:%d", \ | 116 "Failed to allocate "#lval" at %s:%d", \ |
| 121 __FILE__,__LINE__);\ | 117 __FILE__,__LINE__);\ |
| 122 } while(0) | 118 } while(0) |
| 123 #else | 119 #else |
| 124 #define CHECK_MEM_ERROR(lval,expr) do {\ | 120 #define CHECK_MEM_ERROR(lval,expr) do {\ |
| 125 lval = (expr); \ | 121 lval = (expr); \ |
| 126 if(!lval) \ | 122 if(!lval) \ |
| 127 vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR,\ | 123 vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR,\ |
| 128 "Failed to allocate "#lval);\ | 124 "Failed to allocate "#lval);\ |
| 129 } while(0) | 125 } while(0) |
| 130 #endif | 126 #endif |
| 131 | 127 |
| 132 #endif | 128 #endif |
| OLD | NEW |