From patchwork Fri Dec 6 17:06:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 16641 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 E0BA444A243 for ; Fri, 6 Dec 2019 19:06:40 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BBCFD68B64D; Fri, 6 Dec 2019 19:06:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgau1.qq.com (smtpbgau1.qq.com [54.206.16.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 575CA68B57D for ; Fri, 6 Dec 2019 19:06:31 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1575651985; bh=4NAjhKoo0xmbz3dVYnQDhqUaDCylJkn1mSjGuyQnADI=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=Qd0lv/0ZIvZmtDkgu1MamTP19/GCQ/YQLyR0gVQ7FxtvT0YfwncDC4RHaY+oGAdOm qh/ltphU2Og/v+mk2Dod2PHztGodUfSHdKXfvM1TkktMIbccIX75AEF0R/MP2OQUII c1MijcIry1ZnFaQWak2YRwrwT1KvHirvRIOjq6xM= X-QQ-mid: esmtp2t1575651983tapbuxi8k Received: from localhost.localdomain (unknown [27.46.7.221]) by esmtp4.qq.com (ESMTP) with id ; Sat, 07 Dec 2019 01:06:22 +0800 (CST) X-QQ-SSF: A1000000000000N0VG3000000000002 X-QQ-FEAT: HirWekLIAYKsSpSlBVcL+zGgglWHSLGtcqsdiM+vPQc73dmLNWET8lGT+xNAr XOqK+70JstQ5RehJoN7bYWHZsmMqEXK3kQtKAoC+IQrWp5TwDxfehbNjxzXcE/iFakZ/La6 K1P17+EwAfR6pDjnxYaGZBLIErd9Kd8S6DnZX0fDn8HVPgMgNauLJHHl0yLz9ysUzNItE4/ PAhyjVJiC5qcI+gjM07ffarnpFJhkT4AT4pgWeI9KI5PqW7HnNRkLY11E6TmJF18AC7OHRX ctyapsdTksh0uu7TgBGvSvKI9Yls4LBDBo/g== X-QQ-GoodBg: 0 From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 Dec 2019 01:06:20 +0800 Message-Id: <20191206170620.25029-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191206170056.24783-1-quinkblack@foxmail.com> References: <20191206170056.24783-1-quinkblack@foxmail.com> MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: esmtp:foxmail.com:bgforeign:bgforeign11 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH v2] avfilter/formats: optimize ff_all_formats 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This is a micro-optimization. Saving almost 200 reallocations makes it worth a try. --- fix commit message typo: relocations -> reallocations libavfilter/formats.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 33c64668a0..1af7a1cedd 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -348,23 +348,30 @@ int ff_add_channel_layout(AVFilterChannelLayouts **l, uint64_t channel_layout) AVFilterFormats *ff_all_formats(enum AVMediaType type) { - AVFilterFormats *ret = NULL; + AVFilterFormats *ret; + int i, count; - if (type == AVMEDIA_TYPE_VIDEO) { - const AVPixFmtDescriptor *desc = NULL; - while ((desc = av_pix_fmt_desc_next(desc))) { - if (ff_add_format(&ret, av_pix_fmt_desc_get_id(desc)) < 0) - return NULL; - } - } else if (type == AVMEDIA_TYPE_AUDIO) { - enum AVSampleFormat fmt = 0; - while (av_get_sample_fmt_name(fmt)) { - if (ff_add_format(&ret, fmt) < 0) - return NULL; - fmt++; - } + if (type == AVMEDIA_TYPE_VIDEO) + count = AV_PIX_FMT_NB; + else if (type == AVMEDIA_TYPE_AUDIO) + count = AV_SAMPLE_FMT_NB; + else + return NULL; + + ret = av_mallocz(sizeof(*ret)); + if (!ret) + return NULL; + + ret->nb_formats = count; + ret->formats = av_malloc_array(count, sizeof(*ret->formats)); + if (!ret->formats) { + av_free(ret); + return NULL; } + for (i = 0; i < count; i++) + ret->formats[i] = i; + return ret; }