From patchwork Fri May 29 05:02:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19957 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 29C55449F72 for ; Fri, 29 May 2020 08:02:50 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0801D68AABE; Fri, 29 May 2020 08:02:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F3C7C68A777 for ; Fri, 29 May 2020 08:02:43 +0300 (EEST) Received: by mail-pl1-f196.google.com with SMTP id k22so573449pls.10 for ; Thu, 28 May 2020 22:02:43 -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=CqduYncz3waQmAu9ffrG9E+qpXasecjw3VCIofe3l60=; b=EpO7SeS5z58KKC6QSalNeyov9ZTf46+Ji0/cl7Xk0ChuRoamGA2FPTVFl3PL1RXPHz gIsAN/+bhkXMk/poBFLLCOCB26rz4wSMWaJIAV/ZRltp/27x+YZshrrRDaW8zA8oRG8P /NFxbkdIlQ5M8UOcGJh89OpOHa0Rcu5BbUXLPFZ3vkmVrDgZI45Iao+oIuGqhvWSK+U7 kDU/24UcUyjsyZnFjtxi5AAEn8GXKPOx82QwQqjPr1ivk1nyydTAF7c9/M2ARmF+nW7c B5PHRZtlP5hnmQtkF5UVkg5mIIVnN3RGCzqNIPXC+i8me+UvTjYGNnNHKHHlo/DR8AcW cRRA== 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=CqduYncz3waQmAu9ffrG9E+qpXasecjw3VCIofe3l60=; b=i/RkRuJIqCCnV7if/KGoOQhlmneiUN+8OyD37/2OzfU3iGuJuSdNLCQ354vBcPPs7Z Ibdxc+SgIgdKQph4ILDsYf1aXUZtVryWm8iH621VBTvJmKLcjgn/KsbcPeRInYcCZAMg l08wVGHqjS0OqsC1goVFs5U11pIXnpnOGtPCZgX8hGBPcjbv+dfjWME2i0F+Hr8oE4dc lCLMm/x+XsT8Eg3Ctyba+o7Oa2JzfmGzCtmUNQQw5wZeARmE7/s+uziZAlW/JCz030am q2jypcccParUg/0NRC2n6H5mhwGbTkyYjYyDDIrAFWQN8eHc+khzkzz4xAno7ZkgnpkN wDAg== X-Gm-Message-State: AOAM532SAUxFKjauL0E0EFE962FjZov74B6UJ6lhDckAmx9i3D2UjUbY F07NNxJdAeTbDLDpydtZmoV+2H+J X-Google-Smtp-Source: ABdhPJz7s5w5R2iMQhpZ6Dnsg/UUgG9bHB+QTZytBlZNmyScxFtgo6o8bmK2LKYz+IteRAjKiKpQTQ== X-Received: by 2002:a17:902:b94c:: with SMTP id h12mr6978500pls.315.1590728561972; Thu, 28 May 2020 22:02:41 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id w73sm6351517pfd.113.2020.05.28.22.02.40 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 May 2020 22:02:41 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 May 2020 13:02:28 +0800 Message-Id: <1590728554-23471-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1590674250-32571-1-git-send-email-lance.lmwang@gmail.com> References: <1590674250-32571-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 1/7] avcodec/h264dec: cosmetics 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 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index e463fde2a5..7c7a63ca12 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -253,8 +253,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) { + } else if (CONFIG_ERROR_RESILIENCE) { /* init ER */ er->avctx = h->avctx; 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); From patchwork Fri May 29 05:02:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19959 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 4F6B8449F72 for ; Fri, 29 May 2020 08:02:54 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3AF5568AEEB; Fri, 29 May 2020 08:02:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f65.google.com (mail-pj1-f65.google.com [209.85.216.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 29AF8680D37 for ; Fri, 29 May 2020 08:02:47 +0300 (EEST) Received: by mail-pj1-f65.google.com with SMTP id z15so2772166pjb.0 for ; Thu, 28 May 2020 22:02:47 -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=p5yO7l+wmlKNJUtofWlV7iTUynUniQNW7SmCXn21NQE=; b=rG+RcF33cCyHKvH/sr9OqUSRc09KastiFJwrfLRUuMDtkVptK0DUEsG7MJzrbSjdJf bFu07HTQFfRl33y0DHuEbcUgaph8Jd4kHCBHbWX6GP+CLbKtsLudAnd70w+zjF9bR8+/ oH7Wgd2tQPcqfRIUbluiBsD7x9Lu8C9dQYUcqkxRwPMik03sFeROa0spfIRPvDrdRpHV e3g5vxumzs7kXJUdlhZJBYWEnGsMZwfDf14FtVaAapP08Rgn+m6YYE7X1mwkUZDycYHy Wcx3B34KZRDTV/q0Y+Mt85GaNYM7ADZBEOuYaM+RCXhHkXXH1eAxyHEqJiAXLygbmfw1 8XcQ== 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=p5yO7l+wmlKNJUtofWlV7iTUynUniQNW7SmCXn21NQE=; b=r6Efpif55/mU1Ylj6HbVH/Dg9zKr9Cl63uCIyAjbisiBSc589VBaIy5C4tA/KlKzgj QWc1EYH37m76mVtjVN8XDS/qlPlDHM3I+f9/1rCsEDAjHWz+5G8WY1aEV9nUPl2qwmqg IqS7rCtz0fuY5b8misUQj+zvOi8zbrZWSiDpCoMXKEi/vSGmaDO7IlfY0r6NmytSc1eb 5cIggCpco1WHruj5IfLsCDL6scxY1UxPmY6wAohLLKlLxXyPUnpfl/Pp0kJjTcNocNjJ uEqGyC1RdID1XZ8kdNct005c/fTUmfM+wZ0ze+VTdV/sYAf1OQu+7PA3rUAMPzxs9NTH Ny8A== X-Gm-Message-State: AOAM533eD5guKKSKFef+l6evDkli66+hIxLfetvfg8WbCHSHIA7Y42iu WYIJTe6SxAtLDEpEoxJ0zMR0Bn7S X-Google-Smtp-Source: ABdhPJzUODlrqtFbOiE4rsQnG16I7id2h7XXXU9CS9MD33FVyYuBKEvop3mrGyUujKBPhpAMVXmZUw== X-Received: by 2002:a17:902:7e4e:: with SMTP id a14mr6895504pln.329.1590728565160; Thu, 28 May 2020 22:02:45 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id w73sm6351517pfd.113.2020.05.28.22.02.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 May 2020 22:02:44 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 May 2020 13:02:30 +0800 Message-Id: <1590728554-23471-3-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 3/7] avcodec/h264dec: replace FF_ALLOCZ{_ARRAY}_OR_GOTO with av_mallocz_array() 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 remove the fail goto label and return AVERROR(ENOMEM) directly Signed-off-by: Limin Wang --- libavcodec/h264dec.c | 60 +++++++++++++------------------------------- 1 file changed, 17 insertions(+), 43 deletions(-) diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 951b8c4802..b3bd8c8a67 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -185,38 +185,24 @@ int ff_h264_alloc_tables(H264Context *h) const int st_size = big_mb_num + h->mb_stride; int x, y; - FF_ALLOCZ_ARRAY_OR_GOTO(h->avctx, h->intra4x4_pred_mode, - row_mb_num, 8 * sizeof(uint8_t), fail) + 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)))) + return AVERROR(ENOMEM); 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, - 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, - 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); 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) - memset(h->slice_table_base, -1, 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, - big_mb_num * sizeof(uint32_t), fail); - FF_ALLOCZ_OR_GOTO(h->avctx, h->mb2br_xy, - big_mb_num * sizeof(uint32_t), 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; @@ -227,9 +213,6 @@ int ff_h264_alloc_tables(H264Context *h) } return 0; - -fail: - return AVERROR(ENOMEM); } /** @@ -270,8 +253,11 @@ 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); + 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)))) + return AVERROR(ENOMEM); // ff_h264_free_tables will clean up for us for (y = 0; y < h->mb_height; y++) for (x = 0; x < h->mb_width; x++) @@ -279,15 +265,6 @@ 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_ALLOC_OR_GOTO(h->avctx, er->er_temp_buffer, - er_size * sizeof(uint8_t), fail); - - FF_ALLOCZ_OR_GOTO(h->avctx, sl->dc_val_base, - yc_size * sizeof(int16_t), 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; @@ -296,9 +273,6 @@ int ff_h264_slice_context_init(H264Context *h, H264SliceContext *sl) } return 0; - -fail: - return AVERROR(ENOMEM); // ff_h264_free_tables will clean up for us } static int h264_init_context(AVCodecContext *avctx, H264Context *h) 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++) 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);\ From patchwork Fri May 29 05:02:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19963 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 6D68A449F72 for ; Fri, 29 May 2020 08:03:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5D3AB68AFA9; Fri, 29 May 2020 08:03:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D167D68AB98 for ; Fri, 29 May 2020 08:02:51 +0300 (EEST) Received: by mail-pg1-f193.google.com with SMTP id 124so798787pgi.9 for ; Thu, 28 May 2020 22:02:51 -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=6joJTp83X8MvclYrOHNTl7spiWDR1GsQhfJKIejuhfM=; b=JeyEnZibA7I7JmSBEuryDzo4H7SIJXohzQq8xWKaioTFMfRKCoLSEsc+iRGnakSgTw SrYFLFTYEjbFxrpxu4u2N6t0qJ44VN0gLYXzbbQEfXw/tDPNQWNocnHKpIqBBIh3jkHf Ocg4xb/3zzURydzSodzvTE8adhL5vSt5H3A09rHe0fMOIvVlz3KFpab9UrAqH1R39OnK ziFprZtBVZB4xibkUJSYqcJDNcIm++7+01ZoNOV/CZatxK/oqzT18fot+11efS/LYNIq Ay8AIsQ+hSpwMet8j78aW/FQ9uK/3sORviN8xXl4rNYeMLcRR49Nfzmzr/2x+va9pmu+ 722A== 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=6joJTp83X8MvclYrOHNTl7spiWDR1GsQhfJKIejuhfM=; b=FVveWj2pYYAc+a4BQBduVRUsTk8YVD9G3tI+zTq380/TiWkVAM/IoOo/fgJM1GRnlp BcymSPItC4WPzgXlK5UI5c4UMswQP/2CMB/Lq4dSpyleuXpMEPH+np3lWI5DSYOp+fEC YI4elJJQak6x7ttWkqxr5Xq6iBts5BRIn2gwS2wdS13apku15WTcSuOhZFACXzB8+X8l JYAhYLhA1IK+L2oAHNCmwwwYRaWD9+rAInc/HA+61qrOhZwSRjf1FR2gY3ybGerNxLsG YZ0mn6/v9u7fKHRRVnzoNjrWN5r+iYRBIYEu9QTmJiUIaX3m1Dp6sEfXOA69XbWCjhVT MeYg== X-Gm-Message-State: AOAM5317m9zTljhMbmk6rKcCuK3zzNrktkVealeVBWU219ziPM3B9cWl A9BvGnLLYkz2wVAOjdx4ZMWK72BV X-Google-Smtp-Source: ABdhPJzAMpC8ad8wlUnvMJMixBgpSQSof7vv3YaimRPcEeX+vXrQRJC8i0WfzBPbkqIId5c86JfR7A== X-Received: by 2002:a65:4487:: with SMTP id l7mr6662810pgq.221.1590728569930; Thu, 28 May 2020 22:02:49 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id w73sm6351517pfd.113.2020.05.28.22.02.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 May 2020 22:02:49 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 May 2020 13:02:33 +0800 Message-Id: <1590728554-23471-6-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 6/7] avcodec/adpcmenc: remove FF_ALLOC_OR_GOTO macros for gotos will be removed 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/adpcmenc.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index d5fbc0b9a7..bcb6783c0c 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -89,14 +89,11 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) if (avctx->trellis) { int frontier = 1 << avctx->trellis; int max_paths = frontier * FREEZE_INTERVAL; - FF_ALLOC_OR_GOTO(avctx, s->paths, - max_paths * sizeof(*s->paths), error); - FF_ALLOC_OR_GOTO(avctx, s->node_buf, - 2 * frontier * sizeof(*s->node_buf), error); - FF_ALLOC_OR_GOTO(avctx, s->nodep_buf, - 2 * frontier * sizeof(*s->nodep_buf), error); - FF_ALLOC_OR_GOTO(avctx, s->trellis_hash, - 65536 * sizeof(*s->trellis_hash), error); + if (!FF_ALLOC_TYPED_ARRAY(s->paths, max_paths) || + !FF_ALLOC_TYPED_ARRAY(s->node_buf, 2 * frontier) || + !FF_ALLOC_TYPED_ARRAY(s->nodep_buf, 2 * frontier) || + !FF_ALLOC_TYPED_ARRAY(s->trellis_hash, 65536)) + return AVERROR(ENOMEM); } avctx->bits_per_coded_sample = av_get_bits_per_sample(avctx->codec->id); @@ -523,7 +520,8 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, /* stereo: 4 bytes (8 samples) for left, 4 bytes for right */ if (avctx->trellis > 0) { - FF_ALLOC_ARRAY_OR_GOTO(avctx, buf, avctx->channels, blocks * 8, error); + if (!FF_ALLOC_TYPED_ARRAY(buf, avctx->channels * blocks * 8)) + return AVERROR(ENOMEM); for (ch = 0; ch < avctx->channels; ch++) { adpcm_compress_trellis(avctx, &samples_p[ch][1], buf + ch * blocks * 8, &c->status[ch], @@ -618,7 +616,8 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, } if (avctx->trellis > 0) { - FF_ALLOC_OR_GOTO(avctx, buf, 2 * n, error); + if (!(buf = av_malloc(2 * n))) + return AVERROR(ENOMEM); adpcm_compress_trellis(avctx, samples + avctx->channels, buf, &c->status[0], n, avctx->channels); if (avctx->channels == 2) @@ -666,7 +665,8 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, if (avctx->trellis > 0) { n = avctx->block_align - 7 * avctx->channels; - FF_ALLOC_OR_GOTO(avctx, buf, 2 * n, error); + if (!(buf = av_malloc(2 * n))) + return AVERROR(ENOMEM); if (avctx->channels == 1) { adpcm_compress_trellis(avctx, samples, buf, &c->status[0], n, avctx->channels); @@ -693,7 +693,8 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, case AV_CODEC_ID_ADPCM_YAMAHA: n = frame->nb_samples / 2; if (avctx->trellis > 0) { - FF_ALLOC_OR_GOTO(avctx, buf, 2 * n * 2, error); + if (!(buf = av_malloc(2 * n * 2))) + return AVERROR(ENOMEM); n *= 2; if (avctx->channels == 1) { adpcm_compress_trellis(avctx, samples, buf, &c->status[0], n, From patchwork Fri May 29 05:02:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19960 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 476CB449F72 for ; Fri, 29 May 2020 08:02:58 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2C28368AF6D; 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-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8777668AED0 for ; Fri, 29 May 2020 08:02:53 +0300 (EEST) Received: by mail-pf1-f194.google.com with SMTP id 131so650020pfv.13 for ; Thu, 28 May 2020 22:02: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=eo9HU4Y4mC5jANS0ZN8Kjh3wJ3n+rRE12I33nC5telE=; b=K5gskoaNwN/qjhOVFl2z1SaEq0O9BYcP3ieRG7bzpzohLuSJ4NbnY/6bPXsoY57wOh +Tszm+MUyiQIpRtchugC6eaZDgQtUPs0sNd4r05eCQnNroPjbBBJr23IW31tk+2owFie NDMCNtpnlWsrUM/E9kYFXXUycYusym0HAcLXU2CzPdCYL1rPf4QgEhrE3DH9rJEHWzL2 6HinJ3xSJZY+t4cHVZeOBwcZ6tMiEvtpPj3HRut7Zhnw3Joz968T1NyG7TOlJjs9hWJV O4wQxlLmP5Z3VpXfLJgAoDtBkB+dYOVRkBtvuR4Jt2iL0ISDe3OnXSvSCsz4TyBDLnJh SM7w== 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=eo9HU4Y4mC5jANS0ZN8Kjh3wJ3n+rRE12I33nC5telE=; b=CgsQwyhbOpUiOq5jcNiQTPh+0RbQFzvn7ouyHXegZ7nHGWxw+xehnAXaEhyr+57e2c SG0pQj/rLOhy7as2afK8R1cv7LwscFZiX34LLIBiYmqoVP6L3X4gdd95TAPvnoSwQevN iRLwLaoA6/C/BDLkRVCz/tfMITl6RG+WwclwxFVXMxIRb13H3VB7aX5waid3rtbTxufB Sd61elrW4MXLkno7FKnuN5GO8s3FbxeGvJErDX9gbaz1mAOTpVAbKkDhDTiFC3oq/ZsW Fa/apKdOoylY/KxfuiePWSXFwLKdavD44QqWy8u3emFPrBqoSSrF5jV8PKc/KoGq9OXe lAcw== X-Gm-Message-State: AOAM530Txnm8SIBRt/dmQKRXi9C8LR5ZGa6271iFeve8D9ghg8U9J1oL KeZ8FNE+S0DSF5Mk3kxde8/rWyKk X-Google-Smtp-Source: ABdhPJzpt8EZd89l26nG/OBAhyHMZHk7c3aFG2tSFcyZu9tqAl4DXN//oDwQEChtDtyKS5d8icQy3A== X-Received: by 2002:a63:3c53:: with SMTP id i19mr6445798pgn.147.1590728571541; Thu, 28 May 2020 22:02:51 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id w73sm6351517pfd.113.2020.05.28.22.02.50 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 May 2020 22:02:51 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 May 2020 13:02:34 +0800 Message-Id: <1590728554-23471-7-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 7/7] avcodec/adpcmenc: remove gotos and error label 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/adpcmenc.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index bcb6783c0c..52f0f67958 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -65,7 +65,6 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) ADPCMEncodeContext *s = avctx->priv_data; uint8_t *extradata; int i; - int ret = AVERROR(ENOMEM); if (avctx->channels > 2) { av_log(avctx, AV_LOG_ERROR, "only stereo or mono is supported\n"); @@ -120,7 +119,7 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) avctx->bits_per_coded_sample = 4; avctx->block_align = BLKSIZE; if (!(avctx->extradata = av_malloc(32 + AV_INPUT_BUFFER_PADDING_SIZE))) - goto error; + return AVERROR(ENOMEM); avctx->extradata_size = 32; extradata = avctx->extradata; bytestream_put_le16(&extradata, avctx->frame_size); @@ -140,8 +139,7 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) avctx->sample_rate != 44100) { av_log(avctx, AV_LOG_ERROR, "Sample rate must be 11025, " "22050 or 44100\n"); - ret = AVERROR(EINVAL); - goto error; + return AVERROR(EINVAL); } avctx->frame_size = 512 * (avctx->sample_rate / 11025); break; @@ -150,13 +148,10 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) avctx->block_align = BLKSIZE; break; default: - ret = AVERROR(EINVAL); - goto error; + return AVERROR(EINVAL); } return 0; -error: - return ret; } static av_cold int adpcm_encode_close(AVCodecContext *avctx) @@ -725,8 +720,6 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, avpkt->size = pkt_size; *got_packet_ptr = 1; return 0; -error: - return AVERROR(ENOMEM); } static const enum AVSampleFormat sample_fmts[] = {