From patchwork Sat Sep 10 04:37:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 513 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp631769vsd; Fri, 9 Sep 2016 21:38:30 -0700 (PDT) X-Received: by 10.194.61.164 with SMTP id q4mr5568510wjr.89.1473482310312; Fri, 09 Sep 2016 21:38:30 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 67si5928002wmb.36.2016.09.09.21.38.25; Fri, 09 Sep 2016 21:38:30 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 76010689EA7; Sat, 10 Sep 2016 07:37:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi0-f65.google.com (mail-oi0-f65.google.com [209.85.218.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E5A8E689E5F for ; Sat, 10 Sep 2016 07:37:52 +0300 (EEST) Received: by mail-oi0-f65.google.com with SMTP id 2so13231916oif.2 for ; Fri, 09 Sep 2016 21:38:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=L93jmJkiMgPfK2EPBm8ymrFjS0buWGQCVhgG1Y4/2Kk=; b=VeA+JOMAW83jCyTjOh2vhy9Y6X4Xo33Po8Jn7rQ/lm9eK4A+y3cIRXfds9jDqTCrN+ cziv1rS0fpj9FYgaIBmhp7b2TzWSangG9IZOT37yFcKRAahvf0iglxdCCyZAQCmSHD99 ZZaMa8Lm08GMwDKOmECpZBwyYtlSCibRXZzL3TgVyXal35LZUu6QxmH22nfMUG13BXOJ HsvXPqzdBQyz7Z5iXMzPSDnw2TNqrlcePemRs5OtssO+dwBF50yv9JhkQm/c+tMTsHyK KfNK/RiLC3NVfJ8cP+4eXqfziY6S9yP9tMLUABpevX5g6RIm4Lpc24S1nmYV+AK9JPnY brYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=L93jmJkiMgPfK2EPBm8ymrFjS0buWGQCVhgG1Y4/2Kk=; b=eSYhe15RXjoawr02R7I3LSuJ6JZXPkRIsLixY8EztNlRkihCrhrj5jon67wvGslsIy /i/jQUKjNqLg3UqNMmFwXDnb33BBlIhaawQuRfXqYMfvPpaSZ4NUQkmvbOe5hrp1Bh74 Lncx2MeRrXTdiGgPMqj+WLltrp6uetM+2QktCeKuOjJeP1YrURCu1ezFodKu1PBbx8ml iBU8QFo8GvCpzAuKtZ8YW/vos4ONpFbqwY9dTRmnI7qJYVGFkBHlSJad/82eLcDtuzfK gP4LhIpbH6sr58LB64pSSRP7OwBKzUTH5AF8Cj8yT4pJoqdytU4+DPyPEyxxvZiph0dj 4fVg== X-Gm-Message-State: AE9vXwO1+OaHGTX17RTeCztq5nskdtgLtW+NCyXfP/O3kab1Mkjr7Foc4x/PIwkAKQOgrA== X-Received: by 10.202.217.70 with SMTP id q67mr10405924oig.86.1473482282410; Fri, 09 Sep 2016 21:38:02 -0700 (PDT) Received: from Rodgers-MacBook-Pro.local.net (c-73-209-137-129.hsd1.il.comcast.net. [73.209.137.129]) by smtp.gmail.com with ESMTPSA id s185sm3616106ita.21.2016.09.09.21.38.01 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 09 Sep 2016 21:38:01 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Sep 2016 23:37:17 -0500 Message-Id: <20160910043725.98484-3-rodger.combs@gmail.com> X-Mailer: git-send-email 2.10.0 In-Reply-To: <20160910043725.98484-1-rodger.combs@gmail.com> References: <20160910043725.98484-1-rodger.combs@gmail.com> Subject: [FFmpeg-devel] [PATCH 03/11] lavf/segment: 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/segment.c | 47 ++++++++++++++++++++--------------------------- 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/libavformat/segment.c b/libavformat/segment.c index 33a5cf0..139761f 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -627,8 +627,9 @@ static int select_reference_stream(AVFormatContext *s) return 0; } -static void seg_free_context(SegmentContext *seg) +static void seg_free(AVFormatContext *s) { + SegmentContext *seg = s->priv_data; ff_format_io_close(seg->avf, &seg->list_pb); avformat_free_context(seg->avf); seg->avf = NULL; @@ -693,7 +694,7 @@ static int seg_init(AVFormatContext *s) if (ret < 0) { av_log(s, AV_LOG_ERROR, "Could not parse format options list '%s'\n", seg->format_options_str); - goto fail; + return ret; } } @@ -707,7 +708,7 @@ static int seg_init(AVFormatContext *s) } if (!seg->list_size && seg->list_type != LIST_TYPE_M3U8) { if ((ret = segment_list_open(s)) < 0) - goto fail; + return ret; } else { const char *proto = avio_find_protocol_name(s->filename); seg->use_rename = proto && !strcmp(proto, "file"); @@ -718,29 +719,26 @@ static int seg_init(AVFormatContext *s) av_log(s, AV_LOG_WARNING, "'ext' list type option is deprecated in favor of 'csv'\n"); if ((ret = select_reference_stream(s)) < 0) - goto fail; + return ret; av_log(s, AV_LOG_VERBOSE, "Selected stream id:%d type:%s\n", seg->reference_stream_index, av_get_media_type_string(s->streams[seg->reference_stream_index]->codecpar->codec_type)); seg->oformat = av_guess_format(seg->format, s->filename, NULL); - if (!seg->oformat) { - ret = AVERROR_MUXER_NOT_FOUND; - goto fail; - } + if (!seg->oformat) + return AVERROR_MUXER_NOT_FOUND; if (seg->oformat->flags & AVFMT_NOFILE) { av_log(s, AV_LOG_ERROR, "format %s not supported.\n", seg->oformat->name); - ret = AVERROR(EINVAL); - goto fail; + return AVERROR(EINVAL); } if ((ret = segment_mux_init(s)) < 0) - goto fail; + return ret; if ((ret = set_segment_filename(s)) < 0) - goto fail; + return ret; oc = seg->avf; if (seg->write_header_trailer) { @@ -748,13 +746,13 @@ static int seg_init(AVFormatContext *s) seg->header_filename ? seg->header_filename : oc->filename, AVIO_FLAG_WRITE, NULL)) < 0) { av_log(s, AV_LOG_ERROR, "Failed to open segment '%s'\n", oc->filename); - goto fail; + return ret; } if (!seg->individual_header_trailer) oc->pb->seekable = 0; } else { if ((ret = open_null_ctx(&oc->pb)) < 0) - goto fail; + return ret; } av_dict_copy(&options, seg->format_options, 0); @@ -762,13 +760,14 @@ static int seg_init(AVFormatContext *s) if (av_dict_count(options)) { av_log(s, AV_LOG_ERROR, "Some of the provided format options in '%s' are not recognized\n", seg->format_options_str); - ret = AVERROR(EINVAL); - goto fail; + av_dict_free(&options); + return AVERROR(EINVAL); } + av_dict_free(&options); if (ret < 0) { ff_format_io_close(oc, &oc->pb); - goto fail; + return ret; } seg->segment_frame_count = 0; @@ -790,17 +789,12 @@ static int seg_init(AVFormatContext *s) close_null_ctxp(&oc->pb); } if ((ret = oc->io_open(oc, &oc->pb, oc->filename, AVIO_FLAG_WRITE, NULL)) < 0) - goto fail; + return ret; if (!seg->individual_header_trailer) oc->pb->seekable = 0; } -fail: - av_dict_free(&options); - if (ret < 0) - seg_free_context(seg); - - return ret; + return 0; } static int seg_write_packet(AVFormatContext *s, AVPacket *pkt) @@ -913,9 +907,6 @@ fail: seg->segment_frame_count++; } - if (ret < 0) - seg_free_context(seg); - return ret; } @@ -1023,6 +1014,7 @@ AVOutputFormat ff_segment_muxer = { .init = seg_init, .write_packet = seg_write_packet, .write_trailer = seg_write_trailer, + .deinit = seg_free, .priv_class = &seg_class, }; @@ -1041,5 +1033,6 @@ AVOutputFormat ff_stream_segment_muxer = { .init = seg_init, .write_packet = seg_write_packet, .write_trailer = seg_write_trailer, + .deinit = seg_free, .priv_class = &sseg_class, };