From patchwork Mon Dec 12 20:12:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Converse X-Patchwork-Id: 1765 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp1846052vsa; Mon, 12 Dec 2016 12:12:31 -0800 (PST) X-Received: by 10.195.30.165 with SMTP id kf5mr80458939wjd.41.1481573551233; Mon, 12 Dec 2016 12:12:31 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f19si46113200wjq.287.2016.12.12.12.12.30; Mon, 12 Dec 2016 12:12:31 -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; dkim=neutral (body hash did not verify) header.i=@gmail.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; dmarc=fail (p=NONE 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 6857B689EDF; Mon, 12 Dec 2016 22:12:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A4A65689DD8 for ; Mon, 12 Dec 2016 22:12:16 +0200 (EET) Received: by mail-pg0-f65.google.com with SMTP id e9so1964092pgc.1 for ; Mon, 12 Dec 2016 12:12:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=CyabwBfLQo0Ctrt7r0AMtMxfDbQ3UodZwPrAf8x8Vn8=; b=CEpvXtMjgx8znWToCISI0De1poAeOBtVVnU5WHa0CK0ewXFbNjGszT4/KM9odVxPtv LavKfVXr+MyhEiN/baqeg3fAKq2fsy6O3mGzG0L0SkE2mKKyr6i7A4cWAdPUneS/FpJU poLicYouENyf3zJug3JxJU7O/zrLbshiA+TB/Y+R4QRFeJEADWZGvMmCIA/OuKGeGb0+ ekvtsUz4i3H56zmUX045PRKqCIQ5ysOLvyGsFvrS/lUqBmoC3vU9f5Z5MiK/vncKp036 IVrRHVxABruNzCmrMm9UBcU6TMla1CLMZ3484XHgi8muFHdNmm/UTNlCJoulu/f7BrYl d2kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=CyabwBfLQo0Ctrt7r0AMtMxfDbQ3UodZwPrAf8x8Vn8=; b=MnZowG1BJiEzkxYlwOCU4Cb5eFFDmj2uA+TaKYxWihJUAE4A3IDCEWL6t+JZf/BOgd cIZdehSpqJIJop4fwCdoVv+MRXBXRrCRnZjogi4Vw/U/rPLJnzPMwvOmIZS0EOPy8kkV GR2AqXxTnFcyL7456qbdLLZI3z9bAvLgn0gKAxEza12kyH6KcCAT2DRCLKnnVBFlIiNz QveWtuIWKCEg4Dvc72cU/XrUpr86a9309xpcNkrlAFbEhv7joPaEmS1l0ZMC9hN8Xxxn 4nr53ML/XSKOfe7z4C0rIkLIhs2sJcPoioH1cFunZtPnrw4HHvKO4KHk5VyhEbA1YwcN mpuw== X-Gm-Message-State: AKaTC00kGNLI55wrnH94gsqqhH4wc3B5OOcZAJgHHxliHnQKTIRLYo8hcQOcRITxAkBisQ== X-Received: by 10.84.204.8 with SMTP id a8mr192358383ple.172.1481573540022; Mon, 12 Dec 2016 12:12:20 -0800 (PST) Received: from terok.mtv.corp.google.com ([172.22.116.121]) by smtp.gmail.com with ESMTPSA id j190sm77621237pgd.23.2016.12.12.12.12.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Dec 2016 12:12:19 -0800 (PST) From: Alex Converse To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Dec 2016 12:12:13 -0800 Message-Id: <1481573533-23361-1-git-send-email-alex.converse@gmail.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 Subject: [FFmpeg-devel] [PATCH] libvpxenc: Don't spam level errors for VP8 encodes 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 Cc: Alex Converse MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes "Failed to set VP9E_GET_LEVEL codec control: Codec does not implement requested capability" log messages on VP8 encodes. --- libavcodec/libvpxenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 1325199..de0d0b6 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -293,7 +293,8 @@ static av_cold int vpx_free(AVCodecContext *avctx) VPxContext *ctx = avctx->priv_data; #if VPX_ENCODER_ABI_VERSION >= 12 - if (ctx->level >= 0 && !(avctx->flags & AV_CODEC_FLAG_PASS1)) { + if (avctx->codec_id == AV_CODEC_ID_VP9 && ctx->level >= 0 && + !(avctx->flags & AV_CODEC_FLAG_PASS1)) { int level_out = 0; if (!codecctl_intp(avctx, VP9E_GET_LEVEL, &level_out)) av_log(avctx, AV_LOG_INFO, "Encoded level %.1f\n", level_out * 0.1);