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 E867347CD9 for ; Wed, 14 Aug 2024 13:32:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1975868DB44; Wed, 14 Aug 2024 16:32:52 +0300 (EEST) Received: from xmbghk7.mail.qq.com (xmbghk7.mail.qq.com [43.163.128.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 708C068DB12 for ; Wed, 14 Aug 2024 16:32:43 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1723642355; bh=ab0SBlHnKPbf0oUMRYtC7v+PypBrcbrjlt6PJyMQLoU=; h=From:To:Cc:Subject:Date; b=JKyHN4gmD0j+jIlnsA+3Vdtg4jvtT/zpG6636njjch6ByV+JJph12iyMSzYUMuYUs bJC/QOUZDhGWZ+GeQdBB0XzbazD61tf4iAPnofffE6/wBbvx4qC2e94WfZFerZrfX+ fEDwYmxofJrs/EILIW4Sdptd4HAGy0zdWmDggq14= Received: from ZHILIZHAO-MB1.tencent.com ([113.108.77.52]) by newxmesmtplogicsvrsza10-0.qq.com (NewEsmtp) with SMTP id 82219E06; Wed, 14 Aug 2024 21:32:34 +0800 X-QQ-mid: xmsmtpt1723642354t9skmnhoc Message-ID: X-QQ-XMAILINFO: NMGzQWUSIfvT4T/o2vUUi8OjTZi16Nf/CQgOgPB2/lFzirjyLKg0ZPL/eB9+s+ J+MaQZeeQCn5vdLnFAn1JAo2wbyLxtjbwHCKMUtyaHAsNe8Mc2eOHT/6t5rn3GUw1pnMIzf3kHKU AwDNSoUvsLJOhnl1QEYABvPeiUjztf3zFQcEHvNDoYFz1nU00VMk6dwSK84X2KNlbuZBi4+WkBnZ QBpPsd2lY21tHcMyrHKEHfY6Se2PS7MKtPXilOSSpBzNsBCx5ynFkmzLRednxard2zFTl63kXRog mKR1WWlGRbXhwSCvdcJIbLV1ui8io8TughxNynQsFYI8ksmw0xoniGYsOSawnQMmNPCJgyBR9DtO R6s8qG8uKS/trAMJUCF8sA1c9stKsd8EF7Gg7WhaKgZwPyQmYX95EVcznH///mw4yMWouEVbzc/v K1ZCnOEhDdcO/OMzNylxIDptHKKskRpY5XeRANpmcEi0Hi7PHEkTdncbccQ6B/NATPMv6zW+6lpe rr1xfnkQH4OAQ46gQxbIAKny/A1AnQtkfR1VtMMZVVsgwAPXAdyzVjew5Fbm3DqQtjUr9IGaZoNW 5pnKRmak9+JXTwi4bVHig65wlq9yjbBW1Gh4Huo/KYsRfJJxKCQK6KbyLrNRUEuQUWlK6NLC2jU7 gb+idigXei12utQzaefyz+n+EJr0LRRFq6OdDzHD+33pPkXF3WmkE95cbtaokjPLGPXXSF62lOSI XgpHIk5xGkr/XZhiGmqHZQFsXIimWEHuKZBope/irt/Tuyte+ZMJ5FULRdaZIBTwaNPtZAUGWV3n 0lHJBa7f6qBbJJ6W7ePay3Rc6cZn6EJXWOEvMVDQ8Dxzz4f4nwLTS1bKNo/yITp6oJgbcOBsTJKY XYFc29Xhnt632sSOsimHw8CbSeotgoVxWbqQGIkUdDbNkggESTGUmvf5yd823zaRSlTVS8rbhVbR c7qTGxlMTkfCLKoPbfijI/P2aoUivekoeqBF9IDF+ZW8Yt+qx1rgClbHYJoEn0 X-QQ-XMRINFO: MSVp+SPm3vtS1Vd6Y4Mggwc= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 Aug 2024 21:32:30 +0800 X-OQ-MSGID: <20240814133230.43857-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/filter_units: Fix extradata and packets can have different bitstream format 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: Zhao Zhili 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: From: Zhao Zhili Filter init can change extradata from avcc/hvcc to annexb format. With different passthrough logic, packets can still in avcc/hvcc format. Use same passthrough logic for init and filter. Signed-off-by: Zhao Zhili --- libavcodec/bsf/filter_units.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/bsf/filter_units.c b/libavcodec/bsf/filter_units.c index 029c86048b..336331733f 100644 --- a/libavcodec/bsf/filter_units.c +++ b/libavcodec/bsf/filter_units.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include #include "libavutil/mem.h" @@ -44,6 +45,7 @@ typedef struct FilterUnitsContext { } mode; CodedBitstreamUnitType *type_list; int nb_types; + bool passthrough; } FilterUnitsContext; @@ -111,7 +113,7 @@ static int filter_units_filter(AVBSFContext *bsf, AVPacket *pkt) if (err < 0) return err; - if (ctx->mode == NOOP && ctx->discard <= AVDISCARD_DEFAULT) + if (ctx->passthrough) return 0; err = ff_cbs_read_packet(ctx->cbc, frag, pkt); @@ -181,6 +183,7 @@ static int filter_units_init(AVBSFContext *bsf) return err; } } else if (ctx->discard == AVDISCARD_NONE) { + ctx->passthrough = true; return 0; } -- 2.42.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".