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 B299844B8E for ; Fri, 6 Jan 2023 15:43:51 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6C20A68BCEB; Fri, 6 Jan 2023 17:43:50 +0200 (EET) Received: from mail.frobbit.se (mail.frobbit.se [85.30.129.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6244C68BBCC for ; Fri, 6 Jan 2023 17:43:44 +0200 (EET) Received: from laptop.lan (h-79-136-39-105.A258.priv.bahnhof.se [79.136.39.105]) by mail.frobbit.se (Postfix) with ESMTPSA id EEAA21FEB0 for ; Fri, 6 Jan 2023 16:43:43 +0100 (CET) Message-ID: <10f8c277a22ade5c67d0c5c9e2dc1dd7d619a8a7.camel@haerdin.se> From: Tomas =?ISO-8859-1?Q?H=E4rdin?= To: FFmpeg development discussions and patches Date: Fri, 06 Jan 2023 16:43:43 +0100 In-Reply-To: <1a215429e2ac714005e4bc2ccb08c0c3d0bf9356.camel@haerdin.se> References: <1a215429e2ac714005e4bc2ccb08c0c3d0bf9356.camel@haerdin.se> Content-Type: multipart/mixed; boundary="=-J3gKXD1WgL1gt/cTniEQ" User-Agent: Evolution 3.38.3-1+deb11u1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavc/mediacodecenc: Probe actually supported color formats using JNI 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: --=-J3gKXD1WgL1gt/cTniEQ Content-Type: text/plain Content-Transfer-Encoding: 7bit This should be faster than opening the encoder several times. /Tomas --=-J3gKXD1WgL1gt/cTniEQ Content-Disposition: attachment; filename*0=0002-lavc-mediacodecenc-Probe-actually-supported-color-fo.pat; filename*1=ch Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0002-lavc-mediacodecenc-Probe-actually-supported-color-fo.patch"; charset="UTF-8" RnJvbSA0NGMzNDdmNWEyYjYxNjBhYmQ4ZmMwOWEwMjU1ZWUyMWE3YmE2ZWU0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/VG9tYXM9MjBIPUMzPUE0cmRpbj89IDxnaXRA aGFlcmRpbi5zZT4KRGF0ZTogV2VkLCA0IEphbiAyMDIzIDE2OjI3OjI2ICswMTAwClN1YmplY3Q6 IFtQQVRDSCAyLzJdIGxhdmMvbWVkaWFjb2RlY2VuYzogUHJvYmUgYWN0dWFsbHkgc3VwcG9ydGVk IGNvbG9yCiBmb3JtYXRzIHVzaW5nIEpOSQoKRmFsbCBiYWNrIG9uIHRyeWluZyB0byBvcGVuIHRo ZSBlbmNvZGVyIGlmIEpOSSBkb2Vzbid0IHdvcmsuCgpUaGlzIHBhdGNoIGhhcyBiZWVuIHJlbGVh c2VkIGJ5IEVwaWMgR2FtZXMnIGxlZ2FsIGRlcGFydG1lbnQuCi0tLQogbGliYXZjb2RlYy9tZWRp YWNvZGVjX3dyYXBwZXIuYyB8IDkzICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwog bGliYXZjb2RlYy9tZWRpYWNvZGVjX3dyYXBwZXIuaCB8IDE1ICsrKysrKwogbGliYXZjb2RlYy9t ZWRpYWNvZGVjZW5jLmMgICAgICB8IDI3ICsrKysrKysrKy0KIDMgZmlsZXMgY2hhbmdlZCwgMTM0 IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9saWJhdmNvZGVjL21l ZGlhY29kZWNfd3JhcHBlci5jIGIvbGliYXZjb2RlYy9tZWRpYWNvZGVjX3dyYXBwZXIuYwppbmRl eCA0ZDZlOTQ4N2I4Li5hYzc3NjcyMDEzIDEwMDY0NAotLS0gYS9saWJhdmNvZGVjL21lZGlhY29k ZWNfd3JhcHBlci5jCisrKyBiL2xpYmF2Y29kZWMvbWVkaWFjb2RlY193cmFwcGVyLmMKQEAgLTIs NiArMiw3IEBACiAgKiBBbmRyb2lkIE1lZGlhQ29kZWMgV3JhcHBlcgogICoKICAqIENvcHlyaWdo dCAoYykgMjAxNS0yMDE2IE1hdHRoaWV1IEJvdXJvbiA8bWF0dGhpZXUuYm91cm9uIHN0dXBlZmxp eC5jb20+CisgKiBNb2RpZmljYXRpb25zIGJ5IEVwaWMgR2FtZXMsIEluYy4sIDIwMjMuCiAgKgog ICogVGhpcyBmaWxlIGlzIHBhcnQgb2YgRkZtcGVnLgogICoKQEAgLTE3Niw2ICsxNzcsNyBAQCBz dHJ1Y3QgSk5JQU1lZGlhQ29kZWNGaWVsZHMgewogICAgIGptZXRob2RJRCByZWxlYXNlX2lkOwog CiAgICAgam1ldGhvZElEIGdldF9vdXRwdXRfZm9ybWF0X2lkOworICAgIGptZXRob2RJRCBnZXRf Y29kZWNfaW5mb19pZDsKIAogICAgIGptZXRob2RJRCBkZXF1ZXVlX2lucHV0X2J1ZmZlcl9pZDsK ICAgICBqbWV0aG9kSUQgcXVldWVfaW5wdXRfYnVmZmVyX2lkOwpAQCAtMjI4LDYgKzIzMCw3IEBA IHN0YXRpYyBjb25zdCBzdHJ1Y3QgRkZKbmlGaWVsZCBqbmlfYW1lZGlhY29kZWNfbWFwcGluZ1td ID0gewogICAgICAgICB7ICJhbmRyb2lkL21lZGlhL01lZGlhQ29kZWMiLCAicmVsZWFzZSIsICIo KVYiLCBGRl9KTklfTUVUSE9ELCBvZmZzZXRvZihzdHJ1Y3QgSk5JQU1lZGlhQ29kZWNGaWVsZHMs IHJlbGVhc2VfaWQpLCAxIH0sCiAKICAgICAgICAgeyAiYW5kcm9pZC9tZWRpYS9NZWRpYUNvZGVj IiwgImdldE91dHB1dEZvcm1hdCIsICIoKUxhbmRyb2lkL21lZGlhL01lZGlhRm9ybWF0OyIsIEZG X0pOSV9NRVRIT0QsIG9mZnNldG9mKHN0cnVjdCBKTklBTWVkaWFDb2RlY0ZpZWxkcywgZ2V0X291 dHB1dF9mb3JtYXRfaWQpLCAxIH0sCisgICAgICAgIHsgImFuZHJvaWQvbWVkaWEvTWVkaWFDb2Rl YyIsICJnZXRDb2RlY0luZm8iLCAiKClMYW5kcm9pZC9tZWRpYS9NZWRpYUNvZGVjSW5mbzsiLCBG Rl9KTklfTUVUSE9ELCBvZmZzZXRvZihzdHJ1Y3QgSk5JQU1lZGlhQ29kZWNGaWVsZHMsIGdldF9j b2RlY19pbmZvX2lkKSwgMSB9LAogCiAgICAgICAgIHsgImFuZHJvaWQvbWVkaWEvTWVkaWFDb2Rl YyIsICJkZXF1ZXVlSW5wdXRCdWZmZXIiLCAiKEopSSIsIEZGX0pOSV9NRVRIT0QsIG9mZnNldG9m KHN0cnVjdCBKTklBTWVkaWFDb2RlY0ZpZWxkcywgZGVxdWV1ZV9pbnB1dF9idWZmZXJfaWQpLCAx IH0sCiAgICAgICAgIHsgImFuZHJvaWQvbWVkaWEvTWVkaWFDb2RlYyIsICJxdWV1ZUlucHV0QnVm ZmVyIiwgIihJSUlKSSlWIiwgRkZfSk5JX01FVEhPRCwgb2Zmc2V0b2Yoc3RydWN0IEpOSUFNZWRp YUNvZGVjRmllbGRzLCBxdWV1ZV9pbnB1dF9idWZmZXJfaWQpLCAxIH0sCkBAIC02MDQsNiArNjA3 LDk2IEBAIGRvbmU6CiAgICAgcmV0dXJuIG5hbWU7CiB9CiAKK2ludCBmZl9BTWVkaWFDb2RlY19j b2xvcl9mb3JtYXRzX2ludGVyc2VjdChGRkFNZWRpYUNvZGVjICpjb2RlYywgY29uc3QgY2hhciAq bWltZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBp bnQgKmluX2Zvcm1hdHMsIGludCBuaW5fZm9ybWF0cywKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBpbnQgKm91dF9mb3JtYXRzLCB2b2lkICpsb2dfY3R4KQorewor ICAgIEZGQU1lZGlhQ29kZWNKbmkgKmpuaV9jb2RlYyA9IChGRkFNZWRpYUNvZGVjSm5pKiljb2Rl YzsKKyAgICBqb2JqZWN0IGluZm8gPSBOVUxMOworICAgIGpvYmplY3QgY2FwYWJpbGl0aWVzID0g TlVMTDsKKyAgICBKTklFbnYgKmVudiA9IE5VTEw7CisgICAgamludEFycmF5IGNvbG9yX2Zvcm1h dHMgPSBOVUxMOworICAgIGludCBjb2xvcl9jb3VudCwgcmV0LCAqZWxlbXM7CisgICAgamJvb2xl YW4gaXNfY29weTsKKyAgICBqc3RyaW5nIGptaW1lID0gTlVMTDsKKyAgICBzdHJ1Y3QgSk5JQU1l ZGlhQ29kZWNGaWVsZHMgamZpZWxkcyA9IHsgMCB9OworICAgIHN0cnVjdCBKTklBTWVkaWFDb2Rl Y0xpc3RGaWVsZHMgamZpZWxkczIgPSB7IDAgfTsKKworICAgIC8vIG1ha2Ugc3VyZSB3ZSBoYXZl IGEgSlZNCisgICAgSk5JX0dFVF9FTlZfT1JfUkVUVVJOKGVudiwgbG9nX2N0eCwgLTEpOworCisg ICAgLy8gZ3JhYiBtYXBwaW5ncworICAgIGlmICgocmV0ID0gZmZfam5pX2luaXRfamZpZWxkcyhl bnYsICZqZmllbGRzLCBqbmlfYW1lZGlhY29kZWNfbWFwcGluZywgMCwgbG9nX2N0eCkpIDwgMCkg eworICAgICAgICBnb3RvIGRvbmU7CisgICAgfQorCisgICAgaWYgKChyZXQgPSBmZl9qbmlfaW5p dF9qZmllbGRzKGVudiwgJmpmaWVsZHMyLCBqbmlfYW1lZGlhY29kZWNsaXN0X21hcHBpbmcsIDAs IGxvZ19jdHgpKSA8IDApIHsKKyAgICAgICAgZ290byBkb25lOworICAgIH0KKworICAgIC8vIGNv ZGVjLmdldENvZGVjSW5mbygpLmdldENhcGFiaWxpdGllc0ZvclR5cGUobWltZSkuY29sb3JGb3Jt YXRzCisgICAgcmV0ID0gLTE7CisgICAgaW5mbyA9ICgqZW52KS0+Q2FsbE9iamVjdE1ldGhvZChl bnYsIGpuaV9jb2RlYy0+b2JqZWN0LCBqZmllbGRzLmdldF9jb2RlY19pbmZvX2lkKTsKKyAgICBp ZiAoZmZfam5pX2V4Y2VwdGlvbl9jaGVjayhlbnYsIDEsIGxvZ19jdHgpIDwgMCkgeworICAgICAg ICBnb3RvIGRvbmU7CisgICAgfQorCisgICAgLy8gY29udmVydCBjb25zdCBjaGFyKiB0byBqYXZh LmxhbmcuU3RyaW5nCisgICAgam1pbWUgPSBmZl9qbmlfdXRmX2NoYXJzX3RvX2pzdHJpbmcoZW52 LCBtaW1lLCBsb2dfY3R4KTsKKyAgICBpZiAoIWptaW1lKSB7CisgICAgICAgIGdvdG8gZG9uZTsK KyAgICB9CisKKyAgICBjYXBhYmlsaXRpZXMgPSAoKmVudiktPkNhbGxPYmplY3RNZXRob2QoZW52 LCBpbmZvLCBqZmllbGRzMi5nZXRfY29kZWNfY2FwYWJpbGl0aWVzX2lkLCBqbWltZSk7CisgICAg aWYgKGZmX2puaV9leGNlcHRpb25fY2hlY2soZW52LCAxLCBsb2dfY3R4KSA8IDApIHsKKyAgICAg ICAgZ290byBkb25lOworICAgIH0KKworICAgIGNvbG9yX2Zvcm1hdHMgPSAoKmVudiktPkdldE9i amVjdEZpZWxkKGVudiwgY2FwYWJpbGl0aWVzLCBqZmllbGRzMi5jb2xvcl9mb3JtYXRzX2lkKTsK KyAgICBpZiAoZmZfam5pX2V4Y2VwdGlvbl9jaGVjayhlbnYsIDEsIGxvZ19jdHgpIDwgMCkgewor ICAgICAgICBnb3RvIGRvbmU7CisgICAgfQorCisgICAgY29sb3JfY291bnQgPSAoKmVudiktPkdl dEFycmF5TGVuZ3RoKGVudiwgY29sb3JfZm9ybWF0cyk7CisgICAgZWxlbXMgPSAoKmVudiktPkdl dEludEFycmF5RWxlbWVudHMoZW52LCBjb2xvcl9mb3JtYXRzLCAmaXNfY29weSk7CisgICAgcmV0 ID0gMDsKKworICAgIC8vIG91dF9mb3JtYXRzID0gaW50ZXJzZWN0KGluX2Zvcm1hdHMsIGVsZW1z KQorICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbmluX2Zvcm1hdHM7IGkrKykgeworICAgICAgICBm b3IgKGludCBqID0gMDsgaiA8IGNvbG9yX2NvdW50OyBqKyspIHsKKyAgICAgICAgICAgIGlmIChl bGVtc1tqXSA9PSBpbl9mb3JtYXRzW2ldKSB7CisgICAgICAgICAgICAgICAgb3V0X2Zvcm1hdHNb cmV0KytdID0gaW5fZm9ybWF0c1tpXTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAg ICAgIH0KKyAgICAgICAgfQorICAgIH0KKworICAgICgqZW52KS0+UmVsZWFzZUludEFycmF5RWxl bWVudHMoZW52LCBjb2xvcl9mb3JtYXRzLCBlbGVtcywgSk5JX0FCT1JUKTsKKworZG9uZToKKyAg ICAvLyBjbGVhbiB1cAorICAgIGlmIChqbWltZSkgeworICAgICAgICAoKmVudiktPkRlbGV0ZUxv Y2FsUmVmKGVudiwgam1pbWUpOworICAgIH0KKworICAgIGlmIChjb2xvcl9mb3JtYXRzKSB7Cisg ICAgICAgICgqZW52KS0+RGVsZXRlTG9jYWxSZWYoZW52LCBjb2xvcl9mb3JtYXRzKTsKKyAgICB9 CisKKyAgICBpZiAoY2FwYWJpbGl0aWVzKSB7CisgICAgICAgICgqZW52KS0+RGVsZXRlTG9jYWxS ZWYoZW52LCBjYXBhYmlsaXRpZXMpOworICAgIH0KKworICAgIGlmIChpbmZvKSB7CisgICAgICAg ICgqZW52KS0+RGVsZXRlTG9jYWxSZWYoZW52LCBpbmZvKTsKKyAgICB9CisKKyAgICBmZl9qbmlf cmVzZXRfamZpZWxkcyhlbnYsICZqZmllbGRzLCBqbmlfYW1lZGlhY29kZWNfbWFwcGluZywgMCwg bG9nX2N0eCk7CisgICAgZmZfam5pX3Jlc2V0X2pmaWVsZHMoZW52LCAmamZpZWxkczIsIGpuaV9h bWVkaWFjb2RlY2xpc3RfbWFwcGluZywgMCwgbG9nX2N0eCk7CisKKyAgICByZXR1cm4gcmV0Owor fQorCiBzdGF0aWMgRkZBTWVkaWFGb3JtYXQgKm1lZGlhZm9ybWF0X2puaV9uZXcodm9pZCkKIHsK ICAgICBKTklFbnYgKmVudiA9IE5VTEw7CmRpZmYgLS1naXQgYS9saWJhdmNvZGVjL21lZGlhY29k ZWNfd3JhcHBlci5oIGIvbGliYXZjb2RlYy9tZWRpYWNvZGVjX3dyYXBwZXIuaAppbmRleCAxYjgx ZTZkYjg0Li5mMDQyN2YzMjg3IDEwMDY0NAotLS0gYS9saWJhdmNvZGVjL21lZGlhY29kZWNfd3Jh cHBlci5oCisrKyBiL2xpYmF2Y29kZWMvbWVkaWFjb2RlY193cmFwcGVyLmgKQEAgLTIsNiArMiw3 IEBACiAgKiBBbmRyb2lkIE1lZGlhQ29kZWMgV3JhcHBlcgogICoKICAqIENvcHlyaWdodCAoYykg MjAxNS0yMDE2IE1hdHRoaWV1IEJvdXJvbiA8bWF0dGhpZXUuYm91cm9uIHN0dXBlZmxpeC5jb20+ CisgKiBNb2RpZmljYXRpb25zIGJ5IEVwaWMgR2FtZXMsIEluYy4sIDIwMjMuCiAgKgogICogVGhp cyBmaWxlIGlzIHBhcnQgb2YgRkZtcGVnLgogICoKQEAgLTIzMCw2ICsyMzEsMjAgQEAgRkZBTWVk aWFDb2RlYyogZmZfQU1lZGlhQ29kZWNfY3JlYXRlQ29kZWNCeU5hbWUoY29uc3QgY2hhciAqbmFt ZSwgaW50IG5kayk7CiBGRkFNZWRpYUNvZGVjKiBmZl9BTWVkaWFDb2RlY19jcmVhdGVEZWNvZGVy QnlUeXBlKGNvbnN0IGNoYXIgKm1pbWVfdHlwZSwgaW50IG5kayk7CiBGRkFNZWRpYUNvZGVjKiBm Zl9BTWVkaWFDb2RlY19jcmVhdGVFbmNvZGVyQnlUeXBlKGNvbnN0IGNoYXIgKm1pbWVfdHlwZSwg aW50IG5kayk7CiAKKy8qKgorICogSW50ZXJzZWN0cyB0aGUgZ2l2ZW4gbGlzdCBvZiBjb2xvciBm b3JtYXRzIHdpdGggdGhlIGZvcm1hdHMgYWN0dWFsbHkgc3VwcG9ydGVkIGJ5IHRoZSBkZXZpY2Uu CisgKiBAcGFyYW1baW5dICBjb2RlYyAgICAgICAgVGhlIGNvZGVjIHRvIHF1ZXJ5CisgKiBAcGFy YW1baW5dICBtaW1lICAgICAgICAgTUlNRSBmb3JtYXQuIFR5cGljYWxseSAidmlkZW8vYXZjIiBv ciAidmlkZW8vaGV2YyIKKyAqIEBwYXJhbVtpbl0gIGluX2Zvcm1hdHMgICBBcnJheSBvZiBpbnB1 dCBjb2xvciBmb3JtYXRzCisgKiBAcGFyYW1baW5dICBuaW5fZm9ybWF0cyAgTnVtYmVyIG9mIGVs ZW1lbnRzIGluIGluX2Zvcm1hdHMKKyAqIEBwYXJhbVtvdXRdIG91dF9mb3JtYXRzICBDb21wdXRl ZCBpbnRlcnNlY3Rpb24gb2YgaW5fZm9ybWF0cyBhbmQgc3VwcG9ydGVkIGZvcm1hdHMKKyAqIEBw YXJhbVtpbl0gIGxvZ19jdHggICAgICBMb2dnaW5nIGNvbnRleHQKKyAqIEByZXR1cm4gU2l6ZSBv ZiBvdXRfZm9ybWF0cyBvciBuZWdhdGl2ZSBpbiBjYXNlIG9mIGVycm9yCisgKi8KK2ludCBmZl9B TWVkaWFDb2RlY19jb2xvcl9mb3JtYXRzX2ludGVyc2VjdChGRkFNZWRpYUNvZGVjICpjb2RlYywg Y29uc3QgY2hhciAqbWltZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBjb25zdCBpbnQgKmluX2Zvcm1hdHMsIGludCBuaW5fZm9ybWF0cywKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgKm91dF9mb3JtYXRzLCB2b2lkICps b2dfY3R4KTsKKwogc3RhdGljIGlubGluZSBpbnQgZmZfQU1lZGlhQ29kZWNfY29uZmlndXJlKEZG QU1lZGlhQ29kZWMgKmNvZGVjLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGNvbnN0IEZGQU1lZGlhRm9ybWF0ICpmb3JtYXQsCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgRkZBTmF0aXZlV2luZG93ICpzdXJmYWNlLApkaWZmIC0t Z2l0IGEvbGliYXZjb2RlYy9tZWRpYWNvZGVjZW5jLmMgYi9saWJhdmNvZGVjL21lZGlhY29kZWNl bmMuYwppbmRleCBmZDkwZDQxNjI1Li4yMTg1ZTBiNWFiIDEwMDY0NAotLS0gYS9saWJhdmNvZGVj L21lZGlhY29kZWNlbmMuYworKysgYi9saWJhdmNvZGVjL21lZGlhY29kZWNlbmMuYwpAQCAtOTAs NiArOTAsMTIgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCB7CiAgICAgeyBDT0xPUl9Gb3JtYXRTdXJm YWNlLCAgICAgICAgICAgICAgQVZfUElYX0ZNVF9NRURJQUNPREVDIH0sCiB9OwogCitzdGF0aWMg Y29uc3QgaW50IGluX2Zvcm1hdHNbXSA9IHsKKyAgICBDT0xPUl9Gb3JtYXRZVVY0MjBQbGFuYXIs CisgICAgQ09MT1JfRm9ybWF0WVVWNDIwU2VtaVBsYW5hciwKKyAgICBDT0xPUl9Gb3JtYXRTdXJm YWNlLAorfTsKKwogLy8gZmlsbGVkIGluIGJ5IG1lZGlhY29kZWNfaW5pdF9zdGF0aWNfZGF0YSgp CiBzdGF0aWMgZW51bSBBVlBpeGVsRm9ybWF0IHByb2JlZF9waXhfZm10c1tGRl9BUlJBWV9FTEVN Uyhjb2xvcl9mb3JtYXRzKSsxXTsKIApAQCAtNTM1LDcgKzU0MSw3IEBAIHN0YXRpYyBhdl9jb2xk IHZvaWQgbWVkaWFjb2RlY19pbml0X3N0YXRpY19kYXRhKEZGQ29kZWMgKmZmY29kZWMpCiB7CiAg ICAgY29uc3QgY2hhciAqY29kZWNfbWltZSA9IGZmY29kZWMtPnAuaWQgPT0gQVZfQ09ERUNfSURf SDI2NCA/ICJ2aWRlby9hdmMiIDogInZpZGVvL2hldmMiOwogICAgIEZGQU1lZGlhQ29kZWMgKmNv ZGVjOwotICAgIGludCBudW1fcGl4X2ZtdHMgPSAwOworICAgIGludCBudW1fcGl4X2ZtdHMsIG91 dF9mb3JtYXRzW0ZGX0FSUkFZX0VMRU1TKGluX2Zvcm1hdHMpXTsKICAgICBpbnQgdXNlX25ka19j b2RlYyA9ICFhdl9qbmlfZ2V0X2phdmFfdm0oTlVMTCk7CiAKICAgICBpZiAoIShjb2RlYyA9IGZm X0FNZWRpYUNvZGVjX2NyZWF0ZUVuY29kZXJCeVR5cGUoY29kZWNfbWltZSwgdXNlX25ka19jb2Rl YykpKSB7CkBAIC01NDMsNiArNTQ5LDI0IEBAIHN0YXRpYyBhdl9jb2xkIHZvaWQgbWVkaWFjb2Rl Y19pbml0X3N0YXRpY19kYXRhKEZGQ29kZWMgKmZmY29kZWMpCiAgICAgICAgIHJldHVybjsKICAg ICB9CiAKKyAgICAvLyBhdHRlbXB0IHRvIHF1ZXJ5IGNvbG9yIGZvcm1hdHMgdXNpbmcgSk5JCisg ICAgLy8gZmFsbCBiYWNrIG9uIE5ESy1jb21wYXRpYmxlIG1ldGhvZCBiZWxvdyBpZiB0aGlzIGZh aWxzCisgICAgaWYgKChudW1fcGl4X2ZtdHMgPSBmZl9BTWVkaWFDb2RlY19jb2xvcl9mb3JtYXRz X2ludGVyc2VjdCgKKyAgICAgICAgICAgIGNvZGVjLCBjb2RlY19taW1lLCBpbl9mb3JtYXRzLCBG Rl9BUlJBWV9FTEVNUyhpbl9mb3JtYXRzKSwKKyAgICAgICAgICAgIG91dF9mb3JtYXRzLCBOVUxM KSkgPj0gMCkgeworICAgICAgICAvLyB0cmFuc2xhdGUgY29sb3IgZm9ybWF0cyB0byBwaXhlbCBm b3JtYXRzCisgICAgICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbnVtX3BpeF9mbXRzOyBpKyspIHsK KyAgICAgICAgICAgIGZvciAoaW50IGogPSAwOyBqIDwgRkZfQVJSQVlfRUxFTVMoY29sb3JfZm9y bWF0cyk7IGorKykgeworICAgICAgICAgICAgICAgIGlmIChvdXRfZm9ybWF0c1tpXSA9PSBjb2xv cl9mb3JtYXRzW2pdLmNvbG9yX2Zvcm1hdCkgeworICAgICAgICAgICAgICAgICAgICBwcm9iZWRf cGl4X2ZtdHNbaV0gPSBjb2xvcl9mb3JtYXRzW2pdLnBpeF9mbXQ7CisgICAgICAgICAgICAgICAg ICAgIGJyZWFrOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAgICAgICAgfQor ICAgICAgICBnb3RvIGRvbmU7CisgICAgfQorCisgICAgbnVtX3BpeF9mbXRzID0gMDsKICAgICBm b3IgKGludCBpID0gMDsgaSA8IEZGX0FSUkFZX0VMRU1TKGNvbG9yX2Zvcm1hdHMpOyBpKyspIHsK ICAgICAgICAgaWYgKGNvbG9yX2Zvcm1hdHNbaV0ucGl4X2ZtdCA9PSBBVl9QSVhfRk1UX01FRElB Q09ERUMpIHsKICAgICAgICAgICAgIC8vIGFzc3VtbWUgQVZfUElYX0ZNVF9NRURJQUNPREVDIGFs d2F5cyB3b3JrcwpAQCAtNTg5LDYgKzYxMyw3IEBAIHN0YXRpYyBhdl9jb2xkIHZvaWQgbWVkaWFj b2RlY19pbml0X3N0YXRpY19kYXRhKEZGQ29kZWMgKmZmY29kZWMpCiAgICAgICAgIH0KICAgICB9 CiAKK2RvbmU6CiAgICAgcHJvYmVkX3BpeF9mbXRzW251bV9waXhfZm10c10gPSBBVl9QSVhfRk1U X05PTkU7CiAgICAgZmZjb2RlYy0+cC5waXhfZm10cyA9IHByb2JlZF9waXhfZm10czsKICAgICBm Zl9BTWVkaWFDb2RlY19kZWxldGUoY29kZWMpOwotLSAKMi4zMC4yCgo= --=-J3gKXD1WgL1gt/cTniEQ 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". --=-J3gKXD1WgL1gt/cTniEQ--