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 A648943E52 for ; Thu, 15 Sep 2022 15:27:15 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C564C68BB92; Thu, 15 Sep 2022 18:27:12 +0300 (EEST) Received: from mail-yw1-f176.google.com (mail-yw1-f176.google.com [209.85.128.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EC0D868B85C for ; Thu, 15 Sep 2022 18:27:05 +0300 (EEST) Received: by mail-yw1-f176.google.com with SMTP id 00721157ae682-3487d84e477so224426537b3.6 for ; Thu, 15 Sep 2022 08:27:05 -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=E8jd9kL4FYnYEiyX8WbYtizzuaM8BvRfXrjqIh4fTEs=; b=nXlDBUpnOB96LYfg3gUHWhhGLCJnJXo9wcnLx49qknkO6OCyoqErdDr3PIGcxeHr+8 TZaQ+t/AzeVUriA5bU9+nN6N24JgiiHp5v1dhflb5/83GeuzS7UVX0EFTR7GE8pNfgdU AChQgUhb2soEf+2h2Khc2SuJDEtoKHQt3oesd8ybe7xHofHTJHHHSWBw2eMUEhTiacI/ NRtA2/FTEv9aKm/VH0TdlmJ6HMvlfmm5HO1lOXlZcRuuZsEGpHOuk5c4Epd7toIlJp40 toXLhxXVDb47ZROpT/LVNVYqZqkW2xBUEi3RAijAzdJtrYcFxresSDFWeZP25cGAwg9e tkuw== 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=E8jd9kL4FYnYEiyX8WbYtizzuaM8BvRfXrjqIh4fTEs=; b=0yndSQ9dcTxLyPN4E+y72yCRem4tPqN6zCe2EUxJF1Sj+AnrDRrvlyyjmGznFlLI3W kKohcgv7V4ygaIqAiA9NUtoAAVZvyT2gswlCGsmcuWxUpqK7hwOugMPLAFbMEP2IxtZ/ M0E9GjYjk1o/PA3dTBlCUSoav8+GedvrYtQi2cp1cvdKwByDP5smW4qxUQJHuulkoZs7 C+ggUOGPKMT7A8+SafI1XFsNlGRui+VGZ4UKtUE5cJPqlBOYrg/ODfZL1j5Gcwt1Xrw9 MwRAeInIO3txhb2X9BvjyDDkjiHmD9kEMk2V9qn3EVKbVmbPl7eKZPjGGwI8FXtTWSWd 1LOQ== X-Gm-Message-State: ACrzQf1T1TPrPDi9q9BLqJt8q+mulNTjlZNMJ9H50vCnHFWDOi3AqnF1 2IejTloRRXMHj2aKxG/O+21nMPMlTN9ldHpKCm3NY5SB X-Google-Smtp-Source: AMsMyM6gvQtm2R2fT2Bqnd9vlvN4aEznUeEyPkKHvJrjLc0323jzJXIr4TxcHdXWjHGGRWPtutM38P8IyYJxs1vLjGc= X-Received: by 2002:a81:a708:0:b0:335:17af:e96a with SMTP id e8-20020a81a708000000b0033517afe96amr339055ywh.34.1663255624342; Thu, 15 Sep 2022 08:27:04 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a81:7402:0:0:0:0:0 with HTTP; Thu, 15 Sep 2022 08:27:03 -0700 (PDT) From: Paul B Mahol Date: Thu, 15 Sep 2022 17:27:03 +0200 Message-ID: To: FFmpeg development discussions and patches Content-Type: multipart/mixed; boundary="000000000000a919c005e8b8e0f3" Subject: [FFmpeg-devel] [PATCH] avcodec/mlpdec: fix decoding of overlapping channels in substreams 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: --000000000000a919c005e8b8e0f3 Content-Type: text/plain; charset="UTF-8" Patch attached. There are cases when previously decoded substreams would, if they have overlapping channels with final substream, cause incorrect decoding results. --000000000000a919c005e8b8e0f3 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-avcodec-mlpdec-fix-decoding-of-overlapping-channels-.patch" Content-Disposition: attachment; filename="0001-avcodec-mlpdec-fix-decoding-of-overlapping-channels-.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: file0 RnJvbSBhZGY1ZmQzYmRiMzk3Zjg4YTUyZDdjZTBjZjc2NDkxYTU1ZDMzZWVmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEIgTWFob2wgPG9uZW1kYUBnbWFpbC5jb20+CkRhdGU6 IFRodSwgMTUgU2VwIDIwMjIgMTY6MTQ6MDggKzAyMDAKU3ViamVjdDogW1BBVENIXSBhdmNvZGVj L21scGRlYzogZml4IGRlY29kaW5nIG9mIG92ZXJsYXBwaW5nIGNoYW5uZWxzIGluCiBzdWJzdHJl YW1zCgpGaXhlcyAjNTAzOQoKU2lnbmVkLW9mZi1ieTogUGF1bCBCIE1haG9sIDxvbmVtZGFAZ21h aWwuY29tPgotLS0KIGxpYmF2Y29kZWMvbWxwZGVjLmMgfCAyNSArKysrKysrKysrKysrKysrKysr LS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTkgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9saWJhdmNvZGVjL21scGRlYy5jIGIvbGliYXZjb2RlYy9tbHBkZWMuYwpp bmRleCAwYTk3ZmFlMjZjLi5iYjcyMTM0YjA5IDEwMDY0NAotLS0gYS9saWJhdmNvZGVjL21scGRl Yy5jCisrKyBiL2xpYmF2Y29kZWMvbWxwZGVjLmMKQEAgLTY3LDYgKzY3LDggQEAgdHlwZWRlZiBz dHJ1Y3QgU3ViU3RyZWFtIHsKICAgICB1aW50OF90ICAgICBtaW5fY2hhbm5lbDsKICAgICAvLy8g VGhlIGluZGV4IG9mIHRoZSBsYXN0IGNoYW5uZWwgY29kZWQgaW4gdGhpcyBzdWJzdHJlYW0uCiAg ICAgdWludDhfdCAgICAgbWF4X2NoYW5uZWw7CisgICAgLy8vIFRoZSBjb2RlZCBjaGFubmVscyBt YXNrIGluIHRoaXMgc3Vic3RyZWFtLgorICAgIHVpbnQ2NF90ICAgIGNvZGVkX2NoYW5uZWxzOwog ICAgIC8vLyBUaGUgbnVtYmVyIG9mIGNoYW5uZWxzIGlucHV0IGludG8gdGhlIHJlbWF0cml4IHN0 YWdlLgogICAgIHVpbnQ4X3QgICAgIG1heF9tYXRyaXhfY2hhbm5lbDsKICAgICAvLy8gRm9yIGVh Y2ggY2hhbm5lbCBvdXRwdXQgYnkgdGhlIG1hdHJpeCwgdGhlIG91dHB1dCBjaGFubmVsIHRvIG1h cCBpdCB0bwpAQCAtNTYzLDYgKzU2NSw3IEBAIHN0YXRpYyBpbnQgcmVhZF9yZXN0YXJ0X2hlYWRl cihNTFBEZWNvZGVDb250ZXh0ICptLCBHZXRCaXRDb250ZXh0ICpnYnAsCiAKICAgICBzLT5taW5f Y2hhbm5lbCAgICAgICAgPSBtaW5fY2hhbm5lbDsKICAgICBzLT5tYXhfY2hhbm5lbCAgICAgICAg PSBtYXhfY2hhbm5lbDsKKyAgICBzLT5jb2RlZF9jaGFubmVscyAgICAgPSAoKDFMTCA8PCAobWF4 X2NoYW5uZWwgLSBtaW5fY2hhbm5lbCArIDEpKSAtIDEpIDw8IG1pbl9jaGFubmVsOwogICAgIHMt Pm1heF9tYXRyaXhfY2hhbm5lbCA9IG1heF9tYXRyaXhfY2hhbm5lbDsKICAgICBzLT5ub2lzZV90 eXBlICAgICAgICAgPSBub2lzZV90eXBlOwogCkBAIC0xMjcyLDExICsxMjc1LDYgQEAgc3RhdGlj IGludCByZWFkX2FjY2Vzc191bml0KEFWQ29kZWNDb250ZXh0ICphdmN0eCwgQVZGcmFtZSAqZnJh bWUsCiAgICAgZm9yIChzdWJzdHIgPSAwOyBzdWJzdHIgPD0gbS0+bWF4X2RlY29kZWRfc3Vic3Ry ZWFtOyBzdWJzdHIrKykgewogICAgICAgICBTdWJTdHJlYW0gKnMgPSAmbS0+c3Vic3RyZWFtW3N1 YnN0cl07CiAKLSAgICAgICAgaWYgKHN1YnN0ciAhPSBtLT5tYXhfZGVjb2RlZF9zdWJzdHJlYW0g JiYKLSAgICAgICAgICAgIG0tPnN1YnN0cmVhbVttLT5tYXhfZGVjb2RlZF9zdWJzdHJlYW1dLm1p bl9jaGFubmVsID09IDAgJiYKLSAgICAgICAgICAgIG0tPnN1YnN0cmVhbVttLT5tYXhfZGVjb2Rl ZF9zdWJzdHJlYW1dLm1heF9jaGFubmVsID09IGF2Y3R4LT5jaF9sYXlvdXQubmJfY2hhbm5lbHMg LSAxKQotICAgICAgICAgICAgZ290byBza2lwX3N1YnN0cjsKLQogICAgICAgICBpbml0X2dldF9i aXRzKCZnYiwgYnVmLCBzdWJzdHJlYW1fZGF0YV9sZW5bc3Vic3RyXSAqIDgpOwogCiAgICAgICAg IG0tPm1hdHJpeF9jaGFuZ2VkID0gMDsKQEAgLTEzMDEsNiArMTI5OSwyMiBAQCBzdGF0aWMgaW50 IHJlYWRfYWNjZXNzX3VuaXQoQVZDb2RlY0NvbnRleHQgKmF2Y3R4LCBBVkZyYW1lICpmcmFtZSwK ICAgICAgICAgICAgIGlmICghcy0+cmVzdGFydF9zZWVuKQogICAgICAgICAgICAgICAgIGdvdG8g bmV4dF9zdWJzdHI7CiAKKyAgICAgICAgICAgIGlmIChzdWJzdHIgPiAwICYmIHN1YnN0ciA8IG0t Pm1heF9kZWNvZGVkX3N1YnN0cmVhbSAmJgorICAgICAgICAgICAgICAgIChzLT5taW5fY2hhbm5l bCA8PSBtLT5zdWJzdHJlYW1bc3Vic3RyIC0gMV0ubWF4X2NoYW5uZWwpKSB7CisgICAgICAgICAg ICAgICAgYXZfbG9nKGF2Y3R4LCBBVl9MT0dfREVCVUcsCisgICAgICAgICAgICAgICAgICAgICAg ICJQcmV2aW91cyBzdWJzdHJlYW0oJWQpIGNoYW5uZWxzIG92ZXJsYXBzIGN1cnJlbnQgc3Vic3Ry ZWFtKCVkKSBjaGFubmVscywgc2tpcHBpbmcuXG4iLAorICAgICAgICAgICAgICAgICAgICAgICBz dWJzdHIgLSAxLCBzdWJzdHIpOworICAgICAgICAgICAgICAgIGdvdG8gbmV4dF9zdWJzdHI7Cisg ICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGlmIChzdWJzdHIgIT0gbS0+bWF4X2RlY29kZWRf c3Vic3RyZWFtICYmCisgICAgICAgICAgICAgICAgKChzLT5jb2RlZF9jaGFubmVscyAmIG0tPnN1 YnN0cmVhbVttLT5tYXhfZGVjb2RlZF9zdWJzdHJlYW1dLmNvZGVkX2NoYW5uZWxzKSAhPSAwKSkg eworICAgICAgICAgICAgICAgIGF2X2xvZyhhdmN0eCwgQVZfTE9HX0RFQlVHLAorICAgICAgICAg ICAgICAgICAgICAgICAiQ3VycmVudCBzdWJzdHJlYW0oJWQpIGNoYW5uZWxzIG92ZXJsYXBzIGZp bmFsIHN1YnN0cmVhbSglZCkgY2hhbm5lbHMsIHNraXBwaW5nLlxuIiwKKyAgICAgICAgICAgICAg ICAgICAgICAgc3Vic3RyLCBtLT5tYXhfZGVjb2RlZF9zdWJzdHJlYW0pOworICAgICAgICAgICAg ICAgIGdvdG8gbmV4dF9zdWJzdHI7CisgICAgICAgICAgICB9CisKICAgICAgICAgICAgIGlmICgo cmV0ID0gcmVhZF9ibG9ja19kYXRhKG0sICZnYiwgc3Vic3RyKSkgPCAwKQogICAgICAgICAgICAg ICAgIHJldHVybiByZXQ7CiAKQEAgLTEzNTAsNyArMTM2NCw2IEBAIG5leHRfc3Vic3RyOgogICAg ICAgICAgICAgYXZfbG9nKG0tPmF2Y3R4LCBBVl9MT0dfRVJST1IsCiAgICAgICAgICAgICAgICAg ICAgIk5vIHJlc3RhcnQgaGVhZGVyIHByZXNlbnQgaW4gc3Vic3RyZWFtICVkLlxuIiwgc3Vic3Ry KTsKIAotc2tpcF9zdWJzdHI6CiAgICAgICAgIGJ1ZiArPSBzdWJzdHJlYW1fZGF0YV9sZW5bc3Vi c3RyXTsKICAgICB9CiAKLS0gCjIuMzcuMgoK --000000000000a919c005e8b8e0f3 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". --000000000000a919c005e8b8e0f3--