izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix leak of VA driver resources on each encoder init

Browse Source
This commit is contained in:
Cameron Gutman
2023-05-22 17:20:43 -05:00
parent 8a9eed2f6f
commit 5b24148cfa
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/platform/linux/vaapi.cpp
View File

@@ -515,6 +515,16 @@ namespace va {
BOOST_LOG(*(boost::log::sources::severity_logger<int> *) level) << msg; BOOST_LOG(*(boost::log::sources::severity_logger<int> *) level) << msg;
} }
static void
vaapi_hwdevice_ctx_free(AVHWDeviceContext *ctx) {
auto hwctx = (AVVAAPIDeviceContext *) ctx->hwctx;
auto priv = (VAAPIDevicePriv *) ctx->user_opaque;
vaTerminate(hwctx->display);
close(priv->drm_fd);
av_freep(&priv);
}
int int
vaapi_make_hwdevice_ctx(platf::hwdevice_t *base, AVBufferRef **hw_device_buf) { vaapi_make_hwdevice_ctx(platf::hwdevice_t *base, AVBufferRef **hw_device_buf) {
if (!va::initialize) { if (!va::initialize) {
@@ -532,7 +542,6 @@ namespace va {
auto *priv = (VAAPIDevicePriv *) av_mallocz(sizeof(VAAPIDevicePriv)); auto *priv = (VAAPIDevicePriv *) av_mallocz(sizeof(VAAPIDevicePriv));
priv->drm_fd = fd; priv->drm_fd = fd;
priv->drm.fd = fd;
auto fg = util::fail_guard([fd, priv]() { auto fg = util::fail_guard([fd, priv]() {
close(fd); close(fd);
@@ -562,9 +571,13 @@ namespace va {
BOOST_LOG(debug) << "vaapi vendor: "sv << va::queryVendorString(display.get()); BOOST_LOG(debug) << "vaapi vendor: "sv << va::queryVendorString(display.get());
*hw_device_buf = av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_VAAPI); *hw_device_buf = av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_VAAPI);
auto ctx = (AVVAAPIDeviceContext *) ((AVHWDeviceContext *) (*hw_device_buf)->data)->hwctx; auto ctx = (AVHWDeviceContext *) (*hw_device_buf)->data;
ctx->display = display.release(); auto hwctx = (AVVAAPIDeviceContext *) ctx->hwctx;
// Ownership of the VADisplay and DRM fd is now ours to manage via the free() function
hwctx->display = display.release();
ctx->user_opaque = priv;
ctx->free = vaapi_hwdevice_ctx_free;
fg.disable(); fg.disable();
auto err = av_hwdevice_ctx_init(*hw_device_buf); auto err = av_hwdevice_ctx_init(*hw_device_buf);