Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.xiph.org/xiph/opus.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Vos <koen.vos@skype.net>2011-10-29 03:44:26 +0400
committerJean-Marc Valin <jmvalin@jmvalin.ca>2011-10-29 03:44:26 +0400
commitacc7a6c78b266e3ef0e1f91ee405af92a0989dec (patch)
treed3e32cc66cf96fecdaffc924ff0d051028b72f31 /silk/control_audio_bandwidth.c
parent2d4f61409186c7efa831387bf14e2164607a805a (diff)
Reformatting changes with an update to the MSVC project files
Diffstat (limited to 'silk/control_audio_bandwidth.c')
-rw-r--r--silk/control_audio_bandwidth.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/silk/control_audio_bandwidth.c b/silk/control_audio_bandwidth.c
index e551e9d6..a8541f6e 100644
--- a/silk/control_audio_bandwidth.c
+++ b/silk/control_audio_bandwidth.c
@@ -34,8 +34,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/* Control internal sampling rate */
opus_int silk_control_audio_bandwidth(
- silk_encoder_state *psEncC, /* I/O Pointer to Silk encoder state */
- silk_EncControlStruct *encControl /* I: Control structure */
+ silk_encoder_state *psEncC, /* I/O Pointer to Silk encoder state */
+ silk_EncControlStruct *encControl /* I Control structure */
)
{
opus_int fs_kHz;
@@ -71,7 +71,7 @@ opus_int silk_control_audio_bandwidth(
/* Reset transition filter state */
silk_memset( psEncC->sLP.In_LP_State, 0, sizeof( psEncC->sLP.In_LP_State ) );
}
- if (encControl->opusCanSwitch) {
+ if( encControl->opusCanSwitch ) {
/* Stop transition phase */
psEncC->sLP.mode = 0;
@@ -91,7 +91,7 @@ opus_int silk_control_audio_bandwidth(
if( silk_SMULBB( psEncC->fs_kHz, 1000 ) < psEncC->desiredInternal_fs_Hz )
{
/* Switch up */
- if (encControl->opusCanSwitch) {
+ if( encControl->opusCanSwitch ) {
/* Switch to a higher sample frequency */
fs_kHz = psEncC->fs_kHz == 8 ? 12 : 16;
@@ -115,9 +115,5 @@ opus_int silk_control_audio_bandwidth(
}
}
-#ifdef FORCE_INTERNAL_FS_KHZ
- fs_kHz = FORCE_INTERNAL_FS_KHZ;
-#endif
-
return fs_kHz;
}