From patchwork Sat Sep 11 08:19:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30139 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2237903iov; Sat, 11 Sep 2021 01:19:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxeoWTGI2eejRKlKajmwsmX8myRcbxO7Vkhti0QVXwOPW/HCK9hGGtKsp2X5TDMgqQmZAoW X-Received: by 2002:aa7:c782:: with SMTP id n2mr2201471eds.77.1631348365591; Sat, 11 Sep 2021 01:19:25 -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 ne33si1373800ejc.598.2021.09.11.01.19.25; Sat, 11 Sep 2021 01:19:25 -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=md1Sz6XA; 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 3928068A5E7; Sat, 11 Sep 2021 11:19:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11olkn2106.outbound.protection.outlook.com [40.92.18.106]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C7D168A181 for ; Sat, 11 Sep 2021 11:19:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SmQY27w1A5lJqYbCfl/WDKBc+yUMbIg7rm/OAChj5HzScdJv/Z/9+dt/P+vrfxbqrnsPfvMBByiQx7V0B3D5uR8UcGBV+dJ3VJvwViGXtWXW7tqWnoS/wWXjy1DhhtPtgZ0x1lUM6qO9kD7oMcM1V5CC02rt3FDBkwQX6D1U52JjiaOu0ePPDq/eNrbkq9F+WaNf9Iow43sZnOhO/6YrN2DU1sd0bXbqq4EeYNmvIwaWmMRikhd+/lkKu7rgAYgmt2iB5oyA8o+lhQSK9N5QR7euNrJhFjKgRR3WiCZRUgyQkrTAgmJ2M7WODA5pX3DI8shIB4qVyaKeq/Cd3ynkXw== 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=Km7xzpXeJk0NeEAj4PabRNU4jbHXUEYYrSjS91CJ8Jda2RIk89tPxQfAFMxRabAbvTyPQ65f8WdsLa9c2wPHeBJuaycE3N7KWtBvdNmMJABzejbs3ofEBf+nbbjkZI24t44WHlXyy66OoiHct4+WqgE63FEE2jxKh1HE6O5TPbfS7t+h6a0pGZsjFDbmV18FlLKCEg/JBLvfmUhHPqoJK6+8D8XDVWNy9zuauw98NGI2XMBmoeyW5HIy6Qpl16mL0ezUbtjfgJ8pHVA6YOAkNqYoTdppXmj9DO796+VBIyv17mosOG0mK71rsXGdLmxTNiKpFo25XcT29o/9zemE4Q== 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=md1Sz6XAD2ZMUZOjf9HNJjI8AGj842dggNSrAs11tCQdH/Lm0M2ZCmOYCrY5kqcyY4XGlHbi3ugto8MzZhcA6tN7+tUQoSnDjv9E91y3TwFHhqmdqrSlb4L5Rgl4erbYCALD2QAhTTQ9sKDn4gYjuFJ0ZWmmlDLTPwDGP4jfNxuf5PJKUe2IIPZn8QOO/XPLXwkS5n4EjpZKtNyiEz67u0PuVdSDqRliWML+F7kRGGCGHpDwLZA02wtkIvPIBXXA5mTNhhGtVr4FcZq85qic0pXt83e369pTm/B+tcOGvC9j9JUvsXKZVmV6UqjJJuiQad7eMmUn0sX+Y08to7mDag== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB6048.namprd04.prod.outlook.com (2603:10b6:208:e5::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sat, 11 Sep 2021 08:19:13 +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.4500.018; Sat, 11 Sep 2021 08:19:13 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v4 06/18] avcodec/ass_split: Extend ass dialog parsing Thread-Index: Adekd9FI1iBVUAeRR9+3OSuoLHjkpQ== Date: Sat, 11 Sep 2021 08:19:12 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [RjKD14NC7qY6tEgho8L8WwiZouR0K740g7Y237Yzb4w=] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 39ffe0a3-a22e-4222-f478-08d974fcd694 x-ms-traffictypediagnostic: MN2PR04MB6048: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: wUWQKFRSTOoRPyb0ercz3DrkZGdNE9PuoDZMaBaxjIluN7udOQP14lxm0x1xKlYr2+DLd/xKp9g09b8DZMCyVbqC4qkIl3Usl+p5jic85uriEgRUhVbnR7SUmyFtu+V33bIDwpBkmsIcuhacw0PJWo8v5Fykyd3d8l3AX+k+qA3JW6EFP5OQAgK/BzGfeUjT0ExCWUfK5H9NrzBgVdoToURFsqvuDDZMgogPbR5V3J/+lII2tHsp21eoC1OHbFYKQWgEpvaGNw0CBN1BFFLe4XbeRtOcsi5nxHwPEsQmwDK9iIgZ6BInykwUAe+CrXaR9JjgP6Gf69JCymg/sI18RctQW0m+ikuoHGJtDq5VfljnS/qDmIbIvyt45bqfthEqes0YsdsnziqojGSWpzN3IyKyWv5Tf57rq8dCopsGFr4fp2PK5ILrE99fAKrh+fy9 x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: DP/cRIjTLbYGTqGfS4dC8Wiltrzg45y6Ba1Em1sY+5ospstEOOwDg9lNdb2ukFlnwVXZn0PbCIqRV09Pc0Jmhji/SnzhEwI3lcxWoePhW/dgEds+v/q/emcIrIVpLM/FAIXSqhvH+/rc2M/DCazN8g== 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: 39ffe0a3-a22e-4222-f478-08d974fcd694 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Sep 2021 08:19:12.9832 (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: MN2PR04MB6048 Subject: [FFmpeg-devel] [PATCH v4 06/18] 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: aTzQza/m/1oJ 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); /** @} */ /**