From patchwork Fri May 29 05:02:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19962 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 B38E3449F72 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 A25BE68AEEA; Fri, 29 May 2020 08:02:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6219C680D37 for ; Fri, 29 May 2020 08:02:50 +0300 (EEST) Received: by mail-pj1-f68.google.com with SMTP id z15so2772205pjb.0 for ; Thu, 28 May 2020 22:02:50 -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=WY/gjiorP0czu+32nyGeV6nsb8rkJ8Ymw486K3VGbNE=; b=XxWwPE6kGS5P5g5hIJD1WO26PHEJws0M8xj8ww/cR+K3Pg04HRryfuDxLuKvXUx0D8 dJ0pPpu9zRfRFlSGWSLFpuxlcMzvTGzrQg8TnmjCvuWzpWE/MKsfYwbra5RYViSQdgk7 sF9YNIJCZWnYabQYuywAAbsT3+uP5/TvWj5heXOaBebMlSVXR7PSmSRqu0O714LnM86h UaZ9Xe1LdUS4GmFIgoigPQTJH8q6Aks7lWkv0fLhKrIZovumB/dW66ohamNWfpRnuBtr LarBNA0rBM3gl56Wj2MvIltqc2MnoPwhlEWVaS792TKVtsBJBUlb/s+AH8glyQ77r26I HeaQ== 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=WY/gjiorP0czu+32nyGeV6nsb8rkJ8Ymw486K3VGbNE=; b=lelN3uOuhkujezwZnGE26lESK2XTkoD43eQtFej9JFfKEuuW/yLcLI7cyWhhc3QHBo DxS6ouaFErW+rop8i4NzpHZR0hVkidD5ZS8goaKLcxWW8Yfe0Io7GewIZjSNYwjuqENw JfboBmNQdOkPqjv78lxphMkjoGVZDsuj9iZlrmT3ees5of8W/aiQ7X6HdF0GUf1bYUMP pRz8vnVdJ07BByldEf/0+KVPDXfD5cbu2OGbas0pnZCFl9REn8ebGyZsKi7SUwkXOSd1 XVTocLZ7HYdzYKRg6yuqshEpEwMX+Hw5Or9RViJUbXGaq/bgb14ORtqLmY65nVwfgbPI SX8Q== X-Gm-Message-State: AOAM5302DJ8QOwhJ6VzuuMv0SeBPGjvuaKS0/tqPjUSYkB51X/15Z/hg KFiueYo/Rxw5Psi2ATjL937ecSRe X-Google-Smtp-Source: ABdhPJxAa3M6WY7bFrJgLmspMlJY4A6CsgTNI7fp4i0JQVmNXOd6gGZsrBIPirWSw1ogLLxH2gygiw== X-Received: by 2002:a17:902:6943:: with SMTP id k3mr7146548plt.81.1590728568343; Thu, 28 May 2020 22:02:48 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id w73sm6351517pfd.113.2020.05.28.22.02.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 May 2020 22:02:47 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 May 2020 13:02:32 +0800 Message-Id: <1590728554-23471-5-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 5/7] avcodec/h264dec: define and use FF_ALLOCZ_TYPED_ARRAY helper macro 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 +++++++++++++++--------------- libavutil/internal.h | 3 +++ 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 8a4c85018f..6dba6efe56 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(*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)))) + if (!FF_ALLOCZ_TYPED_ARRAY(h->intra4x4_pred_mode, row_mb_num * 8) || + !FF_ALLOCZ_TYPED_ARRAY(h->non_zero_count, big_mb_num * 48) || + !FF_ALLOCZ_TYPED_ARRAY(h->slice_table_base, st_size) || + !FF_ALLOCZ_TYPED_ARRAY(h->cbp_table, big_mb_num) || + !FF_ALLOCZ_TYPED_ARRAY(h->chroma_pred_mode_table, big_mb_num) || + !FF_ALLOCZ_TYPED_ARRAY(h->mvd_table[0], row_mb_num * 16) || + !FF_ALLOCZ_TYPED_ARRAY(h->mvd_table[1], row_mb_num * 16) || + !FF_ALLOCZ_TYPED_ARRAY(h->direct_table, big_mb_num * 4) || + !FF_ALLOCZ_TYPED_ARRAY(h->list_counts, big_mb_num) || + !FF_ALLOCZ_TYPED_ARRAY(h->mb2b_xy, big_mb_num) || + !FF_ALLOCZ_TYPED_ARRAY(h->mb2br_xy, big_mb_num)) 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(*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)))) + if (!FF_ALLOCZ_TYPED_ARRAY(er->mb_index2xy, h->mb_num + 1) || + !FF_ALLOCZ_TYPED_ARRAY(er->error_status_table, mb_array_size) || + !FF_ALLOCZ_TYPED_ARRAY(er->er_temp_buffer, er_size) || + !FF_ALLOCZ_TYPED_ARRAY(sl->dc_val_base, yc_size)) return AVERROR(ENOMEM); // ff_h264_free_tables will clean up for us for (y = 0; y < h->mb_height; y++) diff --git a/libavutil/internal.h b/libavutil/internal.h index 4acbcf56cb..00f1a578c0 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -137,6 +137,9 @@ # define LOCAL_ALIGNED_32(t, v, ...) E1(LOCAL_ALIGNED_A(32, t, v, __VA_ARGS__,,)) #endif +#define FF_ALLOC_TYPED_ARRAY(p, nelem) (p = av_malloc_array(nelem, sizeof(*p))) +#define FF_ALLOCZ_TYPED_ARRAY(p, nelem) (p = av_mallocz_array(nelem, sizeof(*p))) + #define FF_ALLOC_OR_GOTO(ctx, p, size, label)\ {\ p = av_malloc(size);\