From patchwork Fri Jan 24 22:48:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17523 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 99DC9449962 for ; Sat, 25 Jan 2020 00:48:57 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8682568B060; Sat, 25 Jan 2020 00:48:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EE47668AECA for ; Sat, 25 Jan 2020 00:48:49 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id c9so3909756wrw.8 for ; Fri, 24 Jan 2020 14:48:49 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=KZEDvG0pzYpq/lSYNwgv0llmP7cYe4rusSZ4Iua5B6M=; b=UCqmYlEFBmb9BGrtKyg6eP3ipFCV93HRfeal+GGZ9o8hpT2UOJl05oDmBJDNN0BO0U yJCBrTHNsKdNk0/fHqJAp66u9KPplpqBftRWccP+31wkNajNzlkcb+8HfrH2b4is7bAX HeKrRc3TGJCNixosx8XzGGG/mrdcyEKayZbkU9eEuUidwirgCKAVKIbVMFyShgw0vV8v naMkYTYysxofifiEdyhahSIkkA6efhBWDwVYDu/FdFYy4Jm9sMHqZr1wR6c16nKE3RW5 rTnDzGfplM+aTHgKZk49Gs6f2xCfpRcHoNQBGBQKwP0htFyRugk3dEC3rZFaTHXayc50 OdPQ== 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:mime-version:content-transfer-encoding; bh=KZEDvG0pzYpq/lSYNwgv0llmP7cYe4rusSZ4Iua5B6M=; b=OoqlwJ1WI655Uh1R/LG8YH41PkNs/J8rlh0HL0aNAxjoQWNFU4eDZn1hAFPpVItS5V BwoPrlLvXy79cAd9el+yjcF8Vju+s1YuKdSvnWtndEKKlvBjMiHmlS7NnPByTT55xQnh Zu+ioQkpHA825r3WOgRmPjjNzvJnwL1MWznYjNMSxF4sKefSEGOM2bPwU1jR8W/8gPEZ 2zXmW4c9UlsW0x0n5fUP2GnTKIy6s3MAC3cGysQw2GKEy1K7qF2XfIvAgwasRuhL5mIu 8kcxc6o4tUZb9QsI0bSDXQrKe7VOYG/SAbL+XLWF1xidizSc0+7nlXGSMmxdMamNsTt7 JWbg== X-Gm-Message-State: APjAAAWr2jQzn+3i+rZiDt/9ilFarvxIs2+fIB1gH+KhTsEbbg/mHv3i HjFxERU5lNo17/9LNP3IYEujnp+h X-Google-Smtp-Source: APXvYqy6BrdObODgbv993tOuJ1htk+KL++4M6Q84IsCg5odLlvrCh5wzlD9WJKpRY7E0bys+oFnshg== X-Received: by 2002:a5d:6987:: with SMTP id g7mr6545001wru.422.1579906129291; Fri, 24 Jan 2020 14:48:49 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08bbf.dynamic.kabel-deutschland.de. [188.192.139.191]) by smtp.gmail.com with ESMTPSA id z25sm8977594wmf.14.2020.01.24.14.48.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jan 2020 14:48:48 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Jan 2020 23:48:30 +0100 Message-Id: <20200124224833.17579-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200123160832.2020-1-andreas.rheinhardt@gmail.com> References: <20200123160832.2020-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/12] avformat/hevc: Defer initializations in ff_isom_write_hvcc() 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Saves initialization of an HEVCDecoderConfigurationRecord when the data is already in ISOBMFF-format or if it is plainly invalid. Signed-off-by: Andreas Rheinhardt --- libavformat/hevc.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/libavformat/hevc.c b/libavformat/hevc.c index a4e53bc4ab..616e9ed49a 100644 --- a/libavformat/hevc.c +++ b/libavformat/hevc.c @@ -1070,29 +1070,27 @@ int ff_hevc_annexb2mp4_buf(const uint8_t *buf_in, uint8_t **buf_out, int ff_isom_write_hvcc(AVIOContext *pb, const uint8_t *data, int size, int ps_array_completeness) { - int ret = 0; - uint8_t *buf, *end, *start = NULL; HEVCDecoderConfigurationRecord hvcc; - - hvcc_init(&hvcc); + uint8_t *buf, *end, *start; + int ret; if (size < 6) { /* We can't write a valid hvcC from the provided data */ - ret = AVERROR_INVALIDDATA; - goto end; + return AVERROR_INVALIDDATA; } else if (*data == 1) { /* Data is already hvcC-formatted */ avio_write(pb, data, size); - goto end; + return 0; } else if (!(AV_RB24(data) == 1 || AV_RB32(data) == 1)) { /* Not a valid Annex B start code prefix */ - ret = AVERROR_INVALIDDATA; - goto end; + return AVERROR_INVALIDDATA; } ret = ff_avc_parse_nal_units_buf(data, &start, &size); if (ret < 0) - goto end; + return ret; + + hvcc_init(&hvcc); buf = start; end = start + size;