-/*
+/*
* WAV encoder and decoder
* Copyright (c) 2001, 2002 Fabrice Bellard.
*
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "avformat.h"
#include "avi.h"
{ CODEC_ID_MP2, 0x50 },
{ CODEC_ID_MP3, 0x55 },
{ CODEC_ID_AC3, 0x2000 },
+ { CODEC_ID_DTS, 0x2001 },
{ CODEC_ID_PCM_S16LE, 0x01 },
{ CODEC_ID_PCM_U8, 0x01 }, /* must come after s16le in this list */
+ { CODEC_ID_PCM_S24LE, 0x01 },
+ { CODEC_ID_PCM_S32LE, 0x01 },
{ CODEC_ID_PCM_ALAW, 0x06 },
{ CODEC_ID_PCM_MULAW, 0x07 },
{ CODEC_ID_ADPCM_MS, 0x02 },
{ CODEC_ID_ADPCM_IMA_WAV, 0x11 },
+ { CODEC_ID_ADPCM_YAMAHA, 0x20 },
{ CODEC_ID_ADPCM_G726, 0x45 },
{ CODEC_ID_ADPCM_IMA_DK4, 0x61 }, /* rogue format number */
{ CODEC_ID_ADPCM_IMA_DK3, 0x62 }, /* rogue format number */
{ CODEC_ID_VORBIS, ('V'<<8)+'o' }, //HACK/FIXME, does vorbis in WAV/AVI have an (in)official id?
{ CODEC_ID_SONIC, 0x2048 },
{ CODEC_ID_SONIC_LS, 0x2048 },
+ { CODEC_ID_ADPCM_CT, 0x200 },
+ { CODEC_ID_ADPCM_SWF, ('S'<<8)+'F' },
+ { CODEC_ID_TRUESPEECH, 0x22 },
{ 0, 0 },
};
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
/* WAVEFORMATEX header */
/* returns the size or -1 on error */
int put_wav_header(ByteIOContext *pb, AVCodecContext *enc)
bps = 8;
} else if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3) {
bps = 0;
- } else if (enc->codec_id == CODEC_ID_ADPCM_IMA_WAV || enc->codec_id == CODEC_ID_ADPCM_MS) {
+ } 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) { //
bps = 4;
+ } else if (enc->codec_id == CODEC_ID_PCM_S24LE) {
+ bps = 24;
+ } else if (enc->codec_id == CODEC_ID_PCM_S32LE) {
+ bps = 32;
} else {
bps = 16;
}
-
+
if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3) {
- blkalign = 1;
+ blkalign = enc->frame_size; //this is wrong, but seems many demuxers dont work if this is set correctly
//blkalign = 144 * enc->bit_rate/enc->sample_rate;
+ } else if (enc->codec_id == CODEC_ID_ADPCM_G726) { //
+ blkalign = 1;
} else if (enc->block_align != 0) { /* specified by the codec */
blkalign = enc->block_align;
} else
blkalign = enc->channels*bps >> 3;
if (enc->codec_id == CODEC_ID_PCM_U8 ||
+ enc->codec_id == CODEC_ID_PCM_S24LE ||
+ enc->codec_id == CODEC_ID_PCM_S32LE ||
enc->codec_id == CODEC_ID_PCM_S16LE) {
bytespersec = enc->sample_rate * blkalign;
} else {
return hdrsize;
}
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
/* We could be given one of the three possible structures here:
* WAVEFORMAT, PCMWAVEFORMAT or WAVEFORMATEX. Each structure
* WAVEFORMATEX adds 'WORD cbSize' and basically makes itself
* an openended structure.
*/
-void get_wav_header(ByteIOContext *pb, AVCodecContext *codec, int size)
+void get_wav_header(ByteIOContext *pb, AVCodecContext *codec, int size)
{
int id;
}else
codec->bits_per_sample = get_le16(pb);
codec->codec_id = wav_codec_get_id(id, codec->bits_per_sample);
-
+
if (size > 16) { /* We're obviously dealing with WAVEFORMATEX */
- codec->extradata_size = get_le16(pb);
- if (codec->extradata_size > 0) {
- if (codec->extradata_size > size - 18)
- codec->extradata_size = size - 18;
- codec->extradata = av_mallocz(codec->extradata_size);
+ codec->extradata_size = get_le16(pb);
+ if (codec->extradata_size > 0) {
+ if (codec->extradata_size > size - 18)
+ codec->extradata_size = size - 18;
+ codec->extradata = av_mallocz(codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
get_buffer(pb, codec->extradata, codec->extradata_size);
} else
- codec->extradata_size = 0;
-
- /* It is possible for the chunk to contain garbage at the end */
- if (size - codec->extradata_size - 18 > 0)
- url_fskip(pb, size - codec->extradata_size - 18);
+ codec->extradata_size = 0;
+
+ /* It is possible for the chunk to contain garbage at the end */
+ if (size - codec->extradata_size - 18 > 0)
+ url_fskip(pb, size - codec->extradata_size - 18);
}
}
/* handle specific u8 codec */
if (id == CODEC_ID_PCM_S16LE && bps == 8)
id = CODEC_ID_PCM_U8;
+ if (id == CODEC_ID_PCM_S16LE && bps == 24)
+ id = CODEC_ID_PCM_S24LE;
+ if (id == CODEC_ID_PCM_S16LE && bps == 32)
+ id = CODEC_ID_PCM_S32LE;
return id;
}
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
typedef struct {
offset_t data;
} WAVContext;
/* format header */
fmt = start_tag(pb, "fmt ");
- if (put_wav_header(pb, &s->streams[0]->codec) < 0) {
+ if (put_wav_header(pb, s->streams[0]->codec) < 0) {
av_free(wav);
return -1;
}
end_tag(pb, fmt);
+ av_set_pts_info(s->streams[0], 64, 1, s->streams[0]->codec->sample_rate);
+
/* data header */
wav->data = start_tag(pb, "data");
-
+
put_flush_packet(pb);
return 0;
}
return 0;
}
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
/* return the size of the found tag */
/* XXX: > 2GB ? */
tag = get_le32(pb);
if (tag != MKTAG('W', 'A', 'V', 'E'))
return -1;
-
+
/* parse fmt header */
size = find_tag(pb, MKTAG('f', 'm', 't', ' '));
if (size < 0)
if (!st)
return AVERROR_NOMEM;
- get_wav_header(pb, &st->codec, size);
+ get_wav_header(pb, st->codec, size);
st->need_parsing = 1;
-
+
+ av_set_pts_info(st, 64, 1, st->codec->sample_rate);
+
size = find_tag(pb, MKTAG('d', 'a', 't', 'a'));
if (size < 0)
return -1;
st = s->streams[0];
size = MAX_SIZE;
- if (st->codec.block_align > 1) {
- if (size < st->codec.block_align)
- size = st->codec.block_align;
- size = (size / st->codec.block_align) * st->codec.block_align;
+ if (st->codec->block_align > 1) {
+ if (size < st->codec->block_align)
+ size = st->codec->block_align;
+ size = (size / st->codec->block_align) * st->codec->block_align;
}
if (av_new_packet(pkt, size))
return AVERROR_IO;
return 0;
}
-static int wav_read_seek(AVFormatContext *s,
- int stream_index, int64_t timestamp)
+static int wav_read_seek(AVFormatContext *s,
+ int stream_index, int64_t timestamp, int flags)
{
AVStream *st;
st = s->streams[0];
- switch(st->codec.codec_id) {
+ switch(st->codec->codec_id) {
case CODEC_ID_MP2:
case CODEC_ID_MP3:
case CODEC_ID_AC3:
default:
break;
}
- return pcm_read_seek(s, stream_index, timestamp);
+ return pcm_read_seek(s, stream_index, timestamp, flags);
}
wav_read_seek,
};
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
static AVOutputFormat wav_oformat = {
"wav",
"wav format",
wav_write_packet,
wav_write_trailer,
};
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
int ff_wav_init(void)
{
av_register_input_format(&wav_iformat);
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
av_register_output_format(&wav_oformat);
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
return 0;
}
projects / ffmpeg / blobdiff