From patchwork Sat Nov 19 13:01:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1483 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp624010vsb; Sat, 19 Nov 2016 05:02:06 -0800 (PST) X-Received: by 10.28.35.205 with SMTP id j196mr3699317wmj.62.1479560526570; Sat, 19 Nov 2016 05:02:06 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g5si6179734wmi.28.2016.11.19.05.02.05; Sat, 19 Nov 2016 05:02:06 -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=@googlemail.com; 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=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 337D4689D50; Sat, 19 Nov 2016 15:02:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2DBB0689B0E for ; Sat, 19 Nov 2016 15:01:55 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id u144so12995292wmu.0 for ; Sat, 19 Nov 2016 05:01:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:subject:to:references:message-id:date:user-agent:mime-version :in-reply-to; bh=zsJ31H0/h6QIPUaELuKOSdDgRNClPcO9l901xYKMOSc=; b=I1vBIbAYk0QSnbSIXLkwUwm12ciSnzRiTlVT7/OFMXu2YGX4xN5VF3YLHxPsnWnxoI 5k8ln5UPXnbvzagS1s1mTiqflvzJyCtKCvEI5OCMDLP2yaqmxg/ejwmdrPZMJgNU4zCo U43mrerNHqkkxG6OFxwi0/8hEdX8wwk69PcxDnO9ToOjaBPXPPtFceu4iW68TVz4fjaz aQZmDt4XG080nw1oBXRniy+HJq35lnT/f6Z4ziuljV4iUUH0zwLydKGtPBHoFI5nZOQr 67i5mcwGGhDN758VQKp8HcezxaRZ3cu5of/lr2NvSsUGL3E1x1orKeckR9fHYMaR7DFh LE4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:to:references:message-id:date :user-agent:mime-version:in-reply-to; bh=zsJ31H0/h6QIPUaELuKOSdDgRNClPcO9l901xYKMOSc=; b=J3hrw7UIjkxa66TvN39xdySSSKGlMtjxBml5NSukTe5fTufxYOKkcjpe81EB7pDrUf MuQ9/g2G2jtHVb2etrrL9absqaUaOOK5onLw4ab8L70qghkkhTFGB8hc7zGgx23urUsl x8N1icl7AFNeKLiFM6Hqr852v9mH6bdHPSbmkHLuM9wdAVy9uQbGtZLvbI78rCkuftZn igDfFa5adc/nB6uHTIyvOxn5zVOn+nWSzYcuSTKZEQH2hXgoO/9ARkPHAJvHwdA56xU1 KLWWbCQynRUTpQWmkHH166PQIcDmvsI5xW3Akc70EDtahGrl5TX3mTEuc9ICvLjw+1cY AhDw== X-Gm-Message-State: AKaTC00e/Bku/eVy2i/qNH2xgvftOLwuFYkK2x6py9XMXI6DtX5rIYO55o9h9Gxt1SoDDw== X-Received: by 10.28.150.75 with SMTP id y72mr3538770wmd.47.1479560516278; Sat, 19 Nov 2016 05:01:56 -0800 (PST) Received: from [192.168.2.21] (p5B095CF1.dip0.t-ipconnect.de. [91.9.92.241]) by smtp.googlemail.com with ESMTPSA id u18sm8702358wmd.1.2016.11.19.05.01.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Nov 2016 05:01:55 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: ffmpeg-devel@ffmpeg.org References: <6f4937ce-7e05-cc18-b541-5fa31adb0620@googlemail.com> <20161119003905.GI4824@nb4> Message-ID: <2af51940-cd6f-26aa-585f-50acaf5d744c@googlemail.com> Date: Sat, 19 Nov 2016 14:01:54 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 In-Reply-To: <20161119003905.GI4824@nb4> Subject: Re: [FFmpeg-devel] [PATCH] options_table: replace INT64_MAX with a sligthly smaller value X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" On 19.11.2016 01:39, Michael Niedermayer wrote: > On Fri, Nov 18, 2016 at 11:06:56PM +0100, Andreas Cadhalpun wrote: >> AVOption.max is a double, which has not enough precision for INT64_MAX. >> >> It gets interpreted as INT64_MIN, when converted back to int64_t. >> >> Signed-off-by: Andreas Cadhalpun >> --- >> libavcodec/options_table.h | 10 ++++++---- >> 1 file changed, 6 insertions(+), 4 deletions(-) >> >> diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h >> index 48de667..f117ce4 100644 >> --- a/libavcodec/options_table.h >> +++ b/libavcodec/options_table.h >> @@ -41,8 +41,10 @@ >> >> #define AV_CODEC_DEFAULT_BITRATE 200*1000 >> >> +#define FF_INT64_MAX (INT64_MAX - 0x1000) > > Missing documentation Added a comment. >> + >> static const AVOption avcodec_options[] = { >> -{"b", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT64, {.i64 = AV_CODEC_DEFAULT_BITRATE }, 0, INT64_MAX, A|V|E}, >> +{"b", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT64, {.i64 = AV_CODEC_DEFAULT_BITRATE }, 0, FF_INT64_MAX, A|V|E}, >> {"ab", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT64, {.i64 = 128*1000 }, 0, INT_MAX, A|E}, >> {"bt", "Set video bitrate tolerance (in bits/s). In 1-pass mode, bitrate tolerance specifies how far " >> "ratecontrol is willing to deviate from the target average bitrate value. This is not related " >> @@ -444,11 +446,11 @@ static const AVOption avcodec_options[] = { >> #if FF_API_PRIVATE_OPT >> {"min_prediction_order", NULL, OFFSET(min_prediction_order), AV_OPT_TYPE_INT, {.i64 = -1 }, INT_MIN, INT_MAX, A|E}, >> {"max_prediction_order", NULL, OFFSET(max_prediction_order), AV_OPT_TYPE_INT, {.i64 = -1 }, INT_MIN, INT_MAX, A|E}, >> -{"timecode_frame_start", "GOP timecode frame start number, in non-drop-frame format", OFFSET(timecode_frame_start), AV_OPT_TYPE_INT64, {.i64 = -1 }, -1, INT64_MAX, V|E}, >> +{"timecode_frame_start", "GOP timecode frame start number, in non-drop-frame format", OFFSET(timecode_frame_start), AV_OPT_TYPE_INT64, {.i64 = -1 }, -1, FF_INT64_MAX, V|E}, >> #endif > >> {"bits_per_raw_sample", NULL, OFFSET(bits_per_raw_sample), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX}, >> -{"channel_layout", NULL, OFFSET(channel_layout), AV_OPT_TYPE_INT64, {.i64 = DEFAULT }, 0, INT64_MAX, A|E|D, "channel_layout"}, >> +{"channel_layout", NULL, OFFSET(channel_layout), AV_OPT_TYPE_INT64, {.i64 = DEFAULT }, 0, FF_INT64_MAX, A|E|D, "channel_layout"}, >> -{"request_channel_layout", NULL, OFFSET(request_channel_layout), AV_OPT_TYPE_INT64, {.i64 = DEFAULT }, 0, INT64_MAX, A|D, "request_channel_layout"}, >> +{"request_channel_layout", NULL, OFFSET(request_channel_layout), AV_OPT_TYPE_INT64, {.i64 = DEFAULT }, 0, FF_INT64_MAX, A|D, "request_channel_layout"}, > > this doesnt feel right > layout is not a scalar Then why is it limited to positive values? Currently setting either of those to "max" will actually cause them to be set to INT64_MIN. Anyway, I dropped this part. New patch attached. Best regards, Andreas From 0f6fe6ae00d8176aa5a84f7ef1232d743d32e0dd Mon Sep 17 00:00:00 2001 From: Andreas Cadhalpun Date: Fri, 18 Nov 2016 23:00:59 +0100 Subject: [PATCH] options_table: replace INT64_MAX with a sligthly smaller value AVOption.max is a double, which has not enough precision for INT64_MAX. It gets interpreted as INT64_MIN, when converted back to int64_t. Signed-off-by: Andreas Cadhalpun --- libavcodec/options_table.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 48de667..377dade 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -41,8 +41,12 @@ #define AV_CODEC_DEFAULT_BITRATE 200*1000 +// AVOption.max is a double, which has not enough precision for INT64_MAX. +// It gets interpreted as INT64_MIN, when converted back to int64_t. +#define FF_INT64_MAX (INT64_MAX - 0x1000) + static const AVOption avcodec_options[] = { -{"b", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT64, {.i64 = AV_CODEC_DEFAULT_BITRATE }, 0, INT64_MAX, A|V|E}, +{"b", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT64, {.i64 = AV_CODEC_DEFAULT_BITRATE }, 0, FF_INT64_MAX, A|V|E}, {"ab", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT64, {.i64 = 128*1000 }, 0, INT_MAX, A|E}, {"bt", "Set video bitrate tolerance (in bits/s). In 1-pass mode, bitrate tolerance specifies how far " "ratecontrol is willing to deviate from the target average bitrate value. This is not related " @@ -444,7 +448,7 @@ static const AVOption avcodec_options[] = { #if FF_API_PRIVATE_OPT {"min_prediction_order", NULL, OFFSET(min_prediction_order), AV_OPT_TYPE_INT, {.i64 = -1 }, INT_MIN, INT_MAX, A|E}, {"max_prediction_order", NULL, OFFSET(max_prediction_order), AV_OPT_TYPE_INT, {.i64 = -1 }, INT_MIN, INT_MAX, A|E}, -{"timecode_frame_start", "GOP timecode frame start number, in non-drop-frame format", OFFSET(timecode_frame_start), AV_OPT_TYPE_INT64, {.i64 = -1 }, -1, INT64_MAX, V|E}, +{"timecode_frame_start", "GOP timecode frame start number, in non-drop-frame format", OFFSET(timecode_frame_start), AV_OPT_TYPE_INT64, {.i64 = -1 }, -1, FF_INT64_MAX, V|E}, #endif {"bits_per_raw_sample", NULL, OFFSET(bits_per_raw_sample), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX}, {"channel_layout", NULL, OFFSET(channel_layout), AV_OPT_TYPE_INT64, {.i64 = DEFAULT }, 0, INT64_MAX, A|E|D, "channel_layout"}, -- 2.10.2