From patchwork Sun Oct 15 15:04:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 5584 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp2788217jah; Sun, 15 Oct 2017 08:13:49 -0700 (PDT) X-Received: by 10.223.196.199 with SMTP id o7mr5861552wrf.119.1508080429287; Sun, 15 Oct 2017 08:13:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508080429; cv=none; d=google.com; s=arc-20160816; b=qOUuJgTphDvzzffVgs5wpo+HZZqRHvKba0bClEz9MUIb9kBCCHD7N2avrpEW7fCe99 t245hO79LhrvTm9l9Scsw4nKZDirybB4tLQtQ2vVCN88J6xOOYSt6nolBLOdkJPmSGTt IL5h4ffAqMQYHkrxhUUkYTruZ4RwLcvrFtbm3UVZRQIs8/AId0vUais3gu8jkleqV9aw lkYtm6ivePWQlRG1CHT6jZ7wP+d7YXqjgJsn26ncT+mVGO87IHypDPswevuXlFNLrzbj 2HvKJYMsDakf7oUnHHhED/aYsrVHBGZrMpgV5qIAs+UbiO6bxPTVzoY5zrK8NRHBpU2E Pikg== 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=0ZDyF01RLrQbUejlUCeh4fBvGnW5JjAexOynz7L9HI4=; b=nGfJdWrcP/aabfUZ/nepuYLmIczdxkRRAHzmLJNjDAwfkC/EJR6GmlaEzxH1spEq4H Q9DnNLIjvtVKVzMpF8mIhpo0GD1MhbZxTSUMz7XfFJj3o9cvW1QpQiZBiBoAiK3o7KjO IoPxiIJu+onZq2YR8vBLWlLnNO+guJjCSMXf4xJqad/s04DzB5QJ5U/m1yQhNFRBd/at bwSUo6T+yZOmSpg7m232nzj/K8myTJoEbLLh0v4rz9wUAGMpZgME/kYBxJp7x8bk6zry odFKDt1RVgWRZ+F60HalYYELVzy+/Iu5uWsEUn9sBGeqxh7xbBvfIr6ioVgNuWu69lYw 9XGA== 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=JU+j3ZpL; 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 n125si3739907wma.21.2017.10.15.08.13.48; Sun, 15 Oct 2017 08:13:49 -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=JU+j3ZpL; 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 B7CE968A247; Sun, 15 Oct 2017 18:12:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f43.google.com (mail-wm0-f43.google.com [74.125.82.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E2E6668A1CE for ; Sun, 15 Oct 2017 18:12:49 +0300 (EEST) Received: by mail-wm0-f43.google.com with SMTP id m72so29193904wmc.1 for ; Sun, 15 Oct 2017 08:12:54 -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=TLfE30eeWojGSwLNS83ZcfEZ16rLNx0WigubEIAv/zE=; b=JU+j3ZpL47GDD7i7hpVdhZmMXbXd4JOS4QS2qehWFTHwuxJppdjOyKU6N03Eb2cCq3 lyJMNoRdAqi86W6d1UIUc3BPYaK5FhStzm+lvvPlgou5od5q1K6yY0i5L6vIUTZFktG/ gDqD0e+0ec9boAUJMlswu3UsSa1jYjWilt3sZkgM+qxuaQXgtAKixTS8iY+rzvA6Jeh3 j/dezvZ5e/meaVyuBqNioYoQAktPvjigO9cNzYjkvd1mRy2o8DzqCaKvX/Vdhtmm3jPI BATp6lhiO5+ZXZsa1mVZLvKfzxX3PPZ1kVUWGLftvJCIEp5K18vakjdqYdgs8kq2WFF5 AQsg== 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=TLfE30eeWojGSwLNS83ZcfEZ16rLNx0WigubEIAv/zE=; b=pBD2abAqk3I2/UXTJcGHOR4NiHy7eaP1EkFvtcVJNsM77GdFs0cOpmWD7yKpiVeYMO JJIbaXtZOXnidYYp7PVIPtsEoMicKik8f8H8/Ho23Gtq6iM+ZJt0YSXzL2gLMzC4VxpA 11tkgqLoz8jwjV4kLM6FQY4pXV8SfqVCdF2BKZlup4kVKZp/i0TL0E6aAp/6Uy24jFVn N8yAuuMOnPzFpkUd/VJx5VZZnaj1xFda4r7Rf+IR5KdBKM18260vPa+dmRuREpfhGhwf qNmP5nHuGj5KkVge0VCY4acDc4guwrMLKuxQ+uY2mYlH6rnp1UYdI/JmD4RybmwmsGA9 CZzw== X-Gm-Message-State: AMCzsaU9nTcUK9Q6zDfln7ABKagNudEqz0NGPL1/KWPAJIXAv1eozyZ/ QJTUTzrs8oKOLn+kGfjQJEyHqwpJ X-Google-Smtp-Source: ABhQp+Q1qIxTjpRU2gAr7ZdsHphadTZbKFbDteWvd2kGy+5TP0gAa3N30zBMtS2BfD1ZKLPNJoNeag== X-Received: by 10.28.168.203 with SMTP id r194mr5314304wme.2.1508079906605; Sun, 15 Oct 2017 08:05:06 -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.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Oct 2017 08:05:06 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 15 Oct 2017 16:04:41 +0100 Message-Id: <20171015150447.18058-15-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 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 9a8019aa7b..b147457b75 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; @@ -931,6 +961,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 },