From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 3F9204EA9F for ; Fri, 13 Jun 2025 05:56:45 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 20C4D68C770; Fri, 13 Jun 2025 08:55:34 +0300 (EEST) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id B56F768C8C5 for ; Fri, 13 Jun 2025 08:55:31 +0300 (EEST) Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-7426c44e014so1428495b3a.3 for ; Thu, 12 Jun 2025 22:55:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749794130; x=1750398930; darn=ffmpeg.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:from:to:cc:subject:date :message-id:reply-to; bh=BQ6RPNABHuBAhVu2k7drWxwl3Xyi4juaOaRJF0aZd6A=; b=bvdkUf9jKG5JC8qZ3jvyoc9k+Q184btsRM8Wzf3luQIHEPl+NnMJFpQI551RVMnBVP Gs393kffHbpPEmCKb3SSsuChNDeukqBix7IHug7OfZEpczrHKa8mUWi/IKpn3dLzZXxu 8fw5Kfr0QY7HivKD/77p3QhUZo7AJPtKcbfWDu5gosU5O32+23tuRWYsizqHtIS9f30T Cbq5PEhHU1lsfAJFoNUQrGMwBc5PJx5CkWm3QkTW3nexSlLy89x3+vqxph2eEXFmCq9i b8SmDzvVcudDymZIUSUupx7UiPI1sowLV0EIok94wI4/PKO2hENL+GGoWU3Ytqe5Afwa Ys0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749794130; x=1750398930; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=BQ6RPNABHuBAhVu2k7drWxwl3Xyi4juaOaRJF0aZd6A=; b=C6ySrv52tOEI1sXLt6lF6PTFZGGih50UmEcpp3whcA8Ae5dWrAhj1OKOCTU5wbF4n7 s3lbtG6vanYDVzKww4fb9FCtsarQUFW8HcJKd3E6pNZ3fid1eJLRpJ0VOvHMu/X/7S/Q LFOs89oBbYxgfAc5CrDIj1oKwWaP+VercsjcyPWMD5+Eb0G+8BNRuMv901IteJnbBp5O pfjTLiFFeTCL/u6wxesmd7G2oCg7fwGNy5cWf6mJA1aIQOr0DIDxFICC6QPK5MXlusfl FAz/36Nos5Zzg0oAtE+gvk6eCsTaKm2obs/IrbCTZg4xLGV7sjsiIPGNSku1j7QFrEDy IMLw== X-Gm-Message-State: AOJu0YzJmPdjD7P2kkfLBdsO6fnHs1xj0aFUsHMHibaeK9MIvdcH2tfi zNBBYqx3ohKcwHjvSldVeI41QoH6j+8r1zsIQKPdaUddRF3GiXQctx0AQQwYYw== X-Gm-Gg: ASbGncvEHkogIC0bm0NXtG4FFu5OQHchb4ZRKipkGxnO/Ip9t1o5LoDsS2VVXVz5//X PAP98tuB5V/9/b341Q7zL3MQnQsXmh0LIfhqMGEXEyc//6oE6RHWx1tGKPv59Ox6T1oogMSAApu 0qlZBMwAUm6jTPYdPS/Pa8tiH9FMqePFwItHUMsB4kCQbQKh6cqi1NHQUpUDCo1NtWA7mwKhKZ4 MUDpGmJkRYQ/YQPPVLBKXM6oxVx81JIKWi0Jdtkx6aWtV8Qhgpa3o46EmSWK/1g3HXgCBqB0PhQ f/PyjqHu3LM9tSPylSbAPubess8D5jo5XUmQO1IXt0Zdyp13YCvDGn/jfywBuAFsfHKY34fXZmX eYDUP X-Google-Smtp-Source: AGHT+IG96pO5ACvBKIMNnVnfBgYXa3H61oTZ154C1kYECDObhgHQrwLhywuCy6iEEZRq09qyQRFNeA== X-Received: by 2002:a05:6a00:18a5:b0:748:3849:e790 with SMTP id d2e1a72fcca58-7488f4399f6mr2569736b3a.0.1749794129807; Thu, 12 Jun 2025 22:55:29 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7488ffecfafsm796524b3a.17.2025.06.12.22.55.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Jun 2025 22:55:29 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <88a8dc78756633d546571bd224966f81993fcf8b.1749794067.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Fri, 13 Jun 2025 05:54:26 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 10/10] avformat/segment: Indent and whitespace fixes X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: softworkz Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: softworkz Signed-off-by: softworkz --- libavformat/segment.c | 48 +++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/libavformat/segment.c b/libavformat/segment.c index 3cd9e313f4..8e1e4a9c0c 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -177,7 +177,7 @@ static int segment_mux_init(AVFormatContext *s) return AVERROR(ENOMEM); opar = st->codecpar; if (!oc->oformat->codec_tag || - av_codec_get_id (oc->oformat->codec_tag, ipar->codec_tag) == opar->codec_id || + av_codec_get_id(oc->oformat->codec_tag, ipar->codec_tag) == opar->codec_id || av_codec_get_tag(oc->oformat->codec_tag, ipar->codec_id) <= 0) { opar->codec_tag = ipar->codec_tag; } else { @@ -340,17 +340,17 @@ static void segment_list_print_entry(AVIOContext *list_ioctx, list_entry->end_time - list_entry->start_time, list_entry->filename); break; case LIST_TYPE_FFCONCAT: - { - char *buf; - if (av_escape(&buf, list_entry->filename, NULL, AV_ESCAPE_MODE_AUTO, AV_ESCAPE_FLAG_WHITESPACE) < 0) { - av_log(log_ctx, AV_LOG_WARNING, - "Error writing list entry '%s' in list file\n", list_entry->filename); - return; + { + char *buf; + if (av_escape(&buf, list_entry->filename, NULL, AV_ESCAPE_MODE_AUTO, AV_ESCAPE_FLAG_WHITESPACE) < 0) { + av_log(log_ctx, AV_LOG_WARNING, + "Error writing list entry '%s' in list file\n", list_entry->filename); + return; + } + avio_printf(list_ioctx, "file %s\n", buf); + av_free(buf); + break; } - avio_printf(list_ioctx, "file %s\n", buf); - av_free(buf); - break; - } default: av_assert0(!"Invalid list type"); } @@ -456,8 +456,8 @@ static int segment_end(AVFormatContext *s, int write_trailer, int is_last) av_log(s, AV_LOG_WARNING, "Could not increment stream %d timecode, error occurred during timecode creation.\n", i); continue; } - st_tc.start += (int)((seg->cur_entry.end_time - seg->cur_entry.start_time) * av_q2d(st_rate)); // increment timecode - av_dict_set(&s->streams[i]->metadata, "timecode", av_timecode_make_string(&st_tc, st_buf, 0), 0); + st_tc.start += (int)((seg->cur_entry.end_time - seg->cur_entry.start_time) * av_q2d(st_rate)); // increment timecode + av_dict_set(&s->streams[i]->metadata, "timecode", av_timecode_make_string(&st_tc, st_buf, 0), 0); } } } @@ -755,8 +755,8 @@ static int seg_init(AVFormatContext *s) if (seg->list) { if (seg->list_type == LIST_TYPE_UNDEFINED) { - if (av_match_ext(seg->list, "csv" )) seg->list_type = LIST_TYPE_CSV; - else if (av_match_ext(seg->list, "ext" )) seg->list_type = LIST_TYPE_EXT; + if (av_match_ext(seg->list, "csv")) seg->list_type = LIST_TYPE_CSV; + else if (av_match_ext(seg->list, "ext")) seg->list_type = LIST_TYPE_EXT; else if (av_match_ext(seg->list, "m3u8")) seg->list_type = LIST_TYPE_M3U8; else if (av_match_ext(seg->list, "ffcat,ffconcat")) seg->list_type = LIST_TYPE_FFCONCAT; else seg->list_type = LIST_TYPE_FLAT; @@ -911,11 +911,9 @@ static int seg_write_packet(AVFormatContext *s, AVPacket *pkt) calc_times: if (seg->times) { - end_pts = seg->segment_count < seg->nb_times ? - seg->times[seg->segment_count] : INT64_MAX; + end_pts = seg->segment_count < seg->nb_times ? seg->times[seg->segment_count] : INT64_MAX; } else if (seg->frames) { - start_frame = seg->segment_count < seg->nb_frames ? - seg->frames[seg->segment_count] : INT_MAX; + start_frame = seg->segment_count < seg->nb_frames ? seg->frames[seg->segment_count] : INT_MAX; } else { if (seg->use_clocktime) { int64_t avgt = av_gettime(); @@ -956,10 +954,10 @@ calc_times: (pkt->flags & AV_PKT_FLAG_KEY || seg->break_non_keyframes) && (seg->segment_frame_count > 0 || seg->write_empty) && (seg->cut_pending || seg->frame_count >= start_frame || - (pkt->pts != AV_NOPTS_VALUE && - pkt_pts_avtb - seg->cur_entry.start_pts >= seg->min_seg_duration && - av_compare_ts(pkt->pts, st->time_base, - end_pts - seg->time_delta, AV_TIME_BASE_Q) >= 0))) { + (pkt->pts != AV_NOPTS_VALUE && + pkt_pts_avtb - seg->cur_entry.start_pts >= seg->min_seg_duration && + av_compare_ts(pkt->pts, st->time_base, + end_pts - seg->time_delta, AV_TIME_BASE_Q) >= 0))) { /* sanitize end time in case last packet didn't have a defined duration */ if (seg->cur_entry.last_duration == 0) seg->cur_entry.end_time = (double)pkt->pts * av_q2d(st->time_base); @@ -1064,8 +1062,8 @@ static int seg_check_bitstream(AVFormatContext *s, AVStream *st, if (ret == 1) { FFStream *const sti = ffstream(st); FFStream *const osti = ffstream(ost); - sti->bsfc = osti->bsfc; - osti->bsfc = NULL; + sti->bsfc = osti->bsfc; + osti->bsfc = NULL; } return ret; } -- ffmpeg-codebot _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".