From patchwork Tue Sep 12 23:44:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 5123 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp297541jaa; Tue, 12 Sep 2017 16:47:12 -0700 (PDT) X-Received: by 10.223.152.6 with SMTP id v6mr13600033wrb.40.1505260032228; Tue, 12 Sep 2017 16:47:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505260032; cv=none; d=google.com; s=arc-20160816; b=Q961XrLK5Pvdo+YbzPREWAeARwJXHsuNr/DChuqcvMjeFZ3ynq8Ygz2h3JnNVcJhmc ecf05yed/g97coEkNpwBXk778ys3vIMRBRZdzgLgAvFkoy8ol9xGWhuUb/CnV78y0zpl 71cmL7X4wyUybYdjlTiilx5CtRKCOuB69JYAuXhHyXFeop0Lkx0d5JCh12kH/wwseNWV cQQpQUyGPaLRDSpv81VcsnJ1lFcZbPtZqZX12vFWtFgtCW6A6CfcUOMbjoQNW1ZJBnmz 4yWPcPWIyaCpV8v4BLoGuWW00tiuu2wTlM8BZ3P8x3vyHsvnz6/zcFFqrlRZ6xg1K9YY LHSQ== 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=KPC6WwK+9lMdYPZXDq3e9hQ+YXVWrBBYpe4eNQ3xs30=; b=drHrwiFNu+GbYY6sZy4iCwJHNRKnomCenVUMFieSY+HZuBO5aCflRqwAdhkjd56XxK let8Xb5Bbo4vcZQR7xmziTcHklEfFluUxL0yt6ZzuEGXk0Xuk/vNV0/Vw+dYPqk81M2K XVr8/KVnp23dfs9AbnY0JQKcvhtjEXC6pQWWrgxMvGPlYcGzIYBxX5hm5iqjVDQRlBa6 diZnP2TvjxJL3cxuo3UmaimDQ5M8Du9RCUDf8i01yNd2CvCnWwJLEx6b0l+AMJjjqvn0 lMV7uZU+fL1qz3cCDenc3wgTrlPQx+4KmroEyl66z3D27V3D7QOBzVoKgXF5PCr7g7eX hD9Q== 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=eK/cxYzs; 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 p5si9614479wre.41.2017.09.12.16.47.08; Tue, 12 Sep 2017 16:47:12 -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=eK/cxYzs; 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 334D6689E99; Wed, 13 Sep 2017 02:44:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f53.google.com (mail-wm0-f53.google.com [74.125.82.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8CB47689E72 for ; Wed, 13 Sep 2017 02:44:26 +0300 (EEST) Received: by mail-wm0-f53.google.com with SMTP id a137so3564804wma.0 for ; Tue, 12 Sep 2017 16:44: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=10yJGpQJFa9w2oIfqE0ajwSMFXFNlCcIGXV+jrCksUg=; b=eK/cxYzsqTNVg61ViC+LbpM6AomQ9u52iRo4fRZCLNazD35lOjtBxvVJM5AltoRpDk ZLX6zQHmjs8egv8YmbY4eWsnTnd9wo2Q5qjY3Ljemo6DlGEwq9Cf+R+ri0lR+bDU+v5i pz+6Plsb0lkd61nUuNVyQxyVNlaza08kTn/ReFt4VKTDDIwSbdJe0qQ5AQiWmcILfLBz i+1+3S48NZ+ARi3kTjbctggVNvA4kxP2DDHVioip0Pke9xB31KUDSVfh2mBuC2pu4q7D feG7obTzsttYixFjaSTauPPioblXQBfPq8SHxuTuY65l2obWwPfn5u/sgCjkZXYmHADR OL7g== 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=10yJGpQJFa9w2oIfqE0ajwSMFXFNlCcIGXV+jrCksUg=; b=nTm+aYimlbtJn8VXa+Hc44clnbrcyti8bRWTzTKkLAuXRbK8+B+4UR/0R3ry5450p+ oGg03m9JSScHWNn8sbGAT+sXZhmmaWztsIrfKwjXXud0uB+FJ06zQYqDoN7zrDgIzJze o+bx3sNEu9q9xaTx4OEZvUaue2CQ/sF8jSV4qObWErerGsLEciud/Yj7lhLnbF6l17/z eBjfTY+ZSEekJuJlpPFyF6hqJuTgGC2/l8GibMpO8T9gDVV4Gm7VwDPOoi336GYADMsV gTdiohgi5MCdWPVu5Vjq3Kbl5BhVgf7OLfaJPzmnRsxHwbKI6xg1BEjuXltwZlO1Du9N nfPw== X-Gm-Message-State: AHPjjUipI1G3DgNQ5HxeNMJ++22WJPDFtp8QstTst4SiNMM8iVpEHw+m 2eD/ZmNWDlEijRrPbDOjTs6sCERp X-Google-Smtp-Source: AOwi7QCYeDaLe9RhdzZYQnB9GXot8Z/GKEw/kQfo9pP0g6jA/dOcFkHlh65OoGxYrNgBnHW6qQJsrw== X-Received: by 10.28.166.68 with SMTP id p65mr818736wme.50.1505259871992; Tue, 12 Sep 2017 16:44: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 p193sm4378138wmg.37.2017.09.12.16.44.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Sep 2017 16:44:31 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Sep 2017 00:44:07 +0100 Message-Id: <20170912234410.14093-18-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170912234410.14093-1-sw@jkqxz.net> References: <20170912234410.14093-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 17/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 fd3edbb553..e9db041586 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 }, };