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 991B149E38 for ; Fri, 12 Apr 2024 23:46:51 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 174A068D314; Sat, 13 Apr 2024 02:46:49 +0300 (EEST) Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD34568D0CE for ; Sat, 13 Apr 2024 02:46:42 +0300 (EEST) Received: by mail-qt1-f175.google.com with SMTP id d75a77b69052e-434ffc2b520so58101cf.0 for ; Fri, 12 Apr 2024 16:46:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712965601; x=1713570401; h=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=OJv3QHESI0SZFD04V+Mm+1fCA4G+unyxTvoL+U6X8WY=; b=QOjr39Pqip4+NCV+ydtRXVwVj45yIG/sEAEb0TaL4C0zpU9sTFJxG+Y/pY5Yfs7bca ypJCq90VIkGSysEHLL2yoN6ClSSIF2cbZpdYWjnvxUwAuI3o5XchBCkImNfIpUjvhheR haXi0gixb9x2SOp1v/lvsMPvvMmUnXhIEcfnhG0BY9RsxW6Ne46OAcBndsuNDb7T1DJz OGQN3tXAEoyfNoBLj/gOjCEE7mFIrGFuugXm5A06lp+/xenazihnFimH55jz+LiANsUk Zdo2naib/qVTMi081CYg0EjNDeMuvM8ufJLN+HI+0XYHa9iYn1ULOS+0zZp7b4Y2NJUD y9gw== X-Gm-Message-State: AOJu0Yy+3zyNiw4d0gjkXan73ZjzfhGLWYi4PmwsXXKJtVTvC6CqHAWE iN1PlV/4DWrI10GEPVJVZ63vtrCeM8ALtK1fM5ocImEW0+F6Vr4GUHWSYSS4fgpKZTgvmKmuB65 /6gMINygSa7vl5hkIuuuCsaK3zW3Y+sGjdE66Nbsw8lJcXL2k8w== X-Google-Smtp-Source: AGHT+IHt7kHLxh+4c9LHwzb3CIdaFL/ED241RDFZakN4GE+qW/E1Y1Qeb+SLlbzNxaX6GQukYKYgS3/NOPcfPYbaqRc= X-Received: by 2002:ac8:7d44:0:b0:431:6352:80fb with SMTP id h4-20020ac87d44000000b00431635280fbmr110152qtb.16.1712965600605; Fri, 12 Apr 2024 16:46:40 -0700 (PDT) MIME-Version: 1.0 References: <20240408222733.1422670-1-asoulier@google.com> In-Reply-To: Date: Fri, 12 Apr 2024 16:46:29 -0700 Message-ID: To: FFmpeg development discussions and patches , Antoine Soulier Content-Type: multipart/mixed; boundary="000000000000239a9a0615eee24f" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [FFmpeg-devel] [PATCH] avformat/lc3: Add file format for LC3/LC3plus transport 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: Antoine Soulier via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: Antoine Soulier Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --000000000000239a9a0615eee24f Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Thanks. On Fri, Apr 12, 2024 at 6:05=E2=80=AFAM Stefano Sabatini wrote: > On date Wednesday 2024-04-10 16:46:55 -0700, ffmpeg-devel Mailing List > wrote: > > Sure, I thought these warnings were disabled while looking at codec2.c > > Sorry for the bad merge of the doc. > > > From 975040408f32431efc3fae0a0b8c048f02159515 Mon Sep 17 00:00:00 2001 > > From: Antoine SOULIER > > Date: Thu, 4 Apr 2024 22:38:03 +0000 > > Subject: [PATCH] avformat/lc3: Add file format for LC3/LC3plus transpor= t > > > > A file format is described in Bluetooth SIG LC3 and ETSI TS 103 634, fo= r > > test purpose. This is the format implemented here. > > --- > > Changelog | 1 + > > doc/muxers.texi | 6 + > > libavformat/Makefile | 2 + > > libavformat/allformats.c | 2 + > > libavformat/lc3.c | 253 +++++++++++++++++++++++++++++++++++++++ > > 5 files changed, 264 insertions(+) > > create mode 100644 libavformat/lc3.c > > > > diff --git a/Changelog b/Changelog > > index b7a1af4083..5c8f505211 100644 > > --- a/Changelog > > +++ b/Changelog > > @@ -5,6 +5,7 @@ version : > > - Raw Captions with Time (RCWT) closed caption demuxer > > - LC3/LC3plus decoding/encoding using external library liblc3 > > - ffmpeg CLI filtergraph chaining > > +- LC3/LC3plus demuxer and muxer > > > > > > version 7.0: > > diff --git a/doc/muxers.texi b/doc/muxers.texi > > index 4b30970b78..4c14323d50 100644 > > --- a/doc/muxers.texi > > +++ b/doc/muxers.texi > > @@ -2725,6 +2725,12 @@ games such as "Real War", and "Real War: Rogue > States". > > > > This muxer accepts a single @samp{adpcm_ima_ssi} audio stream. > > > > +@section lc3 > > +Bluetooth SIG Low Complexity Communication Codec audio (LC3), or > > +ETSI TS 103 634 Low Complexity Communication Codec plus (LC3plus). > > + > > > +This muxer accepts a single @code{lc3} audio stream. > > nit++: @samp{lc3} for consistency > > > + > > @section lrc > > LRC lyrics file format muxer. > > > > diff --git a/libavformat/Makefile b/libavformat/Makefile > > index 9981799cc9..8efe26b6df 100644 > > --- a/libavformat/Makefile > > +++ b/libavformat/Makefile > > @@ -332,6 +332,8 @@ OBJS-$(CONFIG_KVAG_DEMUXER) +=3D kvag.= o > > OBJS-$(CONFIG_KVAG_MUXER) +=3D kvag.o rawenc.o > > OBJS-$(CONFIG_LAF_DEMUXER) +=3D lafdec.o > > OBJS-$(CONFIG_LATM_MUXER) +=3D latmenc.o rawenc.o > > +OBJS-$(CONFIG_LC3_DEMUXER) +=3D lc3.o > > +OBJS-$(CONFIG_LC3_MUXER) +=3D lc3.o > > OBJS-$(CONFIG_LMLM4_DEMUXER) +=3D lmlm4.o > > OBJS-$(CONFIG_LOAS_DEMUXER) +=3D loasdec.o rawdec.o > > OBJS-$(CONFIG_LUODAT_DEMUXER) +=3D luodatdec.o > > diff --git a/libavformat/allformats.c b/libavformat/allformats.c > > index ae925dcf60..305fa46532 100644 > > --- a/libavformat/allformats.c > > +++ b/libavformat/allformats.c > > @@ -252,6 +252,8 @@ extern const FFInputFormat ff_kvag_demuxer; > > extern const FFOutputFormat ff_kvag_muxer; > > extern const FFInputFormat ff_laf_demuxer; > > extern const FFOutputFormat ff_latm_muxer; > > +extern const FFInputFormat ff_lc3_demuxer; > > +extern const FFOutputFormat ff_lc3_muxer; > > extern const FFInputFormat ff_lmlm4_demuxer; > > extern const FFInputFormat ff_loas_demuxer; > > extern const FFInputFormat ff_luodat_demuxer; > > diff --git a/libavformat/lc3.c b/libavformat/lc3.c > > new file mode 100644 > > index 0000000000..e27727145b > > --- /dev/null > > +++ b/libavformat/lc3.c > > @@ -0,0 +1,253 @@ > > +/* > > + * LC3 demuxer > > nit: LC3 demuxer and muxer > > > + * Copyright (C) 2024 Antoine Soulier > > + * > > + * This file is part of FFmpeg. > > + * > > + * FFmpeg is free software; you can redistribute it and/or > > + * modify it under the terms of the GNU Lesser General Public > > + * License as published by the Free Software Foundation; either > > + * version 2.1 of the License, or (at your option) any later version. > > + * > > + * FFmpeg is distributed in the hope that it will be useful, > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > > + * Lesser General Public License for more details. > > + * > > + * You should have received a copy of the GNU Lesser General Public > > + * License along with FFmpeg; if not, write to the Free Software > > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA > 02110-1301 USA > > + */ > > + > > +/** > > + * @file > > + * Based on the file format specified by : > > + * > > + * - Bluetooth SIG - Low Complexity Communication Codec Test Suite > > + * > https://www.bluetooth.org/docman/handlers/downloaddoc.ashx?doc_id=3D50230= 1 > > + * 3.2.8.2 Reference LC3 Codec Bitstream Format > > + * > > + * - ETSI TI 103 634 V1.4.1 - Low Complexity Communication Codec plus > > + * > https://www.etsi.org/deliver/etsi_ts/103600_103699/103634/01.04.01_60/ts_= 103634v010401p.pdf > > + * LC3plus conformance script package > > + */ > > + > > +#include "config_components.h" > > + > > +#include "libavcodec/packet.h" > > +#include "libavutil/intreadwrite.h" > > + > > +#include "avformat.h" > > +#include "avio.h" > > +#include "demux.h" > > +#include "internal.h" > > +#include "mux.h" > > + > > +static int check_frame_length(int srate_hz, int frame_us) > > +{ > > + if (srate_hz !=3D 8000 && srate_hz !=3D 16000 && srate_hz !=3D 24= 000 && > > + srate_hz !=3D 32000 && srate_hz !=3D 48000 && srate_hz !=3D 96= 000) > > + return -1; > > + > > + if (frame_us !=3D 2500 && frame_us !=3D 5000 && > > + frame_us !=3D 7500 && frame_us !=3D 10000) > > + return -1; > > + > > + return 0; > > +} > > + > > +#if CONFIG_LC3_DEMUXER > > + > > +typedef struct LC3DemuxContext { > > + int frame_samples; > > + int64_t end_dts; > > +} LC3DemuxContext; > > + > > +static int lc3_read_probe(const AVProbeData *p) > > +{ > > + int frame_us, srate_hz; > > + > > + if (p->buf_size < 12) > > + return 0; > > + > > + if (AV_RB16(p->buf + 0) !=3D 0x1ccc || > > + AV_RL16(p->buf + 2) < 9 * sizeof(uint16_t)) > > + return 0; > > + > > + srate_hz =3D AV_RL16(p->buf + 4) * 100; > > + frame_us =3D AV_RL16(p->buf + 10) * 10; > > + if (check_frame_length(srate_hz, frame_us) < 0) > > + return 0; > > + > > + return AVPROBE_SCORE_MAX; > > +} > > + > > +static int lc3_read_header(AVFormatContext *s) > > +{ > > + LC3DemuxContext *lc3 =3D s->priv_data; > > + AVStream *st =3D NULL; > > + uint16_t tag, hdr_size; > > + uint32_t length; > > + int srate_hz, frame_us, channels, bit_rate; > > + int ep_mode, hr_mode; > > + int num_extra_params; > > + int delay, ret; > > + > > + tag =3D avio_rb16(s->pb); > > + hdr_size =3D avio_rl16(s->pb); > > + > > + if (tag !=3D 0x1ccc || hdr_size < 9 * sizeof(uint16_t)) > > + return AVERROR_INVALIDDATA; > > + > > + num_extra_params =3D hdr_size / sizeof(uint16_t) - 9; > > + > > + srate_hz =3D avio_rl16(s->pb) * 100; > > + bit_rate =3D avio_rl16(s->pb) * 100; > > + channels =3D avio_rl16(s->pb); > > + frame_us =3D avio_rl16(s->pb) * 10; > > + ep_mode =3D avio_rl16(s->pb) !=3D 0; > > + length =3D avio_rl32(s->pb); > > + hr_mode =3D num_extra_params >=3D 1 && avio_rl16(s->pb); > > + > > + if (check_frame_length(srate_hz, frame_us) < 0) { > > > + av_log(s, AV_LOG_ERROR, "Invalid LC3 sample rate: %d Hz, " > > + "frame duration: %.1f ms.\n", > > + srate_hz, frame_us / 1000.f); > > you can move the log to the function, by passing a log context (this > way you can provide more context in the error message and specify what > failed between rate and duration) - or skip the log in case a NULL log > context is provided for the probe case > > but I don't think this is really blocking > > [...] > > Looks good to me otherwise, thanks. > --000000000000239a9a0615eee24f Content-Type: text/x-patch; charset="US-ASCII"; name="0001-avformat-lc3-Add-file-format-for-LC3-LC3plus-transpo.patch" Content-Disposition: attachment; filename="0001-avformat-lc3-Add-file-format-for-LC3-LC3plus-transpo.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_luxbgow90 RnJvbSA5M2M1NjI4NTAyYTFmMjQyMDQzYjM5YTE4ZTgzODk1ZDkwNjc1NDFlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvaW5lIFNPVUxJRVIgPGFzb3VsaWVyQGdvb2dsZS5jb20+ CkRhdGU6IFRodSwgNCBBcHIgMjAyNCAyMjozODowMyArMDAwMApTdWJqZWN0OiBbUEFUQ0hdIGF2 Zm9ybWF0L2xjMzogQWRkIGZpbGUgZm9ybWF0IGZvciBMQzMvTEMzcGx1cyB0cmFuc3BvcnQKCkEg ZmlsZSBmb3JtYXQgaXMgZGVzY3JpYmVkIGluIEJsdWV0b290aCBTSUcgTEMzIGFuZCBFVFNJIFRT IDEwMyA2MzQsIGZvcgp0ZXN0IHB1cnBvc2UuIFRoaXMgaXMgdGhlIGZvcm1hdCBpbXBsZW1lbnRl ZCBoZXJlLgotLS0KIENoYW5nZWxvZyAgICAgICAgICAgICAgICB8ICAgMSArCiBkb2MvbXV4ZXJz LnRleGkgICAgICAgICAgfCAgIDYgKwogbGliYXZmb3JtYXQvTWFrZWZpbGUgICAgIHwgICAyICsK IGxpYmF2Zm9ybWF0L2FsbGZvcm1hdHMuYyB8ICAgMiArCiBsaWJhdmZvcm1hdC9sYzMuYyAgICAg ICAgfCAyNTIgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiA1IGZpbGVz IGNoYW5nZWQsIDI2MyBpbnNlcnRpb25zKCspCiBjcmVhdGUgbW9kZSAxMDA2NDQgbGliYXZmb3Jt YXQvbGMzLmMKCmRpZmYgLS1naXQgYS9DaGFuZ2Vsb2cgYi9DaGFuZ2Vsb2cKaW5kZXggYjdhMWFm NDA4My4uNWM4ZjUwNTIxMSAxMDA2NDQKLS0tIGEvQ2hhbmdlbG9nCisrKyBiL0NoYW5nZWxvZwpA QCAtNSw2ICs1LDcgQEAgdmVyc2lvbiA8bmV4dD46CiAtIFJhdyBDYXB0aW9ucyB3aXRoIFRpbWUg KFJDV1QpIGNsb3NlZCBjYXB0aW9uIGRlbXV4ZXIKIC0gTEMzL0xDM3BsdXMgZGVjb2RpbmcvZW5j b2RpbmcgdXNpbmcgZXh0ZXJuYWwgbGlicmFyeSBsaWJsYzMKIC0gZmZtcGVnIENMSSBmaWx0ZXJn cmFwaCBjaGFpbmluZworLSBMQzMvTEMzcGx1cyBkZW11eGVyIGFuZCBtdXhlcgogCiAKIHZlcnNp b24gNy4wOgpkaWZmIC0tZ2l0IGEvZG9jL211eGVycy50ZXhpIGIvZG9jL211eGVycy50ZXhpCmlu ZGV4IDRiMzA5NzBiNzguLjU4ZWQ1YjQ5MDIgMTAwNjQ0Ci0tLSBhL2RvYy9tdXhlcnMudGV4aQor KysgYi9kb2MvbXV4ZXJzLnRleGkKQEAgLTI3MjUsNiArMjcyNSwxMiBAQCBnYW1lcyBzdWNoIGFz ICJSZWFsIFdhciIsIGFuZCAiUmVhbCBXYXI6IFJvZ3VlIFN0YXRlcyIuCiAKIFRoaXMgbXV4ZXIg YWNjZXB0cyBhIHNpbmdsZSBAc2FtcHthZHBjbV9pbWFfc3NpfSBhdWRpbyBzdHJlYW0uCiAKK0Bz ZWN0aW9uIGxjMworQmx1ZXRvb3RoIFNJRyBMb3cgQ29tcGxleGl0eSBDb21tdW5pY2F0aW9uIENv ZGVjIGF1ZGlvIChMQzMpLCBvcgorRVRTSSBUUyAxMDMgNjM0IExvdyBDb21wbGV4aXR5IENvbW11 bmljYXRpb24gQ29kZWMgcGx1cyAoTEMzcGx1cykuCisKK1RoaXMgbXV4ZXIgYWNjZXB0cyBhIHNp bmdsZSBAc2FtcHtsYzN9IGF1ZGlvIHN0cmVhbS4KKwogQHNlY3Rpb24gbHJjCiBMUkMgbHlyaWNz IGZpbGUgZm9ybWF0IG11eGVyLgogCmRpZmYgLS1naXQgYS9saWJhdmZvcm1hdC9NYWtlZmlsZSBi L2xpYmF2Zm9ybWF0L01ha2VmaWxlCmluZGV4IDk5ODE3OTljYzkuLjhlZmUyNmI2ZGYgMTAwNjQ0 Ci0tLSBhL2xpYmF2Zm9ybWF0L01ha2VmaWxlCisrKyBiL2xpYmF2Zm9ybWF0L01ha2VmaWxlCkBA IC0zMzIsNiArMzMyLDggQEAgT0JKUy0kKENPTkZJR19LVkFHX0RFTVVYRVIpICAgICAgICAgICAg ICArPSBrdmFnLm8KIE9CSlMtJChDT05GSUdfS1ZBR19NVVhFUikgICAgICAgICAgICAgICAgKz0g a3ZhZy5vIHJhd2VuYy5vCiBPQkpTLSQoQ09ORklHX0xBRl9ERU1VWEVSKSAgICAgICAgICAgICAg ICs9IGxhZmRlYy5vCiBPQkpTLSQoQ09ORklHX0xBVE1fTVVYRVIpICAgICAgICAgICAgICAgICs9 IGxhdG1lbmMubyByYXdlbmMubworT0JKUy0kKENPTkZJR19MQzNfREVNVVhFUikgICAgICAgICAg ICAgICArPSBsYzMubworT0JKUy0kKENPTkZJR19MQzNfTVVYRVIpICAgICAgICAgICAgICAgICAr PSBsYzMubwogT0JKUy0kKENPTkZJR19MTUxNNF9ERU1VWEVSKSAgICAgICAgICAgICArPSBsbWxt NC5vCiBPQkpTLSQoQ09ORklHX0xPQVNfREVNVVhFUikgICAgICAgICAgICAgICs9IGxvYXNkZWMu byByYXdkZWMubwogT0JKUy0kKENPTkZJR19MVU9EQVRfREVNVVhFUikgICAgICAgICAgICArPSBs dW9kYXRkZWMubwpkaWZmIC0tZ2l0IGEvbGliYXZmb3JtYXQvYWxsZm9ybWF0cy5jIGIvbGliYXZm b3JtYXQvYWxsZm9ybWF0cy5jCmluZGV4IGFlOTI1ZGNmNjAuLjMwNWZhNDY1MzIgMTAwNjQ0Ci0t LSBhL2xpYmF2Zm9ybWF0L2FsbGZvcm1hdHMuYworKysgYi9saWJhdmZvcm1hdC9hbGxmb3JtYXRz LmMKQEAgLTI1Miw2ICsyNTIsOCBAQCBleHRlcm4gY29uc3QgRkZJbnB1dEZvcm1hdCAgZmZfa3Zh Z19kZW11eGVyOwogZXh0ZXJuIGNvbnN0IEZGT3V0cHV0Rm9ybWF0IGZmX2t2YWdfbXV4ZXI7CiBl eHRlcm4gY29uc3QgRkZJbnB1dEZvcm1hdCAgZmZfbGFmX2RlbXV4ZXI7CiBleHRlcm4gY29uc3Qg RkZPdXRwdXRGb3JtYXQgZmZfbGF0bV9tdXhlcjsKK2V4dGVybiBjb25zdCBGRklucHV0Rm9ybWF0 ICBmZl9sYzNfZGVtdXhlcjsKK2V4dGVybiBjb25zdCBGRk91dHB1dEZvcm1hdCBmZl9sYzNfbXV4 ZXI7CiBleHRlcm4gY29uc3QgRkZJbnB1dEZvcm1hdCAgZmZfbG1sbTRfZGVtdXhlcjsKIGV4dGVy biBjb25zdCBGRklucHV0Rm9ybWF0ICBmZl9sb2FzX2RlbXV4ZXI7CiBleHRlcm4gY29uc3QgRkZJ bnB1dEZvcm1hdCAgZmZfbHVvZGF0X2RlbXV4ZXI7CmRpZmYgLS1naXQgYS9saWJhdmZvcm1hdC9s YzMuYyBiL2xpYmF2Zm9ybWF0L2xjMy5jCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAuLjkzY2U3MjBhZjMKLS0tIC9kZXYvbnVsbAorKysgYi9saWJhdmZvcm1hdC9sYzMuYwpA QCAtMCwwICsxLDI1MiBAQAorLyoKKyAqIExDMyBtdXhlciBhbmQgZGVtdXhlcgorICogQ29weXJp Z2h0IChDKSAyMDI0ICBBbnRvaW5lIFNvdWxpZXIgPGFzb3VsaWVyQGdvb2dsZS5jb20+CisgKgor ICogVGhpcyBmaWxlIGlzIHBhcnQgb2YgRkZtcGVnLgorICoKKyAqIEZGbXBlZyBpcyBmcmVlIHNv ZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKKyAqIG1vZGlmeSBpdCB1bmRl ciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMZXNzZXIgR2VuZXJhbCBQdWJsaWMKKyAqIExpY2Vuc2Ug YXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb247IGVpdGhlcgorICog dmVyc2lvbiAyLjEgb2YgdGhlIExpY2Vuc2UsIG9yIChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVy IHZlcnNpb24uCisgKgorICogRkZtcGVnIGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQg aXQgd2lsbCBiZSB1c2VmdWwsCisgKiBidXQgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQg ZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgorICogTUVSQ0hBTlRBQklMSVRZIG9yIEZJVE5F U1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2VlIHRoZSBHTlUKKyAqIExlc3NlciBHZW5l cmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCisgKgorICogWW91IHNob3VsZCBo YXZlIHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIExlc3NlciBHZW5lcmFsIFB1YmxpYworICog TGljZW5zZSBhbG9uZyB3aXRoIEZGbXBlZzsgaWYgbm90LCB3cml0ZSB0byB0aGUgRnJlZSBTb2Z0 d2FyZQorICogRm91bmRhdGlvbiwgSW5jLiwgNTEgRnJhbmtsaW4gU3RyZWV0LCBGaWZ0aCBGbG9v ciwgQm9zdG9uLCBNQSAwMjExMC0xMzAxIFVTQQorICovCisKKy8qKgorICogQGZpbGUKKyAqIEJh c2VkIG9uIHRoZSBmaWxlIGZvcm1hdCBzcGVjaWZpZWQgYnkgOgorICoKKyAqIC0gQmx1ZXRvb3Ro IFNJRyAtIExvdyBDb21wbGV4aXR5IENvbW11bmljYXRpb24gQ29kZWMgVGVzdCBTdWl0ZQorICog ICBodHRwczovL3d3dy5ibHVldG9vdGgub3JnL2RvY21hbi9oYW5kbGVycy9kb3dubG9hZGRvYy5h c2h4P2RvY19pZD01MDIzMDEKKyAqICAgMy4yLjguMiBSZWZlcmVuY2UgTEMzIENvZGVjIEJpdHN0 cmVhbSBGb3JtYXQKKyAqCisgKiAtIEVUU0kgVEkgMTAzIDYzNCBWMS40LjEgLSBMb3cgQ29tcGxl eGl0eSBDb21tdW5pY2F0aW9uIENvZGVjIHBsdXMKKyAqICAgaHR0cHM6Ly93d3cuZXRzaS5vcmcv ZGVsaXZlci9ldHNpX3RzLzEwMzYwMF8xMDM2OTkvMTAzNjM0LzAxLjA0LjAxXzYwL3RzXzEwMzYz NHYwMTA0MDFwLnBkZgorICogICBMQzNwbHVzIGNvbmZvcm1hbmNlIHNjcmlwdCBwYWNrYWdlCisg Ki8KKworI2luY2x1ZGUgImNvbmZpZ19jb21wb25lbnRzLmgiCisKKyNpbmNsdWRlICJsaWJhdmNv ZGVjL3BhY2tldC5oIgorI2luY2x1ZGUgImxpYmF2dXRpbC9pbnRyZWFkd3JpdGUuaCIKKworI2lu Y2x1ZGUgImF2Zm9ybWF0LmgiCisjaW5jbHVkZSAiYXZpby5oIgorI2luY2x1ZGUgImRlbXV4Lmgi CisjaW5jbHVkZSAiaW50ZXJuYWwuaCIKKyNpbmNsdWRlICJtdXguaCIKKworc3RhdGljIGludCBj aGVja19mcmFtZV9sZW5ndGgodm9pZCAqYXZjbCwgaW50IHNyYXRlX2h6LCBpbnQgZnJhbWVfdXMp Cit7CisgICAgaWYgKHNyYXRlX2h6ICE9ICA4MDAwICYmIHNyYXRlX2h6ICE9IDE2MDAwICYmIHNy YXRlX2h6ICE9IDI0MDAwICYmCisgICAgICAgIHNyYXRlX2h6ICE9IDMyMDAwICYmIHNyYXRlX2h6 ICE9IDQ4MDAwICYmIHNyYXRlX2h6ICE9IDk2MDAwKSB7CisgICAgICAgIGlmIChhdmNsKQorICAg ICAgICAgICAgYXZfbG9nKGF2Y2wsIEFWX0xPR19FUlJPUiwKKyAgICAgICAgICAgICAgICAgICAi SW52YWxpZCBMQzMgc2FtcGxlIHJhdGU6ICVkIEh6LlxuIiwgc3JhdGVfaHopOworICAgICAgICBy ZXR1cm4gLTE7CisgICAgfQorCisgICAgaWYgKGZyYW1lX3VzICE9IDI1MDAgJiYgZnJhbWVfdXMg IT0gIDUwMDAgJiYKKyAgICAgICAgZnJhbWVfdXMgIT0gNzUwMCAmJiBmcmFtZV91cyAhPSAxMDAw MCkgeworICAgICAgICBpZiAoYXZjbCkKKyAgICAgICAgICAgIGF2X2xvZyhhdmNsLCBBVl9MT0df RVJST1IsCisgICAgICAgICAgICAgICAgICAgIkludmFsaWQgTEMzIGZyYW1lIGR1cmF0aW9uOiAl LjFmIG1zLlxuIiwgZnJhbWVfdXMgLyAxMDAwLmYpOworICAgICAgICByZXR1cm4gLTE7CisgICAg fQorCisgICAgcmV0dXJuIDA7Cit9CisKKyNpZiBDT05GSUdfTEMzX0RFTVVYRVIKKwordHlwZWRl ZiBzdHJ1Y3QgTEMzRGVtdXhDb250ZXh0IHsKKyAgICBpbnQgZnJhbWVfc2FtcGxlczsKKyAgICBp bnQ2NF90IGVuZF9kdHM7Cit9IExDM0RlbXV4Q29udGV4dDsKKworc3RhdGljIGludCBsYzNfcmVh ZF9wcm9iZShjb25zdCBBVlByb2JlRGF0YSAqcCkKK3sKKyAgICBpbnQgZnJhbWVfdXMsIHNyYXRl X2h6OworCisgICAgaWYgKHAtPmJ1Zl9zaXplIDwgMTIpCisgICAgICAgIHJldHVybiAwOworCisg ICAgaWYgKEFWX1JCMTYocC0+YnVmICsgMCkgIT0gMHgxY2NjIHx8CisgICAgICAgIEFWX1JMMTYo cC0+YnVmICsgMikgPCAgOSAqIHNpemVvZih1aW50MTZfdCkpCisgICAgICAgIHJldHVybiAwOwor CisgICAgc3JhdGVfaHogPSBBVl9STDE2KHAtPmJ1ZiArIDQpICogMTAwOworICAgIGZyYW1lX3Vz ID0gQVZfUkwxNihwLT5idWYgKyAxMCkgKiAxMDsKKyAgICBpZiAoY2hlY2tfZnJhbWVfbGVuZ3Ro KE5VTEwsIHNyYXRlX2h6LCBmcmFtZV91cykgPCAwKQorICAgICAgICByZXR1cm4gMDsKKworICAg IHJldHVybiBBVlBST0JFX1NDT1JFX01BWDsKK30KKworc3RhdGljIGludCBsYzNfcmVhZF9oZWFk ZXIoQVZGb3JtYXRDb250ZXh0ICpzKQoreworICAgIExDM0RlbXV4Q29udGV4dCAqbGMzID0gcy0+ cHJpdl9kYXRhOworICAgIEFWU3RyZWFtICpzdCA9IE5VTEw7CisgICAgdWludDE2X3QgdGFnLCBo ZHJfc2l6ZTsKKyAgICB1aW50MzJfdCBsZW5ndGg7CisgICAgaW50IHNyYXRlX2h6LCBmcmFtZV91 cywgY2hhbm5lbHMsIGJpdF9yYXRlOworICAgIGludCBlcF9tb2RlLCBocl9tb2RlOworICAgIGlu dCBudW1fZXh0cmFfcGFyYW1zOworICAgIGludCBkZWxheSwgcmV0OworCisgICAgdGFnID0gYXZp b19yYjE2KHMtPnBiKTsKKyAgICBoZHJfc2l6ZSA9IGF2aW9fcmwxNihzLT5wYik7CisKKyAgICBp ZiAodGFnICE9IDB4MWNjYyB8fCBoZHJfc2l6ZSA8IDkgKiBzaXplb2YodWludDE2X3QpKQorICAg ICAgICByZXR1cm4gQVZFUlJPUl9JTlZBTElEREFUQTsKKworICAgIG51bV9leHRyYV9wYXJhbXMg PSBoZHJfc2l6ZSAvIHNpemVvZih1aW50MTZfdCkgLSA5OworCisgICAgc3JhdGVfaHogPSBhdmlv X3JsMTYocy0+cGIpICogMTAwOworICAgIGJpdF9yYXRlID0gYXZpb19ybDE2KHMtPnBiKSAqIDEw MDsKKyAgICBjaGFubmVscyA9IGF2aW9fcmwxNihzLT5wYik7CisgICAgZnJhbWVfdXMgPSBhdmlv X3JsMTYocy0+cGIpICogMTA7CisgICAgZXBfbW9kZSAgPSBhdmlvX3JsMTYocy0+cGIpICE9IDA7 CisgICAgbGVuZ3RoICAgPSBhdmlvX3JsMzIocy0+cGIpOworICAgIGhyX21vZGUgID0gbnVtX2V4 dHJhX3BhcmFtcyA+PSAxICYmIGF2aW9fcmwxNihzLT5wYik7CisKKyAgICBpZiAoY2hlY2tfZnJh bWVfbGVuZ3RoKHMsIHNyYXRlX2h6LCBmcmFtZV91cykgPCAwKQorICAgICAgICByZXR1cm4gQVZF UlJPUl9JTlZBTElEREFUQTsKKworICAgIHN0ID0gYXZmb3JtYXRfbmV3X3N0cmVhbShzLCBOVUxM KTsKKyAgICBpZiAoIXN0KQorICAgICAgICByZXR1cm4gQVZFUlJPUihFTk9NRU0pOworCisgICAg YXZwcml2X3NldF9wdHNfaW5mbyhzdCwgNjQsIDEsIHNyYXRlX2h6KTsKKyAgICBhdnByaXZfdXBk YXRlX2N1cl9kdHMocywgc3QsIDApOworICAgIHN0LT5kdXJhdGlvbiA9IGxlbmd0aDsKKworICAg IHN0LT5jb2RlY3Bhci0+Y29kZWNfdHlwZSA9IEFWTUVESUFfVFlQRV9BVURJTzsKKyAgICBzdC0+ Y29kZWNwYXItPmNvZGVjX2lkID0gQVZfQ09ERUNfSURfTEMzOworICAgIHN0LT5jb2RlY3Bhci0+ c2FtcGxlX3JhdGUgPSBzcmF0ZV9oejsKKyAgICBzdC0+Y29kZWNwYXItPmJpdF9yYXRlID0gYml0 X3JhdGU7CisgICAgc3QtPmNvZGVjcGFyLT5jaF9sYXlvdXQubmJfY2hhbm5lbHMgPSBjaGFubmVs czsKKworICAgIGlmICgocmV0ID0gZmZfYWxsb2NfZXh0cmFkYXRhKHN0LT5jb2RlY3BhciwgNikp IDwgMCkKKyAgICAgICAgcmV0dXJuIHJldDsKKworICAgIEFWX1dMMTYoc3QtPmNvZGVjcGFyLT5l eHRyYWRhdGEgKyAwLCBmcmFtZV91cyAvIDEwKTsKKyAgICBBVl9XTDE2KHN0LT5jb2RlY3Bhci0+ ZXh0cmFkYXRhICsgMiwgZXBfbW9kZSk7CisgICAgQVZfV0wxNihzdC0+Y29kZWNwYXItPmV4dHJh ZGF0YSArIDQsIGhyX21vZGUpOworCisgICAgbGMzLT5mcmFtZV9zYW1wbGVzID0gYXZfcmVzY2Fs ZShmcmFtZV91cywgc3JhdGVfaHosIDEwMDAqMTAwMCk7CisKKyAgICBkZWxheSA9IGF2X3Jlc2Nh bGUoZnJhbWVfdXMgPT0gNzUwMCA/IDQwMDAgOiAyNTAwLCBzcmF0ZV9oeiwgMTAwMCoxMDAwKTsK KyAgICBsYzMtPmVuZF9kdHMgPSBsZW5ndGggPyBsZW5ndGggKyBkZWxheSA6IC0xOworCisgICAg cmV0dXJuIDA7Cit9CisKK3N0YXRpYyBpbnQgbGMzX3JlYWRfcGFja2V0KEFWRm9ybWF0Q29udGV4 dCAqcywgQVZQYWNrZXQgKnBrdCkKK3sKKyAgICBMQzNEZW11eENvbnRleHQgKmxjMyA9IHMtPnBy aXZfZGF0YTsKKyAgICBBVlN0cmVhbSAqc3QgPSBzLT5zdHJlYW1zWzBdOworICAgIEFWSU9Db250 ZXh0ICpwYiA9IHMtPnBiOworICAgIGludDY0X3QgcG9zID0gYXZpb190ZWxsKHBiKTsKKyAgICBp bnQ2NF90IHJlbWFpbmluZ19zYW1wbGVzOworICAgIGludCByZXQ7CisKKyAgICByZXQgPSBhdl9n ZXRfcGFja2V0KHMtPnBiLCBwa3QsIGF2aW9fcmwxNihwYikpOworICAgIGlmIChyZXQgPCAwKQor ICAgICAgICByZXR1cm4gcmV0OworCisgICAgcGt0LT5wb3MgPSBwb3M7CisKKyAgICByZW1haW5p bmdfc2FtcGxlcyA9IGxjMy0+ZW5kX2R0cyA8IDAgPyBsYzMtPmZyYW1lX3NhbXBsZXMgOgorICAg ICAgICAgICAgICAgICAgICAgICAgRkZNQVgobGMzLT5lbmRfZHRzIC0gZmZzdHJlYW0oc3QpLT5j dXJfZHRzLCAwKTsKKyAgICBwa3QtPmR1cmF0aW9uID0gRkZNSU4obGMzLT5mcmFtZV9zYW1wbGVz LCByZW1haW5pbmdfc2FtcGxlcyk7CisKKyAgICByZXR1cm4gMDsKK30KKworY29uc3QgRkZJbnB1 dEZvcm1hdCBmZl9sYzNfZGVtdXhlciA9IHsKKyAgICAucC5uYW1lICAgICAgICAgPSAibGMzIiwK KyAgICAucC5sb25nX25hbWUgICAgPSBOVUxMX0lGX0NPTkZJR19TTUFMTCgiTEMzIChMb3cgQ29t cGxleGl0eSBDb21tdW5pY2F0aW9uIENvZGVjKSIpLAorICAgIC5wLmV4dGVuc2lvbnMgICA9ICJs YzMiLAorICAgIC5wLmZsYWdzICAgICAgICA9IEFWRk1UX0dFTkVSSUNfSU5ERVgsCisgICAgLnBy aXZfZGF0YV9zaXplID0gc2l6ZW9mKExDM0RlbXV4Q29udGV4dCksCisgICAgLnJlYWRfcHJvYmUg ICAgID0gbGMzX3JlYWRfcHJvYmUsCisgICAgLnJlYWRfaGVhZGVyICAgID0gbGMzX3JlYWRfaGVh ZGVyLAorICAgIC5yZWFkX3BhY2tldCAgICA9IGxjM19yZWFkX3BhY2tldCwKK307CisKKyNlbmRp ZiAvKiBDT05GSUdfTEMzX0RFTVVYRVIgKi8KKworI2lmIENPTkZJR19MQzNfTVVYRVIKKworc3Rh dGljIGF2X2NvbGQgaW50IGxjM19tdXhlcl9pbml0KEFWRm9ybWF0Q29udGV4dCAqcykKK3sKKyAg ICBpZiAocy0+bmJfc3RyZWFtcyAhPSAxKSB7CisgICAgICAgIGF2X2xvZyhzLCBBVl9MT0dfRVJS T1IsICJUaGlzIG11eGVyIG9ubHkgc3VwcG9ydHMgYSBzaW5nbGUgc3RyZWFtLlxuIik7CisgICAg ICAgIHJldHVybiBBVkVSUk9SKEVJTlZBTCk7CisgICAgfQorCisgICAgcmV0dXJuIDA7Cit9CisK K3N0YXRpYyBpbnQgbGMzX3dyaXRlX2hlYWRlcihBVkZvcm1hdENvbnRleHQgKnMpCit7CisgICAg QVZTdHJlYW0gKnN0ID0gcy0+c3RyZWFtc1swXTsKKyAgICBpbnQgY2hhbm5lbHMgPSBzdC0+Y29k ZWNwYXItPmNoX2xheW91dC5uYl9jaGFubmVsczsKKyAgICBpbnQgc3JhdGVfaHogPSBzdC0+Y29k ZWNwYXItPnNhbXBsZV9yYXRlOworICAgIGludCBiaXRfcmF0ZSA9IHN0LT5jb2RlY3Bhci0+Yml0 X3JhdGU7CisgICAgaW50IGZyYW1lX3VzLCBlcF9tb2RlLCBocl9tb2RlOworICAgIHVpbnQzMl90 IG5iX3NhbXBsZXMgPSBhdl9yZXNjYWxlX3EoCisgICAgICAgIHN0LT5kdXJhdGlvbiwgc3QtPnRp bWVfYmFzZSwgKEFWUmF0aW9uYWwpeyAxLCBzcmF0ZV9oeiB9KTsKKworICAgIGlmIChzdC0+Y29k ZWNwYXItPmV4dHJhZGF0YV9zaXplIDwgNikKKyAgICAgICAgcmV0dXJuIEFWRVJST1JfSU5WQUxJ RERBVEE7CisKKyAgICBmcmFtZV91cyA9IEFWX1JMMTYoc3QtPmNvZGVjcGFyLT5leHRyYWRhdGEg KyAwKSAqIDEwOworICAgIGVwX21vZGUgPSBBVl9STDE2KHN0LT5jb2RlY3Bhci0+ZXh0cmFkYXRh ICsgMikgIT0gMDsKKyAgICBocl9tb2RlID0gQVZfUkwxNihzdC0+Y29kZWNwYXItPmV4dHJhZGF0 YSArIDQpICE9IDA7CisKKyAgICBpZiAoY2hlY2tfZnJhbWVfbGVuZ3RoKHMsIHNyYXRlX2h6LCBm cmFtZV91cykgPCAwKQorICAgICAgICByZXR1cm4gQVZFUlJPUl9JTlZBTElEREFUQTsKKworICAg IGF2aW9fd2IxNihzLT5wYiwgMHgxY2NjKTsKKyAgICBhdmlvX3dsMTYocy0+cGIsICg5ICsgaHJf bW9kZSkgKiBzaXplb2YodWludDE2X3QpKTsKKyAgICBhdmlvX3dsMTYocy0+cGIsIHNyYXRlX2h6 IC8gMTAwKTsKKyAgICBhdmlvX3dsMTYocy0+cGIsIGJpdF9yYXRlIC8gMTAwKTsKKyAgICBhdmlv X3dsMTYocy0+cGIsIGNoYW5uZWxzKTsKKyAgICBhdmlvX3dsMTYocy0+cGIsIGZyYW1lX3VzIC8g MTApOworICAgIGF2aW9fd2wxNihzLT5wYiwgZXBfbW9kZSk7CisgICAgYXZpb193bDMyKHMtPnBi LCBuYl9zYW1wbGVzKTsKKyAgICBpZiAoaHJfbW9kZSkKKyAgICAgICAgYXZpb193bDE2KHMtPnBi LCBocl9tb2RlKTsKKworICAgIHJldHVybiAwOworfQorCitzdGF0aWMgaW50IGxjM193cml0ZV9w YWNrZXQoQVZGb3JtYXRDb250ZXh0ICpzLCBBVlBhY2tldCAqcGt0KQoreworICAgIGF2aW9fd2wx NihzLT5wYiwgcGt0LT5zaXplKTsKKyAgICBhdmlvX3dyaXRlKHMtPnBiLCBwa3QtPmRhdGEsIHBr dC0+c2l6ZSk7CisgICAgcmV0dXJuIDA7Cit9CisKK2NvbnN0IEZGT3V0cHV0Rm9ybWF0IGZmX2xj M19tdXhlciA9IHsKKyAgICAucC5uYW1lICAgICAgICA9ICJsYzMiLAorICAgIC5wLmxvbmdfbmFt ZSAgID0gTlVMTF9JRl9DT05GSUdfU01BTEwoIkxDMyAoTG93IENvbXBsZXhpdHkgQ29tbXVuaWNh dGlvbiBDb2RlYykiKSwKKyAgICAucC5leHRlbnNpb25zICA9ICJsYzMiLAorICAgIC5wLmF1ZGlv X2NvZGVjID0gQVZfQ09ERUNfSURfTEMzLAorICAgIC5wLnZpZGVvX2NvZGVjID0gQVZfQ09ERUNf SURfTk9ORSwKKyAgICAucC5mbGFncyAgICAgICA9IEFWRk1UX05PVElNRVNUQU1QUywKKyAgICAu aW5pdCAgICAgICAgICA9IGxjM19tdXhlcl9pbml0LAorICAgIC53cml0ZV9oZWFkZXIgID0gbGMz X3dyaXRlX2hlYWRlciwKKyAgICAud3JpdGVfcGFja2V0ICA9IGxjM193cml0ZV9wYWNrZXQsCit9 OworCisjZW5kaWYgLyogQ09ORklHX0xDM19NVVhFUiAqLwotLSAKMi40NC4wLjY4My5nNzk2MWM4 MzhhYy1nb29nCgo= --000000000000239a9a0615eee24f 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". --000000000000239a9a0615eee24f--