From patchwork Thu Sep 16 10:54:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 30274 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1131314iov; Thu, 16 Sep 2021 03:54:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxMRJHgfTJWyBnNjaH0GNoNQO+K5QReHF12aZLk82LqXRlqY7Bg7EIKZwUYbQHRH1+gw3zb X-Received: by 2002:a17:907:628d:: with SMTP id nd13mr5696456ejc.7.1631789677215; Thu, 16 Sep 2021 03:54:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631789677; cv=none; d=google.com; s=arc-20160816; b=h2oFa2acg/Mu3QfLdJChgcwCZwu/Rb3wTm4TJdxjmUkoKdDRmbVf1KtuUgmcsHxK9o n9XEYq9wZFVHA3tjYtouCBEK+/OzsZujYD6Ii8dFvuUtyMvGO6x5K48URY2OjNzpaKhT IOEd9DclrpCI4Qt88WqnAyU4Q6QUb4gxYitTUdqf0we40UznV5Lt3HNmJmhFVuWNyhbS YbV4SmjeJBadCxO/j8XMVayxRIVKNI4dgmlgp4PzTr6ARwjDEXgAajk//Qsh4sQeU8FD smXYLb8aQfWbP8oxuafic7yxTtvRAlbhpv7+XlKihQP2AJlHeEjZxxwsrT7qWLrUaHG0 KbJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=3R+/Cgpo+Gzr+u0rd++oxB08Y+KPvpxojz+tBRnOuI4=; b=rlEMHwmYQF47qbQ3DCDB0dVy57M/m05SCCbawFI/x0SiQ9hi8eaurHHI1gpE24P0im hOznGuKw/EmAqBs+epv/K2tE8CuCT9LH8ByT0Gr0ZWSTsgbn1RkGQJ2Xmj0xlKw/btc1 IKWMJbJyrE1X/sZqlYiUt2tF9Cf40tw41sHSrusc6fgwHmPdm1wSHAHub08UH46rZXYD d9reJd2J59oe8KwCEVb9P8mIRZihj/UfFuFpUBfefkNgAGY+SCwAxVcg9OS4hB0J8MxN PB6MhOYW/ZW1QdSRSSU7t6ZgRgsTGfQPBK08I6VIN1J+is/jWCUA3PhU01+KvcWlHDM2 rCWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="Q/p2TM82"; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p16si3240780edq.563.2021.09.16.03.54.34; Thu, 16 Sep 2021 03:54:37 -0700 (PDT) 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=@gmail.com header.s=20210112 header.b="Q/p2TM82"; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8D3EE68AB29; Thu, 16 Sep 2021 13:54:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6DBDF68A906 for ; Thu, 16 Sep 2021 13:54:24 +0300 (EEST) Received: by mail-pg1-f174.google.com with SMTP id q68so5754344pga.9 for ; Thu, 16 Sep 2021 03:54:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=kGvbltylMcPPPWG4W6USqcRZjPmfv12oIKl3GIovR8E=; b=Q/p2TM82/rk5rchkZcwfsnhAWgtWUUoeWSYDSXYBAEjq+HuLABWrfs9h1wY3/ZTJtC Ayrrxa1VrZ0FF8DR5x8AM+LXfvFY9BOs7hHUlc4AXxyJ7yGq/ftlGwRpu0PlFihvn899 YX9yxfot8jkOiSa6ZtDU2qWp5stHdejtJJo7XSA43jSHWxoG5SBwpkJEfaf6KaQgDk7D 8mXF8SjkqqBV+SQFWyXMmdCOSKDUNGrKH2n3o0CGzZadYixRcBcoYQ49TaX3y7wv//LT fi3eUCR5T5EKvNSsSEj8o20HiqEecjPu0woK1JpV9sQ/LcMMp5QuKBL2q0xmro/49k3I 8tOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=kGvbltylMcPPPWG4W6USqcRZjPmfv12oIKl3GIovR8E=; b=YT9L0k0nApefwiESSIp3iv3jy4l1ELx/djLoSadQA840y506v9hNk9+e6yla3djln9 324MGc1UXfSFgk1NUzd8pg4xtPzerB5Vp5zIhqE4i2Uk9yfrLqB0aqjdF3+LeH2APxQa tCiUQyg+CZCeWj2t8a6JVN0z5OMzP1txzDvkf1GWy/IgLQ3cl84VDTIHCJWw2IXCxRBJ BvXwk+dDmTqb6ToyDgfznc6EV22D7C94bxIETYNCoNogHJ2ZtqnA1k6dJ0nXBdwIjj7l QXBVCfN2qwSQE7pGXdpd07skJ4Ke5esppSM4Z0dHER7ZF1sHvjrhC6FWNd/59rHkDi6u qc4g== X-Gm-Message-State: AOAM533vgDYt5HkiCG49ND7yp5EwwVoteoXf+903T6VJxYfR2tb/yMV/ NcSTOWElprrYv9ut/KlEQs2tzD+hzoU= X-Received: by 2002:a05:6a00:ac6:b029:374:a33b:a74 with SMTP id c6-20020a056a000ac6b0290374a33b0a74mr4629004pfl.51.1631789662448; Thu, 16 Sep 2021 03:54:22 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id h4sm2959020pgn.6.2021.09.16.03.54.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Sep 2021 03:54:22 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Sep 2021 18:54:13 +0800 Message-Id: <1631789657-16936-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/libsvtav1: Fix redundant setting of caps_internal 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: WDFJ9gsDC4BY From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/libsvtav1.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index fabc4e6..82ae2b9 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -561,12 +561,11 @@ const AVCodec ff_libsvtav1_encoder = { .receive_packet = eb_receive_packet, .close = eb_enc_close, .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS, - .caps_internal = FF_CODEC_CAP_AUTO_THREADS, + .caps_internal = FF_CODEC_CAP_AUTO_THREADS | FF_CODEC_CAP_INIT_CLEANUP, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P10, AV_PIX_FMT_NONE }, .priv_class = &class, .defaults = eb_enc_defaults, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .wrapper_name = "libsvtav1", }; From patchwork Thu Sep 16 10:54:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 30272 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1131397iov; Thu, 16 Sep 2021 03:54:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzXF4zCzZQBqUcOmRx/+dCUVImnuoua+ceJBOCr9mLhzTC0JqIALY2uoAnWznn89hnxZM/o X-Received: by 2002:aa7:c0c7:: with SMTP id j7mr5711948edp.58.1631789685955; Thu, 16 Sep 2021 03:54:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631789685; cv=none; d=google.com; s=arc-20160816; b=qqGu0fvQu9rxekkXIckgR4wWS01/it5bC88xhdIiNlHYaRHdrPTZIq8+0D2uwsV271 RRhMu01OZW3i/1XBJe9eKwrzlj+F13Fg6EKVB2sk8ppOw7eWlrLyQTPVUcF+9EDtrXk/ dam/9HBEROasYRwlE94rKXrRntNlvjFKZyvbUS2kCIeDqOFoxWLfUEfvMgBFy3nqMNXA gNwh8g5nhu3N/54dm2MYhlxgnrs/yTfWXP2zAib3l5U3aWx6cRiRYjnxObMW6vpKp9vl 5cX8T9R2Dntqk/Da9fl3QzhkiFVB9S07XUkX9z+8qUyHq2qq0JKQ5btFmWZbdLXJHwin 1WAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=M86tMDTof1Ehak8iZhaN10R4iL8IAChZ6Q2iZjHj0XE=; b=pyUElpSoeQU+2uJNimfczXbnVkm/PP9yhgrWQWUb+m298PCdBscLdo2tXsxyHQnGrf lkWl38+1RX+hOjL/TlwiYJ5/hzWpT09wTHDo5/9W+qZlfX3gaslojh5uQjOu/WBJKLLB djT8cIj5Cw+3KQbQmWuFb2n9Tgiw2NmcwSLSJGgZ5KqzfU5QVTnETOBMuWkA/7IrZacg CTLEVHFl0nJ0g5rYXKs8S+brHh8aYWr22WY1nwm+SSJ/r4rnripIns3IoQ7tH4OplDKd 12pumDXPAQAZQrsbtj4j4oYvGZZw+VnxHdyYeq3PmqRTU1qWuzgejUw02+jhvDSE7+18 ZuDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=XFeW2iuA; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id nd15si2805679ejc.463.2021.09.16.03.54.45; Thu, 16 Sep 2021 03:54:45 -0700 (PDT) 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=@gmail.com header.s=20210112 header.b=XFeW2iuA; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B995368AA8A; Thu, 16 Sep 2021 13:54:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9470968AB5E for ; Thu, 16 Sep 2021 13:54:25 +0300 (EEST) Received: by mail-pf1-f182.google.com with SMTP id j16so5558356pfc.2 for ; Thu, 16 Sep 2021 03:54:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QzckYb4cXf5KLXCedRdDW1q5VxWS7ePWBJwALpVtN8I=; b=XFeW2iuA+WoEKpqCz9r2DOb4pdhxSo0NDjxeHM8eD1FuOqFdHa543plvXy5tHfqQs1 sqbfHYwhevJ4o3u4lUyBwm4JPlBnRBXIfQ+zuez4z5ySBK5RfomA+22Uu9VRO6rUf+8c 3WNUGN/6QXXs7Z/0qh6LIegImDe5Aj5GjXFq1gYPNNyofYdPNQwN+wJwYhduzyGif1AS DdTezemSWuwMHf4/jzOv2nhHfFY+0yF0N73KnWU7i0gBjhOugj+wKcj9U+BrHAYv+Yye crC5fo/yiswOamRs7QpGodg8uBJTC0tFrdFecPJxUcUw/hjGi9/1T4NCifYWQ4UodMAg JgwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QzckYb4cXf5KLXCedRdDW1q5VxWS7ePWBJwALpVtN8I=; b=aGkVxY1OejMKnonwm84G5wB0lCmgtOgM7oUGoypuYSJlbkm+Y5SljGbRilrravFJcj gNpAkl64nkHjyud4SXy2Qil2/4NcT5x9Y+IdP+FsG7ApGKgZAeUj9ZVhDssD/JP1MNVW unsO6jPN5Hvx/DQ0wU+l+SIWlwpPWrY3Jh4SgcNSn1wZLu8IhRkI8AKZ3LmFIvpUKCVb a55esvP1CLshuvywM2n0qR6Pv9vGWhu3jl2ylV+7bw/4m0ZFVlBz6w+Gwb5szYsjqTUT NjotUp7JDu+gNGoE5Vqtcp63udyA9lsRhiNZ4+85lMaH7Q7VmmZaJ2B++Pwxm+t+jnxw qPfQ== X-Gm-Message-State: AOAM531R/YoWP5KKFUEgBPiBFdb62HzaiRooFwsHyKXmbm8BlB9htjIb p/59JPAYWDsYSrIl/t/KiQnOQJxzGGE= X-Received: by 2002:aa7:83d8:0:b0:3ef:990f:5525 with SMTP id j24-20020aa783d8000000b003ef990f5525mr4475307pfn.29.1631789663670; Thu, 16 Sep 2021 03:54:23 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id h4sm2959020pgn.6.2021.09.16.03.54.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Sep 2021 03:54:23 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Sep 2021 18:54:14 +0800 Message-Id: <1631789657-16936-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1631789657-16936-1-git-send-email-lance.lmwang@gmail.com> References: <1631789657-16936-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/libsvtav1: make intra_refresh_type configurable 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qsABnUxstC4l From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/libsvtav1.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index 82ae2b9..8c2c970 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -210,7 +210,8 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, param->min_qp_allowed = avctx->qmin; } - param->intra_refresh_type = 2; /* Real keyframes only */ + /* 2 = IDR, closed GOP, 1 = CRA, open GOP */ + param->intra_refresh_type = avctx->flags & AV_CODEC_FLAG_CLOSED_GOP ? 2 : 1; if (svt_enc->la_depth >= 0) param->look_ahead_distance = svt_enc->la_depth; @@ -548,6 +549,7 @@ static const AVCodecDefault eb_enc_defaults[] = { { "g", "-1" }, { "qmin", "0" }, { "qmax", "63" }, + { "flags", "+cgop" }, { NULL }, }; From patchwork Thu Sep 16 10:54:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 30271 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1131485iov; Thu, 16 Sep 2021 03:54:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwYadRPzbohF4kZH4ogCCMyC73lGGEieyzW8N0TaL6wJOVHcSNUCbabQvFfZCvDrxTyPjI2 X-Received: by 2002:a17:906:cc0e:: with SMTP id ml14mr5346576ejb.395.1631789696554; Thu, 16 Sep 2021 03:54:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631789696; cv=none; d=google.com; s=arc-20160816; b=ldiPxqkC4pam7fe36v0+V+bvOs455rEwijr2CedtM9YWIE2nEqfo6dNfXHbSwXGrmo 8H57HKMf4bshEGNEUMpIbk6xaZriLZhSeCmjP6KA6p7oa361wtgll1ln3TXG0Zb2v/L1 VNpwlw6r0cfvh66mmJCZ+zGSKWYnwcCZ2ahUQOAaVZojQnJEbQBDC4jxDgLGoyD0Y1Dd N68kbDRUu+9LVI3N9u306F3ZdOUrBw1VuHuewIR1cKTTFm03xd+s45tuldL97+JrJ9D1 L/lMYbn4jNHmZ1JY/t91SRkHxlTFIGHtFLcq/z9DbiMvq58NWWy0V+SzJi2d/i7LbhXU 4xrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=2H8C6lzRwEKkFM5p4xpYwl1Q6cAnCDcTaisj6L9MJB8=; b=qfTED4syVRbMu3uHO2nIO69d9cvFXMdZFcMdOwswxE6eUrN9ThkZrVMP2PJd+t3YU0 hw+b2d5udMt8vIj3EFvJ9BM9CY4VANG7YIK3Q/+XXSgGRxxITD5cN4SLQ0n+z1ySGOTR QmBapuKDcwNqqd50aEUv8zNfkutHjIGwAo6y7XrRSIloEhj7/EGKd/t3aIAb4GTK8djN U7z5GcGHof0egX6ccDwPcBjh8GbEPzMcijgEBLAoR1wM/dThu3BM/Nm9yN9AE3OmvIiR Utwio9Xa6OBBpqaYVj5GQfXcRCmZjEFpCWqL3YYhxAYiWuplfRxWSfR2Ciw0bRweCxiV x+3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=SvzDn4ie; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w20si3083355ejv.231.2021.09.16.03.54.56; Thu, 16 Sep 2021 03:54:56 -0700 (PDT) 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=@gmail.com header.s=20210112 header.b=SvzDn4ie; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A754D68AE6B; Thu, 16 Sep 2021 13:54:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C38668AA1F for ; Thu, 16 Sep 2021 13:54:26 +0300 (EEST) Received: by mail-pg1-f172.google.com with SMTP id t1so5789614pgv.3 for ; Thu, 16 Sep 2021 03:54:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=W5H2RXJRc9oipyO2ZRIT5xr91aepmBMatM8GCvGQXKE=; b=SvzDn4ieluDWanJMjGUtU23dw0g6muRwzRAgjwYhSrONjwehUVqRxMy2GsqMXZzLXT maywyScnGa/2+QpDxqTeENgwnMWWxyRgTOJpPiIENpQst1Ol/q7XeNi9y0pWoWZ3TE+R Y/y1KtslDzL7GnXV7K3HEcY6NF7mLYSszWHoT5//EV4+AQfeL/WdD62u7iDCbu9VAX32 e8xTKY+O9SY2XtsU6DrEEWqftwPqN56pmJfOXuQEsJOetxMfXFDBE13EEgp/jOi7kloV GMKrAhwMQ/FkhT1/zEl669BkC6Ur3dkkX4XtBTHfiCrlJbdQN2cbnzmmGc/RViw1gJGv Vh3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=W5H2RXJRc9oipyO2ZRIT5xr91aepmBMatM8GCvGQXKE=; b=7FL/RJANYT9Z84iSTkNgBVaG1DrWcgCN1yt4kC3WXGuQLLq8LuGLS6KDov16SpVUga 7N9CMykUXrtaXgojz3VZOAjwMgxHXwtu6qKE552JAllc2Gg3Rv9Fu2sKP1Io6XALblwM 9BWjuaUIbLH0Q19w5zvGN/xq7UADBmwDQvyY/gmKbSd3e7HzbvH/fr6M006Xi9Kk31gn FZeJY9pAEJDPTDCL6DDhmumV3vsQYKv+bgkdWm8qX2Btrlo5g5xQIh0ahBRqx8HijajH MfEbbUQ6hQZog03d15gdC0pGU1o/BKGcEM2LAIyX2Etn1cfzHqXID+TnmE4XAc0od3jJ h3dQ== X-Gm-Message-State: AOAM533xgZXYSrxaJXfseYsmq69k1cdwuLyPyjae4fFYKwZm4Y3L1bTM BjVja4iB+sbAt3bmsaoJbcJkxsUlipc= X-Received: by 2002:a63:a55a:: with SMTP id r26mr4338930pgu.13.1631789664880; Thu, 16 Sep 2021 03:54:24 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id h4sm2959020pgn.6.2021.09.16.03.54.23 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Sep 2021 03:54:24 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Sep 2021 18:54:15 +0800 Message-Id: <1631789657-16936-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1631789657-16936-1-git-send-email-lance.lmwang@gmail.com> References: <1631789657-16936-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/5] doc: update for libsvtav1 encoder 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 88pWv7qVHvsi From: Limin Wang Signed-off-by: Limin Wang --- doc/encoders.texi | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/doc/encoders.texi b/doc/encoders.texi index 8fccd73..64d604e 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -1750,12 +1750,56 @@ You need to explicitly configure the build with @code{--enable-libsvtav1}. @table @option @item profile Set the encoding profile. +@table @samp +@item main +@item high +@item professional +@end table @item level Set the operating point level. +@table @samp +@item 2.0 +@item 2.1 +@item 2.2 +@item 2.3 +@item 3.0 +@item 3.1 +@item 3.2 +@item 3.3 +@item 4.0 +@item 4.1 +@item 4.2 +@item 4.3 +@item 5.0 +@item 5.1 +@item 5.2 +@item 5.3 +@item 6.0 +@item 6.1 +@item 6.2 +@item 6.3 +@item 7.0 +@item 7.1 +@item 7.2 +@item 7.3 +@end table + +@item hielevel +Set the Hierarchical prediction levels. +@table @samp +@item 3level +@item 4level, This is the default. +@end table @item tier Set the operating point tier. +@table @samp +@item main +The main tier was designed for most applications. This is the default. +@item high +The high tier was designed for very demanding applications. +@end table @item rc Set the rate control mode to use. From patchwork Thu Sep 16 10:54:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 30275 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1131629iov; Thu, 16 Sep 2021 03:55:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzPFk0dCqiCFmpxDuH3XgDC7e/yRr85WQuo4qU1qvIIJNFqYVTPwYakG+lRjSTBymN9QS9d X-Received: by 2002:a17:906:a24d:: with SMTP id bi13mr5576016ejb.481.1631789716083; Thu, 16 Sep 2021 03:55:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631789716; cv=none; d=google.com; s=arc-20160816; b=VD3e+yeRKKQMb5Wf0Bv9TU9KYZY8twEB65dzuxDXornB2lIhfvhdRuEt6g9oM0rzAf cDQYWmnI6yXoyeD8dCEeM6/gDycEHp7apVUDlYiiEI1zm1+efGpscJaVjjXOtLBIF23T xpLtKb6rYHf8WrrvM3jd0p/C4CK9tHQtp1Ff0sIAWyCfJ7Hx7ZC9X8vvqsLjeoG1HyxW YepBzgSEREG/yxhA5+u+1r+kip/ewpdeDSwbEOX2Bt0Epr0e8Hyd9X3UUFAph547NpMv 2KlRwx4LjfrOgnZl29K1r3rJqCz1Kmy8GA1/qWh7hlRVFv/EE+57fWkqAbCGoF62Tnzm zYWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=3YuMCGWHNzay9ecyPm9YsiSfhtOUWfFW91mM16lX+F4=; b=E66L7z4bulLAjVQ+xH6fqpbA9tx2mNxOKdXwa7fdEMfesc3F4epfqp9su/wILZJK74 zOLIecar4WXTAbSG9V+QlFecQUHSd4cCqn/VHoXwOMRKDpFj8b3QMVxWQohL/cByUQi3 ti8Q3aFD8MeSrmAHo2N9zr6KXCXySzhDo4tbyS7uGR5iklfpcjvvF8OIcooLC0sAzwL0 R0et1QWBcU09RsGFo7e4e6tBgtypeurWDM7yuSpM0rSJLsnkzgXPq4v76Cil9QAbSIio n52bYT8p2f6/+3aZ2t+fqCznhbJUmv4cdiMErNFS8mmZH2SAbscNEcvDgVBm/omAC1YY Q2kg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Me1b39w3; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o13si2955392eje.67.2021.09.16.03.55.07; Thu, 16 Sep 2021 03:55:16 -0700 (PDT) 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=@gmail.com header.s=20210112 header.b=Me1b39w3; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8A58268A8D3; Thu, 16 Sep 2021 13:54:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A926E68AC45 for ; Thu, 16 Sep 2021 13:54:27 +0300 (EEST) Received: by mail-pg1-f172.google.com with SMTP id n18so5739545pgm.12 for ; Thu, 16 Sep 2021 03:54:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=A1VMRbqyr3mS7mmboEEERSDRnW9otOZP6BfmmWkw6l0=; b=Me1b39w3yBcBoI4Wv5cEACFWO0HsHvYYdChFq490HDge1sKuJ9tcOxurhNjxeeIiw0 T7vRzJA1kpmK9aMDQDOC8tXg7yOgAqmVMoTDf2e5wfi6TR73PXWnChykk/hucjblkvP+ w3bVd5XJ9sxViFxZN6Moid7g79BlT/zj2iGMsIYjyD8N3v0PS3XAYzZj2MMOE8otY20D G+KDJjRr/nf4qc0q4HZaWT4OXscHzppVpNJxAheM+R0I6M1o/046dAr11VI/lYXdb9ux oUff9nYvQ/pHwPbthsK0OF0mQ0kqbdneQkKaqJiHD3GDYsBNJuRuh9YDZnHz0/EaAf5U 8Dlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=A1VMRbqyr3mS7mmboEEERSDRnW9otOZP6BfmmWkw6l0=; b=YjOa8+QUepSSaXwSQaswIPVDAei/arfvbxeST6JXC9QyQcEdbxDHbQhl3lA5Tpiusa P/gbWYA/G3rnmIaH9GYzY4oCZgtItnZmVLoN2mylnH/7moTu1+/FQG56Tn1pgiwYdaqD mBS2noF5NURum4B2WJ/s9KOXi6Q1jcMFAMYwfHtJAVj654ez4H72ScXexPmBgIVmCuja LADUo5NMKbKSrLlIx2Om5+5wIMZZKqwHUBjZ/hJ3s/FGBOaPKOtJMZsS4AJFmKv9qMB0 IBc3KgLQA9SHZgOiNHYhz6oVjqAfY/8hh4yMe1kdCeNjllUyvfrVLigG1oVOF7VPu4l+ T0LQ== X-Gm-Message-State: AOAM532EjN75nFLmiXrux6bPDsQJAmFfyFYeL3uT5cntLppk3wKEwzgo dWG760uVKyy/n0CUTOZGK0nQNT5Pkb4= X-Received: by 2002:a05:6a00:1347:b0:440:3a98:a9cd with SMTP id k7-20020a056a00134700b004403a98a9cdmr4644463pfu.58.1631789666030; Thu, 16 Sep 2021 03:54:26 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id h4sm2959020pgn.6.2021.09.16.03.54.25 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Sep 2021 03:54:25 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Sep 2021 18:54:16 +0800 Message-Id: <1631789657-16936-4-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1631789657-16936-1-git-send-email-lance.lmwang@gmail.com> References: <1631789657-16936-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/libsvtav1: Fix CQP mode doesn't work as expection 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qxnTh4P+w9ZT From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/libsvtav1.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index 8c2c970..1f1f86b 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -208,6 +208,8 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, if (param->rate_control_mode) { param->max_qp_allowed = avctx->qmax; param->min_qp_allowed = avctx->qmin; + } else { + param->enable_tpl_la = 0; /* CQP need turn off enable_tp_la */ } /* 2 = IDR, closed GOP, 1 = CRA, open GOP */ From patchwork Thu Sep 16 10:54:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 30273 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1131647iov; Thu, 16 Sep 2021 03:55:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMjlT+MgrW7WCRipRnB9OGa9NQwL8jGc4mWSganLR1nPMQrDC49D/8m47jMnutd2+JMnDk X-Received: by 2002:a17:907:d0c:: with SMTP id gn12mr5336923ejc.359.1631789718019; Thu, 16 Sep 2021 03:55:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631789718; cv=none; d=google.com; s=arc-20160816; b=SsdCdqywSHvAb2PbVp9mx+zuq8cTErqs97jfesUjazThh/ZEor1gSDuC2Zr75cJMBA HkIzpiorc4yHFwBgtMVXTaUzZ3TnJPRzDRIhlRHZpgacjWwyloQpRE8AHlcxIa6NzvZg +L2Z8d6KaR/UMWE75zgSugIRd5utyx0Uj+DI9C5nU21i18oEAvE/2pDcehw1WKouHoSW MNSWMrGQC9wIV6yQlHuO+CElcr1XZGCbMNv5YUY/X2JNXFnx15AXgZ1sjiHn5yxC2JNI socgNe6Er0Lnut5Vn0NQVWIDkRPih0a9xe0NfWbNaKlHU+3QWRk+wSdEShlNJmtkdor3 ULxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=bp8+y+a0ha/cy2KEeJNnLR6pRJgpsy59pxAJlpB8FoU=; b=kHYOetzx8kCVvEih8zU/Q3QJOr5QeoVu38yHqyBNbfUMrMtwt8G7rAxNbV2wrksw+m cGaX7vvGf8NgNYtHMg4SKnE3qZrU6CfXxzRBy5cx6cFqsoYjCLJEFGWPB0ArBNrpczs3 mmKfDY0idw67Y2zX7xxvwkvdHZmhr6SUvLVJAHoVpEjKkpf5gfbk983mXXysDl7EPtEY d4kWPqy3ESXB2JzUtURJgulmosg1sQ/Qr5lSnNxxbH0UYPcvDKOaHRN2fo1fWklL4q4r GzBNr9cXtNSk9PNScMjj4sKMevGACSbmX/Y4lpazcyzgmSFNpQNqRUKcot9KejUAqzAv yINA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=o5E3njT7; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id mq9si2957656ejc.683.2021.09.16.03.55.17; Thu, 16 Sep 2021 03:55:18 -0700 (PDT) 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=@gmail.com header.s=20210112 header.b=o5E3njT7; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8A5EB68AEAF; Thu, 16 Sep 2021 13:54:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1419D68ADC9 for ; Thu, 16 Sep 2021 13:54:29 +0300 (EEST) Received: by mail-pf1-f173.google.com with SMTP id m26so5560116pff.3 for ; Thu, 16 Sep 2021 03:54:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=H1oz592qfcSKT8i5MJz0ag4EHJgD8cjLgvDsfvLvW2w=; b=o5E3njT7qKNsauvvyHoQ1JTPaQpLsHQ1vjEper0oKremycq1zllEyjuYYgynXORbfZ JbssUI6ozmYMSssRg4mcBRbD75K6gDMYrAaIVZ4zSRcufs9Y6CglRuZE3ocGBMjK3lg3 zmI8GcE1ngm7VnlzFek75mzzGy1DE5OmiBtt2Bxc4/v8OS2/IfKirmZ8aBIsXIzujFfU 4wZY8iA7DBZNaVuWjNgOCLWl2zCMTJcskoKeDHvQHmon3P4WeCfFS4nLXNy4/y8sEbEx XCjNMbN575bw9YpoCJeW9B5VziYg26YN+FgRIxZtb9Vo8D9OSLXOUIOJOrlh7qLDGgQb tITA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=H1oz592qfcSKT8i5MJz0ag4EHJgD8cjLgvDsfvLvW2w=; b=5KzjbUJBDUuGbbrVICGaWyCOYuaLY6gG7y3N/BfKmVhsCw5qEPDETof9ReLDB98N06 EW3bWgAF8eIv54lWR8iriSaIxd+bNar3eKG+i3eg+rICj+6kUEET5xPBBQSylvvmrWBO I565Feb1a7KtjO32E73h3g1LXliPkBjIWPmH5fF+89pB8kSh7z1ObVP7RVtKJA0dI9lp /ORhz2xhSkC34xnx0cRKMkjixomBN84j6Z4O0fRJUujGCBBQMbEgCm5fXdKlMmZZ0Uqe Ebapts45GBD4+IJqBlAEXhQlKCAnpyGSmZ+P0ZyQozQyr+ZedPRvGRb3sP++8yHmVOxv yOWQ== X-Gm-Message-State: AOAM531uasbPKQGaqP536oX/mgRC9sx5H05UP3JTa6mFbbqg77UhDvqq Uv8wPOZaPg9uQyJ3lmhvyfvIAPN7exI= X-Received: by 2002:a63:79c7:: with SMTP id u190mr4437382pgc.378.1631789667273; Thu, 16 Sep 2021 03:54:27 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id h4sm2959020pgn.6.2021.09.16.03.54.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Sep 2021 03:54:27 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Sep 2021 18:54:17 +0800 Message-Id: <1631789657-16936-5-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1631789657-16936-1-git-send-email-lance.lmwang@gmail.com> References: <1631789657-16936-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/libsvtav1: support constant quality mode 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: cVALdFsIHaPJ From: Limin Wang Signed-off-by: Limin Wang --- doc/encoders.texi | 7 ++++++- libavcodec/libsvtav1.c | 10 +++++++++- libavcodec/version.h | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index 64d604e..2300bb9 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -1807,9 +1807,11 @@ Set the rate control mode to use. Possible modes: @table @option @item cqp -Constant quantizer: use fixed values of qindex (dependent on the frame type) +Constant quantizer(not set crf): use fixed values of qindex (dependent on the frame type) throughout the stream. This mode is the default. +Constant quality(set crf): maintain a constant QP throughout the stream. + @item vbr Variable bitrate: use a target bitrate for the whole stream. @@ -1826,6 +1828,9 @@ Set the minimum quantizer to use when using a bitrate mode. @item qp Set the quantizer used in cqp rate control mode (0-63). +@item crf +Select the quality for constant quality mode (0-63). + @item sc_detection Enable scene change detection. diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index 1f1f86b..29be4bd 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -66,6 +66,7 @@ typedef struct SvtContext { int rc_mode; int scd; int qp; + int crf; int tier; @@ -210,6 +211,10 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, param->min_qp_allowed = avctx->qmin; } else { param->enable_tpl_la = 0; /* CQP need turn off enable_tp_la */ + if ( svt_enc->crf > 0) { + param->qp = svt_enc->crf; + param->enable_tpl_la = 1; + } } /* 2 = IDR, closed GOP, 1 = CRA, open GOP */ @@ -523,13 +528,16 @@ static const AVOption options[] = { { "rc", "Bit rate control mode", OFFSET(rc_mode), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 3, VE , "rc"}, - { "cqp", "Constant quantizer", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, VE, "rc" }, + { "cqp", "Constant quantizer(not set crf), Constant quality(set crf)", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, VE, "rc" }, { "vbr", "Variable Bit Rate, use a target bitrate for the entire stream", 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, INT_MIN, INT_MAX, VE, "rc" }, { "cvbr", "Constrained Variable Bit Rate, use a target bitrate for each GOP", 0, AV_OPT_TYPE_CONST,{ .i64 = 2 }, INT_MIN, INT_MAX, VE, "rc" }, { "qp", "Quantizer to use with cqp rate control mode", OFFSET(qp), AV_OPT_TYPE_INT, { .i64 = 50 }, 0, 63, VE }, + { "crf", "Select the quality for constant quality mode", OFFSET(crf), + AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 63, VE }, + { "sc_detection", "Scene change detection", OFFSET(scd), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, diff --git a/libavcodec/version.h b/libavcodec/version.h index 4b4fe54..b0a741b 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 59 #define LIBAVCODEC_VERSION_MINOR 7 -#define LIBAVCODEC_VERSION_MICRO 103 +#define LIBAVCODEC_VERSION_MICRO 104 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ From patchwork Sat Sep 18 01:26:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 30318 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2721099iov; Fri, 17 Sep 2021 18:27:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxvQZd2Ch712PdlYy1fkqZFnqDgYQNIuBGNXmf7bWqVLTv0j1iCQwf+Vm+2251wbbzeSqeq X-Received: by 2002:a05:6402:5250:: with SMTP id t16mr16124236edd.227.1631928475375; Fri, 17 Sep 2021 18:27:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631928475; cv=none; d=google.com; s=arc-20160816; b=mmgDdJfnjEr0aZ3OtE1x/JNc+KOJtXw0vZWa/dCvHoOI1crIzSVDv1KUUW3vy03rda HEC/TQeorRfPm22Qh51HaiMdv/ihJsfFezWpgEuy3jfyWx2XXkRiaA/MEYMJN6VXQ255 Y25GeBfGrJsPBdIcKUsV9cFfkCJvG6vRk63HENqIF/nup2aMQfD/dRyfiSZm8d4I5Vjo +0S1ZS9z45mq8Wty4Z8IgR0ISNagSJtKXIv4TE16WStbH3XeV0f4rjh/KQEhNELf+DOi NlgC4zzvECpV99qO26+KKFvLdcDSM2YB1L/kBrCZWKkBMrjC8KTshbEyBZtFGzRTPEkj HGOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=BDhICnG4sscoEwK+p/bATPKe3qp12z0aM5pjGTYTI4M=; b=iECUeJpWQ19jkNhaEmoi91NfPgi0GE2FN9WV0P1c7xYnqmFnAz8c2rnElQr/pAvvf4 n3szg0wyqjEq5jA11QooiPWr33rgqeEosFfMCi5oBYehQfq7ppV1LMkIFF2aEEvpEUq9 /b6ZK7/Scy7ytZPiquyaNS1bk+dChmu6hSAnsw5m9IkhGYBBuOkE6ZVnM/9i7gW0LmlL cWCFDBFCv5hENikgIQQOuHhSiehQnPYepcaHeoi0T7PbNLdFPzk+uUw76KGTQGFroJpL R7HGs8GJPQSpEf8T4EC+Dwbo4r5wmGZEF8pxOq9gU48nqpE4b1IhC9rj2nGFA3fr5NaW pLig== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ciGTbo0c; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z26si8961975ejc.486.2021.09.17.18.27.55; Fri, 17 Sep 2021 18:27:55 -0700 (PDT) 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=@gmail.com header.s=20210112 header.b=ciGTbo0c; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D766F68AEED; Sat, 18 Sep 2021 04:27:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C2A7268B035 for ; Sat, 18 Sep 2021 04:26:57 +0300 (EEST) Received: by mail-pj1-f53.google.com with SMTP id p12-20020a17090adf8c00b0019c959bc795so3019075pjv.1 for ; Fri, 17 Sep 2021 18:26:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=m6Mrfl5U1TIbGUFYvH8vAvIEG96HOf2PYwkiGPha7aQ=; b=ciGTbo0cwz62UIVZAuBsQymhtJ1THirzMrMnusKQkHL2KMdqhp7OJqQYJ7C7Z38wPZ kOfbiJpCUcgMT6giD+9ikhvVPMXKcxqvJXJ7Vw085rro9IKQjXbtaDt8LXK9ZasSu4rx HpE/lOMCy83RjNczNbve91CRBAw5FKvDyV5fG4D8aJr72CQ107Ohfp9l3sYtBkULhG4p Z2k9qHaQBqMVmdeIoNaLWe3PkFposC10jDGCG3CDnxFI8ENmogAF4Tjy96UlB72rrr83 +svObvDCwR1piUKt3URAImj4EFO/3ndyr59az6dNx9SUThokdr/8W/5cTGb1lXkXUXxV Qj3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=m6Mrfl5U1TIbGUFYvH8vAvIEG96HOf2PYwkiGPha7aQ=; b=MUlg/wEBYA8iZ9cty9rNolLmFrwa1aUpCB6Xqg5RuPV7VUlYMKTGwz8+/cfR2arZrQ YvgX4hSVYEGEOiKpvEM4qDIXatvpG/XXBDseW2V01jHBcthNnXeUZqqXepFR56r8QE1D lbqhM/aubnTWRn1CpxIGeIoXyR2BvqJIY2TYmWzlbu1jbgIKK0huHKnsT6Z8EX5g2IIC riPl/PiEFhkTV1EoXk+rrbnuSs3vJy6sclMUuCmpv9C3j0/vxpJ4kTUBeUBzfRc1OfzB 5kTPX4BWDTK+kpJm+pNxiskb1ZoeUHLNQSMZiquDh6M5fxk8LQvwIjPc7x8EDhzaIk+/ LqIQ== X-Gm-Message-State: AOAM532TyCtVDttRM/+5PeaddbssJVIEbQwE/S9KefGUzUkczy1DQE5k qXv7RfFExnaIiRvAiapo84L9k1FWsFQ= X-Received: by 2002:a17:90b:a42:: with SMTP id gw2mr15501042pjb.26.1631928415999; Fri, 17 Sep 2021 18:26:55 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id cp17sm6576815pjb.3.2021.09.17.18.26.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Sep 2021 18:26:55 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Sep 2021 09:26:45 +0800 Message-Id: <1631928405-26935-6-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1631928405-26935-1-git-send-email-lance.lmwang@gmail.com> References: <1631789657-16936-1-git-send-email-lance.lmwang@gmail.com> <1631928405-26935-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 6/6] avcodec/libsvtav1: support constant quality mode 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: YZ7ALcR4rw5T From: Limin Wang Signed-off-by: Limin Wang --- doc/encoders.texi | 10 ++++++++-- libavcodec/libsvtav1.c | 10 +++++++++- libavcodec/version.h | 2 +- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index 64d604e..e7f61ff 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -1807,8 +1807,11 @@ Set the rate control mode to use. Possible modes: @table @option @item cqp -Constant quantizer: use fixed values of qindex (dependent on the frame type) -throughout the stream. This mode is the default. +Constant quantizer(crf: -1): use fixed values of qindex (dependent on the frame type) +throughout the stream. + +Constant quality(crf > 0): maintain a constant QP throughout the stream. This mode is +the default. @item vbr Variable bitrate: use a target bitrate for the whole stream. @@ -1826,6 +1829,9 @@ Set the minimum quantizer to use when using a bitrate mode. @item qp Set the quantizer used in cqp rate control mode (0-63). +@item crf +Select the quality for constant quality mode (0-63). + @item sc_detection Enable scene change detection. diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index 509d92d..f982bb6 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -66,6 +66,7 @@ typedef struct SvtContext { int rc_mode; int scd; int qp; + int crf; int tier; @@ -210,6 +211,10 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, param->min_qp_allowed = avctx->qmin; } else { param->enable_tpl_la = 0; /* CQP need turn off enable_tp_la */ + if ( svt_enc->crf > 0) { + param->qp = svt_enc->crf; + param->enable_tpl_la = 1; + } } /* 2 = IDR, closed GOP, 1 = CRA, open GOP */ @@ -523,13 +528,16 @@ static const AVOption options[] = { { "rc", "Bit rate control mode", OFFSET(rc_mode), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 2, VE , "rc"}, - { "cqp", "Constant quantizer", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, VE, "rc" }, + { "cqp", "Constant quantizer(crf: -1), Constant quality(crf > 0)", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, VE, "rc" }, { "vbr", "Variable Bit Rate, use a target bitrate for the entire stream", 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, INT_MIN, INT_MAX, VE, "rc" }, { "cvbr", "Constrained Variable Bit Rate, use a target bitrate for each GOP", 0, AV_OPT_TYPE_CONST,{ .i64 = 2 }, INT_MIN, INT_MAX, VE, "rc" }, { "qp", "Quantizer to use with cqp rate control mode", OFFSET(qp), AV_OPT_TYPE_INT, { .i64 = 50 }, 0, 63, VE }, + { "crf", "Select the quality for constant quality mode, set to -1 for cqp rate control mode", OFFSET(crf), + AV_OPT_TYPE_INT, { .i64 = 50 }, -1, 63, VE }, + { "sc_detection", "Scene change detection", OFFSET(scd), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, diff --git a/libavcodec/version.h b/libavcodec/version.h index 4b4fe54..b0a741b 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 59 #define LIBAVCODEC_VERSION_MINOR 7 -#define LIBAVCODEC_VERSION_MICRO 103 +#define LIBAVCODEC_VERSION_MICRO 104 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \