From patchwork Mon Jan 30 05:23:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 40176 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp3153179pzj; Sun, 29 Jan 2023 21:24:00 -0800 (PST) X-Google-Smtp-Source: AMrXdXtyhUs/kUStoOKKmc8i0O95ONul7mhki6KbRar5luRsAMb7/A24z4DBV5pKGgzNVYqsPUGF X-Received: by 2002:a05:6402:5110:b0:49d:fff2:d4d7 with SMTP id m16-20020a056402511000b0049dfff2d4d7mr67115793edd.30.1675056240164; Sun, 29 Jan 2023 21:24:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675056240; cv=none; d=google.com; s=arc-20160816; b=z42yWc/55YNPlALAXZF7KNPRTvlTz+jUCFwne1PaGNbuqHp5HGGQ+XcWrv8bMmfVl5 PX8xh7tVXlKs0C27qEKQDqJbFRQwzbfFUFQZv8PVNspOA1/reFHPtCNukY/zV9ReWgRb 0nVVlUVmxhpBmMN+vA1MaCIqJoOarMPnoGth4nLMoAr86Qvxv+8jiE6H711Q5lhNgfnP jxVCyGrrQS1TdNFUuW4tzkoCDlRNzUPvevHZYTMAi80gWDyZoispukjAHaUKgOZztn+/ 9zEuL6/9RU+BOG0DLY001+BEXtX08FmKBaWGkA/q2a8Sb+8U1IVNuZK9Li7+5hRfv3Ad cXvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=v46K/HfB4Ut7IDdwqUN76Vis5b8/cw32QiJhw2j7IuQ=; b=lRsw43GFkt3AaGAdCFi2Uq11gsgdrR2s2cgKc6BB6Xh4OCHCSkPTvMZEjxiloEsxUA CSsqg1l6pviariQsP2o8Pgp2Ydqs3CDtUOv9ykFGFyij8q5CTfmbf/7XXEXtFTfeepRE U4vvF+V4f26X7v7UN/5Gg7k7EOWlrKDFHKkhEt9tqGTkFPIRXRr2Ky8thSjqhUn0DQK6 i0hmwlIEW3yW+sSYL3AyMrOT4ZhX6LkYMamqsbGRVNulP5ZeCHKNC+p6kAIbfceIUuoa X/aIB1vJ2qE2MHlxHzVZZ2VwA6CyjXa+4OZQClVlExGPXwWB9h8y7KtfdeImghbEnP4Z 3Hhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=i9ShvnrO; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id cz27-20020a0564021cbb00b0049e76c617c5si12357624edb.253.2023.01.29.21.23.59; Sun, 29 Jan 2023 21:24:00 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=i9ShvnrO; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2266268BDA5; Mon, 30 Jan 2023 07:23:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 19A0668BD90 for ; Mon, 30 Jan 2023 07:23:48 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675056234; x=1706592234; h=from:to:cc:subject:date:message-id; bh=2/PXaD5Ejr0ApHCDlA1cLyqBuaL+vjQ5dkKOT/d8Sqo=; b=i9ShvnrOyz7+ixOjusjYGeIsoVEC7kIvWEtHNSHV6z8wMn7r4Of7Lm7U UREfnT6cAoeAMPVrTe7WYIjBzc6FrvBzIqVECEj/VjjJMDWwsZ80T6xkx lxR6ModuhswBejwpogGCdrNc+3c+yhbCWpI2NRCy7Lx5lNuycKUbCPiCm dvOE3RKQeLo9Z8VngvCMSDz+CSOlgOJU6BD6kfEH6/xgVLnItlLg0mN/L Hyr5d332X87RpeWhGbc/deUSJJHmRHyg1L6pxNwlz86T8M+/LR5ewXYfi OOSEDE2uR3xVm0teOHRiURhP6nJe8KW1+gy27Xz+pIMII45sRWsRgcdHz w==; X-IronPort-AV: E=McAfee;i="6500,9779,10605"; a="392027251" X-IronPort-AV: E=Sophos;i="5.97,257,1669104000"; d="scan'208";a="392027251" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jan 2023 21:23:45 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10605"; a="694440451" X-IronPort-AV: E=Sophos;i="5.97,257,1669104000"; d="scan'208";a="694440451" Received: from xhh-dg164.sh.intel.com ([10.238.5.169]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jan 2023 21:23:43 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Jan 2023 13:23:21 +0800 Message-Id: <20230130052321.27566-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] lavc/vaapi_encode: fix segfault 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 Cc: Haihao Xiang , Anton Khirnov MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1/qRwgGpJMqk From: Haihao Xiang This is a regression since commit fbdba9a1a69fe4df413d9e9df1b11db522946e75 input_image is freed in vaapi_encode_wait() however it is still used in commit fbdba9a1a69fe4df413d9e9df1b11db522946e75 $ ffmpeg -vaapi_device /dev/dri/renderD128 -f lavfi -i testsrc -vf "format=nv12,hwupload" -c:v h264_vaapi -f null - Note input_image will be freed in vaapi_encode_free() now. Cc: Anton Khirnov Signed-off-by: Haihao Xiang --- libavcodec/vaapi_encode.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 6787b90e8d..b644814b6c 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -173,9 +173,6 @@ static int vaapi_encode_wait(AVCodecContext *avctx, } } - // Input is definitely finished with now. - av_frame_free(&pic->input_image); - pic->encode_complete = 1; return 0; }