From patchwork Wed Nov 27 12:22:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16455 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 DB2C4449287 for ; Wed, 27 Nov 2019 14:23:14 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C057C68B0DA; Wed, 27 Nov 2019 14:23:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BB70F68B07C for ; Wed, 27 Nov 2019 14:23:05 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id b18so26434171wrj.8 for ; Wed, 27 Nov 2019 04:23:05 -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=je5TLut9TK/IXTuKRaxn+0eJ4gd2eM4MkLFyYXdjxv0=; b=ZSMURFIXjRsD0rPKcmwgV7Qh4C+WhIyjszRxU9cDWeWoT9K8gw/wIdSwE+VJ9E93Ii FoyPwGTGDZN/zCn9roI4rYmatw8ICk+KWA9gYxtucl9s11zKb0SNfMHUIxGrBornVIYz hgMLHRMA+Gaq5tzifzZ/t+HN3wQFpn5wHo+eVWAbHuPM56rnWUMaieXbdNoJF9pLR/Iw zeyi8TLLVh1Xfic+oCWyVfe02v5cbz9aPckSQcCvKR+7rcqZReMkxAIUkFlhsmKXcBjC hjJX7dxwGx9+hUDo3gG2o4V16TEXW9XvPicNAU/bLdnIzpR0j6aiyTtcY8VIx0OGmkYk Jo9g== 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=je5TLut9TK/IXTuKRaxn+0eJ4gd2eM4MkLFyYXdjxv0=; b=CSVIHngG3lR/WqgqGo9xpBsbT4ehw6VgQ0BpD15hkeqFoYI8NYQQ4wKYmBl2ZYz1Wr HXeirjHUDt9oolI6iJBH5lT9IJOGk9J9t+m5lTpZqw/IeObiDuauPbkZlCcvXvVIq2h1 Bm9a/FAhqm5vQsyLSfgobaXIFsjHlTcScPNHUca+piD9AJspN+u4hNqIro7hQ9WMM9p+ 2J1fHYIYu022ELmn2Mf46Q0ZTrL4QI486zxMvUEkxwwDPfrOzWbAngfs/aTo+MIM2MwX wKb+68PHQk87eQEeI6NhDzVZm3sEkf75z9BpQc6Nd5alblUyZEP3Pp52OIMMFhBppWs3 1XWw== X-Gm-Message-State: APjAAAUKVQZl8DPz5LzUI98Qt+JhfsRaFXNKm+0DaANanDdrhWTzrJi7 shmP1MIML2f+Sd7RMs4JKVXdveNd X-Google-Smtp-Source: APXvYqxFhdtPoCzq52fxRZ1GqlYIQ6MQYEimwyk0lVxmtZemlbxHQgwgel+rhUfS+a0/DTNgSagXFQ== X-Received: by 2002:a5d:4c85:: with SMTP id z5mr2194984wrs.42.1574857385166; Wed, 27 Nov 2019 04:23:05 -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.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2019 04:23:04 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Nov 2019 13:22:10 +0100 Message-Id: <20191127122211.6352-6-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 6/7] avformat/matroskaenc: 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 (i.e. small master elements). Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index a38ce4325d..570f361351 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -845,11 +845,11 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, ff_put_wav_header(s, dyn_cp, par, FF_PUT_WAV_HEADER_FORCE_WAVEFORMATEX); } - codecpriv_size = avio_close_dyn_buf(dyn_cp, &codecpriv); + codecpriv_size = avio_get_dyn_buf(dyn_cp, &codecpriv); if (codecpriv_size) put_ebml_binary(pb, MATROSKA_ID_CODECPRIVATE, codecpriv, codecpriv_size); - av_free(codecpriv); + ffio_free_dyn_buf(&dyn_cp); return ret; } @@ -933,13 +933,13 @@ static int mkv_write_video_color(AVIOContext *pb, AVCodecParameters *par, AVStre end_ebml_master(dyn_cp, meta_element); } - colorinfo_size = avio_close_dyn_buf(dyn_cp, &colorinfo_ptr); + colorinfo_size = avio_get_dyn_buf(dyn_cp, &colorinfo_ptr); if (colorinfo_size) { ebml_master colorinfo = start_ebml_master(pb, MATROSKA_ID_VIDEOCOLOR, colorinfo_size); avio_write(pb, colorinfo_ptr, colorinfo_size); end_ebml_master(pb, colorinfo); } - av_free(colorinfo_ptr); + ffio_free_dyn_buf(&dyn_cp); return 0; }