*/
#include "avformat.h"
-#include "rawdec.h"
+#include "internal.h"
#include "pcm.h"
#include "libavutil/log.h"
#include "libavutil/opt.h"
#define RAW_SAMPLES 1024
-static int raw_read_packet(AVFormatContext *s, AVPacket *pkt)
+typedef struct PCMAudioDemuxerContext {
+ AVClass *class;
+ int sample_rate;
+ int channels;
+} PCMAudioDemuxerContext;
+
+static int pcm_read_header(AVFormatContext *s)
+{
+ PCMAudioDemuxerContext *s1 = s->priv_data;
+ AVStream *st;
+
+ st = avformat_new_stream(s, NULL);
+ if (!st)
+ return AVERROR(ENOMEM);
+
+
+ st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
+ st->codecpar->codec_id = s->iformat->raw_codec_id;
+ st->codecpar->sample_rate = s1->sample_rate;
+ st->codecpar->channels = s1->channels;
+
+ st->codecpar->bits_per_coded_sample =
+ av_get_bits_per_sample(st->codecpar->codec_id);
+
+ assert(st->codecpar->bits_per_coded_sample > 0);
+
+ st->codecpar->block_align =
+ st->codecpar->bits_per_coded_sample * st->codecpar->channels / 8;
+
+ avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
+ return 0;
+}
+
+static int pcm_read_packet(AVFormatContext *s, AVPacket *pkt)
{
int ret, size, bps;
// AVStream *st = s->streams[0];
- size= RAW_SAMPLES*s->streams[0]->codec->block_align;
+ size= RAW_SAMPLES*s->streams[0]->codecpar->block_align;
ret= av_get_packet(s->pb, pkt, size);
if (ret < 0)
return ret;
- bps= av_get_bits_per_sample(s->streams[0]->codec->codec_id);
- assert(bps); // if false there IS a bug elsewhere (NOT in this function)
+ bps= av_get_bits_per_sample(s->streams[0]->codecpar->codec_id);
+ if (!bps) {
+ av_log(s, AV_LOG_ERROR, "Unknown number of bytes per sample.\n");
+ return AVERROR(EINVAL);
+ }
+
pkt->dts=
- pkt->pts= pkt->pos*8 / (bps * s->streams[0]->codec->channels);
+ pkt->pts= pkt->pos*8 / (bps * s->streams[0]->codecpar->channels);
return ret;
}
static const AVOption pcm_options[] = {
- { "sample_rate", "", offsetof(RawAudioDemuxerContext, sample_rate), FF_OPT_TYPE_INT, {.dbl = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
- { "channels", "", offsetof(RawAudioDemuxerContext, channels), FF_OPT_TYPE_INT, {.dbl = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
+ { "sample_rate", "", offsetof(PCMAudioDemuxerContext, sample_rate), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
+ { "channels", "", offsetof(PCMAudioDemuxerContext, channels), AV_OPT_TYPE_INT, {.i64 = 1}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
{ NULL },
};
-#define PCMDEF(name, long_name, ext, codec) \
-static const AVClass name ## _demuxer_class = {\
- .class_name = #name " demuxer",\
- .item_name = av_default_item_name,\
- .option = pcm_options,\
- .version = LIBAVUTIL_VERSION_INT,\
-};\
-AVInputFormat ff_pcm_ ## name ## _demuxer = {\
- #name,\
- NULL_IF_CONFIG_SMALL(long_name),\
- sizeof(RawAudioDemuxerContext),\
- NULL,\
- ff_raw_read_header,\
- raw_read_packet,\
- NULL,\
- pcm_read_seek,\
- .flags= AVFMT_GENERIC_INDEX,\
- .extensions = ext,\
- .value = codec,\
- .priv_class = &name ## _demuxer_class,\
+#define PCMDEF(name_, long_name_, ext, codec) \
+static const AVClass name_ ## _demuxer_class = { \
+ .class_name = #name_ " demuxer", \
+ .item_name = av_default_item_name, \
+ .option = pcm_options, \
+ .version = LIBAVUTIL_VERSION_INT, \
+}; \
+AVInputFormat ff_pcm_ ## name_ ## _demuxer = { \
+ .name = #name_, \
+ .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
+ .priv_data_size = sizeof(PCMAudioDemuxerContext), \
+ .read_header = pcm_read_header, \
+ .read_packet = pcm_read_packet, \
+ .read_seek = ff_pcm_read_seek, \
+ .flags = AVFMT_GENERIC_INDEX, \
+ .extensions = ext, \
+ .raw_codec_id = codec, \
+ .priv_class = &name_ ## _demuxer_class, \
};
-PCMDEF(f64be, "PCM 64 bit floating-point big-endian format",
- NULL, CODEC_ID_PCM_F64BE)
+PCMDEF(f64be, "PCM 64-bit floating-point big-endian",
+ NULL, AV_CODEC_ID_PCM_F64BE)
-PCMDEF(f64le, "PCM 64 bit floating-point little-endian format",
- NULL, CODEC_ID_PCM_F64LE)
+PCMDEF(f64le, "PCM 64-bit floating-point little-endian",
+ NULL, AV_CODEC_ID_PCM_F64LE)
-PCMDEF(f32be, "PCM 32 bit floating-point big-endian format",
- NULL, CODEC_ID_PCM_F32BE)
+PCMDEF(f32be, "PCM 32-bit floating-point big-endian",
+ NULL, AV_CODEC_ID_PCM_F32BE)
-PCMDEF(f32le, "PCM 32 bit floating-point little-endian format",
- NULL, CODEC_ID_PCM_F32LE)
+PCMDEF(f32le, "PCM 32-bit floating-point little-endian",
+ NULL, AV_CODEC_ID_PCM_F32LE)
-PCMDEF(s32be, "PCM signed 32 bit big-endian format",
- NULL, CODEC_ID_PCM_S32BE)
+PCMDEF(s32be, "PCM signed 32-bit big-endian",
+ NULL, AV_CODEC_ID_PCM_S32BE)
-PCMDEF(s32le, "PCM signed 32 bit little-endian format",
- NULL, CODEC_ID_PCM_S32LE)
+PCMDEF(s32le, "PCM signed 32-bit little-endian",
+ NULL, AV_CODEC_ID_PCM_S32LE)
-PCMDEF(s24be, "PCM signed 24 bit big-endian format",
- NULL, CODEC_ID_PCM_S24BE)
+PCMDEF(s24be, "PCM signed 24-bit big-endian",
+ NULL, AV_CODEC_ID_PCM_S24BE)
-PCMDEF(s24le, "PCM signed 24 bit little-endian format",
- NULL, CODEC_ID_PCM_S24LE)
+PCMDEF(s24le, "PCM signed 24-bit little-endian",
+ NULL, AV_CODEC_ID_PCM_S24LE)
-PCMDEF(s16be, "PCM signed 16 bit big-endian format",
- AV_NE("sw", NULL), CODEC_ID_PCM_S16BE)
+PCMDEF(s16be, "PCM signed 16-bit big-endian",
+ AV_NE("sw", NULL), AV_CODEC_ID_PCM_S16BE)
-PCMDEF(s16le, "PCM signed 16 bit little-endian format",
- AV_NE(NULL, "sw"), CODEC_ID_PCM_S16LE)
+PCMDEF(s16le, "PCM signed 16-bit little-endian",
+ AV_NE(NULL, "sw"), AV_CODEC_ID_PCM_S16LE)
-PCMDEF(s8, "PCM signed 8 bit format",
- "sb", CODEC_ID_PCM_S8)
+PCMDEF(s8, "PCM signed 8-bit",
+ "sb", AV_CODEC_ID_PCM_S8)
-PCMDEF(u32be, "PCM unsigned 32 bit big-endian format",
- NULL, CODEC_ID_PCM_U32BE)
+PCMDEF(u32be, "PCM unsigned 32-bit big-endian",
+ NULL, AV_CODEC_ID_PCM_U32BE)
-PCMDEF(u32le, "PCM unsigned 32 bit little-endian format",
- NULL, CODEC_ID_PCM_U32LE)
+PCMDEF(u32le, "PCM unsigned 32-bit little-endian",
+ NULL, AV_CODEC_ID_PCM_U32LE)
-PCMDEF(u24be, "PCM unsigned 24 bit big-endian format",
- NULL, CODEC_ID_PCM_U24BE)
+PCMDEF(u24be, "PCM unsigned 24-bit big-endian",
+ NULL, AV_CODEC_ID_PCM_U24BE)
-PCMDEF(u24le, "PCM unsigned 24 bit little-endian format",
- NULL, CODEC_ID_PCM_U24LE)
+PCMDEF(u24le, "PCM unsigned 24-bit little-endian",
+ NULL, AV_CODEC_ID_PCM_U24LE)
-PCMDEF(u16be, "PCM unsigned 16 bit big-endian format",
- AV_NE("uw", NULL), CODEC_ID_PCM_U16BE)
+PCMDEF(u16be, "PCM unsigned 16-bit big-endian",
+ AV_NE("uw", NULL), AV_CODEC_ID_PCM_U16BE)
-PCMDEF(u16le, "PCM unsigned 16 bit little-endian format",
- AV_NE(NULL, "uw"), CODEC_ID_PCM_U16LE)
+PCMDEF(u16le, "PCM unsigned 16-bit little-endian",
+ AV_NE(NULL, "uw"), AV_CODEC_ID_PCM_U16LE)
-PCMDEF(u8, "PCM unsigned 8 bit format",
- "ub", CODEC_ID_PCM_U8)
+PCMDEF(u8, "PCM unsigned 8-bit",
+ "ub", AV_CODEC_ID_PCM_U8)
-PCMDEF(alaw, "PCM A-law format",
- "al", CODEC_ID_PCM_ALAW)
+PCMDEF(alaw, "PCM A-law",
+ "al", AV_CODEC_ID_PCM_ALAW)
-PCMDEF(mulaw, "PCM mu-law format",
- "ul", CODEC_ID_PCM_MULAW)
+PCMDEF(mulaw, "PCM mu-law",
+ "ul", AV_CODEC_ID_PCM_MULAW)
projects / ffmpeg / blobdiff