avcodec/vaapi_encode: use AVCodecContext.get_encode_buffer()

James Almer committed 5 years ago

Commit a1cd4191 parent 238e08b7 files · +12 −7Browse files

Unified · Split

7 files

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

libavcodec/vaapi_encode.c+1−1

@@ -650,7 +650,7 @@ static int vaapi_encode_output(AVCodecContext *avctx, · 649 unmodified lines
650	650	for (buf = buf_list; buf; buf = buf->next)
651	651	total_size += buf->size;
652	652
653		− err = av_new_packet(pkt, total_size);
	653	+ err = ff_get_encode_buffer(avctx, pkt, total_size, 0);
654	654	ptr = pkt->data;
655	655
656	656	if (err < 0)

libavcodec/vaapi_encode_h264.c+2−1

@@ -1334,7 +1334,8 @@ AVCodec ff_h264_vaapi_encoder = { · 1333 unmodified lines
1334	1334	.receive_packet = &ff_vaapi_encode_receive_packet,
1335	1335	.close = &vaapi_encode_h264_close,
1336	1336	.priv_class = &vaapi_encode_h264_class,
1337		− .capabilities = AV_CODEC_CAP_DELAY \| AV_CODEC_CAP_HARDWARE,
	1337	+ .capabilities = AV_CODEC_CAP_DELAY \| AV_CODEC_CAP_HARDWARE \|
	1338	+ AV_CODEC_CAP_DR1,
1338	1339	.caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
1339	1340	.defaults = vaapi_encode_h264_defaults,
1340	1341	.pix_fmts = (const enum AVPixelFormat[]) {

libavcodec/vaapi_encode_h265.c+2−1

@@ -1312,7 +1312,8 @@ AVCodec ff_hevc_vaapi_encoder = { · 1311 unmodified lines
1312	1312	.receive_packet = &ff_vaapi_encode_receive_packet,
1313	1313	.close = &vaapi_encode_h265_close,
1314	1314	.priv_class = &vaapi_encode_h265_class,
1315		− .capabilities = AV_CODEC_CAP_DELAY \| AV_CODEC_CAP_HARDWARE,
	1315	+ .capabilities = AV_CODEC_CAP_DELAY \| AV_CODEC_CAP_HARDWARE \|
	1316	+ AV_CODEC_CAP_DR1,
1316	1317	.caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
1317	1318	.defaults = vaapi_encode_h265_defaults,
1318	1319	.pix_fmts = (const enum AVPixelFormat[]) {

libavcodec/vaapi_encode_mjpeg.c+1−1

@@ -562,7 +562,7 @@ AVCodec ff_mjpeg_vaapi_encoder = { · 561 unmodified lines
562	562	.receive_packet = &ff_vaapi_encode_receive_packet,
563	563	.close = &vaapi_encode_mjpeg_close,
564	564	.priv_class = &vaapi_encode_mjpeg_class,
565		− .capabilities = AV_CODEC_CAP_HARDWARE,
	565	+ .capabilities = AV_CODEC_CAP_HARDWARE \| AV_CODEC_CAP_DR1,
566	566	.caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
567	567	.defaults = vaapi_encode_mjpeg_defaults,
568	568	.pix_fmts = (const enum AVPixelFormat[]) {

libavcodec/vaapi_encode_mpeg2.c+2−1

@@ -698,7 +698,8 @@ AVCodec ff_mpeg2_vaapi_encoder = { · 697 unmodified lines
698	698	.receive_packet = &ff_vaapi_encode_receive_packet,
699	699	.close = &vaapi_encode_mpeg2_close,
700	700	.priv_class = &vaapi_encode_mpeg2_class,
701		− .capabilities = AV_CODEC_CAP_DELAY \| AV_CODEC_CAP_HARDWARE,
	701	+ .capabilities = AV_CODEC_CAP_DELAY \| AV_CODEC_CAP_HARDWARE \|
	702	+ AV_CODEC_CAP_DR1,
702	703	.caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
703	704	.defaults = vaapi_encode_mpeg2_defaults,
704	705	.pix_fmts = (const enum AVPixelFormat[]) {

libavcodec/vaapi_encode_vp8.c+2−1

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

libavcodec/vaapi_encode_vp9.c+2−1

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