From patchwork Wed Mar 7 15:52:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Martinez X-Patchwork-Id: 7851 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.181.170 with SMTP id m39csp5117666jaj; Wed, 7 Mar 2018 07:52:19 -0800 (PST) X-Google-Smtp-Source: AG47ELv9KGzoCOAfxPIvJcAT/rBCvXGhsjjuqt1tFd24LUbnSWEDBBHj1C5ApeFWXdcD7CGRzas1 X-Received: by 10.28.84.19 with SMTP id i19mr13737170wmb.7.1520437939655; Wed, 07 Mar 2018 07:52:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520437939; cv=none; d=google.com; s=arc-20160816; b=UhYv4fIi1S9eC7hI0PaxzcTje0mGWh9HAuqLIZW7ELcj6tuVYq1ps63gp/dG3mtPcc 5nTGSFeRPwCgb7Win7JgJhcz3JOsFJI3rxyKqKWyORVZDLoiUKtCHDdr1M39jRF2qgVd rt6adUESscW/RKdwKYMpb03nTLx58FdFfhw9+Bl7EXvgUSFHbtumQd089/qTMgY1PPqo MdTM0yZ/+Lw5AVV6lLrtzSjXnow8aHkZLaytV7bqlMRvTWYCDIVLK1RRVg1x9tYEhC0o NwwGpY9oK7kum2mX6gQglGAZ9wb5f1xGPr1C49JzV+nYf1THRh8SgcMjFcWM1UgtGI36 xPVw== 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=LiRzYMTkkXpViFdgz8hJxY6eyfiy0vleKyfGDnVylDE=; b=HfN0y7LXn8y0RljxvTPO4qOXGwl/uSNfA1Xmm/LyBOTO4Ffey716aEOlgF3cNMmi2H 6LTFz8bYMLyvvyFi/e/djIsKJ6EThgMgxX/FkvRRl9tTlN9eL9olfeeEGY/GHUOtU1Sp KOQzDNHIodKO/77Vd44gSia6rtLYmznjF3Q3y60E4d0QWQcz/ebJYK77tJ7wwjjhcayS OkdyQEKovc7QEgK0o9Lc8tEj8X+dfW7zhICiXKqLj9cVW5nUTPSgAZRj4JKO1oh+wm8X M7nw9ATjuyW6PIi4wmI6dCZ9v14ZsS6Rjs7DTWjODA6VuVLX9no7iK9YRTIWCgJNHM2k ltEQ== 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 k23si12967465wrc.70.2018.03.07.07.52.19; Wed, 07 Mar 2018 07:52:19 -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 0F83468A540; Wed, 7 Mar 2018 17:52:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from 9.mo1.mail-out.ovh.net (9.mo1.mail-out.ovh.net [178.32.108.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5945668A492 for ; Wed, 7 Mar 2018 17:52:03 +0200 (EET) Received: from player778.ha.ovh.net (unknown [10.109.108.31]) by mo1.mail-out.ovh.net (Postfix) with ESMTP id 1A2EBDEBC4 for ; Wed, 7 Mar 2018 16:52:11 +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 E4D92180091 for ; Wed, 7 Mar 2018 16:52:10 +0100 (CET) To: ffmpeg-devel@ffmpeg.org References: <4b0efe51-d6c0-9a37-ce34-155387d1a8e8@mediaarea.net> From: Jerome Martinez Message-ID: <1bfd5dd0-8b2f-7622-a7d5-517351259331@mediaarea.net> Date: Wed, 7 Mar 2018 16:52:12 +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: <4b0efe51-d6c0-9a37-ce34-155387d1a8e8@mediaarea.net> Content-Language: en-GB X-Ovh-Tracer-Id: 768708163528298685 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedtfedrkedvgdekfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecu Subject: [FFmpeg-devel] [PATCH 5/7] avcodec/ffv1enc: support of 1024 slices 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" FFV1 decoder supports up to 1024 slices but FFV1 encoder permits only 961 (31x31) slices. This patch permits to create 1024 (32x32) slices. From 494115e12981a9c54bf04b63a13ef50364349de2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Martinez?= Date: Wed, 7 Mar 2018 10:49:24 +0100 Subject: [PATCH 5/7] avcodec/ffv1enc: support of 1024 slices Decoder already accepts 1024 slices but encoder was limited to 961 slices --- libavcodec/ffv1enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index 16987117d8..262821abab 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -872,7 +872,7 @@ FF_ENABLE_DEPRECATION_WARNINGS s->num_v_slices = FFMIN(s->num_v_slices, max_v_slices); - for (; s->num_v_slices < 32; s->num_v_slices++) { + for (; s->num_v_slices <= 32; s->num_v_slices++) { for (s->num_h_slices = s->num_v_slices; s->num_h_slices < 2*s->num_v_slices; s->num_h_slices++) { int maxw = (avctx->width + s->num_h_slices - 1) / s->num_h_slices; int maxh = (avctx->height + s->num_v_slices - 1) / s->num_v_slices;