| OLD | NEW |
| 1 // Copyright 2010 Google Inc. All Rights Reserved. | 1 // Copyright 2010 Google Inc. All Rights Reserved. |
| 2 // | 2 // |
| 3 // Use of this source code is governed by a BSD-style license | 3 // Use of this source code is governed by a BSD-style license |
| 4 // that can be found in the COPYING file in the root of the source | 4 // that can be found in the COPYING file in the root of the source |
| 5 // tree. An additional intellectual property rights grant can be found | 5 // tree. An additional intellectual property rights grant can be found |
| 6 // in the file PATENTS. All contributing project authors may | 6 // in the file PATENTS. All contributing project authors may |
| 7 // be found in the AUTHORS file in the root of the source tree. | 7 // be found in the AUTHORS file in the root of the source tree. |
| 8 // ----------------------------------------------------------------------------- | 8 // ----------------------------------------------------------------------------- |
| 9 // | 9 // |
| 10 // Coding trees and probas | 10 // Coding trees and probas |
| 11 // | 11 // |
| 12 // Author: Skal (pascal.massimino@gmail.com) | 12 // Author: Skal (pascal.massimino@gmail.com) |
| 13 | 13 |
| 14 #include "./vp8i.h" | 14 #include "./vp8i_dec.h" |
| 15 #include "../utils/bit_reader_inl.h" | 15 #include "../utils/bit_reader_inl_utils.h" |
| 16 | 16 |
| 17 #if !defined(__arm__) && !defined(_M_ARM) && !defined(__aarch64__) |
| 18 // using a table is ~1-2% slower on ARM. Prefer the coded-tree approach then. |
| 17 #define USE_GENERIC_TREE | 19 #define USE_GENERIC_TREE |
| 20 #endif |
| 18 | 21 |
| 19 #ifdef USE_GENERIC_TREE | 22 #ifdef USE_GENERIC_TREE |
| 20 static const int8_t kYModesIntra4[18] = { | 23 static const int8_t kYModesIntra4[18] = { |
| 21 -B_DC_PRED, 1, | 24 -B_DC_PRED, 1, |
| 22 -B_TM_PRED, 2, | 25 -B_TM_PRED, 2, |
| 23 -B_VE_PRED, 3, | 26 -B_VE_PRED, 3, |
| 24 4, 6, | 27 4, 6, |
| 25 -B_HE_PRED, 5, | 28 -B_HE_PRED, 5, |
| 26 -B_RD_PRED, -B_VR_PRED, | 29 -B_RD_PRED, -B_VR_PRED, |
| 27 -B_LD_PRED, 7, | 30 -B_LD_PRED, 7, |
| (...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 516 for (b = 0; b < 16 + 1; ++b) { | 519 for (b = 0; b < 16 + 1; ++b) { |
| 517 proba->bands_ptr_[t][b] = &proba->bands_[t][kBands[b]]; | 520 proba->bands_ptr_[t][b] = &proba->bands_[t][kBands[b]]; |
| 518 } | 521 } |
| 519 } | 522 } |
| 520 dec->use_skip_proba_ = VP8Get(br); | 523 dec->use_skip_proba_ = VP8Get(br); |
| 521 if (dec->use_skip_proba_) { | 524 if (dec->use_skip_proba_) { |
| 522 dec->skip_p_ = VP8GetValue(br, 8); | 525 dec->skip_p_ = VP8GetValue(br, 8); |
| 523 } | 526 } |
| 524 } | 527 } |
| 525 | 528 |
| OLD | NEW |