| 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 "vp9/common/vp9_entropy.h" | 11 #include "vp9/common/vp9_entropy.h" | 
| 12 #include "vp9/common/vp9_blockd.h" | 12 #include "vp9/common/vp9_blockd.h" | 
| 13 #include "vp9/common/vp9_onyxc_int.h" | 13 #include "vp9/common/vp9_onyxc_int.h" | 
| 14 #include "vp9/common/vp9_entropymode.h" | 14 #include "vp9/common/vp9_entropymode.h" | 
| 15 #include "vpx_mem/vpx_mem.h" | 15 #include "vpx_mem/vpx_mem.h" | 
| 16 #include "vpx/vpx_integer.h" | 16 #include "vpx/vpx_integer.h" | 
| 17 | 17 | 
|  | 18 const vp9_prob vp9_cat1_prob[] = { 159 }; | 
|  | 19 const vp9_prob vp9_cat2_prob[] = { 165, 145 }; | 
|  | 20 const vp9_prob vp9_cat3_prob[] = { 173, 148, 140 }; | 
|  | 21 const vp9_prob vp9_cat4_prob[] = { 176, 155, 140, 135 }; | 
|  | 22 const vp9_prob vp9_cat5_prob[] = { 180, 157, 141, 134, 130 }; | 
|  | 23 const vp9_prob vp9_cat6_prob[] = { | 
|  | 24     254, 254, 254, 252, 249, 243, 230, 196, 177, 153, 140, 133, 130, 129 | 
|  | 25 }; | 
| 18 | 26 | 
| 19 const uint8_t vp9_coefband_trans_8x8plus[1024] = { | 27 const uint8_t vp9_coefband_trans_8x8plus[1024] = { | 
| 20   0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, | 28   0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, | 
| 21   4, 4, 4, 4, 4, 5, | 29   4, 4, 4, 4, 4, 5, | 
| 22   // beyond MAXBAND_INDEX+1 all values are filled as 5 | 30   // beyond MAXBAND_INDEX+1 all values are filled as 5 | 
| 23                     5, 5, 5, 5, 5, 5, 5, 5, 5, 5, | 31                     5, 5, 5, 5, 5, 5, 5, 5, 5, 5, | 
| 24   5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, | 32   5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, | 
| 25   5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, | 33   5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, | 
| 26   5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, | 34   5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, | 
| 27   5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, | 35   5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, | 
| (...skipping 746 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 774   } else if (cm->last_frame_type == KEY_FRAME) { | 782   } else if (cm->last_frame_type == KEY_FRAME) { | 
| 775     update_factor = COEF_MAX_UPDATE_FACTOR_AFTER_KEY;  /* adapt quickly */ | 783     update_factor = COEF_MAX_UPDATE_FACTOR_AFTER_KEY;  /* adapt quickly */ | 
| 776     count_sat = COEF_COUNT_SAT_AFTER_KEY; | 784     count_sat = COEF_COUNT_SAT_AFTER_KEY; | 
| 777   } else { | 785   } else { | 
| 778     update_factor = COEF_MAX_UPDATE_FACTOR; | 786     update_factor = COEF_MAX_UPDATE_FACTOR; | 
| 779     count_sat = COEF_COUNT_SAT; | 787     count_sat = COEF_COUNT_SAT; | 
| 780   } | 788   } | 
| 781   for (t = TX_4X4; t <= TX_32X32; t++) | 789   for (t = TX_4X4; t <= TX_32X32; t++) | 
| 782     adapt_coef_probs(cm, t, count_sat, update_factor); | 790     adapt_coef_probs(cm, t, count_sat, update_factor); | 
| 783 } | 791 } | 
| OLD | NEW | 
|---|