From patchwork Sun Oct 8 15:49:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 5461 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp1711114jah; Sun, 8 Oct 2017 08:50:09 -0700 (PDT) X-Received: by 10.28.150.195 with SMTP id y186mr6545808wmd.52.1507477809154; Sun, 08 Oct 2017 08:50:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507477809; cv=none; d=google.com; s=arc-20160816; b=uAkVvUEP5Mg7foRKpdO93AalD9z3S+QQh9HJX8+JLRl0+ocfwIZmGg1zOu3frzt23B bFtYS9tVIIAfyIU2duflUEpTbg754dP6utdpakMF31RgB9+33v1s6MKUX5M2l4KOuzMp nzF54XiJE+Lu28uLfeZxM5ISi05JkXd/9bVyG3NSm7msvWyoXdAryVuWm8K6UdK/vL/J BbgOjbVAvD9f9E9PSDLdAd+MAQRFTKebpKpzlOAxFXEw72sefd3+skNjEQv0zQZ2heq/ TpWDBZY3eM+A6yl8tRFBR9vvRusTLyv4QpZzmr6BYT+eVhMEVz1IKZdGq52269it3Ent LS8Q== 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:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:to:dkim-signature :delivered-to:arc-authentication-results; bh=pOZQHJIaGpYKI2Fj59pXiVrspX2X5MaQ6YhuLjpW4t0=; b=JS5Qq2fHJr4PtQMU8aC6/BfHS4NnbR1Bn2lvfQhfNosAHrtJ1ZS7I7KgSoGpI8oHHL Obbed/DJB+IHSaAfr1AenMl8SAFhvXgmRo3lOB+gJD0xsvqqjWJV53U2zAbuuPYqdGiH fQw3JHpCUVMHjCdf2FeaPR0VwXe9mIbdakWixdbOvbIIBMMIhRCl35b9BEKFD7F411vq 79Nad97X9oDFP8rUu57EcBW1CjEI59c9ZzFLe8AJcetIu6PTIcI43OybCcDOhfssQBI7 ntllibW440QBjqWBgORAC5Ao6uvzu8X+yHCnzQMBufS1jiF/z/xXDAOt+u2+cJ2pPQ76 gnuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=OXZohWmQ; 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 n26si5571969wra.549.2017.10.08.08.50.08; Sun, 08 Oct 2017 08:50:09 -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=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=OXZohWmQ; 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 DD436689E5C; Sun, 8 Oct 2017 18:50:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com [74.125.82.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F0B0689CF6 for ; Sun, 8 Oct 2017 18:49:59 +0300 (EEST) Received: by mail-wm0-f44.google.com with SMTP id f4so17645024wme.0 for ; Sun, 08 Oct 2017 08:50:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-language:content-transfer-encoding; bh=x247tfqZmtTiwBs7ztKv4qphO5zzj77vvNwmEKwXMUs=; b=OXZohWmQapJCTwCitfdkoE79T7VLQqNI8FwgxHJEq8y78CxTfAey7UlnlkhPQ3WJRQ Is7JMJH+zsAaVwtEzaf7q+ECnJb8whRp+WwZK5gDNOiEpkB6m4u6aWqpxd1oGm8Z6xH9 Mf7W6IKKqV3lLQVUfqGZiAx+z9jubp8/Ri0NwQQ2f26/P8xqLIpmMnfX6ZSafndwnJ0Y 99DUtt+i+LP19QtPiW5OHBoHdErCvxrkQsGFfwGoyTccuI2XIlHkgmKBW+zG69mZhRn1 TwnXa+kUFHB9E7UfYBeRYVpZZKDQvdaugOUzhDsCNXp7iYj+4yRlbTjdEJnYRA6N0C59 OaKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=x247tfqZmtTiwBs7ztKv4qphO5zzj77vvNwmEKwXMUs=; b=UexMExXmHD4ogaHyzoaWKaaslecVBSyBRb0KvgPUy0u00WTJSUG3q11Ju5KWwwf9l+ /pRAu97TsjrU/m5ktBdutw4nwRok0WE0VKnbS1DPTj9Aa1lFuGFD1QoJFbfhZamjmi7K 7B9d/fJmkak7D/N+shqRp1Qagks9doTgn+FbfKTVnQJxbyRzRDzshSsRBLXh2yCarnJm cj2AKxqd1Hd6LrvRGnudndMa5IYWL7mvqpiGQGNA8kwoaC4r/b8W5+50p4iYTwdp0Rqx QnZSn7NKav/f489byZgUDoksngTnN0/BsBBhN11dCGW7QiuA7rFwm60y8wAIBV3taG4f wkuQ== X-Gm-Message-State: AMCzsaXwO5Qd5kO7cut3HFCCaAYOQ4uXJhq6/3KRbHZgXXWs8tsCt3A8 Ix/v/sny4ZVzIz2kK4UivmNsun5J X-Google-Smtp-Source: AOwi7QD00MTdUXkIRr36rod/GSTntUbcxD1BZTHOlNux4QasPd6Kh7Kl6awk0/xCN8pv5wcRxIdUFg== X-Received: by 10.28.54.154 with SMTP id y26mr6951878wmh.15.1507477800082; Sun, 08 Oct 2017 08:50:00 -0700 (PDT) Received: from [192.168.0.9] (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id 188sm3498443wmg.45.2017.10.08.08.49.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Oct 2017 08:49:59 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org References: <20171008151146.13505-1-sw@jkqxz.net> <20171008151146.13505-2-sw@jkqxz.net> <9c7ae9ae-88fb-3802-5f9d-065190a831a3@gmail.com> From: Mark Thompson Message-ID: <9e58eb38-02a5-f1d9-1fb4-a25315ddf362@jkqxz.net> Date: Sun, 8 Oct 2017 16:49:58 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <9c7ae9ae-88fb-3802-5f9d-065190a831a3@gmail.com> Content-Language: en-US Subject: [FFmpeg-devel] [PATCH 2/6] vaapi: Remove H.264 baseline profile 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" This has been deprecated in libva2 because hardware does not and will not support it. Therefore never consider it for decode, and for encode assume the user meant constrained baseline profile instead. --- On 08/10/17 16:44, Derek Buitenhuis wrote: > On 10/8/2017 4:11 PM, Mark Thompson wrote: >> + case FF_PROFILE_H264_BASELINE: >> + // Baseline profile is not supported, assume the user meant >> + // constrained baseline instead. >> + avctx->profile = FF_PROFILE_H264_CONSTRAINED_BASELINE; > > Trying to automatically (and silently!) guess what the user wanted > is never a good idea, IMO. At the very least, print a warning. Yeah, ok, I agree. Patch changed as enclosing. libavcodec/vaapi_decode.c | 1 - libavcodec/vaapi_encode_h264.c | 12 ++++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index cf58aae4c6..4f0ff84e01 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -246,7 +246,6 @@ static const struct { MAP(MPEG4, MPEG4_MAIN, MPEG4Main ), MAP(H264, H264_CONSTRAINED_BASELINE, H264ConstrainedBaseline), - MAP(H264, H264_BASELINE, H264Baseline), MAP(H264, H264_MAIN, H264Main ), MAP(H264, H264_HIGH, H264High ), #if VA_CHECK_VERSION(0, 37, 0) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 549867ef3f..efde80b08e 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -1175,6 +1175,10 @@ static av_cold int vaapi_encode_h264_init(AVCodecContext *avctx) ctx->codec = &vaapi_encode_type_h264; switch (avctx->profile) { + case FF_PROFILE_H264_BASELINE: + av_log(avctx, AV_LOG_WARNING, "H.264 baseline profile is not " + "supported, using constrained baseline profile instead.\n"); + avctx->profile = FF_PROFILE_H264_CONSTRAINED_BASELINE; case FF_PROFILE_H264_CONSTRAINED_BASELINE: ctx->va_profile = VAProfileH264ConstrainedBaseline; if (avctx->max_b_frames != 0) { @@ -1183,14 +1187,6 @@ static av_cold int vaapi_encode_h264_init(AVCodecContext *avctx) "doesn't support encoding with B frames, disabling them.\n"); } break; - case FF_PROFILE_H264_BASELINE: - ctx->va_profile = VAProfileH264Baseline; - if (avctx->max_b_frames != 0) { - avctx->max_b_frames = 0; - av_log(avctx, AV_LOG_WARNING, "H.264 baseline profile " - "doesn't support encoding with B frames, disabling them.\n"); - } - break; case FF_PROFILE_H264_MAIN: ctx->va_profile = VAProfileH264Main; break;