From patchwork Thu Jul 9 10:35:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20909 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 AA37744B499 for ; Thu, 9 Jul 2020 13:37:18 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9875268B5BE; Thu, 9 Jul 2020 13:37:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E71A68B51A for ; Thu, 9 Jul 2020 13:37:11 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id b6so1778412wrs.11 for ; Thu, 09 Jul 2020 03:37:11 -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=vAMlq2xLXbZUwfYpNybdxEvY0EAWbwCuIDKl7cluQ48=; b=YgCXo+YKyD7K/HYh+BJhq74BGav7NQmMcInlGEpmoGK4lysdLb1jCnXXJjHCQ72xKN /zMhA/1yWomnIKtGOu9DH9Blszi03sMcLcPr7hmlID1TirP+Ho3JHsm5SRlP4CzGQkEJ STEyGwFH2ZgywKiECKrENRdyVTA+JaHW4IO3y2KSEPD1fhZQ2hk34yEMA5Ndoba3CkSx oxW9cHdT8kP3KCzHoApWeF74kIlmxVf+4WAK3as3CIcrVwTo6mE4ShWRTwynnM4e9Qgv m3GXh6qzSfbTrBZmKOXL0TPFg6ZqF53Da6AL/YTCNnTLlMaWpLQumTnCPy3wPxY508Z8 c2mQ== 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=vAMlq2xLXbZUwfYpNybdxEvY0EAWbwCuIDKl7cluQ48=; b=s3HaDV38guTMlTXmxI4Qs4CxFnaoMe6p5FU9569Dlk4O3WrxCEiNdTLr6Y1iHHnztC fgkk3N9ElmbQ36ToRIAXHLNsk+yOg7S62dTWpmX+45w21+WHhiKxdZsMBrUdO3se4HnJ OQmkS485QNe/cIWJyapGIdz4p6ts/jQUyCMLhGqmrm7F2VUQtsNqrVF1mhRlBlDsbAPb cVkkOM35CukN7KFQjjF9DbPTQnSyQN3LcQbHPiqLDi10ZX4k7PWCVRsTdnBMV+NNiook kvASTbCa0FhP4AeDwTqmWcdIx4EARIP0vFFijTK08Lmd4g5sJ+IDJi+d267TLJvS4DE5 Ww3Q== X-Gm-Message-State: AOAM531fGNxcIQP1YjcRKJOHib8x9nS3vcJtTX5SVCdjxsPnU/nCnxqa tpQcU3Psa6I+Yeqr4V73hDj0jzgs X-Google-Smtp-Source: ABdhPJxFJtpdoKBcKxcuAjADe8tD/0S0ZfNDhFTI+u+eiTznjD1vaDGUOlaNjM35ACJTnOnpkemckw== X-Received: by 2002:adf:d084:: with SMTP id y4mr61327153wrh.161.1594291030630; Thu, 09 Jul 2020 03:37:10 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id c15sm4155623wme.23.2020.07.09.03.37.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2020 03:37:09 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Jul 2020 12:35:40 +0200 Message-Id: <20200709103542.19909-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200709103542.19909-1-andreas.rheinhardt@gmail.com> References: <20200709103542.19909-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/7] avformat/sdp: Avoid allocation for small HEVC annex B extradata 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" In this case, extradata2psets_hevc would have used avio_open_dyn_buf() + avio_close_dyn_buf() to convert the annex B extradata to the hvcc format (which is easier parseable); the temporary buffer would then be freed. avio_close_dyn_buf() + av_free() can be replaced by avio_get_dyn_buf() + ffio_free_dyn_buf(). This saves an allocation and a memcpy if the hvcc is so small that it fits into the dynamic buffer's write buffer. Signed-off-by: Andreas Rheinhardt --- libavformat/sdp.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libavformat/sdp.c b/libavformat/sdp.c index 2ce1a62262..3acbf5d197 100644 --- a/libavformat/sdp.c +++ b/libavformat/sdp.c @@ -27,6 +27,7 @@ #include "libavcodec/xiph.h" #include "libavcodec/mpeg4audio.h" #include "avformat.h" +#include "avio_internal.h" #include "internal.h" #include "avc.h" #include "hevc.h" @@ -228,7 +229,7 @@ static char *extradata2psets_hevc(AVCodecParameters *par) char *psets; uint8_t *extradata = par->extradata; int extradata_size = par->extradata_size; - uint8_t *tmpbuf = NULL; + AVIOContext *pb = NULL; int ps_pos[3] = { 0 }; static const char * const ps_names[3] = { "vps", "sps", "pps" }; int num_arrays, num_nalus; @@ -239,15 +240,12 @@ static char *extradata2psets_hevc(AVCodecParameters *par) // other anyway, we get away with a little less work by using the hvcc // format. if (par->extradata[0] != 1) { - AVIOContext *pb; if (avio_open_dyn_buf(&pb) < 0) return NULL; if (ff_isom_write_hvcc(pb, par->extradata, par->extradata_size, 0) < 0) { - avio_close_dyn_buf(pb, &tmpbuf); goto err; } - extradata_size = avio_close_dyn_buf(pb, &extradata); - tmpbuf = extradata; + extradata_size = avio_get_dyn_buf(pb, &extradata); } if (extradata_size < 23) @@ -315,12 +313,12 @@ static char *extradata2psets_hevc(AVCodecParameters *par) pos += len; } } - av_free(tmpbuf); + ffio_free_dyn_buf(&pb); return psets; err: - av_free(tmpbuf); + ffio_free_dyn_buf(&pb); return NULL; }