From patchwork Wed Apr 29 22:21:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19385 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 031FD44B57C for ; Thu, 30 Apr 2020 01:22:33 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E574A68C221; Thu, 30 Apr 2020 01:22:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E24A568C1EE for ; Thu, 30 Apr 2020 01:22:25 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id u127so3816023wmg.1 for ; Wed, 29 Apr 2020 15:22:25 -0700 (PDT) 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=ZKjj58WQFhUg/piXveQq/Yk+UUGyUMqKwWTcSDLdA/M=; b=FFpF3jmSFmGtHdi3f14r+hoFjHL6Y3Tq7JzLoE0WqlbKvvOwadJSXd8oWm7IIBi73j C3y1x2AESDXRN26tuZiTsYKoCvrEPavWmsZT9CdfXS3QGBndbReUSMhB7SIVyBk/Xs7p UxW1GnKOYtHRBQ6fbzLJcNUt8IruI8pW311dL/KSiZ9HoB8MSoJzlxhn74bCjI3yVept MScOJu8Zyz6FOh6M0xlB7rdizoiOp/USAruObYTaxsDziNEZNtAA+BAtDVcTQ+75GpWx U/TM4OON4gEIEBqMQhoLNE79YFMnoMaG9d8gOT7sieh8tFbPiOaLsh0vL23v15YB+waK nl1A== 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=ZKjj58WQFhUg/piXveQq/Yk+UUGyUMqKwWTcSDLdA/M=; b=P+GeB6mLlOyt3YR/P8q/iX6eW93u4K+Tjf/pXKhLwxp4YGPDGl0CUuj0Kng2WvD0+N VK0lDbLfE+dcbd678258oVYPONX8XSusctO+/RKSbQlal8JLSzYnrb/UjspE2R3BLEiU HQAMcd0uLdUpzD94DeYnGKrMkf2cabIKeqWhNid0Tcdu8sISATyqTlEEZNznYenUlOGd ZNDaDaSfUxMIYllTKl+T124FlUhK+Zbtj1SJVl+rPum8Pw541UPupu5pzGqY3BoUONiM GfVWW3QB+b4/tP/FmohCmo6pEC+3qDf9s/NzvwfHS6sOprOt0z/L3DXKG/WDEOTuGR+7 NyWQ== X-Gm-Message-State: AGi0PuY5Yg2xxDvZs3IeDPf/xlm2wIs1eg40Y7fkcJ9YEWv/04UzpY45 4p6j6ooi4qqvPijDJRWQIMNH2wvk X-Google-Smtp-Source: APiQypJNjTToR/mlmYZtVICMsupv7CkR2iBZEB7eaNntSpUogT65+VDUehbK/WfNsuZ6QY7MPG0ojg== X-Received: by 2002:a1c:7ed7:: with SMTP id z206mr63037wmc.64.1588198945014; Wed, 29 Apr 2020 15:22:25 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id x6sm1071555wrg.58.2020.04.29.15.22.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Apr 2020 15:22:24 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Apr 2020 00:21:53 +0200 Message-Id: <20200429222156.29129-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200429222156.29129-1-andreas.rheinhardt@gmail.com> References: <20200429222156.29129-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/6] avformat/matroskaenc: Avoid dynamic buffer when writing Colour 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" There is a good upper bound for the maximum length of the Colour master element; it is therefore unnecessary to use a dynamic buffer for it. A simple buffer on the stack is enough. This commit implements this. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 31f75abc64..36c9ea1d9c 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -808,18 +808,19 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, return ret; } -static int mkv_write_video_color(AVIOContext *pb, const AVCodecParameters *par, +static void mkv_write_video_color(AVIOContext *pb, const AVCodecParameters *par, const AVStream *st) { - AVIOContext *dyn_cp; - uint8_t *colorinfo_ptr; + /* 18 Elements with two bytes ID, one byte length field, 8 bytes payload + * a master element with two bytes ID and one byte length field + * plus another byte to stay clear of the end. */ + uint8_t colour[(2 + 1 + 8) * 18 + (2 + 1) + 1]; + AVIOContext buf, *dyn_cp = &buf; int side_data_size = 0; - int ret, colorinfo_size; + int colorinfo_size; const uint8_t *side_data; - ret = avio_open_dyn_buf(&dyn_cp); - if (ret < 0) - return ret; + ffio_init_context(dyn_cp, colour, sizeof(colour), 1, NULL, NULL, NULL, NULL); if (par->color_trc != AVCOL_TRC_UNSPECIFIED && par->color_trc < AVCOL_TRC_NB) { @@ -890,14 +891,12 @@ static int mkv_write_video_color(AVIOContext *pb, const AVCodecParameters *par, end_ebml_master(dyn_cp, meta_element); } - colorinfo_size = avio_get_dyn_buf(dyn_cp, &colorinfo_ptr); + colorinfo_size = avio_tell(dyn_cp); if (colorinfo_size) { ebml_master colorinfo = start_ebml_master(pb, MATROSKA_ID_VIDEOCOLOR, colorinfo_size); - avio_write(pb, colorinfo_ptr, colorinfo_size); + avio_write(pb, colour, colorinfo_size); end_ebml_master(pb, colorinfo); } - ffio_free_dyn_buf(&dyn_cp); - return 0; } static int mkv_write_video_projection(AVFormatContext *s, AVIOContext *pb, @@ -1290,9 +1289,8 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, uint32_t color_space = av_le2ne32(par->codec_tag); put_ebml_binary(pb, MATROSKA_ID_VIDEOCOLORSPACE, &color_space, sizeof(color_space)); } - ret = mkv_write_video_color(pb, par, st); - if (ret < 0) - return ret; + mkv_write_video_color(pb, par, st); + ret = mkv_write_video_projection(s, pb, st); if (ret < 0) return ret;