From patchwork Sun Sep 29 18:36:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramiro Polla X-Patchwork-Id: 51935 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d8ca:0:b0:48e:c0f8:d0de with SMTP id dy10csp1541528vqb; Sun, 29 Sep 2024 11:36:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWWBZyHy39xZfu7Dw8VeBzZV+cRYQt9ThfBMOeSOv9dsNBJibUPdBaj/ME9JSi/uTdlJJxyJiV38EuYfc9zAd8u@gmail.com X-Google-Smtp-Source: AGHT+IEhxpxTeKP191LLGKuHxOXhofgWmsiSS965jJ/KcpkiRnmQWwaGRCgDSmGH20aWtxJ41v9b X-Received: by 2002:a17:907:86a6:b0:a8b:2604:1da3 with SMTP id a640c23a62f3a-a93c4908e65mr890966466b.17.1727635004861; Sun, 29 Sep 2024 11:36:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727635004; cv=none; d=google.com; s=arc-20240605; b=VX36+b9sEDB8pnhBoEEHkTDeq81ywZVQhD+II9j7mrHKEXKz5gUtAUyRehJ0w9bbdR OV+B3PGqLMESBJ3l5uJjzWN2eMDm4KIYI062KdCV0fSUWln4OLEMlLAtKYrgObVlTJv8 QOOlDG3yl5tc/Zp0ZjX0bvoG7VjlonTi4hxvlAwVassCZByuU6eB0NJ1pUwRpzBUUtiW 8pqMr0VkDfXOS2brLol2r8JLQS+yTLmZGe4SCBntx+is51pOY7VDxupEZxY+wFTp7nBY ZIi2dZ5Fe2oCZaoZkBQNAtFXo3CTGMr0huUHln7dwIXqH8v+Nrbu0iSb+nd8D1tgoe0Q 5SfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=xqro7G6hJzCy/iTxm+vuL8Ur1p462SMl7uBKUTjRbPA=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=HBAumEOwIMvhyMMYzHzD7RbzhxtkQYFTx9iHLI/w1hql7UsYZBSASWg2tg8tBt//ny YlmSNOqzA8cfkE0dSK/E9HUx8XBvFYcOTx/8l3ffy37ZFRjYxv48s7WWlmYboka9bT2P E6NkFr1VExuoNseyEwFjRl5Bp27YBX25CofrTvSBz406nDcpv/dvWdqbQs4VD2t+Ed4+ GwUdkeR4h8rIDSI9Mx/C++y6uRTGQYPACus0zw2aB7ynlbqNhZ0VGliHKhuqJGVFijRn UxBj5DfIbAfiNOlUa98a3HzDClEfuZwEpvYeSHq7mENneEcxPBqZg/3cKjLdZR8JYmpX eMOA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=UeJPUiMJ; 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=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a93c29e1cd4si470852666b.500.2024.09.29.11.36.44; Sun, 29 Sep 2024 11:36:44 -0700 (PDT) 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=@gmail.com header.s=20230601 header.b=UeJPUiMJ; 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=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 19B2268D3BB; Sun, 29 Sep 2024 21:36:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 317FF68AA42 for ; Sun, 29 Sep 2024 21:36:35 +0300 (EEST) Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-42e7b7bef42so29485095e9.3 for ; Sun, 29 Sep 2024 11:36:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727634994; x=1728239794; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=PsDIHZ4hBn567g2a7+d9cJ3mtqpIdyJgOl6A8kpKnrE=; b=UeJPUiMJXCcpGPqigscMw40/8nAbMdANdBDQpFuPe2xk4/FXbVWQFGFyM/E+PDZvWY 4mO/LNvFm2INEbnHqIOCWpD2Q8yHS2R6JPvcQmxUwa9EiL0IlZxmYgxV/cSNQfZd15tf pen1F1pFnlQ7uvECGiWmljXke4QiPx75gjm/4TV/5CMCm7rTqoVNUu8yuI9UB2SKGnOl Dwcp4tBEJhEFYTUfpz0g7HmP9vTEO80P1ooHDaLr3es/nKkYzPfPZ3GnSP+9ZAtL80hU FKMIeFEctt40S/fIOqTh3/Ot/xqO5EXnpGIt3LCoaOxrin03GlYedK4Y3kFfWV+VCs+0 oPKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727634994; x=1728239794; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=PsDIHZ4hBn567g2a7+d9cJ3mtqpIdyJgOl6A8kpKnrE=; b=dXsCPf7OChPVZXB+Lx4xsi9W1604nJloQ0W3raeXkLk4eGFh203mtnVpjDevj0gpOf GXOyAmfK0nQu+xe6uZCNZVm2BUArbpqC6fLu2+hjRnPOv1/WVpcuKeFFcxOiSSRS+j1J cocoa7oqhKfdEL0ANAbtTj4cVtpX10btmzbyiRnyV52fae/T2L35jdgFYuBe5KMe7haz VVDceeSVjTC/+TyzOvJuS718/yi6Zj4Rksl73N4Kt3sxeEZkN8C+BS2RenHlb7lERWKf tsHTMpjqCGdn/DPU0Z0eUBI6z52bYFzWuR4/8ubGhrFrDRTaYP/hDnvU68nVEKDsQo31 XY3w== X-Gm-Message-State: AOJu0YyV9r3N1dN3/LGFqHbLKdfgGoGbWgmCA6wbLz8xANW5SL77pQm/ qwIZtk/pXYC9gO52Gei1IiMQ5Fr6kZEr5jUs2Gzso/XeqHmRHIf+QyfuPA== X-Received: by 2002:a5d:4572:0:b0:37c:d183:a8f8 with SMTP id ffacd0b85a97d-37cd5a82669mr5024895f8f.19.1727634993730; Sun, 29 Sep 2024 11:36:33 -0700 (PDT) Received: from localhost.localdomain ([193.74.238.20]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37cd564d2e8sm7469053f8f.18.2024.09.29.11.36.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Sep 2024 11:36:32 -0700 (PDT) From: Ramiro Polla To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Sep 2024 20:36:28 +0200 Message-Id: <20240929183629.22777-1-ramiro.polla@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/2] avcodec/flashsvenc: add compression_level option 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: HsnAVHjvUOyc This allows setting the compression level used by zlib. --- libavcodec/flashsvenc.c | 10 ++++++++-- tests/ref/vsynth/vsynth1-flashsv | 2 +- tests/ref/vsynth/vsynth2-flashsv | 4 ++-- tests/ref/vsynth/vsynth3-flashsv | 2 +- tests/ref/vsynth/vsynth_lena-flashsv | 2 +- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/libavcodec/flashsvenc.c b/libavcodec/flashsvenc.c index 5cf0602f5d..f650e517d0 100644 --- a/libavcodec/flashsvenc.c +++ b/libavcodec/flashsvenc.c @@ -67,6 +67,7 @@ typedef struct FlashSVContext { unsigned packet_size; int64_t last_key_frame; uint8_t tmpblock[3 * 256 * 256]; + int compression_level; } FlashSVContext; static int copy_region_enc(const uint8_t *sptr, uint8_t *dptr, int dx, int dy, @@ -121,6 +122,10 @@ static av_cold int flashsv_encode_init(AVCodecContext *avctx) nb_blocks = h_blocks * v_blocks; s->packet_size = 4 + nb_blocks * (2 + 3 * BLOCK_WIDTH * BLOCK_HEIGHT); + s->compression_level = avctx->compression_level == FF_COMPRESSION_DEFAULT + ? Z_DEFAULT_COMPRESSION + : av_clip(avctx->compression_level, 0, 9); + return 0; } @@ -170,9 +175,10 @@ static int encode_bitstream(FlashSVContext *s, const AVFrame *p, uint8_t *buf, p->linesize[0], previous_frame); if (res || *I_frame) { - unsigned long zsize = 3 * block_width * block_height; + unsigned long zsize = 3 * block_width * block_height + 12; ret = compress2(ptr + 2, &zsize, s->tmpblock, - 3 * cur_blk_width * cur_blk_height, 9); + 3 * cur_blk_width * cur_blk_height, + s->compression_level); if (ret != Z_OK) av_log(s->avctx, AV_LOG_ERROR, diff --git a/tests/ref/vsynth/vsynth1-flashsv b/tests/ref/vsynth/vsynth1-flashsv index 8b2783032b..05f9e9432d 100644 --- a/tests/ref/vsynth/vsynth1-flashsv +++ b/tests/ref/vsynth/vsynth1-flashsv @@ -1,4 +1,4 @@ -97894502b4cb57aca1105b6333f72dae *tests/data/fate/vsynth1-flashsv.flv +61b0825258ac6fe85691bdefd892960d *tests/data/fate/vsynth1-flashsv.flv 14681925 tests/data/fate/vsynth1-flashsv.flv 791e1fb999deb2e4156e2286d48c4ed1 *tests/data/fate/vsynth1-flashsv.out.rawvideo stddev: 2.84 PSNR: 39.04 MAXDIFF: 49 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-flashsv b/tests/ref/vsynth/vsynth2-flashsv index 9bda896687..f659edaab5 100644 --- a/tests/ref/vsynth/vsynth2-flashsv +++ b/tests/ref/vsynth/vsynth2-flashsv @@ -1,4 +1,4 @@ -f4b45770dd93b43b4077532e8ef90bfc *tests/data/fate/vsynth2-flashsv.flv -11636546 tests/data/fate/vsynth2-flashsv.flv +a2f145e6e44b51f8fc64ead06a994273 *tests/data/fate/vsynth2-flashsv.flv +11637702 tests/data/fate/vsynth2-flashsv.flv 7f0fc12c02e68faddc153e69ddd6841c *tests/data/fate/vsynth2-flashsv.out.rawvideo stddev: 1.20 PSNR: 46.52 MAXDIFF: 20 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth3-flashsv b/tests/ref/vsynth/vsynth3-flashsv index 38a34bd71d..cdf9e7bf99 100644 --- a/tests/ref/vsynth/vsynth3-flashsv +++ b/tests/ref/vsynth/vsynth3-flashsv @@ -1,4 +1,4 @@ -832fe60169f4d91339458c60a5292924 *tests/data/fate/vsynth3-flashsv.flv +a05a9ab0ae21925dd10a83639de77d77 *tests/data/fate/vsynth3-flashsv.flv 171419 tests/data/fate/vsynth3-flashsv.flv faa660b0ecaaab1bf9b5d7284019aa01 *tests/data/fate/vsynth3-flashsv.out.rawvideo stddev: 2.97 PSNR: 38.67 MAXDIFF: 49 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth_lena-flashsv b/tests/ref/vsynth/vsynth_lena-flashsv index 52046cdf2e..7dfec3edf5 100644 --- a/tests/ref/vsynth/vsynth_lena-flashsv +++ b/tests/ref/vsynth/vsynth_lena-flashsv @@ -1,4 +1,4 @@ -0667077971e0cb63b5f49c580006e90e *tests/data/fate/vsynth_lena-flashsv.flv +59cdcf5f92c5113e27b2fda632ccd55c *tests/data/fate/vsynth_lena-flashsv.flv 12368953 tests/data/fate/vsynth_lena-flashsv.flv 3a984506f1ebfc9fb73b6814cab201cc *tests/data/fate/vsynth_lena-flashsv.out.rawvideo stddev: 0.66 PSNR: 51.73 MAXDIFF: 14 bytes: 7603200/ 7603200