From patchwork Thu Sep 16 20:30:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30286 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1583085iov; Thu, 16 Sep 2021 13:32:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxkiYITkoRNO9FmsdVRxKv9uZEpuPrYeu92pux5LQwAZFqWnRG+JROpun+3YDz9v8lLSMI3 X-Received: by 2002:a17:906:2887:: with SMTP id o7mr8128325ejd.425.1631824336092; Thu, 16 Sep 2021 13:32:16 -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 k28si4507830edk.420.2021.09.16.13.32.15; Thu, 16 Sep 2021 13:32:16 -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=cruU3K8W; 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 287E468B09E; Thu, 16 Sep 2021 23:30:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2034.outbound.protection.outlook.com [40.92.19.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CDB5168B09E for ; Thu, 16 Sep 2021 23:30:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fAYQntzNebnJGYv5BBvDJvvDN/iuTY+rqgqp9KwmHcWcPZRvKkBWm+t/7SAIyewj9ePo8wfOw+LnuLgFKhcnJ48v7tA/oidLMW0CfSBkrbWq9oa7vDX2nkGgrQ+sMAjulL2lDw5272RqWgHm8+BoAsq1D2F9oTEmRHl0LMxjFvbHG5HWVFFXJbO2rstN3XpW69auRhNSK/aX4AM3B1bO/6h5ztCi+idB5pxf59VdvOw6bOC/8LM6yoEKIgfn4SFDjN+6Ymy3tp72ZjBMf73fTlzeLsoVTNrGTjanxASQd3K2YedtY7OhMZwEuGgVsO+l3V9XjeL/EsCxoRFc7RfRbQ== 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=gkH39cnS8kVFY/UYql+tU5++wayb9xDzyrJWwJOiHfr7CTd31cnb2zim7FhG2VZcFGpIVnK9DSDmg/HgxWKeNwup+xhu1HHdrDUt8Wh9tuJzVHRfHy+mzdMIUecY2zWSiBn9z+nwmqUJ1ipmwRF+UoHsC1VdDU18ga1sbsHtZ/XRnU+ZuqXtvi6dyiufbdKPrqlLxLLAD8Gl1LaHpUT7qRxJ8prP2pJwI41/JUhhOmaqvAm17R9LGnKMQ+pOUBaegq12R4Rv4nunBQOeKCyblcQV3aGcwDDeucnIC3Q9Hdjhx+2SFwHE3EQdn1OOfZvq9BVlNA1Mpy0TZqWSwTatdw== 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=cruU3K8Way/l2/O7ki+Sm2vxdxIwR3+BlwTRdl/bc+N/5bhCVNabQEumEog5wystnzipoBhiu4JU4USyNwLEcUSh7UUVmnkMjgMiI83XlVtIGfDpoSs5+6zdm72uvfvibxLDCxvb06yicw9rbFzPcjAqsQIS7/NrB3fCIWJB9OwJd4g2HE3ftdE3k3KXfGQl4KwlYxRX3QdmLTIZ1gM5w9EuLIj2XryWPEkpCvirc3A5J2ufbTSlpu+9b2+BgWtdFw4cKgh6sTb44WrLaZuE61zKCrCxxAhxmUweJzcG5rmuKqN8Jp9rqEaqFBpHAlC6LxSfbmmBfLWL+keQwayNLw== 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.4523.14; Thu, 16 Sep 2021 20:30:34 +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.016; Thu, 16 Sep 2021 20:30:34 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v6 10/11] avcodec/ass_split: Extend ass dialog parsing Thread-Index: AQHXqzmzbgPdnK4SRUqXgCumVhZ6Gg== Date: Thu, 16 Sep 2021 20:30:34 +0000 Message-ID: References: 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: [6E/4WBbQunRf4nrXJYgPBgAAy9VGtkFx] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: a5bb2224-895d-4c57-409f-08d97950d634 x-ms-traffictypediagnostic: MN2PR04MB6048: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: IiQdrkgfrTh8FGWd5MO/JO1zkI+8RPAYqyC1PnaVTfkGyRVxEhyYjm4SzKgGKiMD0Cd0u0fW85bbeYxIFnLLb4O4ZIhQVfvzRtZKENYez21gmCWcy/aOgnTjlQDQfnhc2rxzKDhtJYcQfHvksbPu6u0o9YBcr3fXtmESWMAFKJsRtqSmU5H1m+2cE2o+z98af0a5ZxIauK/k/K4WnLH8VPNY0PQl7y+qug3ioMA9DAGE7cOD0Mk35+Lm4WFQ075l5oGNATf/o2cN4F3pUs1V8KL7IKj7ePpgRpVcQiuiexw6tQH0UUQ6bmUjFxkKnRj/kfIV+WbBJMeXsTKIIjhlGRGIO0nSzZkoyzDi5mxZqqDgPkP3jyiQXN+MG1OfY5bwCDohFWBnSDw2O9eogpI8Ak+45lmlu5322+yRsoDPq4g4rtUPPwMfFUOudz16rNpR x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: xdscrV374IwlAJqrIbew0E0h8f/dBVkcKlCQmt45cmYTUt0rjHy0v4bt97tIYc084cesY9uZj/djpXp5IhkAiDRSztThaqVHYMMmsL0itCZpTF+XZGy0CnjLaYek01dJmZICI/8lm4APGs3x8frK/A== 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: a5bb2224-895d-4c57-409f-08d97950d634 X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Sep 2021 20:30:34.7199 (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 v6 10/11] 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: QcAQmW58N+P9 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); /** @} */ /**