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 2495844B95 for ; Sun, 6 Nov 2022 22:00:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 18FF368BA6F; Mon, 7 Nov 2022 00:00:53 +0200 (EET) Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E8F2368AEFF for ; Mon, 7 Nov 2022 00:00:45 +0200 (EET) Received: by mail-ej1-f54.google.com with SMTP id sc25so25596940ejc.12 for ; Sun, 06 Nov 2022 14:00:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=+11IQPyiVDSPl/d4R9L2wLUpaVOREGX4FX1xw+sH8dM=; b=E6TKswyv5jlryIX+EmvI/qTCAQXLsiDCca9AALlcC06ymNPJlegN86as/uQ9At2qY7 YDqy+URHrwRUAPYleI2T8/0cMrOvWnBoequqCDk0nxJBfyTozSFYbmKZQ9TA70nTZr4r tl9+B3zmthnv+KoDbsP3MtwBZioIvzxGRApw5nm18Hy1XPqZybISr1kewijaYL8oxVbw HPbXwanuj/GQVwMiab1H1w1zx4KDQ4G+P7/tQkfXxWEyYophOIeCKqwUNdAk77JVqjj5 pCkwU6xE6bwm2o3vo/cMhiYHM0kc/uQtUaeCL7ULYTPKM4x3fXsP1nS5aWUKBy2seigb 288A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=+11IQPyiVDSPl/d4R9L2wLUpaVOREGX4FX1xw+sH8dM=; b=akQQgAgfdm65yt+uS+POd+AYmZYjCrtpsSV0/3RgLvnmxGYBmJe60BtxNJS8MP7ZMs SDa/1acDwldVLAbdZg0izQrFTisFwLsOBQej6P5ayj9tnpXwrZDLmM5mbIjJbnpMPZIf Pni7qJfTUK/MGJwyH1/E/v0tZTX4yCqX5NnriqaZoZSNwY6sd0mQQB9nl3QiHqNrOuKy r2br8J93H5wkDmwFUveqYq9W25sFRZrcrs8Dy4l+uRyh70cNqB8miCpQeW6hM7zhWs1t ItszFCDsfRtwYTywM9wMoBfPLW7w2eC+rr7IPVmHPyVbNnHBD07ZDG3AM6S8ku9dlxg/ YRuQ== X-Gm-Message-State: ACrzQf3MqAXgqiuY9b8+FfkldLXZtBn25JrxoWHIjMjOaaWvnuKxaRcA MZhCqJnKjZ5pDwod/Eyt/UVflpsni6HH8i1eoFCELHbv X-Google-Smtp-Source: AMsMyM5u9RSLhAVMU5v4hbGBt6movDql/M52FAtdyqO6lBQX02VpnJfP08gW0HPqz6RBdIPUJVmfYltRKDbkc41w0xo= X-Received: by 2002:a17:906:1c0e:b0:7ad:c648:a4af with SMTP id k14-20020a1709061c0e00b007adc648a4afmr40057142ejg.277.1667772045328; Sun, 06 Nov 2022 14:00:45 -0800 (PST) MIME-Version: 1.0 References: <166721993346.12287.10742392140936295449@lain.khirnov.net> In-Reply-To: <166721993346.12287.10742392140936295449@lain.khirnov.net> From: Carl Eugen Hoyos Date: Sun, 6 Nov 2022 22:53:05 +0100 Message-ID: To: FFmpeg development discussions and patches Content-Type: multipart/mixed; boundary="000000000000543bee05ecd47019" 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --000000000000543bee05ecd47019 Content-Type: text/plain; charset="UTF-8" Am Mo., 31. Okt. 2022 um 13:39 Uhr schrieb Anton Khirnov : > > 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. New patch attached. Please comment, Carl Eugen --000000000000543bee05ecd47019 Content-Type: application/octet-stream; name="0001-lavc-tiff-Support-dng-cropping.patch" Content-Disposition: attachment; filename="0001-lavc-tiff-Support-dng-cropping.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_la5w4o990 RnJvbSAwZDMyMjJkNDRmYmYxNWM4NGM4MzM2NjRhMTA1NmQ4MWU0ZWU3YzBhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDYXJsIEV1Z2VuIEhveW9zIDxjZWZmbXBlZ0BnbWFpbC5jb20+ CkRhdGU6IFN1biwgNiBOb3YgMjAyMiAyMjo0OTo1OCArMDEwMApTdWJqZWN0OiBbUEFUQ0hdIGxh dmMvdGlmZjogU3VwcG9ydCBkbmcgY3JvcHBpbmcKClJlYWRzIGNyb3BwaW5nIGluZm9ybWF0aW9u IGZyb20gc2FtcGxlcyBtZW50aW9uZWQgaW4gdGlja2V0ICM0MzY0LgotLS0KIGxpYmF2Y29kZWMv dGlmZi5jIHwgNjUgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysKIDEgZmlsZSBjaGFuZ2VkLCA2NSBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvbGliYXZj b2RlYy90aWZmLmMgYi9saWJhdmNvZGVjL3RpZmYuYwppbmRleCBmZDlkYjE4YzBiLi40N2U3MzZk MDE1IDEwMDY0NAotLS0gYS9saWJhdmNvZGVjL3RpZmYuYworKysgYi9saWJhdmNvZGVjL3RpZmYu YwpAQCAtMTI1MCw2ICsxMjUwLDMwIEBAIHN0YXRpYyB2b2lkIHNldF9zYXIoVGlmZkNvbnRleHQg KnMsIHVuc2lnbmVkIHRhZywgdW5zaWduZWQgbnVtLCB1bnNpZ25lZCBkZW4pCiAgICAgfQogfQog CitzdGF0aWMgaW50IGhhbmRsZV9jcm9wKFRpZmZDb250ZXh0ICpzLCBpbnQgY291bnQsIGludCB0 eXBlLCBpbnQgKnZhbHVlLCBpbnQgKnZhbHVlMiwgY29uc3QgY2hhciAqY3JvcF90eXBlKQorewor ICAgICAgICBpZiAoY291bnQgIT0gMiB8fCB0eXBlICE9IFRJRkZfU0hPUlQgJiYgdHlwZSAhPSBU SUZGX0xPTkcgJiYgdHlwZSAhPSBUSUZGX1JBVElPTkFMKSB7CisgICAgICAgICAgICBhdl9sb2co cy0+YXZjdHgsIEFWX0xPR19XQVJOSU5HLCAiSW52YWxpZCBjcm9wICVzIChjb3VudDogJWQsIHR5 cGU6ICVkKVxuIiwgY3JvcF90eXBlLCBjb3VudCwgdHlwZSk7CisgICAgICAgICAgICByZXR1cm4g LTE7CisgICAgICAgIH0KKyAgICAgICAgaWYgKHR5cGUgPT0gVElGRl9SQVRJT05BTCkgeworICAg ICAgICAgICAgdW5zaWduZWQgZGVudW0xLCBkZW51bTI7CisgICAgICAgICAgICAqdmFsdWUgID0g ZmZfdGdldCgmcy0+Z2IsIFRJRkZfTE9ORywgcy0+bGUpOworICAgICAgICAgICAgZGVudW0xICA9 IGZmX3RnZXQoJnMtPmdiLCBUSUZGX0xPTkcsIHMtPmxlKTsKKyAgICAgICAgICAgICp2YWx1ZTIg PSBmZl90Z2V0KCZzLT5nYiwgVElGRl9MT05HLCBzLT5sZSk7CisgICAgICAgICAgICBkZW51bTIg ID0gZmZfdGdldCgmcy0+Z2IsIFRJRkZfTE9ORywgcy0+bGUpOworICAgICAgICAgICAgaWYgKGRl bnVtMSAhPSAxIHx8IGRlbnVtMiAhPSAxKSB7CisgICAgICAgICAgICAgICAgYXZfbG9nKHMtPmF2 Y3R4LCBBVl9MT0dfV0FSTklORywgIlVuc3Vwb3J0ZWQgY3JvcCAlc1xuIiwgY3JvcF90eXBlKTsK KyAgICAgICAgICAgICAgICByZXR1cm4gLTE7CisgICAgICAgICAgICB9CisgICAgICAgIH0gZWxz ZSB7CisgICAgICAgICAgICAqdmFsdWUgID0gZmZfdGdldCgmcy0+Z2IsIHR5cGUsIHMtPmxlKTsK KyAgICAgICAgICAgICp2YWx1ZTIgPSBmZl90Z2V0KCZzLT5nYiwgdHlwZSwgcy0+bGUpOworICAg ICAgICB9CisgICAgICAgIGF2X2xvZyhzLT5hdmN0eCwgQVZfTE9HX0RFQlVHLCAiZG5nIGNyb3Ag JXM6ICVkLyVkXG4iLCBjcm9wX3R5cGUsICp2YWx1ZSwgKnZhbHVlMik7CisgICAgICAgIHJldHVy biAwOworfQorCiBzdGF0aWMgaW50IHRpZmZfZGVjb2RlX3RhZyhUaWZmQ29udGV4dCAqcywgQVZG cmFtZSAqZnJhbWUpCiB7CiAgICAgQVZGcmFtZVNpZGVEYXRhICpzZDsKQEAgLTE0OTIsNiArMTUx Niw0NyBAQCBzdGF0aWMgaW50IHRpZmZfZGVjb2RlX3RhZyhUaWZmQ29udGV4dCAqcywgQVZGcmFt ZSAqZnJhbWUpCiAgICAgY2FzZSBETkdfV0hJVEVfTEVWRUw6CiAgICAgICAgIHMtPndoaXRlX2xl dmVsID0gdmFsdWU7CiAgICAgICAgIGJyZWFrOworICAgIGNhc2UgRE5HX0NST1BfT1JJR0lOOgor ICAgICAgICBpZiAoaGFuZGxlX2Nyb3AocywgY291bnQsIHR5cGUsICZ2YWx1ZSwgJnZhbHVlMiwg Im9yaWdpbiIpIDwgMCkKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBpZiAodmFsdWUgPj0g cy0+d2lkdGggfHwgdmFsdWUyID49IHMtPmhlaWdodCkgeworICAgICAgICAgICAgYXZfbG9nKHMt PmF2Y3R4LCBBVl9MT0dfV0FSTklORywgIkludmFsaWQgY3JvcCBvcmlnaW4gKCVkLyVkKVxuIiwg dmFsdWUsIHZhbHVlMik7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgICAgICBm cmFtZS0+Y3JvcF9sZWZ0ID0gdmFsdWU7CisgICAgICAgIGZyYW1lLT5jcm9wX3RvcCA9IHZhbHVl MjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBETkdfQ1JPUF9TSVpFOgorICAgICAgICBpZiAo aGFuZGxlX2Nyb3AocywgY291bnQsIHR5cGUsICZ2YWx1ZSwgJnZhbHVlMiwgInNpemUiKSA8IDAp CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgaWYgKHZhbHVlID49IHMtPndpZHRoIC0gZnJh bWUtPmNyb3BfbGVmdCB8fCB2YWx1ZTIgPj0gcy0+aGVpZ2h0IC0gZnJhbWUtPmNyb3BfdG9wKSB7 CisgICAgICAgICAgICBhdl9sb2cocy0+YXZjdHgsIEFWX0xPR19XQVJOSU5HLCAiSW52YWxpZCBj cm9wIHNpemUgKCVkLyVkKVxuIiwgdmFsdWUsIHZhbHVlMik7CisgICAgICAgICAgICBicmVhazsK KyAgICAgICAgfQorICAgICAgICBmcmFtZS0+Y3JvcF9yaWdodCA9IHMtPndpZHRoIC0gZnJhbWUt PmNyb3BfbGVmdCAtIHZhbHVlOworICAgICAgICBmcmFtZS0+Y3JvcF9ib3R0b20gPSBzLT5oZWln aHQgLSBmcmFtZS0+Y3JvcF90b3AgLSB2YWx1ZTI7CisgICAgICAgIGJyZWFrOworICAgIGNhc2Ug RE5HX0FDVElWRV9BUkVBOiB7CisgICAgICAgIHVuc2lnbmVkIHRvcCwgbGVmdCwgYm90dG9tLCBy aWdodDsKKyAgICAgICAgaWYgKGNvdW50ICE9IDQgfHwgdHlwZSAhPSBUSUZGX1NIT1JUICYmIHR5 cGUgIT0gVElGRl9MT05HKSB7CisgICAgICAgICAgICBhdl9sb2cocy0+YXZjdHgsIEFWX0xPR19X QVJOSU5HLCAiSW52YWxpZCBBY3RpdmUgQXJlYSAoY291bnQ6ICVkLCB0eXBlOiAlZClcbiIsIGNv dW50LCB0eXBlKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgICAgIHRvcCAg ICA9IGZmX3RnZXQoJnMtPmdiLCB0eXBlLCBzLT5sZSk7CisgICAgICAgIGxlZnQgICA9IGZmX3Rn ZXQoJnMtPmdiLCB0eXBlLCBzLT5sZSk7CisgICAgICAgIGJvdHRvbSA9IGZmX3RnZXQoJnMtPmdi LCB0eXBlLCBzLT5sZSk7CisgICAgICAgIHJpZ2h0ICA9IGZmX3RnZXQoJnMtPmdiLCB0eXBlLCBz LT5sZSk7CisgICAgICAgIGlmICh0b3AgPj0gcy0+aGVpZ2h0IC0gZnJhbWUtPmNyb3BfdG9wIHx8 IHRvcCA+IGZyYW1lLT5jcm9wX2JvdHRvbSB8fCBsZWZ0ID49IHMtPndpZHRoIC0gZnJhbWUtPmNy b3BfbGVmdCB8fCBsZWZ0ID4gZnJhbWUtPmNyb3BfcmlnaHQpIHsKKyAgICAgICAgICAgIGF2X2xv ZyhzLT5hdmN0eCwgQVZfTE9HX1dBUk5JTkcsICJJbnZhbGlkIEFjdGl2ZSBBcmVhICglZC8lZC8l ZC8lZClcbiIsIHRvcCwgbGVmdCwgYm90dG9tLCByaWdodCk7CisgICAgICAgICAgICBicmVhazsK KyAgICAgICAgfQorICAgICAgICBhdl9sb2cocy0+YXZjdHgsIEFWX0xPR19ERUJVRywgImRuZyBh Y3RpdmUgYXJlYSAlZCAvICVkIC8gJWQgLyAlZFxuIiwgdG9wLCBsZWZ0LCBib3R0b20sIHJpZ2h0 KTsKKyAgICAgICAgZnJhbWUtPmNyb3BfdG9wICs9IHRvcDsKKyAgICAgICAgZnJhbWUtPmNyb3Bf Ym90dG9tIC09IHRvcDsKKyAgICAgICAgZnJhbWUtPmNyb3BfbGVmdCArPSBsZWZ0OworICAgICAg ICBmcmFtZS0+Y3JvcF9yaWdodCAtPSBsZWZ0OworICAgICAgICBicmVhazsKKyAgICB9CiAgICAg Y2FzZSBUSUZGX0NGQV9QQVRURVJOX0RJTToKICAgICAgICAgaWYgKGNvdW50ICE9IDIgfHwgKGZm X3RnZXQoJnMtPmdiLCB0eXBlLCBzLT5sZSkgIT0gMiAmJgogICAgICAgICAgICAgICAgICAgICAg ICAgICAgZmZfdGdldCgmcy0+Z2IsIHR5cGUsIHMtPmxlKSAhPSAyKSkgewotLSAKMi4xNy4xCgo= --000000000000543bee05ecd47019 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ 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". --000000000000543bee05ecd47019--