From patchwork Sun Oct 8 20:01:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 5473 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp1906896jah; Sun, 8 Oct 2017 13:04:57 -0700 (PDT) X-Received: by 10.223.134.157 with SMTP id 29mr6989902wrx.72.1507493097642; Sun, 08 Oct 2017 13:04:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507493097; cv=none; d=google.com; s=arc-20160816; b=i0S7z129KinS5MuN+FjasQsDado1zFQRxq6wtDZiZaVRnWFmlbSjPTRqTH+rb5eaJ7 THi58uys7Yxe7GglnMVXOjFgwRbDWKC92d6VVMpTNpgvvQ2etV+kN6eNg7s3MKVhYxxT DrBbPCMOeMJJ+WqJfppnqN6UqgncnsL2ZH3PPoU1TgP+e5vMdHbLlb/htbkVCP26wnQF eGeIN3cJlDLAvW3hY1BGwV94sNgB4ObYdbSd5oCEYDPX/rdo1iHR9g5Rr4MZBUC0UagQ YfHErAE6NCycyHbAu5y6dOtLL+19kiDCpkt9T02zBmgBjhWLhkz4dh+fWnAAzC4m7qCW 76aQ== 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=2etDjWkoc8p2l8V2ZyLcEpY0yBAeWqzuqrtbzD8H6kg=; b=VpJTH6du12vJ51DYU+R9xtokxgrdxJDke47zDoouoE85ttg/hi++bF2/lD1kPtQ65C QHm5l6eDJOQhG4BKpxD06oleQd/gljL02a3ksc7PNt4ggAb9icboognEDNCvz9D1Zjke tG4uDgu3zLRQndz1ee7XjIofJVhhV3ixwXucu9QGBD+b33pH2VfxYPLFUFvVpRqFO8GK uCzSbdJ6d5VjmJK3fzvy2bta/ZtA/rs9L4VFnVi8DNub0DHIBH+V8i8f9wY8kWVN7P40 6ivX7dpauWrHRqPKm2cAyaUakfQZ3X9EhIfZacr2l28GAF218sTd8ZFcAMaMOAuKLGfX 9Gdg== 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=P0v1DJYe; 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 e204si5650744wma.128.2017.10.08.13.04.57; Sun, 08 Oct 2017 13:04:57 -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=P0v1DJYe; 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 6437C689EA2; Sun, 8 Oct 2017 23:02:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 89B90689E82 for ; Sun, 8 Oct 2017 23:02:14 +0300 (EEST) Received: by mail-wm0-f54.google.com with SMTP id t69so17664055wmt.2 for ; Sun, 08 Oct 2017 13:02:16 -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=vXx/vrdP+8drQk40vHFjzXk7gGggS+n9ipEOOdOT+5A=; b=P0v1DJYeiTN4WKHJO63MJDF0LnQZrrUueuASKGiT/BO9MSPdiiISQT9plzjTybklcb lhFpA2xTZswXEvEujHMAi8OLCsL/n9/qwU9KAZ/c5hreqyTHEV001T7YPTmQUl5iYR9m jbto6cGSYTB6ftE21xbu2FOhxZ/qc2ZJv+vJ2vwQDSpGSpkcCdnJIQ9XYJ05uS85n+qD p0SAjRToXpsXSXOIM+fVVZi8Pq7iJnLSEv6XOLRJgPTub0JvhuPRnssenyozXIYA50KU 552DLhGDXWaf0W/stK4AIqmeoOcBeT+QDsj2ZGql7xupEuNW+EmAKgpXVIH1v3iwWD4j hwLQ== 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=vXx/vrdP+8drQk40vHFjzXk7gGggS+n9ipEOOdOT+5A=; b=hSDcNGQUweRLmanRB3YKXpknEBqa0ZMFKJ5TxGm2EkY8q0SfuhZY2DyA+Cu8Dx6oWQ jzQ+gb9FCQIro4f0m1yqKk2fX76OU07rWW9Z9ump3YptpoPjUB1Tw7cLXGUx+S+TKGaJ Zq2ZUZVw3YbARX5UdHeGH6A5c959OBiTtu6m0L0EQmk4fhkY0NF3HvsXXzvZguHQl0ur sXZ/zL9eEqOpV6Z0rzYNayODFw/7ZCKOdOTxlX//WRcVN/yMrqbWSFchpUeMEatcSNC0 lNeMz6p3ui1BxfTRFpyQpJrMjCdOejJ+XiKjviObg/fBRqajsNOQ+tRnQaXvLIw3QRbj /+4A== X-Gm-Message-State: AMCzsaUJh23ZuJNW8z7D4spwWi/Y3Kpgo/jCaaUaM0C+HgfwdG9bCYdi nx7XIhSk0djIqizEq4nX0Q4EON1w X-Google-Smtp-Source: AOwi7QDPGRtjjSFRq8tiad8VB+l4fp9wxdEvD0wwR4K6sR8KapXABygU3EkTf5nwuaTDecQ99H3Z4A== X-Received: by 10.223.176.75 with SMTP id g11mr7463477wra.211.1507492935613; Sun, 08 Oct 2017 13:02:15 -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 x49sm2897856wrb.25.2017.10.08.13.02.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Oct 2017 13:02:15 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 8 Oct 2017 21:01:52 +0100 Message-Id: <20171008200154.4873-19-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171008200154.4873-1-sw@jkqxz.net> References: <20171008200154.4873-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 18/20] vaapi_h265: Add support for AUD NAL units 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" Matching the H.264 encoder. (cherry picked from commit e3e8eab359238486dc233f7aa89b7bb3cb19ec38) --- libavcodec/vaapi_encode_h265.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index 4edd53a73c..3ae92a7a09 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -42,6 +42,7 @@ typedef struct VAAPIEncodeH265Context { int fixed_qp_p; int fixed_qp_b; + H265RawAUD aud; H265RawVPS vps; H265RawSPS sps; H265RawPPS pps; @@ -52,13 +53,16 @@ typedef struct VAAPIEncodeH265Context { int slice_nal_unit; int slice_type; + int pic_type; CodedBitstreamContext *cbc; CodedBitstreamFragment current_access_unit; + int aud_needed; } VAAPIEncodeH265Context; typedef struct VAAPIEncodeH265Options { int qp; + int aud; } VAAPIEncodeH265Options; @@ -117,6 +121,13 @@ static int vaapi_encode_h265_write_sequence_header(AVCodecContext *avctx, CodedBitstreamFragment *au = &priv->current_access_unit; int err; + if (priv->aud_needed) { + err = vaapi_encode_h265_add_nal(avctx, au, &priv->aud); + if (err < 0) + goto fail; + priv->aud_needed = 0; + } + err = vaapi_encode_h265_add_nal(avctx, au, &priv->vps); if (err < 0) goto fail; @@ -145,6 +156,13 @@ static int vaapi_encode_h265_write_slice_header(AVCodecContext *avctx, CodedBitstreamFragment *au = &priv->current_access_unit; int err; + if (priv->aud_needed) { + err = vaapi_encode_h265_add_nal(avctx, au, &priv->aud); + if (err < 0) + goto fail; + priv->aud_needed = 0; + } + err = vaapi_encode_h265_add_nal(avctx, au, &priv->slice); if (err < 0) goto fail; @@ -519,6 +537,7 @@ static int vaapi_encode_h265_init_picture_params(AVCodecContext *avctx, { VAAPIEncodeContext *ctx = avctx->priv_data; VAAPIEncodeH265Context *priv = ctx->priv_data; + VAAPIEncodeH265Options *opt = ctx->codec_options; VAEncPictureParameterBufferHEVC *vpic = pic->codec_picture_params; int i; @@ -529,16 +548,19 @@ static int vaapi_encode_h265_init_picture_params(AVCodecContext *avctx, priv->slice_nal_unit = HEVC_NAL_IDR_W_RADL; priv->slice_type = HEVC_SLICE_I; + priv->pic_type = 0; } else { av_assert0(pic->encode_order > priv->last_idr_frame); if (pic->type == PICTURE_TYPE_I) { priv->slice_nal_unit = HEVC_NAL_CRA_NUT; priv->slice_type = HEVC_SLICE_I; + priv->pic_type = 0; } else if (pic->type == PICTURE_TYPE_P) { av_assert0(pic->refs[0]); priv->slice_nal_unit = HEVC_NAL_TRAIL_R; priv->slice_type = HEVC_SLICE_P; + priv->pic_type = 1; } else { av_assert0(pic->refs[0] && pic->refs[1]); if (pic->refs[1]->type == PICTURE_TYPE_I) @@ -546,10 +568,23 @@ static int vaapi_encode_h265_init_picture_params(AVCodecContext *avctx, else priv->slice_nal_unit = HEVC_NAL_TRAIL_N; priv->slice_type = HEVC_SLICE_B; + priv->pic_type = 2; } } priv->pic_order_cnt = pic->display_order - priv->last_idr_frame; + if (opt->aud) { + priv->aud_needed = 1; + priv->aud.nal_unit_header = (H265RawNALUnitHeader) { + .nal_unit_type = HEVC_NAL_AUD, + .nuh_layer_id = 0, + .nuh_temporal_id_plus1 = 1, + }; + priv->aud.pic_type = priv->pic_type; + } else { + priv->aud_needed = 0; + } + vpic->decoded_curr_pic = (VAPictureHEVC) { .picture_id = pic->recon_surface, .pic_order_cnt = priv->pic_order_cnt, @@ -907,6 +942,10 @@ static av_cold int vaapi_encode_h265_close(AVCodecContext *avctx) static const AVOption vaapi_encode_h265_options[] = { { "qp", "Constant QP (for P-frames; scaled by qfactor/qoffset for I/B)", OFFSET(qp), AV_OPT_TYPE_INT, { .i64 = 25 }, 0, 52, FLAGS }, + + { "aud", "Include AUD", + OFFSET(aud), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, FLAGS }, + { NULL }, };