virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity

g723.1: decode directly to the user-provided AVFrame

Browse Source
This commit is contained in:
Justin Ruggles
2013-02-12 12:21:22 -05:00
parent 036e9b045f
commit 7e52fd6bca
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavcodec/g723_1.c
+6 -10
View File
@@ -76,7 +76,6 @@ typedef struct {
typedef struct g723_1_context { typedef struct g723_1_context {
AVClass *class; AVClass *class;
AVFrame frame;
G723_1_Subframe subframe[4]; G723_1_Subframe subframe[4];
enum FrameType cur_frame_type; enum FrameType cur_frame_type;
@@ -117,9 +116,6 @@ static av_cold int g723_1_decode_init(AVCodecContext *avctx)
avctx->sample_rate = 8000; avctx->sample_rate = 8000;
p->pf_gain = 1 << 12; p->pf_gain = 1 << 12;
avcodec_get_frame_defaults(&p->frame);
avctx->coded_frame = &p->frame;
memcpy(p->prev_lsp, dc_lsp, LPC_ORDER * sizeof(*p->prev_lsp)); memcpy(p->prev_lsp, dc_lsp, LPC_ORDER * sizeof(*p->prev_lsp));
memcpy(p->sid_lsp, dc_lsp, LPC_ORDER * sizeof(*p->sid_lsp)); memcpy(p->sid_lsp, dc_lsp, LPC_ORDER * sizeof(*p->sid_lsp));
@@ -1191,6 +1187,7 @@ static int g723_1_decode_frame(AVCodecContext *avctx, void *data,
int *got_frame_ptr, AVPacket *avpkt) int *got_frame_ptr, AVPacket *avpkt)
{ {
G723_1_Context *p = avctx->priv_data; G723_1_Context *p = 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;
int dec_mode = buf[0] & 3; int dec_mode = buf[0] & 3;
@@ -1220,13 +1217,13 @@ static int g723_1_decode_frame(AVCodecContext *avctx, void *data,
p->cur_frame_type = UNTRANSMITTED_FRAME; p->cur_frame_type = UNTRANSMITTED_FRAME;
} }
p->frame.nb_samples = FRAME_LEN; frame->nb_samples = FRAME_LEN;
if ((ret = ff_get_buffer(avctx, &p->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;
} }
out = (int16_t *)p->frame.data[0]; out = (int16_t *)frame->data[0];
if (p->cur_frame_type == ACTIVE_FRAME) { if (p->cur_frame_type == ACTIVE_FRAME) {
if (!bad_frame) if (!bad_frame)
@@ -1297,7 +1294,7 @@ static int g723_1_decode_frame(AVCodecContext *avctx, void *data,
(FRAME_LEN + PITCH_MAX) * sizeof(*p->excitation)); (FRAME_LEN + PITCH_MAX) * sizeof(*p->excitation));
memset(p->prev_excitation, 0, memset(p->prev_excitation, 0,
PITCH_MAX * sizeof(*p->excitation)); PITCH_MAX * sizeof(*p->excitation));
memset(p->frame.data[0], 0, memset(frame->data[0], 0,
(FRAME_LEN + LPC_ORDER) * sizeof(int16_t)); (FRAME_LEN + LPC_ORDER) * sizeof(int16_t));
} else { } else {
int16_t *buf = p->audio + LPC_ORDER; int16_t *buf = p->audio + LPC_ORDER;
@@ -1346,8 +1343,7 @@ static int g723_1_decode_frame(AVCodecContext *avctx, void *data,
out[i] = av_clip_int16(p->audio[LPC_ORDER + i] << 1); out[i] = av_clip_int16(p->audio[LPC_ORDER + i] << 1);
} }
*got_frame_ptr = 1; *got_frame_ptr = 1;
*(AVFrame *)data = p->frame;
return frame_size[dec_mode]; return frame_size[dec_mode];
} }