From patchwork Sun Sep 12 03:22:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30176 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2863641iov; Sat, 11 Sep 2021 20:23:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxwA09L9E7UXSnaD+wasMYV3bx1j29iUgVrf1d1D4B9vSxu1/QC+BEF8YYtFzddmmH8zOSo X-Received: by 2002:a05:6402:697:: with SMTP id f23mr5862973edy.253.1631417026368; Sat, 11 Sep 2021 20:23:46 -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 da3si3201211edb.255.2021.09.11.20.23.46; Sat, 11 Sep 2021 20:23:46 -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=oQDqe0X+; 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 8E63C68AA67; Sun, 12 Sep 2021 06:22:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10olkn2025.outbound.protection.outlook.com [40.92.41.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0EC2368AA4B for ; Sun, 12 Sep 2021 06:22:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Aq5gaPOOpdxdvFDILh1qZGx2QDinbZdqRfMCBtLm0nEhnw++qz6NG6vP5+VHqOfTpGzfbE4CeAJo//alSEcKojhQKl0g9qBL2xFvsKBclSqyXArC0NPKo/r4gkHsIRbHR7xwUY6mFMhtBXwLGLcKJm2GDJBHc6IebTz+kJ24Rm0TlDj2sEhEB6wGYPMslo9ZWG7xlKExdnUtJX93nJBMI0lOcubn27W9wxE5omcnV6WKQyd8FDDVYiRb8tk8sW8S9T2VVvDLsTI0q548BQJsqZIBhvVJefWITpWsSwpw4hdvnhhz1BXkvT+d0Un3vt7bNHsujWlvDcZJo7DFX0RUeA== 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=kgzPeAERazrhxV4vNOL+I6f1A3FdavnV1sgD72VJ5MSfR23E6KQpsQMeFDNXp25X0w+xB+ZBwA0wUF71hKpqYqbdHBLFzpV16EBSU/Zr790ugQK/IQvvd1VRW+8h6vrmUbPn2tZBwEjQROlfxxcKhQp3zgvq+xx8d5ap+xfawDFLyna2aUfDa3fnnQLmrBWh5GlxQgHJAWxR1AZlXTFX1M8v5MUBqYsDK1E01pF8592vDR4zbKPjQkkjLLtt/LqpZAlgUmV/LSzAVjOXL9TbWNDqV4x5wTvJIh8lt1edHO3rEH0Ohd94UZSC0EnTBOdVhq81OAygOr/Tl459WFj/nQ== 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=oQDqe0X+toFbyB3KhKrj8atoNycZj5Q5meu0dnGm2q2jW+OFWv2Yni0AhobcooMbCV3ZsGdy5IXvqrhYxv9BOybU71FREe9ag25OE+nO01j0aatXGeiHGwWInieD6fpGbn6rO7JcjmtN4UwV8tJjrFKtfDpy43djeVaAQRo49N2/v23OXi+Egz0cxJol7XNgIaeP+6BKjwO8OaBcy5xsRQ2W5p1rWoiME97YlL8nb0NjVQ2Ey0Tcbs3jwG2HshXelt5BbnGM7av1pUvrwMlEFIiOKRYa5vf5CyUkQd0DklPonqY1DOu9+vo/NOz+8w8alg2l2smYLKoRaw+bhN50+g== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB5728.namprd04.prod.outlook.com (2603:10b6:208:3d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Sun, 12 Sep 2021 03:22:05 +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; Sun, 12 Sep 2021 03:22:05 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v5 11/12] avcodec/ass_split: Extend ass dialog parsing Thread-Index: AQHXp4VcbR5M0ggNG0qPJDRa6r5NHQ== Date: Sun, 12 Sep 2021 03:22:05 +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: [f0/uXTDmz54k4dQqZdGK8Oc+B8F4n7KVKc2QkohMp4I=] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f5616128-5875-4350-2b9e-08d9759c7f31 x-ms-traffictypediagnostic: MN2PR04MB5728: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: kwu42Rv1dL/GqeGJDwGMj2uf0keMt1y7wGK7mrxahYAk1uQsvbuWmljbeHHKuAsTG9mBif1EeeY2BdCgw22P8TjzPiqJ3BNpGuqAGz2q4h8ScMpznBlnJQ3MRQgjD+k2NiY79P1bu6D4xpLDrzeHdyVNI5Kw15mFfWkKcCB8pOXl5/oqmLaV+OlB++p2vFuFKZfjr1aT2xWAjebpYkBhbRj5TDsKkg+bG5AngwFYVaXCSBNpmhLGfiEs48UPi/WEqljLc+oOYg4DdaHcirlN89r0q/UXcZbxMis8GXEG5rQY2PlpFFinNRexDZz/1dS1MKZvxPFdkhtO2+GrXrAhqQluaHjZVLPA15Y9X6TpvxJj1Wx4OctsXmMgQzHHRSTdRnqqIs/ITXlG6DPEpX2D2SSTwPlcrex00lSRT3EzoWoWVvd4hHG/tXTCbiAJodBS x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: /WgND1qfkC6J8jgUyB7RPKgnx4vAU53AmkekxCGrX39PaMXHOowIR6sgc68q9vY4KK8svGt6euZl3LmQ0qbBwkTeqlBHsA0KlLVpkjN2JVMn3ozc5wrZp4V0zIjnFwshIMQoFaP70BL+9SEVioaxUg== 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: f5616128-5875-4350-2b9e-08d9759c7f31 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Sep 2021 03:22:05.7693 (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: MN2PR04MB5728 Subject: [FFmpeg-devel] [PATCH v5 11/12] 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: DM6DXWwWkZwr 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); /** @} */ /**