From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 97ECC44F2A for ; Fri, 9 Dec 2022 19:20:37 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CDD4A68B890; Fri, 9 Dec 2022 21:20:33 +0200 (EET) Received: from mail.overt.org (mail.overt.org [72.14.183.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 04C1F6899CC for ; Fri, 9 Dec 2022 21:20:27 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=overt.org; s=mail; t=1670613625; bh=Vsq3t8QrhX7IPKnr3YhQd5/n/ZXYZK31lg4ignLhzRo=; h=Date:From:To:Subject:In-Reply-To:References:From; b=tmNcEBM1Qg7E91Pnuv0Hyhb24T/hDiZOPqww6YB7A41p56zMxvG+iFBIK7UO47v1y loKaRHeDXh1Pu29qeetw0BaXNLyi4t8sE1VTZn99ejdfyLS8e2BACKHQEjtBgFV+Q/ 5Aqy6cEYWdxe3o4mwLUbp5/ERPDfDrbVQfd5Okjuu4TaENYRx4Fyos1lJ7mDr4oSH9 yWk4ActU3GnOZCx8mWX8ZxqjIfwWI+cudUhRk2bKUE4n+cUvmAg3wP2tK5PLghpMeT qBATOuYu1AsKohRxOAyvxtuzHZdxVfjvzpQc6gtB8gc8+dJNpoQr49Z1FwJXMq8ZdQ 7C0nhKWCQy+6g== Received: from authenticated-user (mail.overt.org [72.14.183.176]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.overt.org (Postfix) with ESMTPSA id 9526662A0F for ; Fri, 9 Dec 2022 13:20:25 -0600 (CST) Date: Fri, 9 Dec 2022 11:20:24 -0800 From: Philip Langdale To: ffmpeg-devel@ffmpeg.org Message-ID: <20221209112024.63cdb3b9@fido7> In-Reply-To: <20221209141617.13641-2-timo@rothenpieler.org> References: <20221205222559.107006-1-timo@rothenpieler.org> <20221209141617.13641-1-timo@rothenpieler.org> <20221209141617.13641-2-timo@rothenpieler.org> MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH v2 2/2] avcodec/nvdec: make explicit copy of frames unless user requested otherwise X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Fri, 9 Dec 2022 15:16:17 +0100 Timo Rothenpieler wrote: > --- > libavcodec/nvdec.c | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/nvdec.c b/libavcodec/nvdec.c > index fbaedf0b6b..a477449d14 100644 > --- a/libavcodec/nvdec.c > +++ b/libavcodec/nvdec.c > @@ -51,6 +51,8 @@ typedef struct NVDECDecoder { > > CudaFunctions *cudl; > CuvidFunctions *cvdl; > + > + int unsafe_output; > } NVDECDecoder; > > typedef struct NVDECFramePool { > @@ -344,6 +346,8 @@ int ff_nvdec_decode_init(AVCodecContext *avctx) > int cuvid_codec_type, cuvid_chroma_format, chroma_444; > int ret = 0; > > + int unsafe_output = !!(avctx->hwaccel_flags & > AV_HWACCEL_FLAG_UNSAFE_OUTPUT); + > sw_desc = av_pix_fmt_desc_get(avctx->sw_pix_fmt); > if (!sw_desc) > return AVERROR_BUG; > @@ -402,7 +406,7 @@ int ff_nvdec_decode_init(AVCodecContext *avctx) > params.CodecType = cuvid_codec_type; > params.ChromaFormat = cuvid_chroma_format; > params.ulNumDecodeSurfaces = frames_ctx->initial_pool_size; > - params.ulNumOutputSurfaces = frames_ctx->initial_pool_size; > + params.ulNumOutputSurfaces = unsafe_output ? > frames_ctx->initial_pool_size : 1; > ret = nvdec_decoder_create(&ctx->decoder_ref, > frames_ctx->device_ref, ¶ms, avctx); if (ret < 0) { > @@ -417,6 +421,7 @@ int ff_nvdec_decode_init(AVCodecContext *avctx) > } > > decoder = (NVDECDecoder*)ctx->decoder_ref->data; > + decoder->unsafe_output = unsafe_output; > decoder->real_hw_frames_ref = real_hw_frames_ref; > real_hw_frames_ref = NULL; > > @@ -554,7 +559,11 @@ copy_fail: > > finish: > CHECK_CU(decoder->cudl->cuCtxPopCurrent(&dummy)); > - return ret; > + > + if (ret < 0 || decoder->unsafe_output) > + return ret; > + > + return av_frame_make_writable(frame); > } > > int ff_nvdec_start_frame(AVCodecContext *avctx, AVFrame *frame) LGTM --phil _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".