Mercurial > libavcodec.hg

comparison libamr.c @ 9826:336d3c384066 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove comments that refer to fixed-point AMR implementations.
author diego
date Sun, 07 Jun 2009 15:15:45 +0000
parents 592097778fa0
children
comparison
equal deleted inserted replaced
9825:37558edc9df2 9826:336d3c384066
23 * Adaptive Multi-Rate (AMR) Audio decoder stub. 23 * Adaptive Multi-Rate (AMR) Audio decoder stub.
24 * 24 *
25 * This code implements both an AMR-NarrowBand (AMR-NB) and an AMR-WideBand 25 * This code implements both an AMR-NarrowBand (AMR-NB) and an AMR-WideBand
26 * (AMR-WB) audio encoder/decoder through external reference code from 26 * (AMR-WB) audio encoder/decoder through external reference code from
27 * http://www.3gpp.org/. The license of the code from 3gpp is unclear so you 27 * http://www.3gpp.org/. The license of the code from 3gpp is unclear so you
28 * have to download the code separately. Two versions exists: One fixed-point 28 * have to download the code separately.
29 * and one floating-point. For some reason the float encoder is significantly
30 * faster at least on a P4 1.5GHz (0.9s instead of 9.9s on a 30s audio clip
31 * at MR102). Both float and fixed point are supported for AMR-NB, but only
32 * float for AMR-WB.
33 * 29 *
34 * \section AMR-NB 30 * \section AMR-NB
35 * 31 *
36 * \subsection Float
37 * The float version (default) can be downloaded from: 32 * The float version (default) can be downloaded from:
38 * http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-610.zip 33 * http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-610.zip
39 * 34 *
40 * \subsection Specification 35 * \subsection Specification
41 * The specification for AMR-NB can be found in TS 26.071 36 * The specification for AMR-NB can be found in TS 26.071
42 * (http://www.3gpp.org/ftp/Specs/html-info/26071.htm) and some other 37 * (http://www.3gpp.org/ftp/Specs/html-info/26071.htm) and some other
43 * info at http://www.3gpp.org/ftp/Specs/html-info/26-series.htm. 38 * info at http://www.3gpp.org/ftp/Specs/html-info/26-series.htm.
44 * 39 *
45 * \section AMR-WB 40 * \section AMR-WB
46 * 41 *
47 * \subsection Float
48 * The reference code can be downloaded from: 42 * The reference code can be downloaded from:
49 * http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-600.zip 43 * http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-600.zip
50 * 44 *
51 * \subsection Specification 45 * \subsection Specification
52 * The specification for AMR-WB can be found in TS 26.171 46 * The specification for AMR-WB can be found in TS 26.171
77 #include <amrnb/interf_enc.h> 71 #include <amrnb/interf_enc.h>
78 72
79 static const char nb_bitrate_unsupported[] = 73 static const char nb_bitrate_unsupported[] =
80 "bitrate not supported: use one of 4.75k, 5.15k, 5.9k, 6.7k, 7.4k, 7.95k, 10.2k or 12.2k\n"; 74 "bitrate not supported: use one of 4.75k, 5.15k, 5.9k, 6.7k, 7.4k, 7.95k, 10.2k or 12.2k\n";
81 75
82 /* Common code for fixed and float version*/
83 typedef struct AMR_bitrates { 76 typedef struct AMR_bitrates {
84 int rate; 77 int rate;
85 enum Mode mode; 78 enum Mode mode;
86 } AMR_bitrates; 79 } AMR_bitrates;
87 80
276 #include <amrwb/if_rom.h> 269 #include <amrwb/if_rom.h>
277 270
278 static const char wb_bitrate_unsupported[] = 271 static const char wb_bitrate_unsupported[] =
279 "bitrate not supported: use one of 6.6k, 8.85k, 12.65k, 14.25k, 15.85k, 18.25k, 19.85k, 23.05k, or 23.85k\n"; 272 "bitrate not supported: use one of 6.6k, 8.85k, 12.65k, 14.25k, 15.85k, 18.25k, 19.85k, 23.05k, or 23.85k\n";
280 273
281 /* Common code for fixed and float version*/
282 typedef struct AMRWB_bitrates { 274 typedef struct AMRWB_bitrates {
283 int rate; 275 int rate;
284 int mode; 276 int mode;
285 } AMRWB_bitrates; 277 } AMRWB_bitrates;
286 278