Mercurial > libavformat.hg

comparison wav.c @ 5058:33a244b7ca65 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add ff_ prefixes to exported symbols in libavformat/riff.h. patch by Daniel Verkamp, aniel drv nu
author diego
date Mon, 22 Jun 2009 23:09:34 +0000
parents 4da68099d180
children 789e13163b3b
comparison
equal deleted inserted replaced
5057:c9bbf0a253a8 5058:33a244b7ca65
40 put_tag(pb, "RIFF"); 40 put_tag(pb, "RIFF");
41 put_le32(pb, 0); /* file length */ 41 put_le32(pb, 0); /* file length */
42 put_tag(pb, "WAVE"); 42 put_tag(pb, "WAVE");
43 43
44 /* format header */ 44 /* format header */
45 fmt = start_tag(pb, "fmt "); 45 fmt = ff_start_tag(pb, "fmt ");
46 if (put_wav_header(pb, s->streams[0]->codec) < 0) { 46 if (ff_put_wav_header(pb, s->streams[0]->codec) < 0) {
47 av_log(s, AV_LOG_ERROR, "%s codec not supported in WAVE format\n", 47 av_log(s, AV_LOG_ERROR, "%s codec not supported in WAVE format\n",
48 s->streams[0]->codec->codec ? s->streams[0]->codec->codec->name : "NONE"); 48 s->streams[0]->codec->codec ? s->streams[0]->codec->codec->name : "NONE");
49 av_free(wav); 49 av_free(wav);
50 return -1; 50 return -1;
51 } 51 }
52 end_tag(pb, fmt); 52 ff_end_tag(pb, fmt);
53 53
54 if(s->streams[0]->codec->codec_tag != 0x01 /* hence for all other than PCM */ 54 if(s->streams[0]->codec->codec_tag != 0x01 /* hence for all other than PCM */
55 && !url_is_streamed(s->pb)) { 55 && !url_is_streamed(s->pb)) {
56 fact = start_tag(pb, "fact"); 56 fact = ff_start_tag(pb, "fact");
57 put_le32(pb, 0); 57 put_le32(pb, 0);
58 end_tag(pb, fact); 58 ff_end_tag(pb, fact);
59 } 59 }
60 60
61 av_set_pts_info(s->streams[0], 64, 1, s->streams[0]->codec->sample_rate); 61 av_set_pts_info(s->streams[0], 64, 1, s->streams[0]->codec->sample_rate);
62 wav->maxpts = wav->last_duration = 0; 62 wav->maxpts = wav->last_duration = 0;
63 wav->minpts = INT64_MAX; 63 wav->minpts = INT64_MAX;
64 64
65 /* data header */ 65 /* data header */
66 wav->data = start_tag(pb, "data"); 66 wav->data = ff_start_tag(pb, "data");
67 67
68 put_flush_packet(pb); 68 put_flush_packet(pb);
69 69
70 return 0; 70 return 0;
71 } 71 }
89 ByteIOContext *pb = s->pb; 89 ByteIOContext *pb = s->pb;
90 WAVContext *wav = s->priv_data; 90 WAVContext *wav = s->priv_data;
91 int64_t file_size; 91 int64_t file_size;
92 92
93 if (!url_is_streamed(s->pb)) { 93 if (!url_is_streamed(s->pb)) {
94 end_tag(pb, wav->data); 94 ff_end_tag(pb, wav->data);
95 95
96 /* update file size */ 96 /* update file size */
97 file_size = url_ftell(pb); 97 file_size = url_ftell(pb);
98 url_fseek(pb, 4, SEEK_SET); 98 url_fseek(pb, 4, SEEK_SET);
99 put_le32(pb, (uint32_t)(file_size - 8)); 99 put_le32(pb, (uint32_t)(file_size - 8));
180 return -1; 180 return -1;
181 st = av_new_stream(s, 0); 181 st = av_new_stream(s, 0);
182 if (!st) 182 if (!st)
183 return AVERROR(ENOMEM); 183 return AVERROR(ENOMEM);
184 184
185 get_wav_header(pb, st->codec, size); 185 ff_get_wav_header(pb, st->codec, size);
186 st->need_parsing = AVSTREAM_PARSE_FULL; 186 st->need_parsing = AVSTREAM_PARSE_FULL;
187 187
188 av_set_pts_info(st, 64, 1, st->codec->sample_rate); 188 av_set_pts_info(st, 64, 1, st->codec->sample_rate);
189 189
190 size = find_tag(pb, MKTAG('d', 'a', 't', 'a')); 190 size = find_tag(pb, MKTAG('d', 'a', 't', 'a'));
262 wav_read_header, 262 wav_read_header,
263 wav_read_packet, 263 wav_read_packet,
264 NULL, 264 NULL,
265 wav_read_seek, 265 wav_read_seek,
266 .flags= AVFMT_GENERIC_INDEX, 266 .flags= AVFMT_GENERIC_INDEX,
267 .codec_tag= (const AVCodecTag* const []){codec_wav_tags, 0}, 267 .codec_tag= (const AVCodecTag* const []){ff_codec_wav_tags, 0},
268 }; 268 };
269 #endif 269 #endif
270 #if CONFIG_WAV_MUXER 270 #if CONFIG_WAV_MUXER
271 AVOutputFormat wav_muxer = { 271 AVOutputFormat wav_muxer = {
272 "wav", 272 "wav",
277 CODEC_ID_PCM_S16LE, 277 CODEC_ID_PCM_S16LE,
278 CODEC_ID_NONE, 278 CODEC_ID_NONE,
279 wav_write_header, 279 wav_write_header,
280 wav_write_packet, 280 wav_write_packet,
281 wav_write_trailer, 281 wav_write_trailer,
282 .codec_tag= (const AVCodecTag* const []){codec_wav_tags, 0}, 282 .codec_tag= (const AVCodecTag* const []){ff_codec_wav_tags, 0},
283 }; 283 };
284 #endif 284 #endif