*/
#include <stdint.h>
+
+#include "libavutil/channel_layout.h"
+#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
#include "avcodec.h"
+#include "internal.h"
/**
* @file
0, 1, 2, 3, 4, 5, 6, 8
};
-typedef struct WSSndContext {
- AVFrame frame;
-} WSSndContext;
-
static av_cold int ws_snd_decode_init(AVCodecContext *avctx)
{
- WSSndContext *s = avctx->priv_data;
-
- if (avctx->channels != 1) {
- av_log_ask_for_sample(avctx, "unsupported number of channels\n");
- return AVERROR(EINVAL);
- }
-
- avctx->sample_fmt = AV_SAMPLE_FMT_U8;
-
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
+ avctx->channels = 1;
+ avctx->channel_layout = AV_CH_LAYOUT_MONO;
+ avctx->sample_fmt = AV_SAMPLE_FMT_U8;
return 0;
}
static int ws_snd_decode_frame(AVCodecContext *avctx, void *data,
int *got_frame_ptr, AVPacket *avpkt)
{
- WSSndContext *s = avctx->priv_data;
+ AVFrame *frame = data;
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
}
/* get output buffer */
- s->frame.nb_samples = out_size;
- if ((ret = avctx->get_buffer(avctx, &s->frame)) < 0) {
+ frame->nb_samples = out_size;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret;
}
- samples = s->frame.data[0];
+ samples = frame->data[0];
samples_end = samples + out_size;
if (in_size == out_size) {
memcpy(samples, buf, out_size);
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
+ *got_frame_ptr = 1;
return buf_size;
}
}
}
- s->frame.nb_samples = samples - s->frame.data[0];
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
+ frame->nb_samples = samples - frame->data[0];
+ *got_frame_ptr = 1;
return buf_size;
}
AVCodec ff_ws_snd1_decoder = {
.name = "ws_snd1",
+ .long_name = NULL_IF_CONFIG_SMALL("Westwood Audio (SND1)"),
.type = AVMEDIA_TYPE_AUDIO,
.id = AV_CODEC_ID_WESTWOOD_SND1,
- .priv_data_size = sizeof(WSSndContext),
.init = ws_snd_decode_init,
.decode = ws_snd_decode_frame,
.capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Westwood Audio (SND1)"),
};