virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

g723_1: change to encode2()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-05-08 21:45:16 +02:00
parent b4178a3f13
commit 1ebf6f941e
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/g723_1.c
View File

@ -27,6 +27,7 @@
#include "avcodec.h" #include "avcodec.h"
#define BITSTREAM_READER_LE #define BITSTREAM_READER_LE
#include "internal.h"
#include "get_bits.h" #include "get_bits.h"
#include "acelp_vectors.h" #include "acelp_vectors.h"
#include "celp_filters.h" #include "celp_filters.h"
@ -2093,8 +2094,8 @@ static int pack_bitstream(G723_1_Context *p, unsigned char *frame, int size)
return frame_size[info_bits]; return frame_size[info_bits];
} }
static int g723_1_encode_frame(AVCodecContext *avctx, unsigned char *buf, static int g723_1_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
int buf_size, void *data) const AVFrame *frame, int *got_packet_ptr)
{ {
G723_1_Context *p = avctx->priv_data; G723_1_Context *p = avctx->priv_data;
int16_t unq_lpc[LPC_ORDER * SUBFRAMES]; int16_t unq_lpc[LPC_ORDER * SUBFRAMES];
@ -2102,8 +2103,8 @@ static int g723_1_encode_frame(AVCodecContext *avctx, unsigned char *buf,
int16_t cur_lsp[LPC_ORDER]; int16_t cur_lsp[LPC_ORDER];
int16_t weighted_lpc[LPC_ORDER * SUBFRAMES << 1]; int16_t weighted_lpc[LPC_ORDER * SUBFRAMES << 1];
int16_t vector[FRAME_LEN + PITCH_MAX]; int16_t vector[FRAME_LEN + PITCH_MAX];
int offset; int offset, ret;
int16_t *in = data; int16_t *in = (const int16_t *)frame->data[0];
HFParam hf[4]; HFParam hf[4];
int i, j; int i, j;
@ -2213,7 +2214,12 @@ static int g723_1_encode_frame(AVCodecContext *avctx, unsigned char *buf,
offset += LPC_ORDER; offset += LPC_ORDER;
} }
return pack_bitstream(p, buf, buf_size); if ((ret = ff_alloc_packet2(avctx, avpkt, 24)))
return ret;
*got_packet_ptr = 1;
avpkt->size = pack_bitstream(p, avpkt->data, avpkt->size);
return 0;
} }
AVCodec ff_g723_1_encoder = { AVCodec ff_g723_1_encoder = {
@ -2222,7 +2228,7 @@ AVCodec ff_g723_1_encoder = {
.id = CODEC_ID_G723_1, .id = CODEC_ID_G723_1,
.priv_data_size = sizeof(G723_1_Context), .priv_data_size = sizeof(G723_1_Context),
.init = g723_1_encode_init, .init = g723_1_encode_init,
.encode = g723_1_encode_frame, .encode2 = g723_1_encode_frame,
.long_name = NULL_IF_CONFIG_SMALL("G.723.1"), .long_name = NULL_IF_CONFIG_SMALL("G.723.1"),
.sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16, .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE}, AV_SAMPLE_FMT_NONE},