History

lavf/amr: Add amrnb and amrwb demuxers.

Fixes ticket #6678.

Carl Eugen Hoyos committed 9 years ago

Commit e06bdc31 parent 2cc51d56 files · +132 −12Browse files

Unified · Split

6 files
  1. Changelog +1 −0
  2. doc/general.texi +2 −0
  3. libavformat/Makefile +2 −0
  4. libavformat/allformats.c +2 −0
  5. libavformat/amr.c +123 −10
  6. libavformat/version.h +2 −2
Changelog+1−0
@@ -7,6 +7,7 @@ version <next>: · 6 unmodified lines
7 requires 2.1 (or later) and pkg-config.7 requires 2.1 (or later) and pkg-config.
8- VDA dropped (use VideoToolbox instead)8- VDA dropped (use VideoToolbox instead)
9- MagicYUV encoder9- MagicYUV encoder
10- Raw AMR-NB and AMR-WB demuxers
10 11
11 12
12version 3.4:13version 3.4:
doc/general.texi+2−0
@@ -439,6 +439,8 @@ library: · 438 unmodified lines
439@item QCP @tab @tab X439@item QCP @tab @tab X
440@item raw ADTS (AAC) @tab X @tab X440@item raw ADTS (AAC) @tab X @tab X
441@item raw AC-3 @tab X @tab X441@item raw AC-3 @tab X @tab X
442@item raw AMR-NB @tab @tab X
443@item raw AMR-WB @tab @tab X
442@item raw Chinese AVS video @tab X @tab X444@item raw Chinese AVS video @tab X @tab X
443@item raw CRI ADX @tab X @tab X445@item raw CRI ADX @tab X @tab X
444@item raw Dirac @tab X @tab X446@item raw Dirac @tab X @tab X
libavformat/Makefile+2−0
@@ -87,6 +87,8 @@ OBJS-$(CONFIG_AIFF_MUXER) += aiffenc.o id3v2enc.o · 86 unmodified lines
87OBJS-$(CONFIG_AIX_DEMUXER) += aixdec.o87OBJS-$(CONFIG_AIX_DEMUXER) += aixdec.o
88OBJS-$(CONFIG_AMR_DEMUXER) += amr.o88OBJS-$(CONFIG_AMR_DEMUXER) += amr.o
89OBJS-$(CONFIG_AMR_MUXER) += amr.o89OBJS-$(CONFIG_AMR_MUXER) += amr.o
90OBJS-$(CONFIG_AMRNB_DEMUXER) += amr.o
91OBJS-$(CONFIG_AMRWB_DEMUXER) += amr.o
90OBJS-$(CONFIG_ANM_DEMUXER) += anm.o92OBJS-$(CONFIG_ANM_DEMUXER) += anm.o
91OBJS-$(CONFIG_APC_DEMUXER) += apc.o93OBJS-$(CONFIG_APC_DEMUXER) += apc.o
92OBJS-$(CONFIG_APE_DEMUXER) += ape.o apetag.o img2.o94OBJS-$(CONFIG_APE_DEMUXER) += ape.o apetag.o img2.o
libavformat/allformats.c+2−0
@@ -63,6 +63,8 @@ static void register_all(void) · 62 unmodified lines
63 REGISTER_MUXDEMUX(AIFF, aiff);63 REGISTER_MUXDEMUX(AIFF, aiff);
64 REGISTER_DEMUXER (AIX, aix);64 REGISTER_DEMUXER (AIX, aix);
65 REGISTER_MUXDEMUX(AMR, amr);65 REGISTER_MUXDEMUX(AMR, amr);
66 REGISTER_DEMUXER (AMRNB, amrnb);
67 REGISTER_DEMUXER (AMRWB, amrwb);
66 REGISTER_DEMUXER (ANM, anm);68 REGISTER_DEMUXER (ANM, anm);
67 REGISTER_DEMUXER (APC, apc);69 REGISTER_DEMUXER (APC, apc);
68 REGISTER_DEMUXER (APE, ape);70 REGISTER_DEMUXER (APE, ape);
libavformat/amr.c+123−10
@@ -38,6 +38,13 @@ typedef struct { · 37 unmodified lines
38static const char AMR_header[] = "#!AMR\n";38static const char AMR_header[] = "#!AMR\n";
39static const char AMRWB_header[] = "#!AMR-WB\n";39static const char AMRWB_header[] = "#!AMR-WB\n";
40 40
41static const uint8_t amrnb_packed_size[16] = {
42 13, 14, 16, 18, 20, 21, 27, 32, 6, 1, 1, 1, 1, 1, 1, 1
43};
44static const uint8_t amrwb_packed_size[16] = {
45 18, 24, 33, 37, 41, 47, 51, 59, 61, 6, 1, 1, 1, 1, 1, 1
46};
47
41#if CONFIG_AMR_MUXER48#if CONFIG_AMR_MUXER
42static int amr_write_header(AVFormatContext *s)49static int amr_write_header(AVFormatContext *s)
43{50{
@@ -126,17 +133,9 @@ static int amr_read_packet(AVFormatContext *s, AVPacket *pkt) · 82 unmodified lines
126 mode = (toc >> 3) & 0x0F;133 mode = (toc >> 3) & 0x0F;
127 134
128 if (par->codec_id == AV_CODEC_ID_AMR_NB) {135 if (par->codec_id == AV_CODEC_ID_AMR_NB) {
129 static const uint8_t packed_size[16] = {136 size = amrnb_packed_size[mode];
130 12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0
131 };
132
133 size = packed_size[mode] + 1;
134 } else if (par->codec_id == AV_CODEC_ID_AMR_WB) {137 } else if (par->codec_id == AV_CODEC_ID_AMR_WB) {
135 static const uint8_t packed_size[16] = {138 size = amrwb_packed_size[mode];
136 18, 24, 33, 37, 41, 47, 51, 59, 61, 6, 6, 0, 0, 0, 1, 1
137 };
138
139 size = packed_size[mode];
140 }139 }
141 140
142 if (!size || av_new_packet(pkt, size))141 if (!size || av_new_packet(pkt, size))
@@ -176,6 +175,120 @@ AVInputFormat ff_amr_demuxer = { · 33 unmodified lines
176};175};
177#endif176#endif
178 177
178#if CONFIG_AMRNB_DEMUXER
179static int amrnb_probe(AVProbeData *p)
180{
181 int mode, i = 0, valid = 0;
182 const uint8_t *b = p->buf;
183
184 while (i < p->buf_size) {
185 mode = b[i] >> 3 & 0x0F;
186 if (mode < 9 && (b[i] & 0x4) == 0x4) {
187 int last = mode;
188 int size = amrnb_packed_size[mode];
189 while (size--) {
190 if (b[++i] != last)
191 break;
192 last = b[i];
193 }
194 if (size > 0) {
195 valid++;
196 i += size;
197 }
198 } else {
199 valid = 0;
200 i++;
201 }
202 }
203 if (valid > 100)
204 return AVPROBE_SCORE_EXTENSION / 2 + 1;
205 return 0;
206}
207
208static int amrnb_read_header(AVFormatContext *s)
209{
210 AVStream *st = avformat_new_stream(s, NULL);
211 if (!st)
212 return AVERROR(ENOMEM);
213 st->codecpar->codec_tag = MKTAG('s', 'a', 'm', 'r');
214 st->codecpar->codec_id = AV_CODEC_ID_AMR_NB;
215 st->codecpar->sample_rate = 8000;
216 st->codecpar->channels = 1;
217 st->codecpar->channel_layout = AV_CH_LAYOUT_MONO;
218 st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
219 avpriv_set_pts_info(st, 64, 1, 8000);
220
221 return 0;
222}
223
224AVInputFormat ff_amrnb_demuxer = {
225 .name = "amrnb",
226 .long_name = NULL_IF_CONFIG_SMALL("raw AMR-NB"),
227 .priv_data_size = sizeof(AMRContext),
228 .read_probe = amrnb_probe,
229 .read_header = amrnb_read_header,
230 .read_packet = amr_read_packet,
231 .flags = AVFMT_GENERIC_INDEX,
232};
233#endif
234
235#if CONFIG_AMRWB_DEMUXER
236static int amrwb_probe(AVProbeData *p)
237{
238 int mode, i = 0, valid = 0;
239 const uint8_t *b = p->buf;
240
241 while (i < p->buf_size) {
242 mode = b[i] >> 3 & 0x0F;
243 if (mode < 10 && (b[i] & 0x4) == 0x4) {
244 int last = mode;
245 int size = amrwb_packed_size[mode];
246 while (size--) {
247 if (b[++i] != last)
248 break;
249 last = b[i];
250 }
251 if (size > 0) {
252 valid++;
253 i += size;
254 }
255 } else {
256 valid = 0;
257 i++;
258 }
259 }
260 if (valid > 100)
261 return AVPROBE_SCORE_EXTENSION / 2 - 1;
262 return 0;
263}
264
265static int amrwb_read_header(AVFormatContext *s)
266{
267 AVStream *st = avformat_new_stream(s, NULL);
268 if (!st)
269 return AVERROR(ENOMEM);
270 st->codecpar->codec_tag = MKTAG('s', 'a', 'w', 'b');
271 st->codecpar->codec_id = AV_CODEC_ID_AMR_WB;
272 st->codecpar->sample_rate = 16000;
273 st->codecpar->channels = 1;
274 st->codecpar->channel_layout = AV_CH_LAYOUT_MONO;
275 st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
276 avpriv_set_pts_info(st, 64, 1, 16000);
277
278 return 0;
279}
280
281AVInputFormat ff_amrwb_demuxer = {
282 .name = "amrwb",
283 .long_name = NULL_IF_CONFIG_SMALL("raw AMR-WB"),
284 .priv_data_size = sizeof(AMRContext),
285 .read_probe = amrwb_probe,
286 .read_header = amrwb_read_header,
287 .read_packet = amr_read_packet,
288 .flags = AVFMT_GENERIC_INDEX,
289};
290#endif
291
179#if CONFIG_AMR_MUXER292#if CONFIG_AMR_MUXER
180AVOutputFormat ff_amr_muxer = {293AVOutputFormat ff_amr_muxer = {
181 .name = "amr",294 .name = "amr",
libavformat/version.h+2−2
@@ -32,8 +32,8 @@ · 31 unmodified lines
32// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)32// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
33// Also please add any ticket numbers that you believe might be affected here33// Also please add any ticket numbers that you believe might be affected here
34#define LIBAVFORMAT_VERSION_MAJOR 5834#define LIBAVFORMAT_VERSION_MAJOR 58
35#define LIBAVFORMAT_VERSION_MINOR 035#define LIBAVFORMAT_VERSION_MINOR 1
36#define LIBAVFORMAT_VERSION_MICRO 10236#define LIBAVFORMAT_VERSION_MICRO 100
37 37
38#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \38#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
39 LIBAVFORMAT_VERSION_MINOR, \39 LIBAVFORMAT_VERSION_MINOR, \

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t