From patchwork Tue Dec 7 23:21:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32166 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a0c:cdc3:0:0:0:0:0 with SMTP id a3csp1131002qvn; Tue, 7 Dec 2021 15:22:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJz/pzWv3XeNietZ8VdozvH9IKZV8+X1gH3wY3zgFNQZf1INdkuLnXcXNzn1inyjnX7dYxJS X-Received: by 2002:a05:6402:d73:: with SMTP id ec51mr13570543edb.175.1638919354180; Tue, 07 Dec 2021 15:22:34 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t5si2262080edd.468.2021.12.07.15.22.16; Tue, 07 Dec 2021 15:22:34 -0800 (PST) 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=@outlook.com header.s=selector1 header.b=H48ESGia; 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6A60168AB67; Wed, 8 Dec 2021 01:22:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072085.outbound.protection.outlook.com [40.92.72.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0627868996A for ; Wed, 8 Dec 2021 01:22:07 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UwPeZ44FmBz9j8Lv93h5Bw7XNeVZXzxzgAxbOUTIi10Aj+clY+u28cp8/C7EUQU1aAwtqyl8RywKdeciMovznIWL8aXMDL6+thgdxoNjaTUkTdVsci491M/d5r6GMEKlp8v2fkBeLMkjgnpCbQS5o8WJCM557CFMUiRhfIneZxLhksVfosI0lklwg0cGWWxJlpxwxfoBarZFQPgpBdRJ6gVqt83hiY8MijooZmnPq0vCCh5Avwe90Gjy5LYcEXYokzTc0PjRv3+KAhqCGSXsHmbjrUg9uIMek0ZxYot3lc3WuIGVsSJj2aPmBJa/E69c+V2WP+aXRS6XCZpPWELRjQ== 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:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ZsJOxBxZsT7VTPYKY7PcfySZ3t88bTMIYBJEF2m7a7k=; b=Ol5pGxIvRcrcH97h4QnL4AWd2jA2Gxxk7H9tj4jHCSxBliXK3Knk31/YnTWezgEFzMSzmopS/Fha2A3wY6EGp5ruEK67qttNz2WnYJmq1QS929UKW2C3ZIkaSa7bJCkOrN3Y3vl+SONVx/hfOFV40OJD9AaerNKs7PRYEY67mZnKqBW39fMCt3YHog4haUFVen3PuQiprcms+CU0pAhtIzV2/gTwxsQi+7DkYiHItovFqLj30Bb6A+rQiTLzMM+Od0061Kz4bQ0UDJETEAKbNL37wjjssWSh8PkeebjVKnIQpKIGl5cB0aQ6vI9lFyysD4/67AzSaZjvy4FWDVOeEQ== 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=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZsJOxBxZsT7VTPYKY7PcfySZ3t88bTMIYBJEF2m7a7k=; b=H48ESGiaa2McwY8mvzXrlQXzqN7sKvZB+2k3JCRrpPXcYejEXEOEzDUi1Leyqf579s10FZ5OFoaRBHxVcht+hA24lPsM9Sl1qEvzUZCgb4/j2aeuFqSoXhoa9Ov+xEWZavdXflIhYzEayfsPmKc9eHWyl5iAxhuGYRgyYSq08dafySyQ0pR0qxXz/CpmvM9pzaPPxZwuLxcBuLAuHvWov7HVHOm6fXgtDBQrCefdE78s6tbXGy/uy+tUPWUClOUlKk12lw81hwyjS73ale7LY7xXPRRLmxj75b3vBXjhmBfd4fTfkI7upPRvRhqQq7mA7CHoZSObRcVY7ULemH5AMA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR0302MB3480.eurprd03.prod.outlook.com (2603:10a6:209:19::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11; Tue, 7 Dec 2021 23:22:05 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%4]) with mapi id 15.20.4755.024; Tue, 7 Dec 2021 23:22:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Dec 2021 00:21:53 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [jsZT1P33roWUSFnn2v25enAsXaJ3iT8T] X-ClientProxiedBy: AM0PR10CA0049.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::29) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211207232156.483811-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM0PR10CA0049.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.17 via Frontend Transport; Tue, 7 Dec 2021 23:22:04 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 769537bd-fe9e-4bcb-1e7f-08d9b9d86115 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSZafVhYkhL3hNKBaHIpDWhq+VWCVHAamM1c7W8bk73401n33CoAIDmZjLi84jJ+UqxqzqEm066K3PeBK4fxzM2xOSadn2cB6+v6ae6SSBNNBRiqlfEy4cnqkBYtzVyaA+ygZa/Bd4aJz5PgazLtm07s9aKdz1SpSTusF9djoFoHFDCYmJU7LV09roSZ6/WkTZxjTQzBVau0iibwSe53NWH1fOYMH4gcj2ril9akyHFJqbvKNZ+0EnzqsD+nkrrK8IEn5+/s0QJ9Jd+FSxK3+n9ZuZh6R3qs1sUBOHPHrVnr7gDo1+k1UKIpP0UWM518TbtMVLGF3esS6GzWi8ZH66ebMHjVbcgBZvDHk9P2grshrr1jT/AJmKRT4EI5Pr8gNKIJ/zho8NIdqMuZ3PxQ/xNX3DxTxM9KswAgltiWymx/i3Duw3yljYxb3hDg4zt/Dpbl3EYE0ndHwmYgR/NaO3xiLUd8oE+8Ni/5pDmvZ+Ounm01YsPwqLZI7i1Kz0zq//b8kH50BPs/hJZ0phGAkpCrufYzgYEiykBUm2jGJAEzQ70dCY4H/VwbF0awTZq8UbRIEiXESsFPwx56gzjzqG1I72xKMcHY+njyNV36MfA5KIkG/Yfhdk/dj81bNKmYMPqlDjEj2NDvCPSlsFwQJB++hz8GdrLWwQPJJPNvQCphlxMDol6roL7XQ/h5HPDT7SpxS7HdzSI/kJQAnslZcjNKbxp57g4c0wlDrNUd2DQtsUjepkO9MkeoidM6pS4y9I= X-MS-TrafficTypeDiagnostic: AM6PR0302MB3480:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: X9OwWgGzta59VYgIxe1A7m+ooQ8mFD0ekCp+JbfkiwIQ3MQnx6dfdx+6q7GqUijcvj/ckL4aPa/xXDHXhaRNwnM6gDpLRpFWUL3fbSMLRWutqamUDJIBp0edOLdra1S2Z5prSTrAZPRXeVxe/sti3fQFpaDHd7VkdCmkh+o67bFJ1fmuEnBfavCvv5LjFhz1kEdikoBQlbdCLRlgitw8GDvmu8+2sol2+I7dMmlsfFi7bwNNsCmWaUpjT3877trAcMsSVP5kS7IthPWMiW5pP/Ozj52rGBb9hbf1X5vOYIXI3eGfYJ3AsZCHXkPvxwkvckAvPnoK3vNvR67QBjXd0Tn8icVcaWvgaZLql7nSuQE0QkmYKNTmJOaUsJRrNL2A0Dl6nvBURvB2LUEyHj53RJSvNJJys/YJFHz9cT+7PiBGFySIJ5c12beyhaqG0VDfmNz+6VaMNmcdcMQ6hk0tpxDJgFoaV2+RnODljTaQGcdygkVEYNu+enz9GaBaXcZnUrY/OQfpDE3vq9UpH6VknV+oQ6OsN0CmArLAdE7MCY82/V8a9VjN/r5XYtoRtpkjjQE1txaLVg8L/wT2YGf7WA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yxd91h027NRPNPWMuUMpOXsn46VfIP2gnHVNGDetRQ7swOYya0yu7O1Vsb4yz/dWG1jS4hJfmjFMWX0NV5D9yXCEUdwmsFnrcqzoh0YP9kmw8RSdK/cICZpEkwumNMS8QEK3P7E9UIa8jkf0g2O7Vj6nJ7RS9nrvfNgoSQLyQEZ+66Fj03BBFud/BY1+eD/T/DaMUjk+GcGANfP3tKw06LLR0MHcb0EVrbNb3Ppk/ZxgP5NvH0jH4bUaNIavDgj5/EdYVNAQmc9A6fnft39wzu2qS0TAntFGY7cmGnCrjlfQdvIxvbD/1ryaXYALius8VcW53eMg5ely+89hJDFcBqlXBMwVo3XSNrqpubSa+q2iT9QcJF0C+T6Kax1cHrPg6EpnAXNHk8DeZJC8sPTJpPdMQcipS9BVbS44Joi6FUY4GLRFvgPmyfZasceZLLWu0eUVhdBe0Hz/a/sV2cFB91t02gBeanWzvTWreGdEp1lDzHupeZ1gDIqUzZ4zDJDL1LdHntXfe+giI+u1/IdH+rakuk9yd37kbf/AZgSRggEj12OjQrozBLmzu4+rAfM+7By9lEAX/lZHFbHd+YPqxcYVqIrnnbSvu+UbdhmI1/FEoAQ1IYcAxEyaduozItb7d1bFIUQRTcY3CIrLPST7/eLCDbVEtt0ZsEMzwGUf+fwaSnghAwJvgdtlsF5RL3mCPGng8r4GwJAnvW6JTeCgpj445VKsZ0dVNGwpetWOa6JzHjLfWnrPkbrtDEsQbLhTFWPyeEnwP1EIrVbhAU/1bKNuwmj1hDJvX4n6TognVdmswROG0vZhMjUTlL/41HWzv1AnCY5E8W4QQrNmpVwkm5fCE4dUPb6TzTidKagSrZJRb875QrUzdTEod1hjglWL4e4sLFJa5rvQi2u2y6BkippCgzZqasPyQJ3NZEfEMAcQfYuf92QKXjJWcJO61r7a58ojYjbtzru2tKi9cAZdTg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 769537bd-fe9e-4bcb-1e7f-08d9b9d86115 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2021 23:22:05.0307 (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: AM6PR0302MB3480 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/movtextdec: Rename several structure elements 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: X9H69IM6UlmD Content-Length: 6263 Giving elements of a structure called StyleBox names like "style_start" or "style_end" is redundant, especially given that the relevant variables are also called style. Signed-off-by: Andreas Rheinhardt --- libavcodec/movtextdec.c | 54 ++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index 4e14ae5900..7021ad9e24 100644 --- a/libavcodec/movtextdec.c +++ b/libavcodec/movtextdec.c @@ -54,7 +54,7 @@ #define RGB_TO_BGR(c) (((c) & 0xff) << 16 | ((c) & 0xff00) | (((c) >> 16) & 0xff)) typedef struct { - uint16_t fontID; + uint16_t font_id; const char *font; uint8_t fontsize; int color; @@ -68,21 +68,21 @@ typedef struct { } MovTextDefault; typedef struct { - uint16_t fontID; + uint16_t font_id; char *font; } FontRecord; typedef struct { - uint16_t style_start; - uint16_t style_end; - uint8_t style_flag; + uint16_t start; + uint16_t end; + uint8_t flags; uint8_t bold; uint8_t italic; uint8_t underline; int color; uint8_t alpha; uint8_t fontsize; - uint16_t style_fontID; + uint16_t font_id; } StyleBox; typedef struct { @@ -186,12 +186,12 @@ static int mov_text_tx3g(AVCodecContext *avctx, MovTextContext *m) // StyleRecord tx3g_ptr += 4; // fontID - m->d.fontID = bytestream_get_be16(&tx3g_ptr); + m->d.font_id = bytestream_get_be16(&tx3g_ptr); // face-style-flags - s_default.style_flag = bytestream_get_byte(&tx3g_ptr); - m->d.bold = !!(s_default.style_flag & STYLE_FLAG_BOLD); - m->d.italic = !!(s_default.style_flag & STYLE_FLAG_ITALIC); - m->d.underline = !!(s_default.style_flag & STYLE_FLAG_UNDERLINE); + s_default.flags = bytestream_get_byte(&tx3g_ptr); + m->d.bold = !!(s_default.flags & STYLE_FLAG_BOLD); + m->d.italic = !!(s_default.flags & STYLE_FLAG_ITALIC); + m->d.underline = !!(s_default.flags & STYLE_FLAG_UNDERLINE); // fontsize m->d.fontsize = bytestream_get_byte(&tx3g_ptr); // Primary color @@ -218,8 +218,8 @@ static int mov_text_tx3g(AVCodecContext *avctx, MovTextContext *m) m->ftab_entries = ftab_entries; for (i = 0; i < m->ftab_entries; i++) { - m->ftab[i].fontID = bytestream_get_be16(&tx3g_ptr); - if (m->ftab[i].fontID == m->d.fontID) + m->ftab[i].font_id = bytestream_get_be16(&tx3g_ptr); + if (m->ftab[i].font_id == m->d.font_id) j = i; font_length = bytestream_get_byte(&tx3g_ptr); @@ -283,14 +283,14 @@ static int decode_styl(const uint8_t *tsmb, MovTextContext *m, const AVPacket *a for(i = 0; i < m->style_entries; i++) { StyleBox *style = &m->s[i]; - style->style_start = bytestream_get_be16(&tsmb); - style->style_end = bytestream_get_be16(&tsmb); - if ( style->style_end < style->style_start - || (i && style->style_start < m->s[i - 1].style_end)) { + style->start = bytestream_get_be16(&tsmb); + style->end = bytestream_get_be16(&tsmb); + if (style->end < style->start || + (i && style->start < m->s[i - 1].end)) { mov_text_cleanup(m); return AVERROR(ENOMEM); } - if (style->style_start == style->style_end) { + if (style->start == style->end) { /* Skip this style as it applies to no character */ tsmb += 8; m->style_entries--; @@ -298,11 +298,11 @@ static int decode_styl(const uint8_t *tsmb, MovTextContext *m, const AVPacket *a continue; } - style->style_fontID = bytestream_get_be16(&tsmb); - style->style_flag = bytestream_get_byte(&tsmb); - style->bold = !!(style->style_flag & STYLE_FLAG_BOLD); - style->italic = !!(style->style_flag & STYLE_FLAG_ITALIC); - style->underline = !!(style->style_flag & STYLE_FLAG_UNDERLINE); + style->font_id = bytestream_get_be16(&tsmb); + style->flags = bytestream_get_byte(&tsmb); + style->bold = !!(style->flags & STYLE_FLAG_BOLD); + style->italic = !!(style->flags & STYLE_FLAG_ITALIC); + style->underline = !!(style->flags & STYLE_FLAG_UNDERLINE); style->fontsize = bytestream_get_byte(&tsmb); style->color = bytestream_get_be24(&tsmb); style->alpha = bytestream_get_byte(&tsmb); @@ -355,13 +355,13 @@ static int text_to_ass(AVBPrint *buf, const char *text, const char *text_end, if ((m->box_flags & STYL_BOX) && entry < m->style_entries) { const StyleBox *style = &m->s[entry]; - if (text_pos == style->style_end) { + if (text_pos == style->end) { av_bprintf(buf, "{\\r}"); color = m->d.color; entry++; style++; } - if (entry < m->style_entries && text_pos == style->style_start) { + if (entry < m->style_entries && text_pos == style->start) { if (style->bold ^ m->d.bold) av_bprintf(buf, "{\\b%d}", style->bold); if (style->italic ^ m->d.italic) @@ -370,9 +370,9 @@ static int text_to_ass(AVBPrint *buf, const char *text, const char *text_end, av_bprintf(buf, "{\\u%d}", style->underline); if (style->fontsize != m->d.fontsize) av_bprintf(buf, "{\\fs%d}", style->fontsize); - if (style->style_fontID != m->d.fontID) + if (style->font_id != m->d.font_id) for (i = 0; i < m->ftab_entries; i++) { - if (style->style_fontID == m->ftab[i].fontID) + if (style->font_id == m->ftab[i].font_id) av_bprintf(buf, "{\\fn%s}", m->ftab[i].font); } if (m->d.color != style->color) {