| 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 |
| 11 #include <assert.h> | 11 #include <assert.h> |
| 12 #include <stdlib.h> // qsort() | 12 #include <stdlib.h> // qsort() |
| 13 | 13 |
| 14 #include "./vp9_rtcd.h" | 14 #include "./vp9_rtcd.h" |
| 15 #include "./vpx_dsp_rtcd.h" | 15 #include "./vpx_dsp_rtcd.h" |
| 16 #include "./vpx_scale_rtcd.h" | 16 #include "./vpx_scale_rtcd.h" |
| 17 | 17 |
| 18 #include "vpx_dsp/bitreader_buffer.h" | 18 #include "vpx_dsp/bitreader_buffer.h" |
| 19 #include "vpx_dsp/bitreader.h" | 19 #include "vpx_dsp/bitreader.h" |
| 20 #include "vpx_dsp/vpx_dsp_common.h" |
| 20 #include "vpx_mem/vpx_mem.h" | 21 #include "vpx_mem/vpx_mem.h" |
| 21 #include "vpx_ports/mem.h" | 22 #include "vpx_ports/mem.h" |
| 22 #include "vpx_ports/mem_ops.h" | 23 #include "vpx_ports/mem_ops.h" |
| 23 #include "vpx_scale/vpx_scale.h" | 24 #include "vpx_scale/vpx_scale.h" |
| 24 #include "vpx_util/vpx_thread.h" | 25 #include "vpx_util/vpx_thread.h" |
| 25 | 26 |
| 26 #include "vp9/common/vp9_alloccommon.h" | 27 #include "vp9/common/vp9_alloccommon.h" |
| 27 #include "vp9/common/vp9_common.h" | 28 #include "vp9/common/vp9_common.h" |
| 28 #include "vp9/common/vp9_entropy.h" | 29 #include "vp9/common/vp9_entropy.h" |
| 29 #include "vp9/common/vp9_entropymode.h" | 30 #include "vp9/common/vp9_entropymode.h" |
| (...skipping 2207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2237 } | 2238 } |
| 2238 } else { | 2239 } else { |
| 2239 vpx_internal_error(&cm->error, VPX_CODEC_CORRUPT_FRAME, | 2240 vpx_internal_error(&cm->error, VPX_CODEC_CORRUPT_FRAME, |
| 2240 "Decode failed. Frame data is corrupted."); | 2241 "Decode failed. Frame data is corrupted."); |
| 2241 } | 2242 } |
| 2242 | 2243 |
| 2243 // Non frame parallel update frame context here. | 2244 // Non frame parallel update frame context here. |
| 2244 if (cm->refresh_frame_context && !context_updated) | 2245 if (cm->refresh_frame_context && !context_updated) |
| 2245 cm->frame_contexts[cm->frame_context_idx] = *cm->fc; | 2246 cm->frame_contexts[cm->frame_context_idx] = *cm->fc; |
| 2246 } | 2247 } |
| OLD | NEW |