static int map_avcodec_id(enum AVCodecID id)
{
switch (id) {
+#if CONFIG_AV1_NVDEC_HWACCEL
+ case AV_CODEC_ID_AV1: return cudaVideoCodec_AV1;
+#endif
case AV_CODEC_ID_H264: return cudaVideoCodec_H264;
case AV_CODEC_ID_HEVC: return cudaVideoCodec_HEVC;
case AV_CODEC_ID_MJPEG: return cudaVideoCodec_JPEG;
{
int shift_h = 0, shift_v = 0;
+ if (av_pix_fmt_count_planes(pix_fmt) == 1)
+ return cudaVideoChromaFormat_Monochrome;
+
av_pix_fmt_get_chroma_sub_sample(pix_fmt, &shift_h, &shift_v);
if (shift_h == 1 && shift_v == 1)
return ret;
}
-static AVBufferRef *nvdec_decoder_frame_alloc(void *opaque, int size)
+static AVBufferRef *nvdec_decoder_frame_alloc(void *opaque, size_t size)
{
NVDECFramePool *pool = opaque;
AVBufferRef *ret;
NVDECContext *ctx = avctx->internal->hwaccel_priv_data;
av_freep(&ctx->bitstream);
+ av_freep(&ctx->bitstream_internal);
ctx->bitstream_len = 0;
ctx->bitstream_allocated = 0;
av_buffer_pool_uninit(&ctx->pool);
}
-static AVBufferRef *nvdec_alloc_dummy(int size)
+static AVBufferRef *nvdec_alloc_dummy(size_t size)
{
return av_buffer_create(NULL, 0, NULL, NULL, 0);
}
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;
}