From patchwork Sat Aug 14 02:11:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Zern X-Patchwork-Id: 29499 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp93365iov; Fri, 13 Aug 2021 19:11:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxJlrAB/3/hXgAuAnutwcIMPjMH4K8Pd7gOA8lio4227s5zEpSpngp2bIq6jDOAuyq1+rxJ X-Received: by 2002:a17:906:f20c:: with SMTP id gt12mr5382896ejb.90.1628907103805; Fri, 13 Aug 2021 19:11:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628907103; cv=none; d=google.com; s=arc-20160816; b=kYpW6GjaXtSfrKXbmAlRw5Wi65u+PMZ+E0nGSHs+GcH8a0JFssIe2Vr21RPHY+L9Vi rOXhxEdW1WInVVhTFX6VJGF7KWXQdRiUQEDV0eFhzeWTRkPXteKIy40VW/18VwC6eOUL R3MBHFC9QGCpoGotx4KwwLb7U+xSTv8BfLusx2hKgXQDmRN5CvupkGE5m5ZsVTqZwRnM rIy5hBQk9nxZBXWf5Z1VpzIgSifjtswF8t+mZ9OOO8Vy5REtbYyljoNhV8veIaVYB9KT edly/7CGWnyErbijNgOQHTsPSlmMKPesimqbz8ZJQ02PTUM+JFUHPLfckKDMHI5XzapO ohBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:to:from:mime-version:message-id:date :dkim-signature:delivered-to; bh=JGDL+Wl6Uo1efixMMjJYW8wq1i6vzf4SS7tS3CdWIbA=; b=Rp+K8aWg0vai5d+riOobqxKUyBUKnYTxnAJjXRpZSeRS/OA5VqbNlPH0wWJn8fqodg jlFgOzRBNNfPr0DfDuSMokNCsC0bCJJh+nR72hd+YHXSc8jtGW5WWZRC0E+KwFhDtdCY wMalu7UDoJ7CsahsTnJphzhC9hsUM0dAmjT7Yyu809miFoYUu9sI3SylmDATy13yyjFY zcwhZ3Ol1SHPwfK58LFlpKu01jXcEwkzJ8jaBY6F8rTALJudnwPVoolr78jpC2DcAOqw ZV6/CQqKfOST26Dca2pfmVPSTm2w10Dkt+fuh7CCjHkGhpsTGjGFB9de8cf44dFG0GlM Ym0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=qELlUjcs; 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 ne1si3124904ejc.4.2021.08.13.19.11.20; Fri, 13 Aug 2021 19:11:43 -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=@google.com header.s=20161025 header.b=qELlUjcs; 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 6CFC46899E0; Sat, 14 Aug 2021 05:11:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D1E968A16A for ; Sat, 14 Aug 2021 05:11:09 +0300 (EEST) Received: by mail-yb1-f202.google.com with SMTP id w200-20020a25c7d10000b02905585436b530so10920859ybe.21 for ; Fri, 13 Aug 2021 19:11:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to; bh=BVqoE7gayRAcxXOJ4kuGEtY9WiyzzMkaiuSdVV22I88=; b=qELlUjcs3tuH5f99R48iF/CXdu6sR3PP7bEG2dOJlitIHh+9OhtwmGoVPuz9EjEARL w/xgzQ+ATfKdhdvnOyX/pG4tWaYyRJSXqna+RNt0cVw50xVcerMOtLr9nAFnbQG7FAeH VqFs0BaB44Y52ljnN/AbTW0lnVCkyePRxuRK6XVgeBjRC11sKPYJiWrwcyCIMv3GDdfA n1aMcCa6CQ9CIOLSxlm6zYwEFtPCY0XcSWSdXOYf1ToLg3twwD1uXJX9+Un/yv7rwfj0 p0akNbDP8rjK5WUGq/Xdz8S85kV6+Jut3Bpr1uCpNmDA4QSGblqYjxPj+iq6pCvIYbMC WeXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to; bh=BVqoE7gayRAcxXOJ4kuGEtY9WiyzzMkaiuSdVV22I88=; b=aVwbvnAYFBwjgrigVJOX8OgUkmXEatdgswWEgFUF+39IUc1oOkDg87pBMyFxl5jtrT eM+jiJig6ot1j2LOUsIx5hCZsp0SpQJ8rUM3uFAtb7JHApRIacMu3GOxRX5YYL3ah9y0 vMGFUFtIDbK8uX8RHescAW3q98aD73WL7uJv9TrgcLc7sJnrjJnOjkL7NgCSs6qpujZd njtzL7xasMKXC6m/ni+TuLR0qcbkINVKC3emOh2DMaEKOkl+VrFTUHFNUzW6wFW5c+hS Gx33ioF/1DVHxB9Z9xh/b1eTvER4XVBs9Dr+d9VH/ASwn4Aieu7OE2qM6QXs843Kpjpk rxyg== X-Gm-Message-State: AOAM533mfzhKKhmvilrryokOCCXg3l/NRh1SpUfZOk77VCRcw0Gdztbz qF3ttkjJyiopWLRQBbxOpguKeU4pbItMhpx4gA53yc0cyat7YuzgVe+JCCAM/G1d3BMAycGukd0 0E/LgY70zzTPTiFcEODwt0lLMUk5xnKV8JP73CJsbszEFgJDfN3ArTXk3IV7V X-Received: from jzern.mtv.corp.google.com ([2620:0:1000:2511:a248:95ea:2bd:a907]) (user=jzern job=sendgmr) by 2002:a25:47c5:: with SMTP id u188mr6898646yba.456.1628907066703; Fri, 13 Aug 2021 19:11:06 -0700 (PDT) Date: Fri, 13 Aug 2021 19:11:04 -0700 Message-Id: <20210814021104.3439870-1-jzern@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.33.0.rc1.237.g0d66db33f3-goog From: James Zern To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] avcodec/libaomenc: use ctx->usage to get default cfg 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DeT0j/U+hmWO this prevents some mismatches in config values for realtime and all intra modes, avoiding failures like: [libaom-av1 @ ...] Failed to initialize encoder: Invalid parameter [libaom-av1 @ ...] Additional information: g_lag_in_frames out of range [..0] --- libavcodec/libaomenc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 9c0317f3b2..800fda0591 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -599,7 +599,7 @@ static av_cold int aom_init(AVCodecContext *avctx, av_log(avctx, AV_LOG_INFO, "%s\n", aom_codec_version_str()); av_log(avctx, AV_LOG_VERBOSE, "%s\n", aom_codec_build_config()); - if ((res = aom_codec_enc_config_default(iface, &enccfg, 0)) != AOM_CODEC_OK) { + if ((res = aom_codec_enc_config_default(iface, &enccfg, ctx->usage)) != AOM_CODEC_OK) { av_log(avctx, AV_LOG_ERROR, "Failed to get config: %s\n", aom_codec_err_to_string(res)); return AVERROR(EINVAL); @@ -623,8 +623,6 @@ static av_cold int aom_init(AVCodecContext *avctx, enccfg.g_threads = FFMIN(avctx->thread_count ? avctx->thread_count : av_cpu_count(), 64); - enccfg.g_usage = ctx->usage; - if (ctx->lag_in_frames >= 0) enccfg.g_lag_in_frames = ctx->lag_in_frames;