Chiebot-Mirror
/
FFmpeg
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

avcodec/vaapi_encode: use AVCodecContext.get_encode_buffer()

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
pull/371/head
James Almer 4 years ago
parent 238e08b12e
commit a1cd4191e0
7 changed files with 12 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libavcodec/vaapi_encode.c
  2. 3
      libavcodec/vaapi_encode_h264.c
  3. 3
      libavcodec/vaapi_encode_h265.c
  4. 2
      libavcodec/vaapi_encode_mjpeg.c
  5. 3
      libavcodec/vaapi_encode_mpeg2.c
  6. 3
      libavcodec/vaapi_encode_vp8.c
  7. 3
      libavcodec/vaapi_encode_vp9.c

2
libavcodec/vaapi_encode.c
Unescape View File

@ -650,7 +650,7 @@ static int vaapi_encode_output(AVCodecContext *avctx,
for (buf = buf_list; buf; buf = buf->next) for (buf = buf_list; buf; buf = buf->next)
total_size += buf->size; total_size += buf->size;
err = av_new_packet(pkt, total_size); err = ff_get_encode_buffer(avctx, pkt, total_size, 0);
ptr = pkt->data; ptr = pkt->data;
if (err < 0) if (err < 0)

3
libavcodec/vaapi_encode_h264.c
Unescape View File

@ -1334,7 +1334,8 @@ AVCodec ff_h264_vaapi_encoder = {
.receive_packet = &ff_vaapi_encode_receive_packet, .receive_packet = &ff_vaapi_encode_receive_packet,
.close = &vaapi_encode_h264_close, .close = &vaapi_encode_h264_close,
.priv_class = &vaapi_encode_h264_class, .priv_class = &vaapi_encode_h264_class,
.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE, .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE |
AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
.defaults = vaapi_encode_h264_defaults, .defaults = vaapi_encode_h264_defaults,
.pix_fmts = (const enum AVPixelFormat[]) { .pix_fmts = (const enum AVPixelFormat[]) {

3
libavcodec/vaapi_encode_h265.c
Unescape View File

@ -1312,7 +1312,8 @@ AVCodec ff_hevc_vaapi_encoder = {
.receive_packet = &ff_vaapi_encode_receive_packet, .receive_packet = &ff_vaapi_encode_receive_packet,
.close = &vaapi_encode_h265_close, .close = &vaapi_encode_h265_close,
.priv_class = &vaapi_encode_h265_class, .priv_class = &vaapi_encode_h265_class,
.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE, .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE |
AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
.defaults = vaapi_encode_h265_defaults, .defaults = vaapi_encode_h265_defaults,
.pix_fmts = (const enum AVPixelFormat[]) { .pix_fmts = (const enum AVPixelFormat[]) {

2
libavcodec/vaapi_encode_mjpeg.c
Unescape View File

@ -562,7 +562,7 @@ AVCodec ff_mjpeg_vaapi_encoder = {
.receive_packet = &ff_vaapi_encode_receive_packet, .receive_packet = &ff_vaapi_encode_receive_packet,
.close = &vaapi_encode_mjpeg_close, .close = &vaapi_encode_mjpeg_close,
.priv_class = &vaapi_encode_mjpeg_class, .priv_class = &vaapi_encode_mjpeg_class,
.capabilities = AV_CODEC_CAP_HARDWARE, .capabilities = AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
.defaults = vaapi_encode_mjpeg_defaults, .defaults = vaapi_encode_mjpeg_defaults,
.pix_fmts = (const enum AVPixelFormat[]) { .pix_fmts = (const enum AVPixelFormat[]) {

3
libavcodec/vaapi_encode_mpeg2.c
Unescape View File

@ -698,7 +698,8 @@ AVCodec ff_mpeg2_vaapi_encoder = {
.receive_packet = &ff_vaapi_encode_receive_packet, .receive_packet = &ff_vaapi_encode_receive_packet,
.close = &vaapi_encode_mpeg2_close, .close = &vaapi_encode_mpeg2_close,
.priv_class = &vaapi_encode_mpeg2_class, .priv_class = &vaapi_encode_mpeg2_class,
.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE, .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE |
AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
.defaults = vaapi_encode_mpeg2_defaults, .defaults = vaapi_encode_mpeg2_defaults,
.pix_fmts = (const enum AVPixelFormat[]) { .pix_fmts = (const enum AVPixelFormat[]) {

3
libavcodec/vaapi_encode_vp8.c
Unescape View File

@ -255,7 +255,8 @@ AVCodec ff_vp8_vaapi_encoder = {
.receive_packet = &ff_vaapi_encode_receive_packet, .receive_packet = &ff_vaapi_encode_receive_packet,
.close = &ff_vaapi_encode_close, .close = &ff_vaapi_encode_close,
.priv_class = &vaapi_encode_vp8_class, .priv_class = &vaapi_encode_vp8_class,
.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE, .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE |
AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
.defaults = vaapi_encode_vp8_defaults, .defaults = vaapi_encode_vp8_defaults,
.pix_fmts = (const enum AVPixelFormat[]) { .pix_fmts = (const enum AVPixelFormat[]) {

3
libavcodec/vaapi_encode_vp9.c
Unescape View File

@ -289,7 +289,8 @@ AVCodec ff_vp9_vaapi_encoder = {
.receive_packet = &ff_vaapi_encode_receive_packet, .receive_packet = &ff_vaapi_encode_receive_packet,
.close = &ff_vaapi_encode_close, .close = &ff_vaapi_encode_close,
.priv_class = &vaapi_encode_vp9_class, .priv_class = &vaapi_encode_vp9_class,
.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE, .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE |
AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
.defaults = vaapi_encode_vp9_defaults, .defaults = vaapi_encode_vp9_defaults,
.pix_fmts = (const enum AVPixelFormat[]) { .pix_fmts = (const enum AVPixelFormat[]) {

Write Preview
Loading…
Cancel
Save