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 16 matching lines...) Expand all Loading... |
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 #ifdef FIXED_POINT | 31 #ifdef FIXED_POINT |
32 #include "main_FIX.h" | 32 #include "main_FIX.h" |
33 #else | 33 #else |
34 #include "main_FLP.h" | 34 #include "main_FLP.h" |
35 #endif | 35 #endif |
36 #include "tuning_parameters.h" | 36 #include "tuning_parameters.h" |
| 37 #include "cpu_support.h" |
37 | 38 |
38 /*********************************/ | 39 /*********************************/ |
39 /* Initialize Silk Encoder state */ | 40 /* Initialize Silk Encoder state */ |
40 /*********************************/ | 41 /*********************************/ |
41 opus_int silk_init_encoder( | 42 opus_int silk_init_encoder( |
42 silk_encoder_state_Fxx *psEnc /* I
/O Pointer to Silk FIX encoder state
*/ | 43 silk_encoder_state_Fxx *psEnc, /* I
/O Pointer to Silk FIX encoder state
*/ |
| 44 int arch /* I
Run-time architecture
*/ |
43 ) | 45 ) |
44 { | 46 { |
45 opus_int ret = 0; | 47 opus_int ret = 0; |
46 | 48 |
47 /* Clear the entire encoder state */ | 49 /* Clear the entire encoder state */ |
48 silk_memset( psEnc, 0, sizeof( silk_encoder_state_Fxx ) ); | 50 silk_memset( psEnc, 0, sizeof( silk_encoder_state_Fxx ) ); |
49 | 51 |
| 52 psEnc->sCmn.arch = arch; |
| 53 |
50 psEnc->sCmn.variable_HP_smth1_Q15 = silk_LSHIFT( silk_lin2log( SILK_FIX_CONS
T( VARIABLE_HP_MIN_CUTOFF_HZ, 16 ) ) - ( 16 << 7 ), 8 ); | 54 psEnc->sCmn.variable_HP_smth1_Q15 = silk_LSHIFT( silk_lin2log( SILK_FIX_CONS
T( VARIABLE_HP_MIN_CUTOFF_HZ, 16 ) ) - ( 16 << 7 ), 8 ); |
51 psEnc->sCmn.variable_HP_smth2_Q15 = psEnc->sCmn.variable_HP_smth1_Q15; | 55 psEnc->sCmn.variable_HP_smth2_Q15 = psEnc->sCmn.variable_HP_smth1_Q15; |
52 | 56 |
53 /* Used to deactivate LSF interpolation, pitch prediction */ | 57 /* Used to deactivate LSF interpolation, pitch prediction */ |
54 psEnc->sCmn.first_frame_after_reset = 1; | 58 psEnc->sCmn.first_frame_after_reset = 1; |
55 | 59 |
56 /* Initialize Silk VAD */ | 60 /* Initialize Silk VAD */ |
57 ret += silk_VAD_Init( &psEnc->sCmn.sVAD ); | 61 ret += silk_VAD_Init( &psEnc->sCmn.sVAD ); |
58 | 62 |
59 return ret; | 63 return ret; |
60 } | 64 } |
OLD | NEW |