virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

ralf: decode directly to the user-provided AVFrame

Browse Source
This commit is contained in:
Justin Ruggles
2012-12-23 19:49:38 -05:00
parent e01e1a4673
commit cbeb3ed38d
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/ralf.c
View File

@@ -49,8 +49,6 @@ typedef struct VLCSet {
#define RALF_MAX_PKT_SIZE 8192 #define RALF_MAX_PKT_SIZE 8192
typedef struct RALFContext { typedef struct RALFContext {
AVFrame frame;
int version; int version;
int max_frame_size; int max_frame_size;
VLCSet sets[3]; VLCSet sets[3];
@@ -154,9 +152,6 @@ static av_cold int decode_init(AVCodecContext *avctx)
avctx->channel_layout = (avctx->channels == 2) ? AV_CH_LAYOUT_STEREO avctx->channel_layout = (avctx->channels == 2) ? AV_CH_LAYOUT_STEREO
: AV_CH_LAYOUT_MONO; : AV_CH_LAYOUT_MONO;
avcodec_get_frame_defaults(&ctx->frame);
avctx->coded_frame = &ctx->frame;
ctx->max_frame_size = AV_RB32(avctx->extradata + 16); ctx->max_frame_size = AV_RB32(avctx->extradata + 16);
if (ctx->max_frame_size > (1 << 20) || !ctx->max_frame_size) { if (ctx->max_frame_size > (1 << 20) || !ctx->max_frame_size) {
av_log(avctx, AV_LOG_ERROR, "invalid frame size %d\n", av_log(avctx, AV_LOG_ERROR, "invalid frame size %d\n",
@@ -426,6 +421,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
AVPacket *avpkt) AVPacket *avpkt)
{ {
RALFContext *ctx = avctx->priv_data; RALFContext *ctx = avctx->priv_data;
AVFrame *frame = data;
int16_t *samples0; int16_t *samples0;
int16_t *samples1; int16_t *samples1;
int ret; int ret;
@@ -463,13 +459,13 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
src_size = avpkt->size; src_size = avpkt->size;
} }
ctx->frame.nb_samples = ctx->max_frame_size; frame->nb_samples = ctx->max_frame_size;
if ((ret = ff_get_buffer(avctx, &ctx->frame)) < 0) { if ((ret = ff_get_buffer(avctx, frame)) < 0) {
av_log(avctx, AV_LOG_ERROR, "Me fail get_buffer()? That's unpossible!\n"); av_log(avctx, AV_LOG_ERROR, "Me fail get_buffer()? That's unpossible!\n");
return ret; return ret;
} }
samples0 = (int16_t *)ctx->frame.data[0]; samples0 = (int16_t *)frame->data[0];
samples1 = (int16_t *)ctx->frame.data[1]; samples1 = (int16_t *)frame->data[1];
if (src_size < 5) { if (src_size < 5) {
av_log(avctx, AV_LOG_ERROR, "too short packets are too short!\n"); av_log(avctx, AV_LOG_ERROR, "too short packets are too short!\n");
@@ -511,9 +507,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
bytes_left -= ctx->block_size[i]; bytes_left -= ctx->block_size[i];
} }
ctx->frame.nb_samples = ctx->sample_offset; frame->nb_samples = ctx->sample_offset;
*got_frame_ptr = ctx->sample_offset > 0; *got_frame_ptr = ctx->sample_offset > 0;
*(AVFrame*)data = ctx->frame;
return avpkt->size; return avpkt->size;
} }