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 C15BE4760B for ; Thu, 14 Sep 2023 19:00:00 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4DAFD68C79A; Thu, 14 Sep 2023 21:59:57 +0300 (EEST) Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 21F9E68C2DC for ; Thu, 14 Sep 2023 21:59:51 +0300 (EEST) Received: by mail-ej1-f42.google.com with SMTP id a640c23a62f3a-9aa0495f9cfso534569466b.1 for ; Thu, 14 Sep 2023 11:59:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ylo-ph.20230601.gappssmtp.com; s=20230601; t=1694717990; x=1695322790; 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=u8zOtyo8XHb0j4FSQig4YQlIDphHnbcHgf9zHZ649fk=; b=b4QD54npMYpJJr47TJ31PUJ5+NYXKPvv69/FuHghZSpsopx+6mJJ6HzScngaAVUh5O cVpzCgaGPD5Pb2M0y3umi1BM0k2AapwymCeLv9ggeHH+xxnUgplznFSe9pqWj5Gscj69 kNRDPO3WimCydrFWtMW/3BAXkGcZXsczbMmwncJXnFnbO2erVRXaPn4ABo45yfATEk93 3iAfRzVYwEmX8eG9Uyp74HIifjensU7SlqoiVh76Fn/3zzMpd0ZqS3Q32zvcKxc0jKF8 ML+FrwA2oM9THMYn3gfU0t8iqfzRTFQslJlYdttkdsfByzOW4sVdLiUN5srRuY8Hdkli v10A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694717990; x=1695322790; 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=u8zOtyo8XHb0j4FSQig4YQlIDphHnbcHgf9zHZ649fk=; b=jvqKpnfa8WoEn9N/RKUjnk3jXszdK2uj/9Ke1v3Yy1pczn6mBj4vxsq7+bx9/ikDuv IQysbcLzs1CfqnhevRRS1MbxoH1c3ai3sMcfln/Aqmze5D3VVmUVPzM/+lXYueyGrtSr BcogG+sPBfj7z0aXO7rYaGg0w49nJwT5IkbMh+dDqnvFBEC1d1FA7uZa1xa1y5s10/Td AEkfYPMseUcdFxFx9sjZR8okQ0DkRkRmUTQAL9Q4RqarQX40rMbCRjBrQOldKBTj39u0 i9fk3lhqDjaknhsGyYEOwUDkOxkQ9LoNlBg8k5b/MxJtFL4GM0rEJqG7Rhh3VxgAKacz 4I8Q== X-Gm-Message-State: AOJu0Yy2TVAplQ/yQw9RgZO/oetwPMrL0P5ylV+CgZvS/86du8zdALnZ zZPP9fvpDRC5KTorXKl9HucLY5Un49cuMyBXxf+FDQmDzNpP8eNT X-Google-Smtp-Source: AGHT+IFJbQai7IiYQQnae4f/mIWPNee5Aw+jEfr5UhXHyBDI4vnmoZTINmy/nvtKCRyZbczy+2njEC3KWghXHynKQko= X-Received: by 2002:a17:906:eec5:b0:9a1:aaae:8207 with SMTP id wu5-20020a170906eec500b009a1aaae8207mr3176733ejb.20.1694717990050; Thu, 14 Sep 2023 11:59:50 -0700 (PDT) MIME-Version: 1.0 References: <97c138ad-457f-d098-e145-983bdd3e7f69@rothenpieler.org> <74ca77b7-5b84-9d4d-2baa-0223418fd9d6@rothenpieler.org> In-Reply-To: From: Kyle Swanson Date: Thu, 14 Sep 2023 11:59:38 -0700 Message-ID: To: FFmpeg development discussions and patches Content-Type: multipart/mixed; boundary="000000000000cae4090605564760" Subject: Re: [FFmpeg-devel] [PATCH] avfilter: add libvmaf_cuda 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: --000000000000cae4090605564760 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi, On Mon, Sep 11, 2023 at 11:51=E2=80=AFAM Timo Rothenpieler wrote: > > On 11.09.2023 19:53, Kyle Swanson wrote: > > Hi, > > > > On Tue, Sep 5, 2023 at 10:16=E2=80=AFAM Kyle Swanson wrote: > >> I'll merge this in a few days. > > > > Not merged yet because I noticed a bug in the configure script. > > Setting only `--enable-libvmaf` will enable both `libvmaf` and > > `libvmaf_cuda`. Anyone familiar with the configure script know why > > this is happening? > > require_pkg_config libvmaf [...] > Should be: > require_pkg_config libvmaf_cuda [...] > > And then you want to also depend on libvmaf_cuda, not libvmaf. Problem was slightly different, there is no `libvmaf_cuda`, just `libvmaf` built with the cuda apis optionally enabled. `./configure` is fixed now and I've tested all the possible combinations, updated patch attached. Thanks, Kyle --000000000000cae4090605564760 Content-Type: application/octet-stream; name="0001-avfilter-add-libvmaf_cuda.patch" Content-Disposition: attachment; filename="0001-avfilter-add-libvmaf_cuda.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lmjj9oub0 RnJvbSBlZjA1ZDE3MzFiN2QyMzIwMTVhMDJhNGI1MmI0OTlhZWE1ODYzNmZiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLeWxlIFN3YW5zb24gPGtzd2Fuc29uQG5ldGZsaXguY29tPgpE YXRlOiBUaHUsIDE0IFNlcCAyMDIzIDExOjUwOjI3IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gYXZm aWx0ZXI6IGFkZCBsaWJ2bWFmX2N1ZGEKCi0tLQogY29uZmlndXJlICAgICAgICAgICAgICAgIHwg IDEyICsrLQogZG9jL2ZpbHRlcnMudGV4aSAgICAgICAgIHwgIDI2ICsrKysrCiBsaWJhdmZpbHRl ci9NYWtlZmlsZSAgICAgfCAgIDEgKwogbGliYXZmaWx0ZXIvYWxsZmlsdGVycy5jIHwgICAxICsK IGxpYmF2ZmlsdGVyL3ZmX2xpYnZtYWYuYyB8IDIxMCArKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysKIDUgZmlsZXMgY2hhbmdlZCwgMjQ5IGluc2VydGlvbnMoKyksIDEgZGVs ZXRpb24oLSkKCmRpZmYgLS1naXQgYS9jb25maWd1cmUgYi9jb25maWd1cmUKaW5kZXggYmQ3Zjc2 OTdjOC4uNjY4MWNlODhhNyAxMDA3NTUKLS0tIGEvY29uZmlndXJlCisrKyBiL2NvbmZpZ3VyZQpA QCAtMzgzMSw2ICszODMxLDcgQEAgdmZsaXBfdnVsa2FuX2ZpbHRlcl9kZXBzPSJ2dWxrYW4gc3Bp cnZfY29tcGlsZXIiCiB2aWRzdGFiZGV0ZWN0X2ZpbHRlcl9kZXBzPSJsaWJ2aWRzdGFiIgogdmlk c3RhYnRyYW5zZm9ybV9maWx0ZXJfZGVwcz0ibGlidmlkc3RhYiIKIGxpYnZtYWZfZmlsdGVyX2Rl cHM9ImxpYnZtYWYiCitsaWJ2bWFmX2N1ZGFfZmlsdGVyX2RlcHM9ImxpYnZtYWYgZmZudmNvZGVj Igogem1xX2ZpbHRlcl9kZXBzPSJsaWJ6bXEiCiB6b29tcGFuX2ZpbHRlcl9kZXBzPSJzd3NjYWxl IgogenNjYWxlX2ZpbHRlcl9kZXBzPSJsaWJ6aW1nIGNvbnN0X25hbiIKQEAgLTY4MTAsNyArNjgx MSwxNiBAQCBlbmFibGVkIGxpYnR3b2xhbWUgICAgICAgICYmIHJlcXVpcmUgbGlidHdvbGFtZSB0 d29sYW1lLmggdHdvbGFtZV9pbml0IC1sdHdvbGFtZQogZW5hYmxlZCBsaWJ1YXZzM2QgICAgICAg ICAmJiByZXF1aXJlX3BrZ19jb25maWcgbGlidWF2czNkICJ1YXZzM2QgPj0gMS4xLjQxIiB1YXZz M2QuaCB1YXZzM2RfZGVjb2RlCiBlbmFibGVkIGxpYnY0bDIgICAgICAgICAgICYmIHJlcXVpcmVf cGtnX2NvbmZpZyBsaWJ2NGwyIGxpYnY0bDIgbGlidjRsMi5oIHY0bDJfaW9jdGwKIGVuYWJsZWQg bGlidmlkc3RhYiAgICAgICAgJiYgcmVxdWlyZV9wa2dfY29uZmlnIGxpYnZpZHN0YWIgInZpZHN0 YWIgPj0gMC45OCIgdmlkLnN0YWIvbGlidmlkc3RhYi5oIHZzTW90aW9uRGV0ZWN0SW5pdAotZW5h YmxlZCBsaWJ2bWFmICAgICAgICAgICAmJiByZXF1aXJlX3BrZ19jb25maWcgbGlidm1hZiAibGli dm1hZiA+PSAyLjAuMCIgbGlidm1hZi5oIHZtYWZfaW5pdAorCitlbmFibGVkIGxpYnZtYWYgICAg ICAgICAgICYmIHsKKyAgICBlbmFibGVkIGxpYnZtYWZfZmlsdGVyICYmIHsKKyAgICAgICAgcmVx dWlyZV9wa2dfY29uZmlnIGxpYnZtYWYgImxpYnZtYWYgPj0gMi4wLjAiIGxpYnZtYWYuaCB2bWFm X2luaXQKKyAgICB9CisgICAgZW5hYmxlZCBsaWJ2bWFmX2N1ZGFfZmlsdGVyICYmIHsKKyAgICAg ICAgY2hlY2tfcGtnX2NvbmZpZyBsaWJ2bWFmX2N1ZGFfZmlsdGVyICJsaWJ2bWFmID49IDIuMC4w IiBsaWJ2bWFmX2N1ZGEuaCB2bWFmX2N1ZGFfc3RhdGVfaW5pdAorICAgIH0KK30KKwogZW5hYmxl ZCBsaWJ2b19hbXJ3YmVuYyAgICAmJiByZXF1aXJlIGxpYnZvX2FtcndiZW5jIHZvLWFtcndiZW5j L2VuY19pZi5oIEVfSUZfaW5pdCAtbHZvLWFtcndiZW5jCiBlbmFibGVkIGxpYnZvcmJpcyAgICAg ICAgICYmIHJlcXVpcmVfcGtnX2NvbmZpZyBsaWJ2b3JiaXMgdm9yYmlzIHZvcmJpcy9jb2RlYy5o IHZvcmJpc19pbmZvX2luaXQgJiYKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVxdWly ZV9wa2dfY29uZmlnIGxpYnZvcmJpc2VuYyB2b3JiaXNlbmMgdm9yYmlzL3ZvcmJpc2VuYy5oIHZv cmJpc19lbmNvZGVfaW5pdApkaWZmIC0tZ2l0IGEvZG9jL2ZpbHRlcnMudGV4aSBiL2RvYy9maWx0 ZXJzLnRleGkKaW5kZXggMTRhNmJlNDlhYy4uYzI1NDUwY2Y2YyAxMDA2NDQKLS0tIGEvZG9jL2Zp bHRlcnMudGV4aQorKysgYi9kb2MvZmlsdGVycy50ZXhpCkBAIC0xNjkyOCw2ICsxNjkyOCwzMiBA QCBmZm1wZWcgLWkgZGlzdG9ydGVkLm1wZyAtaSByZWZlcmVuY2UubWt2IC1sYXZmaSAiWzA6dl1z ZXR0Yj1BVlRCLHNldHB0cz1QVFMtU1RBUgogQGVuZCBleGFtcGxlCiBAZW5kIGl0ZW1pemUKIAor QHNlY3Rpb24gbGlidm1hZl9jdWRhCisKK1RoaXMgaXMgdGhlIENVREEgdmFyaWFudCBvZiB0aGUg QHJlZntsaWJ2bWFmfSBmaWx0ZXIuIEl0IG9ubHkgYWNjZXB0cyBDVURBIGZyYW1lcy4KKworSXQg cmVxdWlyZXMgTmV0ZmxpeCdzIHZtYWYgbGlicmFyeSAobGlidm1hZikgYXMgYSBwcmUtcmVxdWlz aXRlLgorQWZ0ZXIgaW5zdGFsbGluZyB0aGUgbGlicmFyeSBpdCBjYW4gYmUgZW5hYmxlZCB1c2lu ZzoKK0Bjb2Rley4vY29uZmlndXJlIC0tZW5hYmxlLW5vbmZyZWUgLS1lbmFibGUtZmZudmNvZGVj IC0tZW5hYmxlLWxpYnZtYWZ9LgorCitAc3Vic2VjdGlvbiBFeGFtcGxlcworQGl0ZW1pemUKKwor QGl0ZW0KK0Jhc2ljIHVzYWdlIHNob3dpbmcgQ1VWSUQgaGFyZHdhcmUgZGVjb2RpbmcgYW5kIENV REEgc2NhbGluZyB3aXRoIEByZWZ7c2NhbGVfY3VkYX06CitAZXhhbXBsZQorZmZtcGVnIFwKKyAg ICAtaHdhY2NlbCBjdWRhIC1od2FjY2VsX291dHB1dF9mb3JtYXQgY3VkYSAtY29kZWM6diBhdjFf Y3V2aWQgLWkgZGlzLm9idSBcCisgICAgLWh3YWNjZWwgY3VkYSAtaHdhY2NlbF9vdXRwdXRfZm9y bWF0IGN1ZGEgLWNvZGVjOnYgYXYxX2N1dmlkIC1pIHJlZi5vYnUgXAorICAgIC1maWx0ZXJfY29t cGxleCAiCisgICAgICAgIFswOnZdc2NhbGVfY3VkYT1mb3JtYXQ9eXV2NDIwcFtyZWZdOyBcCisg ICAgICAgIFsxOnZdc2NhbGVfY3VkYT1mb3JtYXQ9eXV2NDIwcFtkaXNdOyBcCisgICAgICAgIFtk aXNdW3JlZl1saWJ2bWFmX2N1ZGE9bG9nX2ZtdD1qc29uOmxvZ19wYXRoPW91dHB1dC5qc29uCisg ICAgIiBcCisgICAgLWYgbnVsbCAtCitAZW5kIGV4YW1wbGUKK0BlbmQgaXRlbWl6ZQorCiBAc2Vj dGlvbiBsaW1pdGRpZmYKIEFwcGx5IGxpbWl0ZWQgZGlmZmVyZW5jZSBmaWx0ZXIgdXNpbmcgc2Vj b25kIGFuZCBvcHRpb25hbGx5IHRoaXJkIHZpZGVvIHN0cmVhbS4KIApkaWZmIC0tZ2l0IGEvbGli YXZmaWx0ZXIvTWFrZWZpbGUgYi9saWJhdmZpbHRlci9NYWtlZmlsZQppbmRleCAyZmUwMDMzYjIx Li41N2Y1ODA5YWNiIDEwMDY0NAotLS0gYS9saWJhdmZpbHRlci9NYWtlZmlsZQorKysgYi9saWJh dmZpbHRlci9NYWtlZmlsZQpAQCAtMzYzLDYgKzM2Myw3IEBAIE9CSlMtJChDT05GSUdfTEVOU0NP UlJFQ1RJT05fRklMVEVSKSAgICAgICAgICs9IHZmX2xlbnNjb3JyZWN0aW9uLm8KIE9CSlMtJChD T05GSUdfTEVOU0ZVTl9GSUxURVIpICAgICAgICAgICAgICAgICs9IHZmX2xlbnNmdW4ubwogT0JK Uy0kKENPTkZJR19MSUJQTEFDRUJPX0ZJTFRFUikgICAgICAgICAgICAgKz0gdmZfbGlicGxhY2Vi by5vIHZ1bGthbi5vIHZ1bGthbl9maWx0ZXIubwogT0JKUy0kKENPTkZJR19MSUJWTUFGX0ZJTFRF UikgICAgICAgICAgICAgICAgKz0gdmZfbGlidm1hZi5vIGZyYW1lc3luYy5vCitPQkpTLSQoQ09O RklHX0xJQlZNQUZfQ1VEQV9GSUxURVIpICAgICAgICAgICArPSB2Zl9saWJ2bWFmLm8gZnJhbWVz eW5jLm8KIE9CSlMtJChDT05GSUdfTElNSVRESUZGX0ZJTFRFUikgICAgICAgICAgICAgICs9IHZm X2xpbWl0ZGlmZi5vIGZyYW1lc3luYy5vCiBPQkpTLSQoQ09ORklHX0xJTUlURVJfRklMVEVSKSAg ICAgICAgICAgICAgICArPSB2Zl9saW1pdGVyLm8KIE9CSlMtJChDT05GSUdfTE9PUF9GSUxURVIp ICAgICAgICAgICAgICAgICAgICs9IGZfbG9vcC5vCmRpZmYgLS1naXQgYS9saWJhdmZpbHRlci9h bGxmaWx0ZXJzLmMgYi9saWJhdmZpbHRlci9hbGxmaWx0ZXJzLmMKaW5kZXggZDQxODRkNmU4MC4u YWE0OTcwM2M2ZSAxMDA2NDQKLS0tIGEvbGliYXZmaWx0ZXIvYWxsZmlsdGVycy5jCisrKyBiL2xp YmF2ZmlsdGVyL2FsbGZpbHRlcnMuYwpAQCAtMzM5LDYgKzMzOSw3IEBAIGV4dGVybiBjb25zdCBB VkZpbHRlciBmZl92Zl9sZW5zY29ycmVjdGlvbjsKIGV4dGVybiBjb25zdCBBVkZpbHRlciBmZl92 Zl9sZW5zZnVuOwogZXh0ZXJuIGNvbnN0IEFWRmlsdGVyIGZmX3ZmX2xpYnBsYWNlYm87CiBleHRl cm4gY29uc3QgQVZGaWx0ZXIgZmZfdmZfbGlidm1hZjsKK2V4dGVybiBjb25zdCBBVkZpbHRlciBm Zl92Zl9saWJ2bWFmX2N1ZGE7CiBleHRlcm4gY29uc3QgQVZGaWx0ZXIgZmZfdmZfbGltaXRkaWZm OwogZXh0ZXJuIGNvbnN0IEFWRmlsdGVyIGZmX3ZmX2xpbWl0ZXI7CiBleHRlcm4gY29uc3QgQVZG aWx0ZXIgZmZfdmZfbG9vcDsKZGlmZiAtLWdpdCBhL2xpYmF2ZmlsdGVyL3ZmX2xpYnZtYWYuYyBi L2xpYmF2ZmlsdGVyL3ZmX2xpYnZtYWYuYwppbmRleCAyNTg2ZjM3ZDk5Li5lYzQyZDQ3MGNiIDEw MDY0NAotLS0gYS9saWJhdmZpbHRlci92Zl9saWJ2bWFmLmMKKysrIGIvbGliYXZmaWx0ZXIvdmZf bGlidm1hZi5jCkBAIC0yNCw2ICsyNCw4IEBACiAgKiBDYWxjdWxhdGUgdGhlIFZNQUYgYmV0d2Vl biB0d28gaW5wdXQgdmlkZW9zLgogICovCiAKKyNpbmNsdWRlICJjb25maWdfY29tcG9uZW50cy5o IgorCiAjaW5jbHVkZSA8bGlidm1hZi5oPgogCiAjaW5jbHVkZSAibGliYXZ1dGlsL2F2c3RyaW5n LmgiCkBAIC0zNiw2ICszOCwxMyBAQAogI2luY2x1ZGUgImludGVybmFsLmgiCiAjaW5jbHVkZSAi dmlkZW8uaCIKIAorI2lmIENPTkZJR19MSUJWTUFGX0NVREFfRklMVEVSCisjaW5jbHVkZSA8bGli dm1hZl9jdWRhLmg+CisKKyNpbmNsdWRlICJsaWJhdnV0aWwvaHdjb250ZXh0LmgiCisjaW5jbHVk ZSAibGliYXZ1dGlsL2h3Y29udGV4dF9jdWRhX2ludGVybmFsLmgiCisjZW5kaWYKKwogdHlwZWRl ZiBzdHJ1Y3QgTElCVk1BRkNvbnRleHQgewogICAgIGNvbnN0IEFWQ2xhc3MgKmNsYXNzOwogICAg IEZGRnJhbWVTeW5jIGZzOwpAQCAtNTgsNiArNjcsOSBAQCB0eXBlZGVmIHN0cnVjdCBMSUJWTUFG Q29udGV4dCB7CiAgICAgdW5zaWduZWQgbW9kZWxfY250OwogICAgIHVuc2lnbmVkIGZyYW1lX2Nu dDsKICAgICB1bnNpZ25lZCBicGM7CisjaWYgQ09ORklHX0xJQlZNQUZfQ1VEQV9GSUxURVIKKyAg ICBWbWFmQ3VkYVN0YXRlICpjdV9zdGF0ZTsKKyNlbmRpZgogfSBMSUJWTUFGQ29udGV4dDsKIAog I2RlZmluZSBPRkZTRVQoeCkgb2Zmc2V0b2YoTElCVk1BRkNvbnRleHQsIHgpCkBAIC03MTAsMyAr NzIyLDIwMSBAQCBjb25zdCBBVkZpbHRlciBmZl92Zl9saWJ2bWFmID0gewogICAgIEZJTFRFUl9P VVRQVVRTKGxpYnZtYWZfb3V0cHV0cyksCiAgICAgRklMVEVSX1BJWEZNVFNfQVJSQVkocGl4X2Zt dHMpLAogfTsKKworI2lmIENPTkZJR19MSUJWTUFGX0NVREFfRklMVEVSCitzdGF0aWMgY29uc3Qg ZW51bSBBVlBpeGVsRm9ybWF0IHN1cHBvcnRlZF9mb3JtYXRzW10gPSB7CisgICAgQVZfUElYX0ZN VF9ZVVY0MjBQLAorICAgIEFWX1BJWF9GTVRfWVVWNDQ0UDE2LAorfTsKKworc3RhdGljIGludCBm b3JtYXRfaXNfc3VwcG9ydGVkKGVudW0gQVZQaXhlbEZvcm1hdCBmbXQpCit7CisgICAgaW50IGk7 CisKKyAgICBmb3IgKGkgPSAwOyBpIDwgRkZfQVJSQVlfRUxFTVMoc3VwcG9ydGVkX2Zvcm1hdHMp OyBpKyspCisgICAgICAgIGlmIChzdXBwb3J0ZWRfZm9ybWF0c1tpXSA9PSBmbXQpCisgICAgICAg ICAgICByZXR1cm4gMTsKKyAgICByZXR1cm4gMDsKK30KKworc3RhdGljIGludCBjb25maWdfcHJv cHNfY3VkYShBVkZpbHRlckxpbmsgKm91dGxpbmspCit7CisgICAgaW50IGVycjsKKyAgICBBVkZp bHRlckNvbnRleHQgKmN0eCA9IG91dGxpbmstPnNyYzsKKyAgICBMSUJWTUFGQ29udGV4dCAqcyA9 IGN0eC0+cHJpdjsKKyAgICBBVkZpbHRlckxpbmsgKmlubGluayA9IGN0eC0+aW5wdXRzWzBdOwor ICAgIEFWSFdGcmFtZXNDb250ZXh0ICpmcmFtZXNfY3R4ID0gKEFWSFdGcmFtZXNDb250ZXh0Kikg aW5saW5rLT5od19mcmFtZXNfY3R4LT5kYXRhOworICAgIEFWQ1VEQURldmljZUNvbnRleHQgKmRl dmljZV9od2N0eCA9IGZyYW1lc19jdHgtPmRldmljZV9jdHgtPmh3Y3R4OworICAgIENVY29udGV4 dCBjdV9jdHggPSBkZXZpY2VfaHdjdHgtPmN1ZGFfY3R4OworICAgIGNvbnN0IEFWUGl4Rm10RGVz Y3JpcHRvciAqZGVzYyA9IGF2X3BpeF9mbXRfZGVzY19nZXQoZnJhbWVzX2N0eC0+c3dfZm9ybWF0 KTsKKworICAgIFZtYWZDb25maWd1cmF0aW9uIGNmZyA9IHsKKyAgICAgICAgLmxvZ19sZXZlbCA9 IGxvZ19sZXZlbF9tYXAoYXZfbG9nX2dldF9sZXZlbCgpKSwKKyAgICAgICAgLm5fc3Vic2FtcGxl ID0gcy0+bl9zdWJzYW1wbGUsCisgICAgICAgIC5uX3RocmVhZHMgPSBzLT5uX3RocmVhZHMsCisg ICAgfTsKKworICAgIFZtYWZDdWRhUGljdHVyZUNvbmZpZ3VyYXRpb24gY3VkYV9waWNfY2ZnID0g eworICAgICAgICAucGljX3BhcmFtcyA9IHsKKyAgICAgICAgICAgIC5icGMgPSBkZXNjLT5jb21w WzBdLmRlcHRoLAorICAgICAgICAgICAgLncgPSBpbmxpbmstPncsCisgICAgICAgICAgICAuaCA9 IGlubGluay0+aCwKKyAgICAgICAgICAgIC5waXhfZm10ID0gcGl4X2ZtdF9tYXAoZnJhbWVzX2N0 eC0+c3dfZm9ybWF0KSwKKyAgICAgICAgfSwKKyAgICAgICAgLnBpY19wcmVhbGxvY19tZXRob2Qg PSBWTUFGX0NVREFfUElDVFVSRV9QUkVBTExPQ0FUSU9OX01FVEhPRF9ERVZJQ0UsCisgICAgfTsK KworICAgIFZtYWZDdWRhQ29uZmlndXJhdGlvbiBjdWRhX2NmZyA9IHsKKyAgICAgICAgLmN1X2N0 eCA9IGN1X2N0eCwKKyAgICB9OworCisgICAgaWYgKCFmb3JtYXRfaXNfc3VwcG9ydGVkKGZyYW1l c19jdHgtPnN3X2Zvcm1hdCkpIHsKKyAgICAgICAgYXZfbG9nKHMsIEFWX0xPR19FUlJPUiwKKyAg ICAgICAgICAgICAgICJVbnN1cHBvcnRlZCBpbnB1dCBmb3JtYXQ6ICVzXG4iLCBkZXNjLT5uYW1l KTsKKyAgICAgICAgcmV0dXJuIEFWRVJST1IoRUlOVkFMKTsKKyAgICB9CisKKyAgICBlcnIgPSB2 bWFmX2luaXQoJnMtPnZtYWYsIGNmZyk7CisgICAgaWYgKGVycikKKyAgICAgICAgcmV0dXJuIEFW RVJST1IoRUlOVkFMKTsKKworICAgIGVyciA9IHZtYWZfY3VkYV9zdGF0ZV9pbml0KCZzLT5jdV9z dGF0ZSwgY3VkYV9jZmcpOworICAgIGlmIChlcnIpCisgICAgICAgIHJldHVybiBBVkVSUk9SKEVJ TlZBTCk7CisKKyAgICBlcnIgPSB2bWFmX2N1ZGFfaW1wb3J0X3N0YXRlKHMtPnZtYWYsIHMtPmN1 X3N0YXRlKTsKKyAgICBpZiAoZXJyKQorICAgICAgICByZXR1cm4gQVZFUlJPUihFSU5WQUwpOwor CisgICAgZXJyID0gdm1hZl9jdWRhX3ByZWFsbG9jYXRlX3BpY3R1cmVzKHMtPnZtYWYsIGN1ZGFf cGljX2NmZyk7CisgICAgaWYgKGVyciA8IDApCisgICAgICAgIHJldHVybiBlcnI7CisKKyAgICBl cnIgPSBwYXJzZV9kZXByZWNhdGVkX29wdGlvbnMoY3R4KTsKKyAgICBpZiAoZXJyKQorICAgICAg ICByZXR1cm4gZXJyOworCisgICAgZXJyID0gcGFyc2VfbW9kZWxzKGN0eCk7CisgICAgaWYgKGVy cikKKyAgICAgICAgcmV0dXJuIGVycjsKKworICAgIGVyciA9IHBhcnNlX2ZlYXR1cmVzKGN0eCk7 CisgICAgaWYgKGVycikKKyAgICAgICAgcmV0dXJuIGVycjsKKworICAgIHJldHVybiBjb25maWdf b3V0cHV0KG91dGxpbmspOworfQorCitzdGF0aWMgaW50IGNvcHlfcGljdHVyZV9kYXRhX2N1ZGEo Vm1hZkNvbnRleHQqIHZtYWYsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQVZD VURBRGV2aWNlQ29udGV4dCogZGV2aWNlX2h3Y3R4LAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIEFWRnJhbWUqIHNyYywgVm1hZlBpY3R1cmUqIGRzdCwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBlbnVtIEFWUGl4ZWxGb3JtYXQgcGl4X2ZtdCkKK3sKKyAgICBj b25zdCBBVlBpeEZtdERlc2NyaXB0b3IgKnBpeF9kZXNjID0gYXZfcGl4X2ZtdF9kZXNjX2dldChw aXhfZm10KTsKKyAgICBDdWRhRnVuY3Rpb25zICpjdSA9IGRldmljZV9od2N0eC0+aW50ZXJuYWwt PmN1ZGFfZGw7CisKKyAgICBDVURBX01FTUNQWTJEIG0gPSB7CisgICAgICAgIC5zcmNNZW1vcnlU eXBlID0gQ1VfTUVNT1JZVFlQRV9ERVZJQ0UsCisgICAgICAgIC5kc3RNZW1vcnlUeXBlID0gQ1Vf TUVNT1JZVFlQRV9ERVZJQ0UsCisgICAgfTsKKworICAgIGludCBlcnIgPSB2bWFmX2N1ZGFfZmV0 Y2hfcHJlYWxsb2NhdGVkX3BpY3R1cmUodm1hZiwgZHN0KTsKKyAgICBpZiAoZXJyKQorICAgICAg ICByZXR1cm4gQVZFUlJPUihFTk9NRU0pOworCisgICAgZXJyID0gY3UtPmN1Q3R4UHVzaEN1cnJl bnQoZGV2aWNlX2h3Y3R4LT5jdWRhX2N0eCk7CisgICAgaWYgKGVycikKKyAgICAgICAgcmV0dXJu IEFWRVJST1JfRVhURVJOQUw7CisKKyAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgcGl4X2Rl c2MtPm5iX2NvbXBvbmVudHM7IGkrKykgeworICAgICAgICBtLnNyY0RldmljZSA9IChDVWRldmlj ZXB0cikgc3JjLT5kYXRhW2ldOworICAgICAgICBtLnNyY1BpdGNoID0gc3JjLT5saW5lc2l6ZVtp XTsKKyAgICAgICAgbS5kc3REZXZpY2UgPSAoQ1VkZXZpY2VwdHIpIGRzdC0+ZGF0YVtpXTsKKyAg ICAgICAgbS5kc3RQaXRjaCA9IGRzdC0+c3RyaWRlW2ldOworICAgICAgICBtLldpZHRoSW5CeXRl cyA9IGRzdC0+d1tpXSAqICgoZHN0LT5icGMgKyA3KSAvIDgpOworICAgICAgICBtLkhlaWdodCA9 IGRzdC0+aFtpXTsKKworICAgICAgICBlcnIgPSBjdS0+Y3VNZW1jcHkyRCgmbSk7CisgICAgICAg IGlmIChlcnIpCisgICAgICAgICAgICByZXR1cm4gQVZFUlJPUl9FWFRFUk5BTDsKKyAgICAgICAg YnJlYWs7CisgICAgfQorCisgICAgZXJyID0gY3UtPmN1Q3R4UG9wQ3VycmVudChOVUxMKTsKKyAg ICBpZiAoZXJyKQorICAgICAgICByZXR1cm4gQVZFUlJPUl9FWFRFUk5BTDsKKworICAgIHJldHVy biAwOworfQorCitzdGF0aWMgaW50IGRvX3ZtYWZfY3VkYShGRkZyYW1lU3luYyogZnMpCit7Cisg ICAgQVZGaWx0ZXJDb250ZXh0KiBjdHggPSBmcy0+cGFyZW50OworICAgIExJQlZNQUZDb250ZXh0 KiBzID0gY3R4LT5wcml2OworICAgIEFWRmlsdGVyTGluayAqaW5saW5rID0gY3R4LT5pbnB1dHNb MF07CisgICAgQVZIV0ZyYW1lc0NvbnRleHQgKmZyYW1lc19jdHggPSAoQVZIV0ZyYW1lc0NvbnRl eHQqKSBpbmxpbmstPmh3X2ZyYW1lc19jdHgtPmRhdGE7CisgICAgQVZDVURBRGV2aWNlQ29udGV4 dCAqZGV2aWNlX2h3Y3R4ID0gZnJhbWVzX2N0eC0+ZGV2aWNlX2N0eC0+aHdjdHg7CisgICAgVm1h ZlBpY3R1cmUgcGljX3JlZiwgcGljX2Rpc3Q7CisgICAgQVZGcmFtZSAqcmVmLCAqZGlzdDsKKwor ICAgIGludCBlcnIgPSAwOworCisgICAgZXJyID0gZmZfZnJhbWVzeW5jX2R1YWxpbnB1dF9nZXQo ZnMsICZkaXN0LCAmcmVmKTsKKyAgICBpZiAoZXJyIDwgMCkKKyAgICAgICAgcmV0dXJuIGVycjsK KyAgICBpZiAoY3R4LT5pc19kaXNhYmxlZCB8fCAhcmVmKQorICAgICAgICByZXR1cm4gZmZfZmls dGVyX2ZyYW1lKGN0eC0+b3V0cHV0c1swXSwgZGlzdCk7CisKKyAgICBlcnIgPSBjb3B5X3BpY3R1 cmVfZGF0YV9jdWRhKHMtPnZtYWYsIGRldmljZV9od2N0eCwgcmVmLCAmcGljX3JlZiwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZyYW1lc19jdHgtPnN3X2Zvcm1hdCk7CisgICAg aWYgKGVycikgeworICAgICAgICBhdl9sb2cocywgQVZfTE9HX0VSUk9SLCAicHJvYmxlbSBkdXJp bmcgY29weV9waWN0dXJlX2RhdGFfY3VkYS5cbiIpOworICAgICAgICByZXR1cm4gQVZFUlJPUihF Tk9NRU0pOworICAgIH0KKworICAgIGVyciA9IGNvcHlfcGljdHVyZV9kYXRhX2N1ZGEocy0+dm1h ZiwgZGV2aWNlX2h3Y3R4LCBkaXN0LCAmcGljX2Rpc3QsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBmcmFtZXNfY3R4LT5zd19mb3JtYXQpOworICAgIGlmIChlcnIpIHsKKyAgICAg ICAgYXZfbG9nKHMsIEFWX0xPR19FUlJPUiwgInByb2JsZW0gZHVyaW5nIGNvcHlfcGljdHVyZV9k YXRhX2N1ZGEuXG4iKTsKKyAgICAgICAgcmV0dXJuIEFWRVJST1IoRU5PTUVNKTsKKyAgICB9CisK KyAgICBlcnIgPSB2bWFmX3JlYWRfcGljdHVyZXMocy0+dm1hZiwgJnBpY19yZWYsICZwaWNfZGlz dCwgcy0+ZnJhbWVfY250KyspOworICAgIGlmIChlcnIpIHsKKyAgICAgICAgYXZfbG9nKHMsIEFW X0xPR19FUlJPUiwgInByb2JsZW0gZHVyaW5nIHZtYWZfcmVhZF9waWN0dXJlcy5cbiIpOworICAg ICAgICByZXR1cm4gQVZFUlJPUihFSU5WQUwpOworICAgIH0KKworICAgIHJldHVybiBmZl9maWx0 ZXJfZnJhbWUoY3R4LT5vdXRwdXRzWzBdLCBkaXN0KTsKK30KKworc3RhdGljIGF2X2NvbGQgaW50 IGluaXRfY3VkYShBVkZpbHRlckNvbnRleHQgKmN0eCkKK3sKKyAgICBMSUJWTUFGQ29udGV4dCAq cyA9IGN0eC0+cHJpdjsKKyAgICBzLT5mcy5vbl9ldmVudCA9IGRvX3ZtYWZfY3VkYTsKKyAgICBy ZXR1cm4gMDsKK30KKworc3RhdGljIGNvbnN0IEFWRmlsdGVyUGFkIGxpYnZtYWZfb3V0cHV0c19j dWRhW10gPSB7CisgICAgeworICAgICAgICAubmFtZSAgICAgICAgID0gImRlZmF1bHQiLAorICAg ICAgICAudHlwZSAgICAgICAgID0gQVZNRURJQV9UWVBFX1ZJREVPLAorICAgICAgICAuY29uZmln X3Byb3BzID0gY29uZmlnX3Byb3BzX2N1ZGEsCisgICAgfSwKK307CisKK2NvbnN0IEFWRmlsdGVy IGZmX3ZmX2xpYnZtYWZfY3VkYSA9IHsKKyAgICAubmFtZSAgICAgICAgICAgPSAibGlidm1hZl9j dWRhIiwKKyAgICAuZGVzY3JpcHRpb24gICAgPSBOVUxMX0lGX0NPTkZJR19TTUFMTCgiQ2FsY3Vs YXRlIHRoZSBWTUFGIGJldHdlZW4gdHdvIHZpZGVvIHN0cmVhbXMuIiksCisgICAgLnByZWluaXQg ICAgICAgID0gbGlidm1hZl9mcmFtZXN5bmNfcHJlaW5pdCwKKyAgICAuaW5pdCAgICAgICAgICAg PSBpbml0X2N1ZGEsCisgICAgLnVuaW5pdCAgICAgICAgID0gdW5pbml0LAorICAgIC5hY3RpdmF0 ZSAgICAgICA9IGFjdGl2YXRlLAorICAgIC5wcml2X3NpemUgICAgICA9IHNpemVvZihMSUJWTUFG Q29udGV4dCksCisgICAgLnByaXZfY2xhc3MgICAgID0gJmxpYnZtYWZfY2xhc3MsCisgICAgRklM VEVSX0lOUFVUUyhsaWJ2bWFmX2lucHV0cyksCisgICAgRklMVEVSX09VVFBVVFMobGlidm1hZl9v dXRwdXRzX2N1ZGEpLAorICAgIEZJTFRFUl9TSU5HTEVfUElYRk1UKEFWX1BJWF9GTVRfQ1VEQSks CisgICAgLmZsYWdzX2ludGVybmFsID0gRkZfRklMVEVSX0ZMQUdfSFdGUkFNRV9BV0FSRSwKK307 CisjZW5kaWYKLS0gCjIuMjQuMyAoQXBwbGUgR2l0LTEyOCkKCg== --000000000000cae4090605564760 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". --000000000000cae4090605564760--