lavc/vaapi_encode: add FF_CODEC_CAP_INIT_CLEANUP caps for encoders

ff_vaapi_encode_close() is not enough to free the resources like cbs if initialization failure happens after codec->configure (except for vp8/vp9). We need to call avctx->codec->close() to deallocate, otherwise memory leak happens. Add FF_CODEC_CAP_INIT_CLEANUP for vaapi encoders and deallocate the resources at free_and_end inside avcodec_open2().

Linjie Fu committed 6 years ago

Commit 2b320681 parent 5767a2e7 files · +6 −1Browse files

Unified · Split

7 files

libavcodec/vaapi_encode.c +0 −1
libavcodec/vaapi_encode_h264.c +1 −0
libavcodec/vaapi_encode_h265.c +1 −0
libavcodec/vaapi_encode_mjpeg.c +1 −0
libavcodec/vaapi_encode_mpeg2.c +1 −0
libavcodec/vaapi_encode_vp8.c +1 −0
libavcodec/vaapi_encode_vp9.c +1 −0

libavcodec/vaapi_encode.c+0−1

@@ -2366,7 +2366,6 @@ av_cold int ff_vaapi_encode_init(AVCodecContext *avctx) · 2365 unmodified lines
2366	2366	return 0;
2367	2367
2368	2368	fail:
2369		− ff_vaapi_encode_close(avctx);
2370	2369	return err;
2371	2370	}
2372	2371

libavcodec/vaapi_encode_h264.c+1−0

@@ -1356,6 +1356,7 @@ AVCodec ff_h264_vaapi_encoder = { · 1355 unmodified lines
1356	1356	.close = &vaapi_encode_h264_close,
1357	1357	.priv_class = &vaapi_encode_h264_class,
1358	1358	.capabilities = AV_CODEC_CAP_DELAY \| AV_CODEC_CAP_HARDWARE,
	1359	+ .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
1359	1360	.defaults = vaapi_encode_h264_defaults,
1360	1361	.pix_fmts = (const enum AVPixelFormat[]) {
1361	1362	AV_PIX_FMT_VAAPI,

libavcodec/vaapi_encode_h265.c+1−0

@@ -1292,6 +1292,7 @@ AVCodec ff_hevc_vaapi_encoder = { · 1291 unmodified lines
1292	1292	.close = &vaapi_encode_h265_close,
1293	1293	.priv_class = &vaapi_encode_h265_class,
1294	1294	.capabilities = AV_CODEC_CAP_DELAY \| AV_CODEC_CAP_HARDWARE,
	1295	+ .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
1295	1296	.defaults = vaapi_encode_h265_defaults,
1296	1297	.pix_fmts = (const enum AVPixelFormat[]) {
1297	1298	AV_PIX_FMT_VAAPI,

libavcodec/vaapi_encode_mjpeg.c+1−0

@@ -565,6 +565,7 @@ AVCodec ff_mjpeg_vaapi_encoder = { · 564 unmodified lines
565	565	.priv_class = &vaapi_encode_mjpeg_class,
566	566	.capabilities = AV_CODEC_CAP_HARDWARE \|
567	567	AV_CODEC_CAP_INTRA_ONLY,
	568	+ .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
568	569	.defaults = vaapi_encode_mjpeg_defaults,
569	570	.pix_fmts = (const enum AVPixelFormat[]) {
570	571	AV_PIX_FMT_VAAPI,

libavcodec/vaapi_encode_mpeg2.c+1−0

@@ -702,6 +702,7 @@ AVCodec ff_mpeg2_vaapi_encoder = { · 701 unmodified lines
702	702	.close = &vaapi_encode_mpeg2_close,
703	703	.priv_class = &vaapi_encode_mpeg2_class,
704	704	.capabilities = AV_CODEC_CAP_DELAY \| AV_CODEC_CAP_HARDWARE,
	705	+ .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
705	706	.defaults = vaapi_encode_mpeg2_defaults,
706	707	.pix_fmts = (const enum AVPixelFormat[]) {
707	708	AV_PIX_FMT_VAAPI,

libavcodec/vaapi_encode_vp8.c+1−0

@@ -257,6 +257,7 @@ AVCodec ff_vp8_vaapi_encoder = { · 256 unmodified lines
257	257	.close = &ff_vaapi_encode_close,
258	258	.priv_class = &vaapi_encode_vp8_class,
259	259	.capabilities = AV_CODEC_CAP_DELAY \| AV_CODEC_CAP_HARDWARE,
	260	+ .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
260	261	.defaults = vaapi_encode_vp8_defaults,
261	262	.pix_fmts = (const enum AVPixelFormat[]) {
262	263	AV_PIX_FMT_VAAPI,

libavcodec/vaapi_encode_vp9.c+1−0

@@ -291,6 +291,7 @@ AVCodec ff_vp9_vaapi_encoder = { · 290 unmodified lines
291	291	.close = &ff_vaapi_encode_close,
292	292	.priv_class = &vaapi_encode_vp9_class,
293	293	.capabilities = AV_CODEC_CAP_DELAY \| AV_CODEC_CAP_HARDWARE,
	294	+ .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
294	295	.defaults = vaapi_encode_vp9_defaults,
295	296	.pix_fmts = (const enum AVPixelFormat[]) {
296	297	AV_PIX_FMT_VAAPI,

lavc/vaapi_encode: add FF_CODEC_CAP_INIT_CLEANUP caps for encoders

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code