From patchwork Mon Dec 11 01:35:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= X-Patchwork-Id: 45052 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2652593pzf; Sun, 10 Dec 2023 17:48:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IFg9wIFZ9R47vA0igxFyko3mPR0DDdnRW1QgwdkrUQY0gDY1NmNpqhYMjomkaeyh3eqf0ja X-Received: by 2002:aa7:de97:0:b0:54c:76bf:eaff with SMTP id j23-20020aa7de97000000b0054c76bfeaffmr2275406edv.58.1702259300746; Sun, 10 Dec 2023 17:48:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702259300; cv=none; d=google.com; s=arc-20160816; b=J9GOwOMpUMaytfd5rN0Ar/HFqNr+E6hR1hu1F0jKnw0kptDAcp7h42HZynoYCZqCm9 iTjht5BcT71YhZYWIRNcXptH5mlBXEQlObusSosxZy0bUn8w/BKssnE6Jfe6cM7oL3+5 Bt/0vOGoh45xCywkzXHcBE2o3d8mutjwDU1xwis3+lfQyhZQZFXpSfuu2VADZL1xvh2t ZOvVB3ApjjIcZ5QPdiT8Ahe74c4QBCEdBMuBuAGYTrZOWm2XXdhA0I7IhYYKTiEXe03O rX947lvA7TWZrN2LTBZ+q7/yo2ezOZ9Y6IaeHexWtJ/bB5K/JviDW6DtVVbNlKqU2L56 1MPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=vBzz+KwPv68wHEj9if+omjoseQ3R3lbBMWk+6FU2KwI=; fh=Jgo3TCyoG8OdFLqA8BuM7Wbf1w27210JU6p+E8x39/M=; b=A4wyjz3g/T8YKQ6QS0g+ZfDmY2EMVBBAmLrk6AA69Tcrqj5tTE9tDEXC4cM8J+qDN6 1My181CacEa/TF3P+eNv7KYZ++h6dVlvXGKVdqq0svoEPbsT1RWMFqNdosNG+qAMHwxR zcNAakUJa2JUTvbnWdGhRHSsfhCPNj9zy2650Cwxm4JEevVJzGgK4Ky5kV/qrB9HvvJG IN+/oBw5Q7Gs9FTuS8Zm+Z72qlqPgunuye93PR8JxnSe3RjQb4+cJ+oS6VzNxtJS8+DL +NQwSdhqFDWiDboKNJwHfsKIYDJ1Vwdxn8IT6jkj9OlLmOLyhhAg5IVpdu4gyCa6E0Gd OIQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b="dAlX0/JC"; 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=NONE dis=NONE) header.from=pkh.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x16-20020a05640226d000b0054be3ba6dabsi3129279edd.96.2023.12.10.17.48.20; Sun, 10 Dec 2023 17:48:20 -0800 (PST) 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=@pkh.me header.s=selector1 header.b="dAlX0/JC"; 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=NONE dis=NONE) header.from=pkh.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3B85568D202; Mon, 11 Dec 2023 03:45:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from ssq0.pkh.me (laubervilliers-656-1-228-164.w92-154.abo.wanadoo.fr [92.154.28.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A662D68D168 for ; Mon, 11 Dec 2023 03:44:56 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pkh.me; s=selector1; t=1702259078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4tbAWMRhwpF1yUsSMkY07bQQXRn8fjQjOjca8zOUXQM=; b=dAlX0/JCB/q7lnAv6LT5ipgChNS/sSNz0Es+zd7jeHmc5zjLnwwGDMVoIrxNVdQW/v25uM 9AQjfh9YmYaplP3BRGTzrxzCOtr1dFFrE64Dl4sdX3TgbkFOVQOs74xR/P6KvstuEqIST3 GWS0EkpJmsi7V7LVai4puUuiazf4nw8= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id c97dd7d7; Mon, 11 Dec 2023 01:44:38 +0000 (UTC) From: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Dec 2023 02:35:27 +0100 Message-ID: <20231211014429.1841681-27-u@pkh.me> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231211014429.1841681-1-u@pkh.me> References: <20231211014429.1841681-1-u@pkh.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 26/35] avcodec/proresenc_anatoliy: only pass down the first scale to encode_dcs() 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: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: arL0CjjF9YrR This matches encode_dcs() prototype from proresenc_kostya. --- libavcodec/proresenc_anatoliy.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 56baeb9956..bdf7bface4 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -267,19 +267,19 @@ static av_always_inline int get_level(int val) static void encode_dcs(PutBitContext *pb, int16_t *blocks, - int blocks_per_slice, int *qmat) + int blocks_per_slice, int scale) { int i; int codebook = 5, code, dc, prev_dc, delta, sign, new_sign; int diff_sign; - prev_dc = (blocks[0] - 0x4000) / qmat[0]; + prev_dc = (blocks[0] - 0x4000) / scale; encode_vlc_codeword(pb, FIRST_DC_CB, MAKE_CODE(prev_dc)); sign = 0; blocks += 64; for (i = 1; i < blocks_per_slice; i++, blocks += 64) { - dc = (blocks[0] - 0x4000) / qmat[0]; + dc = (blocks[0] - 0x4000) / scale; delta = dc - prev_dc; new_sign = GET_SIGN(delta); diff_sign = new_sign ^ sign; @@ -388,7 +388,7 @@ static int encode_slice_plane(int16_t *blocks, int mb_count, uint8_t *buf, unsig blocks_per_slice = mb_count << (2 - sub_sample_chroma); init_put_bits(&pb, buf, buf_size); - encode_dcs(&pb, blocks, blocks_per_slice, qmat); + encode_dcs(&pb, blocks, blocks_per_slice, qmat[0]); encode_ac_coeffs(&pb, blocks, blocks_per_slice, qmat, ff_prores_scan); flush_put_bits(&pb);