highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ws-snd1: decode directly to the user-provided AVFrame

Browse Source
This commit is contained in:
Justin Ruggles
2012-12-23 20:31:24 -05:00
parent 5a7288822f
commit 8ae50d87e7
1 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libavcodec/ws-snd1.c
View File

@@ -41,28 +41,19 @@ static const int8_t ws_adpcm_4bit[] = {
0, 1, 2, 3, 4, 5, 6, 8 0, 1, 2, 3, 4, 5, 6, 8
}; };
typedef struct WSSndContext {
AVFrame frame;
} WSSndContext;
static av_cold int ws_snd_decode_init(AVCodecContext *avctx) static av_cold int ws_snd_decode_init(AVCodecContext *avctx)
{ {
WSSndContext *s = avctx->priv_data;
avctx->channels = 1; avctx->channels = 1;
avctx->channel_layout = AV_CH_LAYOUT_MONO; avctx->channel_layout = AV_CH_LAYOUT_MONO;
avctx->sample_fmt = AV_SAMPLE_FMT_U8; avctx->sample_fmt = AV_SAMPLE_FMT_U8;
avcodec_get_frame_defaults(&s->frame);
avctx->coded_frame = &s->frame;
return 0; return 0;
} }
static int ws_snd_decode_frame(AVCodecContext *avctx, void *data, static int ws_snd_decode_frame(AVCodecContext *avctx, void *data,
int *got_frame_ptr, AVPacket *avpkt) int *got_frame_ptr, AVPacket *avpkt)
{ {
WSSndContext *s = avctx->priv_data; AVFrame *frame = data;
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
@@ -89,18 +80,17 @@ static int ws_snd_decode_frame(AVCodecContext *avctx, void *data,
} }
/* get output buffer */ /* get output buffer */
s->frame.nb_samples = out_size; frame->nb_samples = out_size;
if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) { if ((ret = ff_get_buffer(avctx, frame)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret; return ret;
} }
samples = s->frame.data[0]; samples = frame->data[0];
samples_end = samples + out_size; samples_end = samples + out_size;
if (in_size == out_size) { if (in_size == out_size) {
memcpy(samples, buf, out_size); memcpy(samples, buf, out_size);
*got_frame_ptr = 1; *got_frame_ptr = 1;
*(AVFrame *)data = s->frame;
return buf_size; return buf_size;
} }
@@ -176,9 +166,8 @@ static int ws_snd_decode_frame(AVCodecContext *avctx, void *data,
} }
} }
s->frame.nb_samples = samples - s->frame.data[0]; frame->nb_samples = samples - frame->data[0];
*got_frame_ptr = 1; *got_frame_ptr = 1;
*(AVFrame *)data = s->frame;
return buf_size; return buf_size;
} }
@@ -187,7 +176,6 @@ AVCodec ff_ws_snd1_decoder = {
.name = "ws_snd1", .name = "ws_snd1",
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.id = AV_CODEC_ID_WESTWOOD_SND1, .id = AV_CODEC_ID_WESTWOOD_SND1,
.priv_data_size = sizeof(WSSndContext),
.init = ws_snd_decode_init, .init = ws_snd_decode_init,
.decode = ws_snd_decode_frame, .decode = ws_snd_decode_frame,
.capabilities = CODEC_CAP_DR1, .capabilities = CODEC_CAP_DR1,