From patchwork Tue Jun 2 15:26:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20105 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 6D5D344AF78 for ; Tue, 2 Jun 2020 18:28:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5267168B0A4; Tue, 2 Jun 2020 18:28:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0B02168B0A1 for ; Tue, 2 Jun 2020 18:27:54 +0300 (EEST) Received: by mail-pf1-f195.google.com with SMTP id b16so445037pfi.13 for ; Tue, 02 Jun 2020 08:27:53 -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=j3GDf3w+QxSCqxGL2TJ07Uzy8lkB1XHDONrpgEEir1A=; b=nUCkDLtCfaWym+vxEqXoObq77DWz6oUPjmnnwfMdpsq8ZRhdtYGjHY/DooEELgMzs9 6TcZcr6WYHKnyyhjZOwjjRRbtE8SXLXmdcQl9HeT7OY2C9pwakwHyrJunmV5SHswvIqj dHyBGsYBJSWSyZq/R8lR9kJHdrXz1RKvQxmv+dKIffNX49Gax8pkbe+WBYMpsj9Ybdoh xcQuGD09d5Ai2S2phsyEi62h3L2+XwuahJ/9+nf4G8Q1bYPxM7MNhiZcM/MOnqViLN1B kjkWiXfM2e2mcVyfSBI32TPKtIq1Dbu4vkWsntVmZmoPKlYZrB6Mi+fN2x9ISwWjrhuf IWYA== 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=j3GDf3w+QxSCqxGL2TJ07Uzy8lkB1XHDONrpgEEir1A=; b=ldANxtpB/w6uGvIk5SDdYoP4chIvKqZG3+WqLUq0m+H/uRLZoygbKgbBOwsY7ID4N4 P2Exvh8fHyFgWFu3EeSqnXQ6Dis3NHqER+VtoypV8SDL2LSKEJ1OIRORQJ+AHmT+XAcF j0wGK7NttvuFhkgcacYRLf6vbjMkWJt9TH479jd8rQurNarFAG/Nx9QML1Kve1CoxhUJ 1Hrpi7CuA4JcjXPdlTVhwYiN+PExdrnoQw05oCjFjzd/qCBaq1YpXvdIIIsokKeDulF3 OHiJunWN/Rx9NeMTaVwniK9qhOILmCvrNiJkRLR+w5xYWsX7CBRnDE+MbtUvpQInB0Js W5Ww== X-Gm-Message-State: AOAM530MxO53KnwHRpsCc7sTx3PnB8msm9ea+6YimCVL3Cg8uCLAPoJB IzWCeiJji6EIBOwIyicttyp4H7IH X-Google-Smtp-Source: ABdhPJw52Xe46Tqs4E5bvOwRpv3lzQ9eK4RtfRDKMeSq4ia9V38X6fFMoEmJWFXJLkBVAk5qULo+Nw== X-Received: by 2002:a62:7707:: with SMTP id s7mr26653266pfc.90.1591111672028; Tue, 02 Jun 2020 08:27:52 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id j7sm2626736pfh.154.2020.06.02.08.27.50 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2020 08:27:51 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jun 2020 23:26:36 +0800 Message-Id: <1591111618-15778-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1591111618-15778-1-git-send-email-lance.lmwang@gmail.com> References: <1590674250-32571-1-git-send-email-lance.lmwang@gmail.com> <1591111618-15778-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v4 02/24] 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 4d8c0b1..66f45e6 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);