From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 74A6749776 for ; Sun, 21 Dec 2025 14:06:51 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'tBv5tRAd9itO90nCCb8TwQdsWDuij5XnzF5SRx7JXKI=', expected b'H4xQxsc16PXmXVh6c9pelW1KhxjKhuUCD3LbX36syj8=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1766325999; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=tBv5tRAd9itO90nCCb8TwQdsWDuij5XnzF5SRx7JXKI=; b=VdDmBIYtHW4lPHcYmtaoLPz3HC6ifpXcPIKpHsDQw9uA27WGlUItNIKsezT/GeQEcPFsb DTZGT5kVxUr5+uejHP7wJVsuG9iUmeVMkk9nRmDDsLf5ASu2Wmop20AmgqRWFIKErpfCAOe mHWpSAaga9Cj2lUb1RvkSjZqtGqGSU3yxPoZVkszO2yn15QWSHwEyl2KbXCt+HDm0GXLJnx Qnp+ZPcqLHOs5oz6pIcv083yO/HPfpO5b0+UCg7hflqgXsXkaaQotdP0ZdtL+/xLnrAumo0 fszRySKqdetFd+daVmEBxKNSf7V3nRPxqYSs8WjVOZqaSssIwqA03LCe6dIA== Received: from [172.20.0.2] (unknown [172.19.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 3CBF1690A19; Sun, 21 Dec 2025 16:06:39 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1766325988; b=rVkKNuwEd+AvDwEZ/mDAtCmbAn1xbiF4rYoY/ksyP+dcAEvaHYUKT8Pz/39DF35u4APhW 0eRvt/h082NZAOVmZjMnmuqBWdn/KJi1a4xS4SVCPwTmiMp0uel+y0CLpD4rhA9r76Jizhf bNOXexfSxD+5NO4P1VBT3yn5pU3UDYi9gdckf7inz/E8IwvMqFnb+pAk7J1HVM/otYGx+EI g72wRUieFpgnHwKDxWo7alEk0RXU6f8OtTFU+HFy4mHl/pawdH2AU+K0eWJ5iFg2QZBwE5x DZysZmQz8Er2pNeTPrtRdhpvGQlG7xoGlaxN6w6xJTCD6GmplKxPhRZqhJGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1766325988; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=PaIWxzrji95J7mzWbYOKpH5pDWpDX6kM52jpb9SD0uA=; b=FIhzoPCYFRZPrxRgncKUKOIIB+DDtpQXAYqUIA+43X7LQJuKQ9LJytC0yyzO2e+mqUeKX naqF0avMd5WNlFDwbjX5q9HQdz08KzapRjYxYKAuAAhpY44Pvvfhpe+KKV3f3okg3BrV6sn bjC/3AauAHRC0To3/BE1pDj9Djy019PanXBW8FZ28vbfBONBlFJtHEhhD5jpNABoNDd7SU5 68p0c0nHsu7Mcx9Q1ChAwpzwUlNKUdoaBOJPo4/DlgpklOOBDTlGGwuquxfeyXKAi09pVUx CPiIzrhn3rgoKtBW/hZPd9IyqhAJF8yWSesQsiKq983ttT956GRaSTA3FayQ== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1766325979; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=H4xQxsc16PXmXVh6c9pelW1KhxjKhuUCD3LbX36syj8=; b=rqcLBjeNrQ3cuNgSjw3FbrE5wpL1iAWoft3UO6izcNXVnCJvdtFw9VjRgTVRIcwWE383B //SE3eeihPt9py4YfrVfEgO0N4ofjsn2eVZN1/XLG5oPG49sAK4T8fezP/1FaPIfAGVd67n qDejIKZuKEOq+DRC3xVHm2Hu2AEns3OeeOYIVrWfjNe5T0GQuzHWUz3avu+kXWIc1PksZFz SohoYyLPEpjBeucYoCXzhwUS4r8DgWYjCh7C13CY3BMMMHAmoyIldsWDjpApRSJHlZJypRi RSJgyJ+takg3iuiT9XiwZfvQYdD9mYwFJCCVMXope4NxX048Z3r62iOImTyw== Received: from 55ca25703178 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 1B2D3690A1D for ; Sun, 21 Dec 2025 16:06:19 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Sun, 21 Dec 2025 14:06:18 -0000 Message-ID: <176632597925.60.11811881692086830865@2cb04c0e5124> Message-ID-Hash: DD47P3WQN46TYHWGLJUUZRDWHMC43MVP X-Message-ID-Hash: DD47P3WQN46TYHWGLJUUZRDWHMC43MVP X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avutil/imgutils: use AV_CEIL_RSHIFT (PR #21254) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Zhao Zhili via ffmpeg-devel Cc: Zhao Zhili Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #21254 opened by Zhao Zhili (quink) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21254 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21254.patch >>From 51cb9498ae15496df6c38b298c153d6b170c3dc5 Mon Sep 17 00:00:00 2001 From: Zhao Zhili Date: Sun, 21 Dec 2025 21:40:33 +0800 Subject: [PATCH] avutil/imgutils: use AV_CEIL_RSHIFT --- libavutil/imgutils.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c index 681482dc08..8ff8a6be41 100644 --- a/libavutil/imgutils.c +++ b/libavutil/imgutils.c @@ -63,7 +63,7 @@ int image_get_linesize(int width, int plane, if (width < 0) return AVERROR(EINVAL); s = (max_step_comp == 1 || max_step_comp == 2) ? desc->log2_chroma_w : 0; - shifted_w = ((width + (1 << s) - 1)) >> s; + shifted_w = AV_CEIL_RSHIFT(width, s); if (shifted_w && max_step > INT_MAX / shifted_w) return AVERROR(EINVAL); linesize = max_step * shifted_w; @@ -133,7 +133,7 @@ int av_image_fill_plane_sizes(size_t sizes[4], enum AVPixelFormat pix_fmt, for (i = 1; i < 4 && has_plane[i]; i++) { int h, s = (i == 1 || i == 2) ? desc->log2_chroma_h : 0; - h = (height + (1 << s) - 1) >> s; + h = AV_CEIL_RSHIFT(height, s); if (linesizes[i] > SIZE_MAX / h) return AVERROR(EINVAL); sizes[i] = (size_t)h * linesizes[i]; @@ -523,7 +523,7 @@ int av_image_copy_to_buffer(uint8_t *dst, int dst_size, for (i = 0; i < nb_planes; i++) { int h, shift = (i == 1 || i == 2) ? desc->log2_chroma_h : 0; const uint8_t *src = src_data[i]; - h = (height + (1 << shift) - 1) >> shift; + h = AV_CEIL_RSHIFT(height, shift); for (j = 0; j < h; j++) { memcpy(dst, src, linesize[i]); @@ -646,7 +646,7 @@ int av_image_fill_color(uint8_t * const dst_data[4], const ptrdiff_t dst_linesiz size_t bytewidth = plane_line_bytes[plane]; uint8_t *data = dst_data[plane]; int chroma_div = plane == 1 || plane == 2 ? desc->log2_chroma_h : 0; - int plane_h = ((height + ( 1 << chroma_div) - 1)) >> chroma_div; + int plane_h = AV_CEIL_RSHIFT(height, chroma_div); for (; plane_h > 0; plane_h--) { memset_bytes(data, bytewidth, &clear_block[plane][0], clear_block_size[plane]); -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org