From 4c7b023d56e09a78a587d036db1b64bf7c493b3d Mon Sep 17 00:00:00 2001 From: Philip Langdale Date: Sat, 18 Nov 2017 20:29:15 -0800 Subject: avcodec: Refactor common nvdec hwaccel logic The 'simple' hwaccels (not h.264 and hevc) all use the same bitstream management and reference lookup logic so let's refactor all that into common functions. I verified that casting a signed int -1 to unsigned char produces 255 according to the C language specification. --- libavcodec/nvdec_vc1.c | 55 ++++++-------------------------------------------- 1 file changed, 6 insertions(+), 49 deletions(-) (limited to 'libavcodec/nvdec_vc1.c') diff --git a/libavcodec/nvdec_vc1.c b/libavcodec/nvdec_vc1.c index 588a5b9d07..c04b153a86 100644 --- a/libavcodec/nvdec_vc1.c +++ b/libavcodec/nvdec_vc1.c @@ -25,20 +25,6 @@ #include "decode.h" #include "vc1.h" -static int get_ref_idx(AVFrame *frame) -{ - FrameDecodeData *fdd; - NVDECFrame *cf; - - if (!frame || !frame->private_ref) - return -1; - - fdd = (FrameDecodeData*)frame->private_ref->data; - cf = (NVDECFrame*)fdd->hwaccel_priv; - - return cf->idx; -} - static int nvdec_vc1_start_frame(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size) { VC1Context *v = avctx->priv_data; @@ -73,8 +59,8 @@ static int nvdec_vc1_start_frame(AVCodecContext *avctx, const uint8_t *buffer, u s->pict_type == AV_PICTURE_TYPE_P, .CodecSpecific.vc1 = { - .ForwardRefIdx = get_ref_idx(s->last_picture.f), - .BackwardRefIdx = get_ref_idx(s->next_picture.f), + .ForwardRefIdx = ff_nvdec_get_ref_idx(s->last_picture.f), + .BackwardRefIdx = ff_nvdec_get_ref_idx(s->next_picture.f), .FrameWidth = cur_frame->width, .FrameHeight = cur_frame->height, @@ -117,35 +103,6 @@ static int nvdec_vc1_start_frame(AVCodecContext *avctx, const uint8_t *buffer, u return 0; } -static int nvdec_vc1_end_frame(AVCodecContext *avctx) -{ - NVDECContext *ctx = avctx->internal->hwaccel_priv_data; - int ret = ff_nvdec_end_frame(avctx); - ctx->bitstream = NULL; - return ret; -} - -static int nvdec_vc1_decode_slice(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size) -{ - NVDECContext *ctx = avctx->internal->hwaccel_priv_data; - void *tmp; - - tmp = av_fast_realloc(ctx->slice_offsets, &ctx->slice_offsets_allocated, - (ctx->nb_slices + 1) * sizeof(*ctx->slice_offsets)); - if (!tmp) - return AVERROR(ENOMEM); - ctx->slice_offsets = tmp; - - if (!ctx->bitstream) - ctx->bitstream = (uint8_t*)buffer; - - ctx->slice_offsets[ctx->nb_slices] = buffer - ctx->bitstream; - ctx->bitstream_len += size; - ctx->nb_slices++; - - return 0; -} - static int nvdec_vc1_frame_params(AVCodecContext *avctx, AVBufferRef *hw_frames_ctx) { @@ -159,8 +116,8 @@ AVHWAccel ff_vc1_nvdec_hwaccel = { .id = AV_CODEC_ID_VC1, .pix_fmt = AV_PIX_FMT_CUDA, .start_frame = nvdec_vc1_start_frame, - .end_frame = nvdec_vc1_end_frame, - .decode_slice = nvdec_vc1_decode_slice, + .end_frame = ff_nvdec_simple_end_frame, + .decode_slice = ff_nvdec_simple_decode_slice, .frame_params = nvdec_vc1_frame_params, .init = ff_nvdec_decode_init, .uninit = ff_nvdec_decode_uninit, @@ -174,8 +131,8 @@ AVHWAccel ff_wmv3_nvdec_hwaccel = { .id = AV_CODEC_ID_WMV3, .pix_fmt = AV_PIX_FMT_CUDA, .start_frame = nvdec_vc1_start_frame, - .end_frame = nvdec_vc1_end_frame, - .decode_slice = nvdec_vc1_decode_slice, + .end_frame = ff_nvdec_simple_end_frame, + .decode_slice = ff_nvdec_simple_decode_slice, .frame_params = nvdec_vc1_frame_params, .init = ff_nvdec_decode_init, .uninit = ff_nvdec_decode_uninit, -- cgit v1.2.3