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 3965948408 for ; Sun, 3 Dec 2023 22:24:11 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A0CF868CCB4; Mon, 4 Dec 2023 00:24:08 +0200 (EET) Received: from mail-vk1-f174.google.com (mail-vk1-f174.google.com [209.85.221.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D1BE868CAC2 for ; Mon, 4 Dec 2023 00:24:01 +0200 (EET) Received: by mail-vk1-f174.google.com with SMTP id 71dfb90a1353d-4b2e0492fffso82560e0c.0 for ; Sun, 03 Dec 2023 14:24:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701642240; x=1702247040; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=8v1iMlbc8xIly752RQclYp8UB6ZfQAbp+7N8/4s25/w=; b=kll1yULRuoqmQpPn9DC+KTIEK2+A0fVKhPctPmWAI4Kuuwv5NUA2y48f1iRQNetvHW fqd93RPlqhNfN5l3yK8yY7dpE09rlsWbOYbFBioSM6Fc/vpG9Zpie5UItqyAyVQlCuB8 ZlnYhdVvhI1j5YXK+Rx/n6sxYjQ1rLcazNRUHTtdKf6kUm3Uf7r4J8Ij6ZCMnaoM/xeg Y55yvM/hl08pQkA5IEKC+SZ4fwlOM8v+4qHHrs0kkNuBggFhgNzGuTGCA5ycwet2hc9b r8y/eS1Fcrl2XjURN5JoFCtEMq1ljIyHzDlJxHX1mM7mqa0OW0NW3W93G4b7gkRqOuec yz8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701642240; x=1702247040; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=8v1iMlbc8xIly752RQclYp8UB6ZfQAbp+7N8/4s25/w=; b=e3wOUgi9cIzmrCVRJS8aRG9K++0wamQHNKHAcFJpaKXoE7meIwAP7rC4qI8WczlQma UCnjBgk6kIDv01hXYlow0y5qEeJOxFEqqC/0gGAWoOTDd883KjE61yOk+c8gDRliKu0+ +FK11sKU+CjOuHr+B61SJgmxbacnWwdRpGMqZDXgrq2x0+VfMJyfNjLktgdjMnG0vnVE hEnhOxF3GuC4ZJd2C6QeDOTFLMHfM/0P9z8g7N5kBprpAnfVL3Z4rGBDAkcE3sP/qF3F nWbzJGSyhqjcx7sMVNSc1JPthHQVmIcxWLykmnXuAl8iakJzyncy/n0IHvxcehrKev8W 6pxA== X-Gm-Message-State: AOJu0YyFwjF/YG94aJcAMcn2tZc1XezLCFtP96TrD0Tsx5L3X0QYMFNk iSkhwS3oT2bZf9ZpLPUfcZ2AAPP6EqHZNWssD0StJUwz X-Google-Smtp-Source: AGHT+IGdP7q4VVNamlnoUzvVceauQzpSZcccCZqVevzkY6WwNwI5DM6eADGQJcWbEbUT9qIqzQUKTCNAaLdtFrvxztg= X-Received: by 2002:a05:6122:2518:b0:4b2:c555:384 with SMTP id cl24-20020a056122251800b004b2c5550384mr2074945vkb.26.1701642240151; Sun, 03 Dec 2023 14:24:00 -0800 (PST) MIME-Version: 1.0 From: Paul B Mahol Date: Sun, 3 Dec 2023 23:23:48 +0100 Message-ID: To: FFmpeg development discussions and patches Content-Type: multipart/mixed; boundary="0000000000004299c4060ba275f1" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] libavfilter/asrc_flite: fixes and improvements 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: --0000000000004299c4060ba275f1 Content-Type: text/plain; charset="UTF-8" Attached. --0000000000004299c4060ba275f1 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-avfilter-asrc_flite-switch-to-activate.patch" Content-Disposition: attachment; filename="0001-avfilter-asrc_flite-switch-to-activate.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lpq1twyn1 RnJvbSBmZTFlY2U3MGMwZWNiZTZmYjI0ZTA4MjNmZTQ2ZGI1NzI0MjM5NmU0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEIgTWFob2wgPG9uZW1kYUBnbWFpbC5jb20+CkRhdGU6 IFN1biwgMyBEZWMgMjAyMyAyMTozODowOCArMDEwMApTdWJqZWN0OiBbUEFUQ0ggMS8yXSBhdmZp bHRlci9hc3JjX2ZsaXRlOiBzd2l0Y2ggdG8gYWN0aXZhdGUKCkFsbG93cyB0byBzZXQgRU9GIHRp bWVzdGFtcC4KClNpZ25lZC1vZmYtYnk6IFBhdWwgQiBNYWhvbCA8b25lbWRhQGdtYWlsLmNvbT4K LS0tCiBsaWJhdmZpbHRlci9hc3JjX2ZsaXRlLmMgfCAyNCArKysrKysrKysrKysrLS0tLS0tLS0t LS0KIDEgZmlsZSBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9saWJhdmZpbHRlci9hc3JjX2ZsaXRlLmMgYi9saWJhdmZpbHRlci9hc3JjX2Zs aXRlLmMKaW5kZXggMWMzMDUzYWEzOS4uNzRjODQxNGI1YyAxMDA2NDQKLS0tIGEvbGliYXZmaWx0 ZXIvYXNyY19mbGl0ZS5jCisrKyBiL2xpYmF2ZmlsdGVyL2FzcmNfZmxpdGUuYwpAQCAtMjksNiAr MjksNyBAQAogI2luY2x1ZGUgImxpYmF2dXRpbC9vcHQuaCIKICNpbmNsdWRlICJsaWJhdnV0aWwv dGhyZWFkLmgiCiAjaW5jbHVkZSAiYXZmaWx0ZXIuaCIKKyNpbmNsdWRlICJmaWx0ZXJzLmgiCiAj aW5jbHVkZSAiYXVkaW8uaCIKICNpbmNsdWRlICJmb3JtYXRzLmgiCiAjaW5jbHVkZSAiaW50ZXJu YWwuaCIKQEAgLTI1NiwxNCArMjU3LDIwIEBAIHN0YXRpYyBpbnQgY29uZmlnX3Byb3BzKEFWRmls dGVyTGluayAqb3V0bGluaykKICAgICByZXR1cm4gMDsKIH0KIAotc3RhdGljIGludCByZXF1ZXN0 X2ZyYW1lKEFWRmlsdGVyTGluayAqb3V0bGluaykKK3N0YXRpYyBpbnQgYWN0aXZhdGUoQVZGaWx0 ZXJDb250ZXh0ICpjdHgpCiB7Ci0gICAgQVZGcmFtZSAqc2FtcGxlc3JlZjsKLSAgICBGbGl0ZUNv bnRleHQgKmZsaXRlID0gb3V0bGluay0+c3JjLT5wcml2OworICAgIEFWRmlsdGVyTGluayAqb3V0 bGluayA9IGN0eC0+b3V0cHV0c1swXTsKKyAgICBGbGl0ZUNvbnRleHQgKmZsaXRlID0gY3R4LT5w cml2OwogICAgIGludCBuYl9zYW1wbGVzID0gRkZNSU4oZmxpdGUtPndhdmVfbmJfc2FtcGxlcywg ZmxpdGUtPmZyYW1lX25iX3NhbXBsZXMpOworICAgIEFWRnJhbWUgKnNhbXBsZXNyZWY7CiAKLSAg ICBpZiAoIW5iX3NhbXBsZXMpCi0gICAgICAgIHJldHVybiBBVkVSUk9SX0VPRjsKKyAgICBpZiAo IWZmX291dGxpbmtfZnJhbWVfd2FudGVkKG91dGxpbmspKQorICAgICAgICByZXR1cm4gRkZFUlJP Ul9OT1RfUkVBRFk7CisKKyAgICBpZiAoIW5iX3NhbXBsZXMpIHsKKyAgICAgICAgZmZfb3V0bGlu a19zZXRfc3RhdHVzKG91dGxpbmssIEFWRVJST1JfRU9GLCBmbGl0ZS0+cHRzKTsKKyAgICAgICAg cmV0dXJuIDA7CisgICAgfQogCiAgICAgc2FtcGxlc3JlZiA9IGZmX2dldF9hdWRpb19idWZmZXIo b3V0bGluaywgbmJfc2FtcGxlcyk7CiAgICAgaWYgKCFzYW1wbGVzcmVmKQpAQCAtMjcyLDExICsy NzksNiBAQCBzdGF0aWMgaW50IHJlcXVlc3RfZnJhbWUoQVZGaWx0ZXJMaW5rICpvdXRsaW5rKQog ICAgIG1lbWNweShzYW1wbGVzcmVmLT5kYXRhWzBdLCBmbGl0ZS0+d2F2ZV9zYW1wbGVzLAogICAg ICAgICAgICBuYl9zYW1wbGVzICogZmxpdGUtPndhdmUtPm51bV9jaGFubmVscyAqIDIpOwogICAg IHNhbXBsZXNyZWYtPnB0cyA9IGZsaXRlLT5wdHM7Ci0jaWYgRkZfQVBJX0ZSQU1FX1BLVAotRkZf RElTQUJMRV9ERVBSRUNBVElPTl9XQVJOSU5HUwotICAgIHNhbXBsZXNyZWYtPnBrdF9wb3MgPSAt MTsKLUZGX0VOQUJMRV9ERVBSRUNBVElPTl9XQVJOSU5HUwotI2VuZGlmCiAgICAgc2FtcGxlc3Jl Zi0+c2FtcGxlX3JhdGUgPSBmbGl0ZS0+d2F2ZS0+c2FtcGxlX3JhdGU7CiAgICAgZmxpdGUtPnB0 cyArPSBuYl9zYW1wbGVzOwogICAgIGZsaXRlLT53YXZlX3NhbXBsZXMgKz0gbmJfc2FtcGxlcyAq IGZsaXRlLT53YXZlLT5udW1fY2hhbm5lbHM7CkBAIC0yOTAsNyArMjkyLDYgQEAgc3RhdGljIGNv bnN0IEFWRmlsdGVyUGFkIGZsaXRlX291dHB1dHNbXSA9IHsKICAgICAgICAgLm5hbWUgICAgICAg ICAgPSAiZGVmYXVsdCIsCiAgICAgICAgIC50eXBlICAgICAgICAgID0gQVZNRURJQV9UWVBFX0FV RElPLAogICAgICAgICAuY29uZmlnX3Byb3BzICA9IGNvbmZpZ19wcm9wcywKLSAgICAgICAgLnJl cXVlc3RfZnJhbWUgPSByZXF1ZXN0X2ZyYW1lLAogICAgIH0sCiB9OwogCkBAIC0zMDAsNiArMzAx LDcgQEAgY29uc3QgQVZGaWx0ZXIgZmZfYXNyY19mbGl0ZSA9IHsKICAgICAuaW5pdCAgICAgICAg ICA9IGluaXQsCiAgICAgLnVuaW5pdCAgICAgICAgPSB1bmluaXQsCiAgICAgLnByaXZfc2l6ZSAg ICAgPSBzaXplb2YoRmxpdGVDb250ZXh0KSwKKyAgICAuYWN0aXZhdGUgICAgICA9IGFjdGl2YXRl LAogICAgIC5pbnB1dHMgICAgICAgID0gTlVMTCwKICAgICBGSUxURVJfT1VUUFVUUyhmbGl0ZV9v dXRwdXRzKSwKICAgICBGSUxURVJfUVVFUllfRlVOQyhxdWVyeV9mb3JtYXRzKSwKLS0gCjIuNDIu MQoK --0000000000004299c4060ba275f1 Content-Type: text/x-patch; charset="US-ASCII"; name="0002-avfilter-asrc_flite-use-streaming-function.patch" Content-Disposition: attachment; filename="0002-avfilter-asrc_flite-use-streaming-function.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lpq1twuq0 RnJvbSBlOGFhZDQ0MTFlZTBmOGJjNGJkNTBkNWUzYTEwYjdmNzEyNjg3ZjYwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEIgTWFob2wgPG9uZW1kYUBnbWFpbC5jb20+CkRhdGU6 IFN1biwgMyBEZWMgMjAyMyAyMjo1MDoxMSArMDEwMApTdWJqZWN0OiBbUEFUQ0ggMi8yXSBhdmZp bHRlci9hc3JjX2ZsaXRlOiB1c2Ugc3RyZWFtaW5nIGZ1bmN0aW9uCgpGaXggY29udGludW91cyBh Y2N1bXVsYXRpb24gb2YgYXVkaW8gc2FtcGxlcyBmb3IgYmlnIHR4dCBpbnB1dHMuCgpTaWduZWQt b2ZmLWJ5OiBQYXVsIEIgTWFob2wgPG9uZW1kYUBnbWFpbC5jb20+Ci0tLQogbGliYXZmaWx0ZXIv YXNyY19mbGl0ZS5jIHwgODQgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0t LQogMSBmaWxlIGNoYW5nZWQsIDY0IGluc2VydGlvbnMoKyksIDIwIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2xpYmF2ZmlsdGVyL2FzcmNfZmxpdGUuYyBiL2xpYmF2ZmlsdGVyL2FzcmNfZmxp dGUuYwppbmRleCA3NGM4NDE0YjVjLi43MGEyZmQzZTQwIDEwMDY0NAotLS0gYS9saWJhdmZpbHRl ci9hc3JjX2ZsaXRlLmMKKysrIGIvbGliYXZmaWx0ZXIvYXNyY19mbGl0ZS5jCkBAIC0yNCw2ICsy NCw4IEBACiAgKi8KIAogI2luY2x1ZGUgPGZsaXRlL2ZsaXRlLmg+CisjaW5jbHVkZSAibGliYXZ1 dGlsL2F1ZGlvX2ZpZm8uaCIKKyNpbmNsdWRlICJsaWJhdnV0aWwvYXZzdHJpbmcuaCIKICNpbmNs dWRlICJsaWJhdnV0aWwvY2hhbm5lbF9sYXlvdXQuaCIKICNpbmNsdWRlICJsaWJhdnV0aWwvZmls ZS5oIgogI2luY2x1ZGUgImxpYmF2dXRpbC9vcHQuaCIKQEAgLTM5LDExICs0MSwxNCBAQCB0eXBl ZGVmIHN0cnVjdCBGbGl0ZUNvbnRleHQgewogICAgIGNoYXIgKnZvaWNlX3N0cjsKICAgICBjaGFy ICp0ZXh0ZmlsZTsKICAgICBjaGFyICp0ZXh0OwotICAgIGNzdF93YXZlICp3YXZlOwotICAgIGlu dDE2X3QgKndhdmVfc2FtcGxlczsKLSAgICBpbnQgICAgICB3YXZlX25iX3NhbXBsZXM7CisgICAg Y2hhciAqdGV4dF9wOworICAgIGNoYXIgKnRleHRfc2F2ZXB0cjsKKyAgICBpbnQgbmJfY2hhbm5l bHM7CisgICAgaW50IHNhbXBsZV9yYXRlOworICAgIEFWQXVkaW9GaWZvICpmaWZvOwogICAgIGlu dCBsaXN0X3ZvaWNlczsKICAgICBjc3Rfdm9pY2UgKnZvaWNlOworICAgIGNzdF9hdWRpb19zdHJl YW1pbmdfaW5mbyAqYXNpOwogICAgIHN0cnVjdCB2b2ljZV9lbnRyeSAqdm9pY2VfZW50cnk7CiAg ICAgaW50NjRfdCBwdHM7CiAgICAgaW50IGZyYW1lX25iX3NhbXBsZXM7IC8vLzwgbnVtYmVyIG9m IHNhbXBsZXMgcGVyIGZyYW1lCkBAIC0xNDAsMTAgKzE0NSwzMCBAQCBzdGF0aWMgaW50IHNlbGVj dF92b2ljZShzdHJ1Y3Qgdm9pY2VfZW50cnkgKiplbnRyeV9yZXQsIGNvbnN0IGNoYXIgKnZvaWNl X25hbWUsCiAgICAgcmV0dXJuIEFWRVJST1IoRUlOVkFMKTsKIH0KIAorc3RhdGljIGludCBhdWRp b19zdHJlYW1fY2h1bmtfYnlfd29yZChjb25zdCBjc3Rfd2F2ZSAqdywgaW50IHN0YXJ0LCBpbnQg c2l6ZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50IGxhc3QsIGNz dF9hdWRpb19zdHJlYW1pbmdfaW5mbyAqYXNpKQoreworICAgIEZsaXRlQ29udGV4dCAqZmxpdGUg PSBhc2ktPnVzZXJkYXRhOworICAgIHZvaWQgKmNvbnN0IHB0cls4XSA9IHsgJnctPnNhbXBsZXNb c3RhcnRdIH07CisKKyAgICBmbGl0ZS0+bmJfY2hhbm5lbHMgPSB3LT5udW1fY2hhbm5lbHM7Cisg ICAgZmxpdGUtPnNhbXBsZV9yYXRlID0gdy0+c2FtcGxlX3JhdGU7CisgICAgaWYgKCFmbGl0ZS0+ ZmlmbykgeworICAgICAgICBmbGl0ZS0+ZmlmbyA9IGF2X2F1ZGlvX2ZpZm9fYWxsb2MoQVZfU0FN UExFX0ZNVF9TMTYsIGZsaXRlLT5uYl9jaGFubmVscywgc2l6ZSk7CisgICAgICAgIGlmICghZmxp dGUtPmZpZm8pCisgICAgICAgICAgICByZXR1cm4gQ1NUX0FVRElPX1NUUkVBTV9TVE9QOworICAg IH0KKworICAgIGF2X2F1ZGlvX2ZpZm9fd3JpdGUoZmxpdGUtPmZpZm8sIHB0ciwgc2l6ZSk7CisK KyAgICByZXR1cm4gQ1NUX0FVRElPX1NUUkVBTV9DT05UOworfQorCiBzdGF0aWMgYXZfY29sZCBp bnQgaW5pdChBVkZpbHRlckNvbnRleHQgKmN0eCkKIHsKICAgICBGbGl0ZUNvbnRleHQgKmZsaXRl ID0gY3R4LT5wcml2OwogICAgIGludCByZXQgPSAwOworICAgIGNoYXIgKnRleHQ7CiAKICAgICBp ZiAoZmxpdGUtPmxpc3Rfdm9pY2VzKSB7CiAgICAgICAgIGxpc3Rfdm9pY2VzKGN0eCwgIlxuIik7 CkBAIC0xOTcsMTAgKzIyMiwyMSBAQCBzdGF0aWMgYXZfY29sZCBpbnQgaW5pdChBVkZpbHRlckNv bnRleHQgKmN0eCkKICAgICAgICAgcmV0dXJuIEFWRVJST1IoRUlOVkFMKTsKICAgICB9CiAKLSAg ICAvKiBzeW50aCBhbGwgdGhlIGZpbGUgZGF0YSBpbiBibG9jayAqLwotICAgIGZsaXRlLT53YXZl ID0gZmxpdGVfdGV4dF90b193YXZlKGZsaXRlLT50ZXh0LCBmbGl0ZS0+dm9pY2UpOwotICAgIGZs aXRlLT53YXZlX3NhbXBsZXMgICAgPSBmbGl0ZS0+d2F2ZS0+c2FtcGxlczsKLSAgICBmbGl0ZS0+ d2F2ZV9uYl9zYW1wbGVzID0gZmxpdGUtPndhdmUtPm51bV9zYW1wbGVzOworICAgIGZsaXRlLT5h c2kgPSBuZXdfYXVkaW9fc3RyZWFtaW5nX2luZm8oKTsKKyAgICBpZiAoIWZsaXRlLT5hc2kpCisg ICAgICAgIHJldHVybiBBVkVSUk9SX0JVRzsKKworICAgIGZsaXRlLT5hc2ktPmFzYyA9IGF1ZGlv X3N0cmVhbV9jaHVua19ieV93b3JkOworICAgIGZsaXRlLT5hc2ktPnVzZXJkYXRhID0gZmxpdGU7 CisgICAgZmVhdF9zZXQoZmxpdGUtPnZvaWNlLT5mZWF0dXJlcywgInN0cmVhbWluZ19pbmZvIiwg YXVkaW9fc3RyZWFtaW5nX2luZm9fdmFsKGZsaXRlLT5hc2kpKTsKKworICAgIGZsaXRlLT50ZXh0 X3AgPSBmbGl0ZS0+dGV4dDsKKyAgICBpZiAoISh0ZXh0ID0gYXZfc3RydG9rKGZsaXRlLT50ZXh0 X3AsICJcbiIsICZmbGl0ZS0+dGV4dF9zYXZlcHRyKSkpCisgICAgICAgIHJldHVybiBBVkVSUk9S KEVJTlZBTCk7CisgICAgZmxpdGUtPnRleHRfcCA9IE5VTEw7CisKKyAgICBmbGl0ZV90ZXh0X3Rv X3NwZWVjaCh0ZXh0LCBmbGl0ZS0+dm9pY2UsICJub25lIik7CisKICAgICByZXR1cm4gMDsKIH0K IApAQCAtMjE2LDggKzI1Miw3IEBAIHN0YXRpYyBhdl9jb2xkIHZvaWQgdW5pbml0KEFWRmlsdGVy Q29udGV4dCAqY3R4KQogICAgICAgICB9CiAgICAgICAgIHB0aHJlYWRfbXV0ZXhfdW5sb2NrKCZm bGl0ZV9tdXRleCk7CiAgICAgfQotICAgIGRlbGV0ZV93YXZlKGZsaXRlLT53YXZlKTsKLSAgICBm bGl0ZS0+d2F2ZSA9IE5VTEw7CisgICAgYXZfYXVkaW9fZmlmb19mcmVlKGZsaXRlLT5maWZvKTsK IH0KIAogc3RhdGljIGludCBxdWVyeV9mb3JtYXRzKEFWRmlsdGVyQ29udGV4dCAqY3R4KQpAQCAt MjMwLDEzICsyNjUsMTMgQEAgc3RhdGljIGludCBxdWVyeV9mb3JtYXRzKEFWRmlsdGVyQ29udGV4 dCAqY3R4KQogICAgIEFWRmlsdGVyRm9ybWF0cyAqc2FtcGxlX3JhdGVzID0gTlVMTDsKICAgICBB VkNoYW5uZWxMYXlvdXQgY2hsYXlvdXQgPSB7IDAgfTsKIAotICAgIGF2X2NoYW5uZWxfbGF5b3V0 X2RlZmF1bHQoJmNobGF5b3V0LCBmbGl0ZS0+d2F2ZS0+bnVtX2NoYW5uZWxzKTsKKyAgICBhdl9j aGFubmVsX2xheW91dF9kZWZhdWx0KCZjaGxheW91dCwgZmxpdGUtPm5iX2NoYW5uZWxzKTsKIAog ICAgIGlmICgocmV0ID0gZmZfYWRkX2NoYW5uZWxfbGF5b3V0ICAgICAgICAgKCZjaGxheW91dHMg ICAgICwgJmNobGF5b3V0ICAgICAgICAgICAgICAgKSkgPCAwIHx8CiAgICAgICAgIChyZXQgPSBm Zl9zZXRfY29tbW9uX2NoYW5uZWxfbGF5b3V0cyAoY3R4ICAgICAgICAgICAgLCBjaGxheW91dHMg ICAgICAgICAgICAgICApKSA8IDAgfHwKICAgICAgICAgKHJldCA9IGZmX2FkZF9mb3JtYXQgICAg ICAgICAgICAgICAgICgmc2FtcGxlX2Zvcm1hdHMsIEFWX1NBTVBMRV9GTVRfUzE2ICAgICAgICkp IDwgMCB8fAogICAgICAgICAocmV0ID0gZmZfc2V0X2NvbW1vbl9mb3JtYXRzICAgICAgICAgKGN0 eCAgICAgICAgICAgICwgc2FtcGxlX2Zvcm1hdHMgICAgICAgICAgKSkgPCAwIHx8Ci0gICAgICAg IChyZXQgPSBmZl9hZGRfZm9ybWF0ICAgICAgICAgICAgICAgICAoJnNhbXBsZV9yYXRlcyAgLCBm bGl0ZS0+d2F2ZS0+c2FtcGxlX3JhdGUpKSA8IDAgfHwKKyAgICAgICAgKHJldCA9IGZmX2FkZF9m b3JtYXQgICAgICAgICAgICAgICAgICgmc2FtcGxlX3JhdGVzICAsIGZsaXRlLT5zYW1wbGVfcmF0 ZSAgICAgICkpIDwgMCB8fAogICAgICAgICAocmV0ID0gZmZfc2V0X2NvbW1vbl9zYW1wbGVyYXRl cyAgICAgKGN0eCAgICAgICAgICAgICwgc2FtcGxlX3JhdGVzICAgICAgICAgICAgKSkgPCAwKQog ICAgICAgICByZXR1cm4gcmV0OwogCkBAIC0yNDgsMTIgKzI4MywxMyBAQCBzdGF0aWMgaW50IGNv bmZpZ19wcm9wcyhBVkZpbHRlckxpbmsgKm91dGxpbmspCiAgICAgQVZGaWx0ZXJDb250ZXh0ICpj dHggPSBvdXRsaW5rLT5zcmM7CiAgICAgRmxpdGVDb250ZXh0ICpmbGl0ZSA9IGN0eC0+cHJpdjsK IAotICAgIG91dGxpbmstPnNhbXBsZV9yYXRlID0gZmxpdGUtPndhdmUtPnNhbXBsZV9yYXRlOwot ICAgIG91dGxpbmstPnRpbWVfYmFzZSA9IChBVlJhdGlvbmFsKXsxLCBmbGl0ZS0+d2F2ZS0+c2Ft cGxlX3JhdGV9OworICAgIG91dGxpbmstPnNhbXBsZV9yYXRlID0gZmxpdGUtPnNhbXBsZV9yYXRl OworICAgIG91dGxpbmstPnRpbWVfYmFzZSA9IChBVlJhdGlvbmFsKXsxLCBmbGl0ZS0+c2FtcGxl X3JhdGV9OwogCiAgICAgYXZfbG9nKGN0eCwgQVZfTE9HX1ZFUkJPU0UsICJ2b2ljZTolcyBmbXQ6 JXMgc2FtcGxlX3JhdGU6JWRcbiIsCiAgICAgICAgICAgIGZsaXRlLT52b2ljZV9zdHIsCiAgICAg ICAgICAgIGF2X2dldF9zYW1wbGVfZm10X25hbWUob3V0bGluay0+Zm9ybWF0KSwgb3V0bGluay0+ c2FtcGxlX3JhdGUpOworCiAgICAgcmV0dXJuIDA7CiB9CiAKQEAgLTI2MSwxNCArMjk3LDIzIEBA IHN0YXRpYyBpbnQgYWN0aXZhdGUoQVZGaWx0ZXJDb250ZXh0ICpjdHgpCiB7CiAgICAgQVZGaWx0 ZXJMaW5rICpvdXRsaW5rID0gY3R4LT5vdXRwdXRzWzBdOwogICAgIEZsaXRlQ29udGV4dCAqZmxp dGUgPSBjdHgtPnByaXY7Ci0gICAgaW50IG5iX3NhbXBsZXMgPSBGRk1JTihmbGl0ZS0+d2F2ZV9u Yl9zYW1wbGVzLCBmbGl0ZS0+ZnJhbWVfbmJfc2FtcGxlcyk7CiAgICAgQVZGcmFtZSAqc2FtcGxl c3JlZjsKKyAgICBpbnQgbmJfc2FtcGxlczsKIAogICAgIGlmICghZmZfb3V0bGlua19mcmFtZV93 YW50ZWQob3V0bGluaykpCiAgICAgICAgIHJldHVybiBGRkVSUk9SX05PVF9SRUFEWTsKIAorICAg IG5iX3NhbXBsZXMgPSBGRk1JTihhdl9hdWRpb19maWZvX3NpemUoZmxpdGUtPmZpZm8pLCBmbGl0 ZS0+ZnJhbWVfbmJfc2FtcGxlcyk7CiAgICAgaWYgKCFuYl9zYW1wbGVzKSB7Ci0gICAgICAgIGZm X291dGxpbmtfc2V0X3N0YXR1cyhvdXRsaW5rLCBBVkVSUk9SX0VPRiwgZmxpdGUtPnB0cyk7Cisg ICAgICAgIGNoYXIgKnRleHQ7CisKKyAgICAgICAgaWYgKCEodGV4dCA9IGF2X3N0cnRvayhmbGl0 ZS0+dGV4dF9wLCAiXG4iLCAmZmxpdGUtPnRleHRfc2F2ZXB0cikpKSB7CisgICAgICAgICAgICBm Zl9vdXRsaW5rX3NldF9zdGF0dXMob3V0bGluaywgQVZFUlJPUl9FT0YsIGZsaXRlLT5wdHMpOwor ICAgICAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIH0KKworICAgICAgICBmbGl0ZV90ZXh0X3Rv X3NwZWVjaCh0ZXh0LCBmbGl0ZS0+dm9pY2UsICJub25lIik7CisgICAgICAgIGZmX2ZpbHRlcl9z ZXRfcmVhZHkoY3R4LCAxMDApOwogICAgICAgICByZXR1cm4gMDsKICAgICB9CiAKQEAgLTI3Niwx MyArMzIxLDEyIEBAIHN0YXRpYyBpbnQgYWN0aXZhdGUoQVZGaWx0ZXJDb250ZXh0ICpjdHgpCiAg ICAgaWYgKCFzYW1wbGVzcmVmKQogICAgICAgICByZXR1cm4gQVZFUlJPUihFTk9NRU0pOwogCi0g ICAgbWVtY3B5KHNhbXBsZXNyZWYtPmRhdGFbMF0sIGZsaXRlLT53YXZlX3NhbXBsZXMsCi0gICAg ICAgICAgIG5iX3NhbXBsZXMgKiBmbGl0ZS0+d2F2ZS0+bnVtX2NoYW5uZWxzICogMik7CisgICAg YXZfYXVkaW9fZmlmb19yZWFkKGZsaXRlLT5maWZvLCAodm9pZCAqKilzYW1wbGVzcmVmLT5leHRl bmRlZF9kYXRhLAorICAgICAgICAgICAgICAgICAgICAgICBuYl9zYW1wbGVzKTsKKwogICAgIHNh bXBsZXNyZWYtPnB0cyA9IGZsaXRlLT5wdHM7Ci0gICAgc2FtcGxlc3JlZi0+c2FtcGxlX3JhdGUg PSBmbGl0ZS0+d2F2ZS0+c2FtcGxlX3JhdGU7CisgICAgc2FtcGxlc3JlZi0+c2FtcGxlX3JhdGUg PSBmbGl0ZS0+c2FtcGxlX3JhdGU7CiAgICAgZmxpdGUtPnB0cyArPSBuYl9zYW1wbGVzOwotICAg IGZsaXRlLT53YXZlX3NhbXBsZXMgKz0gbmJfc2FtcGxlcyAqIGZsaXRlLT53YXZlLT5udW1fY2hh bm5lbHM7Ci0gICAgZmxpdGUtPndhdmVfbmJfc2FtcGxlcyAtPSBuYl9zYW1wbGVzOwogCiAgICAg cmV0dXJuIGZmX2ZpbHRlcl9mcmFtZShvdXRsaW5rLCBzYW1wbGVzcmVmKTsKIH0KLS0gCjIuNDIu MQoK --0000000000004299c4060ba275f1 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". --0000000000004299c4060ba275f1--