From patchwork Mon Mar 12 06:35:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 7943 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1257756jad; Sun, 11 Mar 2018 23:35:57 -0700 (PDT) X-Google-Smtp-Source: AG47ELv83wd9oMxaRmTUsRhjQAubi69HurHKN8aSjibWE1RT7QuPFeSe9e+Y3dsDI4R6PiE/c9vP X-Received: by 10.223.171.13 with SMTP id q13mr5388512wrc.183.1520836557100; Sun, 11 Mar 2018 23:35:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520836557; cv=none; d=google.com; s=arc-20160816; b=wVbE2mhSpben9k1ctfpJTzrdwc3Z0UKNksf4lDH0Eg7lbIDKDbo3B5pPvVB9F5Ijwo f+MKsbMlXzyT/XLMeAsevSgK5QRSAkzKLF/eC7ritm3TfeDxDziDP36SpdKip/SZxpuJ qhBXsccjPPKs11QfGwO2WTl1oTlxWQSlOepjehy+I+UCK3uRuSYgxkz2+tAiXPNdCZtW RtfxwPK0urHPSwVTfOkxrvFNmOF/rL8kJEyI2mkXeGnjdABCFyNdlH7aYGbhqELVpuKv ymnqp87iBqNqg0JIsRNjI4i1k4UmSW65XzcFqHWYLumg/U8sg055zOhjdPZEbtFTfbhO O02A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:message-id:date:to:from :delivered-to:arc-authentication-results; bh=bMCtSHezG0Kh5iTxoCV/80fgJxl93t6eJF3yS3QtIGs=; b=S0zkIqRHuclp85qD4UqsKTAH9VBJpCLg3ZlLYUwOOzrL3IX3H27wZehoXstj/PlzIu s5GioxmQk18h4qGK4w3sHt1mph1TCh7zlHkfA/6fV2s+nnpdJ8FHt30BVts1B0JX/Cst a6/B5XJVEoIRNeE6xT/7PGnxciL10SU9RfHRH9pFScz/B3yUfhSfFGPabS65TLH2j7+y 6y9aUwL6TqnBwBvxVrwIBXeO2sdj9RJqAOCM+KuBMb94JzMdDQNEkSbAVodBEVJytvFV QQcaX4waLHfLjc3Rp6+9WjUmEQveaB3yAmHHHnmVqmvaQ3VTRnsEO3xyFfFjN7d68waQ gpsg== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q15si4971731wra.421.2018.03.11.23.35.56; Sun, 11 Mar 2018 23:35:57 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5266A68A463; Mon, 12 Mar 2018 08:35:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg65.qq.com (smtpbg65.qq.com [103.7.28.233]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8AA1A68A39A for ; Mon, 12 Mar 2018 08:35:39 +0200 (EET) X-QQ-mid: bizesmtp16t1520836534t5y9a689 Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Mon, 12 Mar 2018 14:35:34 +0800 (CST) X-QQ-SSF: 01600000004000F0FKF0B00A0000000 X-QQ-FEAT: r8geFCKg7nYlt3bxq0ZWgtR6kR7/Z/WDD2Y45QJzFT1otGE3GQLGDjsEBF3jA 6cYKb+q6ZgOSHyolubhHBr1vLrbh0huNDQr7H6oCwnVyIllD6XbBj7sJjRntqb+tIEftNAG M/5MHQJlqOsMt/Qm8KBZwTVIgO+IEDOMRjCEaHDZP1cp14vx/i9B37DL7Gyib6ODWoGZN+T iayqX5kQIUS/tjpg6WzM8SSu040mpxqCHFPmE4AUQcAsK8EseI28D/DqpO7ZP4cqTLVQnKS B1EUjiPObs91Wbftd0VXKmMkK1vF+cL3L2eQ== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Mar 2018 14:35:33 +0800 Message-Id: <20180312063533.14158-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign4 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH 5/5] avformat/hlsenc: reindent after previous commits 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: Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 250 +++++++++++++++++++++++++-------------------------- 1 file changed, 125 insertions(+), 125 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 196632d066..d319cba764 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2171,7 +2171,7 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) } if (vs->packets_written && can_split && av_compare_ts(pkt->pts - vs->start_pts, st->time_base, - end_pts, AV_TIME_BASE_Q) >= 0) { + end_pts, AV_TIME_BASE_Q) >= 0) { int64_t new_start_pos; char *old_filename = NULL; int byterange_mode = (hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size > 0); @@ -2185,30 +2185,30 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) vs->size = new_start_pos; } - if (hls->segment_type == SEGMENT_TYPE_FMP4) { - if (!vs->init_range_length) { - avio_flush(oc->pb); - range_length = avio_close_dyn_buf(oc->pb, &buffer); - avio_write(vs->out, buffer, range_length); - vs->init_range_length = range_length; - avio_open_dyn_buf(&oc->pb); - vs->packets_written = 0; - vs->start_pos = range_length; - if (!byterange_mode) { - ff_format_io_close(s, &vs->out); - hlsenc_io_close(s, &vs->out, vs->base_output_dirname); - } - } - } else { + if (hls->segment_type == SEGMENT_TYPE_FMP4) { + if (!vs->init_range_length) { + avio_flush(oc->pb); + range_length = avio_close_dyn_buf(oc->pb, &buffer); + avio_write(vs->out, buffer, range_length); + vs->init_range_length = range_length; + avio_open_dyn_buf(&oc->pb); + vs->packets_written = 0; + vs->start_pos = range_length; if (!byterange_mode) { - hlsenc_io_close(s, &oc->pb, oc->url); + ff_format_io_close(s, &vs->out); + hlsenc_io_close(s, &vs->out, vs->base_output_dirname); } } + } else { if (!byterange_mode) { + hlsenc_io_close(s, &oc->pb, oc->url); + } + } + if (!byterange_mode) { if (vs->vtt_avf) { hlsenc_io_close(s, &vs->vtt_avf->pb, vs->vtt_avf->url); } - } + } if ((hls->flags & HLS_TEMP_FILE) && oc->url[0]) { if (!(hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size <= 0)) if ((vs->avf->oformat->priv_class && vs->avf->priv_data) && hls->segment_type != SEGMENT_TYPE_FMP4) @@ -2229,18 +2229,18 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) } vs->size = range_length; } else { - ret = hlsenc_io_open(s, &vs->out, vs->avf->url, NULL); - if (ret < 0) { - av_log(NULL, AV_LOG_ERROR, "Failed to open file '%s'\n", - vs->avf->url); - return ret; - } - write_styp(vs->out); - ret = flush_dynbuf(vs, &range_length); - if (ret < 0) { - return ret; - } - ff_format_io_close(s, &vs->out); + ret = hlsenc_io_open(s, &vs->out, vs->avf->url, NULL); + if (ret < 0) { + av_log(s, AV_LOG_ERROR, "Failed to open file '%s'\n", + vs->avf->url); + return ret; + } + write_styp(vs->out); + ret = flush_dynbuf(vs, &range_length); + if (ret < 0) { + return ret; + } + ff_format_io_close(s, &vs->out); } } @@ -2314,85 +2314,85 @@ static int hls_write_trailer(struct AVFormatContext *s) for (i = 0; i < hls->nb_varstreams; i++) { vs = &hls->var_streams[i]; - oc = vs->avf; - vtt_oc = vs->vtt_avf; - old_filename = av_strdup(vs->avf->url); + oc = vs->avf; + vtt_oc = vs->vtt_avf; + old_filename = av_strdup(vs->avf->url); - if (!old_filename) { - return AVERROR(ENOMEM); - } - if ( hls->segment_type == SEGMENT_TYPE_FMP4) { - int range_length = 0; - if (!(hls->flags & HLS_SINGLE_FILE)) { - ret = hlsenc_io_open(s, &vs->out, vs->avf->url, NULL); - if (ret < 0) { - av_log(NULL, AV_LOG_ERROR, "Failed to open file '%s'\n", vs->avf->url); - goto failed; - } - write_styp(vs->out); + if (!old_filename) { + return AVERROR(ENOMEM); } - ret = flush_dynbuf(vs, &range_length); - if (ret < 0) { - goto failed; + if ( hls->segment_type == SEGMENT_TYPE_FMP4) { + int range_length = 0; + if (!(hls->flags & HLS_SINGLE_FILE)) { + ret = hlsenc_io_open(s, &vs->out, vs->avf->url, NULL); + if (ret < 0) { + av_log(s, AV_LOG_ERROR, "Failed to open file '%s'\n", vs->avf->url); + goto failed; + } + write_styp(vs->out); + } + ret = flush_dynbuf(vs, &range_length); + if (ret < 0) { + goto failed; + } + ff_format_io_close(s, &vs->out); } - ff_format_io_close(s, &vs->out); - } failed: - av_write_trailer(oc); - if (oc->pb) { - if (hls->segment_type != SEGMENT_TYPE_FMP4) { - vs->size = avio_tell(vs->avf->pb) - vs->start_pos; - } else { - vs->size = avio_tell(vs->avf->pb); - } - if (hls->segment_type != SEGMENT_TYPE_FMP4) - ff_format_io_close(s, &oc->pb); + av_write_trailer(oc); + if (oc->pb) { + if (hls->segment_type != SEGMENT_TYPE_FMP4) { + vs->size = avio_tell(vs->avf->pb) - vs->start_pos; + } else { + vs->size = avio_tell(vs->avf->pb); + } + if (hls->segment_type != SEGMENT_TYPE_FMP4) + ff_format_io_close(s, &oc->pb); - if ((hls->flags & HLS_TEMP_FILE) && oc->url[0]) { - hls_rename_temp_file(s, oc); - av_free(old_filename); - old_filename = av_strdup(vs->avf->url); + if ((hls->flags & HLS_TEMP_FILE) && oc->url[0]) { + hls_rename_temp_file(s, oc); + av_free(old_filename); + old_filename = av_strdup(vs->avf->url); - if (!old_filename) { - return AVERROR(ENOMEM); + if (!old_filename) { + return AVERROR(ENOMEM); + } } - } - /* after av_write_trailer, then duration + 1 duration per packet */ - hls_append_segment(s, hls, vs, vs->duration + vs->dpp, vs->start_pos, vs->size); - } + /* after av_write_trailer, then duration + 1 duration per packet */ + hls_append_segment(s, hls, vs, vs->duration + vs->dpp, vs->start_pos, vs->size); + } - sls_flag_file_rename(hls, vs, old_filename); + sls_flag_file_rename(hls, vs, old_filename); - if (vtt_oc) { - if (vtt_oc->pb) - av_write_trailer(vtt_oc); - vs->size = avio_tell(vs->vtt_avf->pb) - vs->start_pos; - ff_format_io_close(s, &vtt_oc->pb); - } - av_freep(&vs->basename); - av_freep(&vs->base_output_dirname); - avformat_free_context(oc); + if (vtt_oc) { + if (vtt_oc->pb) + av_write_trailer(vtt_oc); + vs->size = avio_tell(vs->vtt_avf->pb) - vs->start_pos; + ff_format_io_close(s, &vtt_oc->pb); + } + av_freep(&vs->basename); + av_freep(&vs->base_output_dirname); + avformat_free_context(oc); - vs->avf = NULL; - hls_window(s, 1, vs); + vs->avf = NULL; + hls_window(s, 1, vs); - av_freep(&vs->fmp4_init_filename); - if (vtt_oc) { - av_freep(&vs->vtt_basename); - av_freep(&vs->vtt_m3u8_name); - avformat_free_context(vtt_oc); - } + av_freep(&vs->fmp4_init_filename); + if (vtt_oc) { + av_freep(&vs->vtt_basename); + av_freep(&vs->vtt_m3u8_name); + avformat_free_context(vtt_oc); + } - hls_free_segments(vs->segments); - hls_free_segments(vs->old_segments); - av_free(old_filename); - av_freep(&vs->m3u8_name); - av_freep(&vs->streams); - av_freep(&vs->agroup); - av_freep(&vs->ccgroup); - av_freep(&vs->baseurl); + hls_free_segments(vs->segments); + hls_free_segments(vs->old_segments); + av_free(old_filename); + av_freep(&vs->m3u8_name); + av_freep(&vs->streams); + av_freep(&vs->agroup); + av_freep(&vs->ccgroup); + av_freep(&vs->baseurl); } for (i = 0; i < hls->nb_ccstreams; i++) { @@ -2430,7 +2430,7 @@ static int hls_init(AVFormatContext *s) ret = update_variant_stream_info(s); if (ret < 0) { av_log(s, AV_LOG_ERROR, "Variant stream info update failed with status %x\n", - ret); + ret); goto fail; } //TODO: Updates needed to encryption functionality with periodic re-key when more than one variant streams are present @@ -2466,7 +2466,7 @@ static int hls_init(AVFormatContext *s) ret = update_master_pl_info(s); if (ret < 0) { av_log(s, AV_LOG_ERROR, "Master stream info update failed with status %x\n", - ret); + ret); goto fail; } } @@ -2615,39 +2615,39 @@ static int hls_init(AVFormatContext *s) goto fail; } } else { - vs->fmp4_init_filename = av_malloc(fmp4_init_filename_len); - if (!vs->fmp4_init_filename ) { - ret = AVERROR(ENOMEM); - goto fail; - } - av_strlcpy(vs->fmp4_init_filename, hls->fmp4_init_filename, - fmp4_init_filename_len); - if (hls->nb_varstreams > 1) { - ret = append_postfix(vs->fmp4_init_filename, fmp4_init_filename_len, i); - if (ret < 0) + vs->fmp4_init_filename = av_malloc(fmp4_init_filename_len); + if (!vs->fmp4_init_filename ) { + ret = AVERROR(ENOMEM); goto fail; - } + } + av_strlcpy(vs->fmp4_init_filename, hls->fmp4_init_filename, + fmp4_init_filename_len); + if (hls->nb_varstreams > 1) { + ret = append_postfix(vs->fmp4_init_filename, fmp4_init_filename_len, i); + if (ret < 0) + goto fail; + } - fmp4_init_filename_len = strlen(vs->m3u8_name) + - strlen(vs->fmp4_init_filename) + 1; + 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; - } + vs->base_output_dirname = av_malloc(fmp4_init_filename_len); + if (!vs->base_output_dirname) { + ret = AVERROR(ENOMEM); + goto fail; + } - av_strlcpy(vs->base_output_dirname, vs->m3u8_name, - fmp4_init_filename_len); - p = strrchr(vs->base_output_dirname, '/'); - if (p) { - *(p + 1) = '\0'; - av_strlcat(vs->base_output_dirname, vs->fmp4_init_filename, + av_strlcpy(vs->base_output_dirname, vs->m3u8_name, fmp4_init_filename_len); - } else { - av_strlcpy(vs->base_output_dirname, vs->fmp4_init_filename, - fmp4_init_filename_len); - } + p = strrchr(vs->base_output_dirname, '/'); + if (p) { + *(p + 1) = '\0'; + av_strlcat(vs->base_output_dirname, vs->fmp4_init_filename, + fmp4_init_filename_len); + } else { + av_strlcpy(vs->base_output_dirname, vs->fmp4_init_filename, + fmp4_init_filename_len); + } } }