OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-14 23:34:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

obs-qsv11: Fixup session releasing for Linux

Browse source
This commit is contained in:
Kurt Kartaltepe 2023-08-24 20:22:15 -07:00 committed by Lain
parent 368082d6c0
commit 8e7b697447
3 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/obs-qsv11/QSV_Encoder_Internal.cpp
View file

@ -963,9 +963,9 @@ mfxStatus QSV_Encoder_Internal::ClearData()
}
if ((m_bUseTexAlloc) && (g_numEncodersOpen <= 0)) {
Release();
g_DX_Handle = NULL;
}
Release();
MFXVideoENCODE_Close(m_session);
return sts;
}

8
plugins/obs-qsv11/common_directx11.cpp
View file

@ -2,10 +2,10 @@
#include <map>
ID3D11Device *g_pD3D11Device;
ID3D11DeviceContext *g_pD3D11Ctx;
IDXGIFactory2 *g_pDXGIFactory;
IDXGIAdapter *g_pAdapter;
ID3D11Device *g_pD3D11Device = nullptr;
ID3D11DeviceContext *g_pD3D11Ctx = nullptr;
IDXGIFactory2 *g_pDXGIFactory = nullptr;
IDXGIAdapter *g_pAdapter = nullptr;
std::map<mfxMemId *, mfxHDL> allocResponses;
std::map<mfxHDL, mfxFrameAllocResponse> allocDecodeResponses;

33
plugins/obs-qsv11/common_utils_linux.cpp
View file

@ -21,6 +21,7 @@
static const char *default_h264_device = nullptr;
static const char *default_hevc_device = nullptr;
static const char *default_av1_device = nullptr;
static int default_fd = -1;
mfxStatus simple_alloc(mfxHDL pthis, mfxFrameAllocRequest *request,
mfxFrameAllocResponse *response)
@ -112,21 +113,19 @@ mfxStatus Initialize(mfxVersion ver, mfxSession *pSession,
cfg, (const mfxU8 *)"mfxImplDescription.AccelerationMode",
impl);
// We cant cleanup FDs because Release() is only called for gpu texture sharing cases.
int fd = -1;
if (codec == QSV_CODEC_AVC)
fd = open(default_h264_device, O_RDWR);
if (codec == QSV_CODEC_HEVC)
fd = open(default_hevc_device, O_RDWR);
if (codec == QSV_CODEC_AV1)
fd = open(default_av1_device, O_RDWR);
if (fd < 0) {
if (codec == QSV_CODEC_AVC && default_h264_device)
default_fd = open(default_h264_device, O_RDWR);
if (codec == QSV_CODEC_HEVC && default_hevc_device)
default_fd = open(default_hevc_device, O_RDWR);
if (codec == QSV_CODEC_AV1 && default_av1_device)
default_fd = open(default_av1_device, O_RDWR);
if (default_fd < 0) {
blog(LOG_ERROR, "Failed to open device '%s'",
default_h264_device);
return MFX_ERR_DEVICE_FAILED;
}
mfxHDL vaDisplay = vaGetDisplayDRM(fd);
mfxHDL vaDisplay = vaGetDisplayDRM(default_fd);
if (!vaDisplay) {
return MFX_ERR_DEVICE_FAILED;
}
@ -135,7 +134,8 @@ mfxStatus Initialize(mfxVersion ver, mfxSession *pSession,
if (MFX_ERR_NONE > sts) {
blog(LOG_ERROR, "Failed to initialize MFX");
MSDK_PRINT_RET_MSG(sts);
close(fd);
close(default_fd);
default_fd = -1;
return sts;
}
@ -144,8 +144,9 @@ mfxStatus Initialize(mfxVersion ver, mfxSession *pSession,
int minor;
if (vaInitialize(vaDisplay, &major, &minor) != VA_STATUS_SUCCESS) {
blog(LOG_ERROR, "Failed to initialize VA-API");
close(fd);
vaTerminate(vaDisplay);
close(default_fd);
default_fd = -1;
return MFX_ERR_DEVICE_FAILED;
}
sts = MFXVideoCORE_SetHandle(*pSession, MFX_HANDLE_VA_DISPLAY,
@ -156,7 +157,13 @@ mfxStatus Initialize(mfxVersion ver, mfxSession *pSession,
}
// Release resources (device/display)
void Release(){};
void Release()
{
if (default_fd > 0)
close(default_fd);
default_fd = -1;
}
void mfxGetTime(mfxTime *timestamp)
{