From patchwork Tue Sep 18 22:31:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 10393 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp15189jap; Tue, 18 Sep 2018 15:37:00 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbcyIkc6jfyyddAO3egVwGI7WPii+jiMiH4N3ocwbH9HiWMdOJdwHcw4XdPk6Dl0+qENfW3 X-Received: by 2002:a7b:c04c:: with SMTP id u12-v6mr11478383wmc.24.1537310220737; Tue, 18 Sep 2018 15:37:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537310220; cv=none; d=google.com; s=arc-20160816; b=PYUfn8/gEad9kxuPLcF+EdV31D46w+fuFdo9Vg2Kqr0yb6YzEKFGST1kVgBYykwxCI 3k+Z/5J6Z3KQtKFZQxlRjNKKujicnNqKGHPtCvKJPeNfhHgRveKFtBeIHsSZ12MgrRL+ GUVkuVMWi0GQvRLqFzyr8cAW7SsaEoJDXnlXajqZkVHUeiscUzHK9RR+5KHpPOpC22Wz Z9a5BsEtRDUaD+j40WwVVW9Z2rPi8980yMgPO6qrpZafJJJgV3rpALkCAb0HD367GiP3 zbDGDLrhmpfHC15syQbsRzY3TpzjzTXoYj08ccFQqlCOSD2PZfanA76XCw5DVGaYPoZG Szbw== 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=tPsvJJA8z2Zp/rHGeB9jRztHY06PPvvJgtTIJImikbw=; b=0KMDctabjf2qKPSTrJCxls3s68sU8ovoOHLeINhwJBDg2jq8PFKguCm5R050VOtcHK PYDzjljeL4xbrbY+CGDKemvipBnAkxhvF29Ursm+YA3wT8xjyhMZuyfMs73T58Us8zy5 pTAsWaAGnd9dOPiIC5y+2y8YyePutgvJrevzcUs37o+UKXQGDwPo+h2Ix0h4p50lnu5l lbkjgb4gWaXgQX1WveVd0WxMZxkzstH28P4e2S3/Vay1jAhsvl5xRuH9cI30f1KEg2g3 t1Jf1/NIOnVg5qQzQVIQVnj9N+T2n35AhgfONzwCT8n5xLsvIRa0+saWS4Nm1rYSTwCB KPlg== 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=Ka3VnwVv; 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 t66-v6si498176wmf.31.2018.09.18.15.37.00; Tue, 18 Sep 2018 15:37:00 -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=Ka3VnwVv; 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 6A3D268A704; Wed, 19 Sep 2018 01:31:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6078068A0A0 for ; Wed, 19 Sep 2018 01:31:48 +0300 (EEST) Received: by mail-wr1-f49.google.com with SMTP id w11-v6so3741209wrc.5 for ; Tue, 18 Sep 2018 15:32:01 -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=44PN9T1Z0piCZuQPhz8NBVVw06L8ko8712LIZ+1KZLc=; b=Ka3VnwVv/MKLJuv9ZbF+6YBuT8ilb/Q3O3xbz8uzXIPRkNPpfwW9zVZMFM2kBmI6rg ew7DTyeONFLrggUpDGhOWGNsl8OKtNBN9+siEdaHL+1mrYzdgTijRsGGpPheyuXV7stD ix8bOC58D8jmvI8owaWpGm6myQ8kiyVXrBE9g9ULs7y4AVH1iJNMyHl/lXKXb6O6kfqx ADnnWkKBYuseML6v/lnaKh32AekjjpZDftl+XhvF9ule7cZUiVc12wi9u7ITA7XVbiD+ n061heGhK7kryWRwpImBc5AK7Zvh5MvdG21vPnumsLF/ikEY7xF1QaWJ3xiaySXhaqGG gEWw== 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=44PN9T1Z0piCZuQPhz8NBVVw06L8ko8712LIZ+1KZLc=; b=RWni5h4Vct7555ueO8wwQw49RPwbHKJnV+/n8W5kvldzlAQQvXFv7UGziPG+m3A8RO 07HIMxEe90D0Z1QeYfwkRSexhngkIeURq7wxsaCVt851hRNtYtgRL2ydViSEdT9AkF/0 uG2fcGL7Yj6si4K7eFACV7RkudjjNCXEwtKQRHQpx7C1G4EeSUQK0X7k7W1rCHUMWxdN AP/VyS0vtqbniZo9B/vE5vW9g8XBUZ62FkfiK/j0NAwuNyskcuJDs9Mm1/Y5zZQiXp1d wO5TDX586POx+bPFarQD93BK3xVci9fHnHtg6fyqrbvH3jq0he3bSBRZKlZ4nFube14T +Axg== X-Gm-Message-State: APzg51ComB4NqX5z4R8YJRMuf08WNMRTj0eVFf6xycqS/5UQ3ygY7jL8 MlO6pYJDktPnbTd9qwmckPi6fBazXEc= X-Received: by 2002:a5d:64cd:: with SMTP id y13-v6mr23525115wrv.99.1537309920652; Tue, 18 Sep 2018 15:32:00 -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.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Sep 2018 15:31:59 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Sep 2018 23:31:16 +0100 Message-Id: <20180918223116.14322-39-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 38/38] vaapi_encode_vp9: Support more complex reference structures 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" --- libavcodec/vaapi_encode_vp9.c | 104 +++++++++++++++++----------------- 1 file changed, 51 insertions(+), 53 deletions(-) diff --git a/libavcodec/vaapi_encode_vp9.c b/libavcodec/vaapi_encode_vp9.c index 94f29c0483..97142dcc49 100644 --- a/libavcodec/vaapi_encode_vp9.c +++ b/libavcodec/vaapi_encode_vp9.c @@ -32,6 +32,10 @@ #define VP9_MAX_QUANT 255 +typedef struct VAAPIEncodeVP9Picture { + int slot; +} VAAPIEncodeVP9Picture; + typedef struct VAAPIEncodeVP9Context { VAAPIEncodeContext common; @@ -43,22 +47,9 @@ typedef struct VAAPIEncodeVP9Context { int q_idx_idr; int q_idx_p; int q_idx_b; - - // Stream state. - - // Reference direction for B-like frames: - // 0 - most recent P/IDR frame is last. - // 1 - most recent P frame is golden. - int last_ref_dir; } VAAPIEncodeVP9Context; -#define vseq_var(name) vseq->name, name -#define vseq_field(name) vseq->seq_fields.bits.name, name -#define vpic_var(name) vpic->name, name -#define vpic_field(name) vpic->pic_fields.bits.name, name - - static int vaapi_encode_vp9_init_sequence_params(AVCodecContext *avctx) { VAAPIEncodeContext *ctx = avctx->priv_data; @@ -88,6 +79,7 @@ static int vaapi_encode_vp9_init_picture_params(AVCodecContext *avctx, { VAAPIEncodeContext *ctx = avctx->priv_data; VAAPIEncodeVP9Context *priv = avctx->priv_data; + VAAPIEncodeVP9Picture *hpic = pic->priv_data; VAEncPictureParameterBufferVP9 *vpic = pic->codec_picture_params; int i; @@ -98,65 +90,71 @@ static int vaapi_encode_vp9_init_picture_params(AVCodecContext *avctx, case PICTURE_TYPE_IDR: av_assert0(pic->nb_refs == 0); vpic->ref_flags.bits.force_kf = 1; - vpic->refresh_frame_flags = 0x01; - priv->last_ref_dir = 0; + vpic->refresh_frame_flags = 0xff; + hpic->slot = 0; break; case PICTURE_TYPE_P: av_assert0(pic->nb_refs == 1); - 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; - vpic->ref_flags.bits.ref_gf_sign_bias = 1; - vpic->refresh_frame_flags = 0x01; + { + VAAPIEncodeVP9Picture *href = pic->refs[0]->priv_data; + av_assert0(href->slot == 0 || href->slot == 1); + + if (ctx->max_b_depth > 0) { + hpic->slot = !href->slot; + vpic->refresh_frame_flags = 1 << hpic->slot | 0xfc; } else { - vpic->ref_flags.bits.ref_frame_ctrl_l0 = 1; - vpic->ref_flags.bits.ref_last_idx = 0; - vpic->ref_flags.bits.ref_last_sign_bias = 1; - vpic->refresh_frame_flags = 0x02; + hpic->slot = 0; + vpic->refresh_frame_flags = 0xff; } - } else { vpic->ref_flags.bits.ref_frame_ctrl_l0 = 1; - vpic->ref_flags.bits.ref_last_idx = 0; + vpic->ref_flags.bits.ref_last_idx = href->slot; vpic->ref_flags.bits.ref_last_sign_bias = 1; - vpic->refresh_frame_flags = 0x01; } break; case PICTURE_TYPE_B: av_assert0(pic->nb_refs == 2); - if (priv->last_ref_dir) { + { + VAAPIEncodeVP9Picture *href0 = pic->refs[0]->priv_data, + *href1 = pic->refs[1]->priv_data; + av_assert0(href0->slot < pic->b_depth + 1 && + href1->slot < pic->b_depth + 1); + + if (pic->b_depth == ctx->max_b_depth) { + // Unreferenced frame. + vpic->refresh_frame_flags = 0x00; + hpic->slot = 8; + } else { + vpic->refresh_frame_flags = 0xfe << pic->b_depth & 0xff; + hpic->slot = 1 + pic->b_depth; + } vpic->ref_flags.bits.ref_frame_ctrl_l0 = 1; vpic->ref_flags.bits.ref_frame_ctrl_l1 = 2; - vpic->ref_flags.bits.ref_last_idx = 0; + vpic->ref_flags.bits.ref_last_idx = href0->slot; vpic->ref_flags.bits.ref_last_sign_bias = 1; - vpic->ref_flags.bits.ref_gf_idx = 1; + vpic->ref_flags.bits.ref_gf_idx = href1->slot; vpic->ref_flags.bits.ref_gf_sign_bias = 0; - } else { - vpic->ref_flags.bits.ref_frame_ctrl_l0 = 2; - vpic->ref_flags.bits.ref_frame_ctrl_l1 = 1; - vpic->ref_flags.bits.ref_last_idx = 0; - vpic->ref_flags.bits.ref_last_sign_bias = 0; - vpic->ref_flags.bits.ref_gf_idx = 1; - vpic->ref_flags.bits.ref_gf_sign_bias = 1; } - vpic->refresh_frame_flags = 0x00; break; default: av_assert0(0 && "invalid picture type"); } + if (vpic->refresh_frame_flags == 0x00) { + av_log(avctx, AV_LOG_DEBUG, "Pic %"PRId64" not stored.\n", + pic->display_order); + } else { + av_log(avctx, AV_LOG_DEBUG, "Pic %"PRId64" stored in slot %d.\n", + pic->display_order, hpic->slot); + } for (i = 0; i < FF_ARRAY_ELEMS(vpic->reference_frames); i++) vpic->reference_frames[i] = VA_INVALID_SURFACE; - if (pic->type == PICTURE_TYPE_P) { - av_assert0(pic->refs[0]); - vpic->reference_frames[priv->last_ref_dir] = - pic->refs[0]->recon_surface; - } else if (pic->type == PICTURE_TYPE_B) { - av_assert0(pic->refs[0] && pic->refs[1]); - vpic->reference_frames[!priv->last_ref_dir] = - pic->refs[0]->recon_surface; - vpic->reference_frames[priv->last_ref_dir] = - pic->refs[1]->recon_surface; + + for (i = 0; i < pic->nb_refs; i++) { + VAAPIEncodePicture *ref_pic = pic->refs[i]; + int slot; + slot = ((VAAPIEncodeVP9Picture*)ref_pic->priv_data)->slot; + av_assert0(vpic->reference_frames[slot] == VA_INVALID_SURFACE); + vpic->reference_frames[slot] = ref_pic->recon_surface; } vpic->pic_flags.bits.frame_type = (pic->type != PICTURE_TYPE_IDR); @@ -175,9 +173,6 @@ 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 (ctx->b_per_p > 0 && pic->type == PICTURE_TYPE_P) - priv->last_ref_dir = !priv->last_ref_dir; - return 0; } @@ -213,7 +208,10 @@ static const VAAPIEncodeProfile vaapi_encode_vp9_profiles[] = { static const VAAPIEncodeType vaapi_encode_type_vp9 = { .profiles = vaapi_encode_vp9_profiles, - .flags = FLAG_B_PICTURES, + .flags = FLAG_B_PICTURES | + FLAG_B_PICTURE_REFERENCES, + + .picture_priv_data_size = sizeof(VAAPIEncodeVP9Picture), .configure = &vaapi_encode_vp9_configure,