/**
* SoX native format demuxer
- * @file libavformat/soxdec.c
+ * @file
* @author Daniel Verkamp
* @sa http://wiki.multimedia.cx/index.php?title=SoX_native_intermediate_format
*/
#include "libavutil/intreadwrite.h"
#include "avformat.h"
-#include "raw.h"
+#include "pcm.h"
#include "sox.h"
static int sox_probe(AVProbeData *p)
static int sox_read_header(AVFormatContext *s,
AVFormatParameters *ap)
{
- ByteIOContext *pb = s->pb;
+ AVIOContext *pb = s->pb;
unsigned header_size, comment_size;
double sample_rate, sample_rate_frac;
AVStream *st;
if (!st)
return AVERROR(ENOMEM);
- st->codec->codec_type = CODEC_TYPE_AUDIO;
+ st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
- if (get_le32(pb) == SOX_TAG) {
+ if (avio_rl32(pb) == SOX_TAG) {
st->codec->codec_id = CODEC_ID_PCM_S32LE;
- header_size = get_le32(pb);
+ header_size = avio_rl32(pb);
url_fskip(pb, 8); /* sample count */
- sample_rate = av_int2dbl(get_le64(pb));
- st->codec->channels = get_le32(pb);
- comment_size = get_le32(pb);
+ sample_rate = av_int2dbl(avio_rl64(pb));
+ st->codec->channels = avio_rl32(pb);
+ comment_size = avio_rl32(pb);
} else {
st->codec->codec_id = CODEC_ID_PCM_S32BE;
- header_size = get_be32(pb);
+ header_size = avio_rb32(pb);
url_fskip(pb, 8); /* sample count */
- sample_rate = av_int2dbl(get_be64(pb));
- st->codec->channels = get_be32(pb);
- comment_size = get_be32(pb);
+ sample_rate = av_int2dbl(avio_rb64(pb));
+ st->codec->channels = avio_rb32(pb);
+ comment_size = avio_rb32(pb);
}
if (comment_size > 0xFFFFFFFFU - SOX_FIXED_HDR - 4U) {
return -1;
}
- if (comment_size &&
- comment_size + FF_INPUT_BUFFER_PADDING_SIZE >= comment_size) {
- char *comment = av_mallocz(comment_size + FF_INPUT_BUFFER_PADDING_SIZE);
- if (get_buffer(pb, comment, comment_size) != comment_size) {
+ if (comment_size && comment_size < UINT_MAX) {
+ char *comment = av_malloc(comment_size+1);
+ if (avio_read(pb, comment, comment_size) != comment_size) {
av_freep(&comment);
- return AVERROR_IO;
+ return AVERROR(EIO);
}
- av_metadata_set(&s->metadata, "comment", comment);
- av_freep(&comment);
+ comment[comment_size] = 0;
+
+ av_metadata_set2(&s->metadata, "comment", comment,
+ AV_METADATA_DONT_STRDUP_VAL);
}
url_fskip(pb, header_size - SOX_FIXED_HDR - comment_size);
st->codec->sample_rate = sample_rate;
- st->codec->sample_fmt = SAMPLE_FMT_S32;
st->codec->bits_per_coded_sample = 32;
st->codec->bit_rate = st->codec->sample_rate *
st->codec->bits_per_coded_sample *
st->codec->channels;
+ st->codec->block_align = st->codec->bits_per_coded_sample *
+ st->codec->channels / 8;
av_set_pts_info(st, 64, 1, st->codec->sample_rate);
return 0;
}
-#define MAX_SIZE 4096
+#define SOX_SAMPLES 1024
static int sox_read_packet(AVFormatContext *s,
AVPacket *pkt)
{
- int ret;
+ int ret, size;
if (url_feof(s->pb))
return AVERROR_EOF;
- ret = av_get_packet(s->pb, pkt, MAX_SIZE);
+ size = SOX_SAMPLES*s->streams[0]->codec->block_align;
+ ret = av_get_packet(s->pb, pkt, size);
if (ret < 0)
return AVERROR(EIO);
pkt->stream_index = 0;
return 0;
}
-AVInputFormat sox_demuxer = {
+AVInputFormat ff_sox_demuxer = {
"sox",
NULL_IF_CONFIG_SMALL("SoX native format"),
0,