#endif
#include "libavutil/common.h"
+#include "libavutil/hwcontext.h"
+#include "libavutil/hwcontext_cuda.h"
#include "libavutil/imgutils.h"
#include "libavutil/mem.h"
#include "avcodec.h"
} \
} while (0)
+const enum AVPixelFormat ff_nvenc_pix_fmts[] = {
+ AV_PIX_FMT_NV12,
+ AV_PIX_FMT_YUV420P,
+ AV_PIX_FMT_YUV444P,
+ AV_PIX_FMT_CUDA,
+ AV_PIX_FMT_NONE
+};
+
static const struct {
NVENCSTATUS nverr;
int averr;
PNVENCODEAPICREATEINSTANCE nvenc_create_instance;
NVENCSTATUS err;
+#if CONFIG_CUDA
+ nvel->cu_init = cuInit;
+ nvel->cu_device_get_count = cuDeviceGetCount;
+ nvel->cu_device_get = cuDeviceGet;
+ nvel->cu_device_get_name = cuDeviceGetName;
+ nvel->cu_device_compute_capability = cuDeviceComputeCapability;
+ nvel->cu_ctx_create = cuCtxCreate_v2;
+ nvel->cu_ctx_pop_current = cuCtxPopCurrent_v2;
+ nvel->cu_ctx_destroy = cuCtxDestroy_v2;
+#else
LOAD_LIBRARY(nvel->cuda, CUDA_LIBNAME);
LOAD_SYMBOL(nvel->cu_init, nvel->cuda, "cuInit");
LOAD_SYMBOL(nvel->cu_ctx_create, nvel->cuda, "cuCtxCreate_v2");
LOAD_SYMBOL(nvel->cu_ctx_pop_current, nvel->cuda, "cuCtxPopCurrent_v2");
LOAD_SYMBOL(nvel->cu_ctx_destroy, nvel->cuda, "cuCtxDestroy_v2");
+#endif
LOAD_LIBRARY(nvel->nvenc, NVENC_LIBNAME);
static int nvenc_check_capabilities(AVCodecContext *avctx)
{
+ NVENCContext *ctx = avctx->priv_data;
int ret;
ret = nvenc_check_codec_support(avctx);
}
ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_YUV444_ENCODE);
- if (avctx->pix_fmt == AV_PIX_FMT_YUV444P && ret <= 0) {
+ if (ctx->data_pix_fmt == AV_PIX_FMT_YUV444P && ret <= 0) {
av_log(avctx, AV_LOG_VERBOSE, "YUV444P not supported\n");
return AVERROR(ENOSYS);
}
if (((major << 4) | minor) < NVENC_CAP)
goto fail;
- ret = nvel->cu_ctx_create(&ctx->cu_context, 0, cu_device);
+ ret = nvel->cu_ctx_create(&ctx->cu_context_internal, 0, cu_device);
if (ret != CUDA_SUCCESS)
goto fail;
+ ctx->cu_context = ctx->cu_context_internal;
+
ret = nvel->cu_ctx_pop_current(&dummy);
if (ret != CUDA_SUCCESS)
goto fail2;
ctx->nvenc_ctx = NULL;
fail2:
- nvel->cu_ctx_destroy(ctx->cu_context);
- ctx->cu_context = NULL;
+ nvel->cu_ctx_destroy(ctx->cu_context_internal);
+ ctx->cu_context_internal = NULL;
fail:
if (ret != 0)
{
NVENCContext *ctx = avctx->priv_data;
NVENCLibraryContext *nvel = &ctx->nvel;
- int i, nb_devices = 0;
-
- if ((nvel->cu_init(0)) != CUDA_SUCCESS) {
- av_log(avctx, AV_LOG_ERROR,
- "Cannot init CUDA\n");
- return AVERROR_UNKNOWN;
- }
-
- if ((nvel->cu_device_get_count(&nb_devices)) != CUDA_SUCCESS) {
- av_log(avctx, AV_LOG_ERROR,
- "Cannot enumerate the CUDA devices\n");
- return AVERROR_UNKNOWN;
- }
switch (avctx->codec->id) {
case AV_CODEC_ID_H264:
return AVERROR_BUG;
}
- for (i = 0; i < nb_devices; ++i) {
- if ((nvenc_check_device(avctx, i)) >= 0 && ctx->device != LIST_DEVICES)
- return 0;
- }
+ if (avctx->pix_fmt == AV_PIX_FMT_CUDA) {
+ AVHWFramesContext *frames_ctx;
+ AVCUDADeviceContext *device_hwctx;
+ int ret;
- if (ctx->device == LIST_DEVICES)
- return AVERROR_EXIT;
+ if (!avctx->hw_frames_ctx)
+ return AVERROR(EINVAL);
- return AVERROR(ENOSYS);
+ frames_ctx = (AVHWFramesContext*)avctx->hw_frames_ctx->data;
+ device_hwctx = frames_ctx->device_ctx->hwctx;
+
+ ctx->cu_context = device_hwctx->cuda_ctx;
+
+ ret = nvenc_open_session(avctx);
+ if (ret < 0)
+ return ret;
+
+ ret = nvenc_check_capabilities(avctx);
+ if (ret < 0)
+ return ret;
+ } else {
+ int i, nb_devices = 0;
+
+ if ((nvel->cu_init(0)) != CUDA_SUCCESS) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Cannot init CUDA\n");
+ return AVERROR_UNKNOWN;
+ }
+
+ if ((nvel->cu_device_get_count(&nb_devices)) != CUDA_SUCCESS) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Cannot enumerate the CUDA devices\n");
+ return AVERROR_UNKNOWN;
+ }
+
+
+ for (i = 0; i < nb_devices; ++i) {
+ if ((nvenc_check_device(avctx, i)) >= 0 && ctx->device != LIST_DEVICES)
+ return 0;
+ }
+
+ if (ctx->device == LIST_DEVICES)
+ return AVERROR_EXIT;
+
+ return AVERROR(ENOSYS);
+ }
+
+ return 0;
}
typedef struct GUIDTuple {
if (ctx->profile)
avctx->profile = ctx->profile;
- if (avctx->pix_fmt == AV_PIX_FMT_YUV444P)
+ if (ctx->data_pix_fmt == AV_PIX_FMT_YUV444P)
h264->chromaFormatIDC = 3;
else
h264->chromaFormatIDC = 1;
if (avctx->gop_size > 0) {
if (avctx->max_b_frames > 0) {
- ctx->last_dts = -2;
/* 0 is intra-only,
* 1 is I/P only,
* 2 is one B Frame,
if (ctx->config.frameIntervalP > 1)
avctx->max_b_frames = ctx->config.frameIntervalP - 1;
+ ctx->initial_pts[0] = AV_NOPTS_VALUE;
+ ctx->initial_pts[1] = AV_NOPTS_VALUE;
+
nvenc_setup_rate_control(avctx);
if (avctx->flags & AV_CODEC_FLAG_INTERLACED_DCT) {
NVENCContext *ctx = avctx->priv_data;
NV_ENCODE_API_FUNCTION_LIST *nv = &ctx->nvel.nvenc_funcs;
int ret;
- NV_ENC_CREATE_INPUT_BUFFER in_buffer = { 0 };
NV_ENC_CREATE_BITSTREAM_BUFFER out_buffer = { 0 };
- in_buffer.version = NV_ENC_CREATE_INPUT_BUFFER_VER;
- out_buffer.version = NV_ENC_CREATE_BITSTREAM_BUFFER_VER;
-
- in_buffer.width = avctx->width;
- in_buffer.height = avctx->height;
-
- in_buffer.memoryHeap = NV_ENC_MEMORY_HEAP_SYSMEM_UNCACHED;
-
- switch (avctx->pix_fmt) {
+ switch (ctx->data_pix_fmt) {
case AV_PIX_FMT_YUV420P:
- in_buffer.bufferFmt = NV_ENC_BUFFER_FORMAT_YV12_PL;
+ ctx->frames[idx].format = NV_ENC_BUFFER_FORMAT_YV12_PL;
break;
case AV_PIX_FMT_NV12:
- in_buffer.bufferFmt = NV_ENC_BUFFER_FORMAT_NV12_PL;
+ ctx->frames[idx].format = NV_ENC_BUFFER_FORMAT_NV12_PL;
break;
case AV_PIX_FMT_YUV444P:
- in_buffer.bufferFmt = NV_ENC_BUFFER_FORMAT_YUV444_PL;
+ ctx->frames[idx].format = NV_ENC_BUFFER_FORMAT_YUV444_PL;
break;
default:
return AVERROR_BUG;
}
- ret = nv->nvEncCreateInputBuffer(ctx->nvenc_ctx, &in_buffer);
- if (ret != NV_ENC_SUCCESS)
- return nvenc_print_error(avctx, ret, "CreateInputBuffer failed");
+ if (avctx->pix_fmt == AV_PIX_FMT_CUDA) {
+ ctx->frames[idx].in_ref = av_frame_alloc();
+ if (!ctx->frames[idx].in_ref)
+ return AVERROR(ENOMEM);
+ } else {
+ NV_ENC_CREATE_INPUT_BUFFER in_buffer = { 0 };
+
+ in_buffer.version = NV_ENC_CREATE_INPUT_BUFFER_VER;
+
+ in_buffer.width = avctx->width;
+ in_buffer.height = avctx->height;
- ctx->in[idx].in = in_buffer.inputBuffer;
- ctx->in[idx].format = in_buffer.bufferFmt;
+ in_buffer.bufferFmt = ctx->frames[idx].format;
+ in_buffer.memoryHeap = NV_ENC_MEMORY_HEAP_SYSMEM_UNCACHED;
+ ret = nv->nvEncCreateInputBuffer(ctx->nvenc_ctx, &in_buffer);
+ if (ret != NV_ENC_SUCCESS)
+ return nvenc_print_error(avctx, ret, "CreateInputBuffer failed");
+
+ ctx->frames[idx].in = in_buffer.inputBuffer;
+ }
+
+ out_buffer.version = NV_ENC_CREATE_BITSTREAM_BUFFER_VER;
/* 1MB is large enough to hold most output frames.
* NVENC increases this automaticaly if it's not enough. */
out_buffer.size = BITSTREAM_BUFFER_SIZE;
if (ret != NV_ENC_SUCCESS)
return nvenc_print_error(avctx, ret, "CreateBitstreamBuffer failed");
- ctx->out[idx].out = out_buffer.bitstreamBuffer;
- ctx->out[idx].busy = 0;
+ ctx->frames[idx].out = out_buffer.bitstreamBuffer;
return 0;
}
ctx->nb_surfaces = FFMAX(4 + avctx->max_b_frames,
ctx->nb_surfaces);
- ctx->in = av_mallocz(ctx->nb_surfaces * sizeof(*ctx->in));
- if (!ctx->in)
- return AVERROR(ENOMEM);
-
- ctx->out = av_mallocz(ctx->nb_surfaces * sizeof(*ctx->out));
- if (!ctx->out)
+ ctx->frames = av_mallocz_array(ctx->nb_surfaces, sizeof(*ctx->frames));
+ if (!ctx->frames)
return AVERROR(ENOMEM);
ctx->timestamps = av_fifo_alloc(ctx->nb_surfaces * sizeof(int64_t));
if (!ctx->timestamps)
return AVERROR(ENOMEM);
- ctx->pending = av_fifo_alloc(ctx->nb_surfaces * sizeof(ctx->out));
+ ctx->pending = av_fifo_alloc(ctx->nb_surfaces * sizeof(*ctx->frames));
if (!ctx->pending)
return AVERROR(ENOMEM);
- ctx->ready = av_fifo_alloc(ctx->nb_surfaces * sizeof(ctx->out));
+ ctx->ready = av_fifo_alloc(ctx->nb_surfaces * sizeof(*ctx->frames));
if (!ctx->ready)
return AVERROR(ENOMEM);
NV_ENCODE_API_FUNCTION_LIST *nv = &ctx->nvel.nvenc_funcs;
int i;
+ /* the encoder has to be flushed before it can be closed */
+ if (ctx->nvenc_ctx) {
+ NV_ENC_PIC_PARAMS params = { .version = NV_ENC_PIC_PARAMS_VER,
+ .encodePicFlags = NV_ENC_PIC_FLAG_EOS };
+
+ nv->nvEncEncodePicture(ctx->nvenc_ctx, ¶ms);
+ }
+
av_fifo_free(ctx->timestamps);
av_fifo_free(ctx->pending);
av_fifo_free(ctx->ready);
- if (ctx->in) {
+ if (ctx->frames) {
for (i = 0; i < ctx->nb_surfaces; ++i) {
- nv->nvEncDestroyInputBuffer(ctx->nvenc_ctx, ctx->in[i].in);
- nv->nvEncDestroyBitstreamBuffer(ctx->nvenc_ctx, ctx->out[i].out);
+ if (avctx->pix_fmt != AV_PIX_FMT_CUDA) {
+ nv->nvEncDestroyInputBuffer(ctx->nvenc_ctx, ctx->frames[i].in);
+ } else if (ctx->frames[i].in) {
+ nv->nvEncUnmapInputResource(ctx->nvenc_ctx, ctx->frames[i].in_map.mappedResource);
+ }
+
+ av_frame_free(&ctx->frames[i].in_ref);
+ nv->nvEncDestroyBitstreamBuffer(ctx->nvenc_ctx, ctx->frames[i].out);
}
}
+ for (i = 0; i < ctx->nb_registered_frames; i++) {
+ if (ctx->registered_frames[i].regptr)
+ nv->nvEncUnregisterResource(ctx->nvenc_ctx, ctx->registered_frames[i].regptr);
+ }
+ ctx->nb_registered_frames = 0;
- av_freep(&ctx->in);
- av_freep(&ctx->out);
+ av_freep(&ctx->frames);
if (ctx->nvenc_ctx)
nv->nvEncDestroyEncoder(ctx->nvenc_ctx);
- if (ctx->cu_context)
- ctx->nvel.cu_ctx_destroy(ctx->cu_context);
+ if (ctx->cu_context_internal)
+ ctx->nvel.cu_ctx_destroy(ctx->cu_context_internal);
if (ctx->nvel.nvenc)
dlclose(ctx->nvel.nvenc);
+#if !CONFIG_CUDA
if (ctx->nvel.cuda)
dlclose(ctx->nvel.cuda);
+#endif
return 0;
}
av_cold int ff_nvenc_encode_init(AVCodecContext *avctx)
{
+ NVENCContext *ctx = avctx->priv_data;
int ret;
+ if (avctx->pix_fmt == AV_PIX_FMT_CUDA) {
+ AVHWFramesContext *frames_ctx;
+ if (!avctx->hw_frames_ctx) {
+ av_log(avctx, AV_LOG_ERROR,
+ "hw_frames_ctx must be set when using GPU frames as input\n");
+ return AVERROR(EINVAL);
+ }
+ frames_ctx = (AVHWFramesContext*)avctx->hw_frames_ctx->data;
+ ctx->data_pix_fmt = frames_ctx->sw_format;
+ } else {
+ ctx->data_pix_fmt = avctx->pix_fmt;
+ }
+
if ((ret = nvenc_load_libraries(avctx)) < 0)
return ret;
return 0;
}
-static NVENCInputSurface *get_input_surface(NVENCContext *ctx)
-{
- int i;
-
- for (i = 0; i < ctx->nb_surfaces; i++) {
- if (!ctx->in[i].locked) {
- ctx->in[i].locked = 1;
- return &ctx->in[i];
- }
- }
-
- return NULL;
-}
-
-static NVENCOutputSurface *get_output_surface(NVENCContext *ctx)
+static NVENCFrame *get_free_frame(NVENCContext *ctx)
{
int i;
for (i = 0; i < ctx->nb_surfaces; i++) {
- if (!ctx->out[i].busy) {
- return &ctx->out[i];
+ if (!ctx->frames[i].locked) {
+ ctx->frames[i].locked = 1;
+ return &ctx->frames[i];
}
}
return 0;
}
-static int nvenc_enqueue_frame(AVCodecContext *avctx, const AVFrame *frame,
- NVENCInputSurface **in_surf)
+static int nvenc_find_free_reg_resource(AVCodecContext *avctx)
+{
+ NVENCContext *ctx = avctx->priv_data;
+ NV_ENCODE_API_FUNCTION_LIST *nv = &ctx->nvel.nvenc_funcs;
+ int i;
+
+ if (ctx->nb_registered_frames == FF_ARRAY_ELEMS(ctx->registered_frames)) {
+ for (i = 0; i < ctx->nb_registered_frames; i++) {
+ if (!ctx->registered_frames[i].mapped) {
+ if (ctx->registered_frames[i].regptr) {
+ nv->nvEncUnregisterResource(ctx->nvenc_ctx,
+ ctx->registered_frames[i].regptr);
+ ctx->registered_frames[i].regptr = NULL;
+ }
+ return i;
+ }
+ }
+ } else {
+ return ctx->nb_registered_frames++;
+ }
+
+ av_log(avctx, AV_LOG_ERROR, "Too many registered CUDA frames\n");
+ return AVERROR(ENOMEM);
+}
+
+static int nvenc_register_frame(AVCodecContext *avctx, const AVFrame *frame)
+{
+ NVENCContext *ctx = avctx->priv_data;
+ NV_ENCODE_API_FUNCTION_LIST *nv = &ctx->nvel.nvenc_funcs;
+ AVHWFramesContext *frames_ctx = (AVHWFramesContext*)avctx->hw_frames_ctx->data;
+ NV_ENC_REGISTER_RESOURCE reg;
+ int i, idx, ret;
+
+ for (i = 0; i < ctx->nb_registered_frames; i++) {
+ if (ctx->registered_frames[i].ptr == (CUdeviceptr)frame->data[0])
+ return i;
+ }
+
+ idx = nvenc_find_free_reg_resource(avctx);
+ if (idx < 0)
+ return idx;
+
+ reg.version = NV_ENC_REGISTER_RESOURCE_VER;
+ reg.resourceType = NV_ENC_INPUT_RESOURCE_TYPE_CUDADEVICEPTR;
+ reg.width = frames_ctx->width;
+ reg.height = frames_ctx->height;
+ reg.bufferFormat = ctx->frames[0].format;
+ reg.pitch = frame->linesize[0];
+ reg.resourceToRegister = frame->data[0];
+
+ ret = nv->nvEncRegisterResource(ctx->nvenc_ctx, ®);
+ if (ret != NV_ENC_SUCCESS) {
+ nvenc_print_error(avctx, ret, "Error registering an input resource");
+ return AVERROR_UNKNOWN;
+ }
+
+ ctx->registered_frames[idx].ptr = (CUdeviceptr)frame->data[0];
+ ctx->registered_frames[idx].regptr = reg.registeredResource;
+ return idx;
+}
+
+static int nvenc_upload_frame(AVCodecContext *avctx, const AVFrame *frame,
+ NVENCFrame *nvenc_frame)
{
NVENCContext *ctx = avctx->priv_data;
NV_ENCODE_API_FUNCTION_LIST *nv = &ctx->nvel.nvenc_funcs;
- NV_ENC_LOCK_INPUT_BUFFER params = { 0 };
- NVENCInputSurface *in = get_input_surface(ctx);
int ret;
- if (!in)
- return AVERROR_BUG;
+ if (avctx->pix_fmt == AV_PIX_FMT_CUDA) {
+ int reg_idx;
- params.version = NV_ENC_LOCK_INPUT_BUFFER_VER;
- params.inputBuffer = in->in;
+ ret = nvenc_register_frame(avctx, frame);
+ if (ret < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Could not register an input CUDA frame\n");
+ return ret;
+ }
+ reg_idx = ret;
+ ret = av_frame_ref(nvenc_frame->in_ref, frame);
+ if (ret < 0)
+ return ret;
- ret = nv->nvEncLockInputBuffer(ctx->nvenc_ctx, ¶ms);
- if (ret != NV_ENC_SUCCESS)
- return nvenc_print_error(avctx, ret, "Cannot lock the buffer");
+ nvenc_frame->in_map.version = NV_ENC_MAP_INPUT_RESOURCE_VER;
+ nvenc_frame->in_map.registeredResource = ctx->registered_frames[reg_idx].regptr;
- ret = nvenc_copy_frame(¶ms, frame);
- if (ret < 0)
- goto fail;
+ ret = nv->nvEncMapInputResource(ctx->nvenc_ctx, &nvenc_frame->in_map);
+ if (ret != NV_ENC_SUCCESS) {
+ av_frame_unref(nvenc_frame->in_ref);
+ return nvenc_print_error(avctx, ret, "Error mapping an input resource");
+ }
- ret = nv->nvEncUnlockInputBuffer(ctx->nvenc_ctx, in->in);
- if (ret != NV_ENC_SUCCESS)
- return nvenc_print_error(avctx, ret, "Cannot unlock the buffer");
+ ctx->registered_frames[reg_idx].mapped = 1;
+ nvenc_frame->reg_idx = reg_idx;
+ nvenc_frame->in = nvenc_frame->in_map.mappedResource;
+ } else {
+ NV_ENC_LOCK_INPUT_BUFFER params = { 0 };
- *in_surf = in;
+ params.version = NV_ENC_LOCK_INPUT_BUFFER_VER;
+ params.inputBuffer = nvenc_frame->in;
- return 0;
+ ret = nv->nvEncLockInputBuffer(ctx->nvenc_ctx, ¶ms);
+ if (ret != NV_ENC_SUCCESS)
+ return nvenc_print_error(avctx, ret, "Cannot lock the buffer");
-fail:
- nv->nvEncUnlockInputBuffer(ctx->nvenc_ctx, in->in);
+ ret = nvenc_copy_frame(¶ms, frame);
+ if (ret < 0) {
+ nv->nvEncUnlockInputBuffer(ctx->nvenc_ctx, nvenc_frame->in);
+ return ret;
+ }
- return ret;
+ ret = nv->nvEncUnlockInputBuffer(ctx->nvenc_ctx, nvenc_frame->in);
+ if (ret != NV_ENC_SUCCESS)
+ return nvenc_print_error(avctx, ret, "Cannot unlock the buffer");
+ }
+
+ return 0;
}
static void nvenc_codec_specific_pic_params(AVCodecContext *avctx,
return av_fifo_generic_read(f, pts, sizeof(*pts), NULL);
}
-static inline int nvenc_enqueue_surface(AVFifoBuffer *f,
- NVENCOutputSurface *surf)
-{
- surf->busy = 1;
- return av_fifo_generic_write(f, &surf, sizeof(surf), NULL);
-}
-
-static inline int nvenc_dequeue_surface(AVFifoBuffer *f,
- NVENCOutputSurface **surf)
-{
- return av_fifo_generic_read(f, surf, sizeof(*surf), NULL);
-}
-
-static int nvenc_set_timestamp(NVENCContext *ctx,
+static int nvenc_set_timestamp(AVCodecContext *avctx,
NV_ENC_LOCK_BITSTREAM *params,
AVPacket *pkt)
{
+ NVENCContext *ctx = avctx->priv_data;
+
pkt->pts = params->outputTimeStamp;
pkt->duration = params->outputDuration;
+ /* generate the first dts by linearly extrapolating the
+ * first two pts values to the past */
+ if (avctx->max_b_frames > 0 && !ctx->first_packet_output &&
+ ctx->initial_pts[1] != AV_NOPTS_VALUE) {
+ int64_t ts0 = ctx->initial_pts[0], ts1 = ctx->initial_pts[1];
+ int64_t delta;
+
+ if ((ts0 < 0 && ts1 > INT64_MAX + ts0) ||
+ (ts0 > 0 && ts1 < INT64_MIN + ts0))
+ return AVERROR(ERANGE);
+ delta = ts1 - ts0;
+
+ if ((delta < 0 && ts0 > INT64_MAX + delta) ||
+ (delta > 0 && ts0 < INT64_MIN + delta))
+ return AVERROR(ERANGE);
+ pkt->dts = ts0 - delta;
+
+ ctx->first_packet_output = 1;
+ return 0;
+ }
return nvenc_dequeue_timestamp(ctx->timestamps, &pkt->dts);
}
-static int nvenc_get_frame(AVCodecContext *avctx, AVPacket *pkt)
+static int nvenc_get_output(AVCodecContext *avctx, AVPacket *pkt)
{
NVENCContext *ctx = avctx->priv_data;
NV_ENCODE_API_FUNCTION_LIST *nv = &ctx->nvel.nvenc_funcs;
NV_ENC_LOCK_BITSTREAM params = { 0 };
- NVENCOutputSurface *out = NULL;
+ NVENCFrame *frame;
int ret;
- ret = nvenc_dequeue_surface(ctx->pending, &out);
+ ret = av_fifo_generic_read(ctx->ready, &frame, sizeof(frame), NULL);
if (ret)
return ret;
params.version = NV_ENC_LOCK_BITSTREAM_VER;
- params.outputBitstream = out->out;
+ params.outputBitstream = frame->out;
ret = nv->nvEncLockBitstream(ctx->nvenc_ctx, ¶ms);
if (ret < 0)
memcpy(pkt->data, params.bitstreamBufferPtr, pkt->size);
- ret = nv->nvEncUnlockBitstream(ctx->nvenc_ctx, out->out);
+ ret = nv->nvEncUnlockBitstream(ctx->nvenc_ctx, frame->out);
if (ret < 0)
return nvenc_print_error(avctx, ret, "Cannot unlock the bitstream");
- out->busy = out->in->locked = 0;
+ if (avctx->pix_fmt == AV_PIX_FMT_CUDA) {
+ nv->nvEncUnmapInputResource(ctx->nvenc_ctx, frame->in_map.mappedResource);
+ av_frame_unref(frame->in_ref);
+ ctx->registered_frames[frame->reg_idx].mapped = 0;
+
+ frame->in = NULL;
+ }
+
+ frame->locked = 0;
- ret = nvenc_set_timestamp(ctx, ¶ms, pkt);
+ ret = nvenc_set_timestamp(avctx, ¶ms, pkt);
if (ret < 0)
return ret;
return 0;
}
+static int output_ready(AVCodecContext *avctx, int flush)
+{
+ NVENCContext *ctx = avctx->priv_data;
+
+ /* when B-frames are enabled, we wait for two initial timestamps to
+ * calculate the first dts */
+ if (!flush && avctx->max_b_frames > 0 &&
+ (ctx->initial_pts[0] == AV_NOPTS_VALUE || ctx->initial_pts[1] == AV_NOPTS_VALUE))
+ return 0;
+ return av_fifo_size(ctx->ready) > 0;
+}
+
int ff_nvenc_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *frame, int *got_packet)
{
NVENCContext *ctx = avctx->priv_data;
NV_ENCODE_API_FUNCTION_LIST *nv = &ctx->nvel.nvenc_funcs;
NV_ENC_PIC_PARAMS params = { 0 };
- NVENCInputSurface *in = NULL;
- NVENCOutputSurface *out = NULL;
- int ret;
+ NVENCFrame *nvenc_frame = NULL;
+ int enc_ret, ret;
params.version = NV_ENC_PIC_PARAMS_VER;
if (frame) {
- ret = nvenc_enqueue_frame(avctx, frame, &in);
- if (ret < 0)
- return ret;
- out = get_output_surface(ctx);
- if (!out)
+ nvenc_frame = get_free_frame(ctx);
+ if (!nvenc_frame) {
+ av_log(avctx, AV_LOG_ERROR, "No free surfaces\n");
return AVERROR_BUG;
+ }
- out->in = in;
+ ret = nvenc_upload_frame(avctx, frame, nvenc_frame);
+ if (ret < 0)
+ return ret;
- params.inputBuffer = in->in;
- params.bufferFmt = in->format;
+ params.inputBuffer = nvenc_frame->in;
+ params.bufferFmt = nvenc_frame->format;
params.inputWidth = frame->width;
params.inputHeight = frame->height;
- params.outputBitstream = out->out;
+ params.outputBitstream = nvenc_frame->out;
params.inputTimeStamp = frame->pts;
if (avctx->flags & AV_CODEC_FLAG_INTERLACED_DCT) {
ret = nvenc_enqueue_timestamp(ctx->timestamps, frame->pts);
if (ret < 0)
return ret;
+
+ if (ctx->initial_pts[0] == AV_NOPTS_VALUE)
+ ctx->initial_pts[0] = frame->pts;
+ else if (ctx->initial_pts[1] == AV_NOPTS_VALUE)
+ ctx->initial_pts[1] = frame->pts;
} else {
params.encodePicFlags = NV_ENC_PIC_FLAG_EOS;
}
- ret = nv->nvEncEncodePicture(ctx->nvenc_ctx, ¶ms);
- if (ret != NV_ENC_SUCCESS &&
- ret != NV_ENC_ERR_NEED_MORE_INPUT)
- return nvenc_print_error(avctx, ret, "Error encoding the frame");
+ enc_ret = nv->nvEncEncodePicture(ctx->nvenc_ctx, ¶ms);
+ if (enc_ret != NV_ENC_SUCCESS &&
+ enc_ret != NV_ENC_ERR_NEED_MORE_INPUT)
+ return nvenc_print_error(avctx, enc_ret, "Error encoding the frame");
- if (out) {
- ret = nvenc_enqueue_surface(ctx->pending, out);
+ if (nvenc_frame) {
+ ret = av_fifo_generic_write(ctx->pending, &nvenc_frame, sizeof(nvenc_frame), NULL);
if (ret < 0)
return ret;
}
- if (ret != NV_ENC_ERR_NEED_MORE_INPUT &&
- av_fifo_size(ctx->pending)) {
- ret = nvenc_get_frame(avctx, pkt);
+ /* all the pending buffers are now ready for output */
+ if (enc_ret == NV_ENC_SUCCESS) {
+ while (av_fifo_size(ctx->pending) > 0) {
+ av_fifo_generic_read(ctx->pending, &nvenc_frame, sizeof(nvenc_frame), NULL);
+ av_fifo_generic_write(ctx->ready, &nvenc_frame, sizeof(nvenc_frame), NULL);
+ }
+ }
+
+ if (output_ready(avctx, !frame)) {
+ ret = nvenc_get_output(avctx, pkt);
if (ret < 0)
return ret;
*got_packet = 1;
projects / ffmpeg / blobdiff