From patchwork Thu Apr 9 11:07:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 18794 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 EB4FB44AD15 for ; Thu, 9 Apr 2020 14:07:39 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DA9A168B810; Thu, 9 Apr 2020 14:07:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4AC5368B677 for ; Thu, 9 Apr 2020 14:07:32 +0300 (EEST) Received: by mail-pg1-f193.google.com with SMTP id k5so4844145pga.2 for ; Thu, 09 Apr 2020 04:07:32 -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; bh=I71k8BWevDDZZwHLcC9pIXLpb7T6+vV9P3L0aqFUfAU=; b=B2LcnJaHKjV3j1wHZXZ/Bk546T9ed06a4lL965mOsDaOFD1rhZXo7ydpMRRlS4owBp 6NlgiRO4a053QUdyiNN66RU2RVX6FEZQ1ecTJ0zPU7GvfClY0jlrV9KsXt4VprppPTX7 HjF06HHpB13qeZ1l2NiyAwLm93ta4Az6iasbQd2mlgMJVSfuOoEIbIbga/GCKZ6CnXp9 Yly74nUU9BTfy1NPaQHOcYEaxgcknZAKfPoC3F6sF+9H7/zvDZpgQwjKB1SbwMQxwUhN UAMe1Vnecq4bI6USni94cOsgNwfe2bJTRVTaP7M01U9NdHdb32jGtUmqU4snVHfjBegc 7ipg== 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; bh=I71k8BWevDDZZwHLcC9pIXLpb7T6+vV9P3L0aqFUfAU=; b=ZnUuLWIGzFr3HrO7SRjnIROclpPd7aDF9T5/FTWAgiK3suSeq85rjo6qnzS5yaDUJj 0h7YNOmQjo7R8DcMnosV9qoIge1AGe49LIC07K3CJpSPdqXNt2IVZJxLofF2p00+yXro jvpA8HuPWTNrUs62W28+bhcTZyVGtU4q9RFF5rQImGsJ6hid0ECE5cRE7jXwozxdOJZ/ FG+MZx0/a6QxBwUZiJvxxo9P/CUdmtJpi8Mypre9iW8uB99oD6oEhG6IPFjDZQYY/jlD hbpmgDZCFoOo15ctNmTkij6HDT791rrKsHc1A9wDhi7Pe+hJOPki8rltKWwA6wxURvAK brkQ== X-Gm-Message-State: AGi0PuYocLJqNQYHbdcR4sTq0OMr+I+YemhXz7oUTNbDMBHzor/ye6nh ZX7q4VpU6ou6vObCOqBvO2XjfP41 X-Google-Smtp-Source: APiQypJeptwfX+xqPciZaxCjxedHgp9CpNH+1M09RyaIX4TmwrVyTP8BElTYJiQE+BVXVEV6wkSUIQ== X-Received: by 2002:a65:6451:: with SMTP id s17mr11539803pgv.124.1586430450572; Thu, 09 Apr 2020 04:07:30 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id k17sm18977042pfp.194.2020.04.09.04.07.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Apr 2020 04:07:30 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Apr 2020 19:07:20 +0800 Message-Id: <20200409110720.6965-4-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20200409110720.6965-1-lance.lmwang@gmail.com> References: <20200409110720.6965-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 4/4] avfilter/ebur128: prefer to use variable instead of type for sizeof 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavfilter/ebur128.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavfilter/ebur128.c b/libavfilter/ebur128.c index c8986fb5e1..ca2fca0066 100644 --- a/libavfilter/ebur128.c +++ b/libavfilter/ebur128.c @@ -155,7 +155,7 @@ static int ebur128_init_channel_map(FFEBUR128State * st) { size_t i; st->d->channel_map = - (int *) av_malloc_array(st->channels, sizeof(int)); + (int *) av_malloc_array(st->channels, sizeof(*st->d->channel_map)); if (!st->d->channel_map) return AVERROR(ENOMEM); if (st->channels == 4) { @@ -221,17 +221,17 @@ FFEBUR128State *ff_ebur128_init(unsigned int channels, int errcode; FFEBUR128State *st; - st = (FFEBUR128State *) av_malloc(sizeof(FFEBUR128State)); + st = (FFEBUR128State *) av_malloc(sizeof(*st)); CHECK_ERROR(!st, 0, exit) st->d = (struct FFEBUR128StateInternal *) - av_malloc(sizeof(struct FFEBUR128StateInternal)); + av_malloc(sizeof(*st->d)); CHECK_ERROR(!st->d, 0, free_state) st->channels = channels; errcode = ebur128_init_channel_map(st); CHECK_ERROR(errcode, 0, free_internal) st->d->sample_peak = - (double *) av_mallocz_array(channels, sizeof(double)); + (double *) av_mallocz_array(channels, sizeof(*st->d->sample_peak)); CHECK_ERROR(!st->d->sample_peak, 0, free_channel_map) st->samplerate = samplerate; @@ -253,16 +253,16 @@ FFEBUR128State *ff_ebur128_init(unsigned int channels, } st->d->audio_data = (double *) av_mallocz_array(st->d->audio_data_frames, - st->channels * sizeof(double)); + st->channels * sizeof(*st->d->audio_data)); CHECK_ERROR(!st->d->audio_data, 0, free_sample_peak) ebur128_init_filter(st); st->d->block_energy_histogram = - av_mallocz(1000 * sizeof(unsigned long)); + av_mallocz(1000 * sizeof(*st->d->block_energy_histogram)); CHECK_ERROR(!st->d->block_energy_histogram, 0, free_audio_data) st->d->short_term_block_energy_histogram = - av_mallocz(1000 * sizeof(unsigned long)); + av_mallocz(1000 * sizeof(*st->d->short_term_block_energy_histogram)); CHECK_ERROR(!st->d->short_term_block_energy_histogram, 0, free_block_energy_histogram) st->d->short_term_frame_counter = 0; @@ -275,7 +275,7 @@ FFEBUR128State *ff_ebur128_init(unsigned int channels, if (ff_thread_once(&histogram_init, &init_histogram) != 0) goto free_short_term_block_energy_histogram; - st->d->data_ptrs = av_malloc_array(channels, sizeof(void *)); + st->d->data_ptrs = av_malloc_array(channels, sizeof(*st->d->data_ptrs)); CHECK_ERROR(!st->d->data_ptrs, 0, free_short_term_block_energy_histogram);