From patchwork Thu May 31 22:23:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 9187 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp161211jad; Thu, 31 May 2018 15:24:41 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKYVKLXOwaRCQeJMus+o+ipwAU/9kNpCbPJJwXsHx8uw15sYJjlcVeLUzda/HeWPUpB/X8U X-Received: by 2002:adf:adcb:: with SMTP id w69-v6mr7184404wrc.101.1527805481214; Thu, 31 May 2018 15:24:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527805481; cv=none; d=google.com; s=arc-20160816; b=f7e+7YJjul9//5ahTUPa4/yNG6zcmBOgEbkV8sSZsJSAPaJLvHdePIg7GkJVZT687m QbJGvW4wNY1KQ56jRxy4JfjVov9bxxC+BtvRbLuKnPZ+iNw6/O6P/hpMEXFq+y4fbPqG UFLpXv6NfzVxNLTljsekBynhTdgZOGu2+V6dxKbAO4DywLh7MNtkPbWyE8GYl0SR93db 2yqyMM225dID+YxaPcXHEMLwLnMgz3XMAH3FiKqU6H4FP9D/+tiKOWbHcfFZ3qePHSi5 XZxAAwQxeEyd3ABxm2TS3I0OQxOw4r/rH9yjHlDkAjK2+4h7e/16ajduQERiIBhViOsV 45Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=HHnLnVpz/eMZMTe0f7by7AOirRBcbQwGEf/rfa2+cO4=; b=iL7qMOZ06LCexEdlv9IjZvbSUb48FRXkMI86kR6xw4evyWb/O+FrsrcwEJ9VxNX8KN A/x/CJaKNaxKitghDRkdRmrcuHLegvQcjNLX99rpYKNn04Lkx2EozCEEiF3HU7H0NF1+ 9/JCXR506tOWcn225G8kS1hgntpNXm0PsmgATS0dXSBDWzAgY0WaMT+G5GgYpwwcBWQo e/Rrwn2Wo+tCz7ZnsNRxHLtvY8Tk/ohQSmTrcppmuwGx2Oh9biUfG+Ynb8w/CQodnfZh Hdadnm62hXqktlD1HzCmk6KaB3kdKBttTMjpoReGNCSZVPw0wL4c2ER8JmJI4UsrvPQF +j4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=M7dujjAw; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g50-v6si17291909wrd.55.2018.05.31.15.24.40; Thu, 31 May 2018 15:24:41 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=M7dujjAw; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C39DF689DE7; Fri, 1 Jun 2018 01:23:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f49.google.com (mail-wm0-f49.google.com [74.125.82.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 46CC7689DE7 for ; Fri, 1 Jun 2018 01:23:41 +0300 (EEST) Received: by mail-wm0-f49.google.com with SMTP id f8-v6so56669974wmc.4 for ; Thu, 31 May 2018 15:24:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ek/gs+0OpMJlwfGlxej+yg+L8/NkVsKmFal8duVfwbo=; b=M7dujjAwgDw+sHdgFUpIvPUBN9D+Tb0kU2BwKVmtn29ATUmhvZRUoR7yUrAAqhFq0W OPqqL86wx0+N05xhBNISUWwUO0spknNfKuZLDy0mstjXmuAa7RTFAlTa4GgTyKr8Uro6 dq6rMKYQBzs43XYPXaylgzJp48FHKyHqahhvC5uz2OC4bYK+oTH2MtRKAFaecFZvEdjN DQYrTvm9EypIPykC3wbKZ0mI6NL7rHbIKMf1YVDUolDED75yBScWtJj8YDsWEvgpDk4C S5Vc9bKXfEMI85M6Uhpzri5UxTB+7zsEs4R3AvqlzGv2mtG5x8TtkjQ/eGKwaxTSlAx5 lcDQ== 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=ek/gs+0OpMJlwfGlxej+yg+L8/NkVsKmFal8duVfwbo=; b=FzrkgsMhlmef2XmPJMOLvqUp0IdmufOywaWXn6DgJZHgwJitTStuMhD3WgipAQOmrU VsV27KfAapoQQMjHIRLe60W1qEO296R4RVEF+TDh3Gth/n4oAX6xQkdtcyRKHqQzxB1d pUMA6NLI67iXcZe79lZcfnKsEQ/TDGHhSBTSGbubmYKH3lwpnOtMj9FDEFHZD8NPYBWT Wlv/ERGgBNofrwlJMVpy+VXOyVmTnCsSH23kuB4t8kDkJ++IdL+vLQ/gxjpUIfSgh8Hz n6lDTKNPg0GznBgMMv/L43HC2G/rEBpLnz4dM2cDafJ+SGcoo8zcCJkLlqEAyK19n+9c CKcg== X-Gm-Message-State: ALKqPwcMGcWVvntcy+XzRdefySlX/7U0ocIBWDhBP8BDLd2pST1wEukW C1dUj2lZ9Ks9mCh+qg+Mv2BUBw== X-Received: by 2002:a7b:c011:: with SMTP id c17-v6mr1068466wmb.78.1527805465702; Thu, 31 May 2018 15:24:25 -0700 (PDT) Received: from localhost.localdomain ([46.5.2.0]) by smtp.gmail.com with ESMTPSA id b72-v6sm705017wmf.11.2018.05.31.15.24.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 May 2018 15:24:24 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Jun 2018 00:23:54 +0200 Message-Id: <20180531222415.24966-2-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180531222415.24966-1-klaxa1337@googlemail.com> References: <20180528182711.3221-1-klaxa1337@googlemail.com> <20180531222415.24966-1-klaxa1337@googlemail.com> Subject: [FFmpeg-devel] [PATCH 01/22] ffserver.c: Replace av_malloc with av_mallocz_array 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: Stephan Holljes MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Stephan Holljes --- ffserver.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ffserver.c b/ffserver.c index 1363cdc..116c399 100644 --- a/ffserver.c +++ b/ffserver.c @@ -505,8 +505,8 @@ void *run_server(void *arg) { pthread_t *r_threads; pthread_t **w_threads_p; - pubs = av_mallocz(config->nb_streams * sizeof(struct PublisherContext*)); - ifmt_ctxs = av_mallocz(config->nb_streams * sizeof(AVFormatContext*)); + pubs = av_mallocz_array(config->nb_streams, sizeof(struct PublisherContext*)); + ifmt_ctxs = av_mallocz_array(config->nb_streams, sizeof(AVFormatContext*)); av_log_set_level(AV_LOG_INFO); @@ -516,10 +516,10 @@ void *run_server(void *arg) { ainfo.httpd = &lavfhttpd; ainfo.config = config; - rinfos = av_mallocz(config->nb_streams * sizeof(struct ReadInfo)); - winfos_p = av_mallocz(config->nb_streams * sizeof(struct WriteInfo*)); - r_threads = av_mallocz(config->nb_streams * sizeof(pthread_t)); - w_threads_p = av_mallocz(config->nb_streams * sizeof(pthread_t*)); + rinfos = av_mallocz_array(config->nb_streams, sizeof(struct ReadInfo)); + winfos_p = av_mallocz_array(config->nb_streams, sizeof(struct WriteInfo*)); + r_threads = av_mallocz_array(config->nb_streams, sizeof(pthread_t)); + w_threads_p = av_mallocz_array(config->nb_streams, sizeof(pthread_t*)); for (stream_index = 0; stream_index < config->nb_streams; stream_index++) { struct PublisherContext *pub = NULL; @@ -545,8 +545,8 @@ void *run_server(void *arg) { rinfos[stream_index] = rinfo; - w_threads = av_malloc(sizeof(pthread_t) * pub->nb_threads); - winfos = av_malloc(sizeof(struct WriteInfo) * pub->nb_threads); + w_threads = av_mallocz_array(pub->nb_threads, sizeof(pthread_t)); + winfos = av_mallocz_array(pub->nb_threads, sizeof(struct WriteInfo)); w_threads_p[stream_index] = w_threads; winfos_p[stream_index] = winfos; @@ -604,7 +604,7 @@ int main(int argc, char *argv[]) printf("No valid configurations parsed.\n"); return 1; } - server_threads = av_malloc(nb_configs * sizeof(pthread_t)); + server_threads = av_mallocz_array(nb_configs, sizeof(pthread_t)); for (i = 0; i < nb_configs; i++) { config_dump(configs + i); pthread_create(&server_threads[i], NULL, run_server, configs + i);