From patchwork Tue Sep 10 05:38:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 14997 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 60721448F8F for ; Tue, 10 Sep 2019 08:38:40 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 42E7E6808E3; Tue, 10 Sep 2019 08:38:40 +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 DF0C368066A for ; Tue, 10 Sep 2019 08:38:33 +0300 (EEST) Received: by mail-pf1-f194.google.com with SMTP id r12so10882265pfh.1 for ; Mon, 09 Sep 2019 22:38:33 -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=uY9RaY2S/GN++nY9L+aPtMe8GoWD5poEmOA0MgGC1xI=; b=MBan8DHRW0bA+nRX7odQEtO57tIeZ4nsLaraCNONxKFXidPKy/JVOEpBveJ2RZPduG cSlzrMHHCbNhXoSBsMpWu7socM+vWS03kCjKvqJ+U3TVLPuaXHiEjAlbkUUrakX04UjQ qW6YqIVB9tZMIOAmLeCyFCVPVTMsqD+ckjjJQzg9hlDHMC69Uwqu3KCCvdSpG7kHQgU3 V7aF+DPBBE8N+XfuiR3atELo37k+bVKHIwZliMLaJNjhcH/IC82ft+L/Hy1VHoFhINlR UjB5e/EYkgfAE6cUGvpMeNoDKT+BRmcnUI2f8hV8eiOUJ/OjmSV3NgZ0304cCENPkKaZ 2GAA== 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=uY9RaY2S/GN++nY9L+aPtMe8GoWD5poEmOA0MgGC1xI=; b=inkM1a7niGeV9BKpuN6vQvkhBNn8VeCUJxU/K9YfpazhZRMYvgEXsMbjR5YfcwOICm z5dfGLt5pO1ypLqV0wYIS+Sdrkfdk+DX4YXZqjzZuSoGQMGTdBstKzBG6VnO7K5biCPk zln34ySaLXDN9Ax5Zmn3eXkaL8YN//JskJ/2w6zNZNGVt+j331p3THKgrQvX0P4L9F36 gBANA5Kl56RuOykoJtOL/HGvmrc0sivB6gmtWR3rGwOwo7RDA7zF9IKs3B9gTHfouIB2 7/tQIuMdJKq/foPdniD/7eCT7sBbAIaWJ+o7HXyP8Dxm3Htgs81aC+sc425yzwyL4YCT ES9A== X-Gm-Message-State: APjAAAU8oLa05Ld8uoY5KWOVCyr1RArvEzOBSHwmQ57Pwy8+zUSPNT1t 1FbtppopZBnqGr1aWSj1v0Da2m5k X-Google-Smtp-Source: APXvYqwueLTPdTcuvp/ZSlaWOR3TCb6N2qHipZrnuIm7zKlA1g3v9lObtLs1hERWXG7UVsHNrtMfiw== X-Received: by 2002:a62:115:: with SMTP id 21mr34375466pfb.110.1568093912137; Mon, 09 Sep 2019 22:38:32 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id l11sm13752904pgq.58.2019.09.09.22.38.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Sep 2019 22:38:31 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Sep 2019 13:38:27 +0800 Message-Id: <20190910053827.30410-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <1568078324-8655-1-git-send-email-lance.lmwang@gmail.com> References: <1568078324-8655-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2] avcodec/h2645_parse: refine the code for better readiablity 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/h2645_parse.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libavcodec/h2645_parse.c b/libavcodec/h2645_parse.c index 307e8643e6..f077900617 100644 --- a/libavcodec/h2645_parse.c +++ b/libavcodec/h2645_parse.c @@ -453,16 +453,15 @@ int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length, } } - if (pkt->nals_allocated < pkt->nb_nals + 1) { - int new_size = pkt->nals_allocated + 1; - void *tmp = av_realloc_array(pkt->nals, new_size, sizeof(*pkt->nals)); + if (pkt->nb_nals >= pkt->nals_allocated) { + void *tmp = av_realloc_array(pkt->nals, pkt->nals_allocated + 1, sizeof(*pkt->nals)); if (!tmp) return AVERROR(ENOMEM); pkt->nals = tmp; - memset(pkt->nals + pkt->nals_allocated, 0, - (new_size - pkt->nals_allocated) * sizeof(*pkt->nals)); + memset(pkt->nals + pkt->nals_allocated, 0, sizeof(*pkt->nals)); + pkt->nals_allocated++; nal = &pkt->nals[pkt->nb_nals]; nal->skipped_bytes_pos_size = 1024; // initial buffer size @@ -470,7 +469,6 @@ int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length, if (!nal->skipped_bytes_pos) return AVERROR(ENOMEM); - pkt->nals_allocated = new_size; } nal = &pkt->nals[pkt->nb_nals];