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 2B63A4B4BE for ; Fri, 7 Jun 2024 13:10:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 36F5E68D88C; Fri, 7 Jun 2024 16:08:51 +0300 (EEST) Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C5C468D851 for ; Fri, 7 Jun 2024 16:08:45 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=Mr83E5TG; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id EAFC04DBA for ; Fri, 7 Jun 2024 15:08:44 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id Ag0BeuBd-uWp for ; Fri, 7 Jun 2024 15:08:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1717765724; bh=QyvvVuZBKpKPAq55ghF1ocZgE89GXoTEOmFroai9ZNI=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Mr83E5TGXw3xZdmRSls3gONuIuZBVYTUEHC/4aNvde3lkCayYfUHbjXfcy1ZxZVnV msCXdd7Wg/xSxMkKdeBBiLoGwphUv1D85sPYjwv5sKIT84s+XIC5woGLyhgMMcfbzv SGjj/q7AhPhowLE49cmMJyFySD88OnOiwdSm+BM3dYzp6oNVBAYkUXqxX6tkTFYDaV 2CZn8D84j89ne+51X1EFnfybGgUw1OSjlHaKXuSemQ6X2KsyB2Uwo/J4Ohxuv6Oqaj 6/VVB/zgEKhQWyWpWicvAjchtkPPwHVnmf6xG8Lk68ZqeXHnH6hts76awhRDQbmZt5 JgQf3PyIz/dvQ== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 954C74D42 for ; Fri, 7 Jun 2024 15:08:44 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 21D563A27BF for ; Fri, 07 Jun 2024 15:03:36 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Jun 2024 15:01:34 +0200 Message-ID: <20240607130135.9088-38-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240607130135.9088-1-anton@khirnov.net> References: <20240607130135.9088-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 38/39] lavc/hevcdec: do not unref current frame on frame_end() failure 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: It's a race with frame threading. --- libavcodec/hevc/hevcdec.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index a8c2172674..5fc55d5de9 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -3135,17 +3135,14 @@ static int hevc_frame_end(HEVCContext *s) if (ret < 0) { av_log(s->avctx, AV_LOG_ERROR, "hardware accelerator failed to decode picture\n"); - ff_hevc_unref_frame(s->cur_frame, ~0); return ret; } } else { if (s->avctx->err_recognition & AV_EF_CRCCHECK && s->sei.picture_hash.is_md5) { ret = verify_md5(s, s->cur_frame->f); - if (ret < 0 && s->avctx->err_recognition & AV_EF_EXPLODE) { - ff_hevc_unref_frame(s->cur_frame, ~0); + if (ret < 0 && s->avctx->err_recognition & AV_EF_EXPLODE) return ret; - } } } s->sei.picture_hash.is_md5 = 0; -- 2.43.0 _______________________________________________ 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".