From patchwork Thu Jun 23 07:24:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 34754 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp3301264pzb; Thu, 23 Jun 2022 00:24:30 -0700 (PDT) X-Google-Smtp-Source: AGRyM1txLzYe69KMaWzu/l1PCxt7Ju+s4oAs7AjpCCrsGMklVhYx/iRrlxHWjAXeoPllpJHm5bXP X-Received: by 2002:a17:907:6e02:b0:719:2c77:37ce with SMTP id sd2-20020a1709076e0200b007192c7737cemr6784250ejc.759.1655969070536; Thu, 23 Jun 2022 00:24:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655969070; cv=none; d=google.com; s=arc-20160816; b=zEYHee7bnmDej45pM9ypacAiwRGt3lfP0qzZy5hQGshhb+bfdUhlIBJdrWD9dEiKXW V3bCjwMuH5JrUvzckfdgN1U/FHve7QQx/G6vWc+fE1BfHMv++VFT8kiF7waRX6Wxgc9H lSBO6wjLArr5wz2vueRDRzqdONr/9zIGoPmgBEjHsVkjZ2IaitzqPWWadL3gK7DgvJE4 ZHMueS0cuEtcjno/glRHXdAComRHqDrWmBG0t4djNbL42BW5ealPPom7o5Zby3gwBSHM NmapzGwoPK6RVXTGrxMHNsR50qKpPDMR15QUfyVU8SRxxvNGM+d2+lhtFkfd6wK80cGI 3wtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=HwX1iflpxVG8RJatHIxP6P7ffdVNNxhOMo4aCTweKhc=; b=D6ntv+sI0MW+duQbfE3SFeEi5nejKZEObyTQoGC5D0EmzMaOyJl3G1Qc2x3cety/ON Q2OTXiMx6f61bl9cyx4AQgp7BW7uxFTHTUynvj8XdcMkFJiQDv8lhTva88UyBsHdt8BQ tFMIu+Ov6Ej3G2z3SxvKLVWJ096a6Q/IH7jzC5JkzhcTSg3TRwIfrsAR/R/GuKZczZ1n jVmzNMqKmUD6GRha4iv25o+WeXG7UF6DgXA8g3kMWuxm20ER+ss2cw1VvYpE4sN99mgg Lotys5vfAjjsZHBFaw6MHD/nK4pSXZcfNHyHpnaG5CYS6v6sqLBaHve3xVwT+XCUpIz1 3FBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=hb+vTyCx; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gn18-20020a1709070d1200b00711ca5e5b3esi27898504ejc.638.2022.06.23.00.24.26; Thu, 23 Jun 2022 00:24:30 -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=@gmail.com header.s=20210112 header.b=hb+vTyCx; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C11C268B6AC; Thu, 23 Jun 2022 10:24:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DCF0068B610 for ; Thu, 23 Jun 2022 10:24:15 +0300 (EEST) Received: by mail-lf1-f44.google.com with SMTP id t25so31783472lfg.7 for ; Thu, 23 Jun 2022 00:24:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=/ppPZIfyiJ8vxQXh1sewq22jlc6ofNBJzZaioPBy9PY=; b=hb+vTyCxIN1JMWWz9Auyixmxi4cJDIxOGAXpyEiTpJzpOget86j/cK8RM25f75eFGX Ukp6BnH0Cf+WsWOuluq+qTaKryrwjP7E+nj18JOTewzEAV1eSKjzRXUrmD+b9u51GBrg qiisqyRF6IAfpE2y3U0ZB3G+b6LW+BhBRWMaoM1IFKSZhuRTj94nVnCfs5ODIOmwEkGF eTQSFGksB2sFgD2Vm6lkIdzPPvGXgNb1OUUwIAar3cH29CQiG8Mab9Q6ahsZ1Yg+Njon dn/yJjavZORg0njPReml+vGVekXFtXM9Yf0QSP1uSht4GM0lxgHMUpqnGnrx9WKIpmLS DLZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=/ppPZIfyiJ8vxQXh1sewq22jlc6ofNBJzZaioPBy9PY=; b=ph2hCIvoiSiyASxEAFDmVoIxgR8OihAH6L3GlQw9buEhI0PLq3RlOMJDEIhsoxd9w0 95V57ElKDtpxf0G5a3heMLZav/FC7NQhliec/u/L7vXya8xvOYooXzUi5FNJd1gAozx/ l5Pap2SXuS9T5hnvNQRHo2gMdEPpZVX3zZcjsj0Cjs/6Go68UFFi4NwLrgP74Emdi+vg Ldf1P/SsHIiSxqzMof8BFVC1MoBriYiiucnG0bdKtZspfHB0SnufbSsgAp7gJaBoLuCL v9Vg5gq3jCXgRr/6mkjL6F00xjlBUotfYWCp0GHhRH/KTWz+pvzmRiPJ7Wv+q569Hlle /AoQ== X-Gm-Message-State: AJIora8DlO08i5XsRb9Jb5w3Ygz8+YOM8WE+yx45peHVEJg6Plr0PBhd b6/sv9+lHZikXnnks1UweQYGL8uwP4o= X-Received: by 2002:a05:6512:3c97:b0:47f:76c0:b2ca with SMTP id h23-20020a0565123c9700b0047f76c0b2camr4616467lfv.89.1655969054767; Thu, 23 Jun 2022 00:24:14 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id a15-20020a056512200f00b0047f8ec3ca4esm732843lfb.87.2022.06.23.00.24.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jun 2022 00:24:13 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Jun 2022 10:24:01 +0300 Message-Id: <20220623072408.38977-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 0/7] avformat/movenc: normalize on AC-3 parser usage 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: L43IszIdHzms The simplified parsing currently in `mov_write_ac3_tag` trusts the content of the packets a bit too much (the AC-3 parser returns all data fed to it, including any possible data before the start code), while the existing E-AC-3 logic does proper header validation by utilizing the (E-)AC-3 parser. Thus, normalize on AC-3 parser usage for both AC-3 and E-AC-3. Difference to v3: * Limited bsids higher than 8 (RealAudio AC-3/DolbyNet) from getting muxed, as it is unclear which bit_rate_code value should be utilized for them. Jan Jan Ekström (7): avcodec: make AC-3 bit rate table available in a separate header {configure,avformat/movenc}: enable AC-3 parser for movenc avformat/movenc: enable handle_eac3 to handle AC-3 tracks avformat/movenc: move eac3_info definition so that it can be used for AC-3 avformat/movenc: utilize existing AC-3 parsing workflow for AC-3 avformat/movenc: handle OOM situations when parsing AC-3 headers avformat/movenc: limit ISOBMFF AC-3 mapping to bsids <=8 configure | 2 +- libavcodec/Makefile | 9 ++- libavcodec/ac3_bitrate_tab.c | 22 ++++++ libavcodec/ac3_bitrate_tab.h | 33 +++++++++ libavcodec/ac3tab.c | 6 -- libavformat/Makefile | 1 + libavformat/ac3_bitrate_tab.c | 22 ++++++ libavformat/movenc.c | 129 +++++++++++++++++++--------------- 8 files changed, 157 insertions(+), 67 deletions(-) create mode 100644 libavcodec/ac3_bitrate_tab.c create mode 100644 libavcodec/ac3_bitrate_tab.h create mode 100644 libavformat/ac3_bitrate_tab.c