From patchwork Sun Mar 22 03:47:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18336 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 8C25A449B66 for ; Sun, 22 Mar 2020 05:51:07 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A9BF368B5C2; Sun, 22 Mar 2020 05:48:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D05F168B4DE for ; Sun, 22 Mar 2020 05:48:47 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id f3so12278933wrw.7 for ; Sat, 21 Mar 2020 20:48: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 :mime-version:content-transfer-encoding; bh=LTxI5ZoKkjnO887Jl0tm0fMH2J1HAOE3c21ss12J66s=; b=dddYS4mK2v/id0YXmLemprJPOOGdfk+hKgy2H+CkuT8urX0nzZNOI8NSNUUeqHwICP s05lB23TxBBHWQNiVS1vQi1l6wyj7Qa2U+xpzSWheMW16t7M/jgBn0TmixrvCCG4AC5m 52Fao5UnLzF88d8NnVVCERFpTwXeHUZ4MFULj9eOmr1IF36xReYEuezttJjEep7jt4pF c2cIM8rjARXM/uRcD/XCfp8YsEiON5W5J6nKRMLUfOA9cYdCwesKZjmRtfepB3NGLtLz xk4X92gjVjb7p7Qy00CY/4nWbpDOi1nE3UToqlWIc8+7Mxh/v60/rNmUwg3YuHR2DtuV eStA== 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=LTxI5ZoKkjnO887Jl0tm0fMH2J1HAOE3c21ss12J66s=; b=I2fGQDEH5ft5yMh5YJBuuimTFC6ymIXmODsbl57gVcoCYg+9yPm7sQkvv2x3/kgxnS pTB/ycNZ6HtvdPHH6+EuRS0Pf8VDz+PRNU1sN0A8j+CzmsxSeb4hW/G6RW9LakWgWT/o oGDZ8f+W4ADFrdb1TB76yUzdZkNxDVu4CIiTvYScPsfkWGzJGKJMmzyabsANLuEjN2AY v4wKQ0SF6iMt0Y3rmuioQbjek0IdW4802kkV4m2ihBkdEbXsYdx4eLAmf0wZaefAIteC 93rNF5h9w00ea+1+sUDlzIvQqvpr91/Ur6v5EjxGTgvIN9ZEalXirLh5/sIDjIPf6fAf T9IA== X-Gm-Message-State: ANhLgQ1YypvtE9JMa2XFzx+Ud0TIp50Yudm9h0pdAwcP8RsLP+CRZypg AxyTysyL+81oCCnyqgpGmcVTlGG5 X-Google-Smtp-Source: ADFU+vt/Wgom3oz0QSvIvpmpNaVSKrtKm/qfDzXFkMSiyHUhGc7ytdFiUP+xbHv+Pf7e9q+ckspdWQ== X-Received: by 2002:adf:ec4c:: with SMTP id w12mr4742082wrn.240.1584848926982; Sat, 21 Mar 2020 20:48:46 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id k204sm1530371wma.17.2020.03.21.20.48.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Mar 2020 20:48:46 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Mar 2020 04:47:54 +0100 Message-Id: <20200322034756.29907-19-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200322034756.29907-1-andreas.rheinhardt@gmail.com> References: <20200322034756.29907-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 19/21] avformat/tiertexseq: Simplify cleanup after read_header error 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" by setting the FF_INPUTFORMAT_HEADER_CLEANUP flag. Also check error conditions for being negative instead of only nonzero (they couldn't be positive here anyway). Signed-off-by: Andreas Rheinhardt --- libavformat/tiertexseq.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/libavformat/tiertexseq.c b/libavformat/tiertexseq.c index d7719e5acb..07c939a4d4 100644 --- a/libavformat/tiertexseq.c +++ b/libavformat/tiertexseq.c @@ -161,7 +161,7 @@ static int seq_parse_frame_data(SeqDemuxContext *seq, AVIOContext *pb) err = seq_fill_buffer(seq, pb, buffer_num[1 + i], offset_table[i], offset_table[e] - offset_table[i]); - if (err) + if (err < 0) return err; } } @@ -202,20 +202,16 @@ static int seq_read_header(AVFormatContext *s) /* init internal buffers */ rc = seq_init_frame_buffers(seq, pb); - if (rc) { - seq_read_close(s); + if (rc < 0) return rc; - } seq->current_frame_offs = 0; /* preload (no audio data, just buffer operations related data) */ for (i = 1; i <= 100; i++) { rc = seq_parse_frame_data(seq, pb); - if (rc) { - seq_read_close(s); + if (rc < 0) return rc; - } } seq->current_frame_pts = 0; @@ -224,10 +220,8 @@ static int seq_read_header(AVFormatContext *s) /* initialize the video decoder stream */ st = avformat_new_stream(s, NULL); - if (!st) { - seq_read_close(s); + if (!st) return AVERROR(ENOMEM); - } avpriv_set_pts_info(st, 32, 1, SEQ_FRAME_RATE); seq->video_stream_index = st->index; @@ -239,10 +233,8 @@ static int seq_read_header(AVFormatContext *s) /* initialize the audio decoder stream */ st = avformat_new_stream(s, NULL); - if (!st) { - seq_read_close(s); + if (!st) return AVERROR(ENOMEM); - } st->start_time = 0; avpriv_set_pts_info(st, 32, 1, SEQ_SAMPLE_RATE); @@ -324,4 +316,5 @@ AVInputFormat ff_tiertexseq_demuxer = { .read_header = seq_read_header, .read_packet = seq_read_packet, .read_close = seq_read_close, + .flags_internal = FF_INPUTFORMAT_HEADER_CLEANUP, };