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 A1F2E48AA2 for ; Tue, 27 Feb 2024 20:32:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8C15868CE36; Tue, 27 Feb 2024 22:32:31 +0200 (EET) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7405668CE0F for ; Tue, 27 Feb 2024 22:32:24 +0200 (EET) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-6e4ca46ab04so2954240b3a.3 for ; Tue, 27 Feb 2024 12:32:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709065942; x=1709670742; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=kRpst+ClFnIn1EKqsWZM7VUOFp0HrErvaSXQ/4trobw=; b=RrLDLuUaWjOY193AQz2s3GfdiHU5W7tUOuR2VRqymas/ZXRvfv8vws1WYflsdwc2qD EuqD/lTHgy+qr1eN9LToDdAn0scsAUgxTUdCFK9fyMld/MU/PMFQ2IIYX282V8pEQ8qy 9/TKqgvEMYeS0kJpR1DB5nW1CD3nywwvcTiycMUEuMhnchGV1qvNyxBvUUlKyOgaakz4 FTmMPymw50PumZDGvMGvUjVyCZLx1EHh+y2qR962CG9CqedSaR5N1oSPBa2icfbm2dKk 4JYhFj1n6zaKiAX2KthY4hxzQB6V2wj7joPqw5ZnlpsjoweoVQskxHyQzuRi5LcFK2oV 8Zzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709065942; x=1709670742; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kRpst+ClFnIn1EKqsWZM7VUOFp0HrErvaSXQ/4trobw=; b=VEO20LBBmSyjRq/rzQQcs9BU+Ghzulb+LmYCsV9qRILH8H94M4mTOCCR//hCYaqMzk 6i5/WjrttOWLXPkA8Gc90NOi79hWWtr5D70p84TMNe4OLZs/224KyIPkOx6vvN4Qa3yX YUDo4AaUgkTH7T8ichhiNb4U3P5BPnMZ/xooUKDcfT2c+3yqi47nARp4jpudz1VhEgtm aAfG513Wr36J2z4pTOIAE2DHVdrPBZb//t9iW3h2S5nvUQgKy2Rfmg0Kp+BNoXS+B5Sz n07LjbQSLPJOqzMuop0bzyblLpcI2qIkcxxbyZxM+Kz8Po6aIp2VA5k8i22qSCg6D+xl LUnw== X-Gm-Message-State: AOJu0Yw+prKrtDujfva1xpXdJBfGDpntIUMbU0whSTQ8qx2rjd1zN1Gr NP01wE97C6ts/1JgTVQt2FOukxRxC/JYRXgmqM083JstRL93EsT37dJP0CXA X-Google-Smtp-Source: AGHT+IHNOFEPBEllQ+G8gqLVFUZ/XteW7nidOSKo/x+4qiC5E6hQ/2NJIHkDCZdLDMiWPgE+ikJDYg== X-Received: by 2002:a05:6a00:9386:b0:6e5:4f1e:7209 with SMTP id ka6-20020a056a00938600b006e54f1e7209mr2605995pfb.15.1709065941683; Tue, 27 Feb 2024 12:32:21 -0800 (PST) Received: from localhost.localdomain ([190.194.169.124]) by smtp.gmail.com with ESMTPSA id m22-20020a637116000000b005d880b41598sm6294325pgc.94.2024.02.27.12.32.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Feb 2024 12:32:20 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Feb 2024 17:30:39 -0300 Message-ID: <20240227203040.1989-2-jamrial@gmail.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240227203040.1989-1-jamrial@gmail.com> References: <20240227203040.1989-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avutil/tests/opt: test values > INT_MAX for INT64 type 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: Signed-off-by: James Almer --- libavutil/tests/opt.c | 5 +++-- tests/ref/fate/opt | 25 ++++++++++++++----------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/libavutil/tests/opt.c b/libavutil/tests/opt.c index a914d0359a..11f29468fb 100644 --- a/libavutil/tests/opt.c +++ b/libavutil/tests/opt.c @@ -85,7 +85,7 @@ static const AVOption test_options[]= { {"bin", "set binary value", OFFSET(binary), AV_OPT_TYPE_BINARY, { .str="62696e00" }, 0, 0, 1 }, {"bin1", "set binary value", OFFSET(binary1), AV_OPT_TYPE_BINARY, { .str=NULL }, 0, 0, 1 }, {"bin2", "set binary value", OFFSET(binary2), AV_OPT_TYPE_BINARY, { .str="" }, 0, 0, 1 }, - {"num64", "set num 64bit", OFFSET(num64), AV_OPT_TYPE_INT64, { .i64 = 1 }, -1, 100, 1 }, + {"num64", "set num 64bit", OFFSET(num64), AV_OPT_TYPE_INT64, { .i64 = 1LL << 32 }, -1, 1LL << 32, 1 }, {"flt", "set float", OFFSET(flt), AV_OPT_TYPE_FLOAT, { .dbl = 1.0 / 3 }, 0, 100, 1 }, {"dbl", "set double", OFFSET(dbl), AV_OPT_TYPE_DOUBLE, { .dbl = 1.0 / 3 }, 0, 100, 1 }, {"bool1", "set boolean value", OFFSET(bool1), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, 1 }, @@ -296,7 +296,8 @@ int main(void) "num64=44.4", "num64=-1", "num64=-2", - "num64=101", + "num64=4294967296", + "num64=4294967297", "flt=bogus", "flt=2", "flt=2.2", diff --git a/tests/ref/fate/opt b/tests/ref/fate/opt index 2da155aa2b..d164b9eb0c 100644 --- a/tests/ref/fate/opt +++ b/tests/ref/fate/opt @@ -14,7 +14,7 @@ color=255 192 203 255 channel_layout=311=311 binary=62 69 6e 0 binary_size=4 -num64=1 +num64=4294967296 flt=0.333333 dbl=0.333333 TestContext AVOptions: @@ -37,7 +37,7 @@ TestContext AVOptions: -bin E.......... set binary value -bin1 E.......... set binary value -bin2 E.......... set binary value - -num64 E.......... set num 64bit (from -1 to 100) (default 1) + -num64 E.......... set num 64bit (from -1 to 4.29497e+09) (default 4294967296) -flt E.......... set float (from 0 to 100) (default 0.333333) -dbl E.......... set double (from 0 to 100) (default 0.333333) -bool1 E.......... set boolean value (default auto) @@ -119,7 +119,7 @@ name: cl get: hexagonal set: OK get: hexagonal name: bin get: 62696E00 set: OK get: 62696E00 OK name: bin1 get: set: OK get: OK name: bin2 get: set: OK get: OK -name: num64 get: 1 set: OK get: 1 OK +name: num64 get: 4294967296 set: OK get: 4294967296 OK name: flt get: 0.333333 set: OK get: 0.333333 OK name: dbl get: 0.333333 set: OK get: 0.333333 OK name: bool1 get: auto set: OK get: auto OK @@ -129,7 +129,7 @@ name: dict1 get: set: OK get: name: dict2 get: happy=\:-) set: OK get: happy=\:-) OK Test av_opt_serialize() -num=0,toggle=1,rational=1/1,string=default,escape=\\\=\,,flags=0x00000001,size=200x300,pix_fmt=0bgr,sample_fmt=s16,video_rate=25/1,duration=0.001,color=0xffc0cbff,cl=hexagonal,bin=62696E00,bin1=,bin2=,num64=1,flt=0.333333,dbl=0.333333,bool1=auto,bool2=true,bool3=false,dict1=,dict2=happy\=\\:-) +num=0,toggle=1,rational=1/1,string=default,escape=\\\=\,,flags=0x00000001,size=200x300,pix_fmt=0bgr,sample_fmt=s16,video_rate=25/1,duration=0.001,color=0xffc0cbff,cl=hexagonal,bin=62696E00,bin1=,bin2=,num64=4294967296,flt=0.333333,dbl=0.333333,bool1=auto,bool2=true,bool3=false,dict1=,dict2=happy\=\\:-) Setting entry with key 'num' to value '0' Setting entry with key 'toggle' to value '1' Setting entry with key 'rational' to value '1/1' @@ -146,7 +146,7 @@ Setting entry with key 'cl' to value 'hexagonal' Setting entry with key 'bin' to value '62696E00' Setting entry with key 'bin1' to value '' Setting entry with key 'bin2' to value '' -Setting entry with key 'num64' to value '1' +Setting entry with key 'num64' to value '4294967296' Setting entry with key 'flt' to value '0.333333' Setting entry with key 'dbl' to value '0.333333' Setting entry with key 'bool1' to value 'auto' @@ -154,7 +154,7 @@ Setting entry with key 'bool2' to value 'true' Setting entry with key 'bool3' to value 'false' Setting entry with key 'dict1' to value '' Setting entry with key 'dict2' to value 'happy=\:-)' -num=0,toggle=1,rational=1/1,string=default,escape=\\\=\,,flags=0x00000001,size=200x300,pix_fmt=0bgr,sample_fmt=s16,video_rate=25/1,duration=0.001,color=0xffc0cbff,cl=hexagonal,bin=62696E00,bin1=,bin2=,num64=1,flt=0.333333,dbl=0.333333,bool1=auto,bool2=true,bool3=false,dict1=,dict2=happy\=\\:-) +num=0,toggle=1,rational=1/1,string=default,escape=\\\=\,,flags=0x00000001,size=200x300,pix_fmt=0bgr,sample_fmt=s16,video_rate=25/1,duration=0.001,color=0xffc0cbff,cl=hexagonal,bin=62696E00,bin1=,bin2=,num64=4294967296,flt=0.333333,dbl=0.333333,bool1=auto,bool2=true,bool3=false,dict1=,dict2=happy\=\\:-) Testing av_set_options_string() Setting options string '' @@ -350,12 +350,15 @@ Setting entry with key 'num64' to value '-1' OK 'num64=-1' Setting options string 'num64=-2' Setting entry with key 'num64' to value '-2' -Value -2.000000 for parameter 'num64' out of range [-1 - 100] +Value -2.000000 for parameter 'num64' out of range [-1 - 4.29497e+09] Error 'num64=-2' -Setting options string 'num64=101' -Setting entry with key 'num64' to value '101' -Value 101.000000 for parameter 'num64' out of range [-1 - 100] -Error 'num64=101' +Setting options string 'num64=4294967296' +Setting entry with key 'num64' to value '4294967296' +OK 'num64=4294967296' +Setting options string 'num64=4294967297' +Setting entry with key 'num64' to value '4294967297' +Value 4294967297.000000 for parameter 'num64' out of range [-1 - 4.29497e+09] +Error 'num64=4294967297' Setting options string 'flt=bogus' Setting entry with key 'flt' to value 'bogus' Undefined constant or missing '(' in 'bogus' -- 2.43.2 _______________________________________________ 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".