Rename video encoder cuda to video encoder nvenc

This commit is contained in:
dec05eba
2024-10-09 18:32:26 +02:00
parent 0a8d176ab6
commit 935a7b892e
5 changed files with 53 additions and 53 deletions

View File

@@ -1,16 +0,0 @@
#ifndef GSR_ENCODER_VIDEO_CUDA_H
#define GSR_ENCODER_VIDEO_CUDA_H
#include "video.h"
typedef struct gsr_egl gsr_egl;
typedef struct {
gsr_egl *egl;
bool overclock;
gsr_color_depth color_depth;
} gsr_video_encoder_cuda_params;
gsr_video_encoder* gsr_video_encoder_cuda_create(const gsr_video_encoder_cuda_params *params);
#endif /* GSR_ENCODER_VIDEO_CUDA_H */

View File

@@ -0,0 +1,16 @@
#ifndef GSR_ENCODER_VIDEO_NVENC_H
#define GSR_ENCODER_VIDEO_NVENC_H
#include "video.h"
typedef struct gsr_egl gsr_egl;
typedef struct {
gsr_egl *egl;
bool overclock;
gsr_color_depth color_depth;
} gsr_video_encoder_nvenc_params;
gsr_video_encoder* gsr_video_encoder_nvenc_create(const gsr_video_encoder_nvenc_params *params);
#endif /* GSR_ENCODER_VIDEO_NVENC_H */

View File

