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 A61EC4EF7B for ; Sat, 14 Jun 2025 01:00:36 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id B2BF468CF05; Sat, 14 Jun 2025 03:59:55 +0300 (EEST) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 0A6D468CEBF for ; Sat, 14 Jun 2025 03:59:53 +0300 (EEST) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-7487d2b524eso1470449b3a.0 for ; Fri, 13 Jun 2025 17:59:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749862792; x=1750467592; 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=z3+xA8HvnrvjjRByUOizy4XvH5iDwArrGSaKUs7DNC0=; b=dalFbfz3JZ0Bh50zoUUn5iuoV7y7Pxlkek7wAeNHhJeDDrlGD2MwWUHAu7jWCR0yf7 4GSEOdIGjCailyANEaNEa64B5dzXW8NaE1lsQbAe+IIEUF46GKLhKr5Ou5DftlOe7J1u k/qLZqNlI0H8ri9ObXG+OKsO7A1Oe56ik+3l2HuUXsUFMgAlj3jV9/YHvPUDHApsD6v9 jvA/IluGPVVPlR2UJKWOueE6YnLzbNgrRNfuO1FMzgseF9h+jX/LU5TBqdH8UHinh5ZD fpqYmLKUQMiDPHQLJAKYqhHxZV9gNeur/mu4Ke1w3C2HR6KizTb30UMhG3p9Ko138IXT kMVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749862792; x=1750467592; 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=z3+xA8HvnrvjjRByUOizy4XvH5iDwArrGSaKUs7DNC0=; b=l9udKzCbODDvZcgz+Om+VBtN7kVY2p/hnoYMH/gKu8vp96xWdW3rzgGhGdelK/vv/m 7yJX9JY4CjnmZ4QmzeVsbrPJ/4lBtDjKl6W4snby91yS+2ftRgeFLYC8RM1zzP+nQBaY EHxj62SHLIxK7NjyvtpYkACHHWy1enfP3+Sk5UWcCCaiBj3wCDaOhaPJ9jDOeg/4pg4K rEDvdtFLqjNqesj3C5gvm8e1LbFevD4PSkbit0iqslhLRlR62mgM65+N37xUUkuP4bxf wwx18djYLo3ZDw1L7uIkLYquAa93wlISQHkTt8HbvVbeHHeZ6TDPFx4x8zNzGxwGYtfL Tahg== X-Gm-Message-State: AOJu0YwTtdJLiaj2BZtNcSgzLrQqfvNfSHCxr5QOqGamIl3eIDIodX0B 9oojf9lqPLHzXFRohWQ9nDEayfE8MepgbgyMPe/4fUF+Q+B9fnFT0x5SwSxvKg== X-Gm-Gg: ASbGncsvyhWzJ7qQI4h4sEgo5C2ikqq6v8Gt2C3iyxv0XfEvMUtFXN07cZQywCG4Ols TPIvuUI98e/6JNGAkqP0ILQJXe+801hIwQ151II6mCZOqC/aTbo+fwHYPbj+QovoP/KDPK0wcMt xlJ6IymzJfFsSES1QLQEc9UJeK6+1z+j+Wl1zMk2y2eXiy0MeRK+LL/LszS5gk5SBe0D/xSguZ/ 1ufjKOdlv0TlVD6eUvA+OXBZdujif+w/mDjTQ5X4oh/DqJk5F5ApGWL3z3CtQb/lTR40JIW/3Cv eETXKXcPjlCGsORCOdqu25v/FSGI/dpDrOer20PtGw6P2f4ex6nE6SayVM8vHGAWbC4cqxo1Ky4 V6Nqyy3nIYB9IxZ4= X-Google-Smtp-Source: AGHT+IFGOpAnQUcm4smaW06FfyFu9RILtuWR7t9loXyDPSfZNSOnmlBM6rSAeJbrhWgYux+l3iGrhQ== X-Received: by 2002:a05:6a00:8ca:b0:736:3ea8:4805 with SMTP id d2e1a72fcca58-7489cf726bcmr1609728b3a.7.1749862792081; Fri, 13 Jun 2025 17:59:52 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7488ffecd13sm2326554b3a.34.2025.06.13.17.59.51 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Jun 2025 17:59:51 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: In-Reply-To: References: Date: Sat, 14 Jun 2025 00:59:12 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2 6/6] 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 ec084483d4..57ea54b00a 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 { @@ -339,17 +339,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"); } @@ -457,8 +457,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); } } } @@ -750,8 +750,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; @@ -905,11 +905,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(); @@ -950,10 +948,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); @@ -1056,8 +1054,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".