annotate amr.c @ 4520:9bf957e669f0 libavcodec

This fixes error handling for BeOS, removing the need for some ifdefs. AVERROR_ defines are moved to avcodec.h as they are needed in there as well. Feel free to move that to avutil/common.h. Bumped up avcodec/format version numbers as though it's binary compatible we will want to rebuild apps as error values changed. Please from now on use return AVERROR(EFOO) instead of the ugly return -EFOO in your code. This also removes the need for berrno.h.
author mmu_man
date Tue, 13 Feb 2007 18:26:14 +0000
parents 65e3ae093faf
children 8ae1cba27dbe
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 */
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
21 /*
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
22 This code implements amr-nb and amr-wb audio encoder/decoder through external reference
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
23 code from www.3gpp.org. The licence of the code from 3gpp is unclear so you
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
24 have to download the code separately. Two versions exists: One fixed-point
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
25 and one with floats. For some reason the float-encoder is significant faster
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
26 atleast on a P4 1.5GHz (0.9s instead of 9.9s on a 30s audio clip at MR102).
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
27 Both float and fixed point is supported for amr-nb, but only float for
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
28 amr-wb.
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
29
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
30 --AMR-NB--
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
31 The fixed-point (TS26.073) can be downloaded from:
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
32 http://www.3gpp.org/ftp/Specs/archive/26_series/26.073/26073-510.zip
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
33 Extract the soure into ffmpeg/libavcodec/amr
1736
ff0b3acd5b22 something unimportant ...
michael
parents: 1486
diff changeset
34 To use the fixed version run "./configure" with "--enable-amr_nb-fixed"
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
35
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
36 The float version (default) can be downloaded from:
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
37 http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-510.zip
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
38 Extract the soure into ffmpeg/libavcodec/amr_float
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
39
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
40 The specification for amr-nb can be found in TS 26.071
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
41 (http://www.3gpp.org/ftp/Specs/html-info/26071.htm) and some other
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
42 info at http://www.3gpp.org/ftp/Specs/html-info/26-series.htm
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
43
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
44 --AMR-WB--
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
45 The reference code can be downloaded from:
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
46 http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-510.zip
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
47 It should be extracted to "libavcodec/amrwb_float". Enable it with
1736
ff0b3acd5b22 something unimportant ...
michael
parents: 1486
diff changeset
48 "--enable-amr_wb".
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
49
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
50 The specification for amr-wb can be downloaded from:
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
51 http://www.3gpp.org/ftp/Specs/archive/26_series/26.171/26171-500.zip
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
52
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
53 If someone want to use the fixed point version it can be downloaded
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
54 from: http://www.3gpp.org/ftp/Specs/archive/26_series/26.173/26173-571.zip
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
55
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
56 */
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
57
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
58 #include "avcodec.h"
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
59
3463
444bd402aebe rename AMR config variables to CONFIG_AMR*
mru
parents: 3036
diff changeset
60 #ifdef CONFIG_AMR_NB_FIXED
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
61
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
62 #define MMS_IO
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
63
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
64 #include "amr/sp_dec.h"
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
65 #include "amr/d_homing.h"
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
66 #include "amr/typedef.h"
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
67 #include "amr/sp_enc.h"
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
68 #include "amr/sid_sync.h"
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
69 #include "amr/e_homing.h"
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
70
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
71 #else
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
72 #include "amr_float/interf_dec.h"
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
73 #include "amr_float/interf_enc.h"
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
74 #endif
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
75
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
76 /* Common code for fixed and float version*/
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
77 typedef struct AMR_bitrates
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
78 {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
79 int startrate;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
80 int stoprate;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
81 enum Mode mode;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
82
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
83 } AMR_bitrates;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
84
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
85 /* Match desired bitrate with closest one*/
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
86 static enum Mode getBitrateMode(int bitrate)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
87 {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
88 /* Adjusted so that all bitrates can be used from commandline where
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
89 only a multiple of 1000 can be specified*/
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
90 AMR_bitrates rates[]={ {0,4999,MR475}, //4
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
91 {5000,5899,MR515},//5
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
92 {5900,6699,MR59},//6
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
93 {6700,7000,MR67},//7
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
94 {7001,7949,MR74},//8
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
95 {7950,9999,MR795},//9
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
96 {10000,11999,MR102},//10
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
97 {12000,64000,MR122},//12
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
98
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
99 };
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
100 int i;
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
101 for(i=0;i<8;i++)
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
102 {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
103 if(rates[i].startrate<=bitrate && rates[i].stoprate>=bitrate)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
104 {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
105 return(rates[i].mode);
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
106 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
107 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
108 /*Return highest possible*/
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
109 return(MR122);
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
110 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
111
4094
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
112 static void amr_decode_fix_avctx(AVCodecContext * avctx)
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
113 {
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
114 const int is_amr_wb = 1 + (avctx->codec_id == CODEC_ID_AMR_WB);
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
115
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
116 if(avctx->sample_rate == 0)
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
117 {
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
118 avctx->sample_rate = 8000 * is_amr_wb;
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
119 }
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
120
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
121 if(avctx->channels == 0)
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
122 {
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
123 avctx->channels = 1;
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
124 }
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
125
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
126 avctx->frame_size = 160 * is_amr_wb;
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
127 }
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
128
3463
444bd402aebe rename AMR config variables to CONFIG_AMR*
mru
parents: 3036
diff changeset
129 #ifdef CONFIG_AMR_NB_FIXED
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
130 /* fixed point version*/
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
131 /* 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
132 #define SERIAL_FRAMESIZE (1+MAX_SERIAL_SIZE+5)
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
133
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
134 typedef struct AMRContext {
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
135 int frameCount;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
136 Speech_Decode_FrameState *speech_decoder_state;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
137 enum RXFrameType rx_type;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
138 enum Mode mode;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
139 Word16 reset_flag;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
140 Word16 reset_flag_old;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
141
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
142 enum Mode enc_bitrate;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
143 Speech_Encode_FrameState *enstate;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
144 sid_syncState *sidstate;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
145 enum TXFrameType tx_frametype;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
146
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
147
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
148 } AMRContext;
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
149
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
150 static int amr_nb_decode_init(AVCodecContext * avctx)
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 AMRContext *s = avctx->priv_data;
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
153 s->frameCount=0;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
154 s->speech_decoder_state=NULL;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
155 s->rx_type = (enum RXFrameType)0;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
156 s->mode= (enum Mode)0;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
157 s->reset_flag=0;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
158 s->reset_flag_old=1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
159
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
160 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
161 {
1825
231a6c19e28f av_log()
michael
parents: 1736
diff changeset
162 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
163 return -1;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
164 }
4094
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
165
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
166 amr_decode_fix_avctx(avctx);
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
167
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
168 if(avctx->channels > 1)
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
169 {
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
170 av_log(avctx, AV_LOG_ERROR, "amr_nb: multichannel decoding not supported\n");
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
171 return -1;
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
172 }
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
173
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
174 return 0;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
175 }
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
176
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
177 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
178 {
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
179 AMRContext *s = avctx->priv_data;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
180 s->frameCount=0;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
181 s->speech_decoder_state=NULL;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
182 s->rx_type = (enum RXFrameType)0;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
183 s->mode= (enum Mode)0;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
184 s->reset_flag=0;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
185 s->reset_flag_old=1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
186
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
187 if(avctx->sample_rate!=8000)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
188 {
4309
1f95aa362562 always print message when error, AV_LOG_DEBUG -> AV_LOG_ERROR
bcoudurier
parents: 4221
diff changeset
189 av_log(avctx, AV_LOG_ERROR, "Only 8000Hz sample rate supported\n");
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
190 return -1;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
191 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
192
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
193 if(avctx->channels!=1)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
194 {
4309
1f95aa362562 always print message when error, AV_LOG_DEBUG -> AV_LOG_ERROR
bcoudurier
parents: 4221
diff changeset
195 av_log(avctx, AV_LOG_ERROR, "Only mono supported\n");
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
196 return -1;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
197 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
198
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
199 avctx->frame_size=160;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
200 avctx->coded_frame= avcodec_alloc_frame();
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
201
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
202 if(Speech_Encode_Frame_init(&s->enstate, 0, "encoder") || sid_sync_init (&s->sidstate))
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
203 {
4309
1f95aa362562 always print message when error, AV_LOG_DEBUG -> AV_LOG_ERROR
bcoudurier
parents: 4221
diff changeset
204 av_log(avctx, AV_LOG_ERROR, "Speech_Encode_Frame_init error\n");
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
205 return -1;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
206 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
207
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
208 s->enc_bitrate=getBitrateMode(avctx->bit_rate);
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
209
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
210 return 0;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
211 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
212
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
213 static int amr_nb_encode_close(AVCodecContext * avctx)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
214 {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
215 AMRContext *s = avctx->priv_data;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
216 Speech_Encode_Frame_exit(&s->enstate);
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
217 sid_sync_exit (&s->sidstate);
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
218 av_freep(&avctx->coded_frame);
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
219 return 0;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
220 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
221
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
222 static int amr_nb_decode_close(AVCodecContext * avctx)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
223 {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
224 AMRContext *s = avctx->priv_data;
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
225 Speech_Decode_Frame_exit(&s->speech_decoder_state);
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
226 return 0;
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
227 }
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
228
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
229 static int amr_nb_decode_frame(AVCodecContext * avctx,
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
230 void *data, int *data_size,
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
231 uint8_t * buf, int buf_size)
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
232 {
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
233 AMRContext *s = avctx->priv_data;
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
234
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
235 uint8_t*amrData=buf;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
236 int offset=0;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
237
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
238 UWord8 toc, q, ft;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
239
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
240 Word16 serial[SERIAL_FRAMESIZE]; /* coded bits */
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
241 Word16 *synth;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
242 UWord8 *packed_bits;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
243
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
244 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
245 int i;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
246
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
247 //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
248
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
249 synth=data;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
250
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
251 // while(offset<buf_size)
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
252 {
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
253 toc=amrData[offset];
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
254 /* 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
255 q = (toc >> 2) & 0x01;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
256 ft = (toc >> 3) & 0x0F;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
257
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
258 //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
259
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
260 offset++;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
261
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
262 packed_bits=amrData+offset;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
263
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
264 offset+=packed_size[ft];
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 //Unsort and unpack bits
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
267 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
268
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
269 //We have a new frame
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
270 s->frameCount++;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
271
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
272 if (s->rx_type == RX_NO_DATA)
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
273 {
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
274 s->mode = s->speech_decoder_state->prev_mode;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
275 }
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
276 else {
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
277 s->speech_decoder_state->prev_mode = s->mode;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
278 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
279
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
280 /* 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
281 if (s->reset_flag_old == 1)
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
282 {
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
283 /* only check until end of first subframe */
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
284 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
285 }
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
286 /* 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
287 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
288 {
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
289 for (i = 0; i < L_FRAME; i++)
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 synth[i] = EHF_MASK;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
292 }
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 else
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
295 {
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
296 /* decode frame */
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
297 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
298 }
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
299
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
300 //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
301 *data_size+=160*2;
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
302 synth+=160;
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 /* 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
305 if (s->reset_flag_old == 0)
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 /* check whole frame */
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
308 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
309 }
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
310 /* 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
311 if (s->reset_flag != 0)
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
312 {
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
313 Speech_Decode_Frame_reset(s->speech_decoder_state);
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 s->reset_flag_old = s->reset_flag;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
316
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
317 }
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
318 return offset;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
319 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
320
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
321
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
322 static int amr_nb_encode_frame(AVCodecContext *avctx,
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
323 unsigned char *frame/*out*/, int buf_size, void *data/*in*/)
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
324 {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
325 short serial_data[250] = {0};
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
326
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
327 AMRContext *s = avctx->priv_data;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
328 int written;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
329
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
330 s->reset_flag = encoder_homing_frame_test(data);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
331
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
332 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
333
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
334 /* add frame type and mode */
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
335 sid_sync (s->sidstate, s->mode, &s->tx_frametype);
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 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
338
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
339 if (s->reset_flag != 0)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
340 {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
341 Speech_Encode_Frame_reset(s->enstate);
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
342 sid_sync_reset(s->sidstate);
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
343 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
344 return written;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
345 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
346
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
347
3463
444bd402aebe rename AMR config variables to CONFIG_AMR*
mru
parents: 3036
diff changeset
348 #elif defined(CONFIG_AMR_NB) /* Float point version*/
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
349
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
350 typedef struct AMRContext {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
351 int frameCount;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
352 void * decState;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
353 int *enstate;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
354 enum Mode enc_bitrate;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
355 } AMRContext;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
356
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
357 static int amr_nb_decode_init(AVCodecContext * avctx)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
358 {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
359 AMRContext *s = avctx->priv_data;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
360 s->frameCount=0;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
361 s->decState=Decoder_Interface_init();
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
362 if(!s->decState)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
363 {
1825
231a6c19e28f av_log()
michael
parents: 1736
diff changeset
364 av_log(avctx, AV_LOG_ERROR, "Decoder_Interface_init error\r\n");
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
365 return -1;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
366 }
4094
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
367
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
368 amr_decode_fix_avctx(avctx);
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
369
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
370 if(avctx->channels > 1)
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
371 {
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
372 av_log(avctx, AV_LOG_ERROR, "amr_nb: multichannel decoding not supported\n");
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
373 return -1;
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
374 }
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
375
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
376 return 0;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
377 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
378
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
379 static int amr_nb_encode_init(AVCodecContext * avctx)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
380 {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
381 AMRContext *s = avctx->priv_data;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
382 s->frameCount=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
383
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
384 if(avctx->sample_rate!=8000)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
385 {
4309
1f95aa362562 always print message when error, AV_LOG_DEBUG -> AV_LOG_ERROR
bcoudurier
parents: 4221
diff changeset
386 av_log(avctx, AV_LOG_ERROR, "Only 8000Hz sample rate supported\n");
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
387 return -1;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
388 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
389
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
390 if(avctx->channels!=1)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
391 {
4309
1f95aa362562 always print message when error, AV_LOG_DEBUG -> AV_LOG_ERROR
bcoudurier
parents: 4221
diff changeset
392 av_log(avctx, AV_LOG_ERROR, "Only mono supported\n");
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
393 return -1;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
394 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
395
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
396 avctx->frame_size=160;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
397 avctx->coded_frame= avcodec_alloc_frame();
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
398
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
399 s->enstate=Encoder_Interface_init(0);
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
400 if(!s->enstate)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
401 {
4309
1f95aa362562 always print message when error, AV_LOG_DEBUG -> AV_LOG_ERROR
bcoudurier
parents: 4221
diff changeset
402 av_log(avctx, AV_LOG_ERROR, "Encoder_Interface_init error\n");
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
403 return -1;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
404 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
405
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
406 s->enc_bitrate=getBitrateMode(avctx->bit_rate);
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
407
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
408 return 0;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
409 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
410
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
411 static int amr_nb_decode_close(AVCodecContext * avctx)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
412 {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
413 AMRContext *s = avctx->priv_data;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
414 Decoder_Interface_exit(s->decState);
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
415 return 0;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
416 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
417
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
418 static int amr_nb_encode_close(AVCodecContext * avctx)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
419 {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
420 AMRContext *s = avctx->priv_data;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
421 Encoder_Interface_exit(s->enstate);
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
422 av_freep(&avctx->coded_frame);
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
423 return 0;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
424 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
425
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
426 static int amr_nb_decode_frame(AVCodecContext * avctx,
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
427 void *data, int *data_size,
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
428 uint8_t * buf, int buf_size)
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
429 {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
430 AMRContext *s = (AMRContext*)avctx->priv_data;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
431
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
432 uint8_t*amrData=buf;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
433 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
434 enum Mode dec_mode;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
435 int packet_size;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
436
2287
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
437 /* 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
438
2287
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
439 dec_mode = (buf[0] >> 3) & 0x000F;
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
440 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
441
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
442 if(packet_size > buf_size) {
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
443 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
444 return -1;
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
445 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
446
2287
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
447 s->frameCount++;
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
448 /* 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
449 /* call decoder */
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
450 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
451 *data_size=160*2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
452
2287
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
453 return packet_size;
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
454 }
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
455
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
456 static int amr_nb_encode_frame(AVCodecContext *avctx,
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
457 unsigned char *frame/*out*/, int buf_size, void *data/*in*/)
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
458 {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
459 AMRContext *s = (AMRContext*)avctx->priv_data;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
460 int written;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
461
4220
4115a044e31d allow amr bitrate to be changed "on the fly" through avctx->bitrate.
gpoirier
parents: 4094
diff changeset
462 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
463
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
464 written = Encoder_Interface_Encode(s->enstate,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
465 s->enc_bitrate,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
466 data,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
467 frame,
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
468 0);
2571
b17d868a8f39 04_AMR_no_debug_output.patch by (Calcium | calcium nurs or jp)
michael
parents: 2287
diff changeset
469 /* 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
470
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
471 return written;
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
472 }
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
473
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
474 #endif
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
475
3463
444bd402aebe rename AMR config variables to CONFIG_AMR*
mru
parents: 3036
diff changeset
476 #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
477
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
478 AVCodec amr_nb_decoder =
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
479 {
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
480 "amr_nb",
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
481 CODEC_TYPE_AUDIO,
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
482 CODEC_ID_AMR_NB,
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
483 sizeof(AMRContext),
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
484 amr_nb_decode_init,
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
485 NULL,
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
486 amr_nb_decode_close,
1258
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
487 amr_nb_decode_frame,
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
488 };
802614404398 AMR-NB audio support patch by (<joca at rixmail dot se>)
michaelni
parents:
diff changeset
489
1297
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
490 AVCodec amr_nb_encoder =
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
491 {
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
492 "amr_nb",
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
493 CODEC_TYPE_AUDIO,
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
494 CODEC_ID_AMR_NB,
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
495 sizeof(AMRContext),
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
496 amr_nb_encode_init,
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
497 amr_nb_encode_frame,
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
498 amr_nb_encode_close,
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
499 NULL,
1db67cd7808a * 3gp patch by Joca
kabi
parents: 1258
diff changeset
500 };
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
501
2895
8fe1dc88294a Fix some #ifdef to allow building amr_wb alone.
diego
parents: 2571
diff changeset
502 #endif
8fe1dc88294a Fix some #ifdef to allow building amr_wb alone.
diego
parents: 2571
diff changeset
503
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
504 /* -----------AMR wideband ------------*/
3463
444bd402aebe rename AMR config variables to CONFIG_AMR*
mru
parents: 3036
diff changeset
505 #ifdef CONFIG_AMR_WB
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
506
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
507 #ifdef _TYPEDEF_H
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
508 //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
509 #define typedef_h
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
510 #endif
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
511
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
512 #include "amrwb_float/enc_if.h"
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
513 #include "amrwb_float/dec_if.h"
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
514
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
515 /* Common code for fixed and float version*/
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
516 typedef struct AMRWB_bitrates
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
517 {
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
518 int startrate;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
519 int stoprate;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
520 int mode;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
521
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
522 } AMRWB_bitrates;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
523
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
524 static int getWBBitrateMode(int bitrate)
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
525 {
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
526 /* 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
527 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
528 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
529 {8000,9999,1},//8.85
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
530 {10000,13000,2},//12.65
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
531 {13001,14999,3},//14.25
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
532 {15000,17000,4},//15.85
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
533 {17001,18000,5},//18.25
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
534 {18001,22000,6},//19.85
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
535 {22001,23000,7},//23.05
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
536 {23001,24000,8},//23.85
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
537
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
538 };
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
539 int i;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
540
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
541 for(i=0;i<9;i++)
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
542 {
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
543 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
544 {
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
545 return(rates[i].mode);
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 }
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
548 /*Return highest possible*/
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
549 return(8);
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
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 typedef struct AMRWBContext {
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
554 int frameCount;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
555 void *state;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
556 int mode;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
557 Word16 allow_dtx;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
558 } AMRWBContext;
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 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
561 {
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
562 AMRWBContext *s = (AMRWBContext*)avctx->priv_data;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
563 s->frameCount=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
564
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
565 if(avctx->sample_rate!=16000)
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
566 {
4309
1f95aa362562 always print message when error, AV_LOG_DEBUG -> AV_LOG_ERROR
bcoudurier
parents: 4221
diff changeset
567 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
568 return -1;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
569 }
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
570
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
571 if(avctx->channels!=1)
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
572 {
4309
1f95aa362562 always print message when error, AV_LOG_DEBUG -> AV_LOG_ERROR
bcoudurier
parents: 4221
diff changeset
573 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
574 return -1;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
575 }
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
576
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
577 avctx->frame_size=320;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
578 avctx->coded_frame= avcodec_alloc_frame();
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 s->state = E_IF_init();
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
581 s->mode=getWBBitrateMode(avctx->bit_rate);
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
582 s->allow_dtx=0;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
583
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
584 return 0;
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
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
587 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
588 {
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
589 AMRWBContext *s = (AMRWBContext*) avctx->priv_data;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
590 E_IF_exit(s->state);
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
591 av_freep(&avctx->coded_frame);
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
592 s->frameCount++;
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_frame(AVCodecContext *avctx,
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
597 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
598 {
4221
643c7fd287e4 Fix declaration and code thingie
gpoirier
parents: 4220
diff changeset
599 AMRWBContext *s;
4220
4115a044e31d allow amr bitrate to be changed "on the fly" through avctx->bitrate.
gpoirier
parents: 4094
diff changeset
600 int size;
4221
643c7fd287e4 Fix declaration and code thingie
gpoirier
parents: 4220
diff changeset
601 s = (AMRWBContext*) avctx->priv_data;
4220
4115a044e31d allow amr bitrate to be changed "on the fly" through avctx->bitrate.
gpoirier
parents: 4094
diff changeset
602 s->mode=getWBBitrateMode(avctx->bit_rate);
4115a044e31d allow amr bitrate to be changed "on the fly" through avctx->bitrate.
gpoirier
parents: 4094
diff changeset
603 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
604 return size;
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
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
607 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
608 {
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
609 AMRWBContext *s = (AMRWBContext *)avctx->priv_data;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
610 s->frameCount=0;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
611 s->state = D_IF_init();
4094
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
612
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
613 amr_decode_fix_avctx(avctx);
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
614
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
615 if(avctx->channels > 1)
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
616 {
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
617 av_log(avctx, AV_LOG_ERROR, "amr_wb: multichannel decoding not supported\n");
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
618 return -1;
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
619 }
f812a11be0b1 sample rate fix
diego
parents: 3947
diff changeset
620
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
621 return 0;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
622 }
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
623
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
624 extern const UWord8 block_size[];
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
625
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
626 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
627 void *data, int *data_size,
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
628 uint8_t * buf, int buf_size)
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
629 {
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
630 AMRWBContext *s = (AMRWBContext*)avctx->priv_data;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
631
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
632 uint8_t*amrData=buf;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
633 int mode;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
634 int packet_size;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
635
2287
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
636 if(buf_size==0) {
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
637 /* nothing to do */
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
638 return 0;
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
639 }
2287
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
640
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
641 mode = (amrData[0] >> 3) & 0x000F;
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
642 packet_size = block_size[mode];
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
643
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
644 if(packet_size > buf_size) {
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
645 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
646 return -1;
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
647 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2895
diff changeset
648
2287
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
649 s->frameCount++;
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
650 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
651 *data_size=320*2;
679642dc54cf segfault in amr decoder fix patch by (Richard van der Hoff - richvdh0)
michael
parents: 2028
diff changeset
652 return packet_size;
1486
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
653 }
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
654
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
655 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
656 {
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
657 AMRWBContext *s = (AMRWBContext *)avctx->priv_data;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
658 D_IF_exit(s->state);
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
659 return 0;
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
660 }
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
661
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
662 AVCodec amr_wb_decoder =
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 "amr_wb",
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
665 CODEC_TYPE_AUDIO,
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
666 CODEC_ID_AMR_WB,
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
667 sizeof(AMRWBContext),
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
668 amr_wb_decode_init,
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
669 NULL,
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
670 amr_wb_decode_close,
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
671 amr_wb_decode_frame,
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
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
674 AVCodec amr_wb_encoder =
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
675 {
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
676 "amr_wb",
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
677 CODEC_TYPE_AUDIO,
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
678 CODEC_ID_AMR_WB,
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
679 sizeof(AMRWBContext),
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
680 amr_wb_encode_init,
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
681 amr_wb_encode_frame,
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
682 amr_wb_encode_close,
f22010affdce AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 1297
diff changeset
683 NULL,
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
3463
444bd402aebe rename AMR config variables to CONFIG_AMR*
mru
parents: 3036
diff changeset
686 #endif //CONFIG_AMR_WB