From patchwork Sat Mar 20 17:51:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 26503 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 4CC5144B406 for ; Sat, 20 Mar 2021 19:58:48 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 23F2768A7B6; Sat, 20 Mar 2021 19:58:48 +0200 (EET) 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 1770868A77A for ; Sat, 20 Mar 2021 19:58:42 +0200 (EET) Received: by mail-pf1-f173.google.com with SMTP id l123so8142707pfl.8 for ; Sat, 20 Mar 2021 10:58:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=hz8+EufAzYSpnVAVcd2DoWjXjGjCEhHWtI/YSdw828E=; b=t6/pIDumvd54BnNIYee+b/PaSKLGljfWfMaRS3Dl1bH/wxKOCJjKvQe3BY2xeh2Bq4 lEH1PMiFrHm5I+p3GCj9GWvY/bRYJ4EoYBHchqBIxP/ZcEDGMaO9OEK4GiGksP7+rZCB JiFBmNLfYqVy60Jm3+EV0Lh4Ycfi7FC1BNFZgnmMsM39YbLSyclD2zCFaJFkDqbbi97f fx7zqhn+mcd2o9ql1VpwwOHZYMeDSJAP8drh822GkkwAKn3x5159U0sjHpG/4Yf/ugAe J6nTjYtLlKLl2oWuU+83E2H2Ew5OFwRez5rBl8kmUz/SNH9IbKwYctKyonst8eJ3r4Jz SvtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=hz8+EufAzYSpnVAVcd2DoWjXjGjCEhHWtI/YSdw828E=; b=GOvbzZzU/+aGhvABaeDu15e7lWBH95pM40h8sxBQ8RFclFPq9C42B6q9m4MAqRa8ro kOvJIv4zgMv6EEKavp3QGHpAbmlNNU+/DyY8QT7Vi01lpfY4g63yC8T59ub0DE95jhbt AN+bStjUGQX8FHm+5wCqOXTTX+xTJVt1CoJ5Jqfqe2QsuatU5lj+FWCFNUaF0ZMWIaj4 PqEB5gud7+HeUfDFi8YyF3nhkOykduCDyiQZ7VOH06EZFpNGDhRB0f8maFcYOKPZD1l/ 6aDfL0DlL/Jc6mTPHgvN5V7yrfGdrzd1UAsHFYjJKXdCm+nUhPhuI+x2TDmStErTbPLC bIhQ== X-Gm-Message-State: AOAM532OCPNlL78bS3Z6bvhl97wfbViu3zdMsTs/znrtouIVcO9H/P16 jnClySyH3SKt2wpvXfcphy9lFDoDVy9Yik3z+3/u+nM2dTU= X-Google-Smtp-Source: ABdhPJzwS5DkZBUADm3dR4yfSYCfnti0dStqzN+k92rtDDgWL+cAnGKv3Gd18qYFvqGYUjUPXve2GoWaVoZ38NJHYJA= X-Received: by 2002:a62:1581:0:b029:202:7800:442 with SMTP id 123-20020a6215810000b029020278000442mr14645275pfv.3.1616262726063; Sat, 20 Mar 2021 10:52:06 -0700 (PDT) MIME-Version: 1.0 From: Carl Eugen Hoyos Date: Sat, 20 Mar 2021 18:51:55 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavc/aom: Force default qmax to 0 if crf was set to 0 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" Hi! Attached patch fixes lossless aom encoding in some cases for me, it is still possible to force lossy encoding with crf == 0 and qmax > 0. Please comment, Carl Eugen Subject: [PATCH] lavc/aom: Force default qmax to 0 if crf was set to 0. Fixes lossless encoding. --- libavcodec/libaomenc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 2c3c3eb185..a8f0420230 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -640,6 +640,8 @@ static av_cold int aom_init(AVCodecContext *avctx, if (!avctx->bit_rate) enccfg.rc_end_usage = AOM_Q; } + if (!ctx->crf && avctx->qmax == -1) + avctx->qmax = 0; if (avctx->bit_rate) { enccfg.rc_target_bitrate = av_rescale_rnd(avctx->bit_rate, 1, 1000,