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 0A1A44290D for ; Fri, 5 Aug 2022 13:20:04 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 09F4568B1F6; Fri, 5 Aug 2022 16:20:00 +0300 (EEST) Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D0AC068B4F6 for ; Fri, 5 Aug 2022 16:19:52 +0300 (EEST) Received: by mail-lf1-f42.google.com with SMTP id y11so3402458lfs.6 for ; Fri, 05 Aug 2022 06:19:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=vxHdnQrKY2vBXc5P0icor/74xIzNTj1NxH97YMfTiuo=; b=f5ExlbjIM1dR1/tgMVrSQAS2/5yFIepXDFIdsMatAwhuNBkeYz4fu4x2yf9n4i9lmr vFKoIgHwKj2lJEL/mENP4gFwKe5LLS6KlzMzMT+Zn7I39hnEl2i5Nh9l6p7OWfnRYtdf Jxn1xGzioph2RbcBV7dIqToVoNEIz2orG1xCPPliRy6NecIE+7sxh6v0VZbSqG77RUjU Bn32xNPB/BMhdFYe66u5r6swhbMZJsMaELzqDGHpoXTgucVM6/3eI/dOQqnW8+TI2agL kIBLQY9z3/ETQqPWFEC3fezJM4Lp6GuKR9PMvSZNClTxSNBg8eCnbHFcQWMpFj31ydM0 XW8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=vxHdnQrKY2vBXc5P0icor/74xIzNTj1NxH97YMfTiuo=; b=AKLREksx3q/++5Fgy4EhGOHcyXeusWTxLv16ofsnEGvo2jjpuGwno4yoseAgEzHDd4 qkoxnmjvP6CITHGwjRgFWBzSsXCqVz6m9NEHDd/KDaZ6ueySOkEM3Hub8tyOtdslPbsR Q8up/jEBfdyvFGbtBirW4sWs+nWvfES3HbvngmKrPz8RKhkXJg09jodug/CIDCmXIfEg B2m5cAOeg4ug2jex7Zzc6M1C2IMcxPXUJzIByw+HeuwZfs4j00tXB1FUZO/a5ZAlR1aX 05VeGUyLYIesy/baJYjIXRSh4AsoQg8gLBKZ4FgHNO0N3nIuqvhsiY6BIL1WrRehYPhK hP2Q== X-Gm-Message-State: ACgBeo1Ts4h0FeLM/E0GKYp3l5IJx5wmj3JHoGbmOQaR8QIOJYL3/OXQ BH/tTfLSMqIolSsUX+3uiOrDAOuTVpA= X-Google-Smtp-Source: AA6agR5LpMM5UwMv+JjdIXPWs/8NHt/CMmBIt/ZbtxVqffmXZ4Htf6N0YvyjlahVmE9cunEkklsqRg== X-Received: by 2002:ac2:4f02:0:b0:481:43a8:e368 with SMTP id k2-20020ac24f02000000b0048143a8e368mr2221192lfr.65.1659705591808; Fri, 05 Aug 2022 06:19:51 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id o20-20020a2e9b54000000b0025e2c5a12b6sm467373ljj.129.2022.08.05.06.19.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Aug 2022 06:19:50 -0700 (PDT) From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Aug 2022 16:19:43 +0300 Message-Id: <20220805131945.21970-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220729133537.53269-1-jeebjp@gmail.com> References: <20220729133537.53269-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 1/3] 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 dG9vbHMvZmZtcGVnLmMgYi9mZnRvb2xzL2ZmbXBlZy5jCmluZGV4IDQ3NDY3NDJjMDIuLjliNTE0 YTJkYjUgMTAwNjQ0Ci0tLSBhL2ZmdG9vbHMvZmZtcGVnLmMKKysrIGIvZmZ0b29scy9mZm1wZWcu YwpAQCAtMjMwMSwyNyArMjMwMSwxNiBAQCBmYWlsOgogICAgIHJldHVybiBlcnIgPCAwID8gZXJy IDogcmV0OwogfQogCi1zdGF0aWMgaW50IHRyYW5zY29kZV9zdWJ0aXRsZXMoSW5wdXRTdHJlYW0g KmlzdCwgQVZQYWNrZXQgKnBrdCwgaW50ICpnb3Rfb3V0cHV0LAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGludCAqZGVjb2RlX2ZhaWxlZCkKK3N0YXRpYyBpbnQgcHJvY2Vzc19zdWJ0 aXRsZShJbnB1dFN0cmVhbSAqaXN0LCBBVlN1YnRpdGxlICpzdWJ0aXRsZSwgaW50ICpnb3Rfb3V0 cHV0KQogewotICAgIEFWU3VidGl0bGUgc3VidGl0bGU7CisgICAgaW50IHJldCA9IDA7CiAgICAg aW50IGZyZWVfc3ViID0gMTsKLSAgICBpbnQgaSwgcmV0ID0gYXZjb2RlY19kZWNvZGVfc3VidGl0 bGUyKGlzdC0+ZGVjX2N0eCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICZzdWJ0aXRsZSwgZ290X291dHB1dCwgcGt0KTsKIAotICAgIGNoZWNrX2RlY29kZV9yZXN1 bHQoTlVMTCwgZ290X291dHB1dCwgcmV0KTsKLQotICAgIGlmIChyZXQgPCAwIHx8ICEqZ290X291 dHB1dCkgewotICAgICAgICAqZGVjb2RlX2ZhaWxlZCA9IDE7Ci0gICAgICAgIGlmICghcGt0LT5z aXplKQotICAgICAgICAgICAgc3ViMnZpZGVvX2ZsdXNoKGlzdCk7Ci0gICAgICAgIHJldHVybiBy ZXQ7Ci0gICAgfQogCiAgICAgaWYgKGlzdC0+Zml4X3N1Yl9kdXJhdGlvbikgewogICAgICAgICBp bnQgZW5kID0gMTsKICAgICAgICAgaWYgKGlzdC0+cHJldl9zdWIuZ290X291dHB1dCkgewotICAg ICAgICAgICAgZW5kID0gYXZfcmVzY2FsZShzdWJ0aXRsZS5wdHMgLSBpc3QtPnByZXZfc3ViLnN1 YnRpdGxlLnB0cywKKyAgICAgICAgICAgIGVuZCA9IGF2X3Jlc2NhbGUoc3VidGl0bGUtPnB0cyAt IGlzdC0+cHJldl9zdWIuc3VidGl0bGUucHRzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAxMDAwLCBBVl9USU1FX0JBU0UpOwogICAgICAgICAgICAgaWYgKGVuZCA8IGlzdC0+cHJldl9z dWIuc3VidGl0bGUuZW5kX2Rpc3BsYXlfdGltZSkgewogICAgICAgICAgICAgICAgIGF2X2xvZyhO VUxMLCBBVl9MT0dfREVCVUcsCkBAIC0yMzMzLDcgKzIzMjIsNyBAQCBzdGF0aWMgaW50IHRyYW5z Y29kZV9zdWJ0aXRsZXMoSW5wdXRTdHJlYW0gKmlzdCwgQVZQYWNrZXQgKnBrdCwgaW50ICpnb3Rf b3V0cHV0LAogICAgICAgICB9CiAgICAgICAgIEZGU1dBUChpbnQsICAgICAgICAqZ290X291dHB1 dCwgaXN0LT5wcmV2X3N1Yi5nb3Rfb3V0cHV0KTsKICAgICAgICAgRkZTV0FQKGludCwgICAgICAg IHJldCwgICAgICAgICBpc3QtPnByZXZfc3ViLnJldCk7Ci0gICAgICAgIEZGU1dBUChBVlN1YnRp dGxlLCBzdWJ0aXRsZSwgICAgaXN0LT5wcmV2X3N1Yi5zdWJ0aXRsZSk7CisgICAgICAgIEZGU1dB UChBVlN1YnRpdGxlLCAqc3VidGl0bGUsICAgaXN0LT5wcmV2X3N1Yi5zdWJ0aXRsZSk7CiAgICAg ICAgIGlmIChlbmQgPD0gMCkKICAgICAgICAgICAgIGdvdG8gb3V0OwogICAgIH0KQEAgLTIzNDIs NDAgKzIzMzEsNTkgQEAgc3RhdGljIGludCB0cmFuc2NvZGVfc3VidGl0bGVzKElucHV0U3RyZWFt ICppc3QsIEFWUGFja2V0ICpwa3QsIGludCAqZ290X291dHB1dCwKICAgICAgICAgcmV0dXJuIHJl dDsKIAogICAgIGlmIChpc3QtPnN1YjJ2aWRlby5mcmFtZSkgewotICAgICAgICBzdWIydmlkZW9f dXBkYXRlKGlzdCwgSU5UNjRfTUlOLCAmc3VidGl0bGUpOworICAgICAgICBzdWIydmlkZW9fdXBk YXRlKGlzdCwgSU5UNjRfTUlOLCBzdWJ0aXRsZSk7CiAgICAgfSBlbHNlIGlmIChpc3QtPm5iX2Zp bHRlcnMpIHsKICAgICAgICAgaWYgKCFpc3QtPnN1YjJ2aWRlby5zdWJfcXVldWUpCiAgICAgICAg ICAgICBpc3QtPnN1YjJ2aWRlby5zdWJfcXVldWUgPSBhdl9maWZvX2FsbG9jMig4LCBzaXplb2Yo QVZTdWJ0aXRsZSksIEFWX0ZJRk9fRkxBR19BVVRPX0dST1cpOwogICAgICAgICBpZiAoIWlzdC0+ c3ViMnZpZGVvLnN1Yl9xdWV1ZSkKICAgICAgICAgICAgIGV4aXRfcHJvZ3JhbSgxKTsKIAotICAg ICAgICByZXQgPSBhdl9maWZvX3dyaXRlKGlzdC0+c3ViMnZpZGVvLnN1Yl9xdWV1ZSwgJnN1YnRp dGxlLCAxKTsKKyAgICAgICAgcmV0ID0gYXZfZmlmb193cml0ZShpc3QtPnN1YjJ2aWRlby5zdWJf cXVldWUsIHN1YnRpdGxlLCAxKTsKICAgICAgICAgaWYgKHJldCA8IDApCiAgICAgICAgICAgICBl eGl0X3Byb2dyYW0oMSk7CiAgICAgICAgIGZyZWVfc3ViID0gMDsKICAgICB9CiAKLSAgICBpZiAo IXN1YnRpdGxlLm51bV9yZWN0cykKKyAgICBpZiAoIXN1YnRpdGxlLT5udW1fcmVjdHMpCiAgICAg ICAgIGdvdG8gb3V0OwogCiAgICAgaXN0LT5mcmFtZXNfZGVjb2RlZCsrOwogCi0gICAgZm9yIChp ID0gMDsgaSA8IG5iX291dHB1dF9zdHJlYW1zOyBpKyspIHsKKyAgICBmb3IgKGludCBpID0gMDsg aSA8IG5iX291dHB1dF9zdHJlYW1zOyBpKyspIHsKICAgICAgICAgT3V0cHV0U3RyZWFtICpvc3Qg PSBvdXRwdXRfc3RyZWFtc1tpXTsKIAogICAgICAgICBpZiAoIWNoZWNrX291dHB1dF9jb25zdHJh aW50cyhpc3QsIG9zdCkgfHwgIW9zdC0+ZW5jb2RpbmdfbmVlZGVkCiAgICAgICAgICAgICB8fCBv c3QtPmVuYy0+dHlwZSAhPSBBVk1FRElBX1RZUEVfU1VCVElUTEUpCiAgICAgICAgICAgICBjb250 aW51ZTsKIAotICAgICAgICBkb19zdWJ0aXRsZV9vdXQob3V0cHV0X2ZpbGVzW29zdC0+ZmlsZV9p bmRleF0sIG9zdCwgJnN1YnRpdGxlKTsKKyAgICAgICAgZG9fc3VidGl0bGVfb3V0KG91dHB1dF9m aWxlc1tvc3QtPmZpbGVfaW5kZXhdLCBvc3QsIHN1YnRpdGxlKTsKICAgICB9CiAKIG91dDoKICAg ICBpZiAoZnJlZV9zdWIpCi0gICAgICAgIGF2c3VidGl0bGVfZnJlZSgmc3VidGl0bGUpOworICAg ICAgICBhdnN1YnRpdGxlX2ZyZWUoc3VidGl0bGUpOwogICAgIHJldHVybiByZXQ7CiB9CiAKK3N0 YXRpYyBpbnQgdHJhbnNjb2RlX3N1YnRpdGxlcyhJbnB1dFN0cmVhbSAqaXN0LCBBVlBhY2tldCAq cGt0LCBpbnQgKmdvdF9vdXRwdXQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50 ICpkZWNvZGVfZmFpbGVkKQoreworICAgIEFWU3VidGl0bGUgc3VidGl0bGU7CisgICAgaW50IHJl dCA9IGF2Y29kZWNfZGVjb2RlX3N1YnRpdGxlMihpc3QtPmRlY19jdHgsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAmc3VidGl0bGUsIGdvdF9vdXRwdXQsIHBrdCk7CisK KyAgICBjaGVja19kZWNvZGVfcmVzdWx0KE5VTEwsIGdvdF9vdXRwdXQsIHJldCk7CisKKyAgICBp ZiAocmV0IDwgMCB8fCAhKmdvdF9vdXRwdXQpIHsKKyAgICAgICAgKmRlY29kZV9mYWlsZWQgPSAx OworICAgICAgICBpZiAoIXBrdC0+c2l6ZSkKKyAgICAgICAgICAgIHN1YjJ2aWRlb19mbHVzaChp c3QpOworICAgICAgICByZXR1cm4gcmV0OworICAgIH0KKworICAgIHJldHVybiBwcm9jZXNzX3N1 YnRpdGxlKGlzdCwgJnN1YnRpdGxlLCBnb3Rfb3V0cHV0KTsKK30KKwogc3RhdGljIGludCBzZW5k X2ZpbHRlcl9lb2YoSW5wdXRTdHJlYW0gKmlzdCkKIHsKICAgICBpbnQgaSwgcmV0OwotLSAKMi4z Ny4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpmZm1w ZWctZGV2ZWwgbWFpbGluZyBsaXN0CmZmbXBlZy1kZXZlbEBmZm1wZWcub3JnCmh0dHBzOi8vZmZt cGVnLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ZmbXBlZy1kZXZlbAoKVG8gdW5zdWJzY3JpYmUsIHZp c2l0IGxpbmsgYWJvdmUsIG9yIGVtYWlsCmZmbXBlZy1kZXZlbC1yZXF1ZXN0QGZmbXBlZy5vcmcg d2l0aCBzdWJqZWN0ICJ1bnN1YnNjcmliZSIuCg==