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 5ECEF41099 for ; Tue, 15 Mar 2022 20:09:13 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CCAF168B180; Tue, 15 Mar 2022 22:06:51 +0200 (EET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2069.outbound.protection.outlook.com [40.92.90.69]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 370D068B104 for ; Tue, 15 Mar 2022 22:06:46 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ie6xW+nbkomQDBPDPclu4bTPxS5g+fe8rswq3zxJ87hhp+VaeQSuSs/a5qExkMOYTGDXxhJ4hosRrSopIFaGPcipgGWwN51jlHA3YE4la28j4FGhG4F4JMeG4Uggicgtk7R6cf5d3ysoCZxDG9U1BijGG0dGCuTfw5t3z8EW0XDPRz+rpPZwjWJEEn4suUfV0Fw7CID7G75JfA+7fOFH3YJaZzfNbzPt5Ggem12C4nUEPV012c8tNVKL6cmIGCQyCLIEa5ATUkxYoEtZx8K8EEvF/qEGKBk7AfbCO5HOZL9YefUsdKfaFYKPH7IdGg6g1PqCcKX9k4HzNi5tI9uGRw== 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=ygfkptVN5k1Yvq8sY6aFZEa+Lp9dTsb0oKte87BPnnQ=; b=KNQxvWcY51QzfWI19xgCTY+05V9ZMnXs7aMugQz0TJIx8V1+ZgKtv/2T3haUlZwu/87DS6SQx3EpfELMNqcS2SoBTNjM4BuyeY3cJRaPbRkJoCkZ2PXLLAU3c9oKAl9Hik8jLPIC9UpETgcEf3iCdhd3qMTj8rb10TH3LakJgPuXd2ZjmP2QpK//ejb4lIhFk6lqDFEgGaqjyR+7L1PM3v0CrJ07Tr8b7ZF4lHIMRuXBNdVqp5OccQ8+Bybru7TWVJyB46yy5wR/zVpWgM2VA7cx0EYVWN9AtwHumBQ5jYXTy8fX2JLCtHpxtW+UJ5+ddi2phHoXogwKHB67z2KhLA== 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=ygfkptVN5k1Yvq8sY6aFZEa+Lp9dTsb0oKte87BPnnQ=; b=bllPRyBiUpxZTIHe2VIskNgIm0OWY97v4Oh4gyBi/lMQafUgAYo89M0kM3LHbSphqX1JJNNFEnBFpriEW3+uGS58ar67t/PKDV8ISsnPzzSV9PnERnE9jUbtjvAyvg3CagVl2WHoVwsUyVboVMfeu35pu6pltD68QB4+Sf5c887lUFQTXDMB5nWyUB/WrIRKNajHkvDt5RgWz/mgyuH1K48H+tvNbcNibfWx21pv94+DREMorqd0MkTpUN4r7OQDdDtz1EztaYldvuAIDhSnYJbiL0LoEtft253xgKeG5nlyJO94Tn66Gwl9bYZt84OqbUl+VcJ2bx0bIR9E9P3iCg== 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: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:08 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [R/y9dcNXDbo1pNPgEJ8GgxAMyvKSkJ5D] 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-17-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 175b83bf-2956-4e18-8e78-08da06bf54db X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVf+PcTdbcvjaDtfbcUOhIAHpRO1BP0oMX85vAnTCTOYThoPpo2dbVLrXNfM5cJNn6eonvdlx7Rng9HwuL0hNIaDFNhnWO9+7NNPu+1UJyvwoEgooJkUqojDle/o0UvgaKbmzABXV9w4MZhsyrIbAk0iT4oAn6uOFR2EOoWWwCYY53dKBafT7ndaw2j+pkt+7edRpmdUnaG0enKmLiHlikFpuTV1B7L2Ef3n0Xq+pC2f4xQr0GIOcrspGkhZCbUpLcjk/rlkH8sIu6pgqAmjhp8onOxkYB5idqZnNkbvkQVwFeHD08uFZWiLRoSI+dqu03g/+R5/fzG/416RkObRkbUsQU2CVIblfJ9ESCJUZoUeHiWtglvukrUgKJ3jghwKI5SNcN6YWDhRSLD6npMMHHtQlNtRJNTCamGPmHbyy9hSjzZpHCiGoBCIDENQioOmGLqiiIKxy8nJ5vOldurHoIQOWbBYZ+ckmTBrDlj0oBroTS6fpypjxxIYxGwwyFOWwvuzG97PxN080YNp0cuws7eeb1RMshTkOmogKu3uBdH8O2g67Jdw5U3BfSW+6kqxlJir9AyuZpkhtpiHBV+OnmRaT+MYmYAqWPvb9XLVanMaM3SrFzIvGK7nSHpiKLbWJyr9bcNXg9nz7+AnPlxHfKKCqKluGe/9+f2mnmb3vhvK7TwqS+bVFPhG79DDRj/lI9HzF3KFDlid5Dhs7c38ASTR93npW4uDS4= X-MS-TrafficTypeDiagnostic: PA4PR01MB8947:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Q16yhE5JJJKTvOeTzOjiGwcepColskKG7crBF0lN9j9R9L2SQ5W0JruMSnRsgCWBw3T7iov6I9ug0Q4V90Clf1ewW7l2I3dgYCgcNzIoudZniCSrb6ESfOc3COSp2cOIZi+JIYNo7hP4gv7hBrX0ksXY7z4d+3b3lpw7FryznDW20AiAJA8h0qmpzR3ZBzZdkWDlfLpG+PTBXa9Rwo5x/JQ8l+7df5UMyaca2Mh4FKl5Z2Rvy5GLevPMdE2yjTcLoldfhbwP+Guw9uPkfDe/1uSaErJwrbuZCC/5z6FV8kv9RFa7zTQmEj0RfgWVpjsvWqMVCG8deOoJSZtfmYpND06lkcz/Lo7QPlW1MxsSdfQxNrneOcGcuwfS9h9WA6Q3mOt3ObweMmIjqLeYu4VwNksPnraJMECuaS5IbXfAxKslaJYxLX/Lz6uLTzMV2oqP7Mi0YK0Dv0c18A785HLPfZNdaLEcMMAK9DvoKbbFptu9jqJqTKlGiLlKh7ZHrtPURr2sC+rXtUxOqmQy4BBxEzyPRlHmxIH2pY9EURP+8D2q5x2lqejx/Ee2/aR2pKVTM7eJwP1ARAtSVfFSa5fKWQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BTAQ1k7TA58V9d17bExk71bwiHzmM8sw/9ZMvuvygXpC/jWMLGFx5A66sKol?= =?us-ascii?Q?FzbFWfQmelD5WMiA5isjHya3PrqYAijiZ9VLoPgaYG+5VfCgMbuw/ThEYVGT?= =?us-ascii?Q?hLCtzRDx1CXKeluEgX2fKR4E9iZ94EjazMxXcWKtbU29+kjgPw8ur1LzkbvG?= =?us-ascii?Q?gHKiTJ2TvuHGT/cbmITaZosNMcKOtrzt+AirM2yf9eLdLP5Vwoe9Z2AwBcCy?= =?us-ascii?Q?801iZD/ceZSj5VzEKA0kW1Pw9Pua6KSpJ1Ky72ZC2TguIefKsbWkThq+gm68?= =?us-ascii?Q?syRFQfxHoC9wRDWPHE6yOIQE2PAczOUhPaaAkKSTu9Tug1EgyjXsbPfrgaPZ?= =?us-ascii?Q?Lvdv3DkAOC78o2m1NmxYxg/PnqIhdJvf6E1P2O/4MMVPIIkAAK9V2RGYRcYB?= =?us-ascii?Q?KjjukLFpDH7HJZfPABmQ0tl4081FElS9pdb73zL2PbGmYGnkLTgChQReqKRu?= =?us-ascii?Q?cuI5WUBnJ/O9+oxJU4Fk5OdpD1SQzvl/LYSaIoW3fkC6k/QWQLzkRZYSFu8I?= =?us-ascii?Q?vekfHGxIAWTaA+DNzhXAOW1qtskI2tBTAt8EY8bsxQ80lOAr8g27cSzlCPLI?= =?us-ascii?Q?1i7pr7lcieuQtMNmVOPKHurJtFzGVEXJzLVpG/g8oUBW2u3+tJvjcUiQCY1m?= =?us-ascii?Q?1wOoxiwrL6VJI6O6pcwbB7KW1uVd5sAfZq01y4ursNKlR8Gdfrw8hLpDC6oo?= =?us-ascii?Q?jfUEpBge9q5MHc3JR5VbdGsXOCz0B4dcbfjbd1yttzjhhDUB5B/GlVNf1icE?= =?us-ascii?Q?DekKs3tsEqXByNn8mY/hfRl3d6IRWhein8J+RilBtiG9FsK7SU+Qaqfc10sP?= =?us-ascii?Q?26Ru8AW3MwOK7N+XyamZJYAcCRQOaf8dpgOzEzaB4CiCpLFQscYwBFcf0vs+?= =?us-ascii?Q?NWbjJSdE9UR1TBWvNvY88bbxew7dcMcGzU2ZtAu+8G2Vs1rUY7kSvSL0Qvme?= =?us-ascii?Q?uNV85WHWiBHEWe1J9kCpYyC70+HRtjccijWXCG11A92VKtXzNJ26cVWjx7m/?= =?us-ascii?Q?YOrZlC0GyE4UJx3VMLfVHzWWvWCBoXeZvjhmWLh2IwRwE2qECWeyJQWepLGl?= =?us-ascii?Q?+tn6C0iDstjeUp+E21oPwLlD81wuYVgKQywXV20mWGqIRytcZHIIWe7zjVI/?= =?us-ascii?Q?iWjqPKkLde/IXUCdfmk0HJ9MWRy80uWQXbre0LOUkIEVt/iV4JOiV1I=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 175b83bf-2956-4e18-8e78-08da06bf54db 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.0416 (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 18/21] avcodec/zmbvenc: 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 emit better error messages (it does not claim that inflateInit failed upon an error from deflateInit!) and uses our allocation functions. Signed-off-by: Andreas Rheinhardt --- configure | 2 +- libavcodec/zmbvenc.c | 41 +++++++++++++++-------------------------- 2 files changed, 16 insertions(+), 27 deletions(-) diff --git a/configure b/configure index 26417f541f..8f36699d0c 100755 --- a/configure +++ b/configure @@ -2995,7 +2995,7 @@ zerocodec_decoder_select="inflate_wrapper" zlib_decoder_select="inflate_wrapper" zlib_encoder_deps="zlib" zmbv_decoder_select="inflate_wrapper" -zmbv_encoder_deps="zlib" +zmbv_encoder_select="deflate_wrapper" # hardware accelerators crystalhd_deps="libcrystalhd_libcrystalhd_if_h" diff --git a/libavcodec/zmbvenc.c b/libavcodec/zmbvenc.c index 8efdbc963e..065d390a92 100644 --- a/libavcodec/zmbvenc.c +++ b/libavcodec/zmbvenc.c @@ -32,6 +32,7 @@ #include "avcodec.h" #include "encode.h" #include "internal.h" +#include "zlib_wrapper.h" #include @@ -74,8 +75,7 @@ typedef struct ZmbvEncContext { int keyint, curfrm; int bypp; enum ZmbvFormat fmt; - int zlib_init_ok; - z_stream zstream; + FFZStream zstream; int score_tab[ZMBV_BLOCK * ZMBV_BLOCK * 4 + 1]; } ZmbvEncContext; @@ -169,6 +169,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *pict, int *got_packet) { ZmbvEncContext * const c = avctx->priv_data; + z_stream *const zstream = &c->zstream.zstream; const AVFrame * const p = pict; uint8_t *src, *prev, *buf; uint32_t *palptr; @@ -262,21 +263,21 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, } if (keyframe) - deflateReset(&c->zstream); + deflateReset(zstream); - c->zstream.next_in = c->work_buf; - c->zstream.avail_in = work_size; - c->zstream.total_in = 0; + zstream->next_in = c->work_buf; + zstream->avail_in = work_size; + zstream->total_in = 0; - c->zstream.next_out = c->comp_buf; - c->zstream.avail_out = c->comp_size; - c->zstream.total_out = 0; - if(deflate(&c->zstream, Z_SYNC_FLUSH) != Z_OK){ + zstream->next_out = c->comp_buf; + zstream->avail_out = c->comp_size; + zstream->total_out = 0; + if (deflate(zstream, Z_SYNC_FLUSH) != Z_OK) { av_log(avctx, AV_LOG_ERROR, "Error compressing data\n"); return -1; } - pkt_size = c->zstream.total_out + 1 + 6*keyframe; + pkt_size = zstream->total_out + 1 + 6 * keyframe; if ((ret = ff_get_encode_buffer(avctx, pkt, pkt_size, 0)) < 0) return ret; buf = pkt->data; @@ -292,7 +293,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, *buf++ = ZMBV_BLOCK; // block height pkt->flags |= AV_PKT_FLAG_KEY; } - memcpy(buf, c->comp_buf, c->zstream.total_out); + memcpy(buf, c->comp_buf, zstream->total_out); *got_packet = 1; @@ -307,8 +308,7 @@ static av_cold int encode_end(AVCodecContext *avctx) av_freep(&c->work_buf); av_freep(&c->prev_buf); - if (c->zlib_init_ok) - deflateEnd(&c->zstream); + ff_deflate_end(&c->zstream); return 0; } @@ -319,7 +319,6 @@ static av_cold int encode_end(AVCodecContext *avctx) static av_cold int encode_init(AVCodecContext *avctx) { ZmbvEncContext * const c = avctx->priv_data; - int zret; // Zlib return code int i; int lvl = 9; int prev_size, prev_offset; @@ -408,17 +407,7 @@ static av_cold int encode_init(AVCodecContext *avctx) } c->prev = c->prev_buf + prev_offset; - c->zstream.zalloc = Z_NULL; - c->zstream.zfree = Z_NULL; - c->zstream.opaque = Z_NULL; - zret = deflateInit(&c->zstream, lvl); - if (zret != Z_OK) { - av_log(avctx, AV_LOG_ERROR, "Inflate init error: %d\n", zret); - return -1; - } - c->zlib_init_ok = 1; - - return 0; + return ff_deflate_init(&c->zstream, lvl, avctx); } const AVCodec ff_zmbv_encoder = { -- 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".