From patchwork Mon May 11 15:52:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19631 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 52D0B44A31A for ; Mon, 11 May 2020 18:52:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E45C687FAE; Mon, 11 May 2020 18:52:43 +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 6815368813D for ; Mon, 11 May 2020 18:52:36 +0300 (EEST) Received: by mail-pf1-f193.google.com with SMTP id 18so4927250pfx.6 for ; Mon, 11 May 2020 08:52:36 -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=BlXBGdi/jinE5ADsoGhsIvHyUrhD/CWYMjzVzI/Z7TQ=; b=BdWJNQ+e5Gf8AiyFpWg/ryJCZpr/qcmcvAu58KRG0MoIalUiLtkst2FsST5IChm4gf dQLT2PwiUT2AdFyWiJDYK6Z0vYf7/kKvgKsGgwoCEq+HeI1GE/5a0bnTqMRY5mq301c3 QkLApCcBq6RBDXvL9++kiuhV055evj2u6oGOj/ZlpXxAz3o8Yhapnvnb/0C5JIlvs9XF Lrc9T7N45y54K0t+/MBDN1f5uMYvRsC5b/6J+oeYHybV3Gop8TWs8n0oUXoMDNH2O4Fs 4JAl5SuHRIr67L0sewLgQIcSBBDQctZQeRiRYaC1uxRtOhuqJSuxm66TAqfDbBd/Ke1D 9vFQ== 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=BlXBGdi/jinE5ADsoGhsIvHyUrhD/CWYMjzVzI/Z7TQ=; b=Oqhe7bwYCHGlo4ULa+aPVHvl01bw8B1+rHkd8lwI/v9LlqZ6Q+IpJN7P8SyTew0fVE dzjOf5gF1TdS1UTJ77NVCNDBEhiAiubjLgDsWSEhLGPp0npH2ppe/j3JI4lRuPnu6CKs JxmmYwXC4XPvVJ3RhUF/cG6pJ7EY0eK/B+ymy7NxT7mf1P7/gr8OwmaNVZD6kS/jPYur MskeCGnjChq1Cyb7RU+BUgsFKsk7SUJwJrBjlDKGS1IvnRw3r9NCnD0B1ZNgaGQmqDj7 kvyyIGM67LXal2SPiD037RS4duPURFMKXIz3go+3XRFOthZ50B8ROvTgfgKPK4nSiUbm hS4Q== X-Gm-Message-State: AOAM530aOJFyO0PuVpnb6B4xwGPaeofPcySupm4MjlacAYJivuawwmas wvYUG6M/E0OL5GbBK91JLB/zKdj2 X-Google-Smtp-Source: ABdhPJzQrWOjULNl+gCPSB/8HNt618SZ8RzQcw1hq5VvItmF8nNbC1W2OiUY+1Uq7DTh/sGNddoj/g== X-Received: by 2002:aa7:8c0a:: with SMTP id c10mr6126531pfd.177.1589212354377; Mon, 11 May 2020 08:52:34 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id i12sm744886pgi.21.2020.05.11.08.52.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 May 2020 08:52:33 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 May 2020 23:52:23 +0800 Message-Id: <1589212343-8334-4-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1589212343-8334-1-git-send-email-lance.lmwang@gmail.com> References: <1589212343-8334-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 4/4] avcodec/h264dec: use FF_ALLOCZ_TYPED_ARRAY_OR_GOTO instead 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 | 48 ++++++++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 4c355fe..4e223c1 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -186,34 +186,32 @@ int ff_h264_alloc_tables(H264Context *h) row_mb_num, 8 * sizeof(uint8_t), fail) h->slice_ctx[0].intra4x4_pred_mode = h->intra4x4_pred_mode; - FF_ALLOCZ_OR_GOTO(h->avctx, h->non_zero_count, - big_mb_num * 48 * sizeof(uint8_t), fail) - FF_ALLOCZ_OR_GOTO(h->avctx, h->slice_table_base, - (big_mb_num + h->mb_stride) * sizeof(*h->slice_table_base), fail) - FF_ALLOCZ_OR_GOTO(h->avctx, h->cbp_table, - big_mb_num * sizeof(uint16_t), fail) - FF_ALLOCZ_OR_GOTO(h->avctx, h->chroma_pred_mode_table, - big_mb_num * sizeof(uint8_t), fail) - FF_ALLOCZ_ARRAY_OR_GOTO(h->avctx, h->mvd_table[0], - row_mb_num, 16 * sizeof(uint8_t), fail); - FF_ALLOCZ_ARRAY_OR_GOTO(h->avctx, h->mvd_table[1], - row_mb_num, 16 * sizeof(uint8_t), fail); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(h->avctx, h->non_zero_count, + big_mb_num * 48, fail) + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(h->avctx, h->slice_table_base, + big_mb_num + h->mb_stride, fail) + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(h->avctx, h->cbp_table, + big_mb_num, fail) + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(h->avctx, h->chroma_pred_mode_table, + big_mb_num, fail) + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(h->avctx, h->mvd_table[0], + row_mb_num * 16, fail); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(h->avctx, h->mvd_table[1], + row_mb_num * 16, fail); h->slice_ctx[0].mvd_table[0] = h->mvd_table[0]; h->slice_ctx[0].mvd_table[1] = h->mvd_table[1]; - FF_ALLOCZ_OR_GOTO(h->avctx, h->direct_table, - 4 * big_mb_num * sizeof(uint8_t), fail); - FF_ALLOCZ_OR_GOTO(h->avctx, h->list_counts, - big_mb_num * sizeof(uint8_t), fail) + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(h->avctx, h->direct_table, + 4 * big_mb_num, fail); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(h->avctx, h->list_counts, + big_mb_num, fail) memset(h->slice_table_base, -1, (big_mb_num + h->mb_stride) * sizeof(*h->slice_table_base)); h->slice_table = h->slice_table_base + h->mb_stride * 2 + 1; - FF_ALLOCZ_OR_GOTO(h->avctx, h->mb2b_xy, - big_mb_num * sizeof(uint32_t), fail); - FF_ALLOCZ_OR_GOTO(h->avctx, h->mb2br_xy, - big_mb_num * sizeof(uint32_t), fail); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(h->avctx, h->mb2b_xy, big_mb_num, fail); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(h->avctx, h->mb2br_xy, big_mb_num, fail); for (y = 0; y < h->mb_height; y++) for (x = 0; x < h->mb_width; x++) { const int mb_xy = x + y * h->mb_stride; @@ -268,8 +266,7 @@ 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 - FF_ALLOCZ_OR_GOTO(h->avctx, er->mb_index2xy, - (h->mb_num + 1) * sizeof(int), fail); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(h->avctx, er->mb_index2xy, h->mb_num + 1, fail); for (y = 0; y < h->mb_height; y++) for (x = 0; x < h->mb_width; x++) @@ -278,14 +275,13 @@ int ff_h264_slice_context_init(H264Context *h, H264SliceContext *sl) er->mb_index2xy[h->mb_height * h->mb_width] = (h->mb_height - 1) * h->mb_stride + h->mb_width; - FF_ALLOCZ_OR_GOTO(h->avctx, er->error_status_table, - mb_array_size * sizeof(uint8_t), fail); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(h->avctx, er->error_status_table, + mb_array_size, fail); FF_ALLOC_OR_GOTO(h->avctx, er->er_temp_buffer, h->mb_height * h->mb_stride * (4*sizeof(int) + 1), fail); - FF_ALLOCZ_OR_GOTO(h->avctx, sl->dc_val_base, - yc_size * sizeof(int16_t), fail); + FF_ALLOCZ_TYPED_ARRAY_OR_GOTO(h->avctx, sl->dc_val_base, yc_size, fail); er->dc_val[0] = sl->dc_val_base + h->mb_width * 2 + 2; er->dc_val[1] = sl->dc_val_base + y_size + h->mb_stride + 1; er->dc_val[2] = er->dc_val[1] + c_size;