From patchwork Sun Oct 8 20:01:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 5474 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp1906514jah; Sun, 8 Oct 2017 13:04:30 -0700 (PDT) X-Received: by 10.28.247.9 with SMTP id v9mr6992815wmh.104.1507493070000; Sun, 08 Oct 2017 13:04:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507493069; cv=none; d=google.com; s=arc-20160816; b=pMIbTHnHDoe229EbO3LEa9PERLXocJf0D1qQnuyvMDpKXVPKP/+XikefBF5bzuP0mG EPkhijC5nFPID5YCJq+waghaTnvyR7gIFLsa6EOdqGeRVIXNZzo7z7t0FsUFe58HCVpB 3SiTAq0LKbLCyKr0ElB0vheBovFO+NLQGlyo3giLAOnxmc29zEY1RgDA+O1gnoLoAFkk NknFZeYmnkfXnYdcwGA+ePzfPLrKqJvpebelFpp70jOxt0CcpyYSmsERTzUxOtblZPMa Nek7w3SHtW88ZqQ11X67uR5GjjFj6k4Xg8ar/IBs9xAzeWpSFLTQx/5HlskNPScGCA4a bEEA== 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=tEY48y1ccqYY5IK4T7mfttgjfqDUR96ds/8rTZVV4zA=; b=iIRUYY2X53eOTlJfPJBc1Ikd56Pmg57LXyOuqNnCyZLEGV4GxQxMw1/E9JHbmmzr5L iueBAccRJMktqTT523PhCxpy3A4cQFa766PlyH5oXBggI9BH3IiEcndyjVMQalpSjNgO 8IcYP/q5vkkf4sG7rgNRsAk/m2Vp0KHf+tJVfoK+vjLNBDvdmnxmtCxGXGRJ/EtKXlhT 2FBWbOSmlvv8Z2wX7fOIe4ccKHiVPEeCd2zpwEroS5IljmqG2ORslg6AyKMMmD8g+N4T 86m5pL7V+2WSoAN2NnK+f7sKb+Sl7IqBE27PBbmdQLR7ddCKTZPWPwUljgWl1wZGj/fM dpBA== 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=ziT1j5qa; 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 46si327886wrt.394.2017.10.08.13.04.29; Sun, 08 Oct 2017 13:04:29 -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=ziT1j5qa; 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 17982689E77; Sun, 8 Oct 2017 23:02:14 +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 00CCF689E43 for ; Sun, 8 Oct 2017 23:02:10 +0300 (EEST) Received: by mail-wm0-f49.google.com with SMTP id u138so18533030wmu.4 for ; Sun, 08 Oct 2017 13:02:12 -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=8aC7Z73ESLxSRhxkwy4yI82jK2OAOZ8lRlfuwfqO4JU=; b=ziT1j5qat+xYq9ied64RLXpRiTxFr4uPG06LFyjFMAbRXQZ2mQ+/sJYtYRau2uL/fi uWJ5B1WSHcQVZEw9Fj1XMvKbu6mA0siGD2Y49rtOgP+DEx3v5HGBzLWG3tdVJosIDXXy FIZZb7W7GyJrPoLA6y7T7BYsC9SGH0Z3AD+NyMA5y+sLMHY8OI5BCEcg3YZM9V9HnMU+ 2cGiGjfQQnY3Hu+wKAnK0I2GOoqiexDUnKQmMj6YSJvGUtLDq/yUFhOvQ1ynPfOskYo2 Q8iyAI57D58iitBS2RJaR1sGdlwi/lYH00CB0A+n+pZbXXqSCkoq8DS7JNRd+uRghd9M w1PA== 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=8aC7Z73ESLxSRhxkwy4yI82jK2OAOZ8lRlfuwfqO4JU=; b=eVktxnsURPTvEEp6Xle3cL+DEq9opmd90qJlXeNKutPgksSGUeCRm/meWbxHi5Nk86 3oxMdd/xaVlp3qb4g4xiyEmfM41qzGenIEJkQA8dFfbLoDIkoj/7WOYMI8TybjtDLEUE 5mNVSAUIOxsGb25zQtR/iT63bS723OFXM430IImzLIX7EK4qNRXum2TFp/PzBIwkjZ+4 4ybZ1Zo2C05rB5D8HCD9cokD4FIMU6MYw1fpFSE4D75plbqpzWkmOmLPO1vnvo0Ek9U9 Jpf3Dx2V6h5ccGC9qiYp+VVOVxJGWnsoMk7URBNJg9BuyMDN7W2v20ENJjxSrWjtbrVI I1SQ== X-Gm-Message-State: AMCzsaVqAYzhAJIL/YAkydxnjAEmlDRD4OOMYK7A18qWoA7IJo/Ht7Jc p3eLlMfInPp/ptqlGKqS5L6bF0Fe X-Google-Smtp-Source: AOwi7QCZzcKbamFv5c0gO5tNQ0nuWrlbyema7FwFTTcX3kd8ADZ3qS7r8/jWLHDcMTKKkmLnaM5TFg== X-Received: by 10.28.153.85 with SMTP id b82mr5823130wme.121.1507492931922; Sun, 08 Oct 2017 13:02:11 -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.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Oct 2017 13:02:11 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 8 Oct 2017 21:01:48 +0100 Message-Id: <20171008200154.4873-15-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 14/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 e8d04efbc5..5c043baabb 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 },