From patchwork Wed Apr 8 20:12:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18785 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 6FE80449CAC for ; Wed, 8 Apr 2020 23:19:34 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4F57868B7ED; Wed, 8 Apr 2020 23:19:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F2ED668B6B9 for ; Wed, 8 Apr 2020 23:19:27 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id d202so1092132wmd.1 for ; Wed, 08 Apr 2020 13:19:27 -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=jgqIaYeDKt/zph8g8xYv+fHCKiGfkhikz3kf736KMtE=; b=d7BLpmntl+WA+oaDfMtO2gJnAkaXJJvE1KqQFP8lPEj9wWhc5mBkBxKvu9VQ/aycI6 uVdCihJz1XsoAHj+0CU8F95d+rWNI5oiAnPnMmEL5BZeqmNwMIJZMmOYPLgpg2BerE95 0uTff2t/hdy9nGhwnICVJag4gYzy3QRDOJiDcmFqD8yXJ5LKeDhXwjgKYbvm5leqtEh6 Pq13oPkg99WocA5JhWqlmCxTpUe2TGX7QUN8144iYG6YuV9tTE032rBi1LjqK1QgxNjE EA46ujEwIrfSF1SKR6GWBgEdiz+tLRo3Egy6ZfeqNQVDMa6f9yKeS9OUTQKQgC+XF72h GYbA== 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=jgqIaYeDKt/zph8g8xYv+fHCKiGfkhikz3kf736KMtE=; b=tDsxHLFDXo6zlNgMXk1fD8eE6uJCdn59aLAwfRlKF6yV0gP0TbBWhzwED4Q942BgCH HTPp76NWFJ0rtpaVgmGuWJBy+/4i3wczwu0Kb/GEjsEcbUidFC/1J8Vg8wnCqrD6DzXw kfKI/bDUBI/0PFRadMpP4jS9R2V4F3FYDsST536TILK7MeYdA8TGpS/o0iXrPesKfnUo A9pCBGuAVUd0o5l8oFgqP1KOvpV0pXK9lrYqGl4vCq3X02MPlRIIHDJ3Wx6JFOt5MZm5 VOOwZ1hJz8XOL8xdv/pW55S2M4JnwhB0kqIxcm0C8rPouTtSdObzg68iCBw+tI+NsDLG AdKg== X-Gm-Message-State: AGi0PubuUjAeO0MDz5+VEmwVNviKaaCKDtW8pRLDCBwMlEd6HsMlV2BZ 4LQ1NWhhcLiSG4aLQxMvmTC6FeTp X-Google-Smtp-Source: APiQypJLMt6wgU65HbsVzZ57evBSXjQ4scbT679WVyX3L2j1l3KB2xYmwbDi3KPpmmb/LbKpr9zccw== X-Received: by 2002:adf:f812:: with SMTP id s18mr6959095wrp.347.1586377166834; Wed, 08 Apr 2020 13:19:26 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id b11sm36753909wrq.26.2020.04.08.13.19.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2020 13:19:26 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Apr 2020 22:12:15 +0200 Message-Id: <20200408201215.5705-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200228095321.7222-7-andreas.rheinhardt@gmail.com> References: <20200228095321.7222-7-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 7/7] avformat/hlsenc: Cosmetics 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" Mainly includes reindentation and returning directly (i.e. without a goto fail when possible). Signed-off-by: Andreas Rheinhardt --- This new version was made necessary by 99ebb033. The rest of the patchset still applies. libavformat/hlsenc.c | 129 +++++++++++++++++-------------------------- 1 file changed, 52 insertions(+), 77 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index f0d1c700c1..3cdc0d5782 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1652,7 +1652,7 @@ static int hls_start(AVFormatContext *s, VariantStream *vs) } ff_format_set_url(oc, filename); } - if ( vs->vtt_basename) { + if (vs->vtt_basename) { char *filename = NULL; if (replace_int_data_in_filename(&filename, #if FF_API_HLS_WRAP @@ -1784,10 +1784,8 @@ static int validate_name(int nb_vs, const char *fn) char *fn_dup = NULL; int ret = 0; - if (!fn) { - ret = AVERROR(EINVAL); - goto fail; - } + if (!fn) + return AVERROR(EINVAL); fn_dup = av_strdup(fn); if (!fn_dup) @@ -1821,14 +1819,12 @@ static int format_name(const char *buf, char **s, int index, const char *varname int ret = 0; orig_buf_dup = av_strdup(buf); - if (!orig_buf_dup) { - ret = AVERROR(ENOMEM); - goto fail; - } + if (!orig_buf_dup) + return AVERROR(ENOMEM); if (!av_stristr(buf, "%v")) { *s = orig_buf_dup; - return ret; + return 0; } if (!varname) { @@ -2142,16 +2138,14 @@ static int update_variant_stream_info(AVFormatContext *s) hls->var_streams[0].nb_streams = s->nb_streams; hls->var_streams[0].streams = av_mallocz(sizeof(AVStream *) * hls->var_streams[0].nb_streams); - if (!hls->var_streams[0].streams) { + if (!hls->var_streams[0].streams) return AVERROR(ENOMEM); - } //by default, the first available ccgroup is mapped to the variant stream if (hls->nb_ccstreams) { hls->var_streams[0].ccgroup = av_strdup(hls->cc_streams[0].ccgroup); - if (!hls->var_streams[0].ccgroup) { + if (!hls->var_streams[0].ccgroup) return AVERROR(ENOMEM); - } } for (i = 0; i < s->nb_streams; i++) @@ -2517,12 +2511,10 @@ static void hls_deinit(AVFormatContext *s) { HLSContext *hls = s->priv_data; int i = 0; - AVFormatContext *vtt_oc = NULL; VariantStream *vs = NULL; for (i = 0; i < hls->nb_varstreams; i++) { vs = &hls->var_streams[i]; - vtt_oc = vs->vtt_avf; av_freep(&vs->basename); av_freep(&vs->base_output_dirname); @@ -2530,7 +2522,7 @@ static void hls_deinit(AVFormatContext *s) av_freep(&vs->vtt_basename); av_freep(&vs->vtt_m3u8_name); - avformat_free_context(vtt_oc); + avformat_free_context(vs->vtt_avf); avformat_free_context(vs->avf); hls_free_segments(vs->segments); @@ -2547,6 +2539,7 @@ static void hls_deinit(AVFormatContext *s) for (i = 0; i < hls->nb_ccstreams; i++) { ClosedCaptionsStream *ccs = &hls->cc_streams[i]; + av_freep(&ccs->ccgroup); av_freep(&ccs->instreamid); av_freep(&ccs->language); @@ -2597,7 +2590,7 @@ static int hls_write_trailer(struct AVFormatContext *s) return AVERROR(ENOMEM); } - if ( hls->segment_type == SEGMENT_TYPE_FMP4) { + if (hls->segment_type == SEGMENT_TYPE_FMP4) { int range_length = 0; if (!vs->init_range_length) { uint8_t *buffer = NULL; @@ -2716,13 +2709,12 @@ static int hls_init(AVFormatContext *s) if (ret < 0) { av_log(s, AV_LOG_ERROR, "Variant stream info update failed with status %x\n", ret); - goto fail; + return ret; } //TODO: Updates needed to encryption functionality with periodic re-key when more than one variant streams are present if (hls->nb_varstreams > 1 && hls->flags & HLS_PERIODIC_REKEY) { - ret = AVERROR(EINVAL); av_log(s, AV_LOG_ERROR, "Periodic re-key not supported when more than one variant streams are present\n"); - goto fail; + return AVERROR(EINVAL); } if (!hls->method && http_base_proto) { @@ -2731,24 +2723,24 @@ static int hls_init(AVFormatContext *s) ret = validate_name(hls->nb_varstreams, s->url); if (ret < 0) - goto fail; + return ret; if (hls->segment_filename) { ret = validate_name(hls->nb_varstreams, hls->segment_filename); if (ret < 0) - goto fail; + return ret; } if (av_strcasecmp(hls->fmp4_init_filename, "init.mp4")) { ret = validate_name(hls->nb_varstreams, hls->fmp4_init_filename); if (ret < 0) - goto fail; + return ret; } if (hls->subtitle_filename) { ret = validate_name(hls->nb_varstreams, hls->subtitle_filename); if (ret < 0) - goto fail; + return ret; } if (hls->master_pl_name) { @@ -2756,7 +2748,7 @@ static int hls_init(AVFormatContext *s) if (ret < 0) { av_log(s, AV_LOG_ERROR, "Master stream info update failed with status %x\n", ret); - goto fail; + return ret; } } @@ -2782,24 +2774,24 @@ static int hls_init(AVFormatContext *s) hls->recording_time = (hls->init_time ? hls->init_time : hls->time) * AV_TIME_BASE; - if (hls->flags & HLS_SPLIT_BY_TIME && hls->flags & HLS_INDEPENDENT_SEGMENTS) { - // Independent segments cannot be guaranteed when splitting by time - hls->flags &= ~HLS_INDEPENDENT_SEGMENTS; - av_log(s, AV_LOG_WARNING, - "'split_by_time' and 'independent_segments' cannot be enabled together. " - "Disabling 'independent_segments' flag\n"); - } + if (hls->flags & HLS_SPLIT_BY_TIME && hls->flags & HLS_INDEPENDENT_SEGMENTS) { + // Independent segments cannot be guaranteed when splitting by time + hls->flags &= ~HLS_INDEPENDENT_SEGMENTS; + av_log(s, AV_LOG_WARNING, + "'split_by_time' and 'independent_segments' cannot be " + "enabled together. Disabling 'independent_segments' flag\n"); + } for (i = 0; i < hls->nb_varstreams; i++) { vs = &hls->var_streams[i]; ret = format_name(s->url, &vs->m3u8_name, i, vs->varname); if (ret < 0) - goto fail; + return ret; - vs->sequence = hls->start_sequence; - vs->start_pts = AV_NOPTS_VALUE; - vs->end_pts = AV_NOPTS_VALUE; + vs->sequence = hls->start_sequence; + vs->start_pts = AV_NOPTS_VALUE; + vs->end_pts = AV_NOPTS_VALUE; vs->current_segment_final_filename_fmt[0] = '\0'; if (hls->flags & HLS_PROGRAM_DATE_TIME) { @@ -2826,15 +2818,13 @@ static int hls_init(AVFormatContext *s) vs->oformat = av_guess_format("mpegts", NULL, NULL); } - if (!vs->oformat) { - ret = AVERROR_MUXER_NOT_FOUND; - goto fail; - } + if (!vs->oformat) + return AVERROR_MUXER_NOT_FOUND; if (hls->segment_filename) { ret = format_name(hls->segment_filename, &vs->basename, i, vs->varname); if (ret < 0) - goto fail; + return ret; } else { if (hls->flags & HLS_SINGLE_FILE) { if (hls->segment_type == SEGMENT_TYPE_FMP4) { @@ -2851,10 +2841,8 @@ static int hls_init(AVFormatContext *s) } vs->basename = av_malloc(basename_size); - if (!vs->basename) { - ret = AVERROR(ENOMEM); - goto fail; - } + if (!vs->basename) + return AVERROR(ENOMEM); av_strlcpy(vs->basename, vs->m3u8_name, basename_size); @@ -2873,16 +2861,12 @@ static int hls_init(AVFormatContext *s) fmp4_init_filename_len += strlen(POSTFIX_PATTERN); if (hls->flags & HLS_SINGLE_FILE) { vs->fmp4_init_filename = av_strdup(vs->basename); - if (!vs->fmp4_init_filename) { - ret = AVERROR(ENOMEM); - goto fail; - } + if (!vs->fmp4_init_filename) + return AVERROR(ENOMEM); } else { vs->fmp4_init_filename = av_malloc(fmp4_init_filename_len); - if (!vs->fmp4_init_filename ) { - ret = AVERROR(ENOMEM); - goto fail; - } + if (!vs->fmp4_init_filename) + return AVERROR(ENOMEM); av_strlcpy(vs->fmp4_init_filename, hls->fmp4_init_filename, fmp4_init_filename_len); if (hls->nb_varstreams > 1) { @@ -2894,17 +2878,15 @@ static int hls_init(AVFormatContext *s) ret = append_postfix(vs->fmp4_init_filename, fmp4_init_filename_len, i); } if (ret < 0) - goto fail; + return ret; } fmp4_init_filename_len = strlen(vs->m3u8_name) + strlen(vs->fmp4_init_filename) + 1; vs->base_output_dirname = av_malloc(fmp4_init_filename_len); - if (!vs->base_output_dirname) { - ret = AVERROR(ENOMEM); - goto fail; - } + if (!vs->base_output_dirname) + return AVERROR(ENOMEM); av_strlcpy(vs->base_output_dirname, vs->m3u8_name, fmp4_init_filename_len); @@ -2922,7 +2904,7 @@ static int hls_init(AVFormatContext *s) ret = hls->use_localtime ? sls_flag_check_duration_size(hls, vs) : sls_flag_check_duration_size_index(hls); if (ret < 0) - goto fail; + return ret; if (vs->has_subtitle) { vs->vtt_oformat = av_guess_format("webvtt", NULL, NULL); @@ -2934,39 +2916,33 @@ static int hls_init(AVFormatContext *s) vtt_basename_size = strlen(vs->m3u8_name) + strlen(vtt_pattern) + 1; vs->vtt_basename = av_malloc(vtt_basename_size); - if (!vs->vtt_basename) { - ret = AVERROR(ENOMEM); - goto fail; - } + if (!vs->vtt_basename) + return AVERROR(ENOMEM); av_strlcpy(vs->vtt_basename, vs->m3u8_name, vtt_basename_size); p = strrchr(vs->vtt_basename, '.'); if (p) *p = '\0'; - if ( hls->subtitle_filename ) { + if (hls->subtitle_filename) { ret = format_name(hls->subtitle_filename, &vs->vtt_m3u8_name, i, vs->varname); if (ret < 0) - goto fail; + return ret; } else { vs->vtt_m3u8_name = av_asprintf("%s_vtt.m3u8", vs->vtt_basename); - if (!vs->vtt_m3u8_name) { - ret = AVERROR(ENOMEM); - goto fail; - } + if (!vs->vtt_m3u8_name) + return AVERROR(ENOMEM); } av_strlcat(vs->vtt_basename, vtt_pattern, vtt_basename_size); } if (hls->baseurl) { vs->baseurl = av_strdup(hls->baseurl); - if (!vs->baseurl) { - ret = AVERROR(ENOMEM); - goto fail; - } + if (!vs->baseurl) + return AVERROR(ENOMEM); } if ((ret = hls_mux_init(s, vs)) < 0) - goto fail; + return ret; if (hls->flags & HLS_APPEND_LIST) { parse_playlist(s, vs->m3u8_name, vs); @@ -2980,10 +2956,9 @@ static int hls_init(AVFormatContext *s) } if ((ret = hls_start(s, vs)) < 0) - goto fail; + return ret; } -fail: return ret; }