From patchwork Sun Oct 15 15:04:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 5572 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp2782936jah; Sun, 15 Oct 2017 08:06:56 -0700 (PDT) X-Received: by 10.223.169.239 with SMTP id b102mr5780357wrd.171.1508080015983; Sun, 15 Oct 2017 08:06:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508080015; cv=none; d=google.com; s=arc-20160816; b=d+B8GiM0S+pYERNXnrGtFsroxnZ9qgc7STguReLz6DnYyyqbwoHDS1/7r4xC5POY5p JstHQcG4CRPkSmlYtxhnuzUQc8PaZZbWU1diOxPcdRdPOFK5sC9YXlxZffU7AltDPU5h Vvi3tVNRMVz4DqSu2Qebsewe4D+TQqTDQZTXMp1c6oghnTv9dniO2+rp1vrFdrwbtgNn Saz1XalZbpGDQbTsKzBpXkLo82tX6DkY3jpjUgYLTWcAadUKSnLNCWzM8VCfyypHZZw9 O07I07zb1idBpcnZkMNvk2fuZtKq+mSxz6PEV0mZYApVGBuQpT3giZWWQT9eXmR78M9E 3HoA== 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=N5pphVAzGSj1Hs3STe9n27JCEy52l1fdJNzv77VOSAQ2cGO4oD0CFd/riQwpz6ZEdD GxmtglWV1qIefIusJHspOlJb04KkKib1WXmXvh1JLKenTogUed1KgbQoPuUKqF8gow7d GYgPA2akHPbdM5oYbv2W+NFktb1JioNpCYj6h14CVFYXpFbI0iDNZhRDgJfmwy8LAZbH 7P77nbygOiFlPjtGGuO0/Uk7TAM9xWbbiWoeyBXHucgustY/zVlqsaB6+L0ag5CgEs6q qJzRp71XEBuA5y7aq51/z8QGRLMHJvPVe0xWOplCA7+/kYES7a4KkGSl7audQvwvkpTF QDDQ== 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=Cyh2XoLt; 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 p140si3999901wmd.112.2017.10.15.08.06.55; Sun, 15 Oct 2017 08:06:55 -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=Cyh2XoLt; 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 5658668A203; Sun, 15 Oct 2017 18:05:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f49.google.com (mail-wm0-f49.google.com [74.125.82.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2F89A68A1CE for ; Sun, 15 Oct 2017 18:05:07 +0300 (EEST) Received: by mail-wm0-f49.google.com with SMTP id l68so29579970wmd.5 for ; Sun, 15 Oct 2017 08:05:11 -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=Cyh2XoLtB6pM3oN+35R+TTD4VFkESrEJPBYHqOFAOMzdQF8muq5ZqiNixsIdGRVSQe tVMt0eyeVrHbdaahQGCDhFAPx9DtdhGjLnZlC35sloDNefxPdMxsZzYze+I+glRGN0+V P++0R28KSRupvUHWn7uRIrJKalkwmhIFa9sc0qXaRA/1AIlF7m21wax7cqaDT7O5CezK pPhtjGaCIXiE6+2EUvTdFsx2oT7rUrO+i+vPR+/0sKNxp6UvK+K2R/a539ZGr/fXXw/+ 2eabxlzrywTduNaH/yH/OA9+l50mU62JH6EU+td0gceYtYxiDw3f2WezoH+edJ8cDhqN dYIg== 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=KyeAVJIreHAYgUEGS1OrEDvKz4nKnG2PsrCrP92p3PP8YH+DiQ8BG335mowp3q3SN9 W7ZTzyKDX7J26PtTngelewqMgG5L6PrflqRRmOGyJs0MwzDAQNl6qo1FPFgGbnuYuuMr 1loV/mE9z6TZqc9A5LYY9AQ5v7B9Pdcv1FlyNpHpr7y8MJbCylAsGiR7+4m8dR2R2xXP NQgfhA/rRy3pju67gVL5QiqwRkCum204rdp8IHlgFtegkW6BcOhkQvFTvxxa81p5ez9G XMSKu9q2j9+uynWIP61lYrtrvnx2mJrFNrz+dbdz/GECmwRRADTYpLuC/EsslzFbFV17 tpUQ== X-Gm-Message-State: AMCzsaXrg6N25v9MqCqo626wAlR/ZxmPji0sCKqRRtblP4+NkI3aGD3n GcIpm0i7N3dU77Vdp+NhKs5BZ+h6 X-Google-Smtp-Source: AOwi7QCwZKA70Ktt4dklaI3g9TDyfCH/2hE2A5WyMYRZHr0afZGe4HXcP5jvV/hH/XFzdJuUEg9D+w== X-Received: by 10.28.51.19 with SMTP id z19mr4982434wmz.18.1508079910366; Sun, 15 Oct 2017 08:05:10 -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 h4sm2080508wre.13.2017.10.15.08.05.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Oct 2017 08:05:09 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 15 Oct 2017 16:04:45 +0100 Message-Id: <20171015150447.18058-19-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171015150447.18058-1-sw@jkqxz.net> References: <20171015150447.18058-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 }, };