From patchwork Sun Feb 10 19:47:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 12027 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 140FD44665E for ; Sun, 10 Feb 2019 21:47:26 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F3CC468A877; Sun, 10 Feb 2019 21:47:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7171168A79B for ; Sun, 10 Feb 2019 21:47:22 +0200 (EET) Received: by mail-wm1-f53.google.com with SMTP id d15so13417273wmb.3 for ; Sun, 10 Feb 2019 11:47:22 -0800 (PST) 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:mime-version :content-transfer-encoding; bh=/0dkUjXpGKZikdCchUZbNgTaUKSfczSGNEc1828g80A=; b=WLXS2h87MQzq93YNl2jY2ztpHPPv2lfmlEhLIwQnl2/geSSLyM3DUOJghJIRw1XWId vn03tBjC4BwH/QcaJ0T66Vgc8wA1qUKx8JMuiTEEZuWtpY4rys+XJuzLxDm5w0WFurOj LJyebCINrRBVxRabBd4Q0XwQq56nSlK8IFbK+7se+Rn+T4lOJD3VpVPk1SGLrsopxu5V 7HOuP7p0HAUpr5UpqtvlY0btGHIxtcga0TornqZ5ij/ZahmBMIpIZBW2uUtR6/7RPA1j oIiYByq3L/VBPhbI/6BZFs7Skj4qA+XqfNqBpjI4py3ZpY2YViDgJSDuptq5NUYYjLle pnYQ== 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:mime-version:content-transfer-encoding; bh=/0dkUjXpGKZikdCchUZbNgTaUKSfczSGNEc1828g80A=; b=agYpsnFqtsiM7LFQoQbh1llP3pVlH71E1c+KgvVAsi+EW4A53Mcqk1kO7jBQrL3RWd 5CMldA/SNSoAfSz6h+IlHHiLp5yWHe7fz9yfPVWqhJ129Ee6h1QGm5TQg3DmaOptQdRo CR4mm9vI2SR3OUPScEmOimB+/pMxY7NfTpsURhM2V7DrQ+0cdb0T6UEIzGV01RffBsCG 84vlVy34HrtS5U8XCQ+njl0hLCqxzyNguNAeGeu5v3FvObLqnUpc0B1CXo338ggLTwra u0Meo+i+ZJq6SSdOzSdUJr8QibFtFTa40CEBfMJvoFPPK3wYwkqnmbY1dS3qR0lJtRp3 yRQw== X-Gm-Message-State: AHQUAuYxFpQOpw/7j4zYnQPaDEcd+i2Bpgck3sz9akqO3IA0PcsTBAGe BfOuw9fjDt/CL9OU6ZVZcRl+tLF0anKVIA== X-Google-Smtp-Source: AHgI3IZCI+eC+9yYhokUv30UiTmy9Zct699CCm0t7VSS49GrxiciQMJBxW3gnCiRz2eFBIvDXOqJsg== X-Received: by 2002:a5d:5101:: with SMTP id s1mr24642933wrt.89.1549828041678; Sun, 10 Feb 2019 11:47:21 -0800 (PST) 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 u15sm24059889wrm.63.2019.02.10.11.47.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Feb 2019 11:47:20 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Feb 2019 19:47:04 +0000 Message-Id: <20190210194705.3598-11-sw@jkqxz.net> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190210194705.3598-1-sw@jkqxz.net> References: <20190210194705.3598-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 11/12] vaapi_encode_h264: Don't include AUD with slice header 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Always write it as a RawData block, even if there is no SEI as well. --- libavcodec/vaapi_encode_h264.c | 40 +++++++++++++++------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index fb55eb7779..b65ee4bec0 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -187,13 +187,6 @@ 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->raw_aud); - if (err < 0) - goto fail; - priv->aud_needed = 0; - } - err = vaapi_encode_h264_add_nal(avctx, au, &priv->raw_slice); if (err < 0) goto fail; @@ -213,16 +206,16 @@ static int vaapi_encode_h264_write_extra_header(AVCodecContext *avctx, CodedBitstreamFragment *au = &priv->current_access_unit; int err, i; + if (priv->aud_needed) { + err = vaapi_encode_h264_add_nal(avctx, au, &priv->raw_aud); + if (err < 0) + goto fail; + priv->aud_needed = 0; + } + if (priv->sei_needed) { H264RawSEI *sei = &priv->raw_sei; - if (priv->aud_needed) { - err = vaapi_encode_h264_add_nal(avctx, au, &priv->raw_aud); - if (err < 0) - goto fail; - priv->aud_needed = 0; - } - *sei = (H264RawSEI) { .nal_unit_header = { .nal_unit_type = H264_NAL_SEI, @@ -260,15 +253,6 @@ static int vaapi_encode_h264_write_extra_header(AVCodecContext *avctx, goto fail; priv->sei_needed = 0; - err = vaapi_encode_h264_write_access_unit(avctx, data, data_len, au); - if (err < 0) - goto fail; - - ff_cbs_fragment_uninit(priv->cbc, au); - - *type = VAEncPackedHeaderRawData; - return 0; - #if !CONFIG_VAAPI_1 } else if (priv->sei_cbr_workaround_needed) { // Insert a zero-length header using the old SEI type. This is @@ -285,6 +269,16 @@ static int vaapi_encode_h264_write_extra_header(AVCodecContext *avctx, return AVERROR_EOF; } + + err = vaapi_encode_h264_write_access_unit(avctx, data, data_len, au); + if (err < 0) + goto fail; + + ff_cbs_fragment_uninit(priv->cbc, au); + + *type = VAEncPackedHeaderRawData; + return 0; + fail: ff_cbs_fragment_uninit(priv->cbc, au); return err;