annotate amr.c @ 4650:31bf54d9353d libavcodec

Replace custom modified discrete cosine transform with ffmpeg's own. This does alter the decoded output, but not by much. The new output is closer to that produced by Real's "official" decoder, and the decoder runs slightly faster. Patch by Ian Braithwaite ian at braithwaite dot dk
author banan
date Sun, 11 Mar 2007 20:30:06 +0000
parents 8b96c50c6723
children 00f7cd30636f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
1 /*
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
2 * AMR Audio decoder stub
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
3 * Copyright (c) 2003 the ffmpeg project
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
4 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3463
diff changeset
5 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3463
diff changeset
6 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3463
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3463
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
11 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3463
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
15 * Lesser General Public License for more details.
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
16 *
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3463
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
3036
0b546eab515d Update licensing information: The FSF changed postal address.
diego
parents: 2979
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
20 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
21
4575
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
22 /** @file
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
23 * Adaptive Multi-Rate (AMR) Audio decoder stub.
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
24 *
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
25 * This code implements both an AMR-NarrowBand (AMR-NB) and an AMR-WideBand
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
26 * (AMR-WB) audio encoder/decoder through external reference code from
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
27 * http://www.3gpp.org/. The license of the code from 3gpp is unclear so you
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
28 * have to download the code separately. Two versions exists: One fixed-point
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
29 * and one with floats. For some reason the float-encoder is significant faster
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
30 * at least on a P4 1.5GHz (0.9s instead of 9.9s on a 30s audio clip at MR102).
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
31 * Both float and fixed point are supported for AMR-NB, but only float for
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
32 * AMR-WB.
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
33 *
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
34 * \section AMR-NB
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
35 *
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
36 * \subsection Float
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
37 * The float version (default) can be downloaded from:
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
38 * http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-510.zip
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
39 * Extract the source into \c "ffmpeg/libavcodec/amr_float".
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
40 *
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
41 * \subsection Fixed-point
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
42 * The fixed-point (TS26.073) can be downloaded from:
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
43 * http://www.3gpp.org/ftp/Specs/archive/26_series/26.073/26073-510.zip.
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
44 * Extract the source into \c "ffmpeg/libavcodec/amr".
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
45 * To use the fixed version run \c "./configure" with \c "--enable-amr_nb-fixed".
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
46 *
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
47 * \subsection Specification
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
48 * The specification for AMR-NB can be found in TS 26.071
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
49 * (http://www.3gpp.org/ftp/Specs/html-info/26071.htm) and some other
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
50 * info at http://www.3gpp.org/ftp/Specs/html-info/26-series.htm.
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
51 *
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
52 * \section AMR-WB
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
53 * \subsection Float
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
54 * The reference code can be downloaded from:
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
55 * http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-510.zip
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
56 * It should be extracted to \c "ffmpeg/libavcodec/amrwb_float". Enable it with
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
57 * \c "--enable-amr_wb".
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
58 *
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
59 * \subsection Fixed-point
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
60 * If someone wants to use the fixed point version it can be downloaded from:
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
61 * http://www.3gpp.org/ftp/Specs/archive/26_series/26.173/26173-571.zip.
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
62 *
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
63 * \subsection Specification
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
64 * The specification for AMR-WB can be downloaded from:
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
65 * http://www.3gpp.org/ftp/Specs/archive/26_series/26.171/26171-500.zip.
715e6e3ac428 Doxygenize the existing amr.c documentation.
takis
parents: 4565
diff changeset
66 *
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
67 */
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
68
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
69 #include "avcodec.h"
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
70
3463
444bd402aebe rename AMR config variables to CONFIG_AMR*
mru
parents: 3036
diff changeset
71 #ifdef CONFIG_AMR_NB_FIXED
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
72
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
73 #define MMS_IO
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
74
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
75 #include "amr/sp_dec.h"
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
76 #include "amr/d_homing.h"
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
77 #include "amr/typedef.h"
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
78 #include "amr/sp_enc.h"
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
79 #include "amr/sid_sync.h"
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
80 #include "amr/e_homing.h"
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
81
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
82 #else
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
83 #include "amr_float/interf_dec.h"
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
84 #include "amr_float/interf_enc.h"
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
85 #endif
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
86
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
87 /* Common code for fixed and float version*/
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
88 typedef struct AMR_bitrates
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
89 {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
90 int startrate;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
91 int stoprate;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
92 enum Mode mode;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
93 } AMR_bitrates;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
94
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
95 /* Match desired bitrate with closest one*/
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
96 static enum Mode getBitrateMode(int bitrate)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
97 {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
98 /* Adjusted so that all bitrates can be used from commandline where
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
99 only a multiple of 1000 can be specified*/
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
100 AMR_bitrates rates[]={ {0,4999,MR475}, //4
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
101 {5000,5899,MR515},//5
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
102 {5900,6699,MR59},//6
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
103 {6700,7000,MR67},//7
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
104 {7001,7949,MR74},//8
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
105 {7950,9999,MR795},//9
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
106 {10000,11999,MR102},//10
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
107 {12000,64000,MR122},//12
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
108 };
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
109 int i;
4633
cd67b7ab311c Cosmetics in amr.c.
takis
parents: 4632
diff changeset
110
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
111 for(i=0;i<8;i++)
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
112 {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
113 if(rates[i].startrate<=bitrate && rates[i].stoprate>=bitrate)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
114 {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
115 return(rates[i].mode);
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
116 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
117 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
118 /*Return highest possible*/
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
119 return(MR122);
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
120 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
121
4094
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
122 static void amr_decode_fix_avctx(AVCodecContext * avctx)
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
123 {
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
124 const int is_amr_wb = 1 + (avctx->codec_id == CODEC_ID_AMR_WB);
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
125
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
126 if(avctx->sample_rate == 0)
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
127 {
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
128 avctx->sample_rate = 8000 * is_amr_wb;
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
129 }
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
130
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
131 if(avctx->channels == 0)
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
132 {
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
133 avctx->channels = 1;
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
134 }
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
135
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
136 avctx->frame_size = 160 * is_amr_wb;
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
137 }
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
138
3463
444bd402aebe rename AMR config variables to CONFIG_AMR*
mru
parents: 3036
diff changeset
139 #ifdef CONFIG_AMR_NB_FIXED
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
140 /* fixed point version*/
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
141 /* frame size in serial bitstream file (frame type + serial stream + flags) */
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
142 #define SERIAL_FRAMESIZE (1+MAX_SERIAL_SIZE+5)
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
143
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
144 typedef struct AMRContext {
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
145 int frameCount;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
146 Speech_Decode_FrameState *speech_decoder_state;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
147 enum RXFrameType rx_type;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
148 enum Mode mode;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
149 Word16 reset_flag;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
150 Word16 reset_flag_old;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
151
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
152 enum Mode enc_bitrate;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
153 Speech_Encode_FrameState *enstate;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
154 sid_syncState *sidstate;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
155 enum TXFrameType tx_frametype;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
156 } AMRContext;
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
157
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
158 static int amr_nb_decode_init(AVCodecContext * avctx)
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
159 {
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
160 AMRContext *s = avctx->priv_data;
4633
cd67b7ab311c Cosmetics in amr.c.
takis
parents: 4632
diff changeset
161
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
162 s->frameCount=0;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
163 s->speech_decoder_state=NULL;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
164 s->rx_type = (enum RXFrameType)0;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
165 s->mode= (enum Mode)0;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
166 s->reset_flag=0;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
167 s->reset_flag_old=1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
168
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
169 if(Speech_Decode_Frame_init(&s->speech_decoder_state, "Decoder"))
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
170 {
1825
231a6c19e28f av_log()
michael
parents: 1736
diff changeset
171 av_log(avctx, AV_LOG_ERROR, "Speech_Decode_Frame_init error\n");
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
172 return -1;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
173 }
4094
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
174
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
175 amr_decode_fix_avctx(avctx);
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
176
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
177 if(avctx->channels > 1)
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
178 {
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
179 av_log(avctx, AV_LOG_ERROR, "amr_nb: multichannel decoding not supported\n");
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
180 return -1;
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
181 }
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
182
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
183 return 0;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
184 }
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
185
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
186 static int amr_nb_encode_init(AVCodecContext * avctx)
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
187 {
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
188 AMRContext *s = avctx->priv_data;
4633
cd67b7ab311c Cosmetics in amr.c.
takis
parents: 4632
diff changeset
189
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
190 s->frameCount=0;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
191 s->speech_decoder_state=NULL;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
192 s->rx_type = (enum RXFrameType)0;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
193 s->mode= (enum Mode)0;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
194 s->reset_flag=0;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
195 s->reset_flag_old=1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
196
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
197 if(avctx->sample_rate!=8000)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
198 {
4309
1f95aa362562 always print message when error, AV_LOG_DEBUG -> AV_LOG_ERROR
bcoudurier
parents: 4221
diff changeset
199 av_log(avctx, AV_LOG_ERROR, "Only 8000Hz sample rate supported\n");
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
200 return -1;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
201 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
202
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
203 if(avctx->channels!=1)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
204 {
4309
1f95aa362562 always print message when error, AV_LOG_DEBUG -> AV_LOG_ERROR
bcoudurier
parents: 4221
diff changeset
205 av_log(avctx, AV_LOG_ERROR, "Only mono supported\n");
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
206 return -1;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
207 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
208
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
209 avctx->frame_size=160;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
210 avctx->coded_frame= avcodec_alloc_frame();
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
211
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
212 if(Speech_Encode_Frame_init(&s->enstate, 0, "encoder") || sid_sync_init (&s->sidstate))
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
213 {
4309
1f95aa362562 always print message when error, AV_LOG_DEBUG -> AV_LOG_ERROR
bcoudurier
parents: 4221
diff changeset
214 av_log(avctx, AV_LOG_ERROR, "Speech_Encode_Frame_init error\n");
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
215 return -1;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
216 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
217
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
218 s->enc_bitrate=getBitrateMode(avctx->bit_rate);
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
219
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
220 return 0;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
221 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
222
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
223 static int amr_nb_encode_close(AVCodecContext * avctx)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
224 {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
225 AMRContext *s = avctx->priv_data;
4633
cd67b7ab311c Cosmetics in amr.c.
takis
parents: 4632
diff changeset
226
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
227 Speech_Encode_Frame_exit(&s->enstate);
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
228 sid_sync_exit (&s->sidstate);
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
229 av_freep(&avctx->coded_frame);
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
230 return 0;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
231 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
232
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
233 static int amr_nb_decode_close(AVCodecContext * avctx)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
234 {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
235 AMRContext *s = avctx->priv_data;
4633
cd67b7ab311c Cosmetics in amr.c.
takis
parents: 4632
diff changeset
236
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
237 Speech_Decode_Frame_exit(&s->speech_decoder_state);
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
238 return 0;
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
239 }
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
240
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
241 static int amr_nb_decode_frame(AVCodecContext * avctx,
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
242 void *data, int *data_size,
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
243 uint8_t * buf, int buf_size)
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
244 {
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
245 AMRContext *s = avctx->priv_data;
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
246 uint8_t*amrData=buf;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
247 int offset=0;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
248 UWord8 toc, q, ft;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
249 Word16 serial[SERIAL_FRAMESIZE]; /* coded bits */
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
250 Word16 *synth;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
251 UWord8 *packed_bits;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
252 static Word16 packed_size[16] = {12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0};
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
253 int i;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
254
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
255 //printf("amr_decode_frame data_size=%i buf=0x%X buf_size=%d frameCount=%d!!\n",*data_size,buf,buf_size,s->frameCount);
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
256
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
257 synth=data;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
258
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
259 // while(offset<buf_size)
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
260 {
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
261 toc=amrData[offset];
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
262 /* read rest of the frame based on ToC byte */
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
263 q = (toc >> 2) & 0x01;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
264 ft = (toc >> 3) & 0x0F;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
265
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
266 //printf("offset=%d, packet_size=%d amrData= 0x%X %X %X %X\n",offset,packed_size[ft],amrData[offset],amrData[offset+1],amrData[offset+2],amrData[offset+3]);
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
267
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
268 offset++;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
269
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
270 packed_bits=amrData+offset;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
271
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
272 offset+=packed_size[ft];
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
273
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
274 //Unsort and unpack bits
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
275 s->rx_type = UnpackBits(q, ft, packed_bits, &s->mode, &serial[1]);
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
276
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
277 //We have a new frame
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
278 s->frameCount++;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
279
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
280 if (s->rx_type == RX_NO_DATA)
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
281 {
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
282 s->mode = s->speech_decoder_state->prev_mode;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
283 }
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
284 else {
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
285 s->speech_decoder_state->prev_mode = s->mode;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
286 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
287
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
288 /* if homed: check if this frame is another homing frame */
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
289 if (s->reset_flag_old == 1)
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
290 {
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
291 /* only check until end of first subframe */
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
292 s->reset_flag = decoder_homing_frame_test_first(&serial[1], s->mode);
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
293 }
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
294 /* produce encoder homing frame if homed & input=decoder homing frame */
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
295 if ((s->reset_flag != 0) && (s->reset_flag_old != 0))
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
296 {
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
297 for (i = 0; i < L_FRAME; i++)
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
298 {
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
299 synth[i] = EHF_MASK;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
300 }
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
301 }
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
302 else
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
303 {
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
304 /* decode frame */
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
305 Speech_Decode_Frame(s->speech_decoder_state, s->mode, &serial[1], s->rx_type, synth);
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
306 }
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
307
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
308 //Each AMR-frame results in 160 16-bit samples
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
309 *data_size+=160*2;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
310 synth+=160;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
311
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
312 /* if not homed: check whether current frame is a homing frame */
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
313 if (s->reset_flag_old == 0)
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
314 {
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
315 /* check whole frame */
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
316 s->reset_flag = decoder_homing_frame_test(&serial[1], s->mode);
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
317 }
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
318 /* reset decoder if current frame is a homing frame */
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
319 if (s->reset_flag != 0)
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
320 {
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
321 Speech_Decode_Frame_reset(s->speech_decoder_state);
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
322 }
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
323 s->reset_flag_old = s->reset_flag;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
324
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
325 }
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
326 return offset;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
327 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
328
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
329
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
330 static int amr_nb_encode_frame(AVCodecContext *avctx,
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
331 unsigned char *frame/*out*/, int buf_size, void *data/*in*/)
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
332 {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
333 short serial_data[250] = {0};
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
334 AMRContext *s = avctx->priv_data;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
335 int written;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
336
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
337 s->reset_flag = encoder_homing_frame_test(data);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
338
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
339 Speech_Encode_Frame(s->enstate, s->enc_bitrate, data, &serial_data[1], &s->mode);
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
340
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
341 /* add frame type and mode */
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
342 sid_sync (s->sidstate, s->mode, &s->tx_frametype);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
343
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
344 written = PackBits(s->mode, s->enc_bitrate, s->tx_frametype, &serial_data[1], frame);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
345
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
346 if (s->reset_flag != 0)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
347 {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
348 Speech_Encode_Frame_reset(s->enstate);
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
349 sid_sync_reset(s->sidstate);
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
350 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
351 return written;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
352 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
353
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
354
3463
444bd402aebe rename AMR config variables to CONFIG_AMR*
mru
parents: 3036
diff changeset
355 #elif defined(CONFIG_AMR_NB) /* Float point version*/
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
356
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
357 typedef struct AMRContext {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
358 int frameCount;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
359 void * decState;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
360 int *enstate;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
361 enum Mode enc_bitrate;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
362 } AMRContext;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
363
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
364 static int amr_nb_decode_init(AVCodecContext * avctx)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
365 {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
366 AMRContext *s = avctx->priv_data;
4633
cd67b7ab311c Cosmetics in amr.c.
takis
parents: 4632
diff changeset
367
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
368 s->frameCount=0;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
369 s->decState=Decoder_Interface_init();
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
370 if(!s->decState)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
371 {
1825
231a6c19e28f av_log()
michael
parents: 1736
diff changeset
372 av_log(avctx, AV_LOG_ERROR, "Decoder_Interface_init error\r\n");
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
373 return -1;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
374 }
4094
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
375
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
376 amr_decode_fix_avctx(avctx);
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
377
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
378 if(avctx->channels > 1)
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
379 {
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
380 av_log(avctx, AV_LOG_ERROR, "amr_nb: multichannel decoding not supported\n");
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
381 return -1;
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
382 }
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
383
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
384 return 0;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
385 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
386
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
387 static int amr_nb_encode_init(AVCodecContext * avctx)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
388 {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
389 AMRContext *s = avctx->priv_data;
4633
cd67b7ab311c Cosmetics in amr.c.
takis
parents: 4632
diff changeset
390
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
391 s->frameCount=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
392
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
393 if(avctx->sample_rate!=8000)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
394 {
4309
1f95aa362562 always print message when error, AV_LOG_DEBUG -> AV_LOG_ERROR
bcoudurier
parents: 4221
diff changeset
395 av_log(avctx, AV_LOG_ERROR, "Only 8000Hz sample rate supported\n");
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
396 return -1;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
397 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
398
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
399 if(avctx->channels!=1)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
400 {
4309
1f95aa362562 always print message when error, AV_LOG_DEBUG -> AV_LOG_ERROR
bcoudurier
parents: 4221
diff changeset
401 av_log(avctx, AV_LOG_ERROR, "Only mono supported\n");
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
402 return -1;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
403 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
404
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
405 avctx->frame_size=160;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
406 avctx->coded_frame= avcodec_alloc_frame();
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
407
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
408 s->enstate=Encoder_Interface_init(0);
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
409 if(!s->enstate)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
410 {
4309
1f95aa362562 always print message when error, AV_LOG_DEBUG -> AV_LOG_ERROR
bcoudurier
parents: 4221
diff changeset
411 av_log(avctx, AV_LOG_ERROR, "Encoder_Interface_init error\n");
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
412 return -1;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
413 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
414
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
415 s->enc_bitrate=getBitrateMode(avctx->bit_rate);
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
416
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
417 return 0;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
418 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
419
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
420 static int amr_nb_decode_close(AVCodecContext * avctx)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
421 {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
422 AMRContext *s = avctx->priv_data;
4633
cd67b7ab311c Cosmetics in amr.c.
takis
parents: 4632
diff changeset
423
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
424 Decoder_Interface_exit(s->decState);
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
425 return 0;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
426 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
427
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
428 static int amr_nb_encode_close(AVCodecContext * avctx)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
429 {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
430 AMRContext *s = avctx->priv_data;
4633
cd67b7ab311c Cosmetics in amr.c.
takis
parents: 4632
diff changeset
431
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
432 Encoder_Interface_exit(s->enstate);
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
433 av_freep(&avctx->coded_frame);
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
434 return 0;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
435 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
436
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
437 static int amr_nb_decode_frame(AVCodecContext * avctx,
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
438 void *data, int *data_size,
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
439 uint8_t * buf, int buf_size)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
440 {
4634
8b96c50c6723 Remove useless casts as recommended by Mns Rullgrd.
takis
parents: 4633
diff changeset
441 AMRContext *s = avctx->priv_data;
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
442 uint8_t*amrData=buf;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
443 static short block_size[16]={ 12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0 };
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
444 enum Mode dec_mode;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
445 int packet_size;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
446
2287
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
447 /* av_log(NULL,AV_LOG_DEBUG,"amr_decode_frame buf=%p buf_size=%d frameCount=%d!!\n",buf,buf_size,s->frameCount); */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
448
2287
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
449 dec_mode = (buf[0] >> 3) & 0x000F;
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
450 packet_size = block_size[dec_mode]+1;
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
451
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
452 if(packet_size > buf_size) {
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
453 av_log(avctx, AV_LOG_ERROR, "amr frame too short (%u, should be %u)\n", buf_size, packet_size);
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
454 return -1;
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
455 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
456
2287
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
457 s->frameCount++;
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
458 /* av_log(NULL,AV_LOG_DEBUG,"packet_size=%d amrData= 0x%X %X %X %X\n",packet_size,amrData[0],amrData[1],amrData[2],amrData[3]); */
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
459 /* call decoder */
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
460 Decoder_Interface_Decode(s->decState, amrData, data, 0);
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
461 *data_size=160*2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
462
2287
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
463 return packet_size;
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
464 }
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
465
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
466 static int amr_nb_encode_frame(AVCodecContext *avctx,
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
467 unsigned char *frame/*out*/, int buf_size, void *data/*in*/)
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
468 {
4634
8b96c50c6723 Remove useless casts as recommended by Mns Rullgrd.
takis
parents: 4633
diff changeset
469 AMRContext *s = avctx->priv_data;
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
470 int written;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
471
4220
4115a044e31d allow amr bitrate to be changed "on the fly" through avctx->bitrate.
gpoirier
parents: 4094
diff changeset
472 s->enc_bitrate=getBitrateMode(avctx->bit_rate);
4115a044e31d allow amr bitrate to be changed "on the fly" through avctx->bitrate.
gpoirier
parents: 4094
diff changeset
473
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
474 written = Encoder_Interface_Encode(s->enstate,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
475 s->enc_bitrate,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
476 data,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
477 frame,
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
478 0);
2571
b17d868a8f39 04_AMR_no_debug_output.patch by (Calcium | calcium nurs or jp)
michael
parents: 2287
diff changeset
479 /* av_log(NULL,AV_LOG_DEBUG,"amr_nb_encode_frame encoded %u bytes, bitrate %u, first byte was %#02x\n",written, s->enc_bitrate, frame[0] ); */
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
480
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
481 return written;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
482 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
483
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
484 #endif
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
485
3463
444bd402aebe rename AMR config variables to CONFIG_AMR*
mru
parents: 3036
diff changeset
486 #if defined(CONFIG_AMR_NB) || defined(CONFIG_AMR_NB_FIXED)
2895
8fe1dc88294a Fix some #ifdef to allow building amr_wb alone.
diego
parents: 2571
diff changeset
487
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
488 AVCodec amr_nb_decoder =
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
489 {
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
490 "amr_nb",
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
491 CODEC_TYPE_AUDIO,
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
492 CODEC_ID_AMR_NB,
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
493 sizeof(AMRContext),
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
494 amr_nb_decode_init,
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
495 NULL,
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
496 amr_nb_decode_close,
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
497 amr_nb_decode_frame,
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
498 };
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
499
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
500 AVCodec amr_nb_encoder =
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
501 {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
502 "amr_nb",
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
503 CODEC_TYPE_AUDIO,
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
504 CODEC_ID_AMR_NB,
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
505 sizeof(AMRContext),
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
506 amr_nb_encode_init,
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
507 amr_nb_encode_frame,
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
508 amr_nb_encode_close,
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
509 NULL,
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
510 };
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
511
2895
8fe1dc88294a Fix some #ifdef to allow building amr_wb alone.
diego
parents: 2571
diff changeset
512 #endif
8fe1dc88294a Fix some #ifdef to allow building amr_wb alone.
diego
parents: 2571
diff changeset
513
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
514 /* -----------AMR wideband ------------*/
3463
444bd402aebe rename AMR config variables to CONFIG_AMR*
mru
parents: 3036
diff changeset
515 #ifdef CONFIG_AMR_WB
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
516
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
517 #ifdef _TYPEDEF_H
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
518 //To avoid duplicate typedefs from typdef in amr-nb
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
519 #define typedef_h
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
520 #endif
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
521
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
522 #include "amrwb_float/enc_if.h"
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
523 #include "amrwb_float/dec_if.h"
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
524
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
525 /* Common code for fixed and float version*/
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
526 typedef struct AMRWB_bitrates
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
527 {
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
528 int startrate;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
529 int stoprate;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
530 int mode;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
531 } AMRWB_bitrates;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
532
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
533 static int getWBBitrateMode(int bitrate)
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
534 {
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
535 /* Adjusted so that all bitrates can be used from commandline where
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
536 only a multiple of 1000 can be specified*/
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
537 AMRWB_bitrates rates[]={ {0,7999,0}, //6.6kHz
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
538 {8000,9999,1},//8.85
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
539 {10000,13000,2},//12.65
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
540 {13001,14999,3},//14.25
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
541 {15000,17000,4},//15.85
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
542 {17001,18000,5},//18.25
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
543 {18001,22000,6},//19.85
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
544 {22001,23000,7},//23.05
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
545 {23001,24000,8},//23.85
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
546 };
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
547 int i;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
548
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
549 for(i=0;i<9;i++)
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
550 {
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
551 if(rates[i].startrate<=bitrate && rates[i].stoprate>=bitrate)
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
552 {
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
553 return(rates[i].mode);
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
554 }
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
555 }
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
556 /*Return highest possible*/
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
557 return(8);
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
558 }
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
559
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
560
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
561 typedef struct AMRWBContext {
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
562 int frameCount;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
563 void *state;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
564 int mode;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
565 Word16 allow_dtx;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
566 } AMRWBContext;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
567
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
568 static int amr_wb_encode_init(AVCodecContext * avctx)
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
569 {
4634
8b96c50c6723 Remove useless casts as recommended by Mns Rullgrd.
takis
parents: 4633
diff changeset
570 AMRWBContext *s = avctx->priv_data;
4633
cd67b7ab311c Cosmetics in amr.c.
takis
parents: 4632
diff changeset
571
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
572 s->frameCount=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
573
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
574 if(avctx->sample_rate!=16000)
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
575 {
4309
1f95aa362562 always print message when error, AV_LOG_DEBUG -> AV_LOG_ERROR
bcoudurier
parents: 4221
diff changeset
576 av_log(avctx, AV_LOG_ERROR, "Only 16000Hz sample rate supported\n");
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
577 return -1;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
578 }
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
579
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
580 if(avctx->channels!=1)
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
581 {
4309
1f95aa362562 always print message when error, AV_LOG_DEBUG -> AV_LOG_ERROR
bcoudurier
parents: 4221
diff changeset
582 av_log(avctx, AV_LOG_ERROR, "Only mono supported\n");
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
583 return -1;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
584 }
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
585
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
586 avctx->frame_size=320;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
587 avctx->coded_frame= avcodec_alloc_frame();
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
588
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
589 s->state = E_IF_init();
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
590 s->mode=getWBBitrateMode(avctx->bit_rate);
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
591 s->allow_dtx=0;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
592
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
593 return 0;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
594 }
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
595
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
596 static int amr_wb_encode_close(AVCodecContext * avctx)
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
597 {
4634
8b96c50c6723 Remove useless casts as recommended by Mns Rullgrd.
takis
parents: 4633
diff changeset
598 AMRWBContext *s = avctx->priv_data;
4633
cd67b7ab311c Cosmetics in amr.c.
takis
parents: 4632
diff changeset
599
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
600 E_IF_exit(s->state);
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
601 av_freep(&avctx->coded_frame);
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
602 s->frameCount++;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
603 return 0;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
604 }
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
605
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
606 static int amr_wb_encode_frame(AVCodecContext *avctx,
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
607 unsigned char *frame/*out*/, int buf_size, void *data/*in*/)
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
608 {
4634
8b96c50c6723 Remove useless casts as recommended by Mns Rullgrd.
takis
parents: 4633
diff changeset
609 AMRWBContext *s = avctx->priv_data;
4220
4115a044e31d allow amr bitrate to be changed "on the fly" through avctx->bitrate.
gpoirier
parents: 4094
diff changeset
610 int size;
4632
260b5f667458 Move the initialization on context definition. In amr.c, only the
takis
parents: 4575
diff changeset
611
4220
4115a044e31d allow amr bitrate to be changed "on the fly" through avctx->bitrate.
gpoirier
parents: 4094
diff changeset
612 s->mode=getWBBitrateMode(avctx->bit_rate);
4115a044e31d allow amr bitrate to be changed "on the fly" through avctx->bitrate.
gpoirier
parents: 4094
diff changeset
613 size = E_IF_encode(s->state, s->mode, data, frame, s->allow_dtx);
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
614 return size;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
615 }
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
616
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
617 static int amr_wb_decode_init(AVCodecContext * avctx)
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
618 {
4634
8b96c50c6723 Remove useless casts as recommended by Mns Rullgrd.
takis
parents: 4633
diff changeset
619 AMRWBContext *s = avctx->priv_data;
4633
cd67b7ab311c Cosmetics in amr.c.
takis
parents: 4632
diff changeset
620
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
621 s->frameCount=0;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
622 s->state = D_IF_init();
4094
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
623
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
624 amr_decode_fix_avctx(avctx);
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
625
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
626 if(avctx->channels > 1)
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
627 {
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
628 av_log(avctx, AV_LOG_ERROR, "amr_wb: multichannel decoding not supported\n");
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
629 return -1;
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
630 }
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
631
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
632 return 0;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
633 }
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
634
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
635 extern const UWord8 block_size[];
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
636
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
637 static int amr_wb_decode_frame(AVCodecContext * avctx,
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
638 void *data, int *data_size,
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
639 uint8_t * buf, int buf_size)
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
640 {
4634
8b96c50c6723 Remove useless casts as recommended by Mns Rullgrd.
takis
parents: 4633
diff changeset
641 AMRWBContext *s = avctx->priv_data;
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
642 uint8_t*amrData=buf;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
643 int mode;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
644 int packet_size;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
645
2287
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
646 if(buf_size==0) {
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
647 /* nothing to do */
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
648 return 0;
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
649 }
2287
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
650
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
651 mode = (amrData[0] >> 3) & 0x000F;
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
652 packet_size = block_size[mode];
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
653
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
654 if(packet_size > buf_size) {
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
655 av_log(avctx, AV_LOG_ERROR, "amr frame too short (%u, should be %u)\n", buf_size, packet_size+1);
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
656 return -1;
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
657 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
658
2287
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
659 s->frameCount++;
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
660 D_IF_decode( s->state, amrData, data, _good_frame);
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
661 *data_size=320*2;
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
662 return packet_size;
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
663 }
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
664
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
665 static int amr_wb_decode_close(AVCodecContext * avctx)
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
666 {
4634
8b96c50c6723 Remove useless casts as recommended by Mns Rullgrd.
takis
parents: 4633
diff changeset
667 AMRWBContext *s = avctx->priv_data;
4633
cd67b7ab311c Cosmetics in amr.c.
takis
parents: 4632
diff changeset
668
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
669 D_IF_exit(s->state);
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
670 return 0;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
671 }
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
672
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
673 AVCodec amr_wb_decoder =
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
674 {
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
675 "amr_wb",
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
676 CODEC_TYPE_AUDIO,
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
677 CODEC_ID_AMR_WB,
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
678 sizeof(AMRWBContext),
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
679 amr_wb_decode_init,
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
680 NULL,
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
681 amr_wb_decode_close,
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
682 amr_wb_decode_frame,
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
683 };
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
684
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
685 AVCodec amr_wb_encoder =
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
686 {
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
687 "amr_wb",
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
688 CODEC_TYPE_AUDIO,
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
689 CODEC_ID_AMR_WB,
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
690 sizeof(AMRWBContext),
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
691 amr_wb_encode_init,
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
692 amr_wb_encode_frame,
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
693 amr_wb_encode_close,
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
694 NULL,
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
695 };
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
696
3463
444bd402aebe rename AMR config variables to CONFIG_AMR*
mru
parents: 3036
diff changeset
697 #endif //CONFIG_AMR_WB