From patchwork Wed Nov 27 12:22:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16454 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 06332449287 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 DE7C568B0F0; Wed, 27 Nov 2019 14:23:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 334F768B07C for ; Wed, 27 Nov 2019 14:23:05 +0200 (EET) Received: by mail-wr1-f52.google.com with SMTP id i12so26506180wro.5 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=CLNilbZIBjPQ/OcaoL5sJmuZD+kXmuK04R6faPHtHH4=; b=ZFuAwv3y2LvVn5W0NQBp/7M/GYEMx0DxHs61FJ8XkFe8YnIUXwA15RQWZOzs/iGw4b Xi0xPH3FgrHt0CvFMbLPFiKFMkJw7xCTByAgLGYx370++i2rflr8ESsqggFiLwF8PQrK X3WekKlADRQ8TCsu5TAtojpJumXee9D6D9rI5C4lJ0B5bk08SmVVAzkJFs9HoA83lVrr SUuY6rGFgVSMvUGAbaq+klHcGjXGO5hh50160Q1XmfEPspxXfCLWF+n1ETkkZzcwAnZ4 pulR4WWKrhOZ1qFAvYAqP92LyIcGFD+L64ed8k5UeANMi5AF0ObBI8xWn+wNxf2C6zOo YQkw== 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=CLNilbZIBjPQ/OcaoL5sJmuZD+kXmuK04R6faPHtHH4=; b=UczTyzDgv10P//kCdni+SR0kl1KgFEf2B0JhNEBqcLFZcY9pZ0xpxmLE5jOty6P+Ky MxTwT0prjZ/Z0PhT51jEk4ED2/yfCv8WDKAWuBV7r+rTYS9e8jF1hcDgCV3EAqM2w8sw sxHZcRAQ+My0sjKxQLPy+scZVpULYMF2oLcDk9BpuVSKff4qH0M7XP9tDJ+5cCBBfULn ZJbAUfQbhLtc8sBzhBcAjPX5ETMwEnoiCmVEFty/qb7LEUIlFw/MhN3G3DvjlwM5akMn jPH0GBJk5hqOQyI6+/bDsK0YcgxrACCP7d6VMqQZ8iadLVkTMND8xOi9Yxo5RnNiniaN tjrw== X-Gm-Message-State: APjAAAV0x7gF3HgBeHpGAnd4+wQ4cd0LSsmXhajRwaXPY///d6FFDpyP H9Egk+bzc8KlGT7tVu8bhmoqO0g3 X-Google-Smtp-Source: APXvYqz4sZKip53l35k2wm6hPtiG7ixqgcLzxI5YDDnDUtBfA9l5H9L16/BJltAKLMqmzecl4TBKvg== X-Received: by 2002:adf:e310:: with SMTP id b16mr34610880wrj.202.1574857384392; Wed, 27 Nov 2019 04:23:04 -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.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2019 04:23:03 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Nov 2019 13:22:09 +0100 Message-Id: <20191127122211.6352-5-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 5/7] avformat/id3v2enc: Avoid allocation for small tags 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 tags. Furthermore, it simplifies freeing. Signed-off-by: Andreas Rheinhardt --- libavformat/id3v2enc.c | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/libavformat/id3v2enc.c b/libavformat/id3v2enc.c index c13b93a7d8..9040501869 100644 --- a/libavformat/id3v2enc.c +++ b/libavformat/id3v2enc.c @@ -81,7 +81,7 @@ static int id3v2_put_ttag(ID3v2EncContext *id3, AVIOContext *avioc, const char * id3v2_encode_string(dyn_buf, str1, enc); if (str2) id3v2_encode_string(dyn_buf, str2, enc); - len = avio_close_dyn_buf(dyn_buf, &pb); + len = avio_get_dyn_buf(dyn_buf, &pb); avio_wb32(avioc, tag); /* ID3v2.3 frame size is not sync-safe */ @@ -92,7 +92,7 @@ static int id3v2_put_ttag(ID3v2EncContext *id3, AVIOContext *avioc, const char * avio_wb16(avioc, 0); avio_write(avioc, pb, len); - av_freep(&pb); + ffio_free_dyn_buf(&dyn_buf); return len + ID3v2_HEADER_SIZE; } @@ -134,7 +134,7 @@ static int id3v2_put_priv(ID3v2EncContext *id3, AVIOContext *avioc, const char * } } - len = avio_close_dyn_buf(dyn_buf, &pb); + len = avio_get_dyn_buf(dyn_buf, &pb); avio_wb32(avioc, MKBETAG('P', 'R', 'I', 'V')); if (id3->version == 3) @@ -144,7 +144,7 @@ static int id3v2_put_priv(ID3v2EncContext *id3, AVIOContext *avioc, const char * avio_wb16(avioc, 0); avio_write(avioc, pb, len); - av_free(pb); + ffio_free_dyn_buf(&dyn_buf); return len + ID3v2_HEADER_SIZE; } @@ -257,8 +257,8 @@ static int write_metadata(AVIOContext *pb, AVDictionary **metadata, static int write_ctoc(AVFormatContext *s, ID3v2EncContext *id3, int enc) { - uint8_t *dyn_buf = NULL; - AVIOContext *dyn_bc = NULL; + uint8_t *dyn_buf; + AVIOContext *dyn_bc; char name[123]; int len, ret; @@ -266,7 +266,7 @@ static int write_ctoc(AVFormatContext *s, ID3v2EncContext *id3, int enc) return 0; if ((ret = avio_open_dyn_buf(&dyn_bc)) < 0) - goto fail; + return ret; id3->len += avio_put_str(dyn_bc, "toc"); avio_w8(dyn_bc, 0x03); @@ -275,7 +275,7 @@ static int write_ctoc(AVFormatContext *s, ID3v2EncContext *id3, int enc) snprintf(name, 122, "ch%d", i); id3->len += avio_put_str(dyn_bc, name); } - len = avio_close_dyn_buf(dyn_bc, &dyn_buf); + len = avio_get_dyn_buf(dyn_bc, &dyn_buf); id3->len += 16 + ID3v2_HEADER_SIZE; avio_wb32(s->pb, MKBETAG('C', 'T', 'O', 'C')); @@ -283,10 +283,7 @@ static int write_ctoc(AVFormatContext *s, ID3v2EncContext *id3, int enc) avio_wb16(s->pb, 0); avio_write(s->pb, dyn_buf, len); -fail: - if (dyn_bc && !dyn_buf) - avio_close_dyn_buf(dyn_bc, &dyn_buf); - av_freep(&dyn_buf); + ffio_free_dyn_buf(&dyn_bc); return ret; } @@ -295,13 +292,13 @@ static int write_chapter(AVFormatContext *s, ID3v2EncContext *id3, int id, int e { const AVRational time_base = {1, 1000}; AVChapter *ch = s->chapters[id]; - uint8_t *dyn_buf = NULL; - AVIOContext *dyn_bc = NULL; + uint8_t *dyn_buf; + AVIOContext *dyn_bc; char name[123]; int len, start, end, ret; if ((ret = avio_open_dyn_buf(&dyn_bc)) < 0) - goto fail; + return ret; start = av_rescale_q(ch->start, ch->time_base, time_base); end = av_rescale_q(ch->end, ch->time_base, time_base); @@ -316,7 +313,7 @@ static int write_chapter(AVFormatContext *s, ID3v2EncContext *id3, int id, int e if ((ret = write_metadata(dyn_bc, &ch->metadata, id3, enc)) < 0) goto fail; - len = avio_close_dyn_buf(dyn_bc, &dyn_buf); + len = avio_get_dyn_buf(dyn_bc, &dyn_buf); id3->len += 16 + ID3v2_HEADER_SIZE; avio_wb32(s->pb, MKBETAG('C', 'H', 'A', 'P')); @@ -325,9 +322,7 @@ static int write_chapter(AVFormatContext *s, ID3v2EncContext *id3, int id, int e avio_write(s->pb, dyn_buf, len); fail: - if (dyn_bc && !dyn_buf) - avio_close_dyn_buf(dyn_bc, &dyn_buf); - av_freep(&dyn_buf); + ffio_free_dyn_buf(&dyn_bc); return ret; } @@ -406,7 +401,7 @@ int ff_id3v2_write_apic(AVFormatContext *s, ID3v2EncContext *id3, AVPacket *pkt) avio_w8(dyn_buf, type); id3v2_encode_string(dyn_buf, desc, enc); avio_write(dyn_buf, pkt->data, pkt->size); - len = avio_close_dyn_buf(dyn_buf, &buf); + len = avio_get_dyn_buf(dyn_buf, &buf); avio_wb32(s->pb, MKBETAG('A', 'P', 'I', 'C')); if (id3->version == 3) @@ -415,7 +410,7 @@ int ff_id3v2_write_apic(AVFormatContext *s, ID3v2EncContext *id3, AVPacket *pkt) id3v2_put_size(s->pb, len); avio_wb16(s->pb, 0); avio_write(s->pb, buf, len); - av_freep(&buf); + ffio_free_dyn_buf(&dyn_buf); id3->len += len + ID3v2_HEADER_SIZE;