av_buffer_unref(&cf->idx_ref);
av_buffer_unref(&cf->decoder_ref);
+ av_buffer_unref(&cf->ref_idx_ref);
av_freep(&priv);
}
finish:
av_buffer_unref(&unmap_data->idx_ref);
av_buffer_unref(&unmap_data->decoder_ref);
+ av_buffer_unref(&unmap_data->ref_idx_ref);
av_free(unmap_data);
}
ret = AVERROR(ENOMEM);
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_free = nvdec_fdd_priv_free;
}
+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)
{
NVDECContext *ctx = avctx->internal->hwaccel_priv_data;
if (!cf)
return -1;
- return cf->idx;
+ return cf->ref_idx;
}
typedef struct NVDECFrame {
unsigned int idx;
+ unsigned int ref_idx;
AVBufferRef *idx_ref;
+ AVBufferRef *ref_idx_ref;
AVBufferRef *decoder_ref;
} NVDECFrame;
int ff_nvdec_decode_init(AVCodecContext *avctx);
int ff_nvdec_decode_uninit(AVCodecContext *avctx);
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_simple_end_frame(AVCodecContext *avctx);
int ff_nvdec_simple_decode_slice(AVCodecContext *avctx, const uint8_t *buffer,