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 966324C902 for ; Tue, 13 Aug 2024 21:39:15 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4418A68DA7D; Wed, 14 Aug 2024 00:39:12 +0300 (EEST) Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E07A068D93B for ; Wed, 14 Aug 2024 00:39:05 +0300 (EEST) Received: by mail-qt1-f176.google.com with SMTP id d75a77b69052e-45029af1408so21551cf.1 for ; Tue, 13 Aug 2024 14:39:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1723585144; x=1724189944; darn=ffmpeg.org; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=5DmILeXDW0kIj72kwOw831ZybWI/QrFHsdi41gp7JlM=; b=X4/rIARklw2jLg8nrhdo3TTpPi9jM4igRUjuYoBNwuIs70NQugYg2xUlPqrcbpovwt eoml8qUmx12CThePRuI2b/avbCQJ2oCfr6WnTkX/4VjKhIFct9uUT+S1VUITBTY53oNI iE1inuLSVCBi43PksjCwXGtNeoxfk/VENnMeg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723585144; x=1724189944; 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=5DmILeXDW0kIj72kwOw831ZybWI/QrFHsdi41gp7JlM=; b=pgixaHStimrPxj8Oy9GvCMQnK+JAfgYkDzoNM0D1BCd9eGWa3GrKv2FBE0fKYaKyAd ieRF5m3OT/H8nggVmmtiG3cT1my560ZiNxePZaCxM98wcYSiy4vbuACrAwK9oksreLIT SIuPODzaCN8z7JgO8sdcBkEd2ZPOMq8Sf6H6e7Rh0OWoj2FBB7QW+C1BfWt6oRYoAsk/ RZEHwLbnyqCo2Xqk0jR3s/HdD+7wqAH2CZwO3fddU7/0S2PjpJaK7MuWfA1kucNRhoeM umcDY/6z6at9ucJfBPLLqwTKiw2XWnixljEzqygeyoLguEIfB7Rut2KgBE1zNwVN9Btd tr2A== X-Gm-Message-State: AOJu0Yw98NLZNbylsz9ZYS5SRR1d6ITx2tjgokN5Q+Rv8BpPBbnElTC5 24eT80xWk/peQ+IH9FeHUD6meXi+opcwa1aEYsPisSAYkydl9B51JsZJiKAwIoskisBPpReVBPW xe1yA+o5xzM9/Q7fOm2w1AO/EXSjy7eVWRErVNyO4lwsxkCOzLQyf X-Google-Smtp-Source: AGHT+IHCceOS8dxh7BCWIj4XAswLBIFMDsx+XaDpS2hboxIAkP4tlnksmc3xGCRZpb6LNmnah2ZD0f1vIATvMytF1c8= X-Received: by 2002:a05:622a:a211:b0:447:d97f:9765 with SMTP id d75a77b69052e-4535bd98399mr539911cf.16.1723585143738; Tue, 13 Aug 2024 14:39:03 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Dale Curtis Date: Tue, 13 Aug 2024 14:38:48 -0700 Message-ID: To: FFmpeg development discussions and patches Content-Type: multipart/mixed; boundary="0000000000003c57b3061f977080" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [FFmpeg-devel] PATCH] Make H.274 film grain support optional for H.264. Saves ~779kb. 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: --0000000000003c57b3061f977080 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Aug 13, 2024 at 1:11=E2=80=AFPM Hendrik Leppkes wrote: > Disabling random codec features seems like an anti-feature to me, in > the future it'll make every feature be questioned and compile-time > conditional, and make everything terrible. > If the context size is the major concern, maybe large structures > should be allocated when in use, rather than always? > I agree with that, so here's a version which allocates dynamically instead. It passes FATE, but I didn't try with valgrind/msan in case I missed a cleanup path. - dale --0000000000003c57b3061f977080 Content-Type: application/octet-stream; name="dynamic_film_grain_v0.patch" Content-Disposition: attachment; filename="dynamic_film_grain_v0.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lzsy2xjt0 RnJvbSAzMjNjZjUxYzFlMDc3MzhhMDliMmU4YjgyN2I4OWExN2U0YmQxNmU0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEYWxlIEN1cnRpcyA8ZGFsZWN1cnRpc0BjaHJvbWl1bS5vcmc+ CkRhdGU6IFR1ZSwgMTMgQXVnIDIwMjQgMjA6NTM6MTQgKzAwMDAKU3ViamVjdDogW1BBVENIXSBB bGxvY2F0ZSBILjI3NCBmaWxtIGdyYWluIG1ldGFkYXRhIGR5bmFtaWNhbGx5LiBTYXZlcyB+Nzc5 a2IuCgpGaWxtIGdyYWluIHN1cHBvcnQgYWRkcyBhIGh1Z2UgYW1vdW50IG9mIG92ZXJoZWFkIHRv IHRoZSBIMjY0Q29udGV4dApzdHJ1Y3R1cmUgZm9yIGEgZmVhdHVyZSB0aGF0IGlzIHJhcmVseSB1 c2VkLiBPbiBsb3cgZW5kIGRldmljZXMgb3IKcGFnZXMgdGhhdCBoYXZlIGxvdHMgb2YgbWVkaWEg dGhpcyBibG9hdHMgbWVtb3J5IHVzYWdlIHJhcGlkbHkuCgpUaGlzIGNoYW5nZXMgdGhlIHN0YXRp YyBmaWxtIGdyYWluIG1ldGFkYXRhIGFsbG9jYXRpb25zIHRvIGJlIGR5bmFtaWMKd2hpY2ggcmVk dWNlcyB0aGUgSDI2NENvbnRleHQgc2l6ZSBmcm9tIDg1MTgwOCBieXRlcyB0byA1MzQ0NCBieXRl cy4KCkJ1ZzogaHR0cHM6Ly9jcmJ1Zy5jb20vMzU5MzU4ODc1ClNpZ25lZC1vZmYtYnk6IERhbGUg Q3VydGlzIDxkYWxlY3VydGlzQGNocm9taXVtLm9yZz4KLS0tCiBsaWJhdmNvZGVjL2gyNjQ1X3Nl aS5jICAgIHwgMzAgKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tCiBsaWJhdmNvZGVjL2gy NjQ1X3NlaS5oICAgIHwgIDYgKysrKy0tCiBsaWJhdmNvZGVjL2gyNjRfcGljdHVyZS5jIHwgMTEg KysrKysrKysrLS0KIGxpYmF2Y29kZWMvaDI2NF9zZWkuYyAgICAgfCAgMSAtCiBsaWJhdmNvZGVj L2gyNjRfc2xpY2UuYyAgIHwgIDUgKysrKy0KIGxpYmF2Y29kZWMvaDI2NGRlYy5jICAgICAgfCAg MiArKwogbGliYXZjb2RlYy9oMjY0ZGVjLmggICAgICB8ICAyICstCiBsaWJhdmNvZGVjL2hldmMv aGV2Y2RlYy5jIHwgMjAgKysrKysrKysrKysrKy0tLS0tLS0KIGxpYmF2Y29kZWMvaGV2Yy9oZXZj ZGVjLmggfCAgMiArLQogOSBmaWxlcyBjaGFuZ2VkLCA1NiBpbnNlcnRpb25zKCspLCAyMyBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saWJhdmNvZGVjL2gyNjQ1X3NlaS5jIGIvbGliYXZjb2Rl Yy9oMjY0NV9zZWkuYwppbmRleCA3YzgzNzQ3Y2QwLi4zZWQxZTk4MDliIDEwMDY0NAotLS0gYS9s aWJhdmNvZGVjL2gyNjQ1X3NlaS5jCisrKyBiL2xpYmF2Y29kZWMvaDI2NDVfc2VpLmMKQEAgLTIy Myw3ICsyMjMsMTIgQEAgc3RhdGljIGludCBkZWNvZGVfcmVnaXN0ZXJlZF91c2VyX2RhdGEoSDI2 NDVTRUkgKmgsIEdldEJ5dGVDb250ZXh0ICpnYiwKIAogICAgICAgICBwcm92aWRlcl9vcmllbnRl ZF9jb2RlID0gYnl0ZXN0cmVhbTJfZ2V0X2J5dGV1KGdiKTsKICAgICAgICAgaWYgKHByb3ZpZGVy X29yaWVudGVkX2NvZGUgPT0gYW9tX2dyYWluX3Byb3ZpZGVyX29yaWVudGVkX2NvZGUpIHsKLSAg ICAgICAgICAgIHJldHVybiBmZl9hb21fcGFyc2VfZmlsbV9ncmFpbl9zZXRzKCZoLT5hb21fZmls bV9ncmFpbiwKKyAgICAgICAgICAgIGlmICghaC0+YW9tX2ZpbG1fZ3JhaW4pIHsKKyAgICAgICAg ICAgICAgICBoLT5hb21fZmlsbV9ncmFpbiA9IGF2X21hbGxvY3ooc2l6ZW9mKCpoLT5hb21fZmls bV9ncmFpbikpOworICAgICAgICAgICAgICAgIGlmICghaC0+YW9tX2ZpbG1fZ3JhaW4pCisgICAg ICAgICAgICAgICAgICAgIHJldHVybiBBVkVSUk9SKEVOT01FTSk7CisgICAgICAgICAgICB9Cisg ICAgICAgICAgICByZXR1cm4gZmZfYW9tX3BhcnNlX2ZpbG1fZ3JhaW5fc2V0cyhoLT5hb21fZmls bV9ncmFpbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGdiLT5idWZmZXIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBieXRlc3RyZWFtMl9nZXRfYnl0ZXNfbGVmdChnYikpOwogICAgICAgICB9CkBAIC00NzIs NyArNDc3LDEyIEBAIGludCBmZl9oMjY0NV9zZWlfbWVzc2FnZV9kZWNvZGUoSDI2NDVTRUkgKmgs IGVudW0gU0VJVHlwZSB0eXBlLAogICAgIGNhc2UgU0VJX1RZUEVfRElTUExBWV9PUklFTlRBVElP TjoKICAgICAgICAgcmV0dXJuIGRlY29kZV9kaXNwbGF5X29yaWVudGF0aW9uKCZoLT5kaXNwbGF5 X29yaWVudGF0aW9uLCBnYik7CiAgICAgY2FzZSBTRUlfVFlQRV9GSUxNX0dSQUlOX0NIQVJBQ1RF UklTVElDUzoKLSAgICAgICAgcmV0dXJuIGRlY29kZV9maWxtX2dyYWluX2NoYXJhY3RlcmlzdGlj cygmaC0+ZmlsbV9ncmFpbl9jaGFyYWN0ZXJpc3RpY3MsIGNvZGVjX2lkLCBnYik7CisgICAgICAg IGlmICghaC0+ZmlsbV9ncmFpbl9jaGFyYWN0ZXJpc3RpY3MpIHsKKyAgICAgICAgICAgIGgtPmZp bG1fZ3JhaW5fY2hhcmFjdGVyaXN0aWNzID0gYXZfbWFsbG9jeihzaXplb2YoKmgtPmZpbG1fZ3Jh aW5fY2hhcmFjdGVyaXN0aWNzKSk7CisgICAgICAgICAgICBpZiAoIWgtPmZpbG1fZ3JhaW5fY2hh cmFjdGVyaXN0aWNzKQorICAgICAgICAgICAgICAgIHJldHVybiBBVkVSUk9SKEVOT01FTSk7Cisg ICAgICAgIH0KKyAgICAgICAgcmV0dXJuIGRlY29kZV9maWxtX2dyYWluX2NoYXJhY3RlcmlzdGlj cyhoLT5maWxtX2dyYWluX2NoYXJhY3RlcmlzdGljcywgY29kZWNfaWQsIGdiKTsKICAgICBjYXNl IFNFSV9UWVBFX0ZSQU1FX1BBQ0tJTkdfQVJSQU5HRU1FTlQ6CiAgICAgICAgIHJldHVybiBkZWNv ZGVfZnJhbWVfcGFja2luZ19hcnJhbmdlbWVudCgmaC0+ZnJhbWVfcGFja2luZywgZ2IsIGNvZGVj X2lkKTsKICAgICBjYXNlIFNFSV9UWVBFX0FMVEVSTkFUSVZFX1RSQU5TRkVSX0NIQVJBQ1RFUklT VElDUzoKQEAgLTc3OCw4ICs3ODgsOCBAQCBpbnQgZmZfaDI2NDVfc2VpX3RvX2ZyYW1lKEFWRnJh bWUgKmZyYW1lLCBIMjY0NVNFSSAqc2VpLAogICAgICAgICB9CiAgICAgfQogCi0gICAgaWYgKHNl aS0+ZmlsbV9ncmFpbl9jaGFyYWN0ZXJpc3RpY3MucHJlc2VudCkgewotICAgICAgICBIMjY0NVNF SUZpbG1HcmFpbkNoYXJhY3RlcmlzdGljcyAqZmdjID0gJnNlaS0+ZmlsbV9ncmFpbl9jaGFyYWN0 ZXJpc3RpY3M7CisgICAgaWYgKHNlaS0+ZmlsbV9ncmFpbl9jaGFyYWN0ZXJpc3RpY3MgJiYgc2Vp LT5maWxtX2dyYWluX2NoYXJhY3RlcmlzdGljcy0+cHJlc2VudCkgeworICAgICAgICBIMjY0NVNF SUZpbG1HcmFpbkNoYXJhY3RlcmlzdGljcyAqZmdjID0gc2VpLT5maWxtX2dyYWluX2NoYXJhY3Rl cmlzdGljczsKICAgICAgICAgQVZGaWxtR3JhaW5QYXJhbXMgKmZncCA9IGF2X2ZpbG1fZ3JhaW5f cGFyYW1zX2NyZWF0ZV9zaWRlX2RhdGEoZnJhbWUpOwogICAgICAgICBBVkZpbG1HcmFpbkgyNzRQ YXJhbXMgKmgyNzQ7CiAKQEAgLTg1MSw5ICs4NjEsMTEgQEAgRkZfRU5BQkxFX0RFUFJFQ0FUSU9O X1dBUk5JTkdTCiAgICAgfQogCiAjaWYgQ09ORklHX0hFVkNfU0VJCi0gICAgcmV0ID0gZmZfYW9t X2F0dGFjaF9maWxtX2dyYWluX3NldHMoJnNlaS0+YW9tX2ZpbG1fZ3JhaW4sIGZyYW1lKTsKLSAg ICBpZiAocmV0IDwgMCkKLSAgICAgICAgcmV0dXJuIHJldDsKKyAgICBpZiAoc2VpLT5hb21fZmls bV9ncmFpbikgeworICAgICAgICByZXQgPSBmZl9hb21fYXR0YWNoX2ZpbG1fZ3JhaW5fc2V0cyhz ZWktPmFvbV9maWxtX2dyYWluLCBmcmFtZSk7CisgICAgICAgIGlmIChyZXQgPCAwKQorICAgICAg ICAgICAgcmV0dXJuIHJldDsKKyAgICB9CiAjZW5kaWYKIAogICAgIHJldHVybiAwOwpAQCAtODc5 LDUgKzg5MSw3IEBAIHZvaWQgZmZfaDI2NDVfc2VpX3Jlc2V0KEgyNjQ1U0VJICpzKQogICAgIHMt PmFtYmllbnRfdmlld2luZ19lbnZpcm9ubWVudC5wcmVzZW50ID0gMDsKICAgICBzLT5tYXN0ZXJp bmdfZGlzcGxheS5wcmVzZW50ID0gMDsKICAgICBzLT5jb250ZW50X2xpZ2h0LnByZXNlbnQgPSAw OwotICAgIHMtPmFvbV9maWxtX2dyYWluLmVuYWJsZSA9IDA7CisKKyAgICBhdl9mcmVlcCgmcy0+ ZmlsbV9ncmFpbl9jaGFyYWN0ZXJpc3RpY3MpOworICAgIGF2X2ZyZWVwKCZzLT5hb21fZmlsbV9n cmFpbik7CiB9CmRpZmYgLS1naXQgYS9saWJhdmNvZGVjL2gyNjQ1X3NlaS5oIGIvbGliYXZjb2Rl Yy9oMjY0NV9zZWkuaAppbmRleCA0ODhkYmNhZDdlLi4wMGQ1N2M2ZjMzIDEwMDY0NAotLS0gYS9s aWJhdmNvZGVjL2gyNjQ1X3NlaS5oCisrKyBiL2xpYmF2Y29kZWMvaDI2NDVfc2VpLmgKQEAgLTEz MCwxMSArMTMwLDEzIEBAIHR5cGVkZWYgc3RydWN0IEgyNjQ1U0VJIHsKICAgICBIMjY0NVNFSUZy YW1lUGFja2luZyBmcmFtZV9wYWNraW5nOwogICAgIEgyNjQ1U0VJRGlzcGxheU9yaWVudGF0aW9u IGRpc3BsYXlfb3JpZW50YXRpb247CiAgICAgSDI2NDVTRUlBbHRlcm5hdGl2ZVRyYW5zZmVyIGFs dGVybmF0aXZlX3RyYW5zZmVyOwotICAgIEgyNjQ1U0VJRmlsbUdyYWluQ2hhcmFjdGVyaXN0aWNz IGZpbG1fZ3JhaW5fY2hhcmFjdGVyaXN0aWNzOwogICAgIEgyNjQ1U0VJQW1iaWVudFZpZXdpbmdF bnZpcm9ubWVudCBhbWJpZW50X3ZpZXdpbmdfZW52aXJvbm1lbnQ7CiAgICAgSDI2NDVTRUlNYXN0 ZXJpbmdEaXNwbGF5IG1hc3RlcmluZ19kaXNwbGF5OwogICAgIEgyNjQ1U0VJQ29udGVudExpZ2h0 IGNvbnRlbnRfbGlnaHQ7Ci0gICAgQVZGaWxtR3JhaW5BRkdTMVBhcmFtcyBhb21fZmlsbV9ncmFp bjsKKworICAgIC8vIER5bmFtaWMgYWxsb2NhdGlvbnMgZHVlIHRvIGxhcmdlIHNpemUuCisgICAg SDI2NDVTRUlGaWxtR3JhaW5DaGFyYWN0ZXJpc3RpY3MqIGZpbG1fZ3JhaW5fY2hhcmFjdGVyaXN0 aWNzOworICAgIEFWRmlsbUdyYWluQUZHUzFQYXJhbXMqIGFvbV9maWxtX2dyYWluOwogfSBIMjY0 NVNFSTsKIAogZW51bSB7CmRpZmYgLS1naXQgYS9saWJhdmNvZGVjL2gyNjRfcGljdHVyZS5jIGIv bGliYXZjb2RlYy9oMjY0X3BpY3R1cmUuYwppbmRleCAzMjM0MTQxZGJkLi4zNzFhNzk0ZWMyIDEw MDY0NAotLS0gYS9saWJhdmNvZGVjL2gyNjRfcGljdHVyZS5jCisrKyBiL2xpYmF2Y29kZWMvaDI2 NF9waWN0dXJlLmMKQEAgLTI3LDYgKzI3LDcgQEAKIAogI2luY2x1ZGUgImxpYmF2dXRpbC9hdmFz c2VydC5oIgogI2luY2x1ZGUgImxpYmF2dXRpbC9lbW1zLmgiCisjaW5jbHVkZSAibGliYXZ1dGls L21lbS5oIgogI2luY2x1ZGUgImVycm9yX3Jlc2lsaWVuY2UuaCIKICNpbmNsdWRlICJhdmNvZGVj LmgiCiAjaW5jbHVkZSAiaDI2NGRlYy5oIgpAQCAtMjEyLDkgKzIxMywxNSBAQCBpbnQgZmZfaDI2 NF9maWVsZF9lbmQoSDI2NENvbnRleHQgKmgsIEgyNjRTbGljZUNvbnRleHQgKnNsLCBpbnQgaW5f c2V0dXApCiAgICAgICAgIGNvbnN0IEFWRnJhbWVTaWRlRGF0YSAqc2QgPSBhdl9mcmFtZV9nZXRf c2lkZV9kYXRhKGN1ci0+ZiwgQVZfRlJBTUVfREFUQV9GSUxNX0dSQUlOX1BBUkFNUyk7CiAKICAg ICAgICAgZXJyID0gQVZFUlJPUl9JTlZBTElEREFUQTsKLSAgICAgICAgaWYgKHNkKSAvLyBhIGRl Y29kaW5nIGVycm9yIG1heSBoYXZlIGhhcHBlbmVkIGJlZm9yZSB0aGUgc2lkZSBkYXRhIGNvdWxk IGJlIGFsbG9jYXRlZAotICAgICAgICAgICAgZXJyID0gZmZfaDI3NF9hcHBseV9maWxtX2dyYWlu KGN1ci0+Zl9ncmFpbiwgY3VyLT5mLCAmaC0+aDI3NGRiLAorICAgICAgICBpZiAoc2QpIHsgLy8g YSBkZWNvZGluZyBlcnJvciBtYXkgaGF2ZSBoYXBwZW5lZCBiZWZvcmUgdGhlIHNpZGUgZGF0YSBj b3VsZCBiZSBhbGxvY2F0ZWQKKyAgICAgICAgICAgIGlmICghaC0+aDI3NGRiKSB7CisgICAgICAg ICAgICAgICAgaC0+aDI3NGRiID0gYXZfbWFsbG9jeihzaXplb2YoKmgtPmgyNzRkYikpOworICAg ICAgICAgICAgICAgIGlmICghaC0+aDI3NGRiKQorICAgICAgICAgICAgICAgICAgICByZXR1cm4g QVZFUlJPUihFTk9NRU0pOworICAgICAgICAgICAgfQorICAgICAgICAgICAgZXJyID0gZmZfaDI3 NF9hcHBseV9maWxtX2dyYWluKGN1ci0+Zl9ncmFpbiwgY3VyLT5mLCBoLT5oMjc0ZGIsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKEFWRmlsbUdyYWluUGFyYW1z ICopIHNkLT5kYXRhKTsKKyAgICAgICAgfQogICAgICAgICBpZiAoZXJyIDwgMCkgewogICAgICAg ICAgICAgYXZfbG9nKGgtPmF2Y3R4LCBBVl9MT0dfV0FSTklORywgIkZhaWxlZCBzeW50aGVzaXpp bmcgZmlsbSAiCiAgICAgICAgICAgICAgICAgICAgImdyYWluLCBpZ25vcmluZzogJXNcbiIsIGF2 X2VycjJzdHIoZXJyKSk7CmRpZmYgLS1naXQgYS9saWJhdmNvZGVjL2gyNjRfc2VpLmMgYi9saWJh dmNvZGVjL2gyNjRfc2VpLmMKaW5kZXggOGQ2ZGM3Nzk0My4uMTVhNTIzMjIwOSAxMDA2NDQKLS0t IGEvbGliYXZjb2RlYy9oMjY0X3NlaS5jCisrKyBiL2xpYmF2Y29kZWMvaDI2NF9zZWkuYwpAQCAt NTUsNyArNTUsNiBAQCB2b2lkIGZmX2gyNjRfc2VpX3VuaW5pdChIMjY0U0VJQ29udGV4dCAqaCkK ICAgICBoLT5waWN0dXJlX3RpbWluZy5wcmVzZW50ICAgICAgPSAwOwogICAgIGgtPmJ1ZmZlcmlu Z19wZXJpb2QucHJlc2VudCAgICA9IDA7CiAgICAgaC0+Y29tbW9uLmZyYW1lX3BhY2tpbmcucHJl c2VudCAgICAgICA9IDA7Ci0gICAgaC0+Y29tbW9uLmZpbG1fZ3JhaW5fY2hhcmFjdGVyaXN0aWNz LnByZXNlbnQgPSAwOwogICAgIGgtPmNvbW1vbi5kaXNwbGF5X29yaWVudGF0aW9uLnByZXNlbnQg PSAwOwogICAgIGgtPmNvbW1vbi5hZmQucHJlc2VudCAgICAgICAgICAgICAgICAgPSAgMDsKIApk aWZmIC0tZ2l0IGEvbGliYXZjb2RlYy9oMjY0X3NsaWNlLmMgYi9saWJhdmNvZGVjL2gyNjRfc2xp Y2UuYwppbmRleCBhNjZiNzVjYTgwLi44NDU5NWIxYThiIDEwMDY0NAotLS0gYS9saWJhdmNvZGVj L2gyNjRfc2xpY2UuYworKysgYi9saWJhdmNvZGVjL2gyNjRfc2xpY2UuYwpAQCAtNTE2LDcgKzUx NiwxMCBAQCBzdGF0aWMgaW50IGgyNjRfZnJhbWVfc3RhcnQoSDI2NENvbnRleHQgKmgpCiAgICAg cGljLT5mLT5jcm9wX3RvcCAgICA9IGgtPmNyb3BfdG9wOwogICAgIHBpYy0+Zi0+Y3JvcF9ib3R0 b20gPSBoLT5jcm9wX2JvdHRvbTsKIAotICAgIHBpYy0+bmVlZHNfZmcgPSBoLT5zZWkuY29tbW9u LmZpbG1fZ3JhaW5fY2hhcmFjdGVyaXN0aWNzLnByZXNlbnQgJiYgIWgtPmF2Y3R4LT5od2FjY2Vs ICYmCisgICAgcGljLT5uZWVkc19mZyA9CisgICAgICAgIGgtPnNlaS5jb21tb24uZmlsbV9ncmFp bl9jaGFyYWN0ZXJpc3RpY3MgJiYKKyAgICAgICAgaC0+c2VpLmNvbW1vbi5maWxtX2dyYWluX2No YXJhY3RlcmlzdGljcy0+cHJlc2VudCAmJgorICAgICAgICAhaC0+YXZjdHgtPmh3YWNjZWwgJiYK ICAgICAgICAgIShoLT5hdmN0eC0+ZXhwb3J0X3NpZGVfZGF0YSAmIEFWX0NPREVDX0VYUE9SVF9E QVRBX0ZJTE1fR1JBSU4pOwogCiAgICAgaWYgKChyZXQgPSBhbGxvY19waWN0dXJlKGgsIHBpYykp IDwgMCkKZGlmZiAtLWdpdCBhL2xpYmF2Y29kZWMvaDI2NGRlYy5jIGIvbGliYXZjb2RlYy9oMjY0 ZGVjLmMKaW5kZXggYzc3ZDhmNDJkYi4uYjAxZjU0ODQzZSAxMDA2NDQKLS0tIGEvbGliYXZjb2Rl Yy9oMjY0ZGVjLmMKKysrIGIvbGliYXZjb2RlYy9oMjY0ZGVjLmMKQEAgLTE1Niw2ICsxNTYsOCBA QCB2b2lkIGZmX2gyNjRfZnJlZV90YWJsZXMoSDI2NENvbnRleHQgKmgpCiAgICAgYXZfZnJlZXAo JmgtPm1iMmJfeHkpOwogICAgIGF2X2ZyZWVwKCZoLT5tYjJicl94eSk7CiAKKyAgICBhdl9mcmVl cCgmaC0+aDI3NGRiKTsKKwogICAgIGZmX3JlZnN0cnVjdF9wb29sX3VuaW5pdCgmaC0+cXNjYWxl X3RhYmxlX3Bvb2wpOwogICAgIGZmX3JlZnN0cnVjdF9wb29sX3VuaW5pdCgmaC0+bWJfdHlwZV9w b29sKTsKICAgICBmZl9yZWZzdHJ1Y3RfcG9vbF91bmluaXQoJmgtPm1vdGlvbl92YWxfcG9vbCk7 CmRpZmYgLS1naXQgYS9saWJhdmNvZGVjL2gyNjRkZWMuaCBiL2xpYmF2Y29kZWMvaDI2NGRlYy5o CmluZGV4IGNjZDc1ODNiZjQuLmJiYzJhMTg1ZWIgMTAwNjQ0Ci0tLSBhL2xpYmF2Y29kZWMvaDI2 NGRlYy5oCisrKyBiL2xpYmF2Y29kZWMvaDI2NGRlYy5oCkBAIC0zNDQsNyArMzQ0LDcgQEAgdHlw ZWRlZiBzdHJ1Y3QgSDI2NENvbnRleHQgewogICAgIEgyNjREU1BDb250ZXh0IGgyNjRkc3A7CiAg ICAgSDI2NENocm9tYUNvbnRleHQgaDI2NGNocm9tYTsKICAgICBIMjY0UXBlbENvbnRleHQgaDI2 NHFwZWw7Ci0gICAgSDI3NEZpbG1HcmFpbkRhdGFiYXNlIGgyNzRkYjsKKyAgICBIMjc0RmlsbUdy YWluRGF0YWJhc2UqIGgyNzRkYjsgIC8vIER5YW5taWMgYWxsb2NhdGlvbiBkdWUgdG8gbGFyZ2Ug c2l6ZS4KIAogICAgIEgyNjRQaWN0dXJlIERQQltIMjY0X01BWF9QSUNUVVJFX0NPVU5UXTsKICAg ICBIMjY0UGljdHVyZSAqY3VyX3BpY19wdHI7CmRpZmYgLS1naXQgYS9saWJhdmNvZGVjL2hldmMv aGV2Y2RlYy5jIGIvbGliYXZjb2RlYy9oZXZjL2hldmNkZWMuYwppbmRleCAxOTNkNjI0ZmM5Li5m MThhOTNlYmZjIDEwMDY0NAotLS0gYS9saWJhdmNvZGVjL2hldmMvaGV2Y2RlYy5jCisrKyBiL2xp YmF2Y29kZWMvaGV2Yy9oZXZjZGVjLmMKQEAgLTM4Niw4ICszODYsOCBAQCBzdGF0aWMgaW50IGV4 cG9ydF9zdHJlYW1fcGFyYW1zX2Zyb21fc2VpKEhFVkNDb250ZXh0ICpzKQogICAgICAgICBhdmN0 eC0+Y29sb3JfdHJjID0gcy0+c2VpLmNvbW1vbi5hbHRlcm5hdGl2ZV90cmFuc2Zlci5wcmVmZXJy ZWRfdHJhbnNmZXJfY2hhcmFjdGVyaXN0aWNzOwogICAgIH0KIAotICAgIGlmIChzLT5zZWkuY29t bW9uLmZpbG1fZ3JhaW5fY2hhcmFjdGVyaXN0aWNzLnByZXNlbnQgfHwKLSAgICAgICAgcy0+c2Vp LmNvbW1vbi5hb21fZmlsbV9ncmFpbi5lbmFibGUpCisgICAgaWYgKChzLT5zZWkuY29tbW9uLmZp bG1fZ3JhaW5fY2hhcmFjdGVyaXN0aWNzICYmIHMtPnNlaS5jb21tb24uZmlsbV9ncmFpbl9jaGFy YWN0ZXJpc3RpY3MtPnByZXNlbnQpIHx8CisgICAgICAgIChzLT5zZWkuY29tbW9uLmFvbV9maWxt X2dyYWluICYmIHMtPnNlaS5jb21tb24uYW9tX2ZpbG1fZ3JhaW4tPmVuYWJsZSkpCiAgICAgICAg IGF2Y3R4LT5wcm9wZXJ0aWVzIHw9IEZGX0NPREVDX1BST1BFUlRZX0ZJTE1fR1JBSU47CiAKICAg ICByZXR1cm4gMDsKQEAgLTI5ODIsOCArMjk4Miw4IEBAIHN0YXRpYyBpbnQgaGV2Y19mcmFtZV9z dGFydChIRVZDQ29udGV4dCAqcykKICAgICBlbHNlCiAgICAgICAgIHMtPmN1cl9mcmFtZS0+Zi0+ ZmxhZ3MgJj0gfkFWX0ZSQU1FX0ZMQUdfS0VZOwogCi0gICAgcy0+Y3VyX2ZyYW1lLT5uZWVkc19m ZyA9IChzLT5zZWkuY29tbW9uLmZpbG1fZ3JhaW5fY2hhcmFjdGVyaXN0aWNzLnByZXNlbnQgfHwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHMtPnNlaS5jb21tb24uYW9tX2ZpbG1fZ3Jh aW4uZW5hYmxlKSAmJgorICAgIHMtPmN1cl9mcmFtZS0+bmVlZHNfZmcgPSAoKHMtPnNlaS5jb21t b24uZmlsbV9ncmFpbl9jaGFyYWN0ZXJpc3RpY3MgJiYgcy0+c2VpLmNvbW1vbi5maWxtX2dyYWlu X2NoYXJhY3RlcmlzdGljcy0+cHJlc2VudCkgfHwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIChzLT5zZWkuY29tbW9uLmFvbV9maWxtX2dyYWluICYmIHMtPnNlaS5jb21tb24uYW9tX2Zp bG1fZ3JhaW4tPmVuYWJsZSkpICYmCiAgICAgICAgICEocy0+YXZjdHgtPmV4cG9ydF9zaWRlX2Rh dGEgJiBBVl9DT0RFQ19FWFBPUlRfREFUQV9GSUxNX0dSQUlOKSAmJgogICAgICAgICAhcy0+YXZj dHgtPmh3YWNjZWw7CiAKQEAgLTI5OTIsOCArMjk5Miw4IEBAIHN0YXRpYyBpbnQgaGV2Y19mcmFt ZV9zdGFydChIRVZDQ29udGV4dCAqcykKICAgICAgICAgZ290byBmYWlsOwogCiAgICAgaWYgKHMt PmN1cl9mcmFtZS0+bmVlZHNfZmcgJiYKLSAgICAgICAgKHMtPnNlaS5jb21tb24uZmlsbV9ncmFp bl9jaGFyYWN0ZXJpc3RpY3MucHJlc2VudCAmJgotICAgICAgICAgIWZmX2gyNzRfZmlsbV9ncmFp bl9wYXJhbXNfc3VwcG9ydGVkKHMtPnNlaS5jb21tb24uZmlsbV9ncmFpbl9jaGFyYWN0ZXJpc3Rp Y3MubW9kZWxfaWQsCisgICAgICAgIChzLT5zZWkuY29tbW9uLmZpbG1fZ3JhaW5fY2hhcmFjdGVy aXN0aWNzICYmIHMtPnNlaS5jb21tb24uZmlsbV9ncmFpbl9jaGFyYWN0ZXJpc3RpY3MtPnByZXNl bnQgJiYKKyAgICAgICAgICFmZl9oMjc0X2ZpbG1fZ3JhaW5fcGFyYW1zX3N1cHBvcnRlZChzLT5z ZWkuY29tbW9uLmZpbG1fZ3JhaW5fY2hhcmFjdGVyaXN0aWNzLT5tb2RlbF9pZCwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzLT5jdXJfZnJhbWUtPmYtPmZv cm1hdCkgfHwKICAgICAgICAgICFhdl9maWxtX2dyYWluX3BhcmFtc19zZWxlY3Qocy0+Y3VyX2Zy YW1lLT5mKSkpIHsKICAgICAgICAgYXZfbG9nX29uY2Uocy0+YXZjdHgsIEFWX0xPR19XQVJOSU5H LCBBVl9MT0dfREVCVUcsICZzLT5maWxtX2dyYWluX3dhcm5pbmdfc2hvd24sCkBAIC0zMTE5LDgg KzMxMTksMTMgQEAgc3RhdGljIGludCBoZXZjX2ZyYW1lX2VuZChIRVZDQ29udGV4dCAqcykKICAg ICAgICAgICAgIGF2X2Fzc2VydDAoMCk7CiAgICAgICAgICAgICByZXR1cm4gQVZFUlJPUl9CVUc7 CiAgICAgICAgIGNhc2UgQVZfRklMTV9HUkFJTl9QQVJBTVNfSDI3NDoKKyAgICAgICAgICAgIGlm ICghcy0+aDI3NGRiKSB7CisgICAgICAgICAgICAgICAgcy0+aDI3NGRiID0gYXZfbWFsbG9jeihz aXplb2YoKnMtPmgyNzRkYikpOworICAgICAgICAgICAgICAgIGlmICghcy0+aDI3NGRiKQorICAg ICAgICAgICAgICAgICAgICByZXR1cm4gQVZFUlJPUihFTk9NRU0pOworICAgICAgICAgICAgfQog ICAgICAgICAgICAgcmV0ID0gZmZfaDI3NF9hcHBseV9maWxtX2dyYWluKG91dC0+ZnJhbWVfZ3Jh aW4sIG91dC0+ZiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAm cy0+aDI3NGRiLCBmZ3ApOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHMtPmgyNzRkYiwgZmdwKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIEFW X0ZJTE1fR1JBSU5fUEFSQU1TX0FWMToKICAgICAgICAgICAgIHJldCA9IGZmX2FvbV9hcHBseV9m aWxtX2dyYWluKG91dC0+ZnJhbWVfZ3JhaW4sIG91dC0+ZiwgZmdwKTsKQEAgLTM0OTUsNiArMzUw MCw3IEBAIHN0YXRpYyBhdl9jb2xkIGludCBoZXZjX2RlY29kZV9mcmVlKEFWQ29kZWNDb250ZXh0 ICphdmN0eCkKICAgICBhdl9idWZmZXJfdW5yZWYoJnMtPnJwdV9idWYpOwogCiAgICAgYXZfZnJl ZXAoJnMtPm1kNV9jdHgpOworICAgIGF2X2ZyZWVwKCZzLT5oMjc0ZGIpOwogCiAgICAgZm9yIChp ID0gMDsgaSA8IDM7IGkrKykgewogICAgICAgICBhdl9mcmVlcCgmcy0+c2FvX3BpeGVsX2J1ZmZl cl9oW2ldKTsKZGlmZiAtLWdpdCBhL2xpYmF2Y29kZWMvaGV2Yy9oZXZjZGVjLmggYi9saWJhdmNv ZGVjL2hldmMvaGV2Y2RlYy5oCmluZGV4IGRhNGQ4M2U2NjEuLmJkN2I0ZGE0YzggMTAwNjQ0Ci0t LSBhL2xpYmF2Y29kZWMvaGV2Yy9oZXZjZGVjLmgKKysrIGIvbGliYXZjb2RlYy9oZXZjL2hldmNk ZWMuaApAQCAtNDk1LDcgKzQ5NSw3IEBAIHR5cGVkZWYgc3RydWN0IEhFVkNDb250ZXh0IHsKICAg ICBIRVZDRFNQQ29udGV4dCBoZXZjZHNwOwogICAgIFZpZGVvRFNQQ29udGV4dCB2ZHNwOwogICAg IEJzd2FwRFNQQ29udGV4dCBiZHNwOwotICAgIEgyNzRGaWxtR3JhaW5EYXRhYmFzZSBoMjc0ZGI7 CisgICAgSDI3NEZpbG1HcmFpbkRhdGFiYXNlKiBoMjc0ZGI7ICAvLyBEeW5hbWljYWxseSBhbGxv Y2F0ZWQgZHVlIHRvIGxhcmdlIHNpemUuCiAgICAgaW50OF90ICpxcF95X3RhYjsKICAgICB1aW50 OF90ICpob3Jpem9udGFsX2JzOwogICAgIHVpbnQ4X3QgKnZlcnRpY2FsX2JzOwotLSAKMi40Ni4w Ljc2LmdlNTU5YzRiZjFhLWdvb2cKCg== --0000000000003c57b3061f977080 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". --0000000000003c57b3061f977080--