From patchwork Mon Nov 29 20:17:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31821 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp6673678iob; Mon, 29 Nov 2021 12:17:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJxHfTW/RNRxHA+ByUreoU6jHmx0ebjUq57zuhQNU6hq1reUOk7lausACrVaoWqVT+TsEHmt X-Received: by 2002:a05:6402:3514:: with SMTP id b20mr77234119edd.169.1638217064776; Mon, 29 Nov 2021 12:17:44 -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 a25si25601174edx.58.2021.11.29.12.17.43; Mon, 29 Nov 2021 12:17:44 -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=@hotmail.com header.s=selector1 header.b=kMpbWBKn; 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 D039468AE46; Mon, 29 Nov 2021 22:17:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12olkn2090.outbound.protection.outlook.com [40.92.21.90]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DC49468A15F for ; Mon, 29 Nov 2021 22:17:34 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AEhtiMJ/OPuCE8CE914PvI1Zkhp59xUF1V62hLywxcjp0GBe5Srp1KKmMV6CxF+zzIL1drW0U+9xfwYsjsh/dTBS24Alto/FyE/AGWktYwhuhWckgFH6NVB5zt6sQABr2SIi/bgYjtoH/aNLh2hwQr4GSpBGt15qA0M3iULO25/jCtEq2SuNe68GUbhCZFEnrLuNkcS/Ve730PhGly76NpMbhgyw1RnL+j2usCJDpDp9ZmKwZYQrf7Qq7Ry+zPgtSSHmcFKU3G5xxCMVZleSz2QMRmQOmtLH9WPRh2C5GyHBzbKnbM3wTAzIfHQwiUc0pppA/0NESauSuamzQ32Q5Q== 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=LxGghduilf2y1MA/iDO3tiS10rK6MdMepHH8F8ZIauo=; b=GmNRV76N2P2zATC4N3/NTj7HCPXjSHsaha7rTJfbOxnOb927DlbON453pQKtE7hX0vEQv+gZ7xTWO2W4H4zeRv72qYuyvRJcPaY4DElDqm9VbeqrNOyBk6uhhz5rRUinsf/ZwMz+4YZoiFH23+o322ROhMFNIpzp8gelAnuKpLgmMBS/hO7wXcL7oNWKP+HSK04Ej0HGkyZtGIBSSy8oAaGjYOt3g6II4mfVElKRPH8M7+XTTb734g6vkfn3wUF4NwDG0F3RthgJHrV3k/CNSvSdEyrOvHyn+NPduqoedEVOfxsstwfzJ1tyxa20kA+0gU8Rxn3wqQ2159gU5V3qCA== 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=LxGghduilf2y1MA/iDO3tiS10rK6MdMepHH8F8ZIauo=; b=kMpbWBKnhgV0BtoF8YkYwORP/VbfpfFJ2ZRUZLj1TMAO1lcI9KLwHWy+qAryDdXkDuV3ijhilOgVC0PNi2OmJSQ7jpCUKKKlkU+jiZ/tg0jkn87ZdADYZ0w5k26wmAolagzr4Ct2wddcxKQ3+IFLraOFPENMTQ9wuwIfi05+ZS2tuga4u/QPBotk5D7rl8Bd/1evCrOrT9Q5huPdWwbsobbvXboT93cdc7UWwzMq6QuR+ECmMTAAjxBVJQFssXGUGlpRucIVKeI6UuBTdoSBXU5qxei1ycB4BQW64XTgth1glYX379zSkKvTmDl55CayiCA4GeXmSUbytx4ZWSugJQ== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0336.NAMP223.PROD.OUTLOOK.COM (2603:10b6:5:316::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22; Mon, 29 Nov 2021 20:17:33 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775%5]) with mapi id 15.20.4734.024; Mon, 29 Nov 2021 20:17:33 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH 1/2] avcodec/dvdsub: Don't dump images to disk based on DEBUG define Thread-Index: AQIfJiFvuTjzvcCBwHzkkv0yTdpycgD9CC41 Date: Mon, 29 Nov 2021 20:17:32 +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: [ryJ9k5EOuiW3VbZjUrH7nUoXSfRdu1nH] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: ff7daedb-9a10-4a6d-8ff6-08d9b37546d6 x-ms-traffictypediagnostic: DM8P223MB0336: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: E6eYMkLK7p06FaHwWeX5cXQ4yOpoQwhGTYiOG0g1BmOluQmDDGlcd3YNy+8QGPiEjs8vTQMls6ieNTqKrY9jPURMJChgQHdhVFLgc3jTI4PfFRmnOs4+HgVABkH3S3/3U+lR4zqyKogZ/bInGrBxRBDpZsa8z1hXJMKT0V+n693PeiPxmaSQVZhbyt9wmkqTd0j4V5onijKSMUtBLtHcV1V2bnL8d+V80OE2EJ3hq2zROIj4MsbzePx2sCwon/BUPGoMs/VFg7UUWplDLLmwPpjjg1+Orsf8sij5WLTwdc0YhPCvFZ3XYKiNcsU1t1wX6yMPI50MBWDIrwSi0/+yQH86rueuPLW2uE6EvByNh5kYyYWHYVkrTN0Jx1TK12hZCNgeFE6eIkIswfQYKdrNyWiIEibGRcsPKJkKhlhf+liIBD4lB4I/4VMyy4rmZhrqnFQ8lLQCPCPvGSMoGih8WjPcmg1Qi1s6UmNhhefzldyHMYHfcACvgi0TR4PQgUuQAcoN89XIDymS1xOM1yBrTuV06X8Rl8XeVE+pFLvh+DRneDn34PDjswJo32VpueUftMxuNaIMGhPhxglLv8uPOg== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: BOVEQcEp+PKK1q9gZgqkjZZ4QIkc1s2WuMPA1DrbIHz5/IQxVQ/vL9jHAWBiLcScwhYWNFX4IY4g3JrfZRlNHBWjFrmIzMGBO9mjihG4vDh5qJ5SydNZCPOpWt9rjLEHnq2TggTHQ4fkHAWVg4c4t36c5W6DSOZCpr4oUM0XU8XE6KOqMehPGIbQRL9rHDYqX7XOgfGWwyBlV+Fz8o9spluUfCSqnMPosJxyFZfWz5VeSc5wnbshjDqdyPC8FO44z7wyFLL4ejEvYHylBNjxFdhXp5p5Ad5Kdd6bbr+24SpX/rnUs3nj+369CYKC8pKMG7STxxFy2xHqJ0/9bc/EJJ1fozS2YWefhQcyCFk/hWjXjugRpiAutvCqwjfGQxsAd6cJr6KOMOrHgARvR3+bhaztwODwHJN/LLLGij6o5l7weupGxN4JrjhYqq9FEe19WNo9NFxFyc5q4QLya8Swt7sqeoXRNr7NtPoLtqSPo97Vcs/FmL/k4usg/DlpthrxAdoIAo3mYFzlp7R5fHkdc6Im2+AklxUqUpqTiJzm4JXakBn9u4afyIiun53NslEh0WNGtzbIHT6ZzVqUDiN6qPVf3l2Rd/8f8XPpswrMHq6Anrs3qWHpSvxBtXW2S5R1M+OoOxWpN04xWXkNwrj09RSWAsTBQmzXrhH2WEAKRC+BgOsf16FeQK+qc+AG052/gO5X9bvGYdD+Dvz5WtBLtw== MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3912-16-msonline-outlook-1fc6d.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: ff7daedb-9a10-4a6d-8ff6-08d9b37546d6 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Nov 2021 20:17:32.9433 (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: DM8P223MB0336 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/dvdsub: Don't dump images to disk based on DEBUG define 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: A1gR5l8KrMMh It's been a regular annoyance. Introduce a debug-only parameter for this. Signed-off-by: softworkz --- libavcodec/dvdsubdec.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c index 52259f0730..c0f796068e 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -44,6 +44,7 @@ typedef struct DVDSubContext uint8_t used_color[256]; #ifdef DEBUG int sub_id; + int dump_imgs; #endif } DVDSubContext; @@ -597,8 +598,9 @@ static int dvdsub_decode(AVCodecContext *avctx, ff_dlog(NULL, "start=%d ms end =%d ms\n", sub->start_display_time, sub->end_display_time); - ppm_save(ppm_name, sub->rects[0]->data[0], - sub->rects[0]->w, sub->rects[0]->h, (uint32_t*) sub->rects[0]->data[1]); + if (ctx->dump_imgs) + ppm_save(ppm_name, sub->rects[0]->data[0], + sub->rects[0]->w, sub->rects[0]->h, (uint32_t*) sub->rects[0]->data[1]); } #endif @@ -745,6 +747,9 @@ static const AVOption options[] = { { "palette", "set the global palette", OFFSET(palette_str), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, SD }, { "ifo_palette", "obtain the global palette from .IFO file", OFFSET(ifo_str), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, SD }, { "forced_subs_only", "Only show forced subtitles", OFFSET(forced_subs_only), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, SD}, +#ifdef DEBUG + { "dump_imgs", "Dump subtitle images to disk", OFFSET(dump_imgs), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, SD}, +#endif { NULL } }; static const AVClass dvdsub_class = {