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

vda: Reuse the bitstream buffer and reallocate it only if needed

Browse Source 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
Sebastien Zwickert 2012-08-13 20:17:45 +02:00 committed by Diego Biurrun
parent ad08dfd594
commit cfc680ab39
3 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/vda.c
View File

@ -226,6 +226,8 @@ int ff_vda_destroy_decoder(struct vda_context *vda_ctx)
pthread_mutex_destroy(&vda_ctx->queue_mutex); pthread_mutex_destroy(&vda_ctx->queue_mutex);
av_freep(&vda_ctx->priv_bitstream);
if (kVDADecoderNoErr != status) if (kVDADecoderNoErr != status)
return status; return status;

15
libavcodec/vda.h
View File

@ -138,6 +138,21 @@ struct vda_context {
* - decoding: Set/Unset by user. * - decoding: Set/Unset by user.
*/ */
OSType cv_pix_fmt_type; OSType cv_pix_fmt_type;
/**
* The current bitstream buffer.
*/
uint8_t *priv_bitstream;
/**
* The current size of the bitstream.
*/
int priv_bitstream_size;
/**
* The reference size used for fast reallocation.
*/
int priv_allocated_size;
}; };
/** Create the video decoder. */ /** Create the video decoder. */

37
libavcodec/vda_h264.c
View File

@ -21,29 +21,18 @@
*/ */
#include "h264.h" #include "h264.h"
#include "h264data.h"
#include "vda_internal.h" #include "vda_internal.h"
/* This structure is used to store the bitstream of the current frame. */
struct vda_picture_context {
uint8_t *bitstream;
int bitstream_size;
};
static int start_frame(AVCodecContext *avctx, static int start_frame(AVCodecContext *avctx,
av_unused const uint8_t *buffer, av_unused const uint8_t *buffer,
av_unused uint32_t size) av_unused uint32_t size)
{ {
const H264Context *h = avctx->priv_data;
struct vda_context *vda_ctx = avctx->hwaccel_context; struct vda_context *vda_ctx = avctx->hwaccel_context;
struct vda_picture_context *pic_ctx = h->s.current_picture_ptr->f.hwaccel_picture_private;
if (!vda_ctx->decoder) if (!vda_ctx->decoder)
return -1; return -1;
pic_ctx->bitstream = NULL; vda_ctx->priv_bitstream_size = 0;
pic_ctx->bitstream_size = 0;
return 0; return 0;
} }
@ -52,24 +41,24 @@ static int decode_slice(AVCodecContext *avctx,
const uint8_t *buffer, const uint8_t *buffer,
uint32_t size) uint32_t size)
{ {
H264Context *h = avctx->priv_data;
struct vda_context *vda_ctx = avctx->hwaccel_context; struct vda_context *vda_ctx = avctx->hwaccel_context;
struct vda_picture_context *pic_ctx = h->s.current_picture_ptr->f.hwaccel_picture_private;
void *tmp; void *tmp;
if (!vda_ctx->decoder) if (!vda_ctx->decoder)
return -1; return -1;
tmp = av_realloc(pic_ctx->bitstream, pic_ctx->bitstream_size+size+4); tmp = av_fast_realloc(vda_ctx->priv_bitstream,
&vda_ctx->priv_allocated_size,
vda_ctx->priv_bitstream_size + size + 4);
if (!tmp) if (!tmp)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
pic_ctx->bitstream = tmp; vda_ctx->priv_bitstream = tmp;
AV_WB32(pic_ctx->bitstream + pic_ctx->bitstream_size, size); AV_WB32(vda_ctx->priv_bitstream + vda_ctx->priv_bitstream_size, size);
memcpy(pic_ctx->bitstream + pic_ctx->bitstream_size + 4, buffer, size); memcpy(vda_ctx->priv_bitstream + vda_ctx->priv_bitstream_size + 4, buffer, size);
pic_ctx->bitstream_size += size + 4; vda_ctx->priv_bitstream_size += size + 4;
return 0; return 0;
} }
@ -78,22 +67,19 @@ static int end_frame(AVCodecContext *avctx)
{ {
H264Context *h = avctx->priv_data; H264Context *h = avctx->priv_data;
struct vda_context *vda_ctx = avctx->hwaccel_context; struct vda_context *vda_ctx = avctx->hwaccel_context;
struct vda_picture_context *pic_ctx = h->s.current_picture_ptr->f.hwaccel_picture_private;
AVFrame *frame = &h->s.current_picture_ptr->f; AVFrame *frame = &h->s.current_picture_ptr->f;
int status; int status;
if (!vda_ctx->decoder || !pic_ctx->bitstream) if (!vda_ctx->decoder || !vda_ctx->priv_bitstream)
return -1; return -1;
status = ff_vda_decoder_decode(vda_ctx, pic_ctx->bitstream, status = ff_vda_decoder_decode(vda_ctx, vda_ctx->priv_bitstream,
pic_ctx->bitstream_size, vda_ctx->priv_bitstream_size,
frame->reordered_opaque); frame->reordered_opaque);
if (status) if (status)
av_log(avctx, AV_LOG_ERROR, "Failed to decode frame (%d)\n", status); av_log(avctx, AV_LOG_ERROR, "Failed to decode frame (%d)\n", status);
av_freep(&pic_ctx->bitstream);
return status; return status;
} }
@ -105,5 +91,4 @@ AVHWAccel ff_h264_vda_hwaccel = {
.start_frame = start_frame, .start_frame = start_frame,
.decode_slice = decode_slice, .decode_slice = decode_slice,
.end_frame = end_frame, .end_frame = end_frame,
.priv_data_size = sizeof(struct vda_picture_context),
}; };