annotate wav.c @ 925:2d9a65a1d9ea libavformat

AIFF format support by (Patrick Guimond <patg a.t patg d.o.t homeunix d.o.t org)
author michael
date Thu, 02 Feb 2006 15:21:19 +0000
parents edbe5c3717f9
children 3aeb079a7e74
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 874
diff changeset
1 /*
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2 * WAV encoder and decoder
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
3 * Copyright (c) 2001, 2002 Fabrice Bellard.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
4 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
5 * This library is free software; you can redistribute it and/or
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
6 * modify it under the terms of the GNU Lesser General Public
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
7 * License as published by the Free Software Foundation; either
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
8 * version 2 of the License, or (at your option) any later version.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
9 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
10 * This library is distributed in the hope that it will be useful,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
13 * Lesser General Public License for more details.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
14 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
15 * You should have received a copy of the GNU Lesser General Public
05318cf2e886 renamed libav to libavformat
bellard
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: 893
diff changeset
17 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
18 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
19 #include "avformat.h"
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
20 #include "avi.h"
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
21
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
22 const CodecTag codec_wav_tags[] = {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
23 { CODEC_ID_MP2, 0x50 },
232
eb90c0a5a1ba CODEC_ID_MP3LAME is obsolete
bellard
parents: 226
diff changeset
24 { CODEC_ID_MP3, 0x55 },
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
25 { CODEC_ID_AC3, 0x2000 },
874
29fa250510df DTS is 0x2001 according to: http://www1.mplayerhq.hu/MPlayer/DOCS/codecs-status.html
gpoirier
parents: 858
diff changeset
26 { CODEC_ID_DTS, 0x2001 },
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
27 { CODEC_ID_PCM_S16LE, 0x01 },
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
28 { CODEC_ID_PCM_U8, 0x01 }, /* must come after s16le in this list */
846
fd1c2109505e Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents: 820
diff changeset
29 { CODEC_ID_PCM_S24LE, 0x01 },
fd1c2109505e Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents: 820
diff changeset
30 { CODEC_ID_PCM_S32LE, 0x01 },
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
31 { CODEC_ID_PCM_ALAW, 0x06 },
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
32 { CODEC_ID_PCM_MULAW, 0x07 },
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
33 { CODEC_ID_ADPCM_MS, 0x02 },
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
34 { CODEC_ID_ADPCM_IMA_WAV, 0x11 },
817
8e9c4e5d157b Yamaha ADPCM in wav patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 713
diff changeset
35 { CODEC_ID_ADPCM_YAMAHA, 0x20 },
362
07bf7ff87eb3 * Initial implementation of the G.726 ADPCM audio codec.
romansh
parents: 309
diff changeset
36 { CODEC_ID_ADPCM_G726, 0x45 },
226
d55e4b761e24 support for Duck DK3 and DK4 ADPCM
tmmm
parents: 196
diff changeset
37 { CODEC_ID_ADPCM_IMA_DK4, 0x61 }, /* rogue format number */
d55e4b761e24 support for Duck DK3 and DK4 ADPCM
tmmm
parents: 196
diff changeset
38 { CODEC_ID_ADPCM_IMA_DK3, 0x62 }, /* rogue format number */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
39 { CODEC_ID_WMAV1, 0x160 },
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
40 { CODEC_ID_WMAV2, 0x161 },
550
bc2751b2c189 untested AAC in WAV/AVI patch by (Mns Rullgrd <mru at mru dot ath dot cx>)
michael
parents: 529
diff changeset
41 { CODEC_ID_AAC, 0x706d },
411
64c347065c1b some random id for vorbis so we can do some experiments with vorbis in various containers, anyone knows if vorbis in WAV/AVI has a official id?
michael
parents: 384
diff changeset
42 { CODEC_ID_VORBIS, ('V'<<8)+'o' }, //HACK/FIXME, does vorbis in WAV/AVI have an (in)official id?
517
543990301444 unofficial ids for sonic for using in nut (fixme)
alex
parents: 496
diff changeset
43 { CODEC_ID_SONIC, 0x2048 },
543990301444 unofficial ids for sonic for using in nut (fixme)
alex
parents: 496
diff changeset
44 { CODEC_ID_SONIC_LS, 0x2048 },
561
d5925f47058d Creative ADPCM decoder, format 0x200, courtesy of Konstantin Shishkov
melanson
parents: 558
diff changeset
45 { CODEC_ID_ADPCM_CT, 0x200 },
685
4b339414d338 pseudo codec tag for adpcm_swf
alex
parents: 645
diff changeset
46 { CODEC_ID_ADPCM_SWF, ('S'<<8)+'F' },
893
1a50f1735214 TrueSpeech compatible audio decoder by Konstantin Shishkov
diego
parents: 887
diff changeset
47 { CODEC_ID_TRUESPEECH, 0x22 },
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
48 { 0, 0 },
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
49 };
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
50
858
66cc656ea404 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
diego
parents: 846
diff changeset
51 #ifdef CONFIG_MUXERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
52 /* WAVEFORMATEX header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
53 /* returns the size or -1 on error */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
54 int put_wav_header(ByteIOContext *pb, AVCodecContext *enc)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
55 {
196
01bec1059bdf use codec_tag for encoding too
michaelni
parents: 87
diff changeset
56 int bps, blkalign, bytespersec;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
57 int hdrsize = 18;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
58
196
01bec1059bdf use codec_tag for encoding too
michaelni
parents: 87
diff changeset
59 if(!enc->codec_tag)
01bec1059bdf use codec_tag for encoding too
michaelni
parents: 87
diff changeset
60 enc->codec_tag = codec_get_tag(codec_wav_tags, enc->codec_id);
01bec1059bdf use codec_tag for encoding too
michaelni
parents: 87
diff changeset
61 if(!enc->codec_tag)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
62 return -1;
196
01bec1059bdf use codec_tag for encoding too
michaelni
parents: 87
diff changeset
63
01bec1059bdf use codec_tag for encoding too
michaelni
parents: 87
diff changeset
64 put_le16(pb, enc->codec_tag);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
65 put_le16(pb, enc->channels);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
66 put_le32(pb, enc->sample_rate);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
67 if (enc->codec_id == CODEC_ID_PCM_U8 ||
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
68 enc->codec_id == CODEC_ID_PCM_ALAW ||
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
69 enc->codec_id == CODEC_ID_PCM_MULAW) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
70 bps = 8;
232
eb90c0a5a1ba CODEC_ID_MP3LAME is obsolete
bellard
parents: 226
diff changeset
71 } else if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
72 bps = 0;
817
8e9c4e5d157b Yamaha ADPCM in wav patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 713
diff changeset
73 } else if (enc->codec_id == CODEC_ID_ADPCM_IMA_WAV || enc->codec_id == CODEC_ID_ADPCM_MS || enc->codec_id == CODEC_ID_ADPCM_G726 || enc->codec_id == CODEC_ID_ADPCM_YAMAHA) { //
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
74 bps = 4;
846
fd1c2109505e Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents: 820
diff changeset
75 } else if (enc->codec_id == CODEC_ID_PCM_S24LE) {
fd1c2109505e Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents: 820
diff changeset
76 bps = 24;
fd1c2109505e Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents: 820
diff changeset
77 } else if (enc->codec_id == CODEC_ID_PCM_S32LE) {
fd1c2109505e Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents: 820
diff changeset
78 bps = 32;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
79 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
80 bps = 16;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
81 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 874
diff changeset
82
232
eb90c0a5a1ba CODEC_ID_MP3LAME is obsolete
bellard
parents: 226
diff changeset
83 if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3) {
577
f8edb92d97b6 cbr audio muxing fix
michael
parents: 570
diff changeset
84 blkalign = enc->frame_size; //this is wrong, but seems many demuxers dont work if this is set correctly
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
85 //blkalign = 144 * enc->bit_rate/enc->sample_rate;
713
3c8a21cd6296 28_fix_parameters_in_G726.patch by (Calcium | calcium nurs or jp)
michael
parents: 685
diff changeset
86 } else if (enc->codec_id == CODEC_ID_ADPCM_G726) { //
3c8a21cd6296 28_fix_parameters_in_G726.patch by (Calcium | calcium nurs or jp)
michael
parents: 685
diff changeset
87 blkalign = 1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
88 } else if (enc->block_align != 0) { /* specified by the codec */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
89 blkalign = enc->block_align;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
90 } else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
91 blkalign = enc->channels*bps >> 3;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
92 if (enc->codec_id == CODEC_ID_PCM_U8 ||
846
fd1c2109505e Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents: 820
diff changeset
93 enc->codec_id == CODEC_ID_PCM_S24LE ||
fd1c2109505e Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents: 820
diff changeset
94 enc->codec_id == CODEC_ID_PCM_S32LE ||
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
95 enc->codec_id == CODEC_ID_PCM_S16LE) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
96 bytespersec = enc->sample_rate * blkalign;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
97 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
98 bytespersec = enc->bit_rate / 8;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
99 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
100 put_le32(pb, bytespersec); /* bytes per second */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
101 put_le16(pb, blkalign); /* block align */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
102 put_le16(pb, bps); /* bits per sample */
232
eb90c0a5a1ba CODEC_ID_MP3LAME is obsolete
bellard
parents: 226
diff changeset
103 if (enc->codec_id == CODEC_ID_MP3) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
104 put_le16(pb, 12); /* wav_extra_size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
105 hdrsize += 12;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
106 put_le16(pb, 1); /* wID */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
107 put_le32(pb, 2); /* fdwFlags */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
108 put_le16(pb, 1152); /* nBlockSize */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
109 put_le16(pb, 1); /* nFramesPerBlock */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
110 put_le16(pb, 1393); /* nCodecDelay */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
111 } else if (enc->codec_id == CODEC_ID_MP2) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
112 put_le16(pb, 22); /* wav_extra_size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
113 hdrsize += 22;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
114 put_le16(pb, 2); /* fwHeadLayer */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
115 put_le32(pb, enc->bit_rate); /* dwHeadBitrate */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
116 put_le16(pb, enc->channels == 2 ? 1 : 8); /* fwHeadMode */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
117 put_le16(pb, 0); /* fwHeadModeExt */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
118 put_le16(pb, 1); /* wHeadEmphasis */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
119 put_le16(pb, 16); /* fwHeadFlags */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
120 put_le32(pb, 0); /* dwPTSLow */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
121 put_le32(pb, 0); /* dwPTSHigh */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
122 } else if (enc->codec_id == CODEC_ID_ADPCM_IMA_WAV) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
123 put_le16(pb, 2); /* wav_extra_size */
379
b056f76ec6eb Correcting the header size for ADPCM_IMA_WAV files patch by (Brian Becker <brian dot becker at palmone dot com>)
michael
parents: 362
diff changeset
124 hdrsize += 2;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
125 put_le16(pb, ((enc->block_align - 4 * enc->channels) / (4 * enc->channels)) * 8 + 1); /* wSamplesPerBlock */
529
0b867ba59753 write shorter headers if possible
michael
parents: 517
diff changeset
126 } else if(enc->extradata_size){
412
459df3ed379e store extradata, vorbis in avi works now, dont expect av sync though
michael
parents: 411
diff changeset
127 put_le16(pb, enc->extradata_size);
459df3ed379e store extradata, vorbis in avi works now, dont expect av sync though
michael
parents: 411
diff changeset
128 put_buffer(pb, enc->extradata, enc->extradata_size);
459df3ed379e store extradata, vorbis in avi works now, dont expect av sync though
michael
parents: 411
diff changeset
129 hdrsize += enc->extradata_size;
413
michael
parents: 412
diff changeset
130 if(hdrsize&1){
michael
parents: 412
diff changeset
131 hdrsize++;
michael
parents: 412
diff changeset
132 put_byte(pb, 0);
michael
parents: 412
diff changeset
133 }
529
0b867ba59753 write shorter headers if possible
michael
parents: 517
diff changeset
134 } else {
0b867ba59753 write shorter headers if possible
michael
parents: 517
diff changeset
135 hdrsize -= 2;
412
459df3ed379e store extradata, vorbis in avi works now, dont expect av sync though
michael
parents: 411
diff changeset
136 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
137
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
138 return hdrsize;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
139 }
858
66cc656ea404 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
diego
parents: 846
diff changeset
140 #endif //CONFIG_MUXERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
141
84
0068a6902911 correct AUDIO strf parsing patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 74
diff changeset
142 /* We could be given one of the three possible structures here:
0068a6902911 correct AUDIO strf parsing patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 74
diff changeset
143 * WAVEFORMAT, PCMWAVEFORMAT or WAVEFORMATEX. Each structure
0068a6902911 correct AUDIO strf parsing patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 74
diff changeset
144 * is an expansion of the previous one with the fields added
0068a6902911 correct AUDIO strf parsing patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 74
diff changeset
145 * at the bottom. PCMWAVEFORMAT adds 'WORD wBitsPerSample' and
0068a6902911 correct AUDIO strf parsing patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 74
diff changeset
146 * WAVEFORMATEX adds 'WORD cbSize' and basically makes itself
0068a6902911 correct AUDIO strf parsing patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 74
diff changeset
147 * an openended structure.
0068a6902911 correct AUDIO strf parsing patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 74
diff changeset
148 */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 874
diff changeset
149 void get_wav_header(ByteIOContext *pb, AVCodecContext *codec, int size)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
150 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
151 int id;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
152
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
153 id = get_le16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
154 codec->codec_type = CODEC_TYPE_AUDIO;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
155 codec->codec_tag = id;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
156 codec->channels = get_le16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
157 codec->sample_rate = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
158 codec->bit_rate = get_le32(pb) * 8;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
159 codec->block_align = get_le16(pb);
84
0068a6902911 correct AUDIO strf parsing patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 74
diff changeset
160 if (size == 14) { /* We're dealing with plain vanilla WAVEFORMAT */
0068a6902911 correct AUDIO strf parsing patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 74
diff changeset
161 codec->bits_per_sample = 8;
87
b43e201588dc sorry forgot
michaelni
parents: 84
diff changeset
162 }else
b43e201588dc sorry forgot
michaelni
parents: 84
diff changeset
163 codec->bits_per_sample = get_le16(pb);
b43e201588dc sorry forgot
michaelni
parents: 84
diff changeset
164 codec->codec_id = wav_codec_get_id(id, codec->bits_per_sample);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 874
diff changeset
165
84
0068a6902911 correct AUDIO strf parsing patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 74
diff changeset
166 if (size > 16) { /* We're obviously dealing with WAVEFORMATEX */
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
167 codec->extradata_size = get_le16(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
168 if (codec->extradata_size > 0) {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
169 if (codec->extradata_size > size - 18)
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
170 codec->extradata_size = size - 18;
587
fe24632a577b allocate a few bytes more for extradata so the bitstream reader if its used by the codec for parsing extardata, doesnt read over the end
michael
parents: 577
diff changeset
171 codec->extradata = av_mallocz(codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
172 get_buffer(pb, codec->extradata, codec->extradata_size);
84
0068a6902911 correct AUDIO strf parsing patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 74
diff changeset
173 } else
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
174 codec->extradata_size = 0;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 874
diff changeset
175
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
176 /* It is possible for the chunk to contain garbage at the end */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
177 if (size - codec->extradata_size - 18 > 0)
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
178 url_fskip(pb, size - codec->extradata_size - 18);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
179 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
180 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
181
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
182
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
183 int wav_codec_get_id(unsigned int tag, int bps)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
184 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
185 int id;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
186 id = codec_get_id(codec_wav_tags, tag);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
187 if (id <= 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
188 return id;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
189 /* handle specific u8 codec */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
190 if (id == CODEC_ID_PCM_S16LE && bps == 8)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
191 id = CODEC_ID_PCM_U8;
846
fd1c2109505e Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents: 820
diff changeset
192 if (id == CODEC_ID_PCM_S16LE && bps == 24)
fd1c2109505e Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents: 820
diff changeset
193 id = CODEC_ID_PCM_S24LE;
fd1c2109505e Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents: 820
diff changeset
194 if (id == CODEC_ID_PCM_S16LE && bps == 32)
fd1c2109505e Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents: 820
diff changeset
195 id = CODEC_ID_PCM_S32LE;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
196 return id;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
197 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
198
858
66cc656ea404 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
diego
parents: 846
diff changeset
199 #ifdef CONFIG_MUXERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
200 typedef struct {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
201 offset_t data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
202 } WAVContext;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
203
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
204 static int wav_write_header(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
205 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
206 WAVContext *wav = s->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
207 ByteIOContext *pb = &s->pb;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
208 offset_t fmt;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
209
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
210 put_tag(pb, "RIFF");
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
211 put_le32(pb, 0); /* file length */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
212 put_tag(pb, "WAVE");
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
213
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
214 /* format header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
215 fmt = start_tag(pb, "fmt ");
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 817
diff changeset
216 if (put_wav_header(pb, s->streams[0]->codec) < 0) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
217 av_free(wav);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
218 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
219 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
220 end_tag(pb, fmt);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
221
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 817
diff changeset
222 av_set_pts_info(s->streams[0], 64, 1, s->streams[0]->codec->sample_rate);
645
9fc2d2cc4608 wav timestamp truncation fix by (Wolfram Gloger <wmglo dent.med.uni-muenchen de>)
michael
parents: 587
diff changeset
223
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
224 /* data header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
225 wav->data = start_tag(pb, "data");
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 874
diff changeset
226
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
227 put_flush_packet(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
228
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
229 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
230 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
231
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 413
diff changeset
232 static int wav_write_packet(AVFormatContext *s, AVPacket *pkt)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
233 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
234 ByteIOContext *pb = &s->pb;
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 413
diff changeset
235 put_buffer(pb, pkt->data, pkt->size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
236 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
237 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
238
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
239 static int wav_write_trailer(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
240 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
241 ByteIOContext *pb = &s->pb;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
242 WAVContext *wav = s->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
243 offset_t file_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
244
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
245 if (!url_is_streamed(&s->pb)) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
246 end_tag(pb, wav->data);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
247
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
248 /* update file size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
249 file_size = url_ftell(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
250 url_fseek(pb, 4, SEEK_SET);
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 0
diff changeset
251 put_le32(pb, (uint32_t)(file_size - 8));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
252 url_fseek(pb, file_size, SEEK_SET);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
253
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
254 put_flush_packet(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
255 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
256 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
257 }
858
66cc656ea404 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
diego
parents: 846
diff changeset
258 #endif //CONFIG_MUXERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
259
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
260 /* return the size of the found tag */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
261 /* XXX: > 2GB ? */
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 0
diff changeset
262 static int find_tag(ByteIOContext *pb, uint32_t tag1)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
263 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
264 unsigned int tag;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
265 int size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
266
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
267 for(;;) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
268 if (url_feof(pb))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
269 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
270 tag = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
271 size = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
272 if (tag == tag1)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
273 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
274 url_fseek(pb, size, SEEK_CUR);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
275 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
276 if (size < 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
277 size = 0x7fffffff;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
278 return size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
279 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
280
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
281 static int wav_probe(AVProbeData *p)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
282 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
283 /* check file header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
284 if (p->buf_size <= 32)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
285 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
286 if (p->buf[0] == 'R' && p->buf[1] == 'I' &&
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
287 p->buf[2] == 'F' && p->buf[3] == 'F' &&
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
288 p->buf[8] == 'W' && p->buf[9] == 'A' &&
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
289 p->buf[10] == 'V' && p->buf[11] == 'E')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
290 return AVPROBE_SCORE_MAX;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
291 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
292 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
293 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
294
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
295 /* wav input */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
296 static int wav_read_header(AVFormatContext *s,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
297 AVFormatParameters *ap)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
298 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
299 int size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
300 unsigned int tag;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
301 ByteIOContext *pb = &s->pb;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
302 AVStream *st;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
303
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
304 /* check RIFF header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
305 tag = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
306
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
307 if (tag != MKTAG('R', 'I', 'F', 'F'))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
308 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
309 get_le32(pb); /* file size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
310 tag = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
311 if (tag != MKTAG('W', 'A', 'V', 'E'))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
312 return -1;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 874
diff changeset
313
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
314 /* parse fmt header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
315 size = find_tag(pb, MKTAG('f', 'm', 't', ' '));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
316 if (size < 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
317 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
318 st = av_new_stream(s, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
319 if (!st)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
320 return AVERROR_NOMEM;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
321
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 817
diff changeset
322 get_wav_header(pb, st->codec, size);
309
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
323 st->need_parsing = 1;
567
23b915bb10f5 set correct timebase
michael
parents: 564
diff changeset
324
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 817
diff changeset
325 av_set_pts_info(st, 64, 1, st->codec->sample_rate);
567
23b915bb10f5 set correct timebase
michael
parents: 564
diff changeset
326
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
327 size = find_tag(pb, MKTAG('d', 'a', 't', 'a'));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
328 if (size < 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
329 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
330 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
331 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
332
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
333 #define MAX_SIZE 4096
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
334
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
335 static int wav_read_packet(AVFormatContext *s,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
336 AVPacket *pkt)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
337 {
309
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
338 int ret, size;
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
339 AVStream *st;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
340
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
341 if (url_feof(&s->pb))
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 468
diff changeset
342 return AVERROR_IO;
309
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
343 st = s->streams[0];
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
344
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
345 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
346 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
347 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
348 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
349 size = (size / st->codec->block_align) * st->codec->block_align;
309
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
350 }
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
351 if (av_new_packet(pkt, size))
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 468
diff changeset
352 return AVERROR_IO;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
353 pkt->stream_index = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
354
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
355 ret = get_buffer(&s->pb, pkt->data, pkt->size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
356 if (ret < 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
357 av_free_packet(pkt);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
358 /* note: we need to modify the packet size here to handle the last
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
359 packet */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
360 pkt->size = ret;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
361 return ret;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
362 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
363
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
364 static int wav_read_close(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
365 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
366 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
367 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
368
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 874
diff changeset
369 static int wav_read_seek(AVFormatContext *s,
558
89bd76208427 100l (forgoten seeking functions)
michael
parents: 550
diff changeset
370 int stream_index, int64_t timestamp, int flags)
309
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
371 {
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
372 AVStream *st;
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
373
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
374 st = s->streams[0];
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 817
diff changeset
375 switch(st->codec->codec_id) {
309
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
376 case CODEC_ID_MP2:
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
377 case CODEC_ID_MP3:
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
378 case CODEC_ID_AC3:
496
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 482
diff changeset
379 case CODEC_ID_DTS:
309
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
380 /* use generic seeking with dynamically generated indexes */
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
381 return -1;
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
382 default:
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
383 break;
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
384 }
558
89bd76208427 100l (forgoten seeking functions)
michael
parents: 550
diff changeset
385 return pcm_read_seek(s, stream_index, timestamp, flags);
309
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
386 }
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
387
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
388
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
389 static AVInputFormat wav_iformat = {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
390 "wav",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
391 "wav format",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
392 0,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
393 wav_probe,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
394 wav_read_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
395 wav_read_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
396 wav_read_close,
309
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
397 wav_read_seek,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
398 };
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
399
858
66cc656ea404 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
diego
parents: 846
diff changeset
400 #ifdef CONFIG_MUXERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
401 static AVOutputFormat wav_oformat = {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
402 "wav",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
403 "wav format",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
404 "audio/x-wav",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
405 "wav",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
406 sizeof(WAVContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
407 CODEC_ID_PCM_S16LE,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
408 CODEC_ID_NONE,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
409 wav_write_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
410 wav_write_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
411 wav_write_trailer,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
412 };
858
66cc656ea404 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
diego
parents: 846
diff changeset
413 #endif //CONFIG_MUXERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
414
384
9479dac25620 fix global name conflicts patch by ("Ronald S. Bultje" <R dot S dot Bultje at students dot uu dot nl>)
michael
parents: 379
diff changeset
415 int ff_wav_init(void)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
416 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
417 av_register_input_format(&wav_iformat);
858
66cc656ea404 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
diego
parents: 846
diff changeset
418 #ifdef CONFIG_MUXERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
419 av_register_output_format(&wav_oformat);
858
66cc656ea404 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
diego
parents: 846
diff changeset
420 #endif //CONFIG_MUXERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
421 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
422 }