From patchwork Sat Sep 14 03:01:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 15066 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 E40E6447A45 for ; Sat, 14 Sep 2019 06:08:04 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CC203688302; Sat, 14 Sep 2019 06:08:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3FC48688200 for ; Sat, 14 Sep 2019 06:07:58 +0300 (EEST) Received: by mail-pl1-f193.google.com with SMTP id t11so14075063plo.0 for ; Fri, 13 Sep 2019 20:07:58 -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=eZmfSTSyKM2eQyJA5m6WmumYXXmyOYhMW/6G5sLACbM=; b=gfy4Vnd1B8C2gy3aYOQjxqDA+HPLWqsLxO1Xqf7jMlFQsVez4QTB84OsMLh3o2ATAZ OjYdXCe0EG8YcxIyRWx53LbR7gBNawobj6zFIltPFq/BrLgEgGFhRk7RGvgBU7ufus9V hz2lssqT3tJbYGGtPxdU7BlOvrVeRaZqlyj5FTHvmkc4PnlphmFHlflJerD95nAViZ3P wMEaKkLH//1Itq0pOCMu1/fBd4peEcNHDJQyVsDaVOyDQHB94aQuXitW1ng5uIADOyan n5nErtTNUhsLBG6ByUvKQN84uy2T7WpVJaQzaP/QF/FVvZOua3bwhYI+HHI2HO++mXlG AR2g== 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=eZmfSTSyKM2eQyJA5m6WmumYXXmyOYhMW/6G5sLACbM=; b=NAH2bCQBC1GQOh+yCYKmAWl/03oXiCC3B9aahW0lZLH69DCMKlxzd55DuowbiM7tTH pqR0W9nr20xyK6xxxga2XgS7Uquw5NoGLGMR8cmhPQEFT8tMf7YBvJv/jbnlTDmFOSfO 9PYRWUJfvkK3ZCA6BmTYBOoz6k0pH21qZrQFjm4dqE2c0crWbQ0yzqAT+j8oB8Y0yaqb 4o3K4rRZWt1KenzH9NYZZgaWh6XScSKRAKVRFs1XL283V2HTges4VzFnWKCBeIL28Qdd cf28j58sYF9IVkArm23ZQ7yHjFviOIgu87akxn0NIMeWpo38as7mSELmARjgCNIR5pu7 Q0yQ== X-Gm-Message-State: APjAAAWKBVL7Y0TJqT/HnNP4Zjcvaj2OAkGg66U1Ngw7Odf+yP3oyOyL odXVtkFxp6rl4F+n/Yi9+HSsOqzP X-Google-Smtp-Source: APXvYqz7GTq/Xb1QSBzBmQYV1UTUq6yuknmM3S+toUGmbZzXq4hhm/I6qlhRoMPAHQA66BSJi1mTlw== X-Received: by 2002:a17:902:c05:: with SMTP id 5mr12247420pls.99.1568430121233; Fri, 13 Sep 2019 20:02:01 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id u2sm15967689pgp.66.2019.09.13.20.01.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Sep 2019 20:02:00 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 14 Sep 2019 11:01:55 +0800 Message-Id: <20190914030155.19292-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 v3] 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 | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavcodec/h2645_parse.c b/libavcodec/h2645_parse.c index ef6a6b4..8b9595a 100644 --- a/libavcodec/h2645_parse.c +++ b/libavcodec/h2645_parse.c @@ -453,23 +453,22 @@ 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, sizeof(*pkt->nals)); + nal = &pkt->nals[pkt->nals_allocated]; - nal = &pkt->nals[pkt->nb_nals]; + memset(nal, 0, sizeof(*pkt->nals)); nal->skipped_bytes_pos_size = 1024; // initial buffer size nal->skipped_bytes_pos = av_malloc_array(nal->skipped_bytes_pos_size, sizeof(*nal->skipped_bytes_pos)); if (!nal->skipped_bytes_pos) return AVERROR(ENOMEM); - pkt->nals_allocated = new_size; + pkt->nals_allocated++; } nal = &pkt->nals[pkt->nb_nals];