From patchwork Sun Apr 22 15:29:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 8574 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp2854937jad; Sun, 22 Apr 2018 08:32:16 -0700 (PDT) X-Google-Smtp-Source: AIpwx48foj28agYtv6JONI0rlCyFna2MvbbD983akCTbosnUfcJuQAuH7l4E+VoafsyWeQ5rdcAH X-Received: by 2002:adf:9a54:: with SMTP id z78-v6mr14443679wrb.235.1524411136468; Sun, 22 Apr 2018 08:32:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524411136; cv=none; d=google.com; s=arc-20160816; b=Xab2Pps9h74GpfluiNr50qWxl99Ofcpni+SHo1TB1mTWSUc49QVSpRdRKKbWZ5hRIL AAUesznbX5WKma9d8X9WhAou1efRvkhFJF+Bps8BVF0ic1hnVEyZrQLrE50GCElmST6L /w9kBLy3PMZIDGqp05QIf3uUP6wvzXOduGJdCPkIJ0e++b5Fksy+1ZRmWO8+b2a3auNE m8FODpbPO7EC4WNeH0HjfKed727sqAT0ssc6Vkhpg/ybBdiwo+vBJSXrekcwfQZ8Rzh8 8Ho3HrSIeikxfnbZnys6CQaXqCmQRWtDrhZH2kjcZXBbxx6Zq4pLWdo6X538wG7cuiSg dvsA== 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=c58/9qQRSfmIWz/UxGfb1mRgLiG2C9ogHsu2KU0gS8Y=; b=hc6+Bo3AQYi3Pf5CGk6fDfP8482UyH6Efldqvzo7fjX4cKwhtNgtWRv5QY4SQkzDl+ prGZqwdkal7NGL4Axlb/ZT23nSgcJAZyfBZiDDfTX4iDsOcBLCGck/LljDUS7UI7z1Zv 1K5WY38aKQRLohj1uYeLEoL4ycqD6XbnKJr4qDqy4oS55Cs/VserLPkV1dldI0YtG+QQ /tQzovGILJvNZijpYSmtxglfZmE5Ccr/FsLfFPP9oMYa5ePqY4jxylonrJV42ZJcMwu3 65ZtisZ0YgO4ifqAGhNzV0Vz559GUVx1nVc2lzWAy3bvZUZ4bFTgc9yk4Ufa7KkrFQXK gR9w== 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=KeUfpCpf; 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 l81si4242262wmf.200.2018.04.22.08.32.16; Sun, 22 Apr 2018 08:32:16 -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=KeUfpCpf; 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 D35E368A391; Sun, 22 Apr 2018 18:29:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7965B68A342 for ; Sun, 22 Apr 2018 18:29:17 +0300 (EEST) Received: by mail-wr0-f193.google.com with SMTP id o15-v6so34570274wro.11 for ; Sun, 22 Apr 2018 08:29:46 -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=aXzpJLz5VUEhXFMgEy5CbzhabNGDPtZzvfWEuhZrvOY=; b=KeUfpCpfzEwlhaTOveMGrLF3qN4nXudtH078+oql4lLkt8v4e1rOO1I88lhrjZ6+w2 6fq1SVbBDVnC0AoGZguUEtmcU6vOTHsyYt3nRXkXLD6/K27U1UR/6MEJ0Ym0BZgnRif+ XVdxRqYQDbG1hFnKSBk5Ct1ZUt9FMsmSHdwYpT6pIsDkwP2NA6YFEQV45Tte1H71XWpo vpAnoLML2QoIXeVJ4LTD3/sbWvwhVJAxteQSOq5fCNpOQ3tkfDU9ih/wYjsPj2xKrDEy aSW02ay5Ol60PwifcjXAscT4DyA0XhOTjS3wi71WtvGBH39ppLBD/ja23Vjite3Bht+N Do/Q== 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=aXzpJLz5VUEhXFMgEy5CbzhabNGDPtZzvfWEuhZrvOY=; b=EPgINr0IVBNC4Pe853ULwe+2xnK8mSpr+y31sIVb1s8DQHDDdvLvKnrgeW2xmdcCkH fV5xGO0huzL75MHG1XZgxc74TXroYk5b7zZ73jm7TsRkrx7WUmG6AIYRIkm/wGkwrWwG 5538i3/iPAPQApNzp9Ca6iOikeyLjhD8TNd3xBZdoWueEMt3Fy9JQw+d4UEZtAuEYNPe vJ2FlRUSZg+XuaQkHRz/1dXxIGEhk0CTUbwdUXcRKI6EvNdWI80PPG13sTNS2M728Uxd Zq26EgzIHQfTiACMEsno14PKaMy7GzoWaNobSfMZK/RYaRSJBN0Sv+O4M2lNpXcQG4iN tRew== X-Gm-Message-State: ALQs6tDgK3LsRU95yQVBDW6o1BmcelXz328l4viK1CDOrCEJQ63g9DMC wM1a1/IHdy3M+Ub8wuBvvB4q0xtG X-Received: by 2002:adf:84e5:: with SMTP id 92-v6mr15466572wrg.46.1524410985636; Sun, 22 Apr 2018 08:29:45 -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 32-v6sm7021498wrf.79.2018.04.22.08.29.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Apr 2018 08:29:44 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Apr 2018 16:29:12 +0100 Message-Id: <20180422152921.32510-18-sw@jkqxz.net> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180422152921.32510-1-sw@jkqxz.net> References: <20180422152921.32510-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 17/26] vaapi_encode: Clean up the GOP structure 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" Choose what types of reference frames will be used based on what types are available, and make the intra-only mode explicit (GOP size one, which must be used for MJPEG). --- libavcodec/vaapi_encode.c | 83 +++++++++++++++++++++++++++-------------- libavcodec/vaapi_encode.h | 1 + libavcodec/vaapi_encode_h264.c | 4 +- libavcodec/vaapi_encode_h265.c | 4 +- libavcodec/vaapi_encode_mjpeg.c | 1 + libavcodec/vaapi_encode_mpeg2.c | 2 +- libavcodec/vaapi_encode_vp8.c | 7 +--- libavcodec/vaapi_encode_vp9.c | 7 ++-- 8 files changed, 68 insertions(+), 41 deletions(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 39c622dacc..024ccc9949 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -680,7 +680,7 @@ static int vaapi_encode_get_next(AVCodecContext *avctx, return AVERROR(ENOMEM); if (ctx->input_order == 0 || ctx->force_idr || - ctx->gop_counter >= avctx->gop_size) { + ctx->gop_counter >= ctx->gop_size) { pic->type = PICTURE_TYPE_IDR; ctx->force_idr = 0; ctx->gop_counter = 1; @@ -703,7 +703,7 @@ static int vaapi_encode_get_next(AVCodecContext *avctx, // encode-after it, but not exceeding the GOP size. for (i = 0; i < ctx->b_per_p && - ctx->gop_counter < avctx->gop_size; i++) { + ctx->gop_counter < ctx->gop_size; i++) { pic = vaapi_encode_alloc(avctx); if (!pic) goto fail; @@ -1207,7 +1207,6 @@ static av_cold int vaapi_encode_config_attributes(AVCodecContext *avctx) int i; VAConfigAttrib attr[] = { - { VAConfigAttribEncMaxRefFrames }, { VAConfigAttribEncPackedHeaders }, }; @@ -1230,24 +1229,6 @@ static av_cold int vaapi_encode_config_attributes(AVCodecContext *avctx) continue; } switch (attr[i].type) { - case VAConfigAttribEncMaxRefFrames: - { - unsigned int ref_l0 = attr[i].value & 0xffff; - unsigned int ref_l1 = (attr[i].value >> 16) & 0xffff; - - if (avctx->gop_size > 1 && ref_l0 < 1) { - av_log(avctx, AV_LOG_ERROR, "P frames are not " - "supported (%#x).\n", attr[i].value); - return AVERROR(EINVAL); - } - if (avctx->max_b_frames > 0 && ref_l1 < 1) { - av_log(avctx, AV_LOG_WARNING, "B frames are not " - "supported (%#x) by the underlying driver.\n", - attr[i].value); - avctx->max_b_frames = 0; - } - } - break; case VAConfigAttribEncPackedHeaders: if (ctx->va_packed_headers & ~attr[i].value) { // This isn't fatal, but packed headers are always @@ -1448,6 +1429,54 @@ static av_cold int vaapi_encode_init_rate_control(AVCodecContext *avctx) return 0; } +static av_cold int vaapi_encode_init_gop_structure(AVCodecContext *avctx) +{ + VAAPIEncodeContext *ctx = avctx->priv_data; + VAStatus vas; + VAConfigAttrib attr = { VAConfigAttribEncMaxRefFrames }; + uint32_t ref_l0, ref_l1; + + 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 reference frames " + "attribute: %d (%s).\n", vas, vaErrorStr(vas)); + return AVERROR_EXTERNAL; + } + + if (attr.value == VA_ATTRIB_NOT_SUPPORTED) { + ref_l0 = ref_l1 = 0; + } else { + ref_l0 = attr.value & 0xffff; + ref_l1 = attr.value >> 16 & 0xffff; + } + + if (avctx->gop_size <= 1) { + av_log(avctx, AV_LOG_VERBOSE, "Using intra frames only.\n"); + ctx->gop_size = 1; + } else if (ref_l0 < 1) { + av_log(avctx, AV_LOG_ERROR, "Driver does not support any " + "reference frames.\n"); + return AVERROR(EINVAL); + } else if (ref_l1 < 1 || avctx->max_b_frames < 1) { + av_log(avctx, AV_LOG_VERBOSE, "Using intra and P-frames " + "(supported references: %d / %d).\n", ref_l0, ref_l1); + ctx->gop_size = avctx->gop_size; + ctx->p_per_i = INT_MAX; + ctx->b_per_p = 0; + } else { + av_log(avctx, AV_LOG_VERBOSE, "Using intra, P- and B-frames " + "(supported references: %d / %d).\n", ref_l0, ref_l1); + ctx->gop_size = avctx->gop_size; + ctx->p_per_i = INT_MAX; + ctx->b_per_p = avctx->max_b_frames; + } + + return 0; +} + static av_cold int vaapi_encode_init_quality(AVCodecContext *avctx) { #if VA_CHECK_VERSION(0, 36, 0) @@ -1620,7 +1649,7 @@ static av_cold int vaapi_encode_create_recon_frames(AVCodecContext *avctx) ctx->recon_frames->height = ctx->surface_height; // At most three IDR/I/P frames and two runs of B frames can be in // flight at any one time. - ctx->recon_frames->initial_pool_size = 3 + 2 * avctx->max_b_frames; + ctx->recon_frames->initial_pool_size = 3 + 2 * ctx->b_per_p; err = av_hwframe_ctx_init(ctx->recon_frames_ref); if (err < 0) { @@ -1675,6 +1704,10 @@ av_cold int ff_vaapi_encode_init(AVCodecContext *avctx) if (err < 0) goto fail; + err = vaapi_encode_init_gop_structure(avctx); + if (err < 0) + goto fail; + err = vaapi_encode_config_attributes(avctx); if (err < 0) goto fail; @@ -1731,14 +1764,10 @@ av_cold int ff_vaapi_encode_init(AVCodecContext *avctx) } ctx->input_order = 0; - ctx->output_delay = avctx->max_b_frames; + ctx->output_delay = ctx->b_per_p; ctx->decode_delay = 1; ctx->output_order = - ctx->output_delay - 1; - // Currently we never generate I frames, only IDR. - ctx->p_per_i = INT_MAX; - ctx->b_per_p = avctx->max_b_frames; - if (ctx->codec->sequence_params_size > 0) { ctx->codec_sequence_params = av_mallocz(ctx->codec->sequence_params_size); diff --git a/libavcodec/vaapi_encode.h b/libavcodec/vaapi_encode.h index 3fb39113a4..322c4d3565 100644 --- a/libavcodec/vaapi_encode.h +++ b/libavcodec/vaapi_encode.h @@ -224,6 +224,7 @@ typedef struct VAAPIEncodeContext { int64_t ts_ring[MAX_REORDER_DELAY * 3]; // Frame type decision. + int gop_size; int p_per_i; int b_per_p; int force_idr; diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 514805d0c2..a7cae548d3 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -491,8 +491,8 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) *vseq = (VAEncSequenceParameterBufferH264) { .seq_parameter_set_id = sps->seq_parameter_set_id, .level_idc = sps->level_idc, - .intra_period = avctx->gop_size, - .intra_idr_period = avctx->gop_size, + .intra_period = ctx->gop_size, + .intra_idr_period = ctx->gop_size, .ip_period = ctx->b_per_p + 1, .bits_per_second = avctx->bit_rate, diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index 8a31a73148..063db47c57 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -431,8 +431,8 @@ static int vaapi_encode_h265_init_sequence_params(AVCodecContext *avctx) .general_level_idc = vps->profile_tier_level.general_level_idc, .general_tier_flag = vps->profile_tier_level.general_tier_flag, - .intra_period = avctx->gop_size, - .intra_idr_period = avctx->gop_size, + .intra_period = ctx->gop_size, + .intra_idr_period = ctx->gop_size, .ip_period = ctx->b_per_p + 1, .bits_per_second = avctx->bit_rate, diff --git a/libavcodec/vaapi_encode_mjpeg.c b/libavcodec/vaapi_encode_mjpeg.c index 77104583bf..318a7a94bd 100644 --- a/libavcodec/vaapi_encode_mjpeg.c +++ b/libavcodec/vaapi_encode_mjpeg.c @@ -401,6 +401,7 @@ static av_cold int vaapi_encode_mjpeg_init(AVCodecContext *avctx) static const AVCodecDefault vaapi_encode_mjpeg_defaults[] = { { "global_quality", "80" }, { "b", "0" }, + { "g", "1" }, { NULL }, }; diff --git a/libavcodec/vaapi_encode_mpeg2.c b/libavcodec/vaapi_encode_mpeg2.c index 42ddb0a284..0185870808 100644 --- a/libavcodec/vaapi_encode_mpeg2.c +++ b/libavcodec/vaapi_encode_mpeg2.c @@ -355,7 +355,7 @@ static int vaapi_encode_mpeg2_init_sequence_params(AVCodecContext *avctx) *vseq = (VAEncSequenceParameterBufferMPEG2) { - .intra_period = avctx->gop_size, + .intra_period = ctx->gop_size, .ip_period = ctx->b_per_p + 1, .picture_width = avctx->width, diff --git a/libavcodec/vaapi_encode_vp8.c b/libavcodec/vaapi_encode_vp8.c index 2026e3276b..e4755687a8 100644 --- a/libavcodec/vaapi_encode_vp8.c +++ b/libavcodec/vaapi_encode_vp8.c @@ -66,7 +66,7 @@ static int vaapi_encode_vp8_init_sequence_params(AVCodecContext *avctx) if (!(ctx->va_rc_mode & VA_RC_CQP)) { vseq->bits_per_second = avctx->bit_rate; - vseq->intra_period = avctx->gop_size; + vseq->intra_period = ctx->gop_size; } return 0; @@ -196,11 +196,6 @@ static av_cold int vaapi_encode_vp8_init(AVCodecContext *avctx) { VAAPIEncodeContext *ctx = avctx->priv_data; - if (avctx->max_b_frames > 0) { - av_log(avctx, AV_LOG_ERROR, "B-frames are not supported.\n"); - return AVERROR_PATCHWELCOME; - } - ctx->codec = &vaapi_encode_type_vp8; // Packed headers are not currently supported. diff --git a/libavcodec/vaapi_encode_vp9.c b/libavcodec/vaapi_encode_vp9.c index fa77b9b298..1393e25ae2 100644 --- a/libavcodec/vaapi_encode_vp9.c +++ b/libavcodec/vaapi_encode_vp9.c @@ -72,7 +72,7 @@ static int vaapi_encode_vp9_init_sequence_params(AVCodecContext *avctx) if (!(ctx->va_rc_mode & VA_RC_CQP)) { vseq->bits_per_second = avctx->bit_rate; - vseq->intra_period = avctx->gop_size; + vseq->intra_period = ctx->gop_size; } vpic->frame_width_src = avctx->width; @@ -86,6 +86,7 @@ static int vaapi_encode_vp9_init_sequence_params(AVCodecContext *avctx) static int vaapi_encode_vp9_init_picture_params(AVCodecContext *avctx, VAAPIEncodePicture *pic) { + VAAPIEncodeContext *ctx = avctx->priv_data; VAAPIEncodeVP9Context *priv = avctx->priv_data; VAEncPictureParameterBufferVP9 *vpic = pic->codec_picture_params; int i; @@ -102,7 +103,7 @@ static int vaapi_encode_vp9_init_picture_params(AVCodecContext *avctx, break; case PICTURE_TYPE_P: av_assert0(pic->nb_refs == 1); - if (avctx->max_b_frames > 0) { + if (ctx->b_per_p > 0) { if (priv->last_ref_dir) { vpic->ref_flags.bits.ref_frame_ctrl_l0 = 2; vpic->ref_flags.bits.ref_gf_idx = 1; @@ -174,7 +175,7 @@ static int vaapi_encode_vp9_init_picture_params(AVCodecContext *avctx, vpic->filter_level = priv->loop_filter_level; vpic->sharpness_level = priv->loop_filter_sharpness; - if (avctx->max_b_frames > 0 && pic->type == PICTURE_TYPE_P) + if (ctx->b_per_p > 0 && pic->type == PICTURE_TYPE_P) priv->last_ref_dir = !priv->last_ref_dir; return 0;