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

avcodec/nvdec: add support for separate reference frame

Browse Source 
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
This commit is contained in:
Timo Rothenpieler 2020-10-17 18:16:36 +02:00
parent 5868f1c66b
commit 72982f8cb5
2 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libavcodec/nvdec.c
View File

@ -441,6 +441,7 @@ static void nvdec_fdd_priv_free(void *priv)
av_buffer_unref(&cf->idx_ref); av_buffer_unref(&cf->idx_ref);
av_buffer_unref(&cf->decoder_ref); av_buffer_unref(&cf->decoder_ref);
av_buffer_unref(&cf->ref_idx_ref);
av_freep(&priv); av_freep(&priv);
} }
@ -465,6 +466,7 @@ static void nvdec_unmap_mapped_frame(void *opaque, uint8_t *data)
finish: finish:
av_buffer_unref(&unmap_data->idx_ref); av_buffer_unref(&unmap_data->idx_ref);
av_buffer_unref(&unmap_data->decoder_ref); av_buffer_unref(&unmap_data->decoder_ref);
av_buffer_unref(&unmap_data->ref_idx_ref);
av_free(unmap_data); av_free(unmap_data);
} }
@ -576,7 +578,7 @@ int ff_nvdec_start_frame(AVCodecContext *avctx, AVFrame *frame)
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail; goto fail;
} }
cf->idx = *(unsigned int*)cf->idx_ref->data; cf->ref_idx = cf->idx = *(unsigned int*)cf->idx_ref->data;
fdd->hwaccel_priv = cf; fdd->hwaccel_priv = cf;
fdd->hwaccel_priv_free = nvdec_fdd_priv_free; fdd->hwaccel_priv_free = nvdec_fdd_priv_free;
@ -589,6 +591,40 @@ fail:
} }
int ff_nvdec_start_frame_sep_ref(AVCodecContext *avctx, AVFrame *frame, int has_sep_ref)
{
NVDECContext *ctx = avctx->internal->hwaccel_priv_data;
FrameDecodeData *fdd = (FrameDecodeData*)frame->private_ref->data;
NVDECFrame *cf;
int ret;
ret = ff_nvdec_start_frame(avctx, frame);
if (ret < 0)
return ret;
cf = fdd->hwaccel_priv;
if (has_sep_ref) {
if (!cf->ref_idx_ref) {
cf->ref_idx_ref = av_buffer_pool_get(ctx->decoder_pool);
if (!cf->ref_idx_ref) {
av_log(avctx, AV_LOG_ERROR, "No decoder surfaces left\n");
ret = AVERROR(ENOMEM);
goto fail;
}
}
cf->ref_idx = *(unsigned int*)cf->ref_idx_ref->data;
} else {
av_buffer_unref(&cf->ref_idx_ref);
cf->ref_idx = cf->idx;
}
return 0;
fail:
nvdec_fdd_priv_free(cf);
return ret;
}
int ff_nvdec_end_frame(AVCodecContext *avctx) int ff_nvdec_end_frame(AVCodecContext *avctx)
{ {
NVDECContext *ctx = avctx->internal->hwaccel_priv_data; NVDECContext *ctx = avctx->internal->hwaccel_priv_data;
@ -714,5 +750,5 @@ int ff_nvdec_get_ref_idx(AVFrame *frame)
if (!cf) if (!cf)
return -1; return -1;
return cf->idx; return cf->ref_idx;
} }

3
libavcodec/nvdec.h
View File

@ -43,7 +43,9 @@
typedef struct NVDECFrame { typedef struct NVDECFrame {
unsigned int idx; unsigned int idx;
unsigned int ref_idx;
AVBufferRef *idx_ref; AVBufferRef *idx_ref;
AVBufferRef *ref_idx_ref;
AVBufferRef *decoder_ref; AVBufferRef *decoder_ref;
} NVDECFrame; } NVDECFrame;
@ -68,6 +70,7 @@ typedef struct NVDECContext {
int ff_nvdec_decode_init(AVCodecContext *avctx); int ff_nvdec_decode_init(AVCodecContext *avctx);
int ff_nvdec_decode_uninit(AVCodecContext *avctx); int ff_nvdec_decode_uninit(AVCodecContext *avctx);
int ff_nvdec_start_frame(AVCodecContext *avctx, AVFrame *frame); int ff_nvdec_start_frame(AVCodecContext *avctx, AVFrame *frame);
int ff_nvdec_start_frame_sep_ref(AVCodecContext *avctx, AVFrame *frame, int has_sep_ref);
int ff_nvdec_end_frame(AVCodecContext *avctx); int ff_nvdec_end_frame(AVCodecContext *avctx);
int ff_nvdec_simple_end_frame(AVCodecContext *avctx); int ff_nvdec_simple_end_frame(AVCodecContext *avctx);
int ff_nvdec_simple_decode_slice(AVCodecContext *avctx, const uint8_t *buffer, int ff_nvdec_simple_decode_slice(AVCodecContext *avctx, const uint8_t *buffer,