From patchwork Fri Mar 9 17:40:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 7884 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.181.170 with SMTP id m39csp1234735jaj; Fri, 9 Mar 2018 09:40:43 -0800 (PST) X-Google-Smtp-Source: AG47ELtlXlrOrGPah7qf9OsolZz+veMWeWkLWC1bO4OJk0lwp5mhdwFp4nTpkYvVGmtLO9oH9HVd X-Received: by 10.28.4.20 with SMTP id 20mr2912537wme.100.1520617243148; Fri, 09 Mar 2018 09:40:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520617243; cv=none; d=google.com; s=arc-20160816; b=ZqpRbv5La1cGR0lfemPGm8zZyPSB1jd+0WPdfSc1l4ctyr5XUF1X+hMAvg5ZocG0la Gw6e6SfnYhi9H5vw13CPFzG/++W4S/qS+nioiR9BRJrBllh7lASj3QGWMlytAcj68Ugc +QFsraqeQqcpW4Zcy6gUWhkNJ2XakMSeTh9Vi/BxGDbH9OcBv4LBSRgPBnYy+n6qCtiR U559KvPZZMkQJNQh/UprXKi6Gw1A+FP9RSdeKL/b1taK7Ga1MBAJX5d6wP78tHLyIDrs b+Krkxpe/eTDtoiQSHsVebKBhgFactfXg7KQAgcraJbqxaknGRhZDuMG/OyHcrPuQxa0 B0kA== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=eOJSyoosE0kDB2qja1udFhgG6rGDzwNZZ9RNIikUSV8=; b=B16RHOA6azu8imrAtecekz7CiTpqYk0eZYDDIRJbxk2z2kTYWvElyrh+gd8LTQcfa9 B7AmWlsGhUcsJgdLA7GXJlZQP15rin8tI42Mg6HSkQ8MmCvz7lxXJDdGxiOOVWyU68B5 vLWBMJUg8mRdlYNCAtE/BN8tQ414NtvYsIgnC19O0eolH0mqfzerEHxabGkXIg5lu7qB QXiDCTngdJAw5o08RjQ/yUBQp+OJOMkA+IkOcO6LSCO6PmgvIdP4ePeJM1pQjzi73i7j biQd/lfzTw38zVl+N3j9C6rwgzg72NL7MnnWWS1aEa2t8ysbQUeAGTA65Vaw3z3k3zQo u0Hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=WQplfFBS; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a3si1188095wme.45.2018.03.09.09.40.42; Fri, 09 Mar 2018 09:40:43 -0800 (PST) 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=@gmail.com header.s=20161025 header.b=WQplfFBS; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 231A068A740; Fri, 9 Mar 2018 19:40:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f196.google.com (mail-qt0-f196.google.com [209.85.216.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5E64868A71D for ; Fri, 9 Mar 2018 19:40:26 +0200 (EET) Received: by mail-qt0-f196.google.com with SMTP id c7so11608781qtn.3 for ; Fri, 09 Mar 2018 09:40:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=cUpkXoU6Jqe7iAZI+LbsKRnD9DA2gCTQKxzOT0Bb6X8=; b=WQplfFBSfImUIzSsRwb7a3uF3uThsmaViuVfMpxE+//N5MN+wbrMTNssPhcy3rE2ON Ssp5nk28orvnAEDwq8aGkUKr9iM0+ck+pxURFjnTMdE4AwQGpYS+87WQlI4f2SBsxwff co68sZNbSLEf07eaXcq6MeSQK9XXKx+y5eMZ7IRcOTXGh45YMr8kDE0ERL8HKwVUEahd UU/ibhm4uzj+BiZYkf6rYiZNPjtVt+OoMQcTLIDmxzIOQKLyv962AUL17At5gPRbfplK YAQLuJZtsN9dVhluTsBy6Jd7HDj7tksTPhIDx8cqXZ6bW00lFm7G7LdEMHvSAlw51/5w AZ7Q== 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; bh=cUpkXoU6Jqe7iAZI+LbsKRnD9DA2gCTQKxzOT0Bb6X8=; b=UoJpVa0Qb5Acn4rOsCDu64DdGfkN2/bIWfnUneUkAN9Q2K7268HpsnvK2mMN/k2fts VAy93dzkfxHHlkuKhuSn/MUeFjbZXMXwCCQYm4JM0tsPIZ/tO3iCuVgbMBWW3YojtO/e XQTN9dwtKRQj/h2jC/1XG7HvC8YHo0KDOZTO8Hg5XfDqkuBtiFQvbfdfatT9V1OKHS7Z KO8YQ2GmkIdwjgKT9VtlHXt25nRRefmYrw2VKJ6ZmnU5TV2tMlUPZiktUvTda2CC3ieQ QO6IPQe82wzEI+HCzrSF1ADDDQXVDPpEOVdRzM2SUkuVW7FBbTX+2UDFvqhzMdnPjwSu nHcQ== X-Gm-Message-State: AElRT7EJ97DpzbrxLC07/xaPysThhCssgmsQyV0vkhAjRrkARNlkLClm ty5yVPidn9LI7P/m82+Twq4sLA== X-Received: by 10.237.62.225 with SMTP id o30mr911147qtf.3.1520617234274; Fri, 09 Mar 2018 09:40:34 -0800 (PST) Received: from localhost.localdomain ([190.188.171.140]) by smtp.gmail.com with ESMTPSA id z62sm954268qkz.34.2018.03.09.09.40.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Mar 2018 09:40:33 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Mar 2018 14:40:00 -0300 Message-Id: <20180309174000.7596-1-jamrial@gmail.com> X-Mailer: git-send-email 2.16.2 Subject: [FFmpeg-devel] [PATCH] avcodec/extract_extradata: don't allocate more space than needed when removing NALUs in h264/hevc 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" Signed-off-by: James Almer --- libavcodec/extract_extradata_bsf.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libavcodec/extract_extradata_bsf.c b/libavcodec/extract_extradata_bsf.c index fbfd12aeef..4e2d601742 100644 --- a/libavcodec/extract_extradata_bsf.c +++ b/libavcodec/extract_extradata_bsf.c @@ -62,7 +62,7 @@ static int extract_extradata_h2645(AVBSFContext *ctx, AVPacket *pkt, ExtractExtradataContext *s = ctx->priv_data; H2645Packet h2645_pkt = { 0 }; - int extradata_size = 0; + int extradata_size = 0, filtered_size = 0; const int *extradata_nal_types; int nb_extradata_nal_types; int i, has_sps = 0, has_vps = 0, ret = 0; @@ -90,6 +90,8 @@ static int extract_extradata_h2645(AVBSFContext *ctx, AVPacket *pkt, } else { if (nal->type == H264_NAL_SPS) has_sps = 1; } + } else if (s->remove) { + filtered_size += nal->raw_size + 3; } } @@ -100,11 +102,13 @@ static int extract_extradata_h2645(AVBSFContext *ctx, AVPacket *pkt, uint8_t *extradata, *filtered_data; if (s->remove) { - filtered_buf = av_buffer_alloc(pkt->size + AV_INPUT_BUFFER_PADDING_SIZE); + filtered_buf = av_buffer_alloc(filtered_size + AV_INPUT_BUFFER_PADDING_SIZE); if (!filtered_buf) { ret = AVERROR(ENOMEM); goto fail; } + memset(filtered_buf->data + filtered_size, 0, AV_INPUT_BUFFER_PADDING_SIZE); + filtered_data = filtered_buf->data; } @@ -137,9 +141,7 @@ static int extract_extradata_h2645(AVBSFContext *ctx, AVPacket *pkt, av_buffer_unref(&pkt->buf); pkt->buf = filtered_buf; pkt->data = filtered_buf->data; - pkt->size = filtered_data - filtered_buf->data; - - memset(pkt->data + pkt->size, 0, AV_INPUT_BUFFER_PADDING_SIZE); + pkt->size = filtered_size; } }