From patchwork Tue Sep 12 23:44:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 5119 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp297092jaa; Tue, 12 Sep 2017 16:46:32 -0700 (PDT) X-Received: by 10.223.135.102 with SMTP id 35mr13218673wrz.160.1505259992441; Tue, 12 Sep 2017 16:46:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505259992; cv=none; d=google.com; s=arc-20160816; b=PdGnMiLEyZ4ZABKqYB76+/nYOCFhJY07RJl7jgaFgGZZZ3FK/vrgCoG6PnFhLUeHI5 umhCuSo1CAF/b8Gnzm3axb4QoDdCoGWDAreLpBNZrT2uTAPjmUOGhFyt2FbgMgcAo/Qm 8kKP9YutmAmq3vYNFD7EcnLcwzE460f2jUNPKa7PziaPwTo5ZZT7V3Ad91TVbHdKBJ4n dCSBhHZw+LJZaIBr0z3YfLlytlTJCr7XI0EPh5ac96Olls/WxJDEQMNl11SQ8/tc1O4I nbJVAg4B4FIJpnKVgzi5O3dK+8Zz9xFM0a/WcKOKu7c/g8kL0AWpW4xvWJzUaWjc/+br XN8Q== 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=asggm/RPUp01kdtB4sYtOI2G2b4jyfA9j0IatbZNF/E=; b=Jt/hbpvI6GVwi68RDDpk5vgJ7aMP7tM1BDi2wYT06Dk7R3dmCJopHHe4AsNvrt4Jzv JL4n/dFrqKHVBuCqaHhGMRvu5qfc6zo0ZyBT7QJh+Ip8yQqgskCGH5mCbHH3PaIc+1q3 STql8f2qCAiCM7+5CAKO58trQNVXzeSqA3WkTde11wQzZmKWsRqChWhH4XX4dHJnX9s6 V7aiTwPOfSZqKx2IBQIXGKCwPpqMKmSiG1aN2xjzy6nMk1vtl+DpUz5oykj9bosI6lfW 00K7FcJMJnebbTPgNdPbudX82XFm8jvDwWL+O7Ik2R6iqonZjtEHvKP3gQMh154rKYtS UvEA== 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=rS3xu3+G; 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 6si4033629wrm.70.2017.09.12.16.46.32; Tue, 12 Sep 2017 16:46:32 -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=rS3xu3+G; 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 86529689E68; Wed, 13 Sep 2017 02:44:25 +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 5A186689E46 for ; Wed, 13 Sep 2017 02:44:22 +0300 (EEST) Received: by mail-wm0-f49.google.com with SMTP id g206so1774984wme.0 for ; Tue, 12 Sep 2017 16:44:28 -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=A9fiX8KTqachBEvofu+gKH42U06rme+/3o0N16lqZZ0=; b=rS3xu3+GJC95eiQFbkBkILxHlMyoFRdZuYF9QnBpBu1ksL7fzYCrBNOO0+ulgPvqxb N0L1/dZ9KYKTmQeZfcl0RVs3oGZEhThqIB13m8x5SlYfyDEHGekW0EWZrTYydk5AHVb3 /NGMi28odMy89nE3MeJhBRYlsxeOFiW9mEdX4Bfr4Lr8Biut0vI9li7GWXeSn+oQFNtp F7k2p2gByffVXPuTRKHR0/55amjUzm7ideQx2NveTLYtMQ0zazOpjsgEGXCGFrJ0uZQG rRyNmALZQNumvmwo3brFoXnvtjAjflBPPdts4pS7nHF4VjUL4rjX+fOa5Pi89AzxKq8i FWhA== 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=A9fiX8KTqachBEvofu+gKH42U06rme+/3o0N16lqZZ0=; b=LlpsjfkSNB/AG/FB3C/Fgv6lDGeX0WUVV/g+ypP4c6TGpXReWPWZwMtoGxH5hcpxRU NTepzLoX2qJCRcrKlyDGfT8oufcoGCjB7/QBQaZXVrJiyyhGexnMyRWfmmHUOMMf9Wrc cfmmpCHVVifp665IklYRwHiVVKIK1CkQhTPIWgpgM1XjGYqhsyNB/+jIhGZsdkbECTPa Se8qxfPr5P1Z0XvreHIq3ncN/Vsz/pocNaW1sL4IMEASw2ypJRH8YHxaL2o5f/ndNV6c EwQlBwC8MW7qq0ZGk20hgg0c+fB67z661Ky7GmVVF+lPTXigsYZdQ/9p2LQ0GDYUNkhM 4l4Q== X-Gm-Message-State: AHPjjUhdVspADNiXENUYPKsLGWrzdzlUUKm8/GrGlJ1JZ7tDcUL7em6u C5vWtzjsk3tAZDSetUw= X-Google-Smtp-Source: AOwi7QApZhuDpgaxG2N7GqUfv9uTfYeIVGrnSJw/SFprafoigvXq9dhHtFsyaDzKFDtceafS37r5bg== X-Received: by 10.28.191.88 with SMTP id p85mr945497wmf.135.1505259867648; Tue, 12 Sep 2017 16:44:27 -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.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Sep 2017 16:44:27 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Sep 2017 00:44:03 +0100 Message-Id: <20170912234410.14093-14-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 13/20] vaapi_h264: 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" Adds a new private option to enable them (off by default). (cherry picked from commit 820a4483af13cf6fd51f13638e57bcd1c3f629d4) --- libavcodec/vaapi_encode_h264.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index d5fbc54c0b..56e10074c8 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -53,6 +53,7 @@ typedef struct VAAPIEncodeH264Context { int fixed_qp_p; int fixed_qp_b; + H264RawAUD aud; H264RawSPS sps; H264RawPPS pps; H264RawSEI sei; @@ -77,6 +78,7 @@ typedef struct VAAPIEncodeH264Context { CodedBitstreamContext cbc; CodedBitstreamFragment current_access_unit; + int aud_needed; int sei_needed; } VAAPIEncodeH264Context; @@ -86,6 +88,7 @@ typedef struct VAAPIEncodeH264Options { int low_power; // Entropy encoder type. int coder; + int aud; int sei; } VAAPIEncodeH264Options; @@ -145,6 +148,13 @@ static int vaapi_encode_h264_write_sequence_header(AVCodecContext *avctx, CodedBitstreamFragment *au = &priv->current_access_unit; int err; + if (priv->aud_needed) { + err = vaapi_encode_h264_add_nal(avctx, au, &priv->aud); + if (err < 0) + goto fail; + priv->aud_needed = 0; + } + err = vaapi_encode_h264_add_nal(avctx, au, &priv->sps); if (err < 0) goto fail; @@ -169,6 +179,13 @@ static int vaapi_encode_h264_write_slice_header(AVCodecContext *avctx, CodedBitstreamFragment *au = &priv->current_access_unit; int err; + if (priv->aud_needed) { + err = vaapi_encode_h264_add_nal(avctx, au, &priv->aud); + if (err < 0) + goto fail; + priv->aud_needed = 0; + } + err = vaapi_encode_h264_add_nal(avctx, au, &priv->slice); if (err < 0) goto fail; @@ -191,6 +208,11 @@ static int vaapi_encode_h264_write_extra_header(AVCodecContext *avctx, int err, i; if (priv->sei_needed) { + if (priv->aud_needed) { + vaapi_encode_h264_add_nal(avctx, au, &priv->aud); + priv->aud_needed = 0; + } + memset(&priv->sei, 0, sizeof(priv->sei)); priv->sei.nal_unit_header.nal_unit_type = H264_NAL_SEI; @@ -573,6 +595,14 @@ static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx, priv->pic_order_cnt = pic->display_order - priv->last_idr_frame; priv->dpb_delay = pic->display_order - pic->encode_order + 1; + if (opt->aud) { + priv->aud_needed = 1; + priv->aud.nal_unit_header.nal_unit_type = H264_NAL_AUD; + priv->aud.primary_pic_type = priv->primary_pic_type; + } else { + priv->aud_needed = 0; + } + if (opt->sei & SEI_IDENTIFIER && pic->encode_order == 0) priv->sei_needed = 1; @@ -935,6 +965,9 @@ static const AVOption vaapi_encode_h264_options[] = { { "vlc", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, FLAGS, "coder" }, { "ac", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, INT_MIN, INT_MAX, FLAGS, "coder" }, + { "aud", "Include AUD", + OFFSET(aud), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, FLAGS }, + { "sei", "Set SEI to include", OFFSET(sei), AV_OPT_TYPE_FLAGS, { .i64 = SEI_IDENTIFIER | SEI_TIMING },