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 B27CD449BD for ; Mon, 31 Oct 2022 12:39:07 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7689A68BE13; Mon, 31 Oct 2022 14:39:04 +0200 (EET) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC28268BAF9 for ; Mon, 31 Oct 2022 14:38:57 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 9248D2404E4 for ; Mon, 31 Oct 2022 13:38:56 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id s2lWb7UpesgA for ; Mon, 31 Oct 2022 13:38:55 +0100 (CET) Received: from lain.khirnov.net (lain.khirnov.net [IPv6:2001:67c:1138:4306::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "lain.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id CD8B62400F4 for ; Mon, 31 Oct 2022 13:38:55 +0100 (CET) Received: by lain.khirnov.net (Postfix, from userid 1000) id 78B451601B2; Mon, 31 Oct 2022 13:38:53 +0100 (CET) From: Anton Khirnov To: FFmpeg development discussions and patches In-Reply-To: References: Mail-Followup-To: FFmpeg development discussions and patches Date: Mon, 31 Oct 2022 13:38:53 +0100 Message-ID: <166721993346.12287.10742392140936295449@lain.khirnov.net> User-Agent: alot/0.8.1 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [RFC]lavc/tiff: Support dng cropping 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 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: Quoting Carl Eugen Hoyos (2022-10-23 20:46:57) > Am So., 23. Okt. 2022 um 16:35 Uhr schrieb Carl Eugen Hoyos > : > > > > Hi! > > > > I tried to implement dng cropping, it unfortunately can only work with > > -flags +unaligned, is there an alternative to simply print a warning > > if the flag was not supplied? > > New patch with more parentheses attached. > > Please comment, Carl Eugen > > From 1bfe065564604659b7703e75b1bb750c031fdc81 Mon Sep 17 00:00:00 2001 > From: Carl Eugen Hoyos > Date: Sun, 23 Oct 2022 16:31:53 +0200 > Subject: [PATCH] lavc/tiff: Support dng cropping, A FATE test would be nice. > needs -flags +unaligned AFAICT this is not entirely correct. Applying left cropping in libavcodec might need AV_CODEC_FLAG_UNALIGNED, but not always. Users may also set apply_cropping=0 and apply cropping themselves. The decoder should not care about it in any case, since it's handled in the generic code. > > Fixes samples mentioned in ticket #4364. > --- > libavcodec/tiff.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++ > libavcodec/tiff.h | 3 ++ > 2 files changed, 86 insertions(+) > > diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c > index fd9db18c0b..33edff8213 100644 > --- a/libavcodec/tiff.c > +++ b/libavcodec/tiff.c > @@ -1492,6 +1492,89 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) > case DNG_WHITE_LEVEL: > s->white_level = value; > break; > + case DNG_CROP_ORIGIN: > + if (count != 2 || type != TIFF_SHORT && type != TIFF_LONG && type != TIFF_RATIONAL) { This condition could definitely use more parentheses. Same in two checks below. > + av_log(s->avctx, AV_LOG_WARNING, "Invalid crop origin (count: %d, type: %d)\n", count, type); > + break; > + } > + if (type == TIFF_RATIONAL) { > + unsigned denum1, denum2; > + value = ff_tget(&s->gb, TIFF_LONG, s->le); > + denum1 = ff_tget(&s->gb, TIFF_LONG, s->le); > + value2 = ff_tget(&s->gb, TIFF_LONG, s->le); > + denum2 = ff_tget(&s->gb, TIFF_LONG, s->le); > + if (denum1 != 1 || denum2 != 1) { > + av_log(s->avctx, AV_LOG_WARNING, "Unsupported crop origin\n"); > + break; > + } > + } else { > + value = ff_tget(&s->gb, type, s->le); > + value2 = ff_tget(&s->gb, type, s->le); > + } This entire block is duplicated for DNG_CROP_ORIGIN and DNG_CROP_SIZE, you could split it into a function. > + av_log(s->avctx, AV_LOG_DEBUG, "dng crop origin: %d/%d\n", value, value2); > + if (value >= s->width || value2 >= s->height) { > + av_log(s->avctx, AV_LOG_WARNING, "Invalid crop origin (%d/%d)\n", value, value2); > + break; > + } > + if ((value || value2) && !(s->avctx->flags & AV_CODEC_FLAG_UNALIGNED)) { > + av_log(s->avctx, AV_LOG_WARNING,"Correct DNG cropping needs -flags +unaligned\n"); > + } else { > + frame->crop_left = value; > + frame->crop_top = value2; > + } > + break; > + case DNG_CROP_SIZE: > + if (count != 2 || type != TIFF_SHORT && type != TIFF_LONG && type != TIFF_RATIONAL) { > + av_log(s->avctx, AV_LOG_WARNING, "Invalid crop size (count: %d, type: %d)\n", count, type); > + break; > + } > + if (type == TIFF_RATIONAL) { > + unsigned denum1, denum2; > + value = ff_tget(&s->gb, TIFF_LONG, s->le); > + denum1 = ff_tget(&s->gb, TIFF_LONG, s->le); > + value2 = ff_tget(&s->gb, TIFF_LONG, s->le); > + denum2 = ff_tget(&s->gb, TIFF_LONG, s->le); > + if (denum1 != 1 || denum2 != 1) { > + av_log(s->avctx, AV_LOG_WARNING, "Unsupported crop size\n"); > + break; > + } > + } else { > + value = ff_tget(&s->gb, type, s->le); > + value2 = ff_tget(&s->gb, type, s->le); > + } > + av_log(s->avctx, AV_LOG_DEBUG, "dng crop size %d x %d\n", value, value2); > + if (value + frame->crop_left >= s->width || value2 + frame->crop_top >= s->height) { value/value2 can be arbitrary 32bit integers, so the addition can overflow. Move crop_left/top to the other side of the comparison, since they are known to be smaller than width/height. Analogously for DNG_ACTIVE_AREA. -- Anton Khirnov _______________________________________________ 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".