From patchwork Wed Nov 27 12:22:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16456 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 9A96B449287 for ; Wed, 27 Nov 2019 14:23:15 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8DDFD68B0FE; Wed, 27 Nov 2019 14:23:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D108068B0E0 for ; Wed, 27 Nov 2019 14:23:06 +0200 (EET) Received: by mail-wm1-f45.google.com with SMTP id a131so2564168wme.5 for ; Wed, 27 Nov 2019 04:23:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FQenU85HpfIqQDtWagRTU7YP7jQ+KsZKPdUcHg12G1E=; b=NPkPlk47OyCEa2GN4kHZCuJ4n+PuH3lsGM4Tq4w00RX60mGUgCDb+xL5WfqAMQzcfo BckimvNgUvVXs7zYvCUFpNa+JLPcpcsW34q7T40x+CqcLKGhm8xnJf7KOKj05GUekhzh NvTJ78DD1IgYEc6abAOn6xouAoT3wjnK9hdo19jhLH0C30e6XGAouV/kl09a/MJV86D4 1t6urtaMJm1ptdkr9ADF2+c86F+I0eSFIaZaEIjGhyLJxlC4qmsZzvX2O5GiH2HuVsp5 Cxh/dEbeIVemxwfhs2ZR4ndfShbUR57DGT8H3Noh8geLI8G0Ugd52uhaXkx3H/jZO1kD zwcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FQenU85HpfIqQDtWagRTU7YP7jQ+KsZKPdUcHg12G1E=; b=RHr8+C7LYIKKA5dLQz4GAl161VI3vRYLCRzKAquBF0DHRkCLDlxN6PK4hVSEsSfTcc QihPAxRIcGudTpQxhx0uDge0BF8Rg04ZQWAQ9a1BG9b1CcEUkgQM5hK3KB3TeIeFgiBy iB3EhKUk5XOH4bCuO8aPyc7HeD6m8mF7AkgssmNMP93g/mWw4Qxb05OdLtYiYlAriROC Vb5YbG1mBG7AmyDLtJtE4dJNZd4rppXnVTysab0Fmv4f7eROzLeBztDP6vMYPy3YMUMi xOozhoXzsJQrKKRx7eJ2hREMjYojL37TMtU3+F8YrPmiIyC9l4NePgCtO0tCMqv9h3p+ 3frA== X-Gm-Message-State: APjAAAVXRO56AEsLuUAYVHTBME0KOoDL24Nx5Ddy+7QkInBS2lTOVvzx rJAcWY2UJe2eA73mwebKMM17tnsf X-Google-Smtp-Source: APXvYqyslV0qa3rdTiZzOotmdapA5UWpqR1lvRXLM7n74Y30AHkMz48CVpsvGhj7fCiGD9YFutcKQg== X-Received: by 2002:a7b:c4c8:: with SMTP id g8mr3903798wmk.36.1574857386170; Wed, 27 Nov 2019 04:23:06 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id r2sm6905614wma.44.2019.11.27.04.23.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2019 04:23:05 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Nov 2019 13:22:11 +0100 Message-Id: <20191127122211.6352-7-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191127122211.6352-1-andreas.rheinhardt@gmail.com> References: <20191127122211.6352-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/7] avformat/movenc: Avoid allocation for small dynamic buffers 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" By using avio_get_dyn_buf() + ffio_free_dyn_buf() instead of avio_close_dyn_buf() + av_free() one can avoid an allocation + copy for small dynamic buffers. Signed-off-by: Andreas Rheinhardt --- libavformat/movenc.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 715bec1c2f..dd144ae20a 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3145,12 +3145,12 @@ static int mov_write_track_udta_tag(AVIOContext *pb, MOVMuxContext *mov, if (mov->mode & (MODE_MP4|MODE_MOV)) mov_write_track_metadata(pb_buf, st, "name", "title"); - if ((size = avio_close_dyn_buf(pb_buf, &buf)) > 0) { + if ((size = avio_get_dyn_buf(pb_buf, &buf)) > 0) { avio_wb32(pb, size + 8); ffio_wfourcc(pb, "udta"); avio_write(pb, buf, size); } - av_free(buf); + ffio_free_dyn_buf(&pb_buf); return 0; } @@ -3820,12 +3820,12 @@ static int mov_write_udta_tag(AVIOContext *pb, MOVMuxContext *mov, if (s->nb_chapters && !(mov->flags & FF_MOV_FLAG_DISABLE_CHPL)) mov_write_chpl_tag(pb_buf, s); - if ((size = avio_close_dyn_buf(pb_buf, &buf)) > 0) { + if ((size = avio_get_dyn_buf(pb_buf, &buf)) > 0) { avio_wb32(pb, size + 8); ffio_wfourcc(pb, "udta"); avio_write(pb, buf, size); } - av_free(buf); + ffio_free_dyn_buf(&pb_buf); return 0; } @@ -5033,12 +5033,11 @@ static int mov_flush_fragment_interleaving(AVFormatContext *s, MOVTrack *track) if ((ret = avio_open_dyn_buf(&mov->mdat_buf)) < 0) return ret; } - buf_size = avio_close_dyn_buf(track->mdat_buf, &buf); - track->mdat_buf = NULL; + buf_size = avio_get_dyn_buf(track->mdat_buf, &buf); offset = avio_tell(mov->mdat_buf); avio_write(mov->mdat_buf, buf, buf_size); - av_free(buf); + ffio_free_dyn_buf(&track->mdat_buf); for (i = track->entries_flushed; i < track->entry; i++) track->cluster[i].pos += offset; @@ -5135,12 +5134,11 @@ static int mov_flush_fragment(AVFormatContext *s, int force) return 0; } - buf_size = avio_close_dyn_buf(mov->mdat_buf, &buf); - mov->mdat_buf = NULL; + buf_size = avio_get_dyn_buf(mov->mdat_buf, &buf); avio_wb32(s->pb, buf_size + 8); ffio_wfourcc(s->pb, "mdat"); avio_write(s->pb, buf, buf_size); - av_free(buf); + ffio_free_dyn_buf(&mov->mdat_buf); if (mov->flags & FF_MOV_FLAG_GLOBAL_SIDX) mov->reserved_header_pos = avio_tell(s->pb);