Mercurial > libavformat.hg
annotate wav.c @ 5209:2b52ec1e8619 libavformat
reindent after last commit and remove unneeded empty line
author | kostya |
---|---|
date | Wed, 16 Sep 2009 18:06:29 +0000 |
parents | e73c5f33463b |
children | c2881eee05b7 |
rev | line source |
---|---|
885 | 1 /* |
1415
3b00fb8ef8e4
replace coder/decoder file description in libavformat by muxer/demuxer
aurel
parents:
1358
diff
changeset
|
2 * WAV muxer and demuxer |
4251
77e0c7511d41
cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents:
4206
diff
changeset
|
3 * Copyright (c) 2001, 2002 Fabrice Bellard |
0 | 4 * |
5126 | 5 * Sony Wave64 demuxer |
6 * Copyright (c) 2009 Daniel Verkamp | |
7 * | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1172
diff
changeset
|
8 * This file is part of FFmpeg. |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1172
diff
changeset
|
9 * |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1172
diff
changeset
|
10 * FFmpeg is free software; you can redistribute it and/or |
0 | 11 * modify it under the terms of the GNU Lesser General Public |
12 * License as published by the Free Software Foundation; either | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1172
diff
changeset
|
13 * version 2.1 of the License, or (at your option) any later version. |
0 | 14 * |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1172
diff
changeset
|
15 * FFmpeg is distributed in the hope that it will be useful, |
0 | 16 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
18 * Lesser General Public License for more details. | |
19 * | |
20 * You should have received a copy of the GNU Lesser General Public | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1172
diff
changeset
|
21 * License along with FFmpeg; if not, write to the Free Software |
896
edbe5c3717f9
Update licensing information: The FSF changed postal address.
diego
parents:
893
diff
changeset
|
22 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
0 | 23 */ |
24 #include "avformat.h" | |
2545
213268d7594e
move unrelated functions declarations out of allformats.h
aurel
parents:
2274
diff
changeset
|
25 #include "raw.h" |
1172
6a5e58d2114b
move common stuff from avienc.c and wav.c to new file riff.c
mru
parents:
1169
diff
changeset
|
26 #include "riff.h" |
0 | 27 |
28 typedef struct { | |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3934
diff
changeset
|
29 int64_t data; |
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3934
diff
changeset
|
30 int64_t data_end; |
1781 | 31 int64_t minpts; |
32 int64_t maxpts; | |
33 int last_duration; | |
5126 | 34 int w64; |
0 | 35 } WAVContext; |
36 | |
4206 | 37 #if CONFIG_WAV_MUXER |
0 | 38 static int wav_write_header(AVFormatContext *s) |
39 { | |
40 WAVContext *wav = s->priv_data; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2545
diff
changeset
|
41 ByteIOContext *pb = s->pb; |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3934
diff
changeset
|
42 int64_t fmt, fact; |
0 | 43 |
44 put_tag(pb, "RIFF"); | |
45 put_le32(pb, 0); /* file length */ | |
46 put_tag(pb, "WAVE"); | |
47 | |
48 /* format header */ | |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
5001
diff
changeset
|
49 fmt = ff_start_tag(pb, "fmt "); |
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
5001
diff
changeset
|
50 if (ff_put_wav_header(pb, s->streams[0]->codec) < 0) { |
3925 | 51 av_log(s, AV_LOG_ERROR, "%s codec not supported in WAVE format\n", |
3934 | 52 s->streams[0]->codec->codec ? s->streams[0]->codec->codec->name : "NONE"); |
0 | 53 av_free(wav); |
54 return -1; | |
55 } | |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
5001
diff
changeset
|
56 ff_end_tag(pb, fmt); |
0 | 57 |
5127
e73c5f33463b
cosmetics: whitespace, prettyprinting, coding style fixes
diego
parents:
5126
diff
changeset
|
58 if (s->streams[0]->codec->codec_tag != 0x01 /* hence for all other than PCM */ |
e73c5f33463b
cosmetics: whitespace, prettyprinting, coding style fixes
diego
parents:
5126
diff
changeset
|
59 && !url_is_streamed(s->pb)) { |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
5001
diff
changeset
|
60 fact = ff_start_tag(pb, "fact"); |
1781 | 61 put_le32(pb, 0); |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
5001
diff
changeset
|
62 ff_end_tag(pb, fact); |
1781 | 63 } |
64 | |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
817
diff
changeset
|
65 av_set_pts_info(s->streams[0], 64, 1, s->streams[0]->codec->sample_rate); |
1781 | 66 wav->maxpts = wav->last_duration = 0; |
67 wav->minpts = INT64_MAX; | |
645
9fc2d2cc4608
wav timestamp truncation fix by (Wolfram Gloger <wmglo dent.med.uni-muenchen de>)
michael
parents:
587
diff
changeset
|
68 |
0 | 69 /* data header */ |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
5001
diff
changeset
|
70 wav->data = ff_start_tag(pb, "data"); |
885 | 71 |
0 | 72 put_flush_packet(pb); |
73 | |
74 return 0; | |
75 } | |
76 | |
468 | 77 static int wav_write_packet(AVFormatContext *s, AVPacket *pkt) |
0 | 78 { |
5127
e73c5f33463b
cosmetics: whitespace, prettyprinting, coding style fixes
diego
parents:
5126
diff
changeset
|
79 ByteIOContext *pb = s->pb; |
e73c5f33463b
cosmetics: whitespace, prettyprinting, coding style fixes
diego
parents:
5126
diff
changeset
|
80 WAVContext *wav = s->priv_data; |
468 | 81 put_buffer(pb, pkt->data, pkt->size); |
1781 | 82 if(pkt->pts != AV_NOPTS_VALUE) { |
5127
e73c5f33463b
cosmetics: whitespace, prettyprinting, coding style fixes
diego
parents:
5126
diff
changeset
|
83 wav->minpts = FFMIN(wav->minpts, pkt->pts); |
e73c5f33463b
cosmetics: whitespace, prettyprinting, coding style fixes
diego
parents:
5126
diff
changeset
|
84 wav->maxpts = FFMAX(wav->maxpts, pkt->pts); |
1781 | 85 wav->last_duration = pkt->duration; |
86 } else | |
87 av_log(s, AV_LOG_ERROR, "wav_write_packet: NOPTS\n"); | |
0 | 88 return 0; |
89 } | |
90 | |
91 static int wav_write_trailer(AVFormatContext *s) | |
92 { | |
5127
e73c5f33463b
cosmetics: whitespace, prettyprinting, coding style fixes
diego
parents:
5126
diff
changeset
|
93 ByteIOContext *pb = s->pb; |
e73c5f33463b
cosmetics: whitespace, prettyprinting, coding style fixes
diego
parents:
5126
diff
changeset
|
94 WAVContext *wav = s->priv_data; |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3934
diff
changeset
|
95 int64_t file_size; |
0 | 96 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2545
diff
changeset
|
97 if (!url_is_streamed(s->pb)) { |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
5001
diff
changeset
|
98 ff_end_tag(pb, wav->data); |
0 | 99 |
100 /* update file size */ | |
101 file_size = url_ftell(pb); | |
102 url_fseek(pb, 4, SEEK_SET); | |
65 | 103 put_le32(pb, (uint32_t)(file_size - 8)); |
0 | 104 url_fseek(pb, file_size, SEEK_SET); |
105 | |
106 put_flush_packet(pb); | |
1781 | 107 |
108 if(s->streams[0]->codec->codec_tag != 0x01) { | |
109 /* Update num_samps in fact chunk */ | |
110 int number_of_samples; | |
111 number_of_samples = av_rescale(wav->maxpts - wav->minpts + wav->last_duration, | |
112 s->streams[0]->codec->sample_rate * (int64_t)s->streams[0]->time_base.num, | |
113 s->streams[0]->time_base.den); | |
114 url_fseek(pb, wav->data-12, SEEK_SET); | |
115 put_le32(pb, number_of_samples); | |
116 url_fseek(pb, file_size, SEEK_SET); | |
117 put_flush_packet(pb); | |
118 } | |
0 | 119 } |
120 return 0; | |
121 } | |
3871
e6aeb2733e34
Replace generic CONFIG_MUXERS preprocessor conditionals by more specific
diego
parents:
3766
diff
changeset
|
122 #endif /* CONFIG_WAV_MUXER */ |
0 | 123 |
124 /* return the size of the found tag */ | |
5001
4da68099d180
Change find_tag return type to int64_t, fix a bug
bcoudurier
parents:
4251
diff
changeset
|
125 static int64_t find_tag(ByteIOContext *pb, uint32_t tag1) |
0 | 126 { |
127 unsigned int tag; | |
5001
4da68099d180
Change find_tag return type to int64_t, fix a bug
bcoudurier
parents:
4251
diff
changeset
|
128 int64_t size; |
0 | 129 |
5127
e73c5f33463b
cosmetics: whitespace, prettyprinting, coding style fixes
diego
parents:
5126
diff
changeset
|
130 for (;;) { |
0 | 131 if (url_feof(pb)) |
132 return -1; | |
5127
e73c5f33463b
cosmetics: whitespace, prettyprinting, coding style fixes
diego
parents:
5126
diff
changeset
|
133 tag = get_le32(pb); |
0 | 134 size = get_le32(pb); |
135 if (tag == tag1) | |
136 break; | |
137 url_fseek(pb, size, SEEK_CUR); | |
138 } | |
139 return size; | |
140 } | |
141 | |
142 static int wav_probe(AVProbeData *p) | |
143 { | |
144 /* check file header */ | |
145 if (p->buf_size <= 32) | |
146 return 0; | |
5127
e73c5f33463b
cosmetics: whitespace, prettyprinting, coding style fixes
diego
parents:
5126
diff
changeset
|
147 if (p->buf[ 0] == 'R' && p->buf[ 1] == 'I' && |
e73c5f33463b
cosmetics: whitespace, prettyprinting, coding style fixes
diego
parents:
5126
diff
changeset
|
148 p->buf[ 2] == 'F' && p->buf[ 3] == 'F' && |
e73c5f33463b
cosmetics: whitespace, prettyprinting, coding style fixes
diego
parents:
5126
diff
changeset
|
149 p->buf[ 8] == 'W' && p->buf[ 9] == 'A' && |
0 | 150 p->buf[10] == 'V' && p->buf[11] == 'E') |
3233
e2bdb989f7da
Decrease returning probe score for WAV demuxer to avoid
voroshil
parents:
2771
diff
changeset
|
151 /* |
e2bdb989f7da
Decrease returning probe score for WAV demuxer to avoid
voroshil
parents:
2771
diff
changeset
|
152 Since ACT demuxer has standard WAV header at top of it's own, |
e2bdb989f7da
Decrease returning probe score for WAV demuxer to avoid
voroshil
parents:
2771
diff
changeset
|
153 returning score is decreased to avoid probe conflict |
e2bdb989f7da
Decrease returning probe score for WAV demuxer to avoid
voroshil
parents:
2771
diff
changeset
|
154 between ACT and WAV. |
e2bdb989f7da
Decrease returning probe score for WAV demuxer to avoid
voroshil
parents:
2771
diff
changeset
|
155 */ |
e2bdb989f7da
Decrease returning probe score for WAV demuxer to avoid
voroshil
parents:
2771
diff
changeset
|
156 return AVPROBE_SCORE_MAX - 1; |
0 | 157 else |
158 return 0; | |
159 } | |
160 | |
161 /* wav input */ | |
162 static int wav_read_header(AVFormatContext *s, | |
163 AVFormatParameters *ap) | |
164 { | |
5001
4da68099d180
Change find_tag return type to int64_t, fix a bug
bcoudurier
parents:
4251
diff
changeset
|
165 int64_t size; |
0 | 166 unsigned int tag; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2545
diff
changeset
|
167 ByteIOContext *pb = s->pb; |
0 | 168 AVStream *st; |
1136
d65cd7c3573e
dont read over the end of a data chunk and at the end search for the next
michael
parents:
1122
diff
changeset
|
169 WAVContext *wav = s->priv_data; |
0 | 170 |
171 /* check RIFF header */ | |
172 tag = get_le32(pb); | |
173 | |
174 if (tag != MKTAG('R', 'I', 'F', 'F')) | |
175 return -1; | |
176 get_le32(pb); /* file size */ | |
177 tag = get_le32(pb); | |
178 if (tag != MKTAG('W', 'A', 'V', 'E')) | |
179 return -1; | |
885 | 180 |
0 | 181 /* parse fmt header */ |
182 size = find_tag(pb, MKTAG('f', 'm', 't', ' ')); | |
183 if (size < 0) | |
184 return -1; | |
185 st = av_new_stream(s, 0); | |
186 if (!st) | |
2273
7eb456c4ed8a
Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents:
2023
diff
changeset
|
187 return AVERROR(ENOMEM); |
0 | 188 |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
5001
diff
changeset
|
189 ff_get_wav_header(pb, st->codec, size); |
2023 | 190 st->need_parsing = AVSTREAM_PARSE_FULL; |
567 | 191 |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
817
diff
changeset
|
192 av_set_pts_info(st, 64, 1, st->codec->sample_rate); |
567 | 193 |
0 | 194 size = find_tag(pb, MKTAG('d', 'a', 't', 'a')); |
195 if (size < 0) | |
196 return -1; | |
1136
d65cd7c3573e
dont read over the end of a data chunk and at the end search for the next
michael
parents:
1122
diff
changeset
|
197 wav->data_end= url_ftell(pb) + size; |
0 | 198 return 0; |
199 } | |
200 | |
5126 | 201 #if CONFIG_W64_DEMUXER |
202 | |
203 static const uint8_t guid_riff[16] = { 'r', 'i', 'f', 'f', | |
204 0x2E, 0x91, 0xCF, 0x11, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 }; | |
205 | |
206 static const uint8_t guid_wave[16] = { 'w', 'a', 'v', 'e', | |
207 0xF3, 0xAC, 0xD3, 0x11, 0x8C, 0xD1, 0x00, 0xC0, 0x4F, 0x8E, 0xDB, 0x8A }; | |
208 | |
209 static const uint8_t guid_fmt [16] = { 'f', 'm', 't', ' ', | |
210 0xF3, 0xAC, 0xD3, 0x11, 0x8C, 0xD1, 0x00, 0xC0, 0x4F, 0x8E, 0xDB, 0x8A }; | |
211 | |
212 static const uint8_t guid_data[16] = { 'd', 'a', 't', 'a', | |
213 0xF3, 0xAC, 0xD3, 0x11, 0x8C, 0xD1, 0x00, 0xC0, 0x4F, 0x8E, 0xDB, 0x8A }; | |
214 | |
215 static int w64_probe(AVProbeData *p) | |
216 { | |
217 if (p->buf_size <= 40) | |
218 return 0; | |
219 if (!memcmp(p->buf, guid_riff, 16) && | |
5127
e73c5f33463b
cosmetics: whitespace, prettyprinting, coding style fixes
diego
parents:
5126
diff
changeset
|
220 !memcmp(p->buf + 24, guid_wave, 16)) |
5126 | 221 return AVPROBE_SCORE_MAX; |
5127
e73c5f33463b
cosmetics: whitespace, prettyprinting, coding style fixes
diego
parents:
5126
diff
changeset
|
222 else |
5126 | 223 return 0; |
224 } | |
225 | |
226 /** Find chunk with w64 GUID by skipping over other chunks | |
227 * @return the size of the found chunk | |
228 */ | |
229 static int64_t find_guid(ByteIOContext *pb, const uint8_t guid1[16]) | |
230 { | |
231 uint8_t guid[16]; | |
232 int64_t size; | |
233 | |
234 while (!url_feof(pb)) { | |
235 get_buffer(pb, guid, 16); | |
236 size = get_le64(pb); | |
237 if (size <= 24) | |
238 return -1; | |
239 if (!memcmp(guid, guid1, 16)) | |
240 return size; | |
241 url_fskip(pb, FFALIGN(size, INT64_C(8)) - 24); | |
242 } | |
243 return -1; | |
244 } | |
245 | |
246 static int w64_read_header(AVFormatContext *s, AVFormatParameters *ap) | |
247 { | |
248 int64_t size; | |
5127
e73c5f33463b
cosmetics: whitespace, prettyprinting, coding style fixes
diego
parents:
5126
diff
changeset
|
249 ByteIOContext *pb = s->pb; |
e73c5f33463b
cosmetics: whitespace, prettyprinting, coding style fixes
diego
parents:
5126
diff
changeset
|
250 WAVContext *wav = s->priv_data; |
5126 | 251 AVStream *st; |
252 uint8_t guid[16]; | |
253 | |
254 get_buffer(pb, guid, 16); | |
255 if (memcmp(guid, guid_riff, 16)) | |
256 return -1; | |
257 | |
258 if (get_le64(pb) < 16 + 8 + 16 + 8 + 16 + 8) /* riff + wave + fmt + sizes */ | |
259 return -1; | |
260 | |
261 get_buffer(pb, guid, 16); | |
262 if (memcmp(guid, guid_wave, 16)) { | |
263 av_log(s, AV_LOG_ERROR, "could not find wave guid\n"); | |
264 return -1; | |
265 } | |
266 | |
267 size = find_guid(pb, guid_fmt); | |
268 if (size < 0) { | |
269 av_log(s, AV_LOG_ERROR, "could not find fmt guid\n"); | |
270 return -1; | |
271 } | |
272 | |
273 st = av_new_stream(s, 0); | |
274 if (!st) | |
275 return AVERROR(ENOMEM); | |
276 | |
277 /* subtract chunk header size - normal wav file doesn't count it */ | |
278 ff_get_wav_header(pb, st->codec, size - 24); | |
279 url_fskip(pb, FFALIGN(size, INT64_C(8)) - size); | |
280 | |
281 st->need_parsing = AVSTREAM_PARSE_FULL; | |
282 | |
283 av_set_pts_info(st, 64, 1, st->codec->sample_rate); | |
284 | |
285 size = find_guid(pb, guid_data); | |
286 if (size < 0) { | |
287 av_log(s, AV_LOG_ERROR, "could not find data guid\n"); | |
288 return -1; | |
289 } | |
290 wav->data_end = url_ftell(pb) + size - 24; | |
5127
e73c5f33463b
cosmetics: whitespace, prettyprinting, coding style fixes
diego
parents:
5126
diff
changeset
|
291 wav->w64 = 1; |
5126 | 292 |
293 return 0; | |
294 } | |
295 #endif /* CONFIG_W64_DEMUXER */ | |
296 | |
0 | 297 #define MAX_SIZE 4096 |
298 | |
299 static int wav_read_packet(AVFormatContext *s, | |
300 AVPacket *pkt) | |
301 { | |
5126 | 302 int ret, size; |
303 int64_t left; | |
309 | 304 AVStream *st; |
1136
d65cd7c3573e
dont read over the end of a data chunk and at the end search for the next
michael
parents:
1122
diff
changeset
|
305 WAVContext *wav = s->priv_data; |
0 | 306 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2545
diff
changeset
|
307 if (url_feof(s->pb)) |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2273
diff
changeset
|
308 return AVERROR(EIO); |
309 | 309 st = s->streams[0]; |
310 | |
5127
e73c5f33463b
cosmetics: whitespace, prettyprinting, coding style fixes
diego
parents:
5126
diff
changeset
|
311 left = wav->data_end - url_ftell(s->pb); |
e73c5f33463b
cosmetics: whitespace, prettyprinting, coding style fixes
diego
parents:
5126
diff
changeset
|
312 if (left <= 0){ |
e73c5f33463b
cosmetics: whitespace, prettyprinting, coding style fixes
diego
parents:
5126
diff
changeset
|
313 if (CONFIG_W64_DEMUXER && wav->w64) |
5126 | 314 left = find_guid(s->pb, guid_data) - 24; |
5127
e73c5f33463b
cosmetics: whitespace, prettyprinting, coding style fixes
diego
parents:
5126
diff
changeset
|
315 else |
e73c5f33463b
cosmetics: whitespace, prettyprinting, coding style fixes
diego
parents:
5126
diff
changeset
|
316 left = find_tag(s->pb, MKTAG('d', 'a', 't', 'a')); |
e73c5f33463b
cosmetics: whitespace, prettyprinting, coding style fixes
diego
parents:
5126
diff
changeset
|
317 if (left < 0) |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2273
diff
changeset
|
318 return AVERROR(EIO); |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2545
diff
changeset
|
319 wav->data_end= url_ftell(s->pb) + left; |
1136
d65cd7c3573e
dont read over the end of a data chunk and at the end search for the next
michael
parents:
1122
diff
changeset
|
320 } |
d65cd7c3573e
dont read over the end of a data chunk and at the end search for the next
michael
parents:
1122
diff
changeset
|
321 |
309 | 322 size = MAX_SIZE; |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
817
diff
changeset
|
323 if (st->codec->block_align > 1) { |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
817
diff
changeset
|
324 if (size < st->codec->block_align) |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
817
diff
changeset
|
325 size = st->codec->block_align; |
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
817
diff
changeset
|
326 size = (size / st->codec->block_align) * st->codec->block_align; |
309 | 327 } |
5127
e73c5f33463b
cosmetics: whitespace, prettyprinting, coding style fixes
diego
parents:
5126
diff
changeset
|
328 size = FFMIN(size, left); |
e73c5f33463b
cosmetics: whitespace, prettyprinting, coding style fixes
diego
parents:
5126
diff
changeset
|
329 ret = av_get_packet(s->pb, pkt, size); |
1756 | 330 if (ret <= 0) |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2273
diff
changeset
|
331 return AVERROR(EIO); |
0 | 332 pkt->stream_index = 0; |
333 | |
334 /* note: we need to modify the packet size here to handle the last | |
335 packet */ | |
336 pkt->size = ret; | |
337 return ret; | |
338 } | |
339 | |
885 | 340 static int wav_read_seek(AVFormatContext *s, |
558 | 341 int stream_index, int64_t timestamp, int flags) |
309 | 342 { |
343 AVStream *st; | |
344 | |
345 st = s->streams[0]; | |
5127
e73c5f33463b
cosmetics: whitespace, prettyprinting, coding style fixes
diego
parents:
5126
diff
changeset
|
346 switch (st->codec->codec_id) { |
309 | 347 case CODEC_ID_MP2: |
348 case CODEC_ID_MP3: | |
349 case CODEC_ID_AC3: | |
496
112057e05179
libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents:
482
diff
changeset
|
350 case CODEC_ID_DTS: |
309 | 351 /* use generic seeking with dynamically generated indexes */ |
352 return -1; | |
353 default: | |
354 break; | |
355 } | |
558 | 356 return pcm_read_seek(s, stream_index, timestamp, flags); |
309 | 357 } |
358 | |
4206 | 359 #if CONFIG_WAV_DEMUXER |
1169 | 360 AVInputFormat wav_demuxer = { |
0 | 361 "wav", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3233
diff
changeset
|
362 NULL_IF_CONFIG_SMALL("WAV format"), |
1136
d65cd7c3573e
dont read over the end of a data chunk and at the end search for the next
michael
parents:
1122
diff
changeset
|
363 sizeof(WAVContext), |
0 | 364 wav_probe, |
365 wav_read_header, | |
366 wav_read_packet, | |
3484 | 367 NULL, |
309 | 368 wav_read_seek, |
1756 | 369 .flags= AVFMT_GENERIC_INDEX, |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
5001
diff
changeset
|
370 .codec_tag= (const AVCodecTag* const []){ff_codec_wav_tags, 0}, |
0 | 371 }; |
1169 | 372 #endif |
5127
e73c5f33463b
cosmetics: whitespace, prettyprinting, coding style fixes
diego
parents:
5126
diff
changeset
|
373 |
4206 | 374 #if CONFIG_WAV_MUXER |
1169 | 375 AVOutputFormat wav_muxer = { |
0 | 376 "wav", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3233
diff
changeset
|
377 NULL_IF_CONFIG_SMALL("WAV format"), |
0 | 378 "audio/x-wav", |
379 "wav", | |
380 sizeof(WAVContext), | |
381 CODEC_ID_PCM_S16LE, | |
382 CODEC_ID_NONE, | |
383 wav_write_header, | |
384 wav_write_packet, | |
385 wav_write_trailer, | |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
5001
diff
changeset
|
386 .codec_tag= (const AVCodecTag* const []){ff_codec_wav_tags, 0}, |
0 | 387 }; |
1169 | 388 #endif |
5127
e73c5f33463b
cosmetics: whitespace, prettyprinting, coding style fixes
diego
parents:
5126
diff
changeset
|
389 |
5126 | 390 #if CONFIG_W64_DEMUXER |
391 AVInputFormat w64_demuxer = { | |
392 "w64", | |
393 NULL_IF_CONFIG_SMALL("Sony Wave64 format"), | |
394 sizeof(WAVContext), | |
395 w64_probe, | |
396 w64_read_header, | |
397 wav_read_packet, | |
398 NULL, | |
399 wav_read_seek, | |
400 .flags = AVFMT_GENERIC_INDEX, | |
401 .codec_tag = (const AVCodecTag* const []){ff_codec_wav_tags, 0}, | |
402 }; | |
403 #endif |