From patchwork Wed Mar 7 15:49:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Martinez X-Patchwork-Id: 7849 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.181.170 with SMTP id m39csp5114574jaj; Wed, 7 Mar 2018 07:49:30 -0800 (PST) X-Google-Smtp-Source: AG47ELsRHFcBs7T59pWj/UlJt9Y8KVOI5pY6ArN9I+4Go64SGD9ssQ4S5M4mreGAIRu1wDF5y4kb X-Received: by 10.223.224.199 with SMTP id e7mr18279533wri.263.1520437770350; Wed, 07 Mar 2018 07:49:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520437770; cv=none; d=google.com; s=arc-20160816; b=aWUqweQeRAVu/PFZfugR+1e+ovNIouu0ZW4URjtUSh2fCPon3uiRpUm1gXL5FZI7QH GPED+9ycuDx6XgfEEldt32AYVr9XB4ufEzz/kX0F/uVa00mIoMqfCSxj6XJf8eE2PIUs V0mDdkWWzTIyf15E+SQi7erE5ln3sZRR1350Uocernf/P+gUFsnbBnZVbuqWZNgESeol XreXwH99GZ5wxWJCgFu9gUQhGjTrhEtOPizrGgx//HEpMeNzHnAqXrvFVT9FWL8yBie+ haiPy20SXG0JNvGzLT4h64rke/9apQ7mStoHSpraSRblrhspwXvaBaFv4gtZNDLt7cZL 74gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:to:delivered-to :arc-authentication-results; bh=Nc2suEjXa3xfs5uXr5J67BqFcVIMdQIDh7Aioykxi7M=; b=AoheEkqAIDKHN05UZ/s6pPLIgqG+NrQWUqMV9tUUmD8G1r8Kv9I2+auJeys301SV89 ERNI2UETg12dG3EBbY9KhWx1bifbkRdxOfQHUZ0Gsny1QcIQPaREoU4nbutQ9COnFOPL VrzAt/RKDwFcaGilPtPXLGxqq9hrX5LCmnilE7ekkLBU2ASt4rZwVYCbp0ZuwN/4Piag 22qDn9D80vU7TBI3cQJdz0vb1UwVXjixgCqZmeXBjzZLWpPVGU8h9ywkrEOB0g4FWTjp u3MiFzJ8LMExWhNlNVM9wxi0nAxz7vWWbqIveoIn7cQqeP1xG2fji3g9Qf2y/QUqpL5l RXpQ== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y8si7798857wmb.64.2018.03.07.07.49.29; Wed, 07 Mar 2018 07:49:30 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D463968A4DF; Wed, 7 Mar 2018 17:49:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from 6.mo69.mail-out.ovh.net (6.mo69.mail-out.ovh.net [46.105.50.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5613C68A4DF for ; Wed, 7 Mar 2018 17:49:14 +0200 (EET) Received: from player778.ha.ovh.net (unknown [10.109.105.27]) by mo69.mail-out.ovh.net (Postfix) with ESMTP id 11BAD5AF23 for ; Wed, 7 Mar 2018 16:49:22 +0100 (CET) Received: from [192.168.2.120] (p5DDB6D89.dip0.t-ipconnect.de [93.219.109.137]) (Authenticated sender: zen-lists@mediaarea.net) by player778.ha.ovh.net (Postfix) with ESMTPSA id DCF991800C3 for ; Wed, 7 Mar 2018 16:49:21 +0100 (CET) To: ffmpeg-devel@ffmpeg.org References: <4b0efe51-d6c0-9a37-ce34-155387d1a8e8@mediaarea.net> <7103d433-37a5-e377-d752-5f73f4d10dd7@mediaarea.net> From: Jerome Martinez Message-ID: <0e2faff5-2182-6d83-bae1-8f5195ec0792@mediaarea.net> Date: Wed, 7 Mar 2018 16:49:24 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <7103d433-37a5-e377-d752-5f73f4d10dd7@mediaarea.net> Content-Language: en-GB X-Ovh-Tracer-Id: 720857418158772413 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedtfedrkedvgdekudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecu Subject: [FFmpeg-devel] [PATCH 2/7] avcodec/ffv1enc: add information message when version is changed by the encoder 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" There is a message when coder type is forced to a value not chosen by user, but no message when version is forced to a value not chosen by user. This patch adds such message for more coherency in the messages, and the user is informed that the command is not fully respected. ffmpeg f lavfi -i mandelbrot=s=1920x1080 -vf format=gbrp9 -vframes 1 -c ffv1 -level 0 -coder 0 a.mkv Before: [ffv1 @ 000002492CD69B40] bits_per_raw_sample > 8, forcing range coder After: [ffv1 @ 000001A6E404A780] bits_per_raw_sample > 8, forcing version 1 [ffv1 @ 000001A6E404A780] bits_per_raw_sample > 8, forcing range coder From 49db6049fa50976683fc651cf180ab8c7428225e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Martinez?= Date: Wed, 7 Mar 2018 10:37:46 +0100 Subject: [PATCH 2/7] avcodec/ffv1enc: add information message when version is changed by the encoder --- libavcodec/ffv1enc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index d71d952c6d..ac8b715b74 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -509,7 +509,7 @@ static av_cold int encode_init(AVCodecContext *avctx) { FFV1Context *s = avctx->priv_data; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt); - int i, j, k, m, ret; + int i, j, k, m, ret, oldversion; if ((ret = ff_ffv1_common_init(avctx)) < 0) return ret; @@ -534,6 +534,7 @@ static av_cold int encode_init(AVCodecContext *avctx) } s->version = avctx->level; } + oldversion = s->version; if (s->ec < 0) { s->ec = (s->version >= 3); @@ -679,6 +680,11 @@ FF_ENABLE_DEPRECATION_WARNINGS av_assert0(s->bits_per_raw_sample >= 8); if (s->bits_per_raw_sample > 8) { + if (oldversion >= 0 && oldversion != s->version) { + av_log(avctx, AV_LOG_INFO, + "bits_per_raw_sample > 8, forcing version 1\n"); + oldversion = s->version; + } if (s->ac == AC_GOLOMB_RICE) { av_log(avctx, AV_LOG_INFO, "bits_per_raw_sample > 8, forcing range coder\n");