From patchwork Tue Sep 21 23:54:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30438 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2919740iob; Tue, 21 Sep 2021 16:56:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0pQx/t0Suyt8EoP/3oa5jtclpBZC2ztodQMQkbD8fz4wiq/GwL0JWyeG5WGp97RiOXZ/G X-Received: by 2002:a50:9dcd:: with SMTP id l13mr15126126edk.90.1632268591106; Tue, 21 Sep 2021 16:56:31 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d2si608827edk.60.2021.09.21.16.56.30; Tue, 21 Sep 2021 16:56:31 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=MM9r5sl7; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6150968B0B2; Wed, 22 Sep 2021 02:55:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12olkn2057.outbound.protection.outlook.com [40.92.23.57]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D01268AE46 for ; Wed, 22 Sep 2021 02:54:56 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GHUSmEpsWgV5flSO+UbmvHbQ/xgjr66Wpl52kP935aJQSg6Fr7Ncvq4OQxq2+LEL3t8PKfHEl5JPr0wc1PvsH1MYJSXyU5LPUtR1vDvs4MUFvL/u4Xuda4zFvUXHaqr3yB+Xc6j4TAwNfvX/69kxGcidHSG4GGCbjWVHSww93fWHvhjSP4Hwdo0s7lVVOz6VgdZQHTiAL0lysckWK3nmWxuD5T3O733QbO+DnH/Ioox6wNMz9/4y1g6dvVWqPFiXRtEXm8nuCgx+D/oqpSbmdITBLctvgrI18pZTohY7FRsIaMmhYSZFuClbMxkgHaTWldD+e+sTIeki7OhTfYSVkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=aqv6slxUggHk3KxScMa1FvkVo4oJF/4VN9icEPRh++U=; b=AJpALlSxjlu0C1pbyswkZPPoVhkfUdw70rPfOLT6mk4hL+gRSeRYCyse4h87ViZS4hdzwbwphfBOLairotDmk0Jbs9YCnkCSp2+B559fFlGWRLisRvu3mDXKxTq2Z9/2NCrTVgsR1hTomQE8TpsoVy94R3dIUjX2um7PGq49+Gn3VFNwqJLYTckOYED8ckaZE782jmONL1ITv1a1rQ3NUwlfmELHsN+d9X7mEnLnuFpjb0SckjFSQy3eSj8tKkHLmu8XqhrOdl/21vxhw0TC7d2snzW7PonOPF+V8MZBdNPJGPv0BZiJGp/ZQORe7ilMwU4aGLzW23cwczK+3qReag== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aqv6slxUggHk3KxScMa1FvkVo4oJF/4VN9icEPRh++U=; b=MM9r5sl7q/tPnb1Mew783CDzmyB/szeOioLLQSnzXFQH9CGrStAfaP/umZK/J0t/S9Q67ib+4y+allYZcd7MLHGolysXU1BoOkjwRFXq8rj3uWWQMI+EzBK2cCpzXIMLgDFHp0egu0Bx5XAjvvhwk4iH4+B2QL5BNcXchRfpMJA37n1OVVHfunc6PacLguYyLflVbKGwLiBYfecDyz7FY+jGJdRGi4aGZpo78nF2gDJweVlw2lYBfHcIzToZ1rnPB5w8lw7kqnYGGN0j3S9KCahr2KjvOJ/FhIZKFKkgQHUfvPUIzjBG6NcBWgc0PGBo/FpxeqsrD+t7CoAYzJKTjg== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB5520.namprd04.prod.outlook.com (2603:10b6:208:d7::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Tue, 21 Sep 2021 23:54:51 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4523.019; Tue, 21 Sep 2021 23:54:51 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v8 10/13] avcodec/ass_split: Extend ass dialog parsing Thread-Index: AQHXr0QR7NqN9t+T6kCb2EKNQRlH+Q== Date: Tue, 21 Sep 2021 23:54:51 +0000 Message-ID: References: <2f4d7190c46bde35cfef16e74900bd11a42856a8.1632266268.git.softworkz@hotmail.com> <4855e43e9cec16b6fa4db8991ddba687b5b90517.1632266268.git.softworkz@hotmail.com> <9b2d5f77fd58279aa3bcfe53e9a211f7d088213a.1632266268.git.softworkz@hotmail.com> <0b57654b386ea5a47dff24924c5ba2a8a3ae3f12.1632266268.git.softworkz@hotmail.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [Wg1wVG8siv0NzjgeFjmq391qi5VxQlR1] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 46e0129b-1fae-42be-ff1d-08d97d5b341d x-ms-traffictypediagnostic: MN2PR04MB5520: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: xYkttHexri/fRiNmdSaMDyDS4N4iqAbKSdMYV3Hqrzp6YGdzz5XEdDHsSyYFomflJxmIHJDBDW3xMSs1O1x1/IQ3EWiw2k8zXFKvvON+DcFC8zWc14BePNVIR3la6ARveM30Qt0boU6qaIvgri253XDYGjhrvix/PRXTCM0xsIzk+JTURysebVQie86uLASrlVdq77EkOBBFobQWsosX71EEhs2wQCqnUvaVL/oE2nxPTapZg0Kq932lyNIEkPaDDX6vqHzsBiZmWD6NHLHLqwux7UZBlNIbC/0MPL/BFyT+uavjuy1k4hty0FjziNsFHXBAzuGHuzAkZ+J+L9yoZlvnEWPjEI47fytkWii8h5Qt6spGz/cj497paMmY9lvkcFptUUOLr+VfRJD/8SwfFpKDOBtxgDzNPM6yQv9rj0WEWOEEQ86S7HENBiXee4OH x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: 12s1wRM+1dnsw5Sq1SN6zFZfehjJhq8OOoQ21H4HYqoqIWRPaILcHM4ryo04MxmgBwPryXJsGkNUGBd/YXk2zFXrvkmkFrcPY40/V9gPVFa6teoPHeKfZg6/gVTa7Jot/IHVj5+/8xsFxgqZDWeT0A== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 46e0129b-1fae-42be-ff1d-08d97d5b341d X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Sep 2021 23:54:51.9203 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR04MB5520 Subject: [FFmpeg-devel] [PATCH v8 10/13] avcodec/ass_split: Extend ass dialog parsing 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" X-TUID: bnsIiM0/cEe5 Signed-off-by: softworkz --- libavcodec/ass_split.c | 12 ++++++++++-- libavcodec/ass_split.h | 2 ++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/libavcodec/ass_split.c b/libavcodec/ass_split.c index 05c5453e53..e58585d3da 100644 --- a/libavcodec/ass_split.c +++ b/libavcodec/ass_split.c @@ -497,8 +497,8 @@ int ff_ass_split_override_codes(const ASSCodesCallbacks *callbacks, void *priv, while (*buf == '\\') { char style[2], c[2], sep[2], c_num[2] = "0", tmp[128] = {0}; unsigned int color = 0xFFFFFFFF; - int len, size = -1, an = -1, alpha = -1; - int x1, y1, x2, y2, t1 = -1, t2 = -1; + int len, size = -1, an = -1, alpha = -1, scale = 0; + int x1, y1, x2, y2, t1 = -1, t2 = -1, accel = 1; if (sscanf(buf, "\\%1[bisu]%1[01\\}]%n", style, c, &len) > 1) { int close = c[0] == '0' ? 1 : c[0] == '1' ? 0 : -1; len += close != -1; @@ -546,6 +546,14 @@ int ff_ass_split_override_codes(const ASSCodesCallbacks *callbacks, void *priv, } else if (sscanf(buf, "\\org(%d,%d)%1[\\}]%n", &x1, &y1, sep, &len) > 2) { if (callbacks->origin) callbacks->origin(priv, x1, y1); + } else if (sscanf(buf, "\\t(%d,%d,%1[\\}]%n", &t1, &t2, sep, &len) > 2 || + sscanf(buf, "\\t(%d,%d,%d,%1[\\}]%n", &t1, &t2, &accel, sep, &len) > 3) { + if (callbacks->animate) + callbacks->animate(priv, t1, t2, accel, tmp); + } else if (sscanf(buf, "\\p%1[\\}]%n", sep, &len) > 0 || + sscanf(buf, "\\p%u%1[\\}]%n", &scale, sep, &len) > 1) { + if (callbacks->drawing_mode) + callbacks->drawing_mode(priv, scale); } else { len = strcspn(buf+1, "\\}") + 2; /* skip unknown code */ } diff --git a/libavcodec/ass_split.h b/libavcodec/ass_split.h index a45fb9b8a1..bda7bb27db 100644 --- a/libavcodec/ass_split.h +++ b/libavcodec/ass_split.h @@ -156,7 +156,9 @@ typedef struct { * @{ */ void (*move)(void *priv, int x1, int y1, int x2, int y2, int t1, int t2); + void (*animate)(void *priv, int t1, int t2, int accel, char *style); void (*origin)(void *priv, int x, int y); + void (*drawing_mode)(void *priv, int scale); /** @} */ /**