| OLD | NEW |
| 1 /*********************************************************************** | 1 /*********************************************************************** |
| 2 Copyright (c) 2006-2011, Skype Limited. All rights reserved. | 2 Copyright (c) 2006-2011, Skype Limited. All rights reserved. |
| 3 Redistribution and use in source and binary forms, with or without | 3 Redistribution and use in source and binary forms, with or without |
| 4 modification, are permitted provided that the following conditions | 4 modification, are permitted provided that the following conditions |
| 5 are met: | 5 are met: |
| 6 - Redistributions of source code must retain the above copyright notice, | 6 - Redistributions of source code must retain the above copyright notice, |
| 7 this list of conditions and the following disclaimer. | 7 this list of conditions and the following disclaimer. |
| 8 - Redistributions in binary form must reproduce the above copyright | 8 - Redistributions in binary form must reproduce the above copyright |
| 9 notice, this list of conditions and the following disclaimer in the | 9 notice, this list of conditions and the following disclaimer in the |
| 10 documentation and/or other materials provided with the distribution. | 10 documentation and/or other materials provided with the distribution. |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 24 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
| 25 POSSIBILITY OF SUCH DAMAGE. | 25 POSSIBILITY OF SUCH DAMAGE. |
| 26 ***********************************************************************/ | 26 ***********************************************************************/ |
| 27 | 27 |
| 28 #ifdef HAVE_CONFIG_H | 28 #ifdef HAVE_CONFIG_H |
| 29 #include "config.h" | 29 #include "config.h" |
| 30 #endif | 30 #endif |
| 31 | 31 |
| 32 #include "tables.h" | 32 #include "tables.h" |
| 33 | 33 |
| 34 const opus_uint8 silk_NLSF_CB1_WB_Q8[ 512 ] = { | 34 static const opus_uint8 silk_NLSF_CB1_WB_Q8[ 512 ] = { |
| 35 7, 23, 38, 54, 69, 85, 100, 116, | 35 7, 23, 38, 54, 69, 85, 100, 116, |
| 36 131, 147, 162, 178, 193, 208, 223, 239, | 36 131, 147, 162, 178, 193, 208, 223, 239, |
| 37 13, 25, 41, 55, 69, 83, 98, 112, | 37 13, 25, 41, 55, 69, 83, 98, 112, |
| 38 127, 142, 157, 171, 187, 203, 220, 236, | 38 127, 142, 157, 171, 187, 203, 220, 236, |
| 39 15, 21, 34, 51, 61, 78, 92, 106, | 39 15, 21, 34, 51, 61, 78, 92, 106, |
| 40 126, 136, 152, 167, 185, 205, 225, 240, | 40 126, 136, 152, 167, 185, 205, 225, 240, |
| 41 10, 21, 36, 50, 63, 79, 95, 110, | 41 10, 21, 36, 50, 63, 79, 95, 110, |
| 42 126, 141, 157, 173, 189, 205, 221, 237, | 42 126, 141, 157, 173, 189, 205, 221, 237, |
| 43 17, 20, 37, 51, 59, 78, 89, 107, | 43 17, 20, 37, 51, 59, 78, 89, 107, |
| 44 123, 134, 150, 164, 184, 205, 224, 240, | 44 123, 134, 150, 164, 184, 205, 224, 240, |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 19, 31, 49, 65, 83, 100, 117, 133, | 91 19, 31, 49, 65, 83, 100, 117, 133, |
| 92 147, 161, 174, 187, 200, 213, 227, 242, | 92 147, 161, 174, 187, 200, 213, 227, 242, |
| 93 18, 31, 52, 68, 88, 103, 117, 126, | 93 18, 31, 52, 68, 88, 103, 117, 126, |
| 94 138, 149, 163, 177, 192, 207, 223, 239, | 94 138, 149, 163, 177, 192, 207, 223, 239, |
| 95 16, 29, 47, 61, 76, 90, 106, 119, | 95 16, 29, 47, 61, 76, 90, 106, 119, |
| 96 133, 147, 161, 176, 193, 209, 224, 240, | 96 133, 147, 161, 176, 193, 209, 224, 240, |
| 97 15, 21, 35, 50, 61, 73, 86, 97, | 97 15, 21, 35, 50, 61, 73, 86, 97, |
| 98 110, 119, 129, 141, 175, 198, 218, 237 | 98 110, 119, 129, 141, 175, 198, 218, 237 |
| 99 }; | 99 }; |
| 100 | 100 |
| 101 const opus_uint8 silk_NLSF_CB1_iCDF_WB[ 64 ] = { | 101 static const opus_uint8 silk_NLSF_CB1_iCDF_WB[ 64 ] = { |
| 102 225, 204, 201, 184, 183, 175, 158, 154, | 102 225, 204, 201, 184, 183, 175, 158, 154, |
| 103 153, 135, 119, 115, 113, 110, 109, 99, | 103 153, 135, 119, 115, 113, 110, 109, 99, |
| 104 98, 95, 79, 68, 52, 50, 48, 45, | 104 98, 95, 79, 68, 52, 50, 48, 45, |
| 105 43, 32, 31, 27, 18, 10, 3, 0, | 105 43, 32, 31, 27, 18, 10, 3, 0, |
| 106 255, 251, 235, 230, 212, 201, 196, 182, | 106 255, 251, 235, 230, 212, 201, 196, 182, |
| 107 167, 166, 163, 151, 138, 124, 110, 104, | 107 167, 166, 163, 151, 138, 124, 110, 104, |
| 108 90, 78, 76, 70, 69, 57, 45, 34, | 108 90, 78, 76, 70, 69, 57, 45, 34, |
| 109 24, 21, 11, 6, 5, 4, 3, 0 | 109 24, 21, 11, 6, 5, 4, 3, 0 |
| 110 }; | 110 }; |
| 111 | 111 |
| 112 const opus_uint8 silk_NLSF_CB2_SELECT_WB[ 256 ] = { | 112 static const opus_uint8 silk_NLSF_CB2_SELECT_WB[ 256 ] = { |
| 113 0, 0, 0, 0, 0, 0, 0, 1, | 113 0, 0, 0, 0, 0, 0, 0, 1, |
| 114 100, 102, 102, 68, 68, 36, 34, 96, | 114 100, 102, 102, 68, 68, 36, 34, 96, |
| 115 164, 107, 158, 185, 180, 185, 139, 102, | 115 164, 107, 158, 185, 180, 185, 139, 102, |
| 116 64, 66, 36, 34, 34, 0, 1, 32, | 116 64, 66, 36, 34, 34, 0, 1, 32, |
| 117 208, 139, 141, 191, 152, 185, 155, 104, | 117 208, 139, 141, 191, 152, 185, 155, 104, |
| 118 96, 171, 104, 166, 102, 102, 102, 132, | 118 96, 171, 104, 166, 102, 102, 102, 132, |
| 119 1, 0, 0, 0, 0, 16, 16, 0, | 119 1, 0, 0, 0, 0, 16, 16, 0, |
| 120 80, 109, 78, 107, 185, 139, 103, 101, | 120 80, 109, 78, 107, 185, 139, 103, 101, |
| 121 208, 212, 141, 139, 173, 153, 123, 103, | 121 208, 212, 141, 139, 173, 153, 123, 103, |
| 122 36, 0, 0, 0, 0, 0, 0, 1, | 122 36, 0, 0, 0, 0, 0, 0, 1, |
| (...skipping 14 matching lines...) Expand all Loading... |
| 137 164, 214, 141, 143, 185, 151, 121, 103, | 137 164, 214, 141, 143, 185, 151, 121, 103, |
| 138 192, 34, 0, 0, 0, 0, 0, 1, | 138 192, 34, 0, 0, 0, 0, 0, 1, |
| 139 208, 109, 74, 187, 134, 249, 159, 137, | 139 208, 109, 74, 187, 134, 249, 159, 137, |
| 140 102, 110, 154, 118, 87, 101, 119, 101, | 140 102, 110, 154, 118, 87, 101, 119, 101, |
| 141 0, 2, 0, 36, 36, 66, 68, 35, | 141 0, 2, 0, 36, 36, 66, 68, 35, |
| 142 96, 164, 102, 100, 36, 0, 2, 33, | 142 96, 164, 102, 100, 36, 0, 2, 33, |
| 143 167, 138, 174, 102, 100, 84, 2, 2, | 143 167, 138, 174, 102, 100, 84, 2, 2, |
| 144 100, 107, 120, 119, 36, 197, 24, 0 | 144 100, 107, 120, 119, 36, 197, 24, 0 |
| 145 }; | 145 }; |
| 146 | 146 |
| 147 const opus_uint8 silk_NLSF_CB2_iCDF_WB[ 72 ] = { | 147 static const opus_uint8 silk_NLSF_CB2_iCDF_WB[ 72 ] = { |
| 148 255, 254, 253, 244, 12, 3, 2, 1, | 148 255, 254, 253, 244, 12, 3, 2, 1, |
| 149 0, 255, 254, 252, 224, 38, 3, 2, | 149 0, 255, 254, 252, 224, 38, 3, 2, |
| 150 1, 0, 255, 254, 251, 209, 57, 4, | 150 1, 0, 255, 254, 251, 209, 57, 4, |
| 151 2, 1, 0, 255, 254, 244, 195, 69, | 151 2, 1, 0, 255, 254, 244, 195, 69, |
| 152 4, 2, 1, 0, 255, 251, 232, 184, | 152 4, 2, 1, 0, 255, 251, 232, 184, |
| 153 84, 7, 2, 1, 0, 255, 254, 240, | 153 84, 7, 2, 1, 0, 255, 254, 240, |
| 154 186, 86, 14, 2, 1, 0, 255, 254, | 154 186, 86, 14, 2, 1, 0, 255, 254, |
| 155 239, 178, 91, 30, 5, 1, 0, 255, | 155 239, 178, 91, 30, 5, 1, 0, 255, |
| 156 248, 227, 177, 100, 19, 2, 1, 0 | 156 248, 227, 177, 100, 19, 2, 1, 0 |
| 157 }; | 157 }; |
| 158 | 158 |
| 159 const opus_uint8 silk_NLSF_CB2_BITS_WB_Q5[ 72 ] = { | 159 static const opus_uint8 silk_NLSF_CB2_BITS_WB_Q5[ 72 ] = { |
| 160 255, 255, 255, 156, 4, 154, 255, 255, | 160 255, 255, 255, 156, 4, 154, 255, 255, |
| 161 255, 255, 255, 227, 102, 15, 92, 255, | 161 255, 255, 255, 227, 102, 15, 92, 255, |
| 162 255, 255, 255, 255, 213, 83, 24, 72, | 162 255, 255, 255, 255, 213, 83, 24, 72, |
| 163 236, 255, 255, 255, 255, 150, 76, 33, | 163 236, 255, 255, 255, 255, 150, 76, 33, |
| 164 63, 214, 255, 255, 255, 190, 121, 77, | 164 63, 214, 255, 255, 255, 190, 121, 77, |
| 165 43, 55, 185, 255, 255, 255, 245, 137, | 165 43, 55, 185, 255, 255, 255, 245, 137, |
| 166 71, 43, 59, 139, 255, 255, 255, 255, | 166 71, 43, 59, 139, 255, 255, 255, 255, |
| 167 131, 66, 50, 66, 107, 194, 255, 255, | 167 131, 66, 50, 66, 107, 194, 255, 255, |
| 168 166, 116, 76, 55, 53, 125, 255, 255 | 168 166, 116, 76, 55, 53, 125, 255, 255 |
| 169 }; | 169 }; |
| 170 | 170 |
| 171 const opus_uint8 silk_NLSF_PRED_WB_Q8[ 30 ] = { | 171 static const opus_uint8 silk_NLSF_PRED_WB_Q8[ 30 ] = { |
| 172 175, 148, 160, 176, 178, 173, 174, 164, | 172 175, 148, 160, 176, 178, 173, 174, 164, |
| 173 177, 174, 196, 182, 198, 192, 182, 68, | 173 177, 174, 196, 182, 198, 192, 182, 68, |
| 174 62, 66, 60, 72, 117, 85, 90, 118, | 174 62, 66, 60, 72, 117, 85, 90, 118, |
| 175 136, 151, 142, 160, 142, 155 | 175 136, 151, 142, 160, 142, 155 |
| 176 }; | 176 }; |
| 177 | 177 |
| 178 const opus_int16 silk_NLSF_DELTA_MIN_WB_Q15[ 17 ] = { | 178 static const opus_int16 silk_NLSF_DELTA_MIN_WB_Q15[ 17 ] = { |
| 179 100, 3, 40, 3, 3, 3, 5, 14, | 179 100, 3, 40, 3, 3, 3, 5, 14, |
| 180 14, 10, 11, 3, 8, 9, 7, 3, | 180 14, 10, 11, 3, 8, 9, 7, 3, |
| 181 347 | 181 347 |
| 182 }; | 182 }; |
| 183 | 183 |
| 184 const silk_NLSF_CB_struct silk_NLSF_CB_WB = | 184 const silk_NLSF_CB_struct silk_NLSF_CB_WB = |
| 185 { | 185 { |
| 186 32, | 186 32, |
| 187 16, | 187 16, |
| 188 SILK_FIX_CONST( 0.15, 16 ), | 188 SILK_FIX_CONST( 0.15, 16 ), |
| 189 SILK_FIX_CONST( 1.0 / 0.15, 6 ), | 189 SILK_FIX_CONST( 1.0 / 0.15, 6 ), |
| 190 silk_NLSF_CB1_WB_Q8, | 190 silk_NLSF_CB1_WB_Q8, |
| 191 silk_NLSF_CB1_iCDF_WB, | 191 silk_NLSF_CB1_iCDF_WB, |
| 192 silk_NLSF_PRED_WB_Q8, | 192 silk_NLSF_PRED_WB_Q8, |
| 193 silk_NLSF_CB2_SELECT_WB, | 193 silk_NLSF_CB2_SELECT_WB, |
| 194 silk_NLSF_CB2_iCDF_WB, | 194 silk_NLSF_CB2_iCDF_WB, |
| 195 silk_NLSF_CB2_BITS_WB_Q5, | 195 silk_NLSF_CB2_BITS_WB_Q5, |
| 196 silk_NLSF_DELTA_MIN_WB_Q15, | 196 silk_NLSF_DELTA_MIN_WB_Q15, |
| 197 }; | 197 }; |
| 198 | 198 |
| OLD | NEW |