From patchwork Sat Mar 13 00:15:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26370 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 238AC44BE75 for ; Sat, 13 Mar 2021 02:16:06 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 08E0D68AB76; Sat, 13 Mar 2021 02:16:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F315868A8F8 for ; Sat, 13 Mar 2021 02:15:57 +0200 (EET) Received: by mail-qk1-f173.google.com with SMTP id d20so26253308qkc.2 for ; Fri, 12 Mar 2021 16:15:57 -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=VDpLw7VEqHrdzOqYFt0KFmovwnROReqC//FlGJrcLVw=; b=FDSNbw6gSLRYxESZ3p5un2HMYCmamKG5PInqHxcV0jmigykw3WG+yPbOo3icoZF1yI zjlS7859m0iBm69tuUynX/EuEIBA4BxfQVMlVXENlUGCLohw7CCz68sNtF0e9jyTY+Da pK3pcIPtl4rqKBgUUjVmsX3/coq4UvNAe40we8geM7ksS+nFoJ0p1chDr2WRjowqiOQL a7z9RhnZOE6HQp+BmaWnjIQNNHtJS6fXhZp3JQTTVQJYrRZFhyHO7yQHWmMnuGkUA2Wi c2yO3HO0qGyJMNX2C93t42cNMPSSB18PDFKOewgVnKBn7IgAZKdcPhvWa5H3769QvKlS bAqA== 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=VDpLw7VEqHrdzOqYFt0KFmovwnROReqC//FlGJrcLVw=; b=QEUoAG5hqZPx4iV9NBnDkpq/VgDqKGuXuvbPCnHFJHR7QsgjPuhHK1HvlAzYnn5vV8 Oimr5Thjdg8Py/3DscwU5b7H/aKVbPsGljv5fwnfj7DwqqYYzF3yeIX/Ql4dAQdNGVi2 ZhhnvrWkud3KIPiIttwVGkvB61tVgSVQph8iLhLgEN2Fi0P/kynedSE41y5KK/MIbexk u8wlRC0s86j95fxGfDWiWkhYovOzlKsoq8LBwY8+Ik140+Qr7sqWIXcQJuhQefHcDJxa zPZRce4H/uPWt2JTRNlun6es+istu6wfWSOgtNEcPclnNFX3OyIGeETZ8gtMcyvgln1/ D9Cg== X-Gm-Message-State: AOAM532n6uFcGDb+LsCkwg8jew2FQUjTsgZceFXwV6gOXFp4gJk8K5AM vvqSmVN1VnSgNgvALeS5lnUKgUQxMl8= X-Google-Smtp-Source: ABdhPJzWFIyKGjaHIkaLe5T7EUMSYRT5Tpp7istNLA/dbm2FJmFM+8WEy1yavyUHDC8QqmznHi0Xmg== X-Received: by 2002:a05:620a:228:: with SMTP id u8mr15247304qkm.443.1615594556579; Fri, 12 Mar 2021 16:15:56 -0800 (PST) Received: from localhost.localdomain ([181.23.75.214]) by smtp.gmail.com with ESMTPSA id 6sm5192267qth.82.2021.03.12.16.15.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Mar 2021 16:15:56 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Mar 2021 21:15:37 -0300 Message-Id: <20210313001538.7240-5-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 4/5] avcodec/nvenc: 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/nvenc.c | 2 +- libavcodec/nvenc_h264.c | 2 +- libavcodec/nvenc_hevc.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index fbf55ebc9d..dddee8cac1 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -1971,7 +1971,7 @@ static int process_output_surface(AVCodecContext *avctx, AVPacket *pkt, NvencSur goto error; } - res = av_new_packet(pkt, lock_params.bitstreamSizeInBytes); + res = ff_get_encode_buffer(avctx, pkt, lock_params.bitstreamSizeInBytes, 0); if (res < 0) { p_nvenc->nvEncUnlockBitstream(ctx->nvencoder, tmpoutsurf->output_surface); diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c index 4c118d3138..4c2585876e 100644 --- a/libavcodec/nvenc_h264.c +++ b/libavcodec/nvenc_h264.c @@ -287,7 +287,7 @@ AVCodec ff_h264_nvenc_encoder = { .priv_class = &h264_nvenc_class, .defaults = defaults, .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE | - AV_CODEC_CAP_ENCODER_FLUSH, + AV_CODEC_CAP_ENCODER_FLUSH | AV_CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .pix_fmts = ff_nvenc_pix_fmts, .wrapper_name = "nvenc", diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c index 031d2ef44e..441e7871d2 100644 --- a/libavcodec/nvenc_hevc.c +++ b/libavcodec/nvenc_hevc.c @@ -237,7 +237,7 @@ AVCodec ff_hevc_nvenc_encoder = { .defaults = defaults, .pix_fmts = ff_nvenc_pix_fmts, .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE | - AV_CODEC_CAP_ENCODER_FLUSH, + AV_CODEC_CAP_ENCODER_FLUSH | AV_CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .wrapper_name = "nvenc", .hw_configs = ff_nvenc_hw_configs,