annotate wav.c @ 1169:d18cc9a1fd02 libavformat

allow individual selection of muxers and demuxers
author mru
date Mon, 10 Jul 2006 21:14:37 +0000
parents d89d7ef290da
children 6a5e58d2114b
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"
1142
e3a585883bbd Move initialisations and internal symbols in allformats.h,
gpoirier
parents: 1136
diff changeset
20 #include "allformats.h"
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
21 #include "avi.h"
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
22
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
23 const CodecTag codec_wav_tags[] = {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
24 { CODEC_ID_MP2, 0x50 },
232
eb90c0a5a1ba CODEC_ID_MP3LAME is obsolete
bellard
parents: 226
diff changeset
25 { CODEC_ID_MP3, 0x55 },
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
26 { 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
27 { CODEC_ID_DTS, 0x2001 },
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
28 { CODEC_ID_PCM_S16LE, 0x01 },
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
29 { 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
30 { 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
31 { CODEC_ID_PCM_S32LE, 0x01 },
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
32 { CODEC_ID_PCM_ALAW, 0x06 },
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
33 { CODEC_ID_PCM_MULAW, 0x07 },
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
34 { CODEC_ID_ADPCM_MS, 0x02 },
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
35 { CODEC_ID_ADPCM_IMA_WAV, 0x11 },
817
8e9c4e5d157b Yamaha ADPCM in wav patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 713
diff changeset
36 { CODEC_ID_ADPCM_YAMAHA, 0x20 },
362
07bf7ff87eb3 * Initial implementation of the G.726 ADPCM audio codec.
romansh
parents: 309
diff changeset
37 { CODEC_ID_ADPCM_G726, 0x45 },
226
d55e4b761e24 support for Duck DK3 and DK4 ADPCM
tmmm
parents: 196
diff changeset
38 { CODEC_ID_ADPCM_IMA_DK4, 0x61 }, /* rogue format number */
d55e4b761e24 support for Duck DK3 and DK4 ADPCM
tmmm
parents: 196
diff changeset
39 { CODEC_ID_ADPCM_IMA_DK3, 0x62 }, /* rogue format number */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
40 { CODEC_ID_WMAV1, 0x160 },
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
41 { 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
42 { 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
43 { 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
44 { CODEC_ID_SONIC, 0x2048 },
543990301444 unofficial ids for sonic for using in nut (fixme)
alex
parents: 496
diff changeset
45 { CODEC_ID_SONIC_LS, 0x2048 },
561
d5925f47058d Creative ADPCM decoder, format 0x200, courtesy of Konstantin Shishkov
melanson
parents: 558
diff changeset
46 { CODEC_ID_ADPCM_CT, 0x200 },
685
4b339414d338 pseudo codec tag for adpcm_swf
alex
parents: 645
diff changeset
47 { CODEC_ID_ADPCM_SWF, ('S'<<8)+'F' },
893
1a50f1735214 TrueSpeech compatible audio decoder by Konstantin Shishkov
diego
parents: 887
diff changeset
48 { CODEC_ID_TRUESPEECH, 0x22 },
1044
3aeb079a7e74 NuppelVideo/MythTVVideo support, including rtjpeg decoder
reimar
parents: 896
diff changeset
49
3aeb079a7e74 NuppelVideo/MythTVVideo support, including rtjpeg decoder
reimar
parents: 896
diff changeset
50 // for NuppelVideo (nuv.c)
3aeb079a7e74 NuppelVideo/MythTVVideo support, including rtjpeg decoder
reimar
parents: 896
diff changeset
51 { CODEC_ID_PCM_S16LE, MKTAG('R', 'A', 'W', 'A') },
3aeb079a7e74 NuppelVideo/MythTVVideo support, including rtjpeg decoder
reimar
parents: 896
diff changeset
52 { CODEC_ID_MP3, MKTAG('L', 'A', 'M', 'E') },
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
53 { 0, 0 },
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
54 };
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
55
858
66cc656ea404 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
diego
parents: 846
diff changeset
56 #ifdef CONFIG_MUXERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
57 /* WAVEFORMATEX header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
58 /* returns the size or -1 on error */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
59 int put_wav_header(ByteIOContext *pb, AVCodecContext *enc)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
60 {
196
01bec1059bdf use codec_tag for encoding too
michaelni
parents: 87
diff changeset
61 int bps, blkalign, bytespersec;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
62 int hdrsize = 18;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
63
1122
f8ee5a4b576e use standard codec tag if the specified tag is out of range and would be
mru
parents: 1044
diff changeset
64 if(!enc->codec_tag || enc->codec_tag > 0xffff)
196
01bec1059bdf use codec_tag for encoding too
michaelni
parents: 87
diff changeset
65 enc->codec_tag = codec_get_tag(codec_wav_tags, enc->codec_id);
01bec1059bdf use codec_tag for encoding too
michaelni
parents: 87
diff changeset
66 if(!enc->codec_tag)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
67 return -1;
196
01bec1059bdf use codec_tag for encoding too
michaelni
parents: 87
diff changeset
68
01bec1059bdf use codec_tag for encoding too
michaelni
parents: 87
diff changeset
69 put_le16(pb, enc->codec_tag);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
70 put_le16(pb, enc->channels);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
71 put_le32(pb, enc->sample_rate);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
72 if (enc->codec_id == CODEC_ID_PCM_U8 ||
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
73 enc->codec_id == CODEC_ID_PCM_ALAW ||
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
74 enc->codec_id == CODEC_ID_PCM_MULAW) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
75 bps = 8;
232
eb90c0a5a1ba CODEC_ID_MP3LAME is obsolete
bellard
parents: 226
diff changeset
76 } else if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
77 bps = 0;
817
8e9c4e5d157b Yamaha ADPCM in wav patch by (Vidar Madsen: vidarino, gmail com)
michael
parents: 713
diff changeset
78 } 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
79 bps = 4;
846
fd1c2109505e Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents: 820
diff changeset
80 } 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
81 bps = 24;
fd1c2109505e Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents: 820
diff changeset
82 } 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
83 bps = 32;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
84 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
85 bps = 16;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
86 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 874
diff changeset
87
232
eb90c0a5a1ba CODEC_ID_MP3LAME is obsolete
bellard
parents: 226
diff changeset
88 if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3) {
577
f8edb92d97b6 cbr audio muxing fix
michael
parents: 570
diff changeset
89 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
90 //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
91 } 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
92 blkalign = 1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
93 } else if (enc->block_align != 0) { /* specified by the codec */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
94 blkalign = enc->block_align;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
95 } else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
96 blkalign = enc->channels*bps >> 3;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
97 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
98 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
99 enc->codec_id == CODEC_ID_PCM_S32LE ||
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
100 enc->codec_id == CODEC_ID_PCM_S16LE) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
101 bytespersec = enc->sample_rate * blkalign;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
102 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
103 bytespersec = enc->bit_rate / 8;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
104 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
105 put_le32(pb, bytespersec); /* bytes per second */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
106 put_le16(pb, blkalign); /* block align */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
107 put_le16(pb, bps); /* bits per sample */
232
eb90c0a5a1ba CODEC_ID_MP3LAME is obsolete
bellard
parents: 226
diff changeset
108 if (enc->codec_id == CODEC_ID_MP3) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
109 put_le16(pb, 12); /* wav_extra_size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
110 hdrsize += 12;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
111 put_le16(pb, 1); /* wID */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
112 put_le32(pb, 2); /* fdwFlags */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
113 put_le16(pb, 1152); /* nBlockSize */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
114 put_le16(pb, 1); /* nFramesPerBlock */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
115 put_le16(pb, 1393); /* nCodecDelay */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
116 } else if (enc->codec_id == CODEC_ID_MP2) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
117 put_le16(pb, 22); /* wav_extra_size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
118 hdrsize += 22;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
119 put_le16(pb, 2); /* fwHeadLayer */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
120 put_le32(pb, enc->bit_rate); /* dwHeadBitrate */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
121 put_le16(pb, enc->channels == 2 ? 1 : 8); /* fwHeadMode */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
122 put_le16(pb, 0); /* fwHeadModeExt */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
123 put_le16(pb, 1); /* wHeadEmphasis */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
124 put_le16(pb, 16); /* fwHeadFlags */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
125 put_le32(pb, 0); /* dwPTSLow */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
126 put_le32(pb, 0); /* dwPTSHigh */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
127 } else if (enc->codec_id == CODEC_ID_ADPCM_IMA_WAV) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
128 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
129 hdrsize += 2;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
130 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
131 } else if(enc->extradata_size){
412
459df3ed379e store extradata, vorbis in avi works now, dont expect av sync though
michael
parents: 411
diff changeset
132 put_le16(pb, enc->extradata_size);
459df3ed379e store extradata, vorbis in avi works now, dont expect av sync though
michael
parents: 411
diff changeset
133 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
134 hdrsize += enc->extradata_size;
413
michael
parents: 412
diff changeset
135 if(hdrsize&1){
michael
parents: 412
diff changeset
136 hdrsize++;
michael
parents: 412
diff changeset
137 put_byte(pb, 0);
michael
parents: 412
diff changeset
138 }
529
0b867ba59753 write shorter headers if possible
michael
parents: 517
diff changeset
139 } else {
0b867ba59753 write shorter headers if possible
michael
parents: 517
diff changeset
140 hdrsize -= 2;
412
459df3ed379e store extradata, vorbis in avi works now, dont expect av sync though
michael
parents: 411
diff changeset
141 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
142
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
143 return hdrsize;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
144 }
858
66cc656ea404 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
diego
parents: 846
diff changeset
145 #endif //CONFIG_MUXERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
146
84
0068a6902911 correct AUDIO strf parsing patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 74
diff changeset
147 /* 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
148 * 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
149 * 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
150 * 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
151 * 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
152 * an openended structure.
0068a6902911 correct AUDIO strf parsing patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 74
diff changeset
153 */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 874
diff changeset
154 void get_wav_header(ByteIOContext *pb, AVCodecContext *codec, int size)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
155 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
156 int id;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
157
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
158 id = get_le16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
159 codec->codec_type = CODEC_TYPE_AUDIO;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
160 codec->codec_tag = id;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
161 codec->channels = get_le16(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
162 codec->sample_rate = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
163 codec->bit_rate = get_le32(pb) * 8;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
164 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
165 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
166 codec->bits_per_sample = 8;
87
b43e201588dc sorry forgot
michaelni
parents: 84
diff changeset
167 }else
b43e201588dc sorry forgot
michaelni
parents: 84
diff changeset
168 codec->bits_per_sample = get_le16(pb);
b43e201588dc sorry forgot
michaelni
parents: 84
diff changeset
169 codec->codec_id = wav_codec_get_id(id, codec->bits_per_sample);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 874
diff changeset
170
84
0068a6902911 correct AUDIO strf parsing patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 74
diff changeset
171 if (size > 16) { /* We're obviously dealing with WAVEFORMATEX */
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
172 codec->extradata_size = get_le16(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
173 if (codec->extradata_size > 0) {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
174 if (codec->extradata_size > size - 18)
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
175 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
176 codec->extradata = av_mallocz(codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
177 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
178 } else
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
179 codec->extradata_size = 0;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 874
diff changeset
180
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
181 /* It is possible for the chunk to contain garbage at the end */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
182 if (size - codec->extradata_size - 18 > 0)
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
183 url_fskip(pb, size - codec->extradata_size - 18);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
184 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
185 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
186
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
187
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
188 int wav_codec_get_id(unsigned int tag, int bps)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
189 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
190 int id;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
191 id = codec_get_id(codec_wav_tags, tag);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
192 if (id <= 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
193 return id;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
194 /* handle specific u8 codec */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
195 if (id == CODEC_ID_PCM_S16LE && bps == 8)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
196 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
197 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
198 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
199 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
200 id = CODEC_ID_PCM_S32LE;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
201 return id;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
202 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
203
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
204 typedef struct {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
205 offset_t data;
1136
d65cd7c3573e dont read over the end of a data chunk and at the end search for the next
michael
parents: 1122
diff changeset
206 offset_t data_end;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
207 } WAVContext;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
208
1149
02e10bcc0e0d Fix compilation with --disable-muxers.
diego
parents: 1142
diff changeset
209 #ifdef CONFIG_MUXERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
210 static int wav_write_header(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
211 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
212 WAVContext *wav = s->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
213 ByteIOContext *pb = &s->pb;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
214 offset_t fmt;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
215
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
216 put_tag(pb, "RIFF");
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
217 put_le32(pb, 0); /* file length */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
218 put_tag(pb, "WAVE");
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
219
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
220 /* format header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
221 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
222 if (put_wav_header(pb, s->streams[0]->codec) < 0) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
223 av_free(wav);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
224 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
225 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
226 end_tag(pb, fmt);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
227
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 817
diff changeset
228 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
229
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
230 /* data header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
231 wav->data = start_tag(pb, "data");
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 874
diff changeset
232
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
233 put_flush_packet(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
234
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
235 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
236 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
237
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 413
diff changeset
238 static int wav_write_packet(AVFormatContext *s, AVPacket *pkt)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
239 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
240 ByteIOContext *pb = &s->pb;
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 413
diff changeset
241 put_buffer(pb, pkt->data, pkt->size);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
242 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
243 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
244
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
245 static int wav_write_trailer(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
246 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
247 ByteIOContext *pb = &s->pb;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
248 WAVContext *wav = s->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
249 offset_t file_size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
250
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
251 if (!url_is_streamed(&s->pb)) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
252 end_tag(pb, wav->data);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
253
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
254 /* update file size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
255 file_size = url_ftell(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
256 url_fseek(pb, 4, SEEK_SET);
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 0
diff changeset
257 put_le32(pb, (uint32_t)(file_size - 8));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
258 url_fseek(pb, file_size, SEEK_SET);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
259
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
260 put_flush_packet(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
261 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
262 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
263 }
858
66cc656ea404 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
diego
parents: 846
diff changeset
264 #endif //CONFIG_MUXERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
265
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
266 /* return the size of the found tag */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
267 /* XXX: > 2GB ? */
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 0
diff changeset
268 static int find_tag(ByteIOContext *pb, uint32_t tag1)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
269 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
270 unsigned int tag;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
271 int size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
272
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
273 for(;;) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
274 if (url_feof(pb))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
275 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
276 tag = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
277 size = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
278 if (tag == tag1)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
279 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
280 url_fseek(pb, size, SEEK_CUR);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
281 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
282 if (size < 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
283 size = 0x7fffffff;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
284 return size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
285 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
286
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
287 static int wav_probe(AVProbeData *p)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
288 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
289 /* check file header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
290 if (p->buf_size <= 32)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
291 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
292 if (p->buf[0] == 'R' && p->buf[1] == 'I' &&
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
293 p->buf[2] == 'F' && p->buf[3] == 'F' &&
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
294 p->buf[8] == 'W' && p->buf[9] == 'A' &&
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
295 p->buf[10] == 'V' && p->buf[11] == 'E')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
296 return AVPROBE_SCORE_MAX;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
297 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
298 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
299 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
300
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
301 /* wav input */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
302 static int wav_read_header(AVFormatContext *s,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
303 AVFormatParameters *ap)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
304 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
305 int size;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
306 unsigned int tag;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
307 ByteIOContext *pb = &s->pb;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
308 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
309 WAVContext *wav = s->priv_data;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
310
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
311 /* check RIFF header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
312 tag = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
313
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
314 if (tag != MKTAG('R', 'I', 'F', 'F'))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
315 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
316 get_le32(pb); /* file size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
317 tag = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
318 if (tag != MKTAG('W', 'A', 'V', 'E'))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
319 return -1;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 874
diff changeset
320
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
321 /* parse fmt header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
322 size = find_tag(pb, MKTAG('f', 'm', 't', ' '));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
323 if (size < 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
324 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
325 st = av_new_stream(s, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
326 if (!st)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
327 return AVERROR_NOMEM;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
328
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 817
diff changeset
329 get_wav_header(pb, st->codec, size);
309
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
330 st->need_parsing = 1;
567
23b915bb10f5 set correct timebase
michael
parents: 564
diff changeset
331
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 817
diff changeset
332 av_set_pts_info(st, 64, 1, st->codec->sample_rate);
567
23b915bb10f5 set correct timebase
michael
parents: 564
diff changeset
333
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
334 size = find_tag(pb, MKTAG('d', 'a', 't', 'a'));
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
335 if (size < 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
336 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
337 wav->data_end= url_ftell(pb) + size;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
338 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
339 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
340
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
341 #define MAX_SIZE 4096
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
342
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
343 static int wav_read_packet(AVFormatContext *s,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
344 AVPacket *pkt)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
345 {
1136
d65cd7c3573e dont read over the end of a data chunk and at the end search for the next
michael
parents: 1122
diff changeset
346 int ret, size, left;
309
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
347 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
348 WAVContext *wav = s->priv_data;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
349
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
350 if (url_feof(&s->pb))
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 468
diff changeset
351 return AVERROR_IO;
309
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
352 st = s->streams[0];
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
353
1136
d65cd7c3573e dont read over the end of a data chunk and at the end search for the next
michael
parents: 1122
diff changeset
354 left= wav->data_end - url_ftell(&s->pb);
d65cd7c3573e dont read over the end of a data chunk and at the end search for the next
michael
parents: 1122
diff changeset
355 if(left <= 0){
d65cd7c3573e dont read over the end of a data chunk and at the end search for the next
michael
parents: 1122
diff changeset
356 left = find_tag(&(s->pb), MKTAG('d', 'a', 't', 'a'));
d65cd7c3573e dont read over the end of a data chunk and at the end search for the next
michael
parents: 1122
diff changeset
357 if (left < 0) {
d65cd7c3573e dont read over the end of a data chunk and at the end search for the next
michael
parents: 1122
diff changeset
358 return AVERROR_IO;
d65cd7c3573e dont read over the end of a data chunk and at the end search for the next
michael
parents: 1122
diff changeset
359 }
d65cd7c3573e dont read over the end of a data chunk and at the end search for the next
michael
parents: 1122
diff changeset
360 wav->data_end= url_ftell(&s->pb) + left;
d65cd7c3573e dont read over the end of a data chunk and at the end search for the next
michael
parents: 1122
diff changeset
361 }
d65cd7c3573e dont read over the end of a data chunk and at the end search for the next
michael
parents: 1122
diff changeset
362
309
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
363 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
364 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
365 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
366 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
367 size = (size / st->codec->block_align) * st->codec->block_align;
309
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
368 }
1136
d65cd7c3573e dont read over the end of a data chunk and at the end search for the next
michael
parents: 1122
diff changeset
369 size= FFMIN(size, left);
309
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
370 if (av_new_packet(pkt, size))
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 468
diff changeset
371 return AVERROR_IO;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
372 pkt->stream_index = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
373
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
374 ret = get_buffer(&s->pb, pkt->data, pkt->size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
375 if (ret < 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
376 av_free_packet(pkt);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
377 /* note: we need to modify the packet size here to handle the last
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
378 packet */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
379 pkt->size = ret;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
380 return ret;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
381 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
382
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
383 static int wav_read_close(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
384 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
385 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
386 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
387
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 874
diff changeset
388 static int wav_read_seek(AVFormatContext *s,
558
89bd76208427 100l (forgoten seeking functions)
michael
parents: 550
diff changeset
389 int stream_index, int64_t timestamp, int flags)
309
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
390 {
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
391 AVStream *st;
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
392
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
393 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
394 switch(st->codec->codec_id) {
309
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
395 case CODEC_ID_MP2:
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
396 case CODEC_ID_MP3:
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
397 case CODEC_ID_AC3:
496
112057e05179 libdts support by (Benjamin Zores <ben at geexbox dot org>)
michael
parents: 482
diff changeset
398 case CODEC_ID_DTS:
309
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
399 /* use generic seeking with dynamically generated indexes */
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
400 return -1;
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
401 default:
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
402 break;
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
403 }
558
89bd76208427 100l (forgoten seeking functions)
michael
parents: 550
diff changeset
404 return pcm_read_seek(s, stream_index, timestamp, flags);
309
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
405 }
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
406
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
407 #ifdef CONFIG_WAV_DEMUXER
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
408 AVInputFormat wav_demuxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
409 "wav",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
410 "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
411 sizeof(WAVContext),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
412 wav_probe,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
413 wav_read_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
414 wav_read_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
415 wav_read_close,
309
6c9fddf8458c seeking support - fixed some ADPCM decoding cases
bellard
parents: 277
diff changeset
416 wav_read_seek,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
417 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
418 #endif
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
419 #ifdef CONFIG_WAV_MUXER
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
420 AVOutputFormat wav_muxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
421 "wav",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
422 "wav format",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
423 "audio/x-wav",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
424 "wav",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
425 sizeof(WAVContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
426 CODEC_ID_PCM_S16LE,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
427 CODEC_ID_NONE,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
428 wav_write_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
429 wav_write_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
430 wav_write_trailer,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
431 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
432 #endif