From patchwork Sat Mar 13 00:15:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26365 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 2DA0D44BE73 for ; Sat, 13 Mar 2021 02:16:01 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 196D268AB0E; Sat, 13 Mar 2021 02:16:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BCE5E68A551 for ; Sat, 13 Mar 2021 02:15:54 +0200 (EET) Received: by mail-qt1-f169.google.com with SMTP id 73so5245048qtg.13 for ; Fri, 12 Mar 2021 16:15:54 -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=LJrl129qoJKUblyMeSwCanhcMvQman69DklPNYBBOng=; b=EDUdN8lBOwfhT5c44nFxEtkHf1A8waFIXBXwPFZVz4rfm/4DPmpr8m+Bdf2Aiopfe0 g5BsaSC9BiQFOrPKuCTlG4AlCb/89RWZy6in7AEMm7QjArR0KTmz1oh2KQtQAkv3VsZm ALq3aEZe6GZ7XLLKf7bPHpy3In1dQHatMJULCxjIv6eSBO0te6giSeY8noq2BIqTHu6R 80MOjMVPY0FtCG5od1g0Qha08+scA2yvqGeAyMcsCk0qmczyCxrZqpOVYEgiZqo3L7k5 W4aLLuZc4AR3HKaGM7Gq4SGmAaYshOrq244hPMNnkMw+lRO1mApWxgZQiGfdS17KAF8o eJxw== 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=LJrl129qoJKUblyMeSwCanhcMvQman69DklPNYBBOng=; b=K1htKwqNuSfTpRV4YBtGFfKYHKgXWg40VCRUdfmfgOiWX7zSTR63DwkwafGb9TetKc hMPQ96pOXK7lXtEPykLggRYrtKXEdgj0Rvp+7vKy/wU2XEqehxc7hL6fJcWNMNUNtvvh NYxP+mdJkjhrSjuZ+QX5CPW8uHma97m4N42mkBd23J9fDHGn4Hq1I5w0b22Jzr5O8idF RVJmdZPc3UT4NqzLQCKE3y9MZETrkgxCoCrTHicnMzCg9FJghZ8ggM2mjzF+OaHf5lGJ ByNCuIsJr55EOCDmiR7Z5/qQsLVVm29v3hRTKRz/P478QpzKjIEyXmIrtuZjvgxTR0bj YQRw== X-Gm-Message-State: AOAM53251VklsBbLxREdvML0N1r2PLVcixmy7qyC/KVmgklHLwggem7O KcFnLuH1/yuwewA+nPn8mgBhNCNsZ44= X-Google-Smtp-Source: ABdhPJzQ02Iuz/MYoYX8TeGoHDwQ3r8rTZ488+ARNA/XS8RMNuSzn3Wn2IvA1qELHKLiExZh+nrlFQ== X-Received: by 2002:aed:2746:: with SMTP id n64mr6206001qtd.370.1615594553069; Fri, 12 Mar 2021 16:15:53 -0800 (PST) Received: from localhost.localdomain ([181.23.75.214]) by smtp.gmail.com with ESMTPSA id 6sm5192267qth.82.2021.03.12.16.15.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Mar 2021 16:15:52 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Mar 2021 21:15:34 -0300 Message-Id: <20210313001538.7240-2-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 1/5] avcodec/amfenc: 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/amfenc.c | 2 +- libavcodec/amfenc_h264.c | 3 ++- libavcodec/amfenc_hevc.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c index e234cfd354..fb23ed738c 100644 --- a/libavcodec/amfenc.c +++ b/libavcodec/amfenc.c @@ -452,7 +452,7 @@ static int amf_copy_buffer(AVCodecContext *avctx, AVPacket *pkt, AMFBuffer *buff int64_t timestamp = AV_NOPTS_VALUE; int64_t size = buffer->pVtbl->GetSize(buffer); - if ((ret = av_new_packet(pkt, size)) < 0) { + if ((ret = ff_get_encode_buffer(avctx, pkt, size, 0)) < 0) { return ret; } memcpy(pkt->data, buffer->pVtbl->GetNative(buffer), size); diff --git a/libavcodec/amfenc_h264.c b/libavcodec/amfenc_h264.c index 622ee85946..fe30d7f11d 100644 --- a/libavcodec/amfenc_h264.c +++ b/libavcodec/amfenc_h264.c @@ -388,7 +388,8 @@ AVCodec ff_h264_amf_encoder = { .priv_data_size = sizeof(AmfContext), .priv_class = &h264_amf_class, .defaults = defaults, - .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, .pix_fmts = ff_amf_pix_fmts, .wrapper_name = "amf", diff --git a/libavcodec/amfenc_hevc.c b/libavcodec/amfenc_hevc.c index a1225c09e3..b5c840e5f3 100644 --- a/libavcodec/amfenc_hevc.c +++ b/libavcodec/amfenc_hevc.c @@ -320,7 +320,8 @@ AVCodec ff_hevc_amf_encoder = { .priv_data_size = sizeof(AmfContext), .priv_class = &hevc_amf_class, .defaults = defaults, - .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, .pix_fmts = ff_amf_pix_fmts, .wrapper_name = "amf",