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 61AFC4625D for ; Wed, 10 May 2023 18:06:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E407368BFDD; Wed, 10 May 2023 21:06:25 +0300 (EEST) Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D192B68BC6E for ; Wed, 10 May 2023 21:06:19 +0300 (EEST) Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-4efe8b3f3f7so8561915e87.2 for ; Wed, 10 May 2023 11:06:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683741979; x=1686333979; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=cE//DUPYEqOKCv4mqlW49LwJWw/ojCIWtZQ0c7F8Sqc=; b=U4Ntokt0uV72J0OJGYMV8v0NZtDGuEK8dbKI1a2wKZuTugJTMCxiiCwK4nc4aXUBuO NAwH6B8qynbMNbbUB5pghmWxL9emMYE+MgmqgaksgkX6/mDReCy7SdYDV0Seq9E3ANfW KA32cCJel9Pp6C6mGrLT4DZEiDe1Q/leKQN3S12qVP7PQyBQIDp3aNRxV+bW7PKGrAaT pH/CPVE3a6OU/U3iF7USHg0Cdw7WlCoDy7x05TZOJVwug1oRXYS+KOZ7KQ4c5L2/mLPQ TxVqfttyIbzAbo4ohjdXgXt4zSprpKBDKonMf2kc0ts8GETVm1+a5wk0MwH8PzA+lJVY A91A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683741979; x=1686333979; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=cE//DUPYEqOKCv4mqlW49LwJWw/ojCIWtZQ0c7F8Sqc=; b=Ax2KCwsZgqDlMWQXzie0/QTzZEx+mlMxCNi3idyPMjZPUmQW26KfTRH/9XTOz9/RdB 7em8Vvyjk4Ayf0n6fpq+AlnSWnE90VJLxseiKFLmrMw/tOqrPZSTEBciESc5wXVa8AMj ExK7nY4STxosOXDLTtGvxbrnG+E5MdV0eG1xa5bsZlNsJvE2I5VJ3L0hum5pByFNcO/c g1oJf9p89jQCrf+CASsdPCwPAFohbb+mfrMwR6cYYDE1he6TmX58JA+kXsA/P5sYnmLE WSXASzrr3CWPdzkli/ufx+iy7BMnO71H0dLMGf6GOfijeCh6sjN024xjHmGVkuAlI5sj TUqA== X-Gm-Message-State: AC+VfDx/3OdD9kfp0ojBVwqyHKr9j/YupHWZM9QNy/3LOz4Us7PPDY8h qBBCk41UvK3XZB9RkjNJwZJIAa4zvSsRiTwgTAWtH0Fsli8= X-Google-Smtp-Source: ACHHUZ5F+NAfrdRLuu4PF3lDUWiZ3G3390CUe4ZYPofd2CfYYQsxDXJVmHfUrneAeuxEDgdnDs0nybPMvS0jCjaMh5Y= X-Received: by 2002:a2e:9555:0:b0:2ab:1247:9b53 with SMTP id t21-20020a2e9555000000b002ab12479b53mr2090877ljh.43.1683741978411; Wed, 10 May 2023 11:06:18 -0700 (PDT) MIME-Version: 1.0 References: <7f76233-3ada-ee7-7680-949796a3db26@passwd.hu> In-Reply-To: <7f76233-3ada-ee7-7680-949796a3db26@passwd.hu> From: Ammon Riley Date: Wed, 10 May 2023 11:06:06 -0700 Message-ID: To: Marton Balint Content-Type: multipart/mixed; boundary="0000000000008472b105fb5aba9a" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/mxfdec: Recognize AAC per SMPTE ST 381-4 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: ffmpeg-devel@ffmpeg.org Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --0000000000008472b105fb5aba9a Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi Marton, Thanks for your feedback. On Mon, May 8, 2023 at 3:58=E2=80=AFPM Marton Balint wrote: > On Thu, 27 Apr 2023, Ammon Riley wrote: > > This patch simply recognizes the AAC audio tracks during > > decode -- it does not add functionality to encode AAC in > > MXF. > > > > A sample file (st381-4-sample.mxf) has been uploaded to > > https://streams.videolan.org/upload/, and is also available > > at https://harmonicinc.box.com/v/st381-4-sample. Audio > > and video are both licensed as CC0. > > > From 9765ec18f65b8ae147660e0d71bfa80293e57f56 Mon Sep 17 00:00:00 2001 > > From: Ammon Riley > > Date: Wed, 26 Apr 2023 18:26:35 -0700 > > Subject: [PATCH] avcodec/mxfdec: Recognize AAC per SMPTE ST 381-4 > > > > This patch simply recognizes the AAC audio track during > > decode -- it does not add functionality to encode AAC in > > MXF. > > > > Signed-off-by: Ammon Riley > > --- > > Changelog | 1 + > > libavformat/mxf.c | 1 + > > libavformat/mxfdec.c | 5 +++++ > > 3 files changed, 7 insertions(+) > > > > diff --git a/Changelog b/Changelog > > index a40f32c23f..e68ee0f2c9 100644 > > --- a/Changelog > > +++ b/Changelog > > @@ -3,6 +3,7 @@ releases are sorted from youngest to oldest. > > > > version : > > - libaribcaption decoder > > +- recognize AAC in MXF (SMPTE ST 381-4) > > I think such small change does not warrant a changelog entry. Removed. > > diff --git a/libavformat/mxf.c b/libavformat/mxf.c > > index 8ef928b8fc..deb6091003 100644 > > --- a/libavformat/mxf.c > > +++ b/libavformat/mxf.c > > @@ -78,6 +78,7 @@ const MXFCodecUL ff_mxf_codec_uls[] =3D { > > { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x01,= 0x00 }, 15, AV_CODEC_ID_AC3 }, > > { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x05,= 0x00 }, 15, AV_CODEC_ID_MP2 }, /* MP2 or MP3 */ > > //{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x1C,= 0x00 }, 15, AV_CODEC_ID_DOLBY_E }, /* Dolby-E */ > > + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0D,0x04,0x02,0x02,0x02,0x04,0x00,0x00,= 0x00 }, 13, AV_CODEC_ID_AAC }, /* AAC SMPTE 381-4 */ > > If I read the SMPTE registry correctly, AAC is only ... 0x04 0x03, and ... 0x04 0x04. Correct. I wasn't sure whether adding both of those more specific ULs would be considered polluting the table unnecessarily. In retrospect, the UL above merely "Identifies MPEG Audio Compression" (per Table 5), which could also include non-AAC MPEG audio. Though Table 6 doesn't currently define anything other than AAC audio, that's not a guarantee some future update to the spec won't add it. > > { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,= 0x00 }, 0, AV_CODEC_ID_NONE }, > > }; > > > > diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c > > index 8a7008b298..c5960ecf0c 100644 > > --- a/libavformat/mxfdec.c > > +++ b/libavformat/mxfdec.c > > @@ -1628,6 +1628,9 @@ static const MXFCodecUL mxf_sound_essence_container_uls[] =3D { > > { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x01,0x01,= 0x01 }, 14, AV_CODEC_ID_PCM_S16LE, NULL, 13 }, /* D-10 Mapping 50Mbps PAL Extended Template */ > > { { 0x06,0x0e,0x2b,0x34,0x01,0x01,0x01,0xff,0x4b,0x46,0x41,0x41,0x00,0x0d,0x4d,= 0x4F }, 14, AV_CODEC_ID_PCM_S16LE }, /* 0001GL00.MXF.A1.mxf_opatom.mxf */ > > { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x03,0x04,0x02,0x02,0x02,0x03,0x03,0x01,= 0x00 }, 14, AV_CODEC_ID_AAC }, /* MPEG-2 AAC ADTS (legacy) */ > > + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0d,0x0d,0x01,0x03,0x01,0x02,0x16,0x00,= 0x00 }, 14, AV_CODEC_ID_AAC, "aac_adif_smpte_381_4", 14 }, /* AAC SMPTE 381-4 */ > > + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0d,0x0d,0x01,0x03,0x01,0x02,0x17,0x00,= 0x00 }, 14, AV_CODEC_ID_AAC, "aac_adts_smpte_381_4", 14 }, /* AAC SMPTE 381-4 */ > > + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0d,0x0d,0x01,0x03,0x01,0x02,0x18,0x00,= 0x00 }, 14, AV_CODEC_ID_AAC, "aac_latm_loas_smpte_381_4", 14 }, /* AAC SMPTE 381-4 */ > > description fields are only used for data, so you can simply use NULL for them for AAC. Changed. Updated patch attached. Cheers, Ammon --0000000000008472b105fb5aba9a Content-Type: text/x-patch; charset="US-ASCII"; name="0001-avcodec-mxfdec-Recognize-AAC-per-SMPTE-ST-381-4.patch" Content-Disposition: attachment; filename="0001-avcodec-mxfdec-Recognize-AAC-per-SMPTE-ST-381-4.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lhi091n20 RnJvbSA0ODhmNTg2YTVjYzFjY2Y3ODgwYTAxOTExNTEwOTM1MjRjNDA5YzI4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbW1vbiBSaWxleSA8YW1tb24ucmlsZXlAaGFybW9uaWNpbmMu Y29tPgpEYXRlOiBXZWQsIDI2IEFwciAyMDIzIDE4OjI2OjM1IC0wNzAwClN1YmplY3Q6IFtQQVRD SF0gYXZjb2RlYy9teGZkZWM6IFJlY29nbml6ZSBBQUMgcGVyIFNNUFRFIFNUIDM4MS00CgpUaGlz IHBhdGNoIHNpbXBseSByZWNvZ25pemVzIHRoZSBBQUMgYXVkaW8gdHJhY2sgZHVyaW5nCmRlY29k ZSAtLSBpdCBkb2VzIG5vdCBhZGQgZnVuY3Rpb25hbGl0eSB0byBlbmNvZGUgQUFDIGluCk1YRi4K ClNpZ25lZC1vZmYtYnk6IEFtbW9uIFJpbGV5IDxhbW1vbi5yaWxleUBnbWFpbC5jb20+Ci0tLQog bGliYXZmb3JtYXQvbXhmLmMgICAgfCAyICsrCiBsaWJhdmZvcm1hdC9teGZkZWMuYyB8IDUgKysr KysKIDIgZmlsZXMgY2hhbmdlZCwgNyBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvbGliYXZm b3JtYXQvbXhmLmMgYi9saWJhdmZvcm1hdC9teGYuYwppbmRleCA4ZWY5MjhiOGZjLi45YzVmNDgw Y2I1IDEwMDY0NAotLS0gYS9saWJhdmZvcm1hdC9teGYuYworKysgYi9saWJhdmZvcm1hdC9teGYu YwpAQCAtNzgsNiArNzgsOCBAQCBjb25zdCBNWEZDb2RlY1VMIGZmX214Zl9jb2RlY191bHNbXSA9 IHsKICAgICB7IHsgMHgwNiwweDBFLDB4MkIsMHgzNCwweDA0LDB4MDEsMHgwMSwweDAxLDB4MDQs MHgwMiwweDAyLDB4MDIsMHgwMywweDAyLDB4MDEsMHgwMCB9LCAxNSwgICAgICAgIEFWX0NPREVD X0lEX0FDMyB9LAogICAgIHsgeyAweDA2LDB4MEUsMHgyQiwweDM0LDB4MDQsMHgwMSwweDAxLDB4 MDEsMHgwNCwweDAyLDB4MDIsMHgwMiwweDAzLDB4MDIsMHgwNSwweDAwIH0sIDE1LCAgICAgICAg QVZfQ09ERUNfSURfTVAyIH0sIC8qIE1QMiBvciBNUDMgKi8KICAgLy97IHsgMHgwNiwweDBFLDB4 MkIsMHgzNCwweDA0LDB4MDEsMHgwMSwweDAxLDB4MDQsMHgwMiwweDAyLDB4MDIsMHgwMywweDAy LDB4MUMsMHgwMCB9LCAxNSwgICAgQVZfQ09ERUNfSURfRE9MQllfRSB9LCAvKiBEb2xieS1FICov CisgICAgeyB7IDB4MDYsMHgwRSwweDJCLDB4MzQsMHgwNCwweDAxLDB4MDEsMHgwRCwweDA0LDB4 MDIsMHgwMiwweDAyLDB4MDQsMHgwMywweDAwLDB4MDAgfSwgMTQsICAgICAgICBBVl9DT0RFQ19J RF9BQUMgfSwgLyogTVBFRy0yIEFBQyBTTVBURSAzODEtNCAqLworICAgIHsgeyAweDA2LDB4MEUs MHgyQiwweDM0LDB4MDQsMHgwMSwweDAxLDB4MEQsMHgwNCwweDAyLDB4MDIsMHgwMiwweDA0LDB4 MDQsMHgwMCwweDAwIH0sIDE0LCAgICAgICAgQVZfQ09ERUNfSURfQUFDIH0sIC8qIE1QRUctNCBB QUMgU01QVEUgMzgxLTQgKi8KICAgICB7IHsgMHgwMCwweDAwLDB4MDAsMHgwMCwweDAwLDB4MDAs MHgwMCwweDAwLDB4MDAsMHgwMCwweDAwLDB4MDAsMHgwMCwweDAwLDB4MDAsMHgwMCB9LCAgMCwg ICAgICAgQVZfQ09ERUNfSURfTk9ORSB9LAogfTsKIApkaWZmIC0tZ2l0IGEvbGliYXZmb3JtYXQv bXhmZGVjLmMgYi9saWJhdmZvcm1hdC9teGZkZWMuYwppbmRleCA4YTcwMDhiMjk4Li4zNDIzMGVj ZTk4IDEwMDY0NAotLS0gYS9saWJhdmZvcm1hdC9teGZkZWMuYworKysgYi9saWJhdmZvcm1hdC9t eGZkZWMuYwpAQCAtMTYyOCw2ICsxNjI4LDkgQEAgc3RhdGljIGNvbnN0IE1YRkNvZGVjVUwgbXhm X3NvdW5kX2Vzc2VuY2VfY29udGFpbmVyX3Vsc1tdID0gewogICAgIHsgeyAweDA2LDB4MGUsMHgy YiwweDM0LDB4MDQsMHgwMSwweDAxLDB4MDEsMHgwZCwweDAxLDB4MDMsMHgwMSwweDAyLDB4MDEs MHgwMSwweDAxIH0sIDE0LCBBVl9DT0RFQ19JRF9QQ01fUzE2TEUsIE5VTEwsIDEzIH0sIC8qIEQt MTAgTWFwcGluZyA1ME1icHMgUEFMIEV4dGVuZGVkIFRlbXBsYXRlICovCiAgICAgeyB7IDB4MDYs MHgwZSwweDJiLDB4MzQsMHgwMSwweDAxLDB4MDEsMHhmZiwweDRiLDB4NDYsMHg0MSwweDQxLDB4 MDAsMHgwZCwweDRkLDB4NEYgfSwgMTQsIEFWX0NPREVDX0lEX1BDTV9TMTZMRSB9LCAvKiAwMDAx R0wwMC5NWEYuQTEubXhmX29wYXRvbS5teGYgKi8KICAgICB7IHsgMHgwNiwweDBlLDB4MmIsMHgz NCwweDA0LDB4MDEsMHgwMSwweDAzLDB4MDQsMHgwMiwweDAyLDB4MDIsMHgwMywweDAzLDB4MDEs MHgwMCB9LCAxNCwgICAgICAgQVZfQ09ERUNfSURfQUFDIH0sIC8qIE1QRUctMiBBQUMgQURUUyAo bGVnYWN5KSAqLworICAgIHsgeyAweDA2LDB4MGUsMHgyYiwweDM0LDB4MDQsMHgwMSwweDAxLDB4 MGQsMHgwZCwweDAxLDB4MDMsMHgwMSwweDAyLDB4MTYsMHgwMCwweDAwIH0sIDE0LCAgICAgICBB Vl9DT0RFQ19JRF9BQUMsIE5VTEwsIDE0IH0sIC8qIEFBQyBBRElGIChTTVBURSAzODEtNCkgKi8K KyAgICB7IHsgMHgwNiwweDBlLDB4MmIsMHgzNCwweDA0LDB4MDEsMHgwMSwweDBkLDB4MGQsMHgw MSwweDAzLDB4MDEsMHgwMiwweDE3LDB4MDAsMHgwMCB9LCAxNCwgICAgICAgQVZfQ09ERUNfSURf QUFDLCBOVUxMLCAxNCB9LCAvKiBBQUMgQURUUyAoU01QVEUgMzgxLTQpICovCisgICAgeyB7IDB4 MDYsMHgwZSwweDJiLDB4MzQsMHgwNCwweDAxLDB4MDEsMHgwZCwweDBkLDB4MDEsMHgwMywweDAx LDB4MDIsMHgxOCwweDAwLDB4MDAgfSwgMTQsICAgICAgIEFWX0NPREVDX0lEX0FBQywgTlVMTCwg MTQgfSwgLyogQUFDIExBVE0vTE9BUyAoU01QVEUgMzgxLTQpICovCiAgICAgeyB7IDB4MDAsMHgw MCwweDAwLDB4MDAsMHgwMCwweDAwLDB4MDAsMHgwMCwweDAwLDB4MDAsMHgwMCwweDAwLDB4MDAs MHgwMCwweDAwLDB4MDAgfSwgIDAsICAgICAgQVZfQ09ERUNfSURfTk9ORSB9LAogfTsKIApAQCAt MzAyOSw2ICszMDMyLDggQEAgc3RhdGljIGludCBteGZfcGFyc2Vfc3RydWN0dXJhbF9tZXRhZGF0 YShNWEZDb250ZXh0ICpteGYpCiAgICAgICAgICAgICAgICAgICAgIHN0LT5jb2RlY3Bhci0+Y29k ZWNfaWQgPSBBVl9DT0RFQ19JRF9QQ01fUzMyQkU7CiAgICAgICAgICAgICB9IGVsc2UgaWYgKHN0 LT5jb2RlY3Bhci0+Y29kZWNfaWQgPT0gQVZfQ09ERUNfSURfTVAyKSB7CiAgICAgICAgICAgICAg ICAgc3RpLT5uZWVkX3BhcnNpbmcgPSBBVlNUUkVBTV9QQVJTRV9GVUxMOworICAgICAgICAgICAg fSBlbHNlIGlmIChzdC0+Y29kZWNwYXItPmNvZGVjX2lkID09IEFWX0NPREVDX0lEX0FBQykgewor ICAgICAgICAgICAgICAgIHN0aS0+bmVlZF9wYXJzaW5nID0gQVZTVFJFQU1fUEFSU0VfRlVMTDsK ICAgICAgICAgICAgIH0KICAgICAgICAgICAgIHN0LT5jb2RlY3Bhci0+Yml0c19wZXJfY29kZWRf c2FtcGxlID0gYXZfZ2V0X2JpdHNfcGVyX3NhbXBsZShzdC0+Y29kZWNwYXItPmNvZGVjX2lkKTsK IAotLSAKMi4zOS4yCgo= --0000000000008472b105fb5aba9a Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ 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". --0000000000008472b105fb5aba9a--