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 8771F49529 for ; Mon, 12 Feb 2024 18:05:52 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 50AE668A9C8; Mon, 12 Feb 2024 20:05:49 +0200 (EET) Received: from mail-40132.protonmail.ch (mail-40132.protonmail.ch [185.70.40.132]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1195568C6F3 for ; Mon, 12 Feb 2024 20:05:42 +0200 (EET) Date: Mon, 12 Feb 2024 18:05:22 +0000 To: FFmpeg development discussions and patches Message-ID: In-Reply-To: References: Feedback-ID: 33509725:user:proton MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_1beQFcVkBRLyES2kPTOjlKyFHBwSlmFYcAgzYapSzY" Subject: Re: [FFmpeg-devel] [PATCH] avformat/matroska: Add support for A_ATRAC/AT1 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: , From: asivery via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: asivery Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This is a multi-part message in MIME format. --b1_1beQFcVkBRLyES2kPTOjlKyFHBwSlmFYcAgzYapSzY Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable I've attached the updated patch. Both new entries are now placed in an alph= abetically correct way in their appropriate lists. On Monday, February 12th, 2024 at 11:53 AM, Andreas Rheinhardt wrote: > asivery via ffmpeg-devel: >=20 > > I apologize for not having responded earlier. > > I've attached the updated patch. > >=20 > > From 68c77320954e44a7f02e95537fc9a6436da7549c Mon Sep 17 00:00:00 2001 > > From: asivery asivery@protonmail.com > > Date: Sun, 11 Feb 2024 23:13:07 +0100 > > Subject: [PATCH] avformat/matroska: Add support for A_ATRAC/AT1 > >=20 > > Signed-off-by: asivery asivery@protonmail.com > > --- >=20 >=20 > Send your patch either via git send-email or as an attachment; if you > have comments for your patch (that are not supposed to be part of the > eventual commit and not its commit message), then put them here, in > between the --- and the affected files. >=20 > > libavformat/matroska.c | 1 + > > libavformat/matroskadec.c | 8 ++++++++ > > libavformat/matroskaenc.c | 1 + > > 3 files changed, 10 insertions(+) > >=20 > > diff --git a/libavformat/matroska.c b/libavformat/matroska.c > > index 5878594e68..ae9ecc8207 100644 > > --- a/libavformat/matroska.c > > +++ b/libavformat/matroska.c > > @@ -53,6 +53,7 @@ const CodecTags ff_mkv_codec_tags[]=3D{ > > {"A_REAL/ATRC" , AV_CODEC_ID_ATRAC3}, > > {"A_REAL/COOK" , AV_CODEC_ID_COOK}, > > {"A_REAL/SIPR" , AV_CODEC_ID_SIPR}, > > + {"A_ATRAC/AT1" , AV_CODEC_ID_ATRAC1}, >=20 >=20 > This audio part of this list is ordered by the Matroska CodecID (i.e. > the string on the left). Please keep it that way. >=20 > > {"A_TRUEHD" , AV_CODEC_ID_TRUEHD}, > > {"A_TTA1" , AV_CODEC_ID_TTA}, > > {"A_VORBIS" , AV_CODEC_ID_VORBIS}, > > diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c > > index 8f000f86be..1bb6e8605a 100644 > > --- a/libavformat/matroskadec.c > > +++ b/libavformat/matroskadec.c > > @@ -2779,6 +2779,14 @@ static int mka_parse_audio_codec(MatroskaTrack *= track, AVCodecParameters par, > > return AVERROR(ENOMEM); > > break; > > } > > + case AV_CODEC_ID_ATRAC1: > > + / ATRAC1 uses a constant frame size. > > + * Typical ATRAC1 streams are either mono or stereo. > > + * At most, ATRAC1 was used to store 8 channels of audio. */ > > + if (track->audio.channels > 8) > > + return AVERROR_INVALIDDATA; > > + par->block_align =3D track->audio.channels * 212; > > + break; > > case AV_CODEC_ID_FLAC: > > if (track->codec_priv.size) { > > ret =3D matroska_parse_flac(s, track, extradata_offset); > > diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c > > index 1457a6890c..aa25657f8f 100644 > > --- a/libavformat/matroskaenc.c > > +++ b/libavformat/matroskaenc.c > > @@ -3483,6 +3483,7 @@ static const AVCodecTag additional_audio_tags[] = =3D { > > { AV_CODEC_ID_QDM2, 0xFFFFFFFF }, > > { AV_CODEC_ID_RA_144, 0xFFFFFFFF }, > > { AV_CODEC_ID_TRUEHD, 0xFFFFFFFF }, > > + { AV_CODEC_ID_ATRAC1, 0xFFFFFFFF }, >=20 >=20 > Please keep this list sorted alphabetically. >=20 > > { AV_CODEC_ID_NONE, 0xFFFFFFFF } > > }; >=20 >=20 > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel >=20 > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". --b1_1beQFcVkBRLyES2kPTOjlKyFHBwSlmFYcAgzYapSzY Content-Type: text/x-patch; name=0001-avformat-matroska-Add-support-for-A_ATRAC-AT1.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-avformat-matroska-Add-support-for-A_ATRAC-AT1.patch RnJvbSBhNTMwOTMxZWJiYTY2MzhiMDk1NzIwYzIyMmI3MmQyZjNkNWIwYmQxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBhc2l2ZXJ5IDxhc2l2ZXJ5QHByb3Rvbm1haWwuY29tPgpEYXRl OiBNb24sIDEyIEZlYiAyMDI0IDE5OjAxOjMyICswMTAwClN1YmplY3Q6IFtQQVRDSF0gYXZmb3Jt YXQvbWF0cm9za2E6IEFkZCBzdXBwb3J0IGZvciBBX0FUUkFDL0FUMQoKU2lnbmVkLW9mZi1ieTog YXNpdmVyeSA8YXNpdmVyeUBwcm90b25tYWlsLmNvbT4KLS0tCiBsaWJhdmZvcm1hdC9tYXRyb3Nr YS5jICAgIHwgMSArCiBsaWJhdmZvcm1hdC9tYXRyb3NrYWRlYy5jIHwgOCArKysrKysrKwogbGli YXZmb3JtYXQvbWF0cm9za2FlbmMuYyB8IDEgKwogMyBmaWxlcyBjaGFuZ2VkLCAxMCBpbnNlcnRp b25zKCspCgpkaWZmIC0tZ2l0IGEvbGliYXZmb3JtYXQvbWF0cm9za2EuYyBiL2xpYmF2Zm9ybWF0 L21hdHJvc2thLmMKaW5kZXggNTg3ODU5NGU2OC4uZDBlY2ZiZWI2YSAxMDA2NDQKLS0tIGEvbGli YXZmb3JtYXQvbWF0cm9za2EuYworKysgYi9saWJhdmZvcm1hdC9tYXRyb3NrYS5jCkBAIC0yOCw2 ICsyOCw3IEBAIGNvbnN0IENvZGVjVGFncyBmZl9ta3ZfY29kZWNfdGFnc1tdPXsKICAgICB7IkFf QUFDIiAgICAgICAgICAgICwgQVZfQ09ERUNfSURfQUFDfSwKICAgICB7IkFfQUMzIiAgICAgICAg ICAgICwgQVZfQ09ERUNfSURfQUMzfSwKICAgICB7IkFfQUxBQyIgICAgICAgICAgICwgQVZfQ09E RUNfSURfQUxBQ30sCisgICAgeyJBX0FUUkFDL0FUMSIgICAgICAsIEFWX0NPREVDX0lEX0FUUkFD MX0sCiAgICAgeyJBX0RUUyIgICAgICAgICAgICAsIEFWX0NPREVDX0lEX0RUU30sCiAgICAgeyJB X0VBQzMiICAgICAgICAgICAsIEFWX0NPREVDX0lEX0VBQzN9LAogICAgIHsiQV9GTEFDIiAgICAg ICAgICAgLCBBVl9DT0RFQ19JRF9GTEFDfSwKZGlmZiAtLWdpdCBhL2xpYmF2Zm9ybWF0L21hdHJv c2thZGVjLmMgYi9saWJhdmZvcm1hdC9tYXRyb3NrYWRlYy5jCmluZGV4IDhmMDAwZjg2YmUuLjVk M2QxOGExNDYgMTAwNjQ0Ci0tLSBhL2xpYmF2Zm9ybWF0L21hdHJvc2thZGVjLmMKKysrIGIvbGli YXZmb3JtYXQvbWF0cm9za2FkZWMuYwpAQCAtMjc3OSw2ICsyNzc5LDE0IEBAIHN0YXRpYyBpbnQg bWthX3BhcnNlX2F1ZGlvX2NvZGVjKE1hdHJvc2thVHJhY2sgKnRyYWNrLCBBVkNvZGVjUGFyYW1l dGVycyAqcGFyLAogICAgICAgICAgICAgcmV0dXJuIEFWRVJST1IoRU5PTUVNKTsKICAgICAgICAg YnJlYWs7CiAgICAgfQorICAgIGNhc2UgQVZfQ09ERUNfSURfQVRSQUMxOgorICAgICAgICAvKiBB VFJBQzEgdXNlcyBhIGNvbnN0YW50IGZyYW1lIHNpemUuCisgICAgICAgICAqIFR5cGljYWwgQVRS QUMxIHN0cmVhbXMgYXJlIGVpdGhlciBtb25vIG9yIHN0ZXJlby4KKyAgICAgICAgICogQXQgbW9z dCwgQVRSQUMxIHdhcyB1c2VkIHRvIHN0b3JlIDggY2hhbm5lbHMgb2YgYXVkaW8uICovCisgICAg ICAgIGlmICh0cmFjay0+YXVkaW8uY2hhbm5lbHMgPiA4KQorICAgICAgICAgICAgcmV0dXJuIEFW RVJST1JfSU5WQUxJRERBVEE7CisgICAgICAgIHBhci0+YmxvY2tfYWxpZ24gPSB0cmFjay0+YXVk aW8uY2hhbm5lbHMgKiAyMTI7CisgICAgICAgIGJyZWFrOwogICAgIGNhc2UgQVZfQ09ERUNfSURf RkxBQzoKICAgICAgICAgaWYgKHRyYWNrLT5jb2RlY19wcml2LnNpemUpIHsKICAgICAgICAgICAg IHJldCA9IG1hdHJvc2thX3BhcnNlX2ZsYWMocywgdHJhY2ssIGV4dHJhZGF0YV9vZmZzZXQpOwpk aWZmIC0tZ2l0IGEvbGliYXZmb3JtYXQvbWF0cm9za2FlbmMuYyBiL2xpYmF2Zm9ybWF0L21hdHJv c2thZW5jLmMKaW5kZXggMTQ1N2E2ODkwYy4uMjFjZTRhZWYzZCAxMDA2NDQKLS0tIGEvbGliYXZm b3JtYXQvbWF0cm9za2FlbmMuYworKysgYi9saWJhdmZvcm1hdC9tYXRyb3NrYWVuYy5jCkBAIC0z NDc0LDYgKzM0NzQsNyBAQCBzdGF0aWMgaW50IG1rdl9jaGVja19iaXRzdHJlYW0oQVZGb3JtYXRD b250ZXh0ICpzLCBBVlN0cmVhbSAqc3QsCiAKIHN0YXRpYyBjb25zdCBBVkNvZGVjVGFnIGFkZGl0 aW9uYWxfYXVkaW9fdGFnc1tdID0gewogICAgIHsgQVZfQ09ERUNfSURfQUxBQywgICAgICAwWEZG RkZGRkZGIH0sCisgICAgeyBBVl9DT0RFQ19JRF9BVFJBQzEsICAgIDB4RkZGRkZGRkYgfSwKICAg ICB7IEFWX0NPREVDX0lEX01MUCwgICAgICAgMHhGRkZGRkZGRiB9LAogICAgIHsgQVZfQ09ERUNf SURfT1BVUywgICAgICAweEZGRkZGRkZGIH0sCiAgICAgeyBBVl9DT0RFQ19JRF9QQ01fUzE2QkUs IDB4RkZGRkZGRkYgfSwKLS0gCjIuMzQuMQoK --b1_1beQFcVkBRLyES2kPTOjlKyFHBwSlmFYcAgzYapSzY 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". --b1_1beQFcVkBRLyES2kPTOjlKyFHBwSlmFYcAgzYapSzY--