From patchwork Sun Aug 20 22:41:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 4777 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.37.132 with SMTP id g126csp2344121jag; Sun, 20 Aug 2017 15:44:45 -0700 (PDT) X-Received: by 10.223.158.130 with SMTP id a2mr10011429wrf.212.1503269085376; Sun, 20 Aug 2017 15:44:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503269085; cv=none; d=google.com; s=arc-20160816; b=K8uS6OogBiX4jzq4E3LhpYdAqVltRPV5P1222TkfIyPLRwGF7UA6OOkUYFayIEf+5j 73Jq2Zfr2phoJYTcddq7oLMlLnTKdoKEY9mSry8rN3Z37Orixtu2eYtu3O0VguzTPDRK sxZ33d6OSnZ8/JU8/VNCbDVyOwAt9DXMNLNkhrjzl+Era4spnaIrdudZ1hb61WR2yOFD CfmhX2yKmVGEPideblH9+KwY+KwjMRauM2TqfX9gP2rOeaH8eZIAMwh/oOjzyuASwFa2 rKkv/Lhl0VQzRQZr0QtBw8s3zBnHcvRDkrNdiD8B8hgZ/IGRtY5+XTDVbC9TeBVbfCYK vzQQ== 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=9hUcUxUqDK0ypeHJofz79rya/hptpMoizjA7UVwS2+4=; b=kCSZOg0dQYVbziAA1MxmVWCFAXYIAOq1SVO1NCncqhjcpL32fTxm7IZzNMtwmNGDXL c22PyS31sJkyqiFWtNbRwEvvWWem7kSEI2YjrnSd33/rcw0115XtyhXc36lg5vtKFLGo ipLgdpJxBW34nophmcdcINJDbEfzEx2HlQRJL2bgGMWqsvm3DngoljoIv9CPnUAnPgVS rFVp1jkZtl5tiolNeg1HHH4gd4gzV9Gf+POY/b0G/kG9vokwDgNA6P8GtDCDrxrRVp9w +p33PRV7QkdxvfVocjv3CkNAPp5ASOyMicuBvZRN3tcf77Tc0c04tyC5C1TioIvZ4Dg7 Lbbg== 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=DJtJcmkt; 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 130si4879370wmf.220.2017.08.20.15.44.44; Sun, 20 Aug 2017 15:44:45 -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=DJtJcmkt; 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 7DF27689B6B; Mon, 21 Aug 2017 01:42:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f169.google.com (mail-wr0-f169.google.com [209.85.128.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1293F6891EE for ; Mon, 21 Aug 2017 01:42:11 +0300 (EEST) Received: by mail-wr0-f169.google.com with SMTP id k46so9447437wre.2 for ; Sun, 20 Aug 2017 15:42:17 -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=7ki/3rXZB0+PAIjUa47TYEw4v8DFZWA5d2led9ZdJAM=; b=DJtJcmktajWVz7Ma3X2DpMb7gEFKSVgl7X6Kn1BsSC5ph9huCnMv7fho1RzkiswTcW rPBkL7ra2bUGN9zgz1hXJUrV0JIijR8ZOIMgXM8S+5G6Lj0qAGMzL4ZPGAptQ64mpdIO rA1espYus63oherJUiLq5DWVY6pncjuJbNDD9G4kmrZaKvAzdZ+YkFr9HxeKXdUd3GJU OuwuCoobAxYwuLnQw2rOG5wNjL97SiBwX0Ekm3A7OWdaZzfYwehFTc1/XTAYP11l1mBi qZkhmkdrxhct5GxDqVC0XJXjyq3JOU6pCSZ3+qrMbJzSaRq/nx801ikUN21QNHSipZ0G tEww== 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=7ki/3rXZB0+PAIjUa47TYEw4v8DFZWA5d2led9ZdJAM=; b=c3dMJ4yTMYHIdKaYw9QvrfRosphoxeE4OLNUOdpIbA3y0x0FekB+iW+zgTF2S0U50B m4sdNDkHb3Mw4hPjl3sqPUzvE0XehMuAQs+sigJMnsQpqX+nAXFtPd2w7aEL2oMrYG6R vYltp1bFmrWxGha1IJn0Ip8PlAdqJ26+ce0prOTEMLWIUZ8bmOpNMzX1aTfy4AL1ZTl5 0LxC9N5VJ6TccQBRk5TwFhKStkXb5uJmTfFF+euLgROBL5rQ6a6AL03sZ6VO7ID+xUGc 8IL3OZQmCTegSSFr9S6zqEgQEUyw7FtkqV1/TCwrcbV9JdcZTI+5yYbhchIXJ0K92TZM sYew== X-Gm-Message-State: AHYfb5g4tVo3mcmGyOomXfA9hwb8Mdbmyt8yx/Yeq+eglzR78tFTeSeZ UHC5RjJLcnrQIpoKDc0= X-Received: by 10.28.194.138 with SMTP id s132mr6109188wmf.29.1503268937193; Sun, 20 Aug 2017 15:42:17 -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 f9sm5391116wmf.18.2017.08.20.15.42.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 Aug 2017 15:42:16 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 20 Aug 2017 23:41:46 +0100 Message-Id: <20170820224146.21289-19-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170820224146.21289-1-sw@jkqxz.net> References: <20170820224146.21289-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 18/18] 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 84dd0cf199..2370d1674f 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, @@ -902,6 +937,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 }, };