| @@ -27,15 +27,15 @@ | |||||
| #define RAW_SAMPLES 1024 | #define RAW_SAMPLES 1024 | ||||
| typedef struct RawAudioDemuxerContext { | |||||
| typedef struct PCMAudioDemuxerContext { | |||||
| AVClass *class; | AVClass *class; | ||||
| int sample_rate; | int sample_rate; | ||||
| int channels; | int channels; | ||||
| } RawAudioDemuxerContext; | |||||
| } PCMAudioDemuxerContext; | |||||
| static int raw_read_header(AVFormatContext *s) | |||||
| static int pcm_read_header(AVFormatContext *s) | |||||
| { | { | ||||
| RawAudioDemuxerContext *s1 = s->priv_data; | |||||
| PCMAudioDemuxerContext *s1 = s->priv_data; | |||||
| AVStream *st; | AVStream *st; | ||||
| st = avformat_new_stream(s, NULL); | st = avformat_new_stream(s, NULL); | ||||
| @@ -60,7 +60,7 @@ static int raw_read_header(AVFormatContext *s) | |||||
| return 0; | return 0; | ||||
| } | } | ||||
| static int raw_read_packet(AVFormatContext *s, AVPacket *pkt) | |||||
| static int pcm_read_packet(AVFormatContext *s, AVPacket *pkt) | |||||
| { | { | ||||
| int ret, size, bps; | int ret, size, bps; | ||||
| // AVStream *st = s->streams[0]; | // AVStream *st = s->streams[0]; | ||||
| @@ -82,8 +82,8 @@ static int raw_read_packet(AVFormatContext *s, AVPacket *pkt) | |||||
| } | } | ||||
| static const AVOption pcm_options[] = { | static const AVOption pcm_options[] = { | ||||
| { "sample_rate", "", offsetof(RawAudioDemuxerContext, sample_rate), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, | |||||
| { "channels", "", offsetof(RawAudioDemuxerContext, channels), AV_OPT_TYPE_INT, {.i64 = 1}, 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 }, | { NULL }, | ||||
| }; | }; | ||||
| @@ -97,9 +97,9 @@ static const AVClass name_ ## _demuxer_class = { \ | |||||
| AVInputFormat ff_pcm_ ## name_ ## _demuxer = { \ | AVInputFormat ff_pcm_ ## name_ ## _demuxer = { \ | ||||
| .name = #name_, \ | .name = #name_, \ | ||||
| .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ | .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ | ||||
| .priv_data_size = sizeof(RawAudioDemuxerContext), \ | |||||
| .read_header = raw_read_header, \ | |||||
| .read_packet = raw_read_packet, \ | |||||
| .priv_data_size = sizeof(PCMAudioDemuxerContext), \ | |||||
| .read_header = pcm_read_header, \ | |||||
| .read_packet = pcm_read_packet, \ | |||||
| .read_seek = ff_pcm_read_seek, \ | .read_seek = ff_pcm_read_seek, \ | ||||
| .flags = AVFMT_GENERIC_INDEX, \ | .flags = AVFMT_GENERIC_INDEX, \ | ||||
| .extensions = ext, \ | .extensions = ext, \ | ||||