| 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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 } | 92 } |
| 93 res_nrg_2nd = res_nrg_interp; | 93 res_nrg_2nd = res_nrg_interp; |
| 94 } | 94 } |
| 95 } | 95 } |
| 96 | 96 |
| 97 if( psEncC->indices.NLSFInterpCoef_Q2 == 4 ) { | 97 if( psEncC->indices.NLSFInterpCoef_Q2 == 4 ) { |
| 98 /* NLSF interpolation is currently inactive, calculate NLSFs from full f
rame AR coefficients */ | 98 /* NLSF interpolation is currently inactive, calculate NLSFs from full f
rame AR coefficients */ |
| 99 silk_A2NLSF_FLP( NLSF_Q15, a, psEncC->predictLPCOrder ); | 99 silk_A2NLSF_FLP( NLSF_Q15, a, psEncC->predictLPCOrder ); |
| 100 } | 100 } |
| 101 | 101 |
| 102 silk_assert( psEncC->indices.NLSFInterpCoef_Q2 == 4 || | 102 silk_assert( psEncC->indices.NLSFInterpCoef_Q2 == 4 || |
| 103 ( psEncC->useInterpolatedNLSFs && !psEncC->first_frame_after_reset && ps
EncC->nb_subfr == MAX_NB_SUBFR ) ); | 103 ( psEncC->useInterpolatedNLSFs && !psEncC->first_frame_after_reset && ps
EncC->nb_subfr == MAX_NB_SUBFR ) ); |
| 104 } | 104 } |
| OLD | NEW |