From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 8067440AEB for ; Thu, 3 Feb 2022 22:08:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8A54868B151; Fri, 4 Feb 2022 00:08:39 +0200 (EET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10olkn2028.outbound.protection.outlook.com [40.92.42.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3349768AFEF for ; Fri, 4 Feb 2022 00:08:33 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ngTYwJTV5ceoDCSQDp4MzLimQDmkkfqfi+S69mmCFb30ruK5Ta0NG5lTTZ+kIOyCSJvmOyH8pmXNX47p6U407pFXBiV2Kcikd1Nro90S2hApBREVQNH5yyA7bUFBXnoGVl7FPOLj84hmbkjodscsVD8R516ZV5yVbTf4IhqSHRilTAi+d78077chC7deJgkyV5iEVdPfelI04E5Ywtn3PK++ySBMUSY2HVgGi8333YDhvhjLpq7n6X9mQlYOODFlUsCd9+Uj/WVLS3WQRx0cxah0mSkGvaE/m5VSAutV1BX0kklrY1EXbhtsB8fZqN4BhleZVEEVpEuLSJn5WWWSqg== 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=pQznH8OXnZNrWC34SasHxmb6cJrqBzZq1HXkfIzdGOo=; b=J3bCak9iQoiEt4keE/2QLBR1q3QhGg0XL6BUXuJzIlxXJFN/FJiiBEuporVt4ht9Jg5D0lhvR66c2CYRCuJnBHRPYHQ7/euelX5h8y+BzlBup41bDKK+3/lOXyYpcmiRiaxGH1FZ7EfO+ztpWcAPFgfn/16X3I1iJPTCF8pooiFicfg8syEZyzC9pC1NKBrk/qh5LpAZiwXJCAkgf0ivPWW5YnO1K8lpQMfC/YOBeSZ4upv1szmG4IKz3m7fxSoJ/h8G994Lrke19ehX5z4BA/hB0cojppAfeUf3UlQokOjAIOhRQD1GxPOhitWZA2tYxGO2ld7r1waRfes0DBViSQ== 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=pQznH8OXnZNrWC34SasHxmb6cJrqBzZq1HXkfIzdGOo=; b=k+Y6j5EXBCPptmF/gkn13ZwKIYh14E/kof6UhiWJpwE7kjzNy/9l3O6ILNcR1aKcxDBFLFKIig5ysGCI5QQbi0gR5A9dvtS/qxePYz85gHW5smbeW4lgwW2j1oFr3nYP/mRef46PNcg0jFii6Ueae0iSfUkBINIcrs2CYmIFp+iO+8vx/XWUELi1cI2b1U+FBftM+qgBfLQL1SdR7RPapl58XSaskAmweEziroWGm3ZZe0MK80wSc9bTbY3Dj6K0TbNGVittnBFPMNFjtU/fRQ3ekoBtB8OcCtRnfOGawvTCB8r/mWo8V91TXfobidYvsfMyiq5tvyaeIinBBxcuog== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0160.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:8::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12; Thu, 3 Feb 2022 22:08:30 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::496c:9ebb:f23e:8e6b]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::496c:9ebb:f23e:8e6b%5]) with mapi id 15.20.4951.014; Thu, 3 Feb 2022 22:08:30 +0000 From: Soft Works To: ffmpegagent , "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v2 0/2] avcodec/dvbsubdec, dvdsubdec: don't dump images to disk based on DEBUG define Thread-Index: AQHYBlwI535EvhPL/kmlf72Vl1QlIqyCh/nw Date: Thu, 3 Feb 2022 22:08:30 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-tmn: [+/VBGYGKffsnFk9RYLvyIniyRZAip25C] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: c4e7152e-2535-4574-9f4f-08d9e761b647 x-ms-traffictypediagnostic: DM8P223MB0160:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: oIywP8/GSEn1CIaZ1UWiCjHS2qgjNCNtW1qenMGOG8+CpQ9JxhL04qS9BbACNVq453Mydcx7TMiDc4DDW1W7Hf1bQ6A90YS5Uyoq8aYk3JXqeLSj+qdLYmUZ/TLy5laosuIxThXMFvzPrenDZtul53yeTLBx3Z6ubyUnVbVhFySHoIn0TUbtW/QsmdXfPDk7WWZCMdsyDS7j67+dfElOlglVCj2P63JaAB29v4tgi5pExFAiSVa9AcPJ3viIrU17oHPCzFxpP7A38gq2rofj/igUse40xHt5SXKtu1Zwi1HD8yfPWHd41X0rzbRHQKQp+v8geYRcfva9+Fo2HHUJgwdJLUDDJcibRUU5uoIjDl5+MacptzYlbSOSItWdm214dI0VYDgCAdogl4KP9B9kbfrKhq4CR0IevM/XH3kmF/+zlcT7k6luOklz9G21HCGDACpapiKDSJ9aVZbu2Qlt1EpgSSV0V56Oo7SCmUdUEeMx6x6bEzXAAD1oROhALzFwwdrSTW6JRIL0ujsPVMSkUClScgE/LniqyNGyEKmtm9Jt6Fa0kE3utDGcZr8SD1v2bbrrUiGeNbXZ/Yts2pN9u94AvdLVBHHOmjn1jnFY09bWMKV0C7PUFIqZqvIf7CaZCUzrMOW457doBNEEM2WAzFYF7jLyi3k9RA7A1pz7Wq0= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?Z2F3RVk2Q0Y4K1lrSXFDa2s5SGF6OE1nZlp4NHhOZWRDTjliSnhmRFJOOWNx?= =?utf-8?B?c0lJSVhKZ1hHeVlNUkFTZWJmQ0QvcEoxOEVMdTl5eGlCbWxxMDNKendqNnlD?= =?utf-8?B?N0xVMHNFVE1RUStTMjBxc0l4aVFtYldvT1lMRS9sdEpPSGJKMzRhcURLempz?= =?utf-8?B?dlV4TVFyTHdyamhCTTVqK001YVUrc25DQWdCMk9LdDRuWnJjUzhBKy9QckND?= =?utf-8?B?RmZpQzNKYjM5WGxKSTRtS0p1UVhxNWZ6RHlBVFZFUVovdHlZUWt0VTZnOGRk?= =?utf-8?B?L2l3TWpIOFVCWWQ1TU9mY3FzZWlMSzBWT0MyRENkTWExU2tsaGZqYWFCNTMy?= =?utf-8?B?WjV3cDdKcWtUekMwMEFwQ2IxaG5oczJrWi80MWhEaldCQ3VZK1dva2NHYzB4?= =?utf-8?B?NzFLNW1idFlOUm5mVTN5TWZjUVh4TTdLS0JZS3VnVVVvalJiRS9IVmtJaTUy?= =?utf-8?B?UlR1Yk43MVl6UHpBT3VJZ0hZZFVpVURFbFo3QWxIcGpYbEFEQVVNV0tqUjRE?= =?utf-8?B?RkY2T3dnYmF4LzRlbXR1elJ4SlFyWnRBNm1WMTh5ZmRVbkw5c1h5TkNqalZ0?= =?utf-8?B?cFRtT2RFZUZldDRuV3dCckYwQWtWSHMxczZNMCtOcTVyS3VuNFBJRGlTQmZS?= =?utf-8?B?WXFkaWJXMG5wMDBXSTVZOHU3REpxZGdTNUt0ZmpsNW52NGxOME8rRE5ZOFRH?= =?utf-8?B?TENhbjBQWk1vK2RnK3owNGJxOTZQNGsreWMxdVlQZm0wQ2tDUjBBMy9qV01N?= =?utf-8?B?VGhOZG1QOVlWZnI4bWN3TjJZRldqWW0raERlRW94cHJIU0ZiSGI1OWN3R3pZ?= =?utf-8?B?RDFUYis1RFJWMkJNVjRqQ0VaUGtRNGRGRXpRMFVmSm5uNkVKOG94RlRrQ1Jr?= =?utf-8?B?SW1Td2k2Zi81cElwMTUxNXlXLysrd3dZaWlIYVpIZTRMOFhnTDVId0w4VlZv?= =?utf-8?B?Vm5TYUdNU1J0bWFxUjJkWGIvRUNBRXNCMzFPbGwxc1ljQ3AvdDJWNlZITm8z?= =?utf-8?B?enRpOUF6TnJzRTRrdzd4UW5idkMxaXdmRkNoWDI5b1FKaFlwMjlJS3QwakRP?= =?utf-8?B?Vzl4ZktxbzgzOVZ2ZlUzMmFITTF0NDR4S3BlcWttbTl0LzRINDZXZ295ZGtX?= =?utf-8?B?SGFLTk92YWMrbGVnUmhUTWVKRmMyYnlZUEVNOTgzVGRtNjBDQTNmZmZWUVM3?= =?utf-8?B?MFRBd1ZzSWhIRWNsWE8zYVA3UjBSVTZEcXVXTndxQVd5LzN6WmsxaE1PV3ph?= =?utf-8?B?QXRZSmdOS2FYa1NRVTdNOE0zNG9sQVRWZERabXJCcU82R1o0dz09?= MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-1ff67.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: c4e7152e-2535-4574-9f4f-08d9e761b647 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Feb 2022 22:08:30.4689 (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: DM8P223MB0160 Subject: Re: [FFmpeg-devel] [PATCH v2 0/2] avcodec/dvbsubdec, dvdsubdec: 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 Cc: Hendrik Leppkes , Marton Balint Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: > -----Original Message----- > From: ffmpegagent > Sent: Monday, January 10, 2022 8:56 PM > To: ffmpeg-devel@ffmpeg.org > Cc: Hendrik Leppkes ; Soft Works > ; Marton Balint ; softworkz > > Subject: [PATCH v2 0/2] avcodec/dvbsubdec,dvdsubdec: don't dump images > to disk based on DEBUG define > > It's annoying and unexpected, but still useful at times (as I've > realized > just recently). > > This is a follow-up to the earlier submission here: > https://www.mail-archive.com/ffmpeg-devel@ffmpeg.org/msg128080.html > > There has been a comment from Anton, questioning whether the dump- > feature is > useful. Meanwhile I came to the conclusion that it can be useful in- > fact. It > just shouldn't happen automatically when DEBUG is defined. That's what > these > patches do. > > I also added fixes for the fopen() call. > > softworkz (2): > avcodec/dvdsubdec,dvbsubdec: don't dump images to disk based on > DEBUG > define > avcodec/dvdsubdec,dvbsubdec: fix writing ppm > > libavcodec/dvbsubdec.c | 20 +++++++++++++------- > libavcodec/dvdsubdec.c | 11 ++++++++--- > 2 files changed, 21 insertions(+), 10 deletions(-) > > > base-commit: 6c4074e4234edacfb3f37184fd68771df3cb2b7f > Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr- > ffstaging-17%2Fsoftworkz%2Fsubmit_dvb_subs-v2 > Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr- > ffstaging-17/softworkz/submit_dvb_subs-v2 > Pull-Request: https://github.com/ffstaging/FFmpeg/pull/17 > > Range-diff vs v1: > > 1: 6ca8905c3d ! 1: 2f12ac7f1f avcodec/dvbsubdec: don't dump images > to disk based on DEBUG define > @@ Metadata > Author: softworkz > > ## Commit message ## > - avcodec/dvbsubdec: don't dump images to disk based on DEBUG > define > + avcodec/dvdsubdec,dvbsubdec: don't dump images to disk based > on DEBUG define > > It's been a regular annoyance. > Introduce a debug-only parameter for this. > @@ libavcodec/dvbsubdec.c: static const AVOption options[] = { > {NULL} > }; > static const AVClass dvbsubdec_class = { > + > + ## libavcodec/dvdsubdec.c ## > +@@ libavcodec/dvdsubdec.c: typedef struct DVDSubContext > + uint8_t used_color[256]; > + #ifdef DEBUG > + int sub_id; > ++ int dump_imgs; > + #endif > + } DVDSubContext; > + > +@@ libavcodec/dvdsubdec.c: 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 > + > +@@ libavcodec/dvdsubdec.c: 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 = { > 2: 8da6e4ab17 ! 2: 0cd2c77f31 avcodec/dvbsubdec: fix writing ppm > @@ Metadata > Author: softworkz > > ## Commit message ## > - avcodec/dvbsubdec: fix writing ppm > + avcodec/dvdsubdec,dvbsubdec: fix writing ppm > > fopen needs (b)inary mode > > @@ libavcodec/dvbsubdec.c: static void png_save(DVBSubContext > *ctx, const char *fil > if (!f) { > perror(fname2); > return; > + > + ## libavcodec/dvdsubdec.c ## > +@@ libavcodec/dvdsubdec.c: static void ppm_save(const char > *filename, uint8_t *bitmap, int w, int h, > + int back[3] = {0, 255, 0}; /* green background */ > + FILE *f; > + > +- f = fopen(filename, "w"); > ++ f = fopen(filename, "wb"); > + if (!f) { > + perror(filename); > + return; > 3: 9186ff48ec < -: ---------- avcodec/dvdsubdec: don't dump images > to disk based on DEBUG define > 4: 341474e338 < -: ---------- avcodec/dvdsubdec: fix writing ppm > > -- > ffmpeg-codebot Ping. (this v2 has squashed the commits as requested) _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".