From patchwork Sat Mar 13 00:15:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26371 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3BBC2440494 for ; Sat, 13 Mar 2021 02:16:07 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 05DFA68ABA3; Sat, 13 Mar 2021 02:16:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f174.google.com (mail-qt1-f174.google.com [209.85.160.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2E58A68AB67 for ; Sat, 13 Mar 2021 02:15:59 +0200 (EET) Received: by mail-qt1-f174.google.com with SMTP id 6so5236007qty.3 for ; Fri, 12 Mar 2021 16:15:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=MNKYFGZPmsWto5b4w+XnG1UJCmmFELGx3UNQ6WCw3nI=; b=Bayg6pA8JwbZvCjWYGi7zYvlBR03VPCEMMfv1qyFqS0wZfh1euCSO+XyrzQBtOJZiN SbN+F+LQZt1M0254UUG8zkEcoyKXxdlalTNdID8jHwegcEdcZiyENPltkzWVPJ49cfwq NFmvEFV6v0SjkGLFyhl6zJAfm/BZphUBSKI9Yau5IgAaHV7YKfQel0XT1znT9l17PThO 4DY0nZWsgPGeqyhaBsNYJjTTxddsod+wmUSfOwq4jiYQ1OWCne0QgIvy0P4bCZFAdGTw TCqfxfm5r332N96eSTzhgIqNOep+kvdDlYb6fPzERJixP5bq9vt5eZMqatN1m2c2mCCt TwiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MNKYFGZPmsWto5b4w+XnG1UJCmmFELGx3UNQ6WCw3nI=; b=ODunLhApuuyUeOqtHL619KNxLRIynVrl3lTH1jdHmaydR+7oMtfmqFAgHh2wC6swWa vSB/YQwW8uxVoMppSA26n0q3DfhzMRW2U3KB0Jv4PPjtk8W+lNdDa9P3vBBZsNxZVk8m KHV/V+u4lgMY88MH4MW5Ynic6JknuaeA+5M1TOCcWDAZoXBHaHlGpwf3P2gSzLsCyOj6 ff0n/Z/ftAoLWx3hENjrVG6CCxWiNatz1AdxlMibFDsB1EFNOys7lkbGv88cbsykxVta Yc803zhz7iDpuCXv90NU6pnHAsAPwwCNfPoRjRum39fs0AP057fK7UVcYIQXchI15J2G awJw== X-Gm-Message-State: AOAM532qx6gWNSYFqxhVCcPaMnesvn1pAqMoaXad9cr78QwBfZYhT48c goXCOsQoGOn3/fi4TRJ5Ni7MqjBeylw= X-Google-Smtp-Source: ABdhPJx2MgJo8v/ieAF8LZAc+2nHOste9rEBQPKq7Ft38aO59IrcaSdAfm0mqvPS9ls0OTMjDSAfvA== X-Received: by 2002:ac8:590b:: with SMTP id 11mr7705238qty.205.1615594557800; Fri, 12 Mar 2021 16:15:57 -0800 (PST) Received: from localhost.localdomain ([181.23.75.214]) by smtp.gmail.com with ESMTPSA id 6sm5192267qth.82.2021.03.12.16.15.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Mar 2021 16:15:57 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Mar 2021 21:15:38 -0300 Message-Id: <20210313001538.7240-6-jamrial@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210313001538.7240-1-jamrial@gmail.com> References: <20210313001538.7240-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/vaapi_encode: use AVCodecContext.get_encode_buffer() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- libavcodec/vaapi_encode.c | 2 +- libavcodec/vaapi_encode_h264.c | 3 ++- libavcodec/vaapi_encode_h265.c | 3 ++- libavcodec/vaapi_encode_mjpeg.c | 2 +- libavcodec/vaapi_encode_mpeg2.c | 3 ++- libavcodec/vaapi_encode_vp8.c | 3 ++- libavcodec/vaapi_encode_vp9.c | 3 ++- 7 files changed, 12 insertions(+), 7 deletions(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 3c57c07f67..607858435f 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -650,7 +650,7 @@ static int vaapi_encode_output(AVCodecContext *avctx, for (buf = buf_list; buf; buf = buf->next) total_size += buf->size; - err = av_new_packet(pkt, total_size); + err = ff_get_encode_buffer(avctx, pkt, total_size, 0); ptr = pkt->data; if (err < 0) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index ce73e269f9..6e20e2d015 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -1334,7 +1334,8 @@ AVCodec ff_h264_vaapi_encoder = { .receive_packet = &ff_vaapi_encode_receive_packet, .close = &vaapi_encode_h264_close, .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, .defaults = vaapi_encode_h264_defaults, .pix_fmts = (const enum AVPixelFormat[]) { diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index 2c356fbd38..287ac58690 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -1312,7 +1312,8 @@ AVCodec ff_hevc_vaapi_encoder = { .receive_packet = &ff_vaapi_encode_receive_packet, .close = &vaapi_encode_h265_close, .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, .defaults = vaapi_encode_h265_defaults, .pix_fmts = (const enum AVPixelFormat[]) { diff --git a/libavcodec/vaapi_encode_mjpeg.c b/libavcodec/vaapi_encode_mjpeg.c index 557f59f00c..3878f3eeb9 100644 --- a/libavcodec/vaapi_encode_mjpeg.c +++ b/libavcodec/vaapi_encode_mjpeg.c @@ -562,7 +562,7 @@ AVCodec ff_mjpeg_vaapi_encoder = { .receive_packet = &ff_vaapi_encode_receive_packet, .close = &vaapi_encode_mjpeg_close, .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, .defaults = vaapi_encode_mjpeg_defaults, .pix_fmts = (const enum AVPixelFormat[]) { diff --git a/libavcodec/vaapi_encode_mpeg2.c b/libavcodec/vaapi_encode_mpeg2.c index df2c62b8e7..4c81d785d6 100644 --- a/libavcodec/vaapi_encode_mpeg2.c +++ b/libavcodec/vaapi_encode_mpeg2.c @@ -698,7 +698,8 @@ AVCodec ff_mpeg2_vaapi_encoder = { .receive_packet = &ff_vaapi_encode_receive_packet, .close = &vaapi_encode_mpeg2_close, .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, .defaults = vaapi_encode_mpeg2_defaults, .pix_fmts = (const enum AVPixelFormat[]) { diff --git a/libavcodec/vaapi_encode_vp8.c b/libavcodec/vaapi_encode_vp8.c index 51039fa19a..66cf2321be 100644 --- a/libavcodec/vaapi_encode_vp8.c +++ b/libavcodec/vaapi_encode_vp8.c @@ -255,7 +255,8 @@ AVCodec ff_vp8_vaapi_encoder = { .receive_packet = &ff_vaapi_encode_receive_packet, .close = &ff_vaapi_encode_close, .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, .defaults = vaapi_encode_vp8_defaults, .pix_fmts = (const enum AVPixelFormat[]) { diff --git a/libavcodec/vaapi_encode_vp9.c b/libavcodec/vaapi_encode_vp9.c index 4f3b55ed2d..0e1c52c92a 100644 --- a/libavcodec/vaapi_encode_vp9.c +++ b/libavcodec/vaapi_encode_vp9.c @@ -289,7 +289,8 @@ AVCodec ff_vp9_vaapi_encoder = { .receive_packet = &ff_vaapi_encode_receive_packet, .close = &ff_vaapi_encode_close, .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, .defaults = vaapi_encode_vp9_defaults, .pix_fmts = (const enum AVPixelFormat[]) {