@@ -14,7 +14,7 @@ src = [
'src/capture/xcomposite.c', 'src/capture/xcomposite.c',
'src/capture/kms.c', 'src/capture/kms.c',
'src/encoder/video/video.c', 'src/encoder/video/video.c',
'src/encoder/video/cuda.c', 'src/encoder/video/nvenc.c',
'src/encoder/video/vaapi.c', 'src/encoder/video/vaapi.c',
'src/encoder/video/vulkan.c', 'src/encoder/video/vulkan.c',
'src/encoder/video/software.c', 'src/encoder/video/software.c',

View File

@@ -1,4 +1,4 @@
#include "../../../include/encoder/video/cuda.h" #include "../../../include/encoder/video/nvenc.h"
#include "../../../include/egl.h" #include "../../../include/egl.h"
#include "../../../include/cuda.h" #include "../../../include/cuda.h"
@@ -8,7 +8,7 @@
#include <stdlib.h> #include <stdlib.h>
typedef struct { typedef struct {
gsr_video_encoder_cuda_params params; gsr_video_encoder_nvenc_params params;
unsigned int target_textures[2]; unsigned int target_textures[2];
@@ -18,12 +18,12 @@ typedef struct {
CUgraphicsResource cuda_graphics_resources[2]; CUgraphicsResource cuda_graphics_resources[2];
CUarray mapped_arrays[2]; CUarray mapped_arrays[2];
CUstream cuda_stream; CUstream cuda_stream;
} gsr_video_encoder_cuda; } gsr_video_encoder_nvenc;
static bool gsr_video_encoder_cuda_setup_context(gsr_video_encoder_cuda *self, AVCodecContext *video_codec_context) { static bool gsr_video_encoder_nvenc_setup_context(gsr_video_encoder_nvenc *self, AVCodecContext *video_codec_context) {
self->device_ctx = av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_CUDA); self->device_ctx = av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_CUDA);
if(!self->device_ctx) { if(!self->device_ctx) {
fprintf(stderr, "gsr error: gsr_video_encoder_cuda_setup_context failed: failed to create hardware device context\n"); fprintf(stderr, "gsr error: gsr_video_encoder_nvenc_setup_context failed: failed to create hardware device context\n");
return false; return false;
} }
@@ -31,14 +31,14 @@ static bool gsr_video_encoder_cuda_setup_context(gsr_video_encoder_cuda *self, A
AVCUDADeviceContext *cuda_device_context = (AVCUDADeviceContext*)hw_device_context->hwctx; AVCUDADeviceContext *cuda_device_context = (AVCUDADeviceContext*)hw_device_context->hwctx;
cuda_device_context->cuda_ctx = self->cuda.cu_ctx; cuda_device_context->cuda_ctx = self->cuda.cu_ctx;
if(av_hwdevice_ctx_init(self->device_ctx) < 0) { if(av_hwdevice_ctx_init(self->device_ctx) < 0) {
fprintf(stderr, "gsr error: gsr_video_encoder_cuda_setup_context failed: failed to create hardware device context\n"); fprintf(stderr, "gsr error: gsr_video_encoder_nvenc_setup_context failed: failed to create hardware device context\n");
av_buffer_unref(&self->device_ctx); av_buffer_unref(&self->device_ctx);
return false; return false;
} }
AVBufferRef *frame_context = av_hwframe_ctx_alloc(self->device_ctx); AVBufferRef *frame_context = av_hwframe_ctx_alloc(self->device_ctx);
if(!frame_context) { if(!frame_context) {
fprintf(stderr, "gsr error: gsr_video_encoder_cuda_setup_context failed: failed to create hwframe context\n"); fprintf(stderr, "gsr error: gsr_video_encoder_nvenc_setup_context failed: failed to create hwframe context\n");
av_buffer_unref(&self->device_ctx); av_buffer_unref(&self->device_ctx);
return false; return false;
} }
@@ -51,7 +51,7 @@ static bool gsr_video_encoder_cuda_setup_context(gsr_video_encoder_cuda *self, A
hw_frame_context->device_ctx = (AVHWDeviceContext*)self->device_ctx->data; hw_frame_context->device_ctx = (AVHWDeviceContext*)self->device_ctx->data;
if (av_hwframe_ctx_init(frame_context) < 0) { if (av_hwframe_ctx_init(frame_context) < 0) {
fprintf(stderr, "gsr error: gsr_video_encoder_cuda_setup_context failed: failed to initialize hardware frame context " fprintf(stderr, "gsr error: gsr_video_encoder_nvenc_setup_context failed: failed to initialize hardware frame context "
"(note: ffmpeg version needs to be > 4.0)\n"); "(note: ffmpeg version needs to be > 4.0)\n");
av_buffer_unref(&self->device_ctx); av_buffer_unref(&self->device_ctx);
//av_buffer_unref(&frame_context); //av_buffer_unref(&frame_context);
@@ -96,10 +96,10 @@ static bool cuda_register_opengl_texture(gsr_cuda *cuda, CUgraphicsResource *cud
return true; return true;
} }
static bool gsr_video_encoder_cuda_setup_textures(gsr_video_encoder_cuda *self, AVCodecContext *video_codec_context, AVFrame *frame) { static bool gsr_video_encoder_nvenc_setup_textures(gsr_video_encoder_nvenc *self, AVCodecContext *video_codec_context, AVFrame *frame) {
const int res = av_hwframe_get_buffer(video_codec_context->hw_frames_ctx, frame, 0); const int res = av_hwframe_get_buffer(video_codec_context->hw_frames_ctx, frame, 0);
if(res < 0) { if(res < 0) {
fprintf(stderr, "gsr error: gsr_video_encoder_cuda_setup_textures: av_hwframe_get_buffer failed: %d\n", res); fprintf(stderr, "gsr error: gsr_video_encoder_nvenc_setup_textures: av_hwframe_get_buffer failed: %d\n", res);
return false; return false;
} }
@@ -111,7 +111,7 @@ static bool gsr_video_encoder_cuda_setup_textures(gsr_video_encoder_cuda *self,
for(int i = 0; i < 2; ++i) { for(int i = 0; i < 2; ++i) {
self->target_textures[i] = gl_create_texture(self->params.egl, video_codec_context->width / div[i], video_codec_context->height / div[i], self->params.color_depth == GSR_COLOR_DEPTH_8_BITS ? internal_formats_nv12[i] : internal_formats_p010[i], formats[i]); self->target_textures[i] = gl_create_texture(self->params.egl, video_codec_context->width / div[i], video_codec_context->height / div[i], self->params.color_depth == GSR_COLOR_DEPTH_8_BITS ? internal_formats_nv12[i] : internal_formats_p010[i], formats[i]);
if(self->target_textures[i] == 0) { if(self->target_textures[i] == 0) {
fprintf(stderr, "gsr error: gsr_video_encoder_cuda_setup_textures: failed to create opengl texture\n"); fprintf(stderr, "gsr error: gsr_video_encoder_nvenc_setup_textures: failed to create opengl texture\n");
return false; return false;
} }
@@ -123,32 +123,32 @@ static bool gsr_video_encoder_cuda_setup_textures(gsr_video_encoder_cuda *self,
return true; return true;
} }
static void gsr_video_encoder_cuda_stop(gsr_video_encoder_cuda *self, AVCodecContext *video_codec_context); static void gsr_video_encoder_nvenc_stop(gsr_video_encoder_nvenc *self, AVCodecContext *video_codec_context);
static bool gsr_video_encoder_cuda_start(gsr_video_encoder *encoder, AVCodecContext *video_codec_context, AVFrame *frame) { static bool gsr_video_encoder_nvenc_start(gsr_video_encoder *encoder, AVCodecContext *video_codec_context, AVFrame *frame) {
gsr_video_encoder_cuda *self = encoder->priv; gsr_video_encoder_nvenc *self = encoder->priv;
const bool overclock = gsr_egl_get_display_server(self->params.egl) == GSR_DISPLAY_SERVER_X11 ? self->params.overclock : false; const bool overclock = gsr_egl_get_display_server(self->params.egl) == GSR_DISPLAY_SERVER_X11 ? self->params.overclock : false;
if(!gsr_cuda_load(&self->cuda, self->params.egl->x11.dpy, overclock)) { if(!gsr_cuda_load(&self->cuda, self->params.egl->x11.dpy, overclock)) {
fprintf(stderr, "gsr error: gsr_video_encoder_cuda_start: failed to load cuda\n"); fprintf(stderr, "gsr error: gsr_video_encoder_nvenc_start: failed to load cuda\n");
gsr_video_encoder_cuda_stop(self, video_codec_context); gsr_video_encoder_nvenc_stop(self, video_codec_context);
return false; return false;
} }
if(!gsr_video_encoder_cuda_setup_context(self, video_codec_context)) { if(!gsr_video_encoder_nvenc_setup_context(self, video_codec_context)) {
gsr_video_encoder_cuda_stop(self, video_codec_context); gsr_video_encoder_nvenc_stop(self, video_codec_context);
return false; return false;
} }
if(!gsr_video_encoder_cuda_setup_textures(self, video_codec_context, frame)) { if(!gsr_video_encoder_nvenc_setup_textures(self, video_codec_context, frame)) {
gsr_video_encoder_cuda_stop(self, video_codec_context); gsr_video_encoder_nvenc_stop(self, video_codec_context);
return false; return false;
} }
return true; return true;
} }
void gsr_video_encoder_cuda_stop(gsr_video_encoder_cuda *self, AVCodecContext *video_codec_context) { void gsr_video_encoder_nvenc_stop(gsr_video_encoder_nvenc *self, AVCodecContext *video_codec_context) {
self->params.egl->glDeleteTextures(2, self->target_textures); self->params.egl->glDeleteTextures(2, self->target_textures);
self->target_textures[0] = 0; self->target_textures[0] = 0;
self->target_textures[1] = 0; self->target_textures[1] = 0;
@@ -171,8 +171,8 @@ void gsr_video_encoder_cuda_stop(gsr_video_encoder_cuda *self, AVCodecContext *v
gsr_cuda_unload(&self->cuda); gsr_cuda_unload(&self->cuda);
} }
static void gsr_video_encoder_cuda_copy_textures_to_frame(gsr_video_encoder *encoder, AVFrame *frame, gsr_color_conversion *color_conversion) { static void gsr_video_encoder_nvenc_copy_textures_to_frame(gsr_video_encoder *encoder, AVFrame *frame, gsr_color_conversion *color_conversion) {
gsr_video_encoder_cuda *self = encoder->priv; gsr_video_encoder_nvenc *self = encoder->priv;
const int div[2] = {1, 2}; // divide UV texture size by 2 because chroma is half size const int div[2] = {1, 2}; // divide UV texture size by 2 because chroma is half size
for(int i = 0; i < 2; ++i) { for(int i = 0; i < 2; ++i) {
CUDA_MEMCPY2D memcpy_struct; CUDA_MEMCPY2D memcpy_struct;
@@ -198,26 +198,26 @@ static void gsr_video_encoder_cuda_copy_textures_to_frame(gsr_video_encoder *enc
self->cuda.cuStreamSynchronize(self->cuda_stream); self->cuda.cuStreamSynchronize(self->cuda_stream);
} }
static void gsr_video_encoder_cuda_get_textures(gsr_video_encoder *encoder, unsigned int *textures, int *num_textures, gsr_destination_color *destination_color) { static void gsr_video_encoder_nvenc_get_textures(gsr_video_encoder *encoder, unsigned int *textures, int *num_textures, gsr_destination_color *destination_color) {
gsr_video_encoder_cuda *self = encoder->priv; gsr_video_encoder_nvenc *self = encoder->priv;
textures[0] = self->target_textures[0]; textures[0] = self->target_textures[0];
textures[1] = self->target_textures[1]; textures[1] = self->target_textures[1];
*num_textures = 2; *num_textures = 2;
*destination_color = self->params.color_depth == GSR_COLOR_DEPTH_10_BITS ? GSR_DESTINATION_COLOR_P010 : GSR_DESTINATION_COLOR_NV12; *destination_color = self->params.color_depth == GSR_COLOR_DEPTH_10_BITS ? GSR_DESTINATION_COLOR_P010 : GSR_DESTINATION_COLOR_NV12;
} }
static void gsr_video_encoder_cuda_destroy(gsr_video_encoder *encoder, AVCodecContext *video_codec_context) { static void gsr_video_encoder_nvenc_destroy(gsr_video_encoder *encoder, AVCodecContext *video_codec_context) {
gsr_video_encoder_cuda_stop(encoder->priv, video_codec_context); gsr_video_encoder_nvenc_stop(encoder->priv, video_codec_context);
free(encoder->priv); free(encoder->priv);
free(encoder); free(encoder);
} }
gsr_video_encoder* gsr_video_encoder_cuda_create(const gsr_video_encoder_cuda_params *params) { gsr_video_encoder* gsr_video_encoder_nvenc_create(const gsr_video_encoder_nvenc_params *params) {
gsr_video_encoder *encoder = calloc(1, sizeof(gsr_video_encoder)); gsr_video_encoder *encoder = calloc(1, sizeof(gsr_video_encoder));
if(!encoder) if(!encoder)
return NULL; return NULL;
gsr_video_encoder_cuda *encoder_cuda = calloc(1, sizeof(gsr_video_encoder_cuda)); gsr_video_encoder_nvenc *encoder_cuda = calloc(1, sizeof(gsr_video_encoder_nvenc));
if(!encoder_cuda) { if(!encoder_cuda) {
free(encoder); free(encoder);
return NULL; return NULL;
@@ -226,10 +226,10 @@ gsr_video_encoder* gsr_video_encoder_cuda_create(const gsr_video_encoder_cuda_pa
encoder_cuda->params = *params; encoder_cuda->params = *params;
*encoder = (gsr_video_encoder) { *encoder = (gsr_video_encoder) {
.start = gsr_video_encoder_cuda_start, .start = gsr_video_encoder_nvenc_start,
.copy_textures_to_frame = gsr_video_encoder_cuda_copy_textures_to_frame, .copy_textures_to_frame = gsr_video_encoder_nvenc_copy_textures_to_frame,
.get_textures = gsr_video_encoder_cuda_get_textures, .get_textures = gsr_video_encoder_nvenc_get_textures,
.destroy = gsr_video_encoder_cuda_destroy, .destroy = gsr_video_encoder_nvenc_destroy,
.priv = encoder_cuda .priv = encoder_cuda
}; };

View File

@@ -6,7 +6,7 @@ extern "C" {
#include "../include/capture/portal.h" #include "../include/capture/portal.h"
#include "../include/dbus.h" #include "../include/dbus.h"
#endif #endif
#include "../include/encoder/video/cuda.h" #include "../include/encoder/video/nvenc.h"
#include "../include/encoder/video/vaapi.h" #include "../include/encoder/video/vaapi.h"
#include "../include/encoder/video/vulkan.h" #include "../include/encoder/video/vulkan.h"
#include "../include/encoder/video/software.h" #include "../include/encoder/video/software.h"
@@ -1741,11 +1741,11 @@ static gsr_video_encoder* create_video_encoder(gsr_egl *egl, bool overclock, gsr
break; break;
} }
case GSR_GPU_VENDOR_NVIDIA: { case GSR_GPU_VENDOR_NVIDIA: {
gsr_video_encoder_cuda_params params; gsr_video_encoder_nvenc_params params;
params.egl = egl; params.egl = egl;
params.overclock = overclock; params.overclock = overclock;
params.color_depth = color_depth; params.color_depth = color_depth;
video_encoder = gsr_video_encoder_cuda_create(&params); video_encoder = gsr_video_encoder_nvenc_create(&params);
break; break;
} }
} }