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 605F944681 for ; Tue, 20 Sep 2022 15:06:22 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 20FC968BB7D; Tue, 20 Sep 2022 18:06:20 +0300 (EEST) Received: from mail-yw1-f173.google.com (mail-yw1-f173.google.com [209.85.128.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2538068B7DE for ; Tue, 20 Sep 2022 18:06:14 +0300 (EEST) Received: by mail-yw1-f173.google.com with SMTP id 00721157ae682-349c4310cf7so30642747b3.3 for ; Tue, 20 Sep 2022 08:06:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date; bh=qnHBPYws8qbMUz9HGlSR23XUxTOH3nYEd8z3RoM23DY=; b=nY7jBhZVadjfTalrCNerfp0RMOxBxNjLxR0ID10HdWsVQ0GrEArSKzmlddJiJqTkt3 s6HJLBAXEi1e9CMjAtBnsUpQ6DxX8g21ULPi4r50tQIyHcNuL3yNtHnrNgfNBIXYmiS2 53WRQV+MnnEZ7axy7WscnC+GVRxgKIdwptAI3fXpbMvsfBqrEGW8rlQ1sY8VBUAEg5EY 2YSrDsZGrf+6/Rmpt5oHZN9OQAuzpQiAJfSqoz3hEuN28p6gxIYgZ1RKsTxxKgFzgefh 8ji4vScNR9aKr33sDhRGYvM6WLHjSn1vq0pcib8nNWhxtN1PSYDcdEEzefYlWdLNZZuQ NujA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date; bh=qnHBPYws8qbMUz9HGlSR23XUxTOH3nYEd8z3RoM23DY=; b=5vWIlLjMvaE7CKsv97iG+AtLXGs7aDuIWpfzfZ5eJ7gCPPoyeM8M+eCIp/l6JVPVbj nLKfP7Q7x8ryBhGAuK+sLyrJNlhVMQzNEzO5ByJQ4QTQIAwX6gOR7C/xw/fKwck7r7xe 21SQGpRwV8lSCYrgI73pfIFqih6SuB+McJ6/PoSHpzqnvZdiNtZxMVVUWK/1+V/K3LBI Nn1cu4XPtWtUBLMZPdaM1+7erOHrzj1SijGpi7GwyMKZ/OsxjiQLkUyGkJeoJXHOjJKg Fjrged8zWMxxvPaza/lz2KVXtVqNQ17yTX5ggBs9XVA9jXO3Az/Qq1oy41QDMrddmq7I 1Fog== X-Gm-Message-State: ACrzQf3yqf2SaIB6vk99YFXh82ASUo5Q3ZDgmj3zZEWpNRxgE13Olnmp /3bwsGt811edjoXjPcfgsoLAHP1Yk7+Au+1/UKuiHwUz X-Google-Smtp-Source: AMsMyM60Ahb4ek8e7wL2qSCAM8EwubMHzp4OUlkuA5mCKqxtyXISlyerG3FeVXj0yXR7jm+URylKEFNTQTG1PSzOjlw= X-Received: by 2002:a81:b09:0:b0:345:30d:77b7 with SMTP id 9-20020a810b09000000b00345030d77b7mr19569247ywl.177.1663686372396; Tue, 20 Sep 2022 08:06:12 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a81:7402:0:0:0:0:0 with HTTP; Tue, 20 Sep 2022 08:06:11 -0700 (PDT) From: Paul B Mahol Date: Tue, 20 Sep 2022 17:06:11 +0200 Message-ID: To: FFmpeg development discussions and patches Content-Type: multipart/mixed; boundary="0000000000003ea7ab05e91d2b9c" Subject: [FFmpeg-devel] [PATCH] avcodec/ac3dec: downmix for 7.1 eac3 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" Archived-At: List-Archive: List-Post: --0000000000003ea7ab05e91d2b9c Content-Type: text/plain; charset="UTF-8" Patch attached. --0000000000003ea7ab05e91d2b9c Content-Type: text/x-patch; charset="US-ASCII"; name="0001-avcodec-ac3dec-add-downmix-support-for-mono-and-ster.patch" Content-Disposition: attachment; filename="0001-avcodec-ac3dec-add-downmix-support-for-mono-and-ster.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: file0 RnJvbSAzZjMzZTIyNmIzNmEwYTE4NmUwNzBkNzQzZDJjNTY4NmM1OTk1YTBlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEIgTWFob2wgPG9uZW1kYUBnbWFpbC5jb20+CkRhdGU6 IFR1ZSwgMjAgU2VwIDIwMjIgMTc6MDc6MTUgKzAyMDAKU3ViamVjdDogW1BBVENIXSBhdmNvZGVj L2FjM2RlYzogYWRkIGRvd25taXggc3VwcG9ydCBmb3IgbW9ubyBhbmQgc3RlcmVvIGZvcgogZWFj MyA3LjEKClNpZ25lZC1vZmYtYnk6IFBhdWwgQiBNYWhvbCA8b25lbWRhQGdtYWlsLmNvbT4KLS0t CiBsaWJhdmNvZGVjL2FjM2RlYy5jIHwgNTUgKysrKysrKysrKysrKysrKysrKysrKysrKystLS0t LS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzIgaW5zZXJ0aW9ucygrKSwgMjMgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGliYXZjb2RlYy9hYzNkZWMuYyBiL2xpYmF2Y29kZWMv YWMzZGVjLmMKaW5kZXggNWQwYWRkNDBmZS4uZjYyOGVhZTMzYyAxMDA2NDQKLS0tIGEvbGliYXZj b2RlYy9hYzNkZWMuYworKysgYi9saWJhdmNvZGVjL2FjM2RlYy5jCkBAIC0xODMsNiArMTgzLDMz IEBAIHN0YXRpYyBhdl9jb2xkIHZvaWQgYWMzX3RhYmxlc19pbml0KHZvaWQpCiAjZW5kaWYKIH0K IAorc3RhdGljIHZvaWQgYWMzX2Rvd25taXgoQVZDb2RlY0NvbnRleHQgKmF2Y3R4KQoreworICAg IEFDM0RlY29kZUNvbnRleHQgKnMgPSBhdmN0eC0+cHJpdl9kYXRhOworICAgIGNvbnN0IEFWQ2hh bm5lbExheW91dCBtb25vICAgPSAoQVZDaGFubmVsTGF5b3V0KUFWX0NIQU5ORUxfTEFZT1VUX01P Tk87CisgICAgY29uc3QgQVZDaGFubmVsTGF5b3V0IHN0ZXJlbyA9IChBVkNoYW5uZWxMYXlvdXQp QVZfQ0hBTk5FTF9MQVlPVVRfU1RFUkVPOworCisgICAgLyogYWxsb3cgZG93bm1peGluZyB0byBz dGVyZW8gb3IgbW9ubyAqLworI2lmIEZGX0FQSV9PTERfQ0hBTk5FTF9MQVlPVVQKK0ZGX0RJU0FC TEVfREVQUkVDQVRJT05fV0FSTklOR1MKKyAgICBpZiAoYXZjdHgtPnJlcXVlc3RfY2hhbm5lbF9s YXlvdXQpIHsKKyAgICAgICAgYXZfY2hhbm5lbF9sYXlvdXRfdW5pbml0KCZzLT5kb3dubWl4X2xh eW91dCk7CisgICAgICAgIGF2X2NoYW5uZWxfbGF5b3V0X2Zyb21fbWFzaygmcy0+ZG93bm1peF9s YXlvdXQsIGF2Y3R4LT5yZXF1ZXN0X2NoYW5uZWxfbGF5b3V0KTsKKyAgICB9CitGRl9FTkFCTEVf REVQUkVDQVRJT05fV0FSTklOR1MKKyNlbmRpZgorICAgIGlmIChhdmN0eC0+Y2hfbGF5b3V0Lm5i X2NoYW5uZWxzID4gMSAmJgorICAgICAgICAhYXZfY2hhbm5lbF9sYXlvdXRfY29tcGFyZSgmcy0+ ZG93bm1peF9sYXlvdXQsICZtb25vKSkgeworICAgICAgICBhdl9jaGFubmVsX2xheW91dF91bmlu aXQoJmF2Y3R4LT5jaF9sYXlvdXQpOworICAgICAgICBhdmN0eC0+Y2hfbGF5b3V0ID0gKEFWQ2hh bm5lbExheW91dClBVl9DSEFOTkVMX0xBWU9VVF9NT05POworICAgIH0gZWxzZSBpZiAoYXZjdHgt PmNoX2xheW91dC5uYl9jaGFubmVscyA+IDIgJiYKKyAgICAgICAgICAgICAhYXZfY2hhbm5lbF9s YXlvdXRfY29tcGFyZSgmcy0+ZG93bm1peF9sYXlvdXQsICZzdGVyZW8pKSB7CisgICAgICAgIGF2 X2NoYW5uZWxfbGF5b3V0X3VuaW5pdCgmYXZjdHgtPmNoX2xheW91dCk7CisgICAgICAgIGF2Y3R4 LT5jaF9sYXlvdXQgPSAoQVZDaGFubmVsTGF5b3V0KUFWX0NIQU5ORUxfTEFZT1VUX1NURVJFTzsK KyAgICB9CisgICAgcy0+ZG93bm1peGVkID0gMTsKK30KKwogLyoqCiAgKiBBVkNvZGVjIGluaXRp YWxpemF0aW9uCiAgKi8KQEAgLTE5MCw4ICsyMTcsNiBAQCBzdGF0aWMgYXZfY29sZCBpbnQgYWMz X2RlY29kZV9pbml0KEFWQ29kZWNDb250ZXh0ICphdmN0eCkKIHsKICAgICBzdGF0aWMgQVZPbmNl IGluaXRfc3RhdGljX29uY2UgPSBBVl9PTkNFX0lOSVQ7CiAgICAgQUMzRGVjb2RlQ29udGV4dCAq cyA9IGF2Y3R4LT5wcml2X2RhdGE7Ci0gICAgY29uc3QgQVZDaGFubmVsTGF5b3V0IG1vbm8gICA9 IChBVkNoYW5uZWxMYXlvdXQpQVZfQ0hBTk5FTF9MQVlPVVRfTU9OTzsKLSAgICBjb25zdCBBVkNo YW5uZWxMYXlvdXQgc3RlcmVvID0gKEFWQ2hhbm5lbExheW91dClBVl9DSEFOTkVMX0xBWU9VVF9T VEVSRU87CiAgICAgaW50IGksIHJldDsKIAogICAgIHMtPmF2Y3R4ID0gYXZjdHg7CkBAIC0yMTks MjUgKzI0NCw3IEBAIHN0YXRpYyBhdl9jb2xkIGludCBhYzNfZGVjb2RlX2luaXQoQVZDb2RlY0Nv bnRleHQgKmF2Y3R4KQogICAgIGVsc2UKICAgICAgICAgYXZjdHgtPnNhbXBsZV9mbXQgPSBBVl9T QU1QTEVfRk1UX0ZMVFA7CiAKLSAgICAvKiBhbGxvdyBkb3dubWl4aW5nIHRvIHN0ZXJlbyBvciBt b25vICovCi0jaWYgRkZfQVBJX09MRF9DSEFOTkVMX0xBWU9VVAotRkZfRElTQUJMRV9ERVBSRUNB VElPTl9XQVJOSU5HUwotICAgIGlmIChhdmN0eC0+cmVxdWVzdF9jaGFubmVsX2xheW91dCkgewot ICAgICAgICBhdl9jaGFubmVsX2xheW91dF91bmluaXQoJnMtPmRvd25taXhfbGF5b3V0KTsKLSAg ICAgICAgYXZfY2hhbm5lbF9sYXlvdXRfZnJvbV9tYXNrKCZzLT5kb3dubWl4X2xheW91dCwgYXZj dHgtPnJlcXVlc3RfY2hhbm5lbF9sYXlvdXQpOwotICAgIH0KLUZGX0VOQUJMRV9ERVBSRUNBVElP Tl9XQVJOSU5HUwotI2VuZGlmCi0gICAgaWYgKGF2Y3R4LT5jaF9sYXlvdXQubmJfY2hhbm5lbHMg PiAxICYmCi0gICAgICAgICFhdl9jaGFubmVsX2xheW91dF9jb21wYXJlKCZzLT5kb3dubWl4X2xh eW91dCwgJm1vbm8pKSB7Ci0gICAgICAgIGF2X2NoYW5uZWxfbGF5b3V0X3VuaW5pdCgmYXZjdHgt PmNoX2xheW91dCk7Ci0gICAgICAgIGF2Y3R4LT5jaF9sYXlvdXQgPSAoQVZDaGFubmVsTGF5b3V0 KUFWX0NIQU5ORUxfTEFZT1VUX01PTk87Ci0gICAgfSBlbHNlIGlmIChhdmN0eC0+Y2hfbGF5b3V0 Lm5iX2NoYW5uZWxzID4gMiAmJgotICAgICAgICAgICAgICFhdl9jaGFubmVsX2xheW91dF9jb21w YXJlKCZzLT5kb3dubWl4X2xheW91dCwgJnN0ZXJlbykpIHsKLSAgICAgICAgYXZfY2hhbm5lbF9s YXlvdXRfdW5pbml0KCZhdmN0eC0+Y2hfbGF5b3V0KTsKLSAgICAgICAgYXZjdHgtPmNoX2xheW91 dCA9IChBVkNoYW5uZWxMYXlvdXQpQVZfQ0hBTk5FTF9MQVlPVVRfU1RFUkVPOwotICAgIH0KLSAg ICBzLT5kb3dubWl4ZWQgPSAxOworICAgIGFjM19kb3dubWl4KGF2Y3R4KTsKIAogICAgIGZvciAo aSA9IDA7IGkgPCBBQzNfTUFYX0NIQU5ORUxTOyBpKyspIHsKICAgICAgICAgcy0+eGNmcHRyW2ld ID0gcy0+dHJhbnNmb3JtX2NvZWZmc1tpXTsKQEAgLTE3NTEsNyArMTc1OCw3IEBAIHNraXA6CiAg ICAgICAgICAgICAgICAgICAgIGlmIChpbmRleCA8IDApCiAgICAgICAgICAgICAgICAgICAgICAg ICByZXR1cm4gQVZFUlJPUl9JTlZBTElEREFUQTsKICAgICAgICAgICAgICAgICAgICAgaWYgKGV4 dGVuZCA+PSBjaGFubmVsX21hcF9zaXplKQotICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJu IEFWRVJST1JfSU5WQUxJRERBVEE7CisgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKIAog ICAgICAgICAgICAgICAgICAgICBleHRlbmRlZF9jaGFubmVsX21hcFtpbmRleF0gPSBvZmZzZXQg KyBjaGFubmVsX21hcFtleHRlbmQrK107CiAgICAgICAgICAgICAgICAgfSBlbHNlIHsKQEAgLTE3 NjMsNyArMTc3MCw3IEBAIHNraXA6CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGlu ZGV4IDwgMCkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIEFWRVJST1Jf SU5WQUxJRERBVEE7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGV4dGVuZCA+PSBj aGFubmVsX21hcF9zaXplKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4g QVZFUlJPUl9JTlZBTElEREFUQTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYnJl YWs7CiAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBleHRlbmRlZF9jaGFubmVsX21hcFtp bmRleF0gPSBvZmZzZXQgKyBjaGFubmVsX21hcFtleHRlbmQrK107CiAgICAgICAgICAgICAgICAg ICAgICAgICB9CkBAIC0xNzcxLDYgKzE3NzgsOCBAQCBza2lwOgogICAgICAgICAgICAgICAgIH0K ICAgICAgICAgICAgIH0KICAgICAgICAgfQorCisgICAgICAgIGFjM19kb3dubWl4KGF2Y3R4KTsK ICAgICB9CiAKICAgICAvKiBnZXQgb3V0cHV0IGJ1ZmZlciAqLwotLSAKMi4zNy4yCgo= --0000000000003ea7ab05e91d2b9c 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". --0000000000003ea7ab05e91d2b9c--