From patchwork Thu Dec 26 10:53:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16969 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 CDFED449EFF for ; Thu, 26 Dec 2019 12:54:18 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BC18468AB8A; Thu, 26 Dec 2019 12:54:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 588D768AB33 for ; Thu, 26 Dec 2019 12:54:10 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id q10so23356269wrm.11 for ; Thu, 26 Dec 2019 02:54:10 -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=YcTGfW7tbixwzZhWvX3FRtDj2DpSymWCEd73j5HwVPI=; b=uMgxL1+P/T9kyI+u6k0+VQOUUJQ5xRBa8NaZJOkfV0m3DCXZjY4EwbbhYUe83ihReb 285BfRKXkuvDUFFMMMzycQzJKaedUbVmM2u6k7z1qPGgoDR2Omczu1WdVd58xi/fo/JC gYFzScaNcSL2ObcSdm8opX6uFW+mqfgKsC6Kl6NwWcOUzO3aA9G9A8kWoS0W1kIMBgqr uH/vGFBvE3tE+jQNICQ6jJT3lfDVfUvsWbopE4LlvkelpQs807OCauOTJQH+2LBL2jv2 g+5QIFl1rKZhj0z7teYXDoJs/eLcA7u5HBkDPFV5ri6W3vcaMweAa2qpyQYcw9OUDqqQ 2Agw== 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=YcTGfW7tbixwzZhWvX3FRtDj2DpSymWCEd73j5HwVPI=; b=rTPDxoLt1VuoGLbP/yOl/PHkUf1Ep0PkbQoj50ENQmg8EOm2bx8i07TSybR23/T7gn 2OMxtSKSQy7tuaSEkaYHCSdLZ5idysWymrBtuOijMscSpVleHcVN3NaMwnNOyp771Fto sPegeggzZoZoiJTau8BIhzVYDuA7k6Tjp3JvliCE9zVAgMpZ4DHuInH3XvA9J7STjwkb 7w5LIa02BpETsX25TERuuqsA46T1ulKRYtWEqRFvbYwgtOO1OGXxvXFT9RQLCW1/Tn0K 3ElPeYdV5vZ7/WTeqf67idSwDA4uGSaH/6GiHN07t5q1+uV7kVJDIgWH3VZx0/YliQ9m LMww== X-Gm-Message-State: APjAAAVT3RrLzw3LqIfxTlbVmJRWNF2zpEDUMBf4c7gOSOuo06U850Eq xV3IXWZSBDsfMfRGCUU5TRYKBzYz X-Google-Smtp-Source: APXvYqy5E5FHY9avMahuTcHnhQORbEiXuDeGlqg1b3KA5r/qCBlI/CBcVW3EKcJnijJUnQ3vm7Bxrg== X-Received: by 2002:a05:6000:367:: with SMTP id f7mr43506198wrf.174.1577357649412; Thu, 26 Dec 2019 02:54:09 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc10203.dynamic.kabel-deutschland.de. [188.193.2.3]) by smtp.gmail.com with ESMTPSA id c68sm7997618wme.13.2019.12.26.02.54.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Dec 2019 02:54:08 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Dec 2019 11:53:31 +0100 Message-Id: <20191226105342.11175-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191226105342.11175-1-andreas.rheinhardt@gmail.com> References: <20191226105342.11175-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/17] avformat/smoothstreaming: Add deinit function 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" Signed-off-by: Andreas Rheinhardt --- libavformat/smoothstreamingenc.c | 43 ++++++++++++-------------------- 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c index 07745d5cb5..ff38edbe05 100644 --- a/libavformat/smoothstreamingenc.c +++ b/libavformat/smoothstreamingenc.c @@ -292,21 +292,18 @@ static int ism_write_header(AVFormatContext *s) ff_const59 AVOutputFormat *oformat; if (mkdir(s->url, 0777) == -1 && errno != EEXIST) { - ret = AVERROR(errno); av_log(s, AV_LOG_ERROR, "mkdir failed\n"); - goto fail; + return AVERROR(errno); } oformat = av_guess_format("ismv", NULL, NULL); if (!oformat) { - ret = AVERROR_MUXER_NOT_FOUND; - goto fail; + return AVERROR_MUXER_NOT_FOUND; } c->streams = av_mallocz_array(s->nb_streams, sizeof(*c->streams)); if (!c->streams) { - ret = AVERROR(ENOMEM); - goto fail; + return AVERROR(ENOMEM); } for (i = 0; i < s->nb_streams; i++) { @@ -324,24 +321,21 @@ static int ism_write_header(AVFormatContext *s) } if (mkdir(os->dirname, 0777) == -1 && errno != EEXIST) { - ret = AVERROR(errno); av_log(s, AV_LOG_ERROR, "mkdir failed\n"); - goto fail; + return AVERROR(errno); } os->ctx = ctx = avformat_alloc_context(); if (!ctx) { - ret = AVERROR(ENOMEM); - goto fail; + return AVERROR(ENOMEM); } if ((ret = ff_copy_whiteblacklists(ctx, s)) < 0) - goto fail; + return ret; ctx->oformat = oformat; ctx->interrupt_callback = s->interrupt_callback; if (!(st = avformat_new_stream(ctx, NULL))) { - ret = AVERROR(ENOMEM); - goto fail; + return AVERROR(ENOMEM); } avcodec_parameters_copy(st->codecpar, s->streams[i]->codecpar); st->sample_aspect_ratio = s->streams[i]->sample_aspect_ratio; @@ -349,8 +343,7 @@ static int ism_write_header(AVFormatContext *s) ctx->pb = avio_alloc_context(os->iobuf, sizeof(os->iobuf), AVIO_FLAG_WRITE, os, NULL, ism_write, ism_seek); if (!ctx->pb) { - ret = AVERROR(ENOMEM); - goto fail; + return AVERROR(ENOMEM); } av_dict_set_int(&opts, "ism_lookahead", c->lookahead_count, 0); @@ -358,7 +351,7 @@ static int ism_write_header(AVFormatContext *s) ret = avformat_write_header(ctx, &opts); av_dict_free(&opts); if (ret < 0) { - goto fail; + return ret; } avio_flush(ctx->pb); s->streams[i]->time_base = st->time_base; @@ -371,8 +364,7 @@ static int ism_write_header(AVFormatContext *s) os->fourcc = "WVC1"; } else { av_log(s, AV_LOG_ERROR, "Unsupported video codec\n"); - ret = AVERROR(EINVAL); - goto fail; + return AVERROR(EINVAL); } } else { c->has_audio = 1; @@ -385,8 +377,7 @@ static int ism_write_header(AVFormatContext *s) os->audio_tag = 0x0162; } else { av_log(s, AV_LOG_ERROR, "Unsupported audio codec\n"); - ret = AVERROR(EINVAL); - goto fail; + return AVERROR(EINVAL); } os->packet_size = st->codecpar->block_align ? st->codecpar->block_align : 4; } @@ -395,15 +386,13 @@ static int ism_write_header(AVFormatContext *s) if (!c->has_video && c->min_frag_duration <= 0) { av_log(s, AV_LOG_WARNING, "no video stream and no min frag duration set\n"); - ret = AVERROR(EINVAL); - goto fail; + return AVERROR(EINVAL); } ret = write_manifest(s, 0); + if (ret < 0) + return ret; -fail: - if (ret) - ism_free(s); - return ret; + return 0; } static int parse_fragment(AVFormatContext *s, const char *filename, int64_t *start_ts, int64_t *duration, int64_t *moof_size, int64_t size) @@ -633,7 +622,6 @@ static int ism_write_trailer(AVFormatContext *s) rmdir(s->url); } - ism_free(s); return 0; } @@ -666,5 +654,6 @@ AVOutputFormat ff_smoothstreaming_muxer = { .write_header = ism_write_header, .write_packet = ism_write_packet, .write_trailer = ism_write_trailer, + .deinit = ism_free, .priv_class = &ism_class, };