From patchwork Sun Jan 27 23:47:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 11888 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 07CE444DDD3 for ; Mon, 28 Jan 2019 01:47:29 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2A30C68B038; Mon, 28 Jan 2019 01:47:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C5C5868B008 for ; Mon, 28 Jan 2019 01:47:10 +0200 (EET) Received: by mail-wr1-f45.google.com with SMTP id z5so16074834wrt.11 for ; Sun, 27 Jan 2019 15:47:30 -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=Dm7OGX+g5thTyWOSJnG7sspaYnlk1KTBWZCmUiMuUBlsX4aJJ4XO7W1AbFwCS44ETd 0/ZJjctYl1Dy/8TR73LAStY7RlQ89bLCdK/6bn1hHSYspzcY4aXDzPdGkzF37hZ4O+wm 66h9HQDlopt8F+ni1nvY/2CdQDCLFR6oLyvgEHofcdYMf4EXa9eivOzG1plg+2GSC6NQ 8wojlr4zP0llmySSQuI8SBR45QN83P9P5KIoKzl0YuB5rN4xZrnfEr4PM+pyz7dZd1ER aRcsMPcT+W9onsDY1EgIe4vr37PRYM0BjxjDNfqn89BtFRw0CPlnVGr+Ri2pnxqzZ8Dg fYGQ== 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=kqWqXRdvwNs0kkx/TpEH34GIK096hspPVsA8Wv5JqX1mOw8sOQQlvkCI591gTOfsks lxFdAelWaJa08BKyghcgoxNrsmLIFi9Keih2PvjBDpkf0afaDn3kxRypQBNtiwgpVLgJ CD/w1qd+AqPeYKr3VNPY8Ks+4pQodbZ7Cr0krvFO1MgCTpW50EwCz/YEpWIfjyDUx+7q FW85LpxeLWmBeEx8m6JoAZGsQxqT0gw9RIUfv/lSadOFqAZysQARTTAmL64Y9b/LOOuO mfJmzXsC9CMwt+WYEteerRNNVG8uBn4y059FqLgW/469JGjGkNMLAapCVGckRFnJgNhI Jr+g== X-Gm-Message-State: AJcUukcrIbKySILQDql58FHazyVCfgt+jR0Ab6tPdsyQe7AcBsPgcD7Y 0QRIFqWBJ9DLzlHSa2ezSTr90O/uT34= X-Google-Smtp-Source: ALg8bN53RY1rzh2DM7adNF3NAI+/vhR1jWWSpz7ogkC/+mlmdJRLj/6rETq/AtEY1JPv65bYJNCWTQ== X-Received: by 2002:adf:c888:: with SMTP id k8mr20604649wrh.6.1548632849989; Sun, 27 Jan 2019 15:47:29 -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 g21sm3642603wmd.0.2019.01.27.15.47.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Jan 2019 15:47:29 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 27 Jan 2019 23:47:06 +0000 Message-Id: <20190127234707.27689-10-sw@jkqxz.net> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190127234707.27689-1-sw@jkqxz.net> References: <20190127234707.27689-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 10/11] 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;