*/
#include <string.h>
+
+#include "libavutil/channel_layout.h"
#include "avformat.h"
static int apc_probe(AVProbeData *p)
return 0;
}
-static int apc_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int apc_read_header(AVFormatContext *s)
{
AVIOContext *pb = s->pb;
AVStream *st;
avio_rl32(pb); /* _APC */
avio_rl32(pb); /* 1.20 */
- st = av_new_stream(s, 0);
+ st = avformat_new_stream(s, NULL);
if (!st)
return AVERROR(ENOMEM);
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
- st->codec->codec_id = CODEC_ID_ADPCM_IMA_WS;
+ st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_APC;
avio_rl32(pb); /* number of samples */
st->codec->sample_rate = avio_rl32(pb);
/* initial predictor values for adpcm decoder */
avio_read(pb, st->codec->extradata, 2 * 4);
- st->codec->channels = 1;
- if (avio_rl32(pb))
- st->codec->channels = 2;
+ if (avio_rl32(pb)) {
+ st->codec->channels = 2;
+ st->codec->channel_layout = AV_CH_LAYOUT_STEREO;
+ } else {
+ st->codec->channels = 1;
+ st->codec->channel_layout = AV_CH_LAYOUT_MONO;
+ }
st->codec->bits_per_coded_sample = 4;
st->codec->bit_rate = st->codec->bits_per_coded_sample * st->codec->channels
}
AVInputFormat ff_apc_demuxer = {
- "apc",
- NULL_IF_CONFIG_SMALL("CRYO APC format"),
- 0,
- apc_probe,
- apc_read_header,
- apc_read_packet,
+ .name = "apc",
+ .long_name = NULL_IF_CONFIG_SMALL("CRYO APC"),
+ .read_probe = apc_probe,
+ .read_header = apc_read_header,
+ .read_packet = apc_read_packet,
};