From patchwork Wed Apr 25 22:42:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 8651 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp1220630jad; Wed, 25 Apr 2018 15:42:47 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/q/pT1tkTbPK9FLu+i3PfK9otWyzKmJMZxUVp0VFPaYOGTqHfeuHPr6zoVHiRpLaY9mdY9 X-Received: by 2002:adf:aa04:: with SMTP id p4-v6mr22925618wrd.226.1524696167328; Wed, 25 Apr 2018 15:42:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524696167; cv=none; d=google.com; s=arc-20160816; b=OHaBjFjtYeh39+8oRZ6FgS5naamgmsi2kdyaqdxDJ4GCtbXdIox4MGKg+2yJhtVuB5 zWlBsqo8IPSd1IgjldXRmBFronK2Z6O9JyRc7vG5lZu33IfjPZhgqfjap7qEuVvVcujX gvinxNVS14etIfFdh/s2U6Fp1M13Rh3VfpHRjc/KGKcvFTLZZfUHCQzWTLpkCTmy3rUX YSzyXh69m09NpkNAzqPLFWXMPClMC5UuK8Y3VsT+EROrhQ9F8QYXtHtobMMeYEsB2MAq kPsmGLReOMCVkCmbV06p0WonEAfRJ7U60cccuRepHLPvUVs2rUm//1b+j0stgEQwuKWU zMfg== 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=f/9pyaK9r4AVLTs8Sk5yjdoYeacX6iUP73VrELEwq6E=; b=QkuoI3Cg0Q4MubFI+MMYlnaKTequp+3VuTiqYnDNjcEdMm4qbu/9F0N5Qe/hPm3MvT 5XMG8R1b390RLnHvlA5dSMwj5KnKn6fn72SbsEGVsyf0uLcEzXx6SpLthThTBZdy3K17 b8k3qfq28v16JazDn1no3fLetxoYuv0LEd0UzKVUyzbPvYLQxhBRcQfJfMUfcva2U9XS 0Vy5dO2qS5moiDfnKcYZeu29ydJfx5wQ4KSQgMYarPZ6aQBdJV8Bxa5sVYO6x8du+W6M wJKdsKhl2HD23n1El6RJ2goim/4lCmUFPVn8acOok42Jm3H5Ho3/HXaqO5/EpCBNoV0Z C6PA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=BG8VEVXk; 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 q48-v6si13639034wrb.209.2018.04.25.15.42.46; Wed, 25 Apr 2018 15:42:47 -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=@gmail.com header.s=20161025 header.b=BG8VEVXk; 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 E758568A44B; Thu, 26 Apr 2018 01:42:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f196.google.com (mail-qk0-f196.google.com [209.85.220.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 80E9B68A402 for ; Thu, 26 Apr 2018 01:42:00 +0300 (EEST) Received: by mail-qk0-f196.google.com with SMTP id b131so19749975qkg.2 for ; Wed, 25 Apr 2018 15:42:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=ca4N6T7H/HV2gt+cSgfZrWbBaMmO59DlUI+Vb4qvX9w=; b=BG8VEVXkL2FXyzhr0LOxIbdCDy1aJ3OA/4p2+d7erKenQCHKkVizKuaUcJTgCX7V2N /MYjtouNd/DgI276IlgrFAdzc7On1yylrwcNToIIex/cmByu5I+FrcMwEW+qoN0E97Z/ S409tVIPdS5JnTdU4gJ82Ae8e8jxxYgKxU3+Wl3Lo1Fq5L42C8DLQGx8JLdf0G29Nl/F PZejtXdv9livuNygsxiSKyurRdt09CC3m2L3qfrwnVR5W9ADbOW8XJN5yxkAdR4j1Too A3lSHJVf0OKGM4P0Z7iR0aKRZ9qWs86jOTvQpZAZZUPc64VyoBfD+E6SMjbMgUG/65A0 Vkbg== 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=ca4N6T7H/HV2gt+cSgfZrWbBaMmO59DlUI+Vb4qvX9w=; b=YHOoVs9AYEpB+WmoENBQ/xngRnYd0o/2c0VoOR0hq4mjyS9BjFV8pH2atwzWml9jW5 S7ERHfDDjKoCnE+Mobt9JrtYsu/U9Shkd7sCRXa5dLrvNgBOc93ljQLf7dXaqP69iYz5 P5FPuTYJALIR23NQ/0YhnMhzkhOlxujViPERN/psFHxG20ZRovXprhJG8sOJ5ujAWOjw BGUlTqE91r4/JRcn+2m6U8GAfnYeikb+2DTsHcN54z0cvXvRE9JJAHduVQURXXjWHn34 6Mml6TqtBUOg7+AQJHC9uHtffQxGN/KDRKsSSiDTai+ssH08Y0doaaPgO4xVXZto92pA Vjfw== X-Gm-Message-State: ALQs6tAkkH/TXyMs1DS9BpjV4mnbaolbvU2XsGcGEeNh1dwQ3JNKewOj QdsPE5Sh15mCo/HLN9LT64SnQA== X-Received: by 10.55.22.66 with SMTP id g63mr32191189qkh.294.1524696149782; Wed, 25 Apr 2018 15:42:29 -0700 (PDT) Received: from localhost.localdomain ([190.188.171.140]) by smtp.gmail.com with ESMTPSA id h2sm14274403qkc.27.2018.04.25.15.42.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Apr 2018 15:42:29 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 Apr 2018 19:42:17 -0300 Message-Id: <20180425224217.1936-2-jamrial@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180425224217.1936-1-jamrial@gmail.com> References: <20180425224217.1936-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/cbs_mpeg2: use existing buffer reference when splitting fragments 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/cbs_mpeg2.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c index 94b9591b21..30d2bb6fbf 100644 --- a/libavcodec/cbs_mpeg2.c +++ b/libavcodec/cbs_mpeg2.c @@ -146,16 +146,11 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx, unit_size = (end - 4) - (start - 1); } - unit_data = av_malloc(unit_size + AV_INPUT_BUFFER_PADDING_SIZE); - if (!unit_data) - return AVERROR(ENOMEM); - memcpy(unit_data, start - 1, unit_size); - memset(unit_data + unit_size, 0, AV_INPUT_BUFFER_PADDING_SIZE); + unit_data = (uint8_t *)start - 1; err = ff_cbs_insert_unit_data(ctx, frag, i, unit_type, - unit_data, unit_size, NULL); + unit_data, unit_size, frag->data_ref); if (err < 0) { - av_freep(&unit_data); return err; }