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 0F215410B3 for ; Tue, 15 Mar 2022 20:09:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 995B268B1A5; Tue, 15 Mar 2022 22:06:52 +0200 (EET) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065096.outbound.protection.outlook.com [40.92.65.96]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5A50D68AF87 for ; Tue, 15 Mar 2022 22:06:48 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bjNYc/Wpq7emTaf2QIBiG5Eh+m685H2SKsFM1j326An1/DsK6/8nVIuShEsKJnMVB4LSSsgTwx3g0/SVw2idP36ngJkdA6UR3eWOpBzAKp73/IEP7PvwBi19MJZcgMq1ePlJKIh2bp8CBDFr5Io3D2DXKIdaNn65jQogZjO1P7wuLY13ARXJPjCL2XhXaPyw91GnzjbiK4Yl6l5hhVMKSD8zIuW6oShKdnf+/l/0yjn7/YC/D94qTKImOH2+aqANWCIE2b4K6SPBb0tiV6VKRp1LySR4RqXwkeJrqc8Ao1hMTh4QIR+lC8Z1abNMGgEqsz5ioVjje8c1gwV/Sr7tSQ== 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=4Ax65ckTg1+aO/BoIGigaHsrdoTgquAJZESxBFbEFeE=; b=HeeVAPjZLIRypKKUxWNQlkyCCF5bFlu6DhGwiP2JJPMTIt6mG9FbB+VPfCB+oxjW7M9ty9qA472Qj8LTBxIwuG5zN8T5wCh7Pqqcgz9H18DB5Sggel0tCFxvVATYxTOygraxx0IQpdATQNmc4gixwEXSLeahY0C7fRU4IpTwiQvTu7SwtskzqXrjXwB6wBHw/4vOLtc/SLyq0blEHhFYufvqEAiPX/DfwSvBl4Iv7Jcd0trhkG7QU4jsXtfxlpdYWHLxqHQRzLsXbFeNsU8CMuXxh0c0LOv0V83Z1zj78FyfX/WVTVgvE4YWEQf020oGfXl0Ng3t/V3WL1RvxPcQxA== 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=4Ax65ckTg1+aO/BoIGigaHsrdoTgquAJZESxBFbEFeE=; b=gU74UvUyFwlmOp3Afu5xWdtiWcpU1e52Q4zda5xsHzerO/+reSTnr0prrytMESUuTGKBHlQnGNzZ38JYsPkjIomrQNdNvhUFyENSjb7LFfjDrAFq7cWih3gOFFCunnjkL8UwZah8dVZrTdoFTNFNeG1zx6ItBqTNUiG96g+oj9SQYP8Ot2IG0ljj3MOUhzm5xorFv8Bg+y4w+L3hl5fKL/2zJ0EurP5wVi9Y1xRxrU4GQPMuvEUPA8ooHpZ0sdgKMxTSps4IxIOmVgNEuZOxfzm4JbZ8+EIVjOPALIp2JPatM4A4zuWJWygwhM4MfOJ7+1IVMgotRIyDeje2GlmcwA== Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) by PR3PR01MB7035.eurprd01.prod.exchangelabs.com (2603:10a6:102:7b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.14; Tue, 15 Mar 2022 20:06:46 +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:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Mar 2022 21:06:09 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [36f0R3QmkKZ045TiMmc+6GG74wkY9X1N] 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-18-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 02324982-b364-4f75-a9bd-08da06bf555e X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQIK6GOv6I/5+ncmNhpuEjVPahUQnQ8uqN/w3m8ftEjjFR1Tdg6d9XQCo0f0myRNE85q2ZaO60X4YlLawyPFD++0QUf5Qrs7eXB7M4dnvnuUZMDSHr8MlnCFw9DOorFS0pSxLgr4nilZqwBMAd4GyhpvMLEineZjF58kw+J0KKM8/9HHQzjlp8A7kUZTKXus4gEPouSu8yWvx1ZnMydLU30TSuXiE5zvUTNXCdIQRPqK2DsrdmIguyD9jGsnsFJ3bvNxN1AjGri3txSMpSYDZ0cjwIfHihG5XgowkjM1DQidGanPhKFm3kcnup2seeVKLkPR+q8HmHhMRrnGbXf1EMX2irkQY3D2FQDmbOKmSVHIakG76V4xHbXLG6Q7INwuffV+/H/fym9p5dMVWOJ9AvjX0Wb/nF60ijfxPp2HbTLeQtYLVKI/vKY+W7A8FEj0fChjGQIFY4MZSywKphXI5zEfxMalPOQywUni8OgLAnrzkUBtH3EHWc35P1lbMR2q1j9knqxDZKbyItOW/l10PtVspfl2jW0smOcWoCvb/ibL8OQgtl7WFgGs9sVk9CLRHTx//B2/RfrNfafs8sPAIe1ZOJ/ptIAtj6/GUq3PfDEZbBQuA9zNS9CfbRQLugFOS6iar1rDna/EteV8ztvZoepZYjxSg28O00Un88YKfmM9HFYeZQK5Rbb2iKOeBh+FFWW3QDFJwF7BLFylZoZlq62Ll9744L2fcgSJTM3xWIqzwGkmm5k5ukahvxsXJGdlJk= X-MS-TrafficTypeDiagnostic: PR3PR01MB7035:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EMlclBPqTUqcgNMpdHXJgVE5QILXb6ba4fFDNziGNsVqZvnTzvhjyB3UYXiKMkmXzEpxQeYJUxIfFZ8WRboXl+LYSh3wSqrBOGBJCYoSnJzfQvz6mZtguXimIzrbW6ROndb/S/SCU9XOtM3p3u/4Uh/8ku6nykJQi0eLJchwyNJWRSjcpL3TZvTBXH/sugO5HYgqIdNZVW8kIN6LOZg1iroyA70vVUcsoc8g++v31vCgRxyZwrS1Wd34LNfxlxEt4SXNbJWXumjbSCqALw7UndwPyhjM72FioJJQc3O7qIFwUJ/a12WpYPkZYlgBpzmYDr81mlXqNHCCXhlXbDPshHA2iiKrYjmMmqbBhQX1NW5M1fbLx3OiEX8hijmhWq9ugQXcYwxr9k/m71EKsSLBtr9IWcoZ+911ax/RQxD8Y0JLWDhLZdpU5u6/UW/B7aSQnUiRHuRkSq2STaO0xCr4TV4a5s/FaBhYpJyyufSAdw6Hz/dLzjwrONQZP7xHpg1HPwhM23kyLkBPygfoXDffHsjDP7V/MHhLKr9TDZQ7Gboa8hqB30RGxvvpplOFZRjEUHCtTTWxA/AiaR5PS+k9FQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Maw1tr12t8l298hGAW+5eP+mecnIA9rgsWFbMX3opGjEhgaGLk+M5hAdj2vg?= =?us-ascii?Q?8hnfWa+PijBrGmImHlJhElOAWXha/bgnTUJfPHsh4TT8PyuChiXZ9MfZ2NYd?= =?us-ascii?Q?Dzk7H6eZUZg2hjd8rtbaYFwUIejQdaNNSK9/1x/SgM12fazt2edFYfop88aN?= =?us-ascii?Q?gGLU1ZSX0+NlxEpN8praz3GLlMLGwsK8a1ZzayzPreEdxOZQ5swoX34ZKZdZ?= =?us-ascii?Q?YTT8uFwG8QTZwWfBe0UhKNhQjTpF48AxMfVtz5kCCR3lxexmg8qfRUxXDKtT?= =?us-ascii?Q?stjDDHq9AiNmTiMyjUatrkA4eg5ZNT9uzFX0tKMTdxDm5TVmoZa9a+FhZzZh?= =?us-ascii?Q?onGHpTK1fW2jqE4YRmkL+J4TxuYgv+6eIQuPKunukO5ypzTINKIMpZOSFltq?= =?us-ascii?Q?G0H/UB0AfsuAF0iWQFbrZXN/kxFqKUpxllqIi6I++4Y8p3RQUIGf8dmkfj5T?= =?us-ascii?Q?xX/kTA6TE2lzBNeSbeS6rgnUAV4gGgHubuWZLg/58f3lqzNBHacYLvocp8V/?= =?us-ascii?Q?TfreQ1mGYHwRtQV/0REnwX3nKVp6T97HKPoRNaCBkVUmUnUcAHsc6B2GT2qq?= =?us-ascii?Q?3qaCrR4hMtHZLe5wDmaWlr0ccKiRr5T3TnChmuKYH8nMbgtsGN9C1hnerpT/?= =?us-ascii?Q?qMi8kwxN+XlaMKxPvuWk8mYBCiLFfhp2dCHK2OMtzwWfDeyvYRxYljgY+4qV?= =?us-ascii?Q?l97kpUtdCH9VFnzDjyCwjVWqckQBhBdZf8kwaVTLdchv+kvrCPi0m1hXJAL4?= =?us-ascii?Q?3kJvx9JvIWBA/D1kv/KtgeYGUvhxFywuwy43tn//8d8lO0ajnY3+z5LwQA99?= =?us-ascii?Q?/5KOQeiEcbKxkKaxwaxUJDEPdwXhutcXCA8XUKQl5/XmejVKzdUaG5QPxRvg?= =?us-ascii?Q?R66D9RnuZZszGHMKvaYDPvVuoA5fIQUacNd1TJMu5DpvMvzeOQZG9BO/632+?= =?us-ascii?Q?QaPvPtzN+ohxk9L/2BZtdPrNVu3oe3VV3C1DR4C4Peg4LGuEhQw8GIMRcrkV?= =?us-ascii?Q?1mNgw5qSsWLoVsfYxo1vGKT3BorHx159ZMtcuZq5pD4bJXUO+PaCDiW24ezZ?= =?us-ascii?Q?h16ZEF+j87Np2of27Rl3t8wFk9QkKU7rPSgrZUgAAIkT3BcoSOmQH1vlKeHa?= =?us-ascii?Q?oTUbIF8egyR8X4ToPhSj2hqYMykNhgb4irTfhbNV1j5vxT/s6oPLb5Q=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 02324982-b364-4f75-a9bd-08da06bf555e 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:46.8863 (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: PR3PR01MB7035 Subject: [FFmpeg-devel] [PATCH 19/21] avcodec/pngenc: Use ff_deflate_init/end() wrappers 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: They return nicer error messages. Signed-off-by: Andreas Rheinhardt --- configure | 6 ++---- libavcodec/png.c | 10 --------- libavcodec/png.h | 4 ---- libavcodec/pngenc.c | 49 ++++++++++++++++++++++----------------------- 4 files changed, 26 insertions(+), 43 deletions(-) diff --git a/configure b/configure index 8f36699d0c..a3d4b224f4 100755 --- a/configure +++ b/configure @@ -2761,8 +2761,7 @@ amv_decoder_select="sp5x_decoder exif" amv_encoder_select="jpegtables mpegvideoenc" ape_decoder_select="bswapdsp llauddsp" apng_decoder_select="inflate_wrapper" -apng_encoder_deps="zlib" -apng_encoder_select="llvidencdsp" +apng_encoder_select="deflate_wrapper llvidencdsp" aptx_decoder_select="audio_frame_queue" aptx_encoder_select="audio_frame_queue" aptx_hd_decoder_select="audio_frame_queue" @@ -2906,8 +2905,7 @@ opus_decoder_deps="swresample" opus_decoder_select="mdct15" opus_encoder_select="audio_frame_queue mdct15" png_decoder_select="inflate_wrapper" -png_encoder_deps="zlib" -png_encoder_select="llvidencdsp" +png_encoder_select="deflate_wrapper llvidencdsp" prores_decoder_select="blockdsp idctdsp" prores_encoder_select="fdctdsp" qcelp_decoder_select="lsp" diff --git a/libavcodec/png.c b/libavcodec/png.c index e772eaad26..34f649815a 100644 --- a/libavcodec/png.c +++ b/libavcodec/png.c @@ -38,16 +38,6 @@ static const uint8_t ff_png_pass_xshift[NB_PASSES] = { 3, 3, 2, 2, 1, 1, 0 }; -void *ff_png_zalloc(void *opaque, unsigned int items, unsigned int size) -{ - return av_calloc(items, size); -} - -void ff_png_zfree(void *opaque, void *ptr) -{ - av_free(ptr); -} - int ff_png_get_nb_channels(int color_type) { int channels; diff --git a/libavcodec/png.h b/libavcodec/png.h index a15560131f..01171e682e 100644 --- a/libavcodec/png.h +++ b/libavcodec/png.h @@ -52,10 +52,6 @@ /* Mask to determine which y pixels are valid in a pass */ extern const uint8_t ff_png_pass_ymask[NB_PASSES]; -void *ff_png_zalloc(void *opaque, unsigned int items, unsigned int size); - -void ff_png_zfree(void *opaque, void *ptr); - int ff_png_get_nb_channels(int color_type); /* compute the row size of an interleaved pass */ diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index 0b75f948d5..b34a94db21 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -26,6 +26,7 @@ #include "lossless_videoencdsp.h" #include "png.h" #include "apng.h" +#include "zlib_wrapper.h" #include "libavutil/avassert.h" #include "libavutil/crc.h" @@ -56,7 +57,7 @@ typedef struct PNGEncContext { int filter_type; - z_stream zstream; + FFZStream zstream; uint8_t buf[IOBUF_SIZE]; int dpi; ///< Physical pixel density, in dots per inch, if set int dpm; ///< Physical pixel density, in dots per meter, if set @@ -272,19 +273,20 @@ static void png_write_image_data(AVCodecContext *avctx, static int png_write_row(AVCodecContext *avctx, const uint8_t *data, int size) { PNGEncContext *s = avctx->priv_data; + z_stream *const zstream = &s->zstream.zstream; int ret; - s->zstream.avail_in = size; - s->zstream.next_in = data; - while (s->zstream.avail_in > 0) { - ret = deflate(&s->zstream, Z_NO_FLUSH); + zstream->avail_in = size; + zstream->next_in = data; + while (zstream->avail_in > 0) { + ret = deflate(zstream, Z_NO_FLUSH); if (ret != Z_OK) return -1; - if (s->zstream.avail_out == 0) { + if (zstream->avail_out == 0) { if (s->bytestream_end - s->bytestream > IOBUF_SIZE + 100) png_write_image_data(avctx, s->buf, IOBUF_SIZE); - s->zstream.avail_out = IOBUF_SIZE; - s->zstream.next_out = s->buf; + zstream->avail_out = IOBUF_SIZE; + zstream->next_out = s->buf; } } return 0; @@ -432,6 +434,7 @@ static int encode_headers(AVCodecContext *avctx, const AVFrame *pict) static int encode_frame(AVCodecContext *avctx, const AVFrame *pict) { PNGEncContext *s = avctx->priv_data; + z_stream *const zstream = &s->zstream.zstream; const AVFrame *const p = pict; int y, len, ret; int row_size, pass_row_size; @@ -459,8 +462,8 @@ static int encode_frame(AVCodecContext *avctx, const AVFrame *pict) } /* put each row */ - s->zstream.avail_out = IOBUF_SIZE; - s->zstream.next_out = s->buf; + zstream->avail_out = IOBUF_SIZE; + zstream->next_out = s->buf; if (s->is_progressive) { int pass; @@ -496,14 +499,14 @@ static int encode_frame(AVCodecContext *avctx, const AVFrame *pict) } /* compress last bytes */ for (;;) { - ret = deflate(&s->zstream, Z_FINISH); + ret = deflate(zstream, Z_FINISH); if (ret == Z_OK || ret == Z_STREAM_END) { - len = IOBUF_SIZE - s->zstream.avail_out; + len = IOBUF_SIZE - zstream->avail_out; if (len > 0 && s->bytestream_end - s->bytestream > len + 100) { png_write_image_data(avctx, s->buf, len); } - s->zstream.avail_out = IOBUF_SIZE; - s->zstream.next_out = s->buf; + zstream->avail_out = IOBUF_SIZE; + zstream->next_out = s->buf; if (ret == Z_STREAM_END) break; } else { @@ -518,7 +521,7 @@ the_end: av_freep(&crow_base); av_freep(&progressive_buf); av_freep(&top_buf); - deflateReset(&s->zstream); + deflateReset(zstream); return ret; } @@ -530,7 +533,8 @@ static int encode_png(AVCodecContext *avctx, AVPacket *pkt, int enc_row_size; int64_t max_packet_size; - enc_row_size = deflateBound(&s->zstream, (avctx->width * s->bits_per_pixel + 7) >> 3); + enc_row_size = deflateBound(&s->zstream.zstream, + (avctx->width * s->bits_per_pixel + 7) >> 3); max_packet_size = AV_INPUT_BUFFER_MIN_SIZE + // headers avctx->height * ( @@ -858,7 +862,8 @@ static int encode_apng(AVCodecContext *avctx, AVPacket *pkt, } } - enc_row_size = deflateBound(&s->zstream, (avctx->width * s->bits_per_pixel + 7) >> 3); + enc_row_size = deflateBound(&s->zstream.zstream, + (avctx->width * s->bits_per_pixel + 7) >> 3); max_packet_size = AV_INPUT_BUFFER_MIN_SIZE + // headers avctx->height * ( @@ -1065,23 +1070,17 @@ static av_cold int png_enc_init(AVCodecContext *avctx) } s->bits_per_pixel = ff_png_get_nb_channels(s->color_type) * s->bit_depth; - s->zstream.zalloc = ff_png_zalloc; - s->zstream.zfree = ff_png_zfree; - s->zstream.opaque = NULL; compression_level = avctx->compression_level == FF_COMPRESSION_DEFAULT ? Z_DEFAULT_COMPRESSION : av_clip(avctx->compression_level, 0, 9); - if (deflateInit(&s->zstream, compression_level) != Z_OK) - return -1; - - return 0; + return ff_deflate_init(&s->zstream, compression_level, avctx); } static av_cold int png_enc_close(AVCodecContext *avctx) { PNGEncContext *s = avctx->priv_data; - deflateEnd(&s->zstream); + ff_deflate_end(&s->zstream); av_frame_free(&s->last_frame); av_frame_free(&s->prev_frame); av_freep(&s->last_frame_packet); -- 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".