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 CBD014051D for ; Tue, 21 Dec 2021 07:57:05 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C64B368AEEB; Tue, 21 Dec 2021 09:57:03 +0200 (EET) Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2F14568AB2E for ; Tue, 21 Dec 2021 09:56:57 +0200 (EET) Received: by mail-lf1-f43.google.com with SMTP id g26so11627370lfv.11 for ; Mon, 20 Dec 2021 23:56:57 -0800 (PST) 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=gm6dcGHiqhKZYWzHVtOqOcv/hreywT9mfLrh/C2+usI=; b=WazP0Zl7O8XFQnzkxALcOQ3VBllGuRD9T6j8/cpBE8gUMMb51eLZh6sn3Ib07PnHNJ 1dH6CQxMJ+K80bE84cIFZgt0LaUBNwfmyaEuUb67l5aRr7rjflI0IZXFepFSFH/e+SwG JG/Yqj1TYm5ewY48rGpHtBiJJchBF9TheAAfpdCVQwC73iHzYWbrviv/r8c2myAktDnv o7qmy6aP00GNSUDj74UpDpEaCI6HeV0rceQGyfyZpEcnJVob6PoccH5oTED6/JDnCV6O qN+0n3233nNc+pgS46WatouYnyetzcWmvQPrYfjm8BB/rfGAMHgluYraQhDBCmJuXrgV qrEw== 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=gm6dcGHiqhKZYWzHVtOqOcv/hreywT9mfLrh/C2+usI=; b=Uv1ZAsPtOBAjTK+kVYkqAoc3cCykPtKkbxjLzmNxDeXm7XUFbV3dxSSNtda8StAd75 UgMiu3H4HYXZ7Tnlg3lDnfLvZkxilDRexy3MRkFDBVMLlt9kKUvOk8R97QTo1tRA6ZOV Kv9u14suMTfhmQ+s4N8IMwRnSy4liGtD2Fad3WmZ7AyVojY9m6SqxzaKYahe7dxWSDGj +O1nGr5wIyWZJGw463GwnXGWOCFaRc4ucm2DBPjudqSrv+VLrhqs7ZKhGfkrPaqk2JSW melUzc+7z9cNDppShyzuSL0pUumeWY4R85eXenFaR1/a49Wbmt0asICxditjd4Mv3gF8 Nx7g== X-Gm-Message-State: AOAM533MFlI5lt4jDQj3qmTF4z9iGubjXGdd4bCBnyK5PRN7FjSQPEfT 2o3VhnA55Z9lvBy9ehntwIAZfAKT3eU= X-Google-Smtp-Source: ABdhPJyhHki3k0uPRV85H7lEDnWUtMNNR3ebpJdtIFFPSnztUd+25BTbFmZrcmJMKfR8TocolCBO2A== X-Received: by 2002:a19:4f13:: with SMTP id d19mr2023322lfb.104.1640073416477; Mon, 20 Dec 2021 23:56:56 -0800 (PST) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id j18sm2631729lfg.60.2021.12.20.23.56.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Dec 2021 23:56:56 -0800 (PST) From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Dec 2021 09:56:47 +0200 Message-Id: <20211221075648.13059-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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 Zm9yIHNwbGl0dGluZyBwdXJwb3Nlcy4KClNpZ25lZC1vZmYtYnk6IEphbiBFa3N0csO2bSA8amFu LmVrc3Ryb21AMjRpLmNvbT4KLS0tCiBmZnRvb2xzL2ZmbXBlZy5jIHwgNTAgKysrKysrKysrKysr KysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjkg aW5zZXJ0aW9ucygrKSwgMjEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZmZ0b29scy9mZm1w ZWcuYyBiL2ZmdG9vbHMvZmZtcGVnLmMKaW5kZXggYmRlZmY5YTEyZS4uMTY5Nzg5MWE5OSAxMDA2 NDQKLS0tIGEvZmZ0b29scy9mZm1wZWcuYworKysgYi9mZnRvb2xzL2ZmbXBlZy5jCkBAIC0yNDgy LDI3ICsyNDgyLDE2IEBAIGZhaWw6CiAgICAgcmV0dXJuIGVyciA8IDAgPyBlcnIgOiByZXQ7CiB9 CiAKLXN0YXRpYyBpbnQgdHJhbnNjb2RlX3N1YnRpdGxlcyhJbnB1dFN0cmVhbSAqaXN0LCBBVlBh Y2tldCAqcGt0LCBpbnQgKmdvdF9vdXRwdXQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgaW50ICpkZWNvZGVfZmFpbGVkKQorc3RhdGljIGludCBlbmNvZGVfbXV4X3N1YnRpdGxlcyhJ bnB1dFN0cmVhbSAqaXN0LCBBVlN1YnRpdGxlICpzdWJ0aXRsZSwgaW50ICpnb3Rfb3V0cHV0KQog ewotICAgIEFWU3VidGl0bGUgc3VidGl0bGU7CisgICAgaW50IHJldCA9IDA7CiAgICAgaW50IGZy ZWVfc3ViID0gMTsKLSAgICBpbnQgaSwgcmV0ID0gYXZjb2RlY19kZWNvZGVfc3VidGl0bGUyKGlz dC0+ZGVjX2N0eCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZz dWJ0aXRsZSwgZ290X291dHB1dCwgcGt0KTsKIAotICAgIGNoZWNrX2RlY29kZV9yZXN1bHQoTlVM TCwgZ290X291dHB1dCwgcmV0KTsKLQotICAgIGlmIChyZXQgPCAwIHx8ICEqZ290X291dHB1dCkg ewotICAgICAgICAqZGVjb2RlX2ZhaWxlZCA9IDE7Ci0gICAgICAgIGlmICghcGt0LT5zaXplKQot ICAgICAgICAgICAgc3ViMnZpZGVvX2ZsdXNoKGlzdCk7Ci0gICAgICAgIHJldHVybiByZXQ7Ci0g ICAgfQogCiAgICAgaWYgKGlzdC0+Zml4X3N1Yl9kdXJhdGlvbikgewogICAgICAgICBpbnQgZW5k ID0gMTsKICAgICAgICAgaWYgKGlzdC0+cHJldl9zdWIuZ290X291dHB1dCkgewotICAgICAgICAg ICAgZW5kID0gYXZfcmVzY2FsZShzdWJ0aXRsZS5wdHMgLSBpc3QtPnByZXZfc3ViLnN1YnRpdGxl LnB0cywKKyAgICAgICAgICAgIGVuZCA9IGF2X3Jlc2NhbGUoc3VidGl0bGUtPnB0cyAtIGlzdC0+ cHJldl9zdWIuc3VidGl0bGUucHRzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAxMDAw LCBBVl9USU1FX0JBU0UpOwogICAgICAgICAgICAgaWYgKGVuZCA8IGlzdC0+cHJldl9zdWIuc3Vi dGl0bGUuZW5kX2Rpc3BsYXlfdGltZSkgewogICAgICAgICAgICAgICAgIGF2X2xvZyhpc3QtPmRl Y19jdHgsIEFWX0xPR19ERUJVRywKQEAgLTI1MTQsNyArMjUwMyw3IEBAIHN0YXRpYyBpbnQgdHJh bnNjb2RlX3N1YnRpdGxlcyhJbnB1dFN0cmVhbSAqaXN0LCBBVlBhY2tldCAqcGt0LCBpbnQgKmdv dF9vdXRwdXQsCiAgICAgICAgIH0KICAgICAgICAgRkZTV0FQKGludCwgICAgICAgICpnb3Rfb3V0 cHV0LCBpc3QtPnByZXZfc3ViLmdvdF9vdXRwdXQpOwogICAgICAgICBGRlNXQVAoaW50LCAgICAg ICAgcmV0LCAgICAgICAgIGlzdC0+cHJldl9zdWIucmV0KTsKLSAgICAgICAgRkZTV0FQKEFWU3Vi dGl0bGUsIHN1YnRpdGxlLCAgICBpc3QtPnByZXZfc3ViLnN1YnRpdGxlKTsKKyAgICAgICAgRkZT V0FQKEFWU3VidGl0bGUsICpzdWJ0aXRsZSwgICBpc3QtPnByZXZfc3ViLnN1YnRpdGxlKTsKICAg ICAgICAgaWYgKGVuZCA8PSAwKQogICAgICAgICAgICAgZ290byBvdXQ7CiAgICAgfQpAQCAtMjUy Myw3ICsyNTEyLDcgQEAgc3RhdGljIGludCB0cmFuc2NvZGVfc3VidGl0bGVzKElucHV0U3RyZWFt ICppc3QsIEFWUGFja2V0ICpwa3QsIGludCAqZ290X291dHB1dCwKICAgICAgICAgcmV0dXJuIHJl dDsKIAogICAgIGlmIChpc3QtPnN1YjJ2aWRlby5mcmFtZSkgewotICAgICAgICBzdWIydmlkZW9f dXBkYXRlKGlzdCwgSU5UNjRfTUlOLCAmc3VidGl0bGUpOworICAgICAgICBzdWIydmlkZW9fdXBk YXRlKGlzdCwgSU5UNjRfTUlOLCBzdWJ0aXRsZSk7CiAgICAgfSBlbHNlIGlmIChpc3QtPm5iX2Zp bHRlcnMpIHsKICAgICAgICAgaWYgKCFpc3QtPnN1YjJ2aWRlby5zdWJfcXVldWUpCiAgICAgICAg ICAgICBpc3QtPnN1YjJ2aWRlby5zdWJfcXVldWUgPSBhdl9maWZvX2FsbG9jKDggKiBzaXplb2Yo QVZTdWJ0aXRsZSkpOwpAQCAtMjUzNCwzMSArMjUyMyw1MCBAQCBzdGF0aWMgaW50IHRyYW5zY29k ZV9zdWJ0aXRsZXMoSW5wdXRTdHJlYW0gKmlzdCwgQVZQYWNrZXQgKnBrdCwgaW50ICpnb3Rfb3V0 cHV0LAogICAgICAgICAgICAgaWYgKHJldCA8IDApCiAgICAgICAgICAgICAgICAgZXhpdF9wcm9n cmFtKDEpOwogICAgICAgICB9Ci0gICAgICAgIGF2X2ZpZm9fZ2VuZXJpY193cml0ZShpc3QtPnN1 YjJ2aWRlby5zdWJfcXVldWUsICZzdWJ0aXRsZSwgc2l6ZW9mKHN1YnRpdGxlKSwgTlVMTCk7Cisg ICAgICAgIGF2X2ZpZm9fZ2VuZXJpY193cml0ZShpc3QtPnN1YjJ2aWRlby5zdWJfcXVldWUsIHN1 YnRpdGxlLCBzaXplb2YoKnN1YnRpdGxlKSwgTlVMTCk7CiAgICAgICAgIGZyZWVfc3ViID0gMDsK ICAgICB9CiAKLSAgICBpZiAoIXN1YnRpdGxlLm51bV9yZWN0cykKKyAgICBpZiAoIXN1YnRpdGxl LT5udW1fcmVjdHMpCiAgICAgICAgIGdvdG8gb3V0OwogCiAgICAgaXN0LT5mcmFtZXNfZGVjb2Rl ZCsrOwogCi0gICAgZm9yIChpID0gMDsgaSA8IG5iX291dHB1dF9zdHJlYW1zOyBpKyspIHsKKyAg ICBmb3IgKGludCBpID0gMDsgaSA8IG5iX291dHB1dF9zdHJlYW1zOyBpKyspIHsKICAgICAgICAg T3V0cHV0U3RyZWFtICpvc3QgPSBvdXRwdXRfc3RyZWFtc1tpXTsKIAogICAgICAgICBpZiAoIWNo ZWNrX291dHB1dF9jb25zdHJhaW50cyhpc3QsIG9zdCkgfHwgIW9zdC0+ZW5jb2RpbmdfbmVlZGVk CiAgICAgICAgICAgICB8fCBvc3QtPmVuYy0+dHlwZSAhPSBBVk1FRElBX1RZUEVfU1VCVElUTEUp CiAgICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAgICBkb19zdWJ0aXRsZV9vdXQob3V0cHV0 X2ZpbGVzW29zdC0+ZmlsZV9pbmRleF0sIG9zdCwgJnN1YnRpdGxlKTsKKyAgICAgICAgZG9fc3Vi dGl0bGVfb3V0KG91dHB1dF9maWxlc1tvc3QtPmZpbGVfaW5kZXhdLCBvc3QsIHN1YnRpdGxlKTsK ICAgICB9CiAKIG91dDoKICAgICBpZiAoZnJlZV9zdWIpCi0gICAgICAgIGF2c3VidGl0bGVfZnJl ZSgmc3VidGl0bGUpOworICAgICAgICBhdnN1YnRpdGxlX2ZyZWUoc3VidGl0bGUpOwogICAgIHJl dHVybiByZXQ7CiB9CiAKK3N0YXRpYyBpbnQgdHJhbnNjb2RlX3N1YnRpdGxlcyhJbnB1dFN0cmVh bSAqaXN0LCBBVlBhY2tldCAqcGt0LCBpbnQgKmdvdF9vdXRwdXQsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgaW50ICpkZWNvZGVfZmFpbGVkKQoreworICAgIEFWU3VidGl0bGUgc3Vi dGl0bGU7CisgICAgaW50IHJldCA9IGF2Y29kZWNfZGVjb2RlX3N1YnRpdGxlMihpc3QtPmRlY19j dHgsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmc3VidGl0bGUsIGdv dF9vdXRwdXQsIHBrdCk7CisKKyAgICBjaGVja19kZWNvZGVfcmVzdWx0KE5VTEwsIGdvdF9vdXRw dXQsIHJldCk7CisKKyAgICBpZiAocmV0IDwgMCB8fCAhKmdvdF9vdXRwdXQpIHsKKyAgICAgICAg KmRlY29kZV9mYWlsZWQgPSAxOworICAgICAgICBpZiAoIXBrdC0+c2l6ZSkKKyAgICAgICAgICAg IHN1YjJ2aWRlb19mbHVzaChpc3QpOworICAgICAgICByZXR1cm4gcmV0OworICAgIH0KKworICAg IHJldHVybiBlbmNvZGVfbXV4X3N1YnRpdGxlcyhpc3QsICZzdWJ0aXRsZSwgZ290X291dHB1dCk7 Cit9CisKIHN0YXRpYyBpbnQgc2VuZF9maWx0ZXJfZW9mKElucHV0U3RyZWFtICppc3QpCiB7CiAg ICAgaW50IGksIHJldDsKLS0gCjIuMzMuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KZmZtcGVnLWRldmVsIG1haWxpbmcgbGlzdApmZm1wZWctZGV2ZWxA ZmZtcGVnLm9yZwpodHRwczovL2ZmbXBlZy5vcmcvbWFpbG1hbi9saXN0aW5mby9mZm1wZWctZGV2 ZWwKClRvIHVuc3Vic2NyaWJlLCB2aXNpdCBsaW5rIGFib3ZlLCBvciBlbWFpbApmZm1wZWctZGV2 ZWwtcmVxdWVzdEBmZm1wZWcub3JnIHdpdGggc3ViamVjdCAidW5zdWJzY3JpYmUiLgo=