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 3408542497 for ; Fri, 22 Jul 2022 13:48:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 638B068B6E8; Fri, 22 Jul 2022 16:48:22 +0300 (EEST) Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1876368B451 for ; Fri, 22 Jul 2022 16:48:16 +0300 (EEST) Received: by mail-lj1-f177.google.com with SMTP id r14so5510808ljp.2 for ; Fri, 22 Jul 2022 06:48:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Ni0hn6MljEx8SR45epxs3+gyPV0D4ZSF7MHypIYc0BM=; b=ZwkD+0k4+aN9hMBEcYZ/rFmqPc0hcjRT6WtDi07ZCvdDfMdLIf/Z2UehI+J0W2kjpo WSXUhGexoX0XWJ0f8QKiWD4kQ9SciTYSQdrs+KBq/vaZ+NOS6Gdir6fhwDdTCi4yQQc8 Mx6SjYz8yboTTrisr/MzFSAdVR2hLaoXNbvos4iGRAEBdVViNh9DMpmISU27ZUfBEYoV egrJha4ypfDbYB8fz7WT1dVlf+JKzHqZFSRdIVyIhsQWuRXetupMU6lXC/JWUh9k6KI2 jZXJnPu4f/2iT5cqgCPKtAIwb849lIfDsYFN9WgA57h1qLvL+JO3bpZGHlahu/RIPwUs B2Ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Ni0hn6MljEx8SR45epxs3+gyPV0D4ZSF7MHypIYc0BM=; b=Uq1qfaZ2Y8BJmQUASfKzdi4xjtphJP3V/qhvQn+wsz7QEMKEH5ib1Mmw2LBhNHNQYn qkX0gJlS83FBnwp7yopzAoVL5BR7+gRv6NjTsTH/GkgbsVxvoU/jJtWjL3gWNu4OGyc4 XOlTGKAGhpBsx5zrd4jdHSHpPdUD603UiA/ibttSUxvrH1NG18D/sOYRmbHtKY6cIeK6 9eJIvQwdyhZwdhvt/GIfrdhjGvDj+MK0UT9a+hpsOQTfVWhvOY0PHsCf5uBPaK2Zw9mc hdstODRV8uZn3HJj3+ploQMZBoBID41k40LqnBK+rMbFdbQ1fDf9TY3fQBtwozYE2V1S Bidw== X-Gm-Message-State: AJIora8tijISdbRXTEfocWJolBlvLRasMjj4AsFd81Y2LA02LHYotpgu GONc9yClh8+FXQc1eXrkgsOkhxtiIYU= X-Google-Smtp-Source: AGRyM1sKkZoGhik2u9U/f7GGbjnfB5thxNbPUs2Exr8EG4BfANGEkvNunhaaC0VHx6DG00kwDBXZ0A== X-Received: by 2002:a2e:9941:0:b0:25b:c885:3143 with SMTP id r1-20020a2e9941000000b0025bc8853143mr31972ljj.477.1658497694709; Fri, 22 Jul 2022 06:48:14 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id s2-20020a056512314200b0047f8cb94004sm1071647lfi.35.2022.07.22.06.48.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jul 2022 06:48:13 -0700 (PDT) From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 22 Jul 2022 16:48:07 +0300 Message-Id: <20220722134808.16692-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/2] ffmpeg: refactor post-decoding steps for subtitles into a function 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: RnJvbTogSmFuIEVrc3Ryw7ZtIDxqYW4uZWtzdHJvbUAyNGkuY29tPgoKVGhpcyBlbmFibGVzIHVz IHRvIGxhdGVyIGNhbGwgdGhpcyB3aGVuIGdlbmVyYXRpbmcgYWRkaXRpb25hbApzdWJ0aXRsZXMg Zm9yIHNwbGl0dGluZyBwdXJwb3Nlcy4KCkNvLWF1dGhvcmVkLWJ5OiBBbmRyemVqIE5hZGFjaG93 c2tpIDxhbmRyemVqLm5hZGFjaG93c2tpQDI0aS5jb20+CgpTaWduZWQtb2ZmLWJ5OiBKYW4gRWtz dHLDtm0gPGphbi5la3N0cm9tQDI0aS5jb20+Ci0tLQogZmZ0b29scy9mZm1wZWcuYyB8IDUwICsr KysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNo YW5nZWQsIDI5IGluc2VydGlvbnMoKyksIDIxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Zm dG9vbHMvZmZtcGVnLmMgYi9mZnRvb2xzL2ZmbXBlZy5jCmluZGV4IGVkMzA3NWY2ZTYuLmZiMTQ4 YTA0MDQgMTAwNjQ0Ci0tLSBhL2ZmdG9vbHMvZmZtcGVnLmMKKysrIGIvZmZ0b29scy9mZm1wZWcu YwpAQCAtMjI3OCwyNyArMjI3OCwxNiBAQCBmYWlsOgogICAgIHJldHVybiBlcnIgPCAwID8gZXJy IDogcmV0OwogfQogCi1zdGF0aWMgaW50IHRyYW5zY29kZV9zdWJ0aXRsZXMoSW5wdXRTdHJlYW0g KmlzdCwgQVZQYWNrZXQgKnBrdCwgaW50ICpnb3Rfb3V0cHV0LAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGludCAqZGVjb2RlX2ZhaWxlZCkKK3N0YXRpYyBpbnQgZW5jb2RlX211eF9z dWJ0aXRsZXMoSW5wdXRTdHJlYW0gKmlzdCwgQVZTdWJ0aXRsZSAqc3VidGl0bGUsIGludCAqZ290 X291dHB1dCkKIHsKLSAgICBBVlN1YnRpdGxlIHN1YnRpdGxlOworICAgIGludCByZXQgPSAwOwog ICAgIGludCBmcmVlX3N1YiA9IDE7Ci0gICAgaW50IGksIHJldCA9IGF2Y29kZWNfZGVjb2RlX3N1 YnRpdGxlMihpc3QtPmRlY19jdHgsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAmc3VidGl0bGUsIGdvdF9vdXRwdXQsIHBrdCk7CiAKLSAgICBjaGVja19kZWNvZGVf cmVzdWx0KE5VTEwsIGdvdF9vdXRwdXQsIHJldCk7Ci0KLSAgICBpZiAocmV0IDwgMCB8fCAhKmdv dF9vdXRwdXQpIHsKLSAgICAgICAgKmRlY29kZV9mYWlsZWQgPSAxOwotICAgICAgICBpZiAoIXBr dC0+c2l6ZSkKLSAgICAgICAgICAgIHN1YjJ2aWRlb19mbHVzaChpc3QpOwotICAgICAgICByZXR1 cm4gcmV0OwotICAgIH0KIAogICAgIGlmIChpc3QtPmZpeF9zdWJfZHVyYXRpb24pIHsKICAgICAg ICAgaW50IGVuZCA9IDE7CiAgICAgICAgIGlmIChpc3QtPnByZXZfc3ViLmdvdF9vdXRwdXQpIHsK LSAgICAgICAgICAgIGVuZCA9IGF2X3Jlc2NhbGUoc3VidGl0bGUucHRzIC0gaXN0LT5wcmV2X3N1 Yi5zdWJ0aXRsZS5wdHMsCisgICAgICAgICAgICBlbmQgPSBhdl9yZXNjYWxlKHN1YnRpdGxlLT5w dHMgLSBpc3QtPnByZXZfc3ViLnN1YnRpdGxlLnB0cywKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgMTAwMCwgQVZfVElNRV9CQVNFKTsKICAgICAgICAgICAgIGlmIChlbmQgPCBpc3QtPnBy ZXZfc3ViLnN1YnRpdGxlLmVuZF9kaXNwbGF5X3RpbWUpIHsKICAgICAgICAgICAgICAgICBhdl9s b2coaXN0LT5kZWNfY3R4LCBBVl9MT0dfREVCVUcsCkBAIC0yMzEwLDcgKzIyOTksNyBAQCBzdGF0 aWMgaW50IHRyYW5zY29kZV9zdWJ0aXRsZXMoSW5wdXRTdHJlYW0gKmlzdCwgQVZQYWNrZXQgKnBr dCwgaW50ICpnb3Rfb3V0cHV0LAogICAgICAgICB9CiAgICAgICAgIEZGU1dBUChpbnQsICAgICAg ICAqZ290X291dHB1dCwgaXN0LT5wcmV2X3N1Yi5nb3Rfb3V0cHV0KTsKICAgICAgICAgRkZTV0FQ KGludCwgICAgICAgIHJldCwgICAgICAgICBpc3QtPnByZXZfc3ViLnJldCk7Ci0gICAgICAgIEZG U1dBUChBVlN1YnRpdGxlLCBzdWJ0aXRsZSwgICAgaXN0LT5wcmV2X3N1Yi5zdWJ0aXRsZSk7Cisg ICAgICAgIEZGU1dBUChBVlN1YnRpdGxlLCAqc3VidGl0bGUsICAgaXN0LT5wcmV2X3N1Yi5zdWJ0 aXRsZSk7CiAgICAgICAgIGlmIChlbmQgPD0gMCkKICAgICAgICAgICAgIGdvdG8gb3V0OwogICAg IH0KQEAgLTIzMTksNDAgKzIzMDgsNTkgQEAgc3RhdGljIGludCB0cmFuc2NvZGVfc3VidGl0bGVz KElucHV0U3RyZWFtICppc3QsIEFWUGFja2V0ICpwa3QsIGludCAqZ290X291dHB1dCwKICAgICAg ICAgcmV0dXJuIHJldDsKIAogICAgIGlmIChpc3QtPnN1YjJ2aWRlby5mcmFtZSkgewotICAgICAg ICBzdWIydmlkZW9fdXBkYXRlKGlzdCwgSU5UNjRfTUlOLCAmc3VidGl0bGUpOworICAgICAgICBz dWIydmlkZW9fdXBkYXRlKGlzdCwgSU5UNjRfTUlOLCBzdWJ0aXRsZSk7CiAgICAgfSBlbHNlIGlm IChpc3QtPm5iX2ZpbHRlcnMpIHsKICAgICAgICAgaWYgKCFpc3QtPnN1YjJ2aWRlby5zdWJfcXVl dWUpCiAgICAgICAgICAgICBpc3QtPnN1YjJ2aWRlby5zdWJfcXVldWUgPSBhdl9maWZvX2FsbG9j Mig4LCBzaXplb2YoQVZTdWJ0aXRsZSksIEFWX0ZJRk9fRkxBR19BVVRPX0dST1cpOwogICAgICAg ICBpZiAoIWlzdC0+c3ViMnZpZGVvLnN1Yl9xdWV1ZSkKICAgICAgICAgICAgIGV4aXRfcHJvZ3Jh bSgxKTsKIAotICAgICAgICByZXQgPSBhdl9maWZvX3dyaXRlKGlzdC0+c3ViMnZpZGVvLnN1Yl9x dWV1ZSwgJnN1YnRpdGxlLCAxKTsKKyAgICAgICAgcmV0ID0gYXZfZmlmb193cml0ZShpc3QtPnN1 YjJ2aWRlby5zdWJfcXVldWUsIHN1YnRpdGxlLCAxKTsKICAgICAgICAgaWYgKHJldCA8IDApCiAg ICAgICAgICAgICBleGl0X3Byb2dyYW0oMSk7CiAgICAgICAgIGZyZWVfc3ViID0gMDsKICAgICB9 CiAKLSAgICBpZiAoIXN1YnRpdGxlLm51bV9yZWN0cykKKyAgICBpZiAoIXN1YnRpdGxlLT5udW1f cmVjdHMpCiAgICAgICAgIGdvdG8gb3V0OwogCiAgICAgaXN0LT5mcmFtZXNfZGVjb2RlZCsrOwog Ci0gICAgZm9yIChpID0gMDsgaSA8IG5iX291dHB1dF9zdHJlYW1zOyBpKyspIHsKKyAgICBmb3Ig KGludCBpID0gMDsgaSA8IG5iX291dHB1dF9zdHJlYW1zOyBpKyspIHsKICAgICAgICAgT3V0cHV0 U3RyZWFtICpvc3QgPSBvdXRwdXRfc3RyZWFtc1tpXTsKIAogICAgICAgICBpZiAoIWNoZWNrX291 dHB1dF9jb25zdHJhaW50cyhpc3QsIG9zdCkgfHwgIW9zdC0+ZW5jb2RpbmdfbmVlZGVkCiAgICAg ICAgICAgICB8fCBvc3QtPmVuYy0+dHlwZSAhPSBBVk1FRElBX1RZUEVfU1VCVElUTEUpCiAgICAg ICAgICAgICBjb250aW51ZTsKIAotICAgICAgICBkb19zdWJ0aXRsZV9vdXQob3V0cHV0X2ZpbGVz W29zdC0+ZmlsZV9pbmRleF0sIG9zdCwgJnN1YnRpdGxlKTsKKyAgICAgICAgZG9fc3VidGl0bGVf b3V0KG91dHB1dF9maWxlc1tvc3QtPmZpbGVfaW5kZXhdLCBvc3QsIHN1YnRpdGxlKTsKICAgICB9 CiAKIG91dDoKICAgICBpZiAoZnJlZV9zdWIpCi0gICAgICAgIGF2c3VidGl0bGVfZnJlZSgmc3Vi dGl0bGUpOworICAgICAgICBhdnN1YnRpdGxlX2ZyZWUoc3VidGl0bGUpOwogICAgIHJldHVybiBy ZXQ7CiB9CiAKK3N0YXRpYyBpbnQgdHJhbnNjb2RlX3N1YnRpdGxlcyhJbnB1dFN0cmVhbSAqaXN0 LCBBVlBhY2tldCAqcGt0LCBpbnQgKmdvdF9vdXRwdXQsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgaW50ICpkZWNvZGVfZmFpbGVkKQoreworICAgIEFWU3VidGl0bGUgc3VidGl0bGU7 CisgICAgaW50IHJldCA9IGF2Y29kZWNfZGVjb2RlX3N1YnRpdGxlMihpc3QtPmRlY19jdHgsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmc3VidGl0bGUsIGdvdF9vdXRw dXQsIHBrdCk7CisKKyAgICBjaGVja19kZWNvZGVfcmVzdWx0KE5VTEwsIGdvdF9vdXRwdXQsIHJl dCk7CisKKyAgICBpZiAocmV0IDwgMCB8fCAhKmdvdF9vdXRwdXQpIHsKKyAgICAgICAgKmRlY29k ZV9mYWlsZWQgPSAxOworICAgICAgICBpZiAoIXBrdC0+c2l6ZSkKKyAgICAgICAgICAgIHN1YjJ2 aWRlb19mbHVzaChpc3QpOworICAgICAgICByZXR1cm4gcmV0OworICAgIH0KKworICAgIHJldHVy biBlbmNvZGVfbXV4X3N1YnRpdGxlcyhpc3QsICZzdWJ0aXRsZSwgZ290X291dHB1dCk7Cit9CisK IHN0YXRpYyBpbnQgc2VuZF9maWx0ZXJfZW9mKElucHV0U3RyZWFtICppc3QpCiB7CiAgICAgaW50 IGksIHJldDsKLS0gCjIuMzYuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KZmZtcGVnLWRldmVsIG1haWxpbmcgbGlzdApmZm1wZWctZGV2ZWxAZmZtcGVn Lm9yZwpodHRwczovL2ZmbXBlZy5vcmcvbWFpbG1hbi9saXN0aW5mby9mZm1wZWctZGV2ZWwKClRv IHVuc3Vic2NyaWJlLCB2aXNpdCBsaW5rIGFib3ZlLCBvciBlbWFpbApmZm1wZWctZGV2ZWwtcmVx dWVzdEBmZm1wZWcub3JnIHdpdGggc3ViamVjdCAidW5zdWJzY3JpYmUiLgo=