From patchwork Tue Sep 18 22:30:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 10367 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp11775jap; Tue, 18 Sep 2018 15:32:49 -0700 (PDT) X-Google-Smtp-Source: ANB0VdapKA2ETcUuJFwZX8BX83wYQb/oKIFG+6mbpi426rg4LE3x9L0W4TD43z4Z7ZpSRvT7mzDU X-Received: by 2002:a1c:6782:: with SMTP id b124-v6mr17763472wmc.30.1537309969754; Tue, 18 Sep 2018 15:32:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537309969; cv=none; d=google.com; s=arc-20160816; b=lihOW83MZiLNGHR4F16N1WccTdo0dHwCmLcw7C7Pntw72ip72yJDzH+HsBowoOvJqY iZ5tJSWJFA68CVq1zKleMo1OpQT06lENjB6jMvz7tXegS+hv7RsREupzaBU50cLVP6wv ADp11ljatjcGWiO887zYftyS6DjrM4nbgakBBsU7AlvksiH7jYrV+/T7buWm1e/8ylDX rcndq9+KLovDmzOva59Hloj+krBMDoxdeIZAZhkUhKzynwboEBTnxb0DNA+k+C6114uy m0BR/zWA+z3JPJ0svZorEIwEVx78LdbqSnokRMKkrEzs7g8KBQeuNrsqpvfc75xOzdid c3PQ== 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; bh=yKP8hRVdZl1GcdjuPyAtnsxYlHOu+tby5PFcuooUlAQ=; b=bfQ8KHwHkG+Tty4hHb/Wg0BHTRnqPIcgOA/VCWA3eW/b7A/VqoSr+iG57Iv7/De5Y3 qDhrZ22/9+WSH6StgZYtSoU8sN9aD7tS+dE6fwmN4YIL/2pNXK6j6r9mIz1tjyMtDEOg neNKQEvKW2fYDwwW5QoYu+uB7OsTJqgEXSYtZK7iT/2lnrlX3jjUB+X0ac6Hg0zNIXg3 9cA35O3vg9lBBGM2VHDBNbiFNymdkfCBNT10RWCjuJ5jWyw+NwpZUtR7rszEKF81OXd+ 55fpDR0V5vcWhQMnSQRYK4BrGcFkblx3U/sP9zmi3fbIIBAgVRZrkaK2hIWDw8OMxvey e77w== 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=Ikb8lthq; 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 n6-v6si11040806wma.39.2018.09.18.15.32.49; Tue, 18 Sep 2018 15:32:49 -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=Ikb8lthq; 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 A162C68A476; Wed, 19 Sep 2018 01:31:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DDCEE68A1E2 for ; Wed, 19 Sep 2018 01:31:18 +0300 (EEST) Received: by mail-wr1-f46.google.com with SMTP id g33-v6so3743366wrd.1 for ; Tue, 18 Sep 2018 15:31:32 -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=wYI+PUMx0sCRx3B5NNXlB0ZuTOOHMR077+AMpH+sj38=; b=Ikb8lthqpVtTX9ewEQGzIEevk42/vWJYs34iH/IytnwoygyfDGAynUmplUSVLfsOKr MsZeYLplQfL2p4Kmrz0hLyuqklHTikGlUbD8UeFuQYHk0+CYu+E28axOnRP/MKVcF1TS maKp8y1gP10gJbDMQLY5tnOC2stmVcY2Sl8y0M/uXchiLLlCBfsC1yIJVPiiMNtpFfAa qTzqkS2SjJIqiP3v1nk4HPHTdqGsOoLU6zse0HRzs/SOnK9mv2y0A8iP/lCobVWaMuGP 4/HHFpwWN6pHohZDU0TPgwetc1OW2si08u4Wt+ek6Cn5bYJ1Xo/Wp8oV1MA66zC66Ypy oRDw== 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=wYI+PUMx0sCRx3B5NNXlB0ZuTOOHMR077+AMpH+sj38=; b=ALs/Rn3AKjX1709b6qj8coLsEUYCy5QcYJv3fs87l/udW/sQs9s3Kyzq89nIZf1SKg hbCWTR0hkFlofHOQtL7LUKE8pieXdPOasXHLj89mGxBShzUrYmOF0UM/wtrcY2ppAMOd CPG0ZNDe/zdJWSHfSjVEKc3M3ktoJOQNjv8ZNEo4Kgjlxn/kIIs2bSJsDzEZrNSVAIzz 48YyUemIs11pe/9GZj2E3wkKhpxEOkz7DNkigljkfGTe24UjBQoVW7oSJZTFw5awy12k 0YeHg9P/aZOu1JfD1qP8JKnDUaAyhpCBT7+e1MFo1q9UAP8CbIQSjA2hyKTl8aMxJkZR +ulQ== X-Gm-Message-State: APzg51BFl2wU1DldPaH6LG/pOBU2Ci+M8Jvp0Mk0GDtkJ3w841SQ+Rl8 z6Ts8BOrdOfC8izqTJjrGmskC1fFfZg= X-Received: by 2002:a5d:6b01:: with SMTP id v1-v6mr7804495wrw.208.1537309891428; Tue, 18 Sep 2018 15:31:31 -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 e141-v6sm4863826wmd.32.2018.09.18.15.31.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Sep 2018 15:31:30 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Sep 2018 23:30:48 +0100 Message-Id: <20180918223116.14322-11-sw@jkqxz.net> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180918223116.14322-1-sw@jkqxz.net> References: <20180918223116.14322-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH v4 10/38] 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 | 119 +++++++++++++++++--------------- 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, 80 insertions(+), 68 deletions(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index e48e703ab4..2c34cdce2c 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -1206,60 +1206,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; @@ -1498,6 +1444,66 @@ 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->desired_packed_headers) { + av_log(avctx, AV_LOG_WARNING, "Driver does not support any " + "packed headers (wanted %#x).\n", + ctx->desired_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->desired_packed_headers & ~attr.value) { + av_log(avctx, AV_LOG_WARNING, "Driver does not support some " + "wanted packed headers (wanted %#x, found %#x).\n", + ctx->desired_packed_headers, attr.value); + } else { + av_log(avctx, AV_LOG_VERBOSE, "All wanted packed headers " + "available (wanted %#x, found %#x).\n", + ctx->desired_packed_headers, attr.value); + } + ctx->va_packed_headers = ctx->desired_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->desired_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) @@ -1728,7 +1734,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; @@ -1817,7 +1823,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 5d6fdcf336..091889f9ae 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 desired_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 5c93fe35ce..b233a91d04 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->desired_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..c40782a78e 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->desired_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..332053ae34 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->desired_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..1377eeb9bb 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->desired_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..697b465787 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->desired_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..39bc868f3a 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->desired_packed_headers = 0; // Surfaces must be aligned to superblock boundaries. ctx->surface_width = FFALIGN(avctx->width, 64);