ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-22 14:26:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

avfilter/vf_hwupload_cuda: use new hwdevice allocation API

Browse Source
This commit is contained in:
Timo Rothenpieler 2016-10-10 12:56:55 +02:00
parent a66835bcb1
commit b0ca90d7cb
1 changed files with 5 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
libavfilter/vf_hwupload_cuda.c
View File

@ -18,7 +18,6 @@
#include "libavutil/buffer.h" #include "libavutil/buffer.h"
#include "libavutil/hwcontext.h" #include "libavutil/hwcontext.h"
#include "libavutil/hwcontext_cuda.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
@ -35,60 +34,14 @@ typedef struct CudaUploadContext {
AVBufferRef *hwframe; AVBufferRef *hwframe;
} CudaUploadContext; } CudaUploadContext;
static void cudaupload_ctx_free(AVHWDeviceContext *ctx)
{
AVCUDADeviceContext *hwctx = ctx->hwctx;
cuCtxDestroy(hwctx->cuda_ctx);
}
static av_cold int cudaupload_init(AVFilterContext *ctx) static av_cold int cudaupload_init(AVFilterContext *ctx)
{ {
CudaUploadContext *s = ctx->priv; CudaUploadContext *s = ctx->priv;
char buf[64] = { 0 };
AVHWDeviceContext *device_ctx; snprintf(buf, sizeof(buf), "%d", s->device_idx);
AVCUDADeviceContext *device_hwctx;
CUdevice device;
CUcontext cuda_ctx = NULL, dummy;
CUresult err;
int ret;
err = cuInit(0); return av_hwdevice_ctx_create(&s->hwdevice, AV_HWDEVICE_TYPE_CUDA, buf, NULL, 0);
if (err != CUDA_SUCCESS) {
av_log(ctx, AV_LOG_ERROR, "Could not initialize the CUDA driver API\n");
return AVERROR_UNKNOWN;
}
err = cuDeviceGet(&device, s->device_idx);
if (err != CUDA_SUCCESS) {
av_log(ctx, AV_LOG_ERROR, "Could not get the device number %d\n", s->device_idx);
return AVERROR_UNKNOWN;
}
err = cuCtxCreate(&cuda_ctx, 0, device);
if (err != CUDA_SUCCESS) {
av_log(ctx, AV_LOG_ERROR, "Error creating a CUDA context\n");
return AVERROR_UNKNOWN;
}
cuCtxPopCurrent(&dummy);
s->hwdevice = av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_CUDA);
if (!s->hwdevice) {
cuCtxDestroy(cuda_ctx);
return AVERROR(ENOMEM);
}
device_ctx = (AVHWDeviceContext*)s->hwdevice->data;
device_ctx->free = cudaupload_ctx_free;
device_hwctx = device_ctx->hwctx;
device_hwctx->cuda_ctx = cuda_ctx;
ret = av_hwdevice_ctx_init(s->hwdevice);
if (ret < 0)
return ret;
return 0;
} }
static av_cold void cudaupload_uninit(AVFilterContext *ctx) static av_cold void cudaupload_uninit(AVFilterContext *ctx)
@ -134,8 +87,8 @@ static int cudaupload_config_output(AVFilterLink *outlink)
hwframe_ctx = (AVHWFramesContext*)s->hwframe->data; hwframe_ctx = (AVHWFramesContext*)s->hwframe->data;
hwframe_ctx->format = AV_PIX_FMT_CUDA; hwframe_ctx->format = AV_PIX_FMT_CUDA;
hwframe_ctx->sw_format = inlink->format; hwframe_ctx->sw_format = inlink->format;
hwframe_ctx->width = FFALIGN(inlink->w, 16); hwframe_ctx->width = inlink->w;
hwframe_ctx->height = FFALIGN(inlink->h, 16); hwframe_ctx->height = inlink->h;
ret = av_hwframe_ctx_init(s->hwframe); ret = av_hwframe_ctx_init(s->hwframe);
if (ret < 0) if (ret < 0)