From patchwork Wed Mar 15 16:27:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 40686 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp3562098pzb; Wed, 15 Mar 2023 09:28:20 -0700 (PDT) X-Google-Smtp-Source: AK7set92Ul7MXFUgUKSH2U4Uj6blxsfLWSOvylvvoyfEkKOndoOPZf1XgWK/zOaftX23jIKuTRRL X-Received: by 2002:a50:ff08:0:b0:4fd:14d5:bb47 with SMTP id a8-20020a50ff08000000b004fd14d5bb47mr3105238edu.38.1678897700384; Wed, 15 Mar 2023 09:28:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678897700; cv=none; d=google.com; s=arc-20160816; b=GrSj8ND14b68/baf0eHfWxM/010HC2lC86J84vZSDbpDjXk3BzlnRQKPUqUmXzWS5q UCWWAAhX0u0qbW62Hoy6+WVEjJaDaw1b8A5IVc9hViD/33XCYnSo8oTFlkgsqEEbSwpY 1oYVtik2vJnAMdA4dq8xPuXZ6LKchd7iSqlcFTyNih0HZutZ5ZuvD2BYv33KPOQc0xl/ JBhWoCwVO6sSFXpJ5IvuVf3UzPMrX+tNjh9ExHv+c6zPx34mOpCKcEtuZ9JI/no5bFZ0 R16PPAeSGwx9oLAmCukwQNHOuqcwCDEwN4jKvS8y1nBAShdkN2aVIxeeHocHWMhIXuY9 biGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:date:to:from:message-id :dkim-signature:delivered-to; bh=Y3ttAveHXM8AMtfDrLzg3rwbi5QmzyWu3MB1zthxTaE=; b=KjVgd0xHccvqTw+4kQS6OF19NCg1yo0KiPi8PcA8ClC+mzwDpsR/5BFodEtGluk+rU DFXLrv17fiwn+eQ5bhZgvszRSf3OvY7dMvKnVb7omB4Ru5LcgLvtHDT5C7qc8xBaEuc6 oH8ns5AKYa36ASc6J9R0r6PeYsUJ6cJ8ZqCkg0K7ZkxDOkyqW3E9xLPI8XYvSVGZgowT ZvtKUE0l/OAsfXW/JKy9T/AXExqmhopkqFRNxEqfVEaSXt6xPXMwa+nlEFZRcB+07lHj /I5Wp2xf49l92h+GF+6HwjOaTBphnAi+Mce8JYXjUL2ZFi5+da4MR+P61Z27bix7GVip k6Dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=WLQbI3q7; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y13-20020aa7cccd000000b004ff7e44fa34si3116283edt.155.2023.03.15.09.28.19; Wed, 15 Mar 2023 09:28:20 -0700 (PDT) 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=@foxmail.com header.s=s201512 header.b=WLQbI3q7; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6090168BE16; Wed, 15 Mar 2023 18:28:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-202.mail.qq.com (out203-205-221-202.mail.qq.com [203.205.221.202]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E485868B680 for ; Wed, 15 Mar 2023 18:28:07 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1678897677; bh=DMnoNhFDRW67yGAnQsJQYsU9zVopBVBRDHoT+V+2h8A=; h=From:To:Cc:Subject:Date; b=WLQbI3q7fKr84uIKYPO1GYLP+Dw2jLGF833eLKBNYfvNpvxbbXB8SZgzmbC2FHX8q xmuEC9tzxFav9Zxg3ax9/PKn/+BYHeJSO8SVGHyfNFLCmIsKm6C4wkBNR0rK/7IE7m 6WqAhMduvLAPryISMoIX78ZdcU0j07RiREVsAMhI= Received: from localhost.localdomain ([113.118.114.71]) by newxmesmtplogicsvrsza12-0.qq.com (NewEsmtp) with SMTP id 6F8ACC21; Thu, 16 Mar 2023 00:27:56 +0800 X-QQ-mid: xmsmtpt1678897676t8ik3srln Message-ID: X-QQ-XMAILINFO: N26DAMVpW7UE+rtOvPzaC0TER9N+elPivcWGjtr7pP00EH3xK3oItHFXWc1vgU jHezutFy6HEk7Il2nHtxSjqGSxB3p21zE/I7/vPKZV2SkrO7aCC+Wo5V8YfAJHJlJ6NGmzrlYCax OAH53Eo5vYPzLjBtnPyYIK6GRguE3JA3QUxhJ4aF6++qrbtranDIZF0/k/kgVGDPzJJxV9wFCgbN DBPTaOZ+0krJcNG45So+jrbiBMDlrN0ywcfw1/vR3lq6S/o38ihEn9ivwfn9njRvvltehqiIJCht Lw17iXVAvt6LuYmlsoGyPycMZBHk/9nIfspvEHrCvE0vbdkkF7OB7Ow34TwjyesbViPRcGxMRfV1 uBnTynh5kQJa5fsYy98AsMijQFoeZdVbNESza97tmTEFysgnYbPzYlTXT5VUZvON1z11DJzea21w sm3Suyld7mr3AvTnIcf6r/Uti279OPuMwtz5AkQpx9guq/pwmltjSIO8VFeXv5caZB9Lz1vh/a3Z xmH45UlIvdEarkDMVk5eu0wwd9ivLqOT2O80CJFSPJe9hKpIrh161f5XkiNp/quJHRZf+U4SKz6r 3pPvJYZ1B8gyOrNEQBvNV/9acoMjQONvOAuPwxa96GThrxmdL/Je59jXKEmoWxQHzZCnNMoqNsGx rIFSaIUCR1odoI8TzntCvpznuKFolG6//YK7uaDEYdQkAqEhzC7jSzVc+ssfjs4oofP50jewEi+d Ty3nfb1dpVnFxzIRyIh4+Jajc0pxGkimVv9SbORDpM7tQRBoYmi4hEdmjNkuk6eIFrrQcVo9k2aE LBlG44WFoBzGhVN0DmWXpoX02vQVGdcr2EpkZDjnGYnNNeHLD8AzEjcn/rmkW/yPujCjjRxrGppj k0GwKnAg3B134m7q0cDdVN254o/ArbBtNin3O8A9aWfHzRPfvscvfimwDsDbchv3LLARVNEisDU/ 91v31cPwAwwe3w3hBSDQ== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Mar 2023 00:27:51 +0800 X-OQ-MSGID: <20230315162752.385634-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/flvenc: use extract_extradata bsf when necessary 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 3MGt+sWSpoc9 From: Zhao Zhili --- libavformat/flvenc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 64ea554dad..fbf7eabaf8 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -1023,13 +1023,15 @@ fail: static int flv_check_bitstream(AVFormatContext *s, AVStream *st, const AVPacket *pkt) { - int ret = 1; - if (st->codecpar->codec_id == AV_CODEC_ID_AAC) { if (pkt->size > 2 && (AV_RB16(pkt->data) & 0xfff0) == 0xfff0) - ret = ff_stream_add_bitstream_filter(st, "aac_adtstoasc", NULL); + return ff_stream_add_bitstream_filter(st, "aac_adtstoasc", NULL); } - return ret; + if (!st->codecpar->extradata_size && + (st->codecpar->codec_id == AV_CODEC_ID_H264 || + st->codecpar->codec_id == AV_CODEC_ID_MPEG4)) + return ff_stream_add_bitstream_filter(st, "extract_extradata", NULL); + return 1; } static void flv_deinit(AVFormatContext *s)