* Based on libSoX sox-fmt.c
* Copyright (c) 2008 robs@users.sourceforge.net
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
- * SoX native format demuxer
* @file
+ * SoX native format demuxer
* @author Daniel Verkamp
- * @sa http://wiki.multimedia.cx/index.php?title=SoX_native_intermediate_format
+ * @see http://wiki.multimedia.cx/index.php?title=SoX_native_intermediate_format
*/
#include "libavutil/intreadwrite.h"
+#include "libavutil/intfloat.h"
+#include "libavutil/dict.h"
#include "avformat.h"
+#include "internal.h"
#include "pcm.h"
#include "sox.h"
return 0;
}
-static int sox_read_header(AVFormatContext *s,
- AVFormatParameters *ap)
+static int sox_read_header(AVFormatContext *s)
{
AVIOContext *pb = s->pb;
unsigned header_size, comment_size;
double sample_rate, sample_rate_frac;
AVStream *st;
- st = av_new_stream(s, 0);
+ st = avformat_new_stream(s, NULL);
if (!st)
return AVERROR(ENOMEM);
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
if (avio_rl32(pb) == SOX_TAG) {
- st->codec->codec_id = CODEC_ID_PCM_S32LE;
+ st->codec->codec_id = AV_CODEC_ID_PCM_S32LE;
header_size = avio_rl32(pb);
- avio_seek(pb, 8, SEEK_CUR); /* sample count */
- sample_rate = av_int2dbl(avio_rl64(pb));
+ avio_skip(pb, 8); /* sample count */
+ sample_rate = av_int2double(avio_rl64(pb));
st->codec->channels = avio_rl32(pb);
comment_size = avio_rl32(pb);
} else {
- st->codec->codec_id = CODEC_ID_PCM_S32BE;
+ st->codec->codec_id = AV_CODEC_ID_PCM_S32BE;
header_size = avio_rb32(pb);
- avio_seek(pb, 8, SEEK_CUR); /* sample count */
- sample_rate = av_int2dbl(avio_rb64(pb));
+ avio_skip(pb, 8); /* sample count */
+ sample_rate = av_int2double(avio_rb64(pb));
st->codec->channels = avio_rb32(pb);
comment_size = avio_rb32(pb);
}
}
comment[comment_size] = 0;
- av_metadata_set2(&s->metadata, "comment", comment,
- AV_METADATA_DONT_STRDUP_VAL);
+ av_dict_set(&s->metadata, "comment", comment,
+ AV_DICT_DONT_STRDUP_VAL);
}
- avio_seek(pb, header_size - SOX_FIXED_HDR - comment_size, SEEK_CUR);
+ avio_skip(pb, header_size - SOX_FIXED_HDR - comment_size);
st->codec->sample_rate = sample_rate;
st->codec->bits_per_coded_sample = 32;
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);
+ avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
return 0;
}
}
AVInputFormat ff_sox_demuxer = {
- "sox",
- NULL_IF_CONFIG_SMALL("SoX native format"),
- 0,
- sox_probe,
- sox_read_header,
- sox_read_packet,
- NULL,
- pcm_read_seek,
+ .name = "sox",
+ .long_name = NULL_IF_CONFIG_SMALL("SoX native"),
+ .read_probe = sox_probe,
+ .read_header = sox_read_header,
+ .read_packet = sox_read_packet,
+ .read_seek = ff_pcm_read_seek,
};