From patchwork Sun Mar 11 18:30:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 7909 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp822930jad; Sun, 11 Mar 2018 11:30:38 -0700 (PDT) X-Google-Smtp-Source: AG47ELs6pyOZ29bxyeN/HtMjdQUtHPPI6yEkIPIafK5h1fWU8gG3pbKB4HJTYZzzeAsRfUWRtRc5 X-Received: by 10.223.160.110 with SMTP id l43mr2057552wrl.264.1520793038195; Sun, 11 Mar 2018 11:30:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520793038; cv=none; d=google.com; s=arc-20160816; b=jtr6lP3I/tYI5L3FGZGGQ/sNUaXL5pGJUkPBfbjc0bjLINrWVW8Eh47ndI8bbkapUE C77mFmLDanZ3ZKf6uu/qS5g9Cge6FtLEW/Z5g/ZrJa6V5alIToXzaol8R3N/L0aaadY5 mPUTFSdN7/6y7O5Zda1/nnpTQp+pYrX9t1itjuJICOuN8X2X2u1peQs+/f53+UmQUSS7 5sQjFhbQXD+CX2KEkaaCXFH3K7VoFFD8t3QgabnZNokjlsjx3IGr8YGad7Gk8HbNwL7I 2iXHvzhmeR4ZRuLNSp9zjIIVWUcgxNOKdSJq9GOSMZNum83xibQQoqF97BK51h5PakrI lYqQ== 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=aF6/rVgdaLTc0b/HC6BDyL6sXjkVbPhIzrVnUgMr5YY=; b=OLwKhavI8+7fvsc0qbTWsLlWLeeUr+U2fqinrzZJaBzfo8cZJEz9trIAOBqV9H6YUY tVI5QwPZUBuBkiCNjTNNRStNEMqVEql8mPvlj02w9twdtO8l6qkcOFSkP9MaST+5VtKx Lcwq/+x39zxLN1xD20pJVW0SdgnohUYhsH8IbtGZbpyhSEkLb4IcLT1psvCcgA9EjAjJ 0ThGOg9knwMjYLIJRzMxrqDmWVsZ+a0+L/erHqBpb49jYv0Bd1p/+fVVsu32tkK2OSt3 TbdNqAUVAfJ//vrixGG48HjyNQ7PagsCISPcgM/rcKEfgZfGAxKAhI2ltH77ydQVMXi6 aRSw== 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=UIL2/uTe; 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 g21si2190205wmd.103.2018.03.11.11.30.37; Sun, 11 Mar 2018 11:30:38 -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=UIL2/uTe; 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 2A78668A1B0; Sun, 11 Mar 2018 20:30:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6F823689F62 for ; Sun, 11 Mar 2018 20:30:20 +0200 (EET) Received: by mail-wr0-f196.google.com with SMTP id f14so13502504wre.8 for ; Sun, 11 Mar 2018 11:30:30 -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=FTpb//LddUeCz//VbvXMLafun5X9xCzttOrurPksnXA=; b=UIL2/uTeJixuqH1z3wvDR4+ZYFpxpeuY5oD/feOhsCsaKJheyew1jBh0dQzgiiGDgf yDXRKTNFcnIUl0GO+Sjr17NgvyNvlepxuULFR5seL9mmZXuNvkA2b5l4q+RnfPRpN09D 9bSZeZLww5a/n+7A56G2HWnaQs70mo+5Kre1n1HpwPz4m032UBfZFpXd55+aeljMk02+ qLOHEHtILty/VgdSlLDzESlQmGEf+XCWmbxCZdSycmeNHIu73XYNcd/hI1L8IrNJBiut t+KsVVHracr99rR526mt9hvgvWfrzwpbBeE4U3ZUEd0rwFrHI6TpzfIk1CMMql6kVPvo EPNQ== 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=FTpb//LddUeCz//VbvXMLafun5X9xCzttOrurPksnXA=; b=KzyWhDcIHQUzoaLfzdD/VDcf2GkEMj6zQzfxbFxi6CGg0KpGaioDr1UiudoPqy9dBi 4kwUEV1NiXBbQK98JgIGJ7BhE8vNkvlIHuFyFEokHxvw4mJFhIByXYRUws0nWyUKdK+j WaH/xZUTIaa39xMnkrQ9yWjmEOg0lK9HjGE3cN+LsSWKgF+wRcqnhtqhuJuSBgwpLzNx cwHrNs9mJ9X6wVhamJjLCG+XLtRvwLKUhzB6vrM0+r7Yi3bvO/0MWCouiq19wi/sKjn+ xaYvss4BDl5jix6flu/G1x1GZTEazRb67sLt6WV50SG6L8AcSF7MPUG32XgjOeAVI2Av LlzQ== X-Gm-Message-State: AElRT7ElTuKlFYPldw+HK7/1TGYsSJ+ym1Prj1l+x8KAo39FmbLo3+ZR F1fnnTukHBDyu5c48vAaNyllTPMh X-Received: by 10.223.136.236 with SMTP id g41mr4189892wrg.103.1520793030075; Sun, 11 Mar 2018 11:30:30 -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 31sm5064514wrr.59.2018.03.11.11.30.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Mar 2018 11:30:29 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Mar 2018 18:30:19 +0000 Message-Id: <20180311183021.25556-6-sw@jkqxz.net> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180311183021.25556-1-sw@jkqxz.net> References: <20180311183021.25556-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 6/8] h264_metadata: Remove unused fields 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" The SEI NAL is unused since 69062d0f9b6aef5d9d9b8c9c9b5cfb23037caddb, while the AUD NAL is small and would more sensibly be on the stack. --- libavcodec/h264_metadata_bsf.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libavcodec/h264_metadata_bsf.c b/libavcodec/h264_metadata_bsf.c index d340c55990..760fe99c41 100644 --- a/libavcodec/h264_metadata_bsf.c +++ b/libavcodec/h264_metadata_bsf.c @@ -47,9 +47,6 @@ typedef struct H264MetadataContext { int done_first_au; - H264RawAUD aud_nal; - H264RawSEI sei_nal; - int aud; AVRational sample_aspect_ratio; @@ -263,7 +260,9 @@ static int h264_metadata_filter(AVBSFContext *bsf, AVPacket *out) 0x3ff, // 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; int primary_pic_type_mask = 0xff; - H264RawAUD *aud = &ctx->aud_nal; + H264RawAUD aud = { + .nal_unit_header.nal_unit_type = H264_NAL_AUD, + }; for (i = 0; i < au->nb_units; i++) { if (au->units[i].type == H264_NAL_SLICE || @@ -286,11 +285,10 @@ static int h264_metadata_filter(AVBSFContext *bsf, AVPacket *out) goto fail; } - aud->nal_unit_header.nal_unit_type = H264_NAL_AUD; - aud->primary_pic_type = j; + aud.primary_pic_type = j; err = ff_cbs_insert_unit_content(ctx->cbc, au, - 0, H264_NAL_AUD, aud, NULL); + 0, H264_NAL_AUD, &aud, NULL); if (err < 0) { av_log(bsf, AV_LOG_ERROR, "Failed to insert AUD.\n"); goto fail;