annotate amr.c @ 1332:7474cc6383d4 libavformat

fix some signedness warnings
author mru
date Wed, 27 Sep 2006 19:47:39 +0000
parents 996ce2a68147
children 0899bfe4105c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
1 /*
148
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
2 * amr file format
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
3 * Copyright (c) 2001 ffmpeg project
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
4 *
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
5 * This library is free software; you can redistribute it and/or
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
6 * modify it under the terms of the GNU Lesser General Public
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
7 * License as published by the Free Software Foundation; either
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
8 * version 2 of the License, or (at your option) any later version.
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
9 *
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
10 * This library is distributed in the hope that it will be useful,
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
13 * Lesser General Public License for more details.
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
14 *
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
15 * You should have received a copy of the GNU Lesser General Public
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
16 * License along with this library; if not, write to the Free Software
896
edbe5c3717f9 Update licensing information: The FSF changed postal address.
diego
parents: 885
diff changeset
17 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
148
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
18 */
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
19
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
20 /*
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
21 Write and read amr data according to RFC3267, http://www.ietf.org/rfc/rfc3267.txt?number=3267
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
22
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
23 Only mono files are supported.
148
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
24
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
25 */
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
26 #include "avformat.h"
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
27
1332
7474cc6383d4 fix some signedness warnings
mru
parents: 1242
diff changeset
28 static const char AMR_header [] = "#!AMR\n";
7474cc6383d4 fix some signedness warnings
mru
parents: 1242
diff changeset
29 static const char AMRWB_header [] = "#!AMR-WB\n";
148
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
30
906
dd0d3138fdbe Place proper #ifdef around muxer-specific code.
diego
parents: 896
diff changeset
31 #ifdef CONFIG_MUXERS
148
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
32 static int amr_write_header(AVFormatContext *s)
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
33 {
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
34 ByteIOContext *pb = &s->pb;
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
35 AVCodecContext *enc = s->streams[0]->codec;
148
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
36
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
37 s->priv_data = NULL;
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
38
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
39 if (enc->codec_id == CODEC_ID_AMR_NB)
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
40 {
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
41 put_tag(pb, AMR_header); /* magic number */
148
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
42 }
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
43 else if(enc->codec_id == CODEC_ID_AMR_WB)
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
44 {
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
45 put_tag(pb, AMRWB_header); /* magic number */
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
46 }
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
47 else
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
48 {
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
49 //This is an error!
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
50 }
148
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
51 put_flush_packet(pb);
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
52 return 0;
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
53 }
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
54
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 258
diff changeset
55 static int amr_write_packet(AVFormatContext *s, AVPacket *pkt)
148
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
56 {
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 258
diff changeset
57 put_buffer(&s->pb, pkt->data, pkt->size);
148
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
58 put_flush_packet(&s->pb);
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
59 return 0;
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
60 }
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
61
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
62 static int amr_write_trailer(AVFormatContext *s)
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
63 {
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
64 return 0;
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
65 }
906
dd0d3138fdbe Place proper #ifdef around muxer-specific code.
diego
parents: 896
diff changeset
66 #endif /* CONFIG_MUXERS */
148
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
67
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
68 static int amr_probe(AVProbeData *p)
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
69 {
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
70 //Only check for "#!AMR" which could be amr-wb, amr-nb.
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
71 //This will also trigger multichannel files: "#!AMR_MC1.0\n" and
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
72 //"#!AMR-WB_MC1.0\n" (not supported)
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
73
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
74 if (p->buf_size < 5)
148
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
75 return 0;
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
76 if(memcmp(p->buf,AMR_header,5)==0)
148
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
77 return AVPROBE_SCORE_MAX;
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
78 else
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
79 return 0;
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
80 }
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
81
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
82 /* amr input */
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
83 static int amr_read_header(AVFormatContext *s,
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
84 AVFormatParameters *ap)
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
85 {
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
86 ByteIOContext *pb = &s->pb;
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
87 AVStream *st;
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
88 uint8_t header[9];
148
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
89
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
90 get_buffer(pb, header, 6);
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
91
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
92 if(memcmp(header,AMR_header,6)!=0)
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
93 {
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
94 get_buffer(pb, header+6, 3);
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
95 if(memcmp(header,AMRWB_header,9)!=0)
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
96 {
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
97 return -1;
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
98 }
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
99 st = av_new_stream(s, 0);
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
100 if (!st)
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
101 {
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
102 return AVERROR_NOMEM;
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
103 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
104
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
105 st->codec->codec_type = CODEC_TYPE_AUDIO;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
106 st->codec->codec_tag = MKTAG('s', 'a', 'w', 'b');
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
107 st->codec->codec_id = CODEC_ID_AMR_WB;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
108 st->codec->channels = 1;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
109 st->codec->sample_rate = 16000;
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
110 }
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
111 else
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
112 {
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
113 st = av_new_stream(s, 0);
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
114 if (!st)
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
115 {
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
116 return AVERROR_NOMEM;
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
117 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
118
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
119 st->codec->codec_type = CODEC_TYPE_AUDIO;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
120 st->codec->codec_tag = MKTAG('s', 'a', 'm', 'r');
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
121 st->codec->codec_id = CODEC_ID_AMR_NB;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
122 st->codec->channels = 1;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
123 st->codec->sample_rate = 8000;
148
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
124 }
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
125
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
126 return 0;
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
127 }
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
128
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
129 #define MAX_SIZE 32
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
130
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
131 static int amr_read_packet(AVFormatContext *s,
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
132 AVPacket *pkt)
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
133 {
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
134 AVCodecContext *enc = s->streams[0]->codec;
148
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
135
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
136 if (enc->codec_id == CODEC_ID_AMR_NB)
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
137 {
1242
996ce2a68147 Fix some "'static' is not at beginning of declaration" warnings.
diego
parents: 1169
diff changeset
138 static const uint8_t packed_size[16] = {12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0};
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
139 uint8_t toc, q, ft;
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
140 int read;
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
141 int size;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
142
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
143 if (url_feof(&s->pb))
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
144 {
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 468
diff changeset
145 return AVERROR_IO;
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
146 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
147
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
148 toc=get_byte(&s->pb);
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
149 q = (toc >> 2) & 0x01;
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
150 ft = (toc >> 3) & 0x0F;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
151
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
152 size=packed_size[ft];
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
153
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
154 if (av_new_packet(pkt, size+1))
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
155 {
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 468
diff changeset
156 return AVERROR_IO;
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
157 }
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
158 pkt->stream_index = 0;
775
c5077fdab490 AVPacket.pos
michael
parents: 734
diff changeset
159 pkt->pos= url_ftell(&s->pb);
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
160 pkt->data[0]=toc;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
161
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
162 read = get_buffer(&s->pb, pkt->data+1, size);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
163
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
164 if (read != size)
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
165 {
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
166 av_free_packet(pkt);
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 468
diff changeset
167 return AVERROR_IO;
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
168 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
169
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
170 return 0;
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
171 }
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
172 else if(enc->codec_id == CODEC_ID_AMR_WB)
148
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
173 {
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
174 static uint8_t packed_size[16] = {18, 24, 33, 37, 41, 47, 51, 59, 61, 6, 6, 0, 0, 0, 1, 1};
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
175 uint8_t toc, mode;
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
176 int read;
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
177 int size;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
178
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
179 if (url_feof(&s->pb))
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
180 {
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 468
diff changeset
181 return AVERROR_IO;
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
182 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
183
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
184 toc=get_byte(&s->pb);
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
185 mode = (uint8_t)((toc >> 3) & 0x0F);
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
186 size = packed_size[mode];
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
187
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
188 if ( (size==0) || av_new_packet(pkt, size))
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
189 {
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 468
diff changeset
190 return AVERROR_IO;
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
191 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
192
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
193 pkt->stream_index = 0;
775
c5077fdab490 AVPacket.pos
michael
parents: 734
diff changeset
194 pkt->pos= url_ftell(&s->pb);
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
195 pkt->data[0]=toc;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
196
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
197 read = get_buffer(&s->pb, pkt->data+1, size-1);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
198
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
199 if (read != (size-1))
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
200 {
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
201 av_free_packet(pkt);
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 468
diff changeset
202 return AVERROR_IO;
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
203 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
204
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
205 return 0;
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
206 }
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
207 else
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
208 {
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 468
diff changeset
209 return AVERROR_IO;
148
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
210 }
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
211 }
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
212
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
213 static int amr_read_close(AVFormatContext *s)
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
214 {
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
215 return 0;
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
216 }
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
217
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
218 #ifdef CONFIG_AMR_DEMUXER
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
219 AVInputFormat amr_demuxer = {
148
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
220 "amr",
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
221 "3gpp amr file format",
258
59c2e84817a1 AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
michaelni
parents: 154
diff changeset
222 0, /*priv_data_size*/
148
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
223 amr_probe,
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
224 amr_read_header,
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
225 amr_read_packet,
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
226 amr_read_close,
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
227 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
228 #endif
148
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
229
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
230 #ifdef CONFIG_AMR_MUXER
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
231 AVOutputFormat amr_muxer = {
148
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
232 "amr",
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
233 "3gpp amr file format",
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
234 "audio/amr",
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
235 "amr",
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
236 0,
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
237 CODEC_ID_AMR_NB,
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
238 CODEC_ID_NONE,
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
239 amr_write_header,
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
240 amr_write_packet,
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
241 amr_write_trailer,
31d7c9a8678c * amr format - by Johannes Carlsson
kabi
parents:
diff changeset
242 };
906
dd0d3138fdbe Place proper #ifdef around muxer-specific code.
diego
parents: 896
diff changeset
243 #endif