From patchwork Thu Jun 7 23:43:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 9304 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp193934jad; Thu, 7 Jun 2018 16:46:17 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIHe+mbHoPNle6+/R9+bnQOyPLAJU0+IZXrxA4goOCybcdMo6CzM2nFXVQJHlbQZIeuPgMF X-Received: by 2002:adf:84c2:: with SMTP id 60-v6mr3351535wrg.167.1528415177131; Thu, 07 Jun 2018 16:46:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528415177; cv=none; d=google.com; s=arc-20160816; b=X9yQO40HaAOcUR3PhaOP5ZkTr+AiZMTmVIMs51q/73CLveT3ie8rfTJH//N50bLpM3 g4gy3UEmleekjP7QgWKdZ0jyBXR57zFfEF5+Z/KVP5H/CIKiVoBIQYusPmiPLodzsIj2 rhkYyyxfQzZ4lQQ/NqN2JOM5ipJTWP77vgyP4E2qkbBRWQFTDN5JKWtknHqMLbx0GpjJ 0/emAQtNsosD/0fY9fRdYycIifBKH+q6akKK8R9ECO0K5l5+7c0rATjwcZl2e+G6HKzq Zhub/Hx6nIZ3ezZWBZ1CxRoYjY6csuGjS29WNMJkhN+p8liqCLsx4qjP78pjZBaO5alw govQ== 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=Zzp6hGfpsk+vnf/7BzBczLS4MdYY6fDnwOaqYONG8xI=; b=RGLNyP0eDUqYKpHqTKFzkEj2lA/HlP/PuxaA7N7lsHZDmggPyxhJIV3F9Ko5wRmZYE 0GulYNiAvuTXyhX2RtUbzGU7ZrAzGwwhu0+0bIjePYhTfEY3CM4i1a7bP3K65HPV59yh tdasOM2bWVWfnQzWdBko9CXIt8A0nElORpWPwkHZGjAV6OWwTnQ2WN4s/zhbZix88bQ/ fUWy+3UL7D09rSb1+4lHcYpVuEgNL0sPgxZpaSm5/XpSRuTFGPmC36S67FywXplsmzED 7JQS8StyGE0/nUtSAEz3lg31iFs24PyPmwwVcMhPKcgk3LDdjaNeV7o6XpOZfU9xy+lG 8CKA== 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=t9jABhhw; 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 g28-v6si26813601wra.434.2018.06.07.16.46.16; Thu, 07 Jun 2018 16:46:17 -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=t9jABhhw; 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 ADFED68A7FD; Fri, 8 Jun 2018 02:43:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f181.google.com (mail-wr0-f181.google.com [209.85.128.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C1AA68A78E for ; Fri, 8 Jun 2018 02:43:12 +0300 (EEST) Received: by mail-wr0-f181.google.com with SMTP id w10-v6so11515466wrk.9 for ; Thu, 07 Jun 2018 16:44:00 -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=VtyrRKelJOEqsDkjt/RgLnyT/xoljGUv//hf0P3ataQ=; b=t9jABhhwwHQi1Ovb5Zo/xeDRLSMSFkSM1o1INk07UuMvtqLB72t7HazeW5gtsrRCXY XIZvtdjr6uLPydh6pDMpZb7CHczimk5LSYC8MJYb4MU/dQXeX9BIY21P+zz3SCA/OxKF 2wJYpxWYoUaTsoKxOVUFhMMmefsPnFfCIBPx6lxlJGDpUIps1xeErwZYQHGZ/KOA9S/l yFD23EHAxHDiX8WfRrLAMO8RLBHyIe+F8T6mxRejVzRzibbM5ubfzicVJbjmSujrys0q 8TPBx0xxUpHp8UyyZ/S+gamNMqVeaYUWxCDpdDrsyHIQyIQWcvL4/T1aPeOjXftSHy6t jGMQ== 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=VtyrRKelJOEqsDkjt/RgLnyT/xoljGUv//hf0P3ataQ=; b=oArBmW+FVcEVwhe0sLYZKMZICMFzn5YBqpcMiM+SHB/GLlYsvr5nsDFQoQNDCeDdEY jT/iCireIrVUdwPgIdya/akII9n64/cskaSFTlhFJmhvxqgSPBAnnygdsKbfB7Es+MgS J950AL7MiRfbIo6MfhTh81RXCC7tUHOQt/77coOg4wBX/pMZTg+R0VCfXAic0z/fzKFs A+YpJH8KMlUd72F86KNqLs7UIMjrxAi7IwrxG6RUWz1XI1IMe/iJAQ538W7nH1XB3w/1 PjYm3s9Uop0lWRVLv9cGAH1Yu9asmn8hXui8Fl3hSRlICA+NeL8rhUFtV2tLPSlK85CY ruPw== X-Gm-Message-State: APt69E274Wm0H7/4ZIdvYRt6gLr8388498TnNT1T7lQdaM478ZOfAzju mh0554rO6mxEMzkzLyRxLjtpYs3i X-Received: by 2002:adf:fb43:: with SMTP id c3-v6mr3404065wrs.32.1528415039148; Thu, 07 Jun 2018 16:43:59 -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 r2-v6sm18640545wrq.55.2018.06.07.16.43.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jun 2018 16:43:58 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Jun 2018 00:43:14 +0100 Message-Id: <20180607234331.32139-20-sw@jkqxz.net> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180607234331.32139-1-sw@jkqxz.net> References: <20180607234331.32139-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH v2 19/36] vaapi_encode: Clean up the packed header configuration 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" Add a larger warning more clearly explaining the consequences of missing packed header support in the driver. Also only write the extradata if the user actually requests it via the GLOBAL_HEADER flag. --- libavcodec/vaapi_encode.c | 118 +++++++++++++++++++++------------------- libavcodec/vaapi_encode.h | 7 ++- libavcodec/vaapi_encode_h264.c | 2 +- libavcodec/vaapi_encode_h265.c | 2 +- libavcodec/vaapi_encode_mjpeg.c | 2 +- libavcodec/vaapi_encode_mpeg2.c | 4 +- libavcodec/vaapi_encode_vp8.c | 6 +- libavcodec/vaapi_encode_vp9.c | 6 +- 8 files changed, 79 insertions(+), 68 deletions(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index af9224c98f..14d1846ea3 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -1210,60 +1210,6 @@ fail: return err; } -static av_cold int vaapi_encode_config_attributes(AVCodecContext *avctx) -{ - VAAPIEncodeContext *ctx = avctx->priv_data; - VAStatus vas; - int i; - - VAConfigAttrib attr[] = { - { VAConfigAttribEncPackedHeaders }, - }; - - vas = vaGetConfigAttributes(ctx->hwctx->display, - ctx->va_profile, ctx->va_entrypoint, - attr, FF_ARRAY_ELEMS(attr)); - if (vas != VA_STATUS_SUCCESS) { - av_log(avctx, AV_LOG_ERROR, "Failed to fetch config " - "attributes: %d (%s).\n", vas, vaErrorStr(vas)); - return AVERROR(EINVAL); - } - - for (i = 0; i < FF_ARRAY_ELEMS(attr); i++) { - if (attr[i].value == VA_ATTRIB_NOT_SUPPORTED) { - // Unfortunately we have to treat this as "don't know" and hope - // for the best, because the Intel MJPEG encoder returns this - // for all the interesting attributes. - av_log(avctx, AV_LOG_DEBUG, "Attribute (%d) is not supported.\n", - attr[i].type); - continue; - } - switch (attr[i].type) { - case VAConfigAttribEncPackedHeaders: - if (ctx->va_packed_headers & ~attr[i].value) { - // This isn't fatal, but packed headers are always - // preferable because they are under our control. - // When absent, the driver is generating them and some - // features may not work (e.g. VUI or SEI in H.264). - av_log(avctx, AV_LOG_WARNING, "Warning: some packed " - "headers are not supported (want %#x, got %#x).\n", - ctx->va_packed_headers, attr[i].value); - ctx->va_packed_headers &= attr[i].value; - } - ctx->config_attributes[ctx->nb_config_attributes++] = - (VAConfigAttrib) { - .type = VAConfigAttribEncPackedHeaders, - .value = ctx->va_packed_headers, - }; - break; - default: - av_assert0(0 && "Unexpected config attribute."); - } - } - - return 0; -} - static av_cold int vaapi_encode_init_rate_control(AVCodecContext *avctx) { VAAPIEncodeContext *ctx = avctx->priv_data; @@ -1494,6 +1440,65 @@ static av_cold int vaapi_encode_init_gop_structure(AVCodecContext *avctx) return 0; } +static av_cold int vaapi_encode_init_packed_headers(AVCodecContext *avctx) +{ + VAAPIEncodeContext *ctx = avctx->priv_data; + VAStatus vas; + VAConfigAttrib attr = { VAConfigAttribEncPackedHeaders }; + + vas = vaGetConfigAttributes(ctx->hwctx->display, + ctx->va_profile, + ctx->va_entrypoint, + &attr, 1); + if (vas != VA_STATUS_SUCCESS) { + av_log(avctx, AV_LOG_ERROR, "Failed to query packed headers " + "attribute: %d (%s).\n", vas, vaErrorStr(vas)); + return AVERROR_EXTERNAL; + } + + if (attr.value == VA_ATTRIB_NOT_SUPPORTED) { + if (ctx->packed_headers) { + av_log(avctx, AV_LOG_WARNING, "Driver does not support any " + "packed headers (wanted %#x).\n", ctx->packed_headers); + } else { + av_log(avctx, AV_LOG_VERBOSE, "Driver does not support any " + "packed headers (none wanted).\n"); + } + ctx->va_packed_headers = 0; + } else { + if (ctx->packed_headers & ~attr.value) { + av_log(avctx, AV_LOG_WARNING, "Driver does not support some " + "wanted packed headers (wanted %#x, found %#x).\n", + ctx->packed_headers, attr.value); + } else { + av_log(avctx, AV_LOG_VERBOSE, "All wanted packed headers " + "available (wanted %#x, found %#x).\n", + ctx->packed_headers, attr.value); + } + ctx->va_packed_headers = ctx->packed_headers & attr.value; + } + + if (ctx->va_packed_headers) { + ctx->config_attributes[ctx->nb_config_attributes++] = + (VAConfigAttrib) { + .type = VAConfigAttribEncPackedHeaders, + .value = ctx->va_packed_headers, + }; + } + + if ( (ctx->packed_headers & VA_ENC_PACKED_HEADER_SEQUENCE) && + !(ctx->va_packed_headers & VA_ENC_PACKED_HEADER_SEQUENCE) && + (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER)) { + av_log(avctx, AV_LOG_WARNING, "Driver does not support packed " + "sequence headers, but a global header is requested.\n"); + av_log(avctx, AV_LOG_WARNING, "No global header will be written: " + "this may result in a stream which is not usable for some " + "purposes (e.g. not muxable to some containers).\n"); + } + + return 0; +} + static av_cold int vaapi_encode_init_quality(AVCodecContext *avctx) { #if VA_CHECK_VERSION(0, 36, 0) @@ -1724,7 +1729,7 @@ av_cold int ff_vaapi_encode_init(AVCodecContext *avctx) if (err < 0) goto fail; - err = vaapi_encode_config_attributes(avctx); + err = vaapi_encode_init_packed_headers(avctx); if (err < 0) goto fail; @@ -1813,7 +1818,8 @@ av_cold int ff_vaapi_encode_init(AVCodecContext *avctx) ctx->issue_mode = ISSUE_MODE_MAXIMISE_THROUGHPUT; if (ctx->va_packed_headers & VA_ENC_PACKED_HEADER_SEQUENCE && - ctx->codec->write_sequence_header) { + ctx->codec->write_sequence_header && + avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) { char data[MAX_PARAM_BUFFER_SIZE]; size_t bit_len = 8 * sizeof(data); diff --git a/libavcodec/vaapi_encode.h b/libavcodec/vaapi_encode.h index bbec721bca..e6acd933d6 100644 --- a/libavcodec/vaapi_encode.h +++ b/libavcodec/vaapi_encode.h @@ -116,9 +116,8 @@ typedef struct VAAPIEncodeContext { // Use low power encoding mode. int low_power; - // Supported packed headers (initially the desired set, modified - // later to what is actually supported). - unsigned int va_packed_headers; + // Desired packed headers. + unsigned int packed_headers; // The required size of surfaces. This is probably the input // size (AVCodecContext.width|height) aligned up to whatever @@ -140,6 +139,8 @@ typedef struct VAAPIEncodeContext { unsigned int va_rc_mode; // Bitrate for codec-specific encoder parameters. unsigned int va_bit_rate; + // Packed headers which will actually be sent. + unsigned int va_packed_headers; // Configuration attributes to use when creating va_config. VAConfigAttrib config_attributes[MAX_CONFIG_ATTRIBUTES]; diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 717be024ca..e2f4f4f2f5 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -930,7 +930,7 @@ static av_cold int vaapi_encode_h264_init(AVCodecContext *avctx) return AVERROR_PATCHWELCOME; } - ctx->va_packed_headers = + ctx->packed_headers = VA_ENC_PACKED_HEADER_SEQUENCE | // SPS and PPS. VA_ENC_PACKED_HEADER_SLICE | // Slice headers. VA_ENC_PACKED_HEADER_MISC; // SEI. diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index b2d6b8d24d..04dfef27c8 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -1064,7 +1064,7 @@ static av_cold int vaapi_encode_h265_init(AVCodecContext *avctx) if (avctx->level == FF_LEVEL_UNKNOWN) avctx->level = priv->level; - ctx->va_packed_headers = + ctx->packed_headers = VA_ENC_PACKED_HEADER_SEQUENCE | // VPS, SPS and PPS. VA_ENC_PACKED_HEADER_SLICE | // Slice headers. VA_ENC_PACKED_HEADER_MISC; // SEI diff --git a/libavcodec/vaapi_encode_mjpeg.c b/libavcodec/vaapi_encode_mjpeg.c index 4982cd166f..f76645425a 100644 --- a/libavcodec/vaapi_encode_mjpeg.c +++ b/libavcodec/vaapi_encode_mjpeg.c @@ -389,7 +389,7 @@ static av_cold int vaapi_encode_mjpeg_init(AVCodecContext *avctx) ctx->codec = &vaapi_encode_type_mjpeg; // The JPEG image header - see note above. - ctx->va_packed_headers = + ctx->packed_headers = VA_ENC_PACKED_HEADER_RAW_DATA; ctx->surface_width = FFALIGN(avctx->width, 8); diff --git a/libavcodec/vaapi_encode_mpeg2.c b/libavcodec/vaapi_encode_mpeg2.c index b6edca9158..1afd753fc1 100644 --- a/libavcodec/vaapi_encode_mpeg2.c +++ b/libavcodec/vaapi_encode_mpeg2.c @@ -615,8 +615,8 @@ static av_cold int vaapi_encode_mpeg2_init(AVCodecContext *avctx) return AVERROR(EINVAL); } - ctx->va_packed_headers = VA_ENC_PACKED_HEADER_SEQUENCE | - VA_ENC_PACKED_HEADER_PICTURE; + ctx->packed_headers = VA_ENC_PACKED_HEADER_SEQUENCE | + VA_ENC_PACKED_HEADER_PICTURE; ctx->surface_width = FFALIGN(avctx->width, 16); ctx->surface_height = FFALIGN(avctx->height, 16); diff --git a/libavcodec/vaapi_encode_vp8.c b/libavcodec/vaapi_encode_vp8.c index 4512609a19..51ba601c5e 100644 --- a/libavcodec/vaapi_encode_vp8.c +++ b/libavcodec/vaapi_encode_vp8.c @@ -200,8 +200,10 @@ static av_cold int vaapi_encode_vp8_init(AVCodecContext *avctx) ctx->codec = &vaapi_encode_type_vp8; - // Packed headers are not currently supported. - ctx->va_packed_headers = 0; + // No packed headers are currently desired. VP8 has no metadata + // which would be useful to write, and no existing driver supports + // adding them anyway. + ctx->packed_headers = 0; ctx->surface_width = FFALIGN(avctx->width, 16); ctx->surface_height = FFALIGN(avctx->height, 16); diff --git a/libavcodec/vaapi_encode_vp9.c b/libavcodec/vaapi_encode_vp9.c index d4069ec850..537a92c48c 100644 --- a/libavcodec/vaapi_encode_vp9.c +++ b/libavcodec/vaapi_encode_vp9.c @@ -228,8 +228,10 @@ static av_cold int vaapi_encode_vp9_init(AVCodecContext *avctx) ctx->codec = &vaapi_encode_type_vp9; - // Packed headers are not currently supported. - ctx->va_packed_headers = 0; + // No packed headers are currently desired. They could be written, + // but there isn't any reason to do so - the one usable driver (i965) + // can write its own headers and there is no metadata to include. + ctx->packed_headers = 0; // Surfaces must be aligned to superblock boundaries. ctx->surface_width = FFALIGN(avctx->width, 64);