From patchwork Fri May 29 05:02:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19958 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 122E9449F72 for ; Fri, 29 May 2020 08:02:53 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E813068AEA8; Fri, 29 May 2020 08:02:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com [209.85.216.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9EFB968AD22 for ; Fri, 29 May 2020 08:02:45 +0300 (EEST) Received: by mail-pj1-f67.google.com with SMTP id cx22so655194pjb.1 for ; Thu, 28 May 2020 22:02:45 -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=jmjIr9ECtWpvHdy4d9kJmhb6ettxV1N0r5KYT2VYim8=; b=gXZ311R99p+N5Z10IxguuLynicGvCLPtF8MG1zsmgykxp1sJ/vwtXVTisNfnez5Dyj 92fRHRV+o3lRQ/k7kUS7i87qWDeV82+9xsOKRQ5Z/av83+Rl9dp38+unPvT09ZK6/4cP 70hBPIQEBiKc+ib+fYebE17AHNwt4gaicRTx+0tauhJjNELwwG22KQfRbtt7mGCHN65R FP3AJPBpYqYgrcc25HdgnjO5k7NKtQ1frn84NMPGYfA2GxJqocTrxwRAN+ICTKHfWroq S90YXCgKVq3vFy7iTRoBrU1gAe0ZkTLuv9MhBRGrnQXlN0FR7/rraee0n7TgNjDth7oc rElw== 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=jmjIr9ECtWpvHdy4d9kJmhb6ettxV1N0r5KYT2VYim8=; b=CtLGee/4XG1PL9z7undM9V2DJkKAEEaKhtd9WfWAMvFHSgE4dHKdyeuMsgVXdF1g7g GVBdbaq6A2eU/y/zq05xi8xPTRRxkahgHdJT4tPEUzDX4LZ/rdAbFgWOl3W4N1GJNf7u ne/wvWlcQj2UpDGqGL416hVlKHoL4vjdBrdAjbJZTkEMMGlkxLgT6tm/30Qjnme3mXWU H7gE9whhACUSaDMyOrb9TspLQQZKTrEpbOHbOnORxKCxW+mdD07UGspb+aV5wnTQ40Z0 bF0+XdXHwiYeiTdbAVtYNB7ivvx11XEmZbWLbDDtnzw0OKtHEzg+EOybOxAcfV+Za5r5 FEfA== X-Gm-Message-State: AOAM533yRECkNXmIf33SCN+jQ2WE4fVdEc8sDfxzFwk3O2Xt5W+0SYql eJpoiHNxZ8Lj9rcwfiNvya1jpiFQ X-Google-Smtp-Source: ABdhPJzx1+EyNWJzjoEZdxwfMNmD/zqFBr3z2sEn53K2IS2FGvDg9HkGcI8rvyEM8OC2WON7y6+uog== X-Received: by 2002:a17:902:9049:: with SMTP id w9mr7270101plz.27.1590728563527; Thu, 28 May 2020 22:02:43 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id w73sm6351517pfd.113.2020.05.28.22.02.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 May 2020 22:02:43 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 May 2020 13:02:29 +0800 Message-Id: <1590728554-23471-2-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 2/7] avcodec/h264dec: store count of the tables into const variable for long lines 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 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 7c7a63ca12..951b8c4802 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -182,6 +182,7 @@ int ff_h264_alloc_tables(H264Context *h) { const int big_mb_num = h->mb_stride * (h->mb_height + 1); const int row_mb_num = 2*h->mb_stride*FFMAX(h->nb_slice_ctx, 1); + const int st_size = big_mb_num + h->mb_stride; int x, y; FF_ALLOCZ_ARRAY_OR_GOTO(h->avctx, h->intra4x4_pred_mode, @@ -191,7 +192,7 @@ int ff_h264_alloc_tables(H264Context *h) 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) + st_size * 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, @@ -209,7 +210,7 @@ int ff_h264_alloc_tables(H264Context *h) big_mb_num * sizeof(uint8_t), fail) memset(h->slice_table_base, -1, - (big_mb_num + h->mb_stride) * sizeof(*h->slice_table_base)); + st_size * 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, @@ -254,6 +255,7 @@ int ff_h264_slice_context_init(H264Context *h, H264SliceContext *sl) if (sl != h->slice_ctx) { memset(er, 0, sizeof(*er)); } else if (CONFIG_ERROR_RESILIENCE) { + const int er_size = h->mb_height * h->mb_stride * (4*sizeof(int) + 1); /* init ER */ er->avctx = h->avctx; @@ -282,7 +284,7 @@ int ff_h264_slice_context_init(H264Context *h, H264SliceContext *sl) mb_array_size * sizeof(uint8_t), fail); FF_ALLOC_OR_GOTO(h->avctx, er->er_temp_buffer, - h->mb_height * h->mb_stride * (4*sizeof(int) + 1), fail); + er_size * sizeof(uint8_t), fail); FF_ALLOCZ_OR_GOTO(h->avctx, sl->dc_val_base, yc_size * sizeof(int16_t), fail);