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 ABE4241099 for ; Tue, 15 Mar 2022 20:08:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 46B9668B15F; Tue, 15 Mar 2022 22:06:45 +0200 (EET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2068.outbound.protection.outlook.com [40.92.90.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A004F68B10D for ; Tue, 15 Mar 2022 22:06:42 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gpgK4yflaVylYgbXIKOPDUf4c0VWryK83e+vkTw9H3v3k68C3plF/Uc659kpFAGWh69sHBaWdYENJWXGrW8Qa2peV5NJGGx2XUTDAzTgGdF2t2+B1i4/7x7zUC/2Hc55n3krOD9t/Ej3fyGQ242uDOZa+ZAKuFkBoGuFYIez0mEUJgPdGpi0D6KhPAbD86ZNNmKtxFfq3Ro3Ryh9+6LgOJ3kL2i8Ux643Lceu5KunX1M0AHQpeaTuCqI4DZnXFnOKqlC9u4tH+iKW3fZVJyrmXwNzc/gZW4zhPlIgca/v1S5JRbwf4Ct8dCVH+0Y7e8qcW5PPHZl/IP/G5+s8HSAbw== 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=Lve4IuqSrANnWTSLnQYKT5CojnPfxU4+37/7CllHA1o=; b=XHCHnUxiEDATDVfv9JnMLio3Gkbqpe7W1wTMFy6whMZ5bQa1Ls9ni513cJ7QiatP8WssipUjuOAfm90vdvOI88oTwoGVhRkqvDo/OLIJPzqVQ3b/lsnhvRsdaacE9sDzUmVUQXCJU2lC8M5I48E5hIck5iRdmiMwKV4ovbPnfYXypjF0dsAbJvfbq98aQkYK0OW5iWhWFemR5ieQ36W1I/nGF7SOWyERRQqZ1dJRgK+DvtvrzNIBhbQUZKzYldyaB7mJXXBY+jnJ4bLItuxZJTHV0faJhFCLJBJEORvaufI+CjFlNk/abew88uDNJdYEYrf6Y5R3zbhNRWHz1TqPsQ== 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=Lve4IuqSrANnWTSLnQYKT5CojnPfxU4+37/7CllHA1o=; b=jvsse+K37PEzAe8e6cKrJOLRxuaA1nEraWOXF2xZC534gEcX+Iji3+u3/Q/TGd1Sx6PmeIxHmiIsYX9zljLcufG7AnooYg/Eaje3oPT0n5W/e64AnM5M+Cigm/y42CbVDt/pDpImIpWKbyGgWXd24w4an9R6zGgg9i/KrkC9VwgHEWTNNQjgVKbpiw3Dd/MklOvNg5IBvmbiX3XSIDf9NJcqTPRTHft3JDmqpzL67Lvr1D/0vfKwCixHJ8BaXqBxOBDNqBXcT+dNwB0A3sQveMfpi+/yWTatrHXbq0wVdy2sazyeHF6EiLAntrclXAsNZ84tJ6WAHAchCYH1VJ77gQ== Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) by PA4PR01MB8947.eurprd01.prod.exchangelabs.com (2603:10a6:102:2a6::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.26; Tue, 15 Mar 2022 20:06:41 +0000 Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8]) by AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8%4]) with mapi id 15.20.5061.028; Tue, 15 Mar 2022 20:06:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Mar 2022 21:06:04 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [uEoiUNysJhky4eoCK8eqmYetT0SSMOu5] X-ClientProxiedBy: AM5PR0202CA0004.eurprd02.prod.outlook.com (2603:10a6:203:69::14) To AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) X-Microsoft-Original-Message-ID: <20220315200611.553534-13-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 457d4879-ffd8-4fe8-b954-08da06bf5257 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQIK6GOv6I/5+ncmNhpuEjVBeJ67f/nzBE9o09n3f8ffFu85nO8TjH9ZjCmVg6MpoREdKDj7YUsETN5OhXfgXnhaaqXRvDtxFBxV7teRBc5Pz47qX0bY8nmKZz6jlaJGpK7Er1mt5QDrhw7YSsXSvKNNTdEIVQnqVHjFZJNyuj2q7fWyDKTt2XJcVzwh6qEhoFu6eqY8/6I2jLMIzSDe7MIMxKZnAr2iqI3Yl+qVivfMZ7ltG5UryqFBjiEe7uJSaA0wrLeFofoR73gW8Me0BbGai0+Ofcxub7sCmGtY3HL9M9UHfNqVaO8S736QklMOiAZt2pCi8VmI990wwhl3GuPronKCMj0zUxRiyJ28PdYL5fhLg+gayfMyYQFddw5s8Qhmr9DhOksWPdysjvUrWjbiMttV4PO95dmhwvFBl85YBy5qrBzSxIW48Jil3hxitx3mSEgdlb/5EHHGRRaxdCK6GH2Oymu6JdFs7F9pDUkmzMVhedJFsKitMwF9319ypA0QYF/7f+MMDAKiXlNqaBNx6CHbIabMbgGwuU1DuPkDXwB1ivxRYgR8k9yA2LJCKEkreMupxY7VRbEQiDC6B6G6qoIBXF1x3phl1oYY52nTuVBfQg+oucG2+Fy7nS0VKx4Fujy/pD6Sv92O/pKZuVEfeGR+wpovh0hROoOEZ4iqJShHEvR2w2Tuihlna/O0AsUmHgo7TjCUYVTQsqD434JiSawSHHvugzQ4QcgZoNNNipNdTmQwZZ5jnW/bDriq98= X-MS-TrafficTypeDiagnostic: PA4PR01MB8947:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qqnhaIxLgq2BU2hUz9+KboqMb/p5SE6b6xEly2aczm2vcmWP2X033EklUpHDhMxcs9uWTEWxirfaROsZiS9lx2q4zd9ajaxqnzeagS2a199Y7KjiXvjYro4ndRJrqOitJ7xMjZc4g2uSYBlrP56zY12nd5j99IVyDeeaOCZPdagd35/Q3NswbS1Gq5HEVGwDviQSZkepWmJctzLhd24/uhDUwSitkiHb0cXhK/OOhKa6GRgQ5wNpdsY+dqfbcticFjM1Jr3q6fFjeHUZl+BR8JxaZ+l1HxlEn/T1DVymNoeVZrSIH4eSikT83CqWSBUN702RI1wzXYJLg9QChwFaFE6BQ+sV4La5fLU8i8nY0kLhxx6/oAPu9nlDRgbjbKidE3F3NhIw6nUXxSuIeZmYZtEXqPRbwHouz0k9+SXSRyDJ7rcyhnxnncr+FmstJDQsEaqjhPxLhvWcF2Wvicewwyfa5B3aO7NQkDbRk/+22LorsO907EZb9Kg5OrJ5af2fXC6ccccvLDR7a+MTBUb/6N3YtMGhDNEL9EABuLGApqJKzNmajE8w9CEGenxxEZXZb95Uf6SVnr1ZZHSq25kA7Q== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?XBYuno+P5LrghJzbnzZ2TofLIpDwCgVKe6VqNrDEGJz8UgNbwWfiuQve4zIM?= =?us-ascii?Q?lvR9psNGG/8MmmMtY46JUkZG7KICXNQ2vtIsJ7X2vGcKcPo45Q3F6ekmPyFf?= =?us-ascii?Q?KU6XagrQYDnZJJXsivCPVMVfCeGU/0eDZ9pI7mec6VK4GvXRj/sKMF9d6RZn?= =?us-ascii?Q?UGJwt+S01HQfAFTZU3Ys7arB/KrlS49KcS2oJPOM8yl7jXgyFy8eqF99XJEF?= =?us-ascii?Q?0aKhOccazO8KYyD0WZbfohmmMh9a+tRKFlGUniSKE7wyn7rLN33SPuZ3dv+n?= =?us-ascii?Q?9krPpjPSHR6F0t+qCbx0SwqClqytqfXCAHZDJPLzAQXnIpk+Zz61q9xg460S?= =?us-ascii?Q?ncdNqpbTj7q246NkxOBHm8LMjhuP8CG4x+5RVw/56fU0q8gsA+RF9U3dw1dV?= =?us-ascii?Q?DMzXjO1eqxsIso4YEKwI/X26LcKTz8KDuOOUE+nW2dak35/vgJ8MZtPUVSbr?= =?us-ascii?Q?3H1mCMIkQLPXemTM5PWzL16FNBSu5ca+qomcq+Z8a8wXQEgRR6SZ86eBERC0?= =?us-ascii?Q?BJ3tGkKejr9pRz979Kr4BcxVqiKIId22LvpiSXVBqvE840egof9+cCkrTksL?= =?us-ascii?Q?WWirpJNXAH6UgFuOji6kLneq9hg5wzCvRBGwHnSGvf2VhO+zMYtbqt/c5ehd?= =?us-ascii?Q?nsni056Uyv975oRzOupjdlkNQif+P3CUvNLkRCM1TQEi2CRvfMO4Q9dopMYo?= =?us-ascii?Q?HbUOUqaDanf+GViiFo4WaBlenq+KAcjQQRBypdoX/slgYli9d5LlQuVWAPp9?= =?us-ascii?Q?YdFXY9WpDf37PzIajWUgfcOIXaWKlkQbnGOSk4y9qUEOw9/jSmAR5I2Vy5ev?= =?us-ascii?Q?QzHN7qKziHJkrBktcnPvVMABYCXvXwrjSA4ax/U1TQ0/SJIsKC33ubxr0rV/?= =?us-ascii?Q?pUh+jlQOHqAzjZHKKpSkxWiMblwfvAwTA0BZQuRQXiFXMHbml4Rpk0gzzYQl?= =?us-ascii?Q?hdzn4plGEnoMRR67N3hjMRC05FzKRdkAxSFHZrl8fl050HCTErj7U4fUR93M?= =?us-ascii?Q?ZF+rM0h80j3xmdfg/cEj+xsQjWG2wbsf3SD1beC9uWLB4jKLQdER0f0sgDmp?= =?us-ascii?Q?qgvrBAVYf5/C7pJUi1mJAWO5GM4f8VP/AJ8Zs+hcbCVKgxsgr5oXtH2qTTcH?= =?us-ascii?Q?NeAPsdUuee4dii0jeUBT+JAFr/M1rbwdCyNKvNuCh0iggpItk0MjAuc=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 457d4879-ffd8-4fe8-b954-08da06bf5257 X-MS-Exchange-CrossTenant-AuthSource: AS1PR01MB9564.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2022 20:06:41.8222 (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: PA4PR01MB8947 Subject: [FFmpeg-devel] [PATCH 14/21] avcodec/lscrdec: Don't open and close z_streams unnecessarily 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 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: Instead reuse and reset a single z_stream. Signed-off-by: Andreas Rheinhardt --- configure | 2 +- libavcodec/lscrdec.c | 84 +++++++++++++++++--------------------------- 2 files changed, 33 insertions(+), 53 deletions(-) diff --git a/configure b/configure index e3d2f590cd..0e5923fced 100755 --- a/configure +++ b/configure @@ -2850,7 +2850,7 @@ jpegls_decoder_select="mjpeg_decoder" jv_decoder_select="blockdsp" lagarith_decoder_select="llviddsp" ljpeg_encoder_select="idctdsp jpegtables" -lscr_decoder_deps="zlib" +lscr_decoder_select="inflate_wrapper" magicyuv_decoder_select="llviddsp" magicyuv_encoder_select="llvidencdsp" mdec_decoder_select="blockdsp bswapdsp idctdsp mpegvideo" diff --git a/libavcodec/lscrdec.c b/libavcodec/lscrdec.c index 18f46bd27c..58dac6e587 100644 --- a/libavcodec/lscrdec.c +++ b/libavcodec/lscrdec.c @@ -32,6 +32,7 @@ #include "packet.h" #include "png.h" #include "pngdsp.h" +#include "zlib_wrapper.h" typedef struct LSCRContext { PNGDSPContext dsp; @@ -52,7 +53,7 @@ typedef struct LSCRContext { int cur_h; int y; - z_stream zstream; + FFZStream zstream; } LSCRContext; static void handle_row(LSCRContext *s) @@ -71,11 +72,11 @@ static void handle_row(LSCRContext *s) s->y++; } -static int decode_idat(LSCRContext *s, int length) +static int decode_idat(LSCRContext *s, z_stream *zstream, int length) { int ret; - s->zstream.avail_in = FFMIN(length, bytestream2_get_bytes_left(&s->gb)); - s->zstream.next_in = s->gb.buffer; + zstream->avail_in = FFMIN(length, bytestream2_get_bytes_left(&s->gb)); + zstream->next_in = s->gb.buffer; if (length <= 0) return AVERROR_INVALIDDATA; @@ -83,22 +84,22 @@ static int decode_idat(LSCRContext *s, int length) bytestream2_skip(&s->gb, length); /* decode one line if possible */ - while (s->zstream.avail_in > 0) { - ret = inflate(&s->zstream, Z_PARTIAL_FLUSH); + while (zstream->avail_in > 0) { + ret = inflate(zstream, Z_PARTIAL_FLUSH); if (ret != Z_OK && ret != Z_STREAM_END) { av_log(s->avctx, AV_LOG_ERROR, "inflate returned error %d\n", ret); return AVERROR_EXTERNAL; } - if (s->zstream.avail_out == 0) { + if (zstream->avail_out == 0) { if (s->y < s->cur_h) { handle_row(s); } - s->zstream.avail_out = s->crow_size; - s->zstream.next_out = s->crow_buf; + zstream->avail_out = s->crow_size; + zstream->next_out = s->crow_buf; } - if (ret == Z_STREAM_END && s->zstream.avail_in > 0) { + if (ret == Z_STREAM_END && zstream->avail_in > 0) { av_log(s->avctx, AV_LOG_WARNING, - "%d undecompressed bytes left in buffer\n", s->zstream.avail_in); + "%d undecompressed bytes left in buffer\n", zstream->avail_in); return 0; } } @@ -131,18 +132,12 @@ static int decode_frame_lscr(AVCodecContext *avctx, return ret; for (int b = 0; b < nb_blocks; b++) { + z_stream *const zstream = &s->zstream.zstream; int x, y, x2, y2, w, h, left; uint32_t csize, size; - s->zstream.zalloc = ff_png_zalloc; - s->zstream.zfree = ff_png_zfree; - s->zstream.opaque = NULL; - - if ((ret = inflateInit(&s->zstream)) != Z_OK) { - av_log(avctx, AV_LOG_ERROR, "inflateInit returned error %d\n", ret); - ret = AVERROR_EXTERNAL; - goto end; - } + if (inflateReset(zstream) != Z_OK) + return AVERROR_EXTERNAL; bytestream2_seek(gb, 2 + b * 12, SEEK_SET); @@ -154,10 +149,8 @@ static int decode_frame_lscr(AVCodecContext *avctx, s->cur_h = h = y2-y; if (w <= 0 || x < 0 || x >= avctx->width || w + x > avctx->width || - h <= 0 || y < 0 || y >= avctx->height || h + y > avctx->height) { - ret = AVERROR_INVALIDDATA; - goto end; - } + h <= 0 || y < 0 || y >= avctx->height || h + y > avctx->height) + return AVERROR_INVALIDDATA; size = bytestream2_get_le32(gb); @@ -168,10 +161,8 @@ static int decode_frame_lscr(AVCodecContext *avctx, bytestream2_seek(gb, 2 + nb_blocks * 12 + offset, SEEK_SET); csize = bytestream2_get_be32(gb); - if (bytestream2_get_le32(gb) != MKTAG('I', 'D', 'A', 'T')) { - ret = AVERROR_INVALIDDATA; - goto end; - } + if (bytestream2_get_le32(gb) != MKTAG('I', 'D', 'A', 'T')) + return AVERROR_INVALIDDATA; offset += size; left = size; @@ -180,40 +171,32 @@ static int decode_frame_lscr(AVCodecContext *avctx, s->row_size = w * 3; av_fast_padded_malloc(&s->buffer, &s->buffer_size, s->row_size + 16); - if (!s->buffer) { - ret = AVERROR(ENOMEM); - goto end; - } + if (!s->buffer) + return AVERROR(ENOMEM); av_fast_padded_malloc(&s->last_row, &s->last_row_size, s->row_size); - if (!s->last_row) { - ret = AVERROR(ENOMEM); - goto end; - } + if (!s->last_row) + return AVERROR(ENOMEM); s->crow_size = w * 3 + 1; s->crow_buf = s->buffer + 15; - s->zstream.avail_out = s->crow_size; - s->zstream.next_out = s->crow_buf; + zstream->avail_out = s->crow_size; + zstream->next_out = s->crow_buf; s->image_buf = frame->data[0] + (avctx->height - y - 1) * frame->linesize[0] + x * 3; s->image_linesize =-frame->linesize[0]; while (left > 16) { - ret = decode_idat(s, csize); + ret = decode_idat(s, zstream, csize); if (ret < 0) - goto end; + return ret; left -= csize + 16; if (left > 16) { bytestream2_skip(gb, 4); csize = bytestream2_get_be32(gb); - if (bytestream2_get_le32(gb) != MKTAG('I', 'D', 'A', 'T')) { - ret = AVERROR_INVALIDDATA; - goto end; - } + if (bytestream2_get_le32(gb) != MKTAG('I', 'D', 'A', 'T')) + return AVERROR_INVALIDDATA; } } - - inflateEnd(&s->zstream); } frame->pict_type = frame->key_frame ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P; @@ -222,11 +205,7 @@ static int decode_frame_lscr(AVCodecContext *avctx, return ret; *got_frame = 1; -end: - inflateEnd(&s->zstream); - if (ret < 0) - return ret; return avpkt->size; } @@ -237,6 +216,7 @@ static int lscr_decode_close(AVCodecContext *avctx) av_frame_free(&s->last_picture); av_freep(&s->buffer); av_freep(&s->last_row); + ff_inflate_end(&s->zstream); return 0; } @@ -255,7 +235,7 @@ static int lscr_decode_init(AVCodecContext *avctx) ff_pngdsp_init(&s->dsp); - return 0; + return ff_inflate_init(&s->zstream, avctx); } static void lscr_decode_flush(AVCodecContext *avctx) @@ -275,5 +255,5 @@ const AVCodec ff_lscr_decoder = { .decode = decode_frame_lscr, .flush = lscr_decode_flush, .capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; -- 2.32.0 _______________________________________________ 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".