From patchwork Fri May 29 05:02:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19961 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 05DE9449F72 for ; Fri, 29 May 2020 08:02:59 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E67F468AF97; Fri, 29 May 2020 08:02:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C07BE68AEE4 for ; Fri, 29 May 2020 08:02:48 +0300 (EEST) Received: by mail-pf1-f193.google.com with SMTP id n18so686369pfa.2 for ; Thu, 28 May 2020 22:02:48 -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=QmKWPPj5yjhX2OiGp9ia865wYvrwJUuc05rUTjT6Eu8=; b=mRADBOFwObZ9oSNhVKi55D0aSj1Dff1BgZwmphMImnzTKgsqds6OAzpGmtHBe3BvpK VV6plOasysiIqennmryqp2DiWiH/JpsAmp3DyRd7gR+2/CyjUVfDQDVKEYXvkhBwxQJ8 PCuNwp3W34Wu6Ciem3oMw2jnRhb7ogBUAd/h8+bvrLYvf89I1pqZyWY84xqDRIRlyc7A BNZuUbAePE478oE2IFBTF8MHoKRaisAg0bltub4u+Y4IQxvzcqZmIs8o8eDJNGiddoS4 grHBpxH3WEZgwmFX5+ju6PVWSvJtLNUxmuQuIrqZUfZqZN7Z9EDfvcTYbv6WpOGAwsYp +Sqg== 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=QmKWPPj5yjhX2OiGp9ia865wYvrwJUuc05rUTjT6Eu8=; b=ZacOOWAGPoBx/vTbCGcOoA4++QQRQctwnkgLIr4tEQSWfGUf/qiVmCgEZXWcvOyGw7 xfyBicMHZFiyuLC67XQiMHf/w0ymrWtHkJH8MmsAMdZ7vNLCxuFDYPPmY6KzoUcKGhmS qvd6rk3+K8PoypQcEqzpvR6w7+JoTybmiKFNr5PHWe6qMsbhqN59sEBW7x5YICDaZYZq s8RSgnuogYrDbvIvzWzxStUY39tCdlboeFd3L0aupL83YHyq6+ZH93pVInCwEHaX7M6O wDiRVFJavoRuosox4Gc1mo+sVcsxJSxZurpyniv8IBrZ/qwJI4BtlK7D/Qo5QdEHZgxG DbZg== X-Gm-Message-State: AOAM532KocmFLqbd9aZBPkO7zU2MhQWQ4M8pF2YMtDvbP8RySBkk/65k Cb0i6xceQacl0cyalZHRrC+9WRe+ X-Google-Smtp-Source: ABdhPJw7w3mDx153+TKWqiiwhJ1Ik9wvRZ9QD0aEAyLiuANvTUKD4RWhsTHZmPgqzAAXLx/1zN3yvg== X-Received: by 2002:a65:4241:: with SMTP id d1mr319472pgq.307.1590728566769; Thu, 28 May 2020 22:02:46 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id w73sm6351517pfd.113.2020.05.28.22.02.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 May 2020 22:02:46 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 May 2020 13:02:31 +0800 Message-Id: <1590728554-23471-4-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1590728554-23471-1-git-send-email-lance.lmwang@gmail.com> References: <1590674250-32571-1-git-send-email-lance.lmwang@gmail.com> <1590728554-23471-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 4/7] avcodec/h264dec: 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 --- libavcodec/h264dec.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index b3bd8c8a67..8a4c85018f 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -185,17 +185,17 @@ int ff_h264_alloc_tables(H264Context *h) const int st_size = big_mb_num + h->mb_stride; int x, y; - if (!(h->intra4x4_pred_mode = av_mallocz_array(row_mb_num * 8, sizeof(uint8_t))) || - !(h->non_zero_count = av_mallocz_array(big_mb_num * 48, sizeof(uint8_t))) || - !(h->slice_table_base = av_mallocz_array(st_size, sizeof(*h->slice_table_base))) || - !(h->cbp_table = av_mallocz_array(big_mb_num, sizeof(uint16_t))) || - !(h->chroma_pred_mode_table = av_mallocz_array(big_mb_num, sizeof(uint8_t))) || - !(h->mvd_table[0] = av_mallocz_array(row_mb_num * 16, sizeof(uint8_t))) || - !(h->mvd_table[1] = av_mallocz_array(row_mb_num * 16, sizeof(uint8_t))) || - !(h->direct_table = av_mallocz_array(big_mb_num * 4, sizeof(uint8_t))) || - !(h->list_counts = av_mallocz_array(big_mb_num, sizeof(uint8_t))) || - !(h->mb2b_xy = av_mallocz_array(big_mb_num, sizeof(uint32_t))) || - !(h->mb2br_xy = av_mallocz_array(big_mb_num, sizeof(uint32_t)))) + if (!(h->intra4x4_pred_mode = av_mallocz_array(row_mb_num * 8, sizeof(*h->intra4x4_pred_mode))) || + !(h->non_zero_count = av_mallocz_array(big_mb_num * 48, sizeof(*h->non_zero_count))) || + !(h->slice_table_base = av_mallocz_array(st_size, sizeof(*h->slice_table_base))) || + !(h->cbp_table = av_mallocz_array(big_mb_num, sizeof(*h->cbp_table))) || + !(h->chroma_pred_mode_table = av_mallocz_array(big_mb_num, sizeof(*h->chroma_pred_mode_table))) || + !(h->mvd_table[0] = av_mallocz_array(row_mb_num * 16, sizeof(*h->mvd_table[0]))) || + !(h->mvd_table[1] = av_mallocz_array(row_mb_num * 16, sizeof(*h->mvd_table[1]))) || + !(h->direct_table = av_mallocz_array(big_mb_num * 4, sizeof(*h->direct_table))) || + !(h->list_counts = av_mallocz_array(big_mb_num, sizeof(*h->list_counts))) || + !(h->mb2b_xy = av_mallocz_array(big_mb_num, sizeof(*h->mb2b_xy))) || + !(h->mb2br_xy = av_mallocz_array(big_mb_num, sizeof(*h->mb2br_xy)))) return AVERROR(ENOMEM); h->slice_ctx[0].intra4x4_pred_mode = h->intra4x4_pred_mode; h->slice_ctx[0].mvd_table[0] = h->mvd_table[0]; @@ -253,10 +253,10 @@ int ff_h264_slice_context_init(H264Context *h, H264SliceContext *sl) er->b8_stride = h->mb_width * 2 + 1; // error resilience code looks cleaner with this - if (!(er->mb_index2xy = av_mallocz_array(h->mb_num + 1, sizeof(int))) || - !(er->error_status_table = av_mallocz_array(mb_array_size, sizeof(uint8_t))) || - !(er->er_temp_buffer = av_mallocz_array(er_size, sizeof(uint8_t))) || - !(sl->dc_val_base = av_mallocz_array(yc_size, sizeof(int16_t)))) + if (!(er->mb_index2xy = av_mallocz_array(h->mb_num + 1, sizeof(*er->mb_index2xy))) || + !(er->error_status_table = av_mallocz_array(mb_array_size, sizeof(*er->error_status_table))) || + !(er->er_temp_buffer = av_mallocz_array(er_size, sizeof(*er->er_temp_buffer))) || + !(sl->dc_val_base = av_mallocz_array(yc_size, sizeof(*sl->dc_val_base)))) return AVERROR(ENOMEM); // ff_h264_free_tables will clean up for us for (y = 0; y < h->mb_height; y++)