From patchwork Tue Nov 30 10:50:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31840 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp7467121iob; Tue, 30 Nov 2021 02:51:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJxdXOi9CGUIqlc/Cavl7UFQZZSl+XW3s35wKmnzACi0NFfzDnVhM9ef710/vevR1x1VgDdy X-Received: by 2002:a17:906:86da:: with SMTP id j26mr63038348ejy.19.1638269495507; Tue, 30 Nov 2021 02:51:35 -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 y19si35265346edd.123.2021.11.30.02.51.35; Tue, 30 Nov 2021 02:51:35 -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=o7aMj6qj; 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 5765968AE42; Tue, 30 Nov 2021 12:51:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068099.outbound.protection.outlook.com [40.92.68.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA28768A44A for ; Tue, 30 Nov 2021 12:51:08 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hNDSd7SgZOTDX4a+S9dQyTYrex/Rk4NmJU638DC9xTjUFXBULssg+sg/XlQDRN/RFSR1xtxXutMgjLSFTv4C9pBINB4n9zsiq4w4albBZ5YfS9c/HNZwRvfttYBnj+N7AVg9ixt0vDv0XZeg/PyfzIRX503gN0rl8SoHtmmzkkHSMQw2Dpx2Pmw5DxvVcMSHje470UpVhtWw3prmb8eFje72tcj6WCGxWm7bx1MJa/wVn2wyM4VuwSxDVoWBeNv/MLz99y006O99omrl2yZf2kkHha9iDq3TU5v3xymnqmGnOnBKpvHU3gI8+Rik1Q5VmgmzQh4Ws4KtinjYEBRG2g== 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=mGMQlsYm37wIwSUQb3Qr5IJvt+TeQJYAoz43F4Xjhkc=; b=lIDfuyG0Mx0anL+b6K6sisC4OLIzcNgeaEM+ppn1AKgNw/TTKdccTJduTA01ufjlJNIMhqv6R1wgqJJ3DOQbknbitmNz1v7MXUbkSAXYuLu3LUyekeoWLfDL62gtDtAVO0AF/Q8bfs5QI3IRQ8RFe+sF6e8oqoQKn9jf/cWutm02AisY2CUurKP56bK8tD5w7DkuoEnz5+jhCic6Z0J/rqm4w+L3uJpO3m4NipsxVHOuudqB2xNiXC5J+al0BnU+Wr+u+ecnvlfazRlVsHJQq8ArniV33J1pUXO9WRe8rEjMojGxpXQSPtTkO/zAsYky0/EpFhgsO+/HuvcuD1sc4Q== 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=mGMQlsYm37wIwSUQb3Qr5IJvt+TeQJYAoz43F4Xjhkc=; b=o7aMj6qjpxfdmfnj6wtsZXux05PcQPy5opn5+EdExVloqa9w6BxxbauvwGZ3dsMOShHdkXuSdPuMWnOSqk0ctezCsTqCF0dnEYGdYmOsGBrlOnCj43GGKaFwjIzzHDfkDu7hUAwNwktNqqn+B+SAcKRZw4sxeZ8ZzT/HI1H+wRqz86Y1FCOiohR/3RToNEhwYtB1Jn0W+lN1X+s17TLxnv8x9MBfLZZLulPBMFe7nKdp7PVPYu7xhbLfNcEGrsqlDdh6QBlSlu+oV0f9Qxngmyg9uKr2AaJI7m53C/cUFLVKqXDkudCarhgdMBOodn/qtm+a0icOEpI5fyIGuFRevA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB2850.eurprd03.prod.outlook.com (2603:10a6:206:20::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Tue, 30 Nov 2021 10:50:59 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%9]) with mapi id 15.20.4734.024; Tue, 30 Nov 2021 10:50:59 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Nov 2021 11:50:42 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [YM4+mbtbkGpxw3/7LIS4TvP9b0NxuAYM] X-ClientProxiedBy: AM0PR02CA0156.eurprd02.prod.outlook.com (2603:10a6:20b:28d::23) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211130105043.129538-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM0PR02CA0156.eurprd02.prod.outlook.com (2603:10a6:20b:28d::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Tue, 30 Nov 2021 10:50:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b3a549fd-01e5-4ee7-4ef6-08d9b3ef4b8c X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIgFldYn+1hibg1CU1wBpO/Jc2rrk7ogScZll/fge/ME+dVeCYd0YObs0PlWiptx1gHY0l4GXJMPfq6jKJ+1I2sHsAE/d3sEl2IrPbjvW+RlE1Y0T5qegfVpx+pa9kke7x/tI5N1eP+mfAS8f8wXH6fIYNBxGeEEMCCMG/IqvVdJ339sxMKFosK47BO1zeaJabiLo40hZ/JqsMzpX88erP6YeUUvJz7F6Oq9GP/bMXoe/PvT6lKxTi3EweP7WwCbdW+DExlU/Qe0Ts4fGLNJUqejZSz693QbGkwse1uv+Y3NzRTKLvOHLFTEtUOUDSg8M2Gos1EEUMghZ3vY9tIMlB14d6joSffo+Z5a5SHtBB96CjcppVYe0aNe+2SRwBSINaP8FEqHT0YKnEjCZaiT3ANMYmEcm21UsHoy7dgTLCn5/ACjZ6uP6Z/ZOzCkXqQ77eLBOinMHmr7/ZJdxR/V+9+sfDKwq5K/+lNJ7pi1WkXGaMGVAB2krYdusovjIrfcOp9ZEPTrIFQAPOhvyP87s/MvKRSs+lfpT2UqKoG3ErM/4FSLZnZWbhaPCQcbNH01Db4AYms5dMKCgm92DZy1EwvkUvZLCYRTN3dWO8olyXJopG9spxRrSDM4TARi9IBRdSGQNX+8DF5bf53eIZ9id1yOR2Xc/jIBn2wHyeHt8nBa1nyPUlkl7hNwI9eHZF4iNyH2o+zW6KVsQ== X-MS-TrafficTypeDiagnostic: AM5PR03MB2850: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VDfsWHRUTCAWYwxZON16zMJ8PjfUJH8IxbAr2/nPZVtt0idQqMpiqwb3SBJhgcRUYKz765VYl4B3rNvvFAMvX5NfXwP0GeW2HtK1YQEyHzAn/fLaWcqpxfvhrEC6WOd83YhFVhjKax/+2sr2b3F4tRaUmlpoSSUTBaEaTVh53pvQzi41XjREbQwkcUruNsBl9Je+U1Sla6l6oOfy33wBfm4kAOesdZgorY/wPgK6aJaE4ObRHa+/WDjKFTCDQEOFIPcgvAvnroENjqrQxzgFkdTicr0p06jUUsOabZ7wJWvG+L/RNMORihXLrrcV8leQI+mb944dY8m46oJVxpXweG1MA0iTcnhYAtJukd//gjMLKD4xxaJLzxj3hbCgBQzATSi1/5kXGhelUGSnJymWnC7Jb5f8L1JmBE9hfr4aZB2u8BDe6HPaiq3cL6NyoRZi+DWFRw7AW5dQo4H5f1sviu39tyUHV4BXq7xAcpjVRrwfwiVmrIFdHTQ1cF5+/KrlcNclY9PMAiWf7RMIUSa8e+r83R+Ar4P49/Zr07cTnaPXj56ZeAqnDcDEX3hJ2s27MlInmmHH2Wb5H6QQH3bmuQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0Ip6j7RS6Y1umhmJEGGn0C9ZZbOPXQMGIaEXsj4jqJSefgNeAB8RZpoebjwzaXlXrX7fHtEtdTHyzcCGPUmSncTNehrjEGh7vuQfztzSyfjwyu8q/IFQjpdZwR/pTLoGtD6f5hR6M7LZMcRNBguTSCSN2xusJdBrhnrQ2FSkUwI5a8PpLZlMvTe/s4+aGsEcKbbkCSAzXspg9r7FohXSZWdBuNwZTymhvZZAA+Dych338CcOL7TXQQq+gwJxkjVzu9pi5K5jctHjC6n2cpCfgsYkK0y9hzL1VopEYegQ2facYcLQuVHFkgRjREIYqQdNEAtAmtBhVA/bKiiFLc8r/xrUO1dKjiE2uqKhtk8UMNVW14f/t8oqb7+maMHjvrz/ci0gRg4/uKaQWaFx0UXeU3CdBiyKO5XxGg7HN7izHsIaT/tJ4wxaqZAWdUxM6u7izHrvRenYrmFMAtJQ6reNFdc7Ebj6T/AgJYzKWu7BzXBnozRAo8vr1UzLJuDlkuRr/ORuQ3oOigzUtSxJqGv2BEH8ZvDQ6ar3kkyfSYZD26mYru7Dfzd1kOikZG2vvGKHsLnaJpSOY4gHHouVAkl9oYH2MKbe17xhEH0r9r66gJIrXZxCSBjKm1Rc0VNDeTkBKNnFekxgcTDA6Rmy09yCLthZOiaXcqZ171W5VGJVvA3D8VDdtBZVHVUHSV0w67keL41tdPfpf1cLoxTFQ9HtHdq6GBujt2T+LHuwWygdUMISliyuzmZr5lxHEwLf52grRXMn7phpaznQlAijeBhLsdafQex13BGnZ3WLEjg0h3R7ao3Qp4Q6Di/bEELsfpI2CWp7etoWbkG40Hfr4+Nf+ZqJSkhtrmTMZWS89wU8SxcSSbw/raQvvad+q+raqFS6UuMv1zdNhoFd5jTv3GR5vnPPhL9RwJcIRbkDH2GvICrbKPDmDDx+O76DFc0V6GWRdgeG3MudCdVxb2UeZPR5rg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3a549fd-01e5-4ee7-4ef6-08d9b3ef4b8c X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2021 10:50:59.7938 (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: AM5PR03MB2850 Subject: [FFmpeg-devel] [PATCH 5/6] avcodec/movtextenc: Remove redundant byte count 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: i1dhewwvSiOn Use the AVBPrint's len instead. Signed-off-by: Andreas Rheinhardt --- libavcodec/movtextenc.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index 52e51503d6..112af41093 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -84,7 +84,6 @@ typedef struct { uint8_t box_flags; StyleBox d; uint16_t text_pos; - unsigned byte_count; char **fonts; int font_count; double font_scale_factor; @@ -611,7 +610,6 @@ static void mov_text_text_cb(void *priv, const char *text, int len) av_bprint_append_data(&s->buffer, text, len); // If it's not utf-8, just use the byte length s->text_pos += utf8_len ? utf8_len : len; - s->byte_count += len; } static void mov_text_new_line_cb(void *priv, int forced) @@ -619,7 +617,6 @@ static void mov_text_new_line_cb(void *priv, int forced) MovTextContext *s = priv; av_bprint_append_data(&s->buffer, "\n", 1); s->text_pos += 1; - s->byte_count += 1; } static const ASSCodesCallbacks mov_text_callbacks = { @@ -641,7 +638,6 @@ static int mov_text_encode_frame(AVCodecContext *avctx, unsigned char *buf, ASSDialog *dialog; int i, length; - s->byte_count = 0; s->text_pos = 0; s->count = 0; s->box_flags = 0; @@ -662,9 +658,9 @@ static int mov_text_encode_frame(AVCodecContext *avctx, unsigned char *buf, ff_ass_free_dialog(&dialog); } - if (s->byte_count > UINT16_MAX) + if (s->buffer.len > UINT16_MAX) return AVERROR(ERANGE); - AV_WB16(buf, s->byte_count); + AV_WB16(buf, s->buffer.len); buf += 2; for (size_t j = 0; j < box_count; j++)