From patchwork Sun Oct 8 15:11:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 5456 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp1687839jah; Sun, 8 Oct 2017 08:17:58 -0700 (PDT) X-Received: by 10.223.180.82 with SMTP id v18mr7866628wrd.61.1507475878185; Sun, 08 Oct 2017 08:17:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507475878; cv=none; d=google.com; s=arc-20160816; b=GZTrLLjG4bBH7it35w+dciHj777ezT4ClhManqTJpBBvISVfkE/OG1gNWTmkKt72g2 Nw4AidMw8VYXDvzjcwOn3UMTBWYgPxnIrNx+ZqO7rCdgNyDnRDoWHxBdkLgNVyQd0vwp k/0Qfnk5OKO82GAcE4WYeSfuK+txkAHoyysLPkjy3StsRFpJ6KPqiCecgBq4sL2m8fk/ Rh9HV5Vf/6q1gk9gcPKYXY5681zsSIGe98JyyB4f60Fv8CbJ4EdZPpi7QlxiaU2XkFJH aM0gJZ6WGnAa56Jr95LxPH2XqMnegoPs+kZcaX+4QaQxW9DJAcc1px6ZeSvLTbPQIPAn 02mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=AuEhZBvorUKOmCzu1Tr8j6FKXS0ji76a+LZFOdNYApI=; b=XNYSu+Gp+0h/SzQCZWDkxFOboYI8vTetNZ3Ay0u5JKUDNjHJ/mAp0MOqEUvjcCNNsM pAFEvYvdftIHaxrFwvYOZ1D2a36VRlT+QCV1Jb08YFhDKiPzhTaFSMvHSZf7RM7/y3jV bvMpdYCmbkSEYIGFlPPVp8xD7DtH2q4k1Q4m7ZwJWw9TBOMjcFs3qtH2UKWUqLZjAllI +PpbAzaMqXN8d5Y/qk7HrVTUoVok5VaygrxIlOdAFPGdfYP6os6dqwtufchzzN2KD2bL IwR32D6pQJUEke2gqC98SA27o4vMO8kX97ibZ0gd8QdyanYehgrE0IwY2K7iTGoXAH4N UGrw== 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=Z74cEVxI; 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 x4si5480091wre.340.2017.10.08.08.17.57; Sun, 08 Oct 2017 08:17:58 -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=Z74cEVxI; 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 ABBA4689DE7; Sun, 8 Oct 2017 18:17:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f48.google.com (mail-wm0-f48.google.com [74.125.82.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 57EC4689DE0 for ; Sun, 8 Oct 2017 18:17:47 +0300 (EEST) Received: by mail-wm0-f48.google.com with SMTP id q124so16788976wmb.0 for ; Sun, 08 Oct 2017 08:17:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=CKPN61GrYIrklz1SzTMOaE40l7EQwCJSOYhl2M8VfxQ=; b=Z74cEVxITAkZxzG8IdAFBe1a1xbvpJW5DY05ZdDcQuXuIvkO3wHzt83fFBDywY4efU IV+iMvld2UvD/vSucGWhLGmKID8cYYG6wagr/KPVL9Cr1EkR2oHFykF3ljrSXLCCp8mJ 8Ss6/gxOZI0VI0P/zFxr/6KA/qoZ28SbiAfwmc+aIfj5ZCymldCOlUiSiLPjZSwVTDfg v9VGLWL6FANBIkTTuGp96/kNvvZtMvXrF3JwBk3M5AwM2s46dcZum7hmcCyOs4wjV/U5 lZfYyAxsK9bH0SBLVB9JeuCCz42B3OdJ5wvWuwTRYRsS/jQU/fvF/UWmDzFDUqYiLtu+ PUjg== 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:in-reply-to :references; bh=CKPN61GrYIrklz1SzTMOaE40l7EQwCJSOYhl2M8VfxQ=; b=gxaTzFzPKL8gOjRlUJKFSZfukhCpsVStOR5hWbPe4P59J5CpNZSANxS/QZbK68tELP nE5iNgWtspNuQwOaATQaW9w5v5L4Jv0XRGit9Sw/XQucOVYV1AkpLF5vpXce3bDbi5Y/ hE1B+P86HnQsiK/MO1CQCVHkka7Or2nLn7bcjm3ZcwcvJw5f+NRwb84K5IHMKXwML70W BFHr+/LGkqEAIuDjlNscfQDAzmasaBy6Nr3w1gIW4DJ+UerelqEPV3ilmf6gd1czr4be ArtK0CqagkLDGynYL1YhN+rrlpwwiO4j+El+VUL5iR6Gh+ulL6ll7R5+ccc1d+DfR2GM WqZA== X-Gm-Message-State: AMCzsaVgkdcpzscLtFg8/AnTG9f2b6XRcukDqqoLt6pJBo+iXtlkQ56U QVkpbwOWoXx9ct4xkR+LXumM6ibl X-Google-Smtp-Source: AOwi7QD0tvuWfaRVEKiMvH9ZkIiQwwNczF59/nDZoSprl1CCO7LNc06GgBsPJCT7QFkBWKYFEQNalA== X-Received: by 10.223.193.140 with SMTP id x12mr6708283wre.155.1507475511358; Sun, 08 Oct 2017 08:11:51 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id b190sm6770476wma.22.2017.10.08.08.11.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Oct 2017 08:11:50 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 8 Oct 2017 16:11:42 +0100 Message-Id: <20171008151146.13505-2-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171008151146.13505-1-sw@jkqxz.net> References: <20171008151146.13505-1-sw@jkqxz.net> 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 MIME-Version: 1.0 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. --- 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..728c871d72 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: + // Baseline profile is not supported, assume the user meant + // constrained baseline instead. + 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;