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 5535449291 for ; Tue, 6 Feb 2024 22:58:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7604868D140; Wed, 7 Feb 2024 00:58:22 +0200 (EET) Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B3320689245 for ; Wed, 7 Feb 2024 00:58:16 +0200 (EET) Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-5d8b70b39efso5524612a12.0 for ; Tue, 06 Feb 2024 14:58:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707260294; x=1707865094; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:autocrypt:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=fdemwnoREeKKCWAEeBGMcJIkEsd1XbOM0htpNDcbthw=; b=OusdwOBNlzQDlmGMGELTIYrqDyqYSq56EyBvtJxQ8q4TGs5tPYxmBxMUgw2AobCmJh Az3TlrtUDKnk3zNA91+GMWL+FlXhQ99UWJiMLeUk/QwDrs7NiF9aH9zJsgHomaZIpI6d CWZVZpa7pSvlost7VBiWC3jpdlJDlIXRWyWhVQ0koJEW/q6YMNKN2L0RDnRkcROqt3AQ tFo4rpuwSHfyu/sknIdRutu1LGVX9NgTpdBu2Wwv8bPoS3WFLUDbM/MGg4Bd4sSrFUaI ugQ4AQ4NV4KxBf2t9PfBXghnhSh6P8BZj6aEnX1Z/ABSMjhqbPtTJJ4NQUmCPkjWY3b0 zMkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707260294; x=1707865094; h=content-transfer-encoding:in-reply-to:autocrypt:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=fdemwnoREeKKCWAEeBGMcJIkEsd1XbOM0htpNDcbthw=; b=UnnnKUjNUoeN5+uzq7tVz2iZ0gfElv/wwS/ZdGIzUpWtIlRO4ACaqY8uIjFNvkbMUC 4a5lUxhDfGGK5/ubniR7AiElUVU02BRjUWWc2ZuZw3Kx+xNARbbxGDhFWUSmuxNy/yPQ TfjuQc8/2rwoGD6R+xI8YUSa0MNCzRR6MmvNo7mWQyeFT8Ahz8yR1T+T8HLSsGNEqn/1 KgYYKZF1yR4qWwojGx4sHKgCil1wAF05s599xg0mfWm5NUQsfqZC9xEAuRxPuq5MWKY5 StLa/5suR+FMbnDpmrtnP7AZ0jiL7UI+rf9O2sqdkxxWwWemn8Ag8xYg0R8j3TysSHHV S2Nw== X-Gm-Message-State: AOJu0YxF054FwU45hgr5zcCyVS6z1XdP2F9JjoScqbAXmTw1HexsKs9A kbiJe9JLXFxnGR4rJ72gaCAzsOj6+7KOB1JkXOfbfdiQN5WHl9JargbriwmA X-Google-Smtp-Source: AGHT+IHJQ/AEyPAwiY3C8wOxcO5//LwW53vET7mAFf3E/AU3J0pe8dSyNA5XcviVtlSrOMwRGegzQA== X-Received: by 2002:a05:6a20:43ab:b0:19e:488f:692d with SMTP id i43-20020a056a2043ab00b0019e488f692dmr3806820pzl.7.1707260294081; Tue, 06 Feb 2024 14:58:14 -0800 (PST) Received: from [192.168.0.18] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id l136-20020a633e8e000000b005dc191a1599sm1620pga.1.2024.02.06.14.58.13 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 06 Feb 2024 14:58:13 -0800 (PST) Message-ID: <67ef754d-8c85-472a-8ab7-71ccac42894d@gmail.com> Date: Tue, 6 Feb 2024 19:58:49 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20240206212640.9193-1-jamrial@gmail.com> From: James Almer Autocrypt: addr=jamrial@gmail.com; keydata= xsBNBFjZtqABCADLW+vdEoZaJZDsIO6geYFTOcn1unsEHefj9zn+3oTHlDFFzO47mzHsSfbK 9JE2xpOJEVnC8FAF5Sayi/pVwV+mtQUV3n5dgVeVBYF9GUQwOGFCpK8X54RRqhkgknbunOEE 0CtgAJgmpFmmmHgq02GvEspx1h/rh4apqwQR6QX4Favb+x9+i9ytVpwVcBX94vo2toyP7h/K BWfadQmb8ltgE1kshfg+SQs/H5bTV5Z1DuEASf02ZL/1qYB/sdTgWPLv9XMUHHsRFmMY8TMx wJSkP+Af3AiYQPJYz1B1D4tt98T/NoiVdin10zATakPjV8hXaobuRmxgakkUASXudydDABEB AAHNH0phbWVzIEFsbWVyIDxqYW1yaWFsQGdtYWlsLmNvbT7CwJIEEwEIADwCGwMGCwkIBwMC BhUIAgkKCwQWAgMBAh4BAheAFiEEd1EujP2UoWlX5pp6FGMBrXN2WeAFAmJoLUUCGQEACgkQ FGMBrXN2WeAFVQf9GtGhniRs1PzNUOgJktCnv6j4BbLieaIPYPEFXKDHOgjqQE2zVMYXnoXl Jam928ii902a8OY06r9ywn/R8ApD1/3NY/v64O71CY9scz5XyH2au8wIZ6HwFy3/f7sqjdGD uctY8Qs7rjT7NkoC5lmgMu2v2k03dGtM9AAf5AK5gU+H0EUw7vmKKiXzUqt5kvBuf4CEwXvH AQT1SMJ52rIlDWB7FQFyZeUbOAK2IgY/KNedfK6nsgd/eQVnlofPd2XoddE7kP6iys7jJefw DD3g3rZyDTq7in5dyk5glaNpWZpbHGBs+9SCYLnfQ8XvWqPFOD+gj0plamKANgOvavKTxM7A TQRY2bagAQgA69YtILj8kYxmqPr/M8+MXT7wVoOWVW9lvSmPquCELaDy/NIS7D06VC5EuE/6 JlJXZMTn37NLlyWhzwOgXuXw5w2tyoQQBuvqGiXJijuXwXH7HKdzrc6rpYtAqt5w05hzNrFS KrS0izG64VpWrfproy3BsL+8TBm9brLhhNPynVRqVukbbGzlATTzNQGZ14TTi2/dL6DkMQnM qn4jX9UEe4GdGQBP50bUJSSmeiIkyNLWA+znuN2PZEz930ZwNrF9GtDVw7mzcmpCZ7spldE2 tutbpy9D1bIqxyqBrYDSezyzL2adR1qgHyOTMCHg2AYNkrIQHrSyJxKTpZ1/hqOp8wARAQAB wsBfBBgBAgAJBQJY2bagAhsMAAoJEBRjAa1zdlnghekH/0Yb0iYJ74oID2f/Fj+AJKS2ekQF P2xOr8lpGzgp/+yWUvPtqbX0A33anBJdYwxaAC0NataX3tfZ+oJkzXqfmqhIHMPYHdZesJA2 Bk9hU/33mDl5s5U66/z0uelWzwKVHoQ2O6or4+qF3HJFSJLCe9uvWJ3zXf9F342Ftj73sfx+ 3xkw/IXsN1RqbYqDlzpoEQ99SIEfY/8Jjwnd3sIPfqkuyeaYfe6GJDqKawdCEP1oRRlbXEAp TJgYz8r3nPhGv9cdHNDCk44ISbsqVuxIEnLqi4fTPZaGupiQhT+srl268TTAp2TQW7+6Ce/b NPQorMquzS/LZoyALpmsYi/miMc= In-Reply-To: Subject: Re: [FFmpeg-devel] [PATCH] avcodec/nvdec: don't attempt to free NVDECContext->bitstream on simple decode_slice hwaccels 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 2/6/2024 7:14 PM, Andreas Rheinhardt wrote: > James Almer: >> If FFHWAccel->end_frame() isn't called before FFHWAccel->uninit(), an attempt >> to free a stale pointer could take place. >> >> Signed-off-by: James Almer >> --- >> libavcodec/nvdec.c | 9 +++++++++ >> libavcodec/nvdec.h | 1 + >> libavcodec/nvdec_mjpeg.c | 2 +- >> libavcodec/nvdec_mpeg12.c | 4 ++-- >> libavcodec/nvdec_mpeg4.c | 2 +- >> libavcodec/nvdec_vc1.c | 4 ++-- >> libavcodec/nvdec_vp8.c | 2 +- >> libavcodec/nvdec_vp9.c | 2 +- >> 8 files changed, 18 insertions(+), 8 deletions(-) >> >> diff --git a/libavcodec/nvdec.c b/libavcodec/nvdec.c >> index 27be644356..8a7f5c0dac 100644 >> --- a/libavcodec/nvdec.c >> +++ b/libavcodec/nvdec.c >> @@ -274,6 +274,15 @@ int ff_nvdec_decode_uninit(AVCodecContext *avctx) >> return 0; >> } >> >> +int ff_nvdec_simple_decode_uninit(AVCodecContext *avctx) >> +{ >> + NVDECContext *ctx = avctx->internal->hwaccel_priv_data; >> + >> + ctx->bitstream = NULL; >> + >> + return ff_nvdec_decode_uninit(avctx); >> +} >> + >> static void nvdec_free_dummy(struct AVHWFramesContext *ctx) >> { >> av_buffer_pool_uninit(&ctx->pool); >> diff --git a/libavcodec/nvdec.h b/libavcodec/nvdec.h >> index 353e95bf42..83bc1de84c 100644 >> --- a/libavcodec/nvdec.h >> +++ b/libavcodec/nvdec.h >> @@ -73,6 +73,7 @@ int ff_nvdec_decode_uninit(AVCodecContext *avctx); >> int ff_nvdec_start_frame(AVCodecContext *avctx, AVFrame *frame); >> int ff_nvdec_start_frame_sep_ref(AVCodecContext *avctx, AVFrame *frame, int has_sep_ref); >> int ff_nvdec_end_frame(AVCodecContext *avctx); >> +int ff_nvdec_simple_decode_uninit(AVCodecContext *avctx); >> int ff_nvdec_simple_end_frame(AVCodecContext *avctx); >> int ff_nvdec_simple_decode_slice(AVCodecContext *avctx, const uint8_t *buffer, >> uint32_t size); >> diff --git a/libavcodec/nvdec_mjpeg.c b/libavcodec/nvdec_mjpeg.c >> index 850634bf1a..adef21b0f7 100644 >> --- a/libavcodec/nvdec_mjpeg.c >> +++ b/libavcodec/nvdec_mjpeg.c >> @@ -80,6 +80,6 @@ const FFHWAccel ff_mjpeg_nvdec_hwaccel = { >> .decode_slice = nvdec_mjpeg_decode_slice, >> .frame_params = nvdec_mjpeg_frame_params, >> .init = ff_nvdec_decode_init, >> - .uninit = ff_nvdec_decode_uninit, >> + .uninit = ff_nvdec_simple_decode_uninit, >> .priv_data_size = sizeof(NVDECContext), >> }; >> diff --git a/libavcodec/nvdec_mpeg12.c b/libavcodec/nvdec_mpeg12.c >> index a4603c7ea7..5d100a46ba 100644 >> --- a/libavcodec/nvdec_mpeg12.c >> +++ b/libavcodec/nvdec_mpeg12.c >> @@ -110,7 +110,7 @@ const FFHWAccel ff_mpeg2_nvdec_hwaccel = { >> .decode_slice = ff_nvdec_simple_decode_slice, >> .frame_params = nvdec_mpeg12_frame_params, >> .init = ff_nvdec_decode_init, >> - .uninit = ff_nvdec_decode_uninit, >> + .uninit = ff_nvdec_simple_decode_uninit, >> .priv_data_size = sizeof(NVDECContext), >> }; >> #endif >> @@ -126,7 +126,7 @@ const FFHWAccel ff_mpeg1_nvdec_hwaccel = { >> .decode_slice = ff_nvdec_simple_decode_slice, >> .frame_params = nvdec_mpeg12_frame_params, >> .init = ff_nvdec_decode_init, >> - .uninit = ff_nvdec_decode_uninit, >> + .uninit = ff_nvdec_simple_decode_uninit, >> .priv_data_size = sizeof(NVDECContext), >> }; >> #endif >> diff --git a/libavcodec/nvdec_mpeg4.c b/libavcodec/nvdec_mpeg4.c >> index 20a0499437..5a50f7d77f 100644 >> --- a/libavcodec/nvdec_mpeg4.c >> +++ b/libavcodec/nvdec_mpeg4.c >> @@ -120,6 +120,6 @@ const FFHWAccel ff_mpeg4_nvdec_hwaccel = { >> .decode_slice = nvdec_mpeg4_decode_slice, >> .frame_params = nvdec_mpeg4_frame_params, >> .init = ff_nvdec_decode_init, >> - .uninit = ff_nvdec_decode_uninit, >> + .uninit = ff_nvdec_simple_decode_uninit, >> .priv_data_size = sizeof(NVDECContext), >> }; >> diff --git a/libavcodec/nvdec_vc1.c b/libavcodec/nvdec_vc1.c >> index 5096d784df..e9ab16c63d 100644 >> --- a/libavcodec/nvdec_vc1.c >> +++ b/libavcodec/nvdec_vc1.c >> @@ -124,7 +124,7 @@ const FFHWAccel ff_vc1_nvdec_hwaccel = { >> .decode_slice = ff_nvdec_simple_decode_slice, >> .frame_params = nvdec_vc1_frame_params, >> .init = ff_nvdec_decode_init, >> - .uninit = ff_nvdec_decode_uninit, >> + .uninit = ff_nvdec_simple_decode_uninit, >> .priv_data_size = sizeof(NVDECContext), >> }; >> >> @@ -139,7 +139,7 @@ const FFHWAccel ff_wmv3_nvdec_hwaccel = { >> .decode_slice = ff_nvdec_simple_decode_slice, >> .frame_params = nvdec_vc1_frame_params, >> .init = ff_nvdec_decode_init, >> - .uninit = ff_nvdec_decode_uninit, >> + .uninit = ff_nvdec_simple_decode_uninit, >> .priv_data_size = sizeof(NVDECContext), >> }; >> #endif >> diff --git a/libavcodec/nvdec_vp8.c b/libavcodec/nvdec_vp8.c >> index ff3b3f259c..bbea6f1577 100644 >> --- a/libavcodec/nvdec_vp8.c >> +++ b/libavcodec/nvdec_vp8.c >> @@ -101,6 +101,6 @@ const FFHWAccel ff_vp8_nvdec_hwaccel = { >> .decode_slice = ff_nvdec_simple_decode_slice, >> .frame_params = nvdec_vp8_frame_params, >> .init = ff_nvdec_decode_init, >> - .uninit = ff_nvdec_decode_uninit, >> + .uninit = ff_nvdec_simple_decode_uninit, >> .priv_data_size = sizeof(NVDECContext), >> }; >> diff --git a/libavcodec/nvdec_vp9.c b/libavcodec/nvdec_vp9.c >> index e196391c6d..69b12657b6 100644 >> --- a/libavcodec/nvdec_vp9.c >> +++ b/libavcodec/nvdec_vp9.c >> @@ -180,6 +180,6 @@ const FFHWAccel ff_vp9_nvdec_hwaccel = { >> .decode_slice = ff_nvdec_simple_decode_slice, >> .frame_params = nvdec_vp9_frame_params, >> .init = ff_nvdec_decode_init, >> - .uninit = ff_nvdec_decode_uninit, >> + .uninit = ff_nvdec_simple_decode_uninit, >> .priv_data_size = sizeof(NVDECContext), >> }; > > Using a field for both an ownership pointer and as a pure data pointer > is bad and confusing. IMO there should be different pointers for this; > or rather: bitstream is always set and used as data pointer and the > another pointer for ownership which may alias bitstream. In fact, it > looks like this is exactly what bitstream_internal is, it is just not > used by H.264 and HEVC in this manner (they use bitstream for allocated > stuff). Yeah, whereas AV1 is doing it right. Sent a new version with this approach. Thanks for the review. > With the approach outlined above, ff_nvdec_simple_end_frame() might > become obsolete. > > - Andreas > > _______________________________________________ > 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". _______________________________________________ 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".