diff options
| -rw-r--r-- | TODO | 4 | ||||
| -rw-r--r-- | src/main.cpp | 25 |
2 files changed, 22 insertions, 7 deletions
@@ -5,7 +5,6 @@ Track window damages and only update then. That is better for output file size. Getting the texture of a window when using a compositor is an nvidia specific limitation. When gpu-screen-recorder supports other gpus then this can be ignored. Remove dependency on glfw (and glew?). Quickly changing workspace and back while recording under i3 breaks the screen recorder. i3 probably unmaps windows in other workspaces. -Remove hw_get_frame as it creates a new cuda device ptr which we dont use! Nvidia 515.57 supports nvfbc direct capture with mouse capture. Check if driver is equal or newer than this and use mouse capture in such situations (with direct capture) supports nvfbc direct capture with mouse capture. See https://trac.ffmpeg.org/wiki/EncodingForStreamingSites for optimizing streaming. Add option to merge audio tracks into one (muxing?) by adding multiple audio streams in one -a arg separated by comma. @@ -15,4 +14,5 @@ Use mov+faststart. Allow recording all monitors/selected monitor without nvfbc by recording the compositor proxy window and only recording the part that matches the monitor(s). Allow recording a region by recording the compositor proxy window / nvfbc window and copying part of it. Resizing the target window to be smaller than the initial size is buggy. The window texture ends up duplicated in the video. -Handle frames (especially for applications with rounded client-side decorations, such as gnome applications. They are huge).
\ No newline at end of file +Handle frames (especially for applications with rounded client-side decorations, such as gnome applications. They are huge). +Use nvenc directly, which allows removing the use of cuda.
\ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 9db23e4..1c02984 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -624,9 +624,13 @@ static AVFrame* open_audio(AVCodecContext *audio_codec_context) { return frame; } +static AVBufferRef* dummy_hw_frame_init(size_t size) { + return av_buffer_alloc(size); +} + static void open_video(AVCodecContext *codec_context, WindowPixmap &window_pixmap, AVBufferRef **device_ctx, - CUgraphicsResource *cuda_graphics_resource, CUcontext cuda_context) { + CUgraphicsResource *cuda_graphics_resource, CUcontext cuda_context, bool use_nvfbc) { int ret; *device_ctx = av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_CUDA); @@ -658,6 +662,11 @@ static void open_video(AVCodecContext *codec_context, hw_frame_context->device_ref = *device_ctx; hw_frame_context->device_ctx = (AVHWDeviceContext *)(*device_ctx)->data; + if(use_nvfbc) { + hw_frame_context->pool = av_buffer_pool_init(1, dummy_hw_frame_init); + hw_frame_context->initial_pool_size = 1; + } + if (av_hwframe_ctx_init(frame_context) < 0) { fprintf(stderr, "Error: Failed to initialize hardware frame context " "(note: ffmpeg version needs to be > 4.0\n"); @@ -1295,7 +1304,7 @@ int main(int argc, char **argv) { AVBufferRef *device_ctx; CUgraphicsResource cuda_graphics_resource; - open_video(video_codec_context, window_pixmap, &device_ctx, &cuda_graphics_resource, cu_ctx); + open_video(video_codec_context, window_pixmap, &device_ctx, &cuda_graphics_resource, cu_ctx, !src_window_id); if(video_stream) avcodec_parameters_from_context(video_stream->codecpar, video_codec_context); @@ -1403,9 +1412,15 @@ int main(int argc, char **argv) { frame->width = video_codec_context->width; frame->height = video_codec_context->height; - if (av_hwframe_get_buffer(video_codec_context->hw_frames_ctx, frame, 0) < 0) { - fprintf(stderr, "Error: av_hwframe_get_buffer failed\n"); - exit(1); + if(src_window_id) { + if (av_hwframe_get_buffer(video_codec_context->hw_frames_ctx, frame, 0) < 0) { + fprintf(stderr, "Error: av_hwframe_get_buffer failed\n"); + exit(1); + } + } else { + frame->hw_frames_ctx = av_buffer_ref(video_codec_context->hw_frames_ctx); + frame->buf[0] = av_buffer_pool_get(((AVHWFramesContext*)video_codec_context->hw_frames_ctx->data)->pool); + frame->extended_data = frame->data; } if(window_pixmap.texture_width < record_width) |