Skip to content

obs-nvenc: destroy NVENC resources before session cleanup #702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aleksandr-voitenko wants to merge 1 commit into
base: streamlabs
Choose a base branch
from
+28 −11
Open

obs-nvenc: destroy NVENC resources before session cleanup #702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions plugins/obs-nvenc/nvenc-cuda.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,15 @@ bool cuda_init_surfaces(struct nvenc_data *enc)
static void cuda_surface_free(struct nvenc_data *enc, struct nv_cuda_surface *nvsurf)
{
if (nvsurf->res) {
if (nvsurf->mapped_res) {
if (enc->session && nvsurf->mapped_res) {
nv.nvEncUnmapInputResource(enc->session, nvsurf->mapped_res);
nvsurf->mapped_res = NULL;
}
nv.nvEncUnregisterResource(enc->session, nvsurf->res);
if (enc->session)
nv.nvEncUnregisterResource(enc->session, nvsurf->res);
nvsurf->res = NULL;
cu->cuArrayDestroy(nvsurf->tex);
nvsurf->tex = NULL;
}
}

Expand Down
8 changes: 6 additions & 2 deletions plugins/obs-nvenc/nvenc-d3d11.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,15 @@ static void d3d11_texture_free(struct nvenc_data *enc, struct nv_texture *nvtex)
{

if (nvtex->res) {
if (nvtex->mapped_res) {
if (enc->session && nvtex->mapped_res) {
nv.nvEncUnmapInputResource(enc->session, nvtex->mapped_res);
nvtex->mapped_res = NULL;
}
nv.nvEncUnregisterResource(enc->session, nvtex->res);
if (enc->session)
nv.nvEncUnregisterResource(enc->session, nvtex->res);
nvtex->res = NULL;
nvtex->tex->lpVtbl->Release(nvtex->tex);
nvtex->tex = NULL;
}
}

Expand Down
23 changes: 16 additions & 7 deletions plugins/obs-nvenc/nvenc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,26 +960,30 @@ static void nvenc_destroy(void *data)
{
struct nvenc_data *enc = data;

if (enc->encode_started) {
if (enc->session && enc->encode_started) {
NV_ENC_PIC_PARAMS params = {NV_ENC_PIC_PARAMS_VER};
params.encodePicFlags = NV_ENC_PIC_FLAG_EOS;
nv.nvEncEncodePicture(enc->session, &params);
get_encoded_packet(enc, true);
}

for (size_t i = 0; i < enc->bitstreams.num; i++) {
nv_bitstream_free(enc, &enc->bitstreams.array[i]);
}
if (enc->session)
nv.nvEncDestroyEncoder(enc->session);

#ifdef _WIN32
d3d11_free_textures(enc);
d3d11_free(enc);
#else
cuda_opengl_free(enc);
#endif
cuda_free_surfaces(enc);

for (size_t i = 0; i < enc->bitstreams.num; i++) {
nv_bitstream_free(enc, &enc->bitstreams.array[i]);
}

if (enc->session) {
nv.nvEncDestroyEncoder(enc->session);
enc->session = NULL;
}

cuda_ctx_free(enc);

bfree(enc->header);
Expand Down Expand Up @@ -1229,6 +1233,11 @@ bool nvenc_encode_base(struct nvenc_data *enc, struct nv_bitstream *bs, void *pi
if (obs_encoder_has_roi(enc->encoder))
add_roi(enc, &params);

if (!enc->session) {
NV_FAIL("nvenc session is not available");
return false;
}

NVENCSTATUS err = nv.nvEncEncodePicture(enc->session, &params);
if (err != NV_ENC_SUCCESS && err != NV_ENC_ERR_NEED_MORE_INPUT) {
nv_failed(enc->encoder, err, __FUNCTION__, "nvEncEncodePicture");
Expand Down