From patchwork Wed May 27 01:32:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 19886 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id AF49544B435 for ; Wed, 27 May 2020 04:40:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 88CFC68A494; Wed, 27 May 2020 04:40:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A067F6898BD for ; Wed, 27 May 2020 04:40:45 +0300 (EEST) Received: by mail-qk1-f194.google.com with SMTP id v79so12838913qkb.10 for ; Tue, 26 May 2020 18:40:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=SVPmeFQaYZm78ELFVPteZSUDurxp17IBn+l00D9cbfs=; b=iDvXYepRtD2nHYZfct+M3m6lM3mmZxf07mTDtmmT+fsVj40oEtvWIsGLb6DKC4nYuE V2ujzvbhwxYVDtm2eV35Iqqsb1KPffIMR4clZz7+Iu1DB46rtubCswm2hCzuuuHal4H2 DJWH4S9ZZ5iASfPBTE+MHlkO0dfjznvKdsAhnrpsh3IigYUFqIGdc9DbuTNbsQpFj+LH UmPM68RxqR7389kWKZI03IoYaJ6oAVJWT/SIS9MLW3/LXpBdJbB9bf4gv5YVLJTqieO0 4vdQ9aDCpqbKYYqtcbstS+PtO1YEGC+HNTSZi1OXf+cp97ftWWdK+oWsZKsXKghEKZ+i WtTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=SVPmeFQaYZm78ELFVPteZSUDurxp17IBn+l00D9cbfs=; b=BYAJl9cHFQaWhC4n3zNy5JoHvF85nmNMLjTe84ErxfbS4W1n97KJFel4OOdj+LojeU DuJ6YLG2OD0QNaGoRgsOhp96tb+CJS0xNjwzjts7+O49KOav7Nheu81gUw6nlHQMsaBD PDMZS/ZrM/FDAPH5WzVbVTKjwaWwq+O626BADvaZl+aN1u+TpRL9rnp33he0LVGLBvTd huyk/BR8Jkn9Ph7en5Y/A0DDm6iGf6ZGC1AfcmFtHj7YidNPl5D+tarHKKQbfIhi1fsQ irGNLsM5TJZ/qSIs19COIEeKIL7wQcFdwqHzVkqBONG7TuNCiIggQCfcmFI9YHMjVcjZ Knmg== X-Gm-Message-State: AOAM53350dW1dYsMNqfYJLW5j92aXh4QXvA+8XMayK+4tUHzHzJlvGDS +fSZOBrGMYNaJWR9bY9E5+hShzS2 X-Google-Smtp-Source: ABdhPJx3rPh+nCUflw1uCWjfdcGNGMiAtQxxl8XIYqu79tqj5dXF+Vfm9HhSraIloxbsZQ6qHnplNQ== X-Received: by 2002:a05:620a:1388:: with SMTP id k8mr1788258qki.216.1590543154101; Tue, 26 May 2020 18:32:34 -0700 (PDT) Received: from localhost.localdomain ([181.23.76.18]) by smtp.gmail.com with ESMTPSA id r18sm1192443qtn.1.2020.05.26.18.32.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 18:32:33 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 26 May 2020 22:32:18 -0300 Message-Id: <20200527013218.14540-1-jamrial@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libaomenc: remove the experimental flag when using libaom 2.0.0 or newer 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" Signed-off-by: James Almer --- Alternatively, we could remove support for libaom 1.0.0, since it's pretty much unusable. But unfortunately both current Debian Stable and latest Ubuntu LTS ship it, so i'm not sure if it would be wise. Any opinions? libavcodec/libaomenc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index fc1ea96659..d26083a426 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -1055,6 +1055,9 @@ static av_cold void av1_init_static(AVCodec *codec) codec->pix_fmts = av1_pix_fmts_highbd; else codec->pix_fmts = av1_pix_fmts; + + if (aom_codec_version_major() < 2) + codec->capabilities |= AV_CODEC_CAP_EXPERIMENTAL; } static av_cold int av1_init(AVCodecContext *avctx) @@ -1131,7 +1134,7 @@ AVCodec ff_libaom_av1_encoder = { .init = av1_init, .encode2 = aom_encode, .close = aom_free, - .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AUTO_THREADS | AV_CODEC_CAP_EXPERIMENTAL, + .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AUTO_THREADS, .profiles = NULL_IF_CONFIG_SMALL(ff_av1_profiles), .priv_class = &class_aom, .defaults = defaults,