summaryrefslogtreecommitdiff
path: root/lib/rbcodec/codecs/libspeex/speex_callbacks.c
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2024-05-08 10:36:38 -0400
committerSolomon Peachy <pizza@shaftnet.org>2024-06-20 07:08:35 -0400
commit547b6a570dbad844e79b4ba5eb934f043bab6318 (patch)
tree0cbdb670d73a2544d33985166c5abfa69e20a590 /lib/rbcodec/codecs/libspeex/speex_callbacks.c
parent8ef20383b1e5025f7724e750832de6e28e50680d (diff)
downloadrockbox-547b6a570dbad844e79b4ba5eb934f043bab6318.tar.gz
rockbox-547b6a570dbad844e79b4ba5eb934f043bab6318.zip
codecs: Update libspeex from 1.2beta3 to 1.2rc1
This is a relatively minor bump, but it's the first step towards bringing this current. Change-Id: Iab6c9b0c77f0ba705280434ea74b513364719499
Diffstat (limited to 'lib/rbcodec/codecs/libspeex/speex_callbacks.c')
-rw-r--r--lib/rbcodec/codecs/libspeex/speex_callbacks.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/lib/rbcodec/codecs/libspeex/speex_callbacks.c b/lib/rbcodec/codecs/libspeex/speex_callbacks.c
index f1de038488..ca236ed399 100644
--- a/lib/rbcodec/codecs/libspeex/speex_callbacks.c
+++ b/lib/rbcodec/codecs/libspeex/speex_callbacks.c
@@ -6,18 +6,18 @@
6 Redistribution and use in source and binary forms, with or without 6 Redistribution and use in source and binary forms, with or without
7 modification, are permitted provided that the following conditions 7 modification, are permitted provided that the following conditions
8 are met: 8 are met:
9 9
10 - Redistributions of source code must retain the above copyright 10 - Redistributions of source code must retain the above copyright
11 notice, this list of conditions and the following disclaimer. 11 notice, this list of conditions and the following disclaimer.
12 12
13 - Redistributions in binary form must reproduce the above copyright 13 - Redistributions in binary form must reproduce the above copyright
14 notice, this list of conditions and the following disclaimer in the 14 notice, this list of conditions and the following disclaimer in the
15 documentation and/or other materials provided with the distribution. 15 documentation and/or other materials provided with the distribution.
16 16
17 - Neither the name of the Xiph.org Foundation nor the names of its 17 - Neither the name of the Xiph.org Foundation nor the names of its
18 contributors may be used to endorse or promote products derived from 18 contributors may be used to endorse or promote products derived from
19 this software without specific prior written permission. 19 this software without specific prior written permission.
20 20
21 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 21 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
22 ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 22 ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
23 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 23 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -40,7 +40,7 @@
40#include "arch.h" 40#include "arch.h"
41#include "os_support.h" 41#include "os_support.h"
42 42
43int speex_inband_handler(SpeexBits *bits, SpeexCallback *callback_list, void *state) 43EXPORT int speex_inband_handler(SpeexBits *bits, SpeexCallback *callback_list, void *state)
44{ 44{
45 int id; 45 int id;
46 SpeexCallback *callback; 46 SpeexCallback *callback;
@@ -65,7 +65,7 @@ int speex_inband_handler(SpeexBits *bits, SpeexCallback *callback_list, void *st
65 adv = 16; 65 adv = 16;
66 else if (id<14) 66 else if (id<14)
67 adv = 32; 67 adv = 32;
68 else 68 else
69 adv = 64; 69 adv = 64;
70 speex_bits_advance(bits, adv); 70 speex_bits_advance(bits, adv);
71 } 71 }
@@ -74,7 +74,7 @@ int speex_inband_handler(SpeexBits *bits, SpeexCallback *callback_list, void *st
74 74
75#if 0 75#if 0
76/* Rockbox: unused */ 76/* Rockbox: unused */
77int speex_std_mode_request_handler(SpeexBits *bits, void *state, void *data) 77EXPORT int speex_std_mode_request_handler(SpeexBits *bits, void *state, void *data)
78{ 78{
79 (void)state; 79 (void)state;
80 spx_int32_t m; 80 spx_int32_t m;
@@ -83,7 +83,7 @@ int speex_std_mode_request_handler(SpeexBits *bits, void *state, void *data)
83 return 0; 83 return 0;
84} 84}
85 85
86int speex_std_low_mode_request_handler(SpeexBits *bits, void *state, void *data) 86EXPORT int speex_std_low_mode_request_handler(SpeexBits *bits, void *state, void *data)
87{ 87{
88 (void)state; 88 (void)state;
89 spx_int32_t m; 89 spx_int32_t m;
@@ -92,7 +92,7 @@ int speex_std_low_mode_request_handler(SpeexBits *bits, void *state, void *data)
92 return 0; 92 return 0;
93} 93}
94 94
95int speex_std_high_mode_request_handler(SpeexBits *bits, void *state, void *data) 95EXPORT int speex_std_high_mode_request_handler(SpeexBits *bits, void *state, void *data)
96{ 96{
97 (void)state; 97 (void)state;
98 spx_int32_t m; 98 spx_int32_t m;
@@ -103,7 +103,7 @@ int speex_std_high_mode_request_handler(SpeexBits *bits, void *state, void *data
103#endif 103#endif
104 104
105#ifndef DISABLE_VBR 105#ifndef DISABLE_VBR
106int speex_std_vbr_request_handler(SpeexBits *bits, void *state, void *data) 106EXPORT int speex_std_vbr_request_handler(SpeexBits *bits, void *state, void *data)
107{ 107{
108 (void)state; 108 (void)state;
109 spx_int32_t vbr; 109 spx_int32_t vbr;
@@ -115,7 +115,7 @@ int speex_std_vbr_request_handler(SpeexBits *bits, void *state, void *data)
115 115
116#if 0 116#if 0
117/* Rockbox: unused */ 117/* Rockbox: unused */
118int speex_std_enh_request_handler(SpeexBits *bits, void *state, void *data) 118EXPORT int speex_std_enh_request_handler(SpeexBits *bits, void *state, void *data)
119{ 119{
120 (void)state; 120 (void)state;
121 spx_int32_t enh; 121 spx_int32_t enh;
@@ -126,7 +126,7 @@ int speex_std_enh_request_handler(SpeexBits *bits, void *state, void *data)
126#endif 126#endif
127 127
128#ifndef DISABLE_VBR 128#ifndef DISABLE_VBR
129int speex_std_vbr_quality_request_handler(SpeexBits *bits, void *state, void *data) 129EXPORT int speex_std_vbr_quality_request_handler(SpeexBits *bits, void *state, void *data)
130{ 130{
131 (void)state; 131 (void)state;
132 float qual; 132 float qual;
@@ -138,7 +138,7 @@ int speex_std_vbr_quality_request_handler(SpeexBits *bits, void *state, void *da
138 138
139#if 0 139#if 0
140/* Rockbox: unused */ 140/* Rockbox: unused */
141int speex_std_char_handler(SpeexBits *bits, void *state, void *data) 141EXPORT int speex_std_char_handler(SpeexBits *bits, void *state, void *data)
142{ 142{
143 (void)state; 143 (void)state;
144 unsigned char ch; 144 unsigned char ch;
@@ -150,7 +150,7 @@ int speex_std_char_handler(SpeexBits *bits, void *state, void *data)
150#endif 150#endif
151 151
152/* Default handler for user callbacks: skip it */ 152/* Default handler for user callbacks: skip it */
153int speex_default_user_handler(SpeexBits *bits, void *state, void *data) 153EXPORT int speex_default_user_handler(SpeexBits *bits, void *state, void *data)
154{ 154{
155 (void)state; 155 (void)state;
156 (void)data; 156 (void)data;