Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Anton Khirnov <anton@khirnov.net>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH 23/35] fftools/ffmpeg_mux: reindent
Date: Thu, 16 Jun 2022 21:55:22 +0200
Message-ID: <20220616195534.5278-23-anton@khirnov.net> (raw)
In-Reply-To: <20220616195534.5278-1-anton@khirnov.net>

---
 fftools/ffmpeg_mux.c | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c
index 453ccac912..641bdb98b0 100644
--- a/fftools/ffmpeg_mux.c
+++ b/fftools/ffmpeg_mux.c
@@ -98,16 +98,16 @@ static int queue_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt)
     }
 
     if (pkt) {
-    ret = av_packet_make_refcounted(pkt);
-    if (ret < 0)
-        return ret;
+        ret = av_packet_make_refcounted(pkt);
+        if (ret < 0)
+            return ret;
 
-    tmp_pkt = av_packet_alloc();
-    if (!tmp_pkt)
-        return AVERROR(ENOMEM);
+        tmp_pkt = av_packet_alloc();
+        if (!tmp_pkt)
+            return AVERROR(ENOMEM);
 
-    av_packet_move_ref(tmp_pkt, pkt);
-    ms->muxing_queue_data_size += tmp_pkt->size;
+        av_packet_move_ref(tmp_pkt, pkt);
+        ms->muxing_queue_data_size += tmp_pkt->size;
     }
     av_fifo_write(ms->muxing_queue, &tmp_pkt, 1);
 
@@ -236,20 +236,20 @@ void of_submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost)
     int ret;
 
     if (pkt) {
-    /*
-     * Audio encoders may split the packets --  #frames in != #packets out.
-     * But there is no reordering, so we can limit the number of output packets
-     * by simply dropping them here.
-     * Counting encoded video frames needs to be done separately because of
-     * reordering, see do_video_out().
-     */
-    if (!(st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && ost->encoding_needed)) {
-        if (ost->frame_number >= ost->max_frames) {
-            av_packet_unref(pkt);
-            return;
+        /*
+         * Audio encoders may split the packets --  #frames in != #packets out.
+         * But there is no reordering, so we can limit the number of output packets
+         * by simply dropping them here.
+         * Counting encoded video frames needs to be done separately because of
+         * reordering, see do_video_out().
+         */
+        if (!(st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && ost->encoding_needed)) {
+            if (ost->frame_number >= ost->max_frames) {
+                av_packet_unref(pkt);
+                return;
+            }
+            ost->frame_number++;
         }
-        ost->frame_number++;
-    }
     }
 
     if (of->mux->header_written) {
-- 
2.34.1

_______________________________________________
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".

  parent reply	other threads:[~2022-06-16 20:07 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-16 19:55 [FFmpeg-devel] [PATCH 01/35] fftools/ffmpeg_mux: add private muxer context Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 02/35] fftools/ffmpeg: add a helper function to access output file size Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 03/35] fftools/ffmpeg: fix the type of limit_filesize Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 04/35] fftools/ffmpeg: refactor limiting output file size with -fs Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 05/35] fftools/ffmpeg: set want_sdp when initializing the muxer Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 06/35] fftools/ffmpeg: write the header for stream-less outputs " Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 07/35] fftools/ffmpeg: move closing the file into of_write_trailer() Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 08/35] fftools/ffmpeg: refactor the code checking for bitexact output Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 09/35] fftools/ffmpeg: access output file chapters through a wrapper Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 10/35] fftools/ffmpeg: do not log to the muxer context Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 11/35] fftools/ffmpeg: move the mux queue into muxer private data Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 12/35] fftools/ffmpeg_mux: split queuing packets into a separate function Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 13/35] fftools/ffmpeg_mux: split of_write_packet() Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 14/35] fftools/ffmpeg: move output file opts into private context Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 15/35] fftools/ffmpeg: move freeing 2pass input stats to a better place Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 16/35] fftools/ffmpeg: use refcounted packets for encoded subtitles Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 17/35] fftools/ffmpeg: do not send spurious EOF for streamcopy when looping Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 18/35] fate/ffmpeg: add a test for interleaving video+subs Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 19/35] fftools/ffmpeg: use last filter output pts to choose next output stream Anton Khirnov
2022-06-17 18:45   ` Michael Niedermayer
2022-06-23 15:32     ` [FFmpeg-devel] [PATCH] " Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 20/35] fftools/ffmpeg: use pre-BSF DTS for choosing next output Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 21/35] fftools: add an object pool Anton Khirnov
2022-06-16 21:41   ` Andreas Rheinhardt
2022-07-22 15:39   ` [FFmpeg-devel] [PATCH 22/35] " Anton Khirnov
2022-07-22 17:58     ` Andreas Rheinhardt
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 22/35] fftools/ffmpeg: rework -shortest implementation Anton Khirnov
2022-06-16 21:05   ` Andreas Rheinhardt
2022-06-17 10:25   ` Anton Khirnov
2022-06-23 10:04     ` [FFmpeg-devel] [PATCH] " Anton Khirnov
2022-07-13 10:50       ` Anton Khirnov
2022-06-16 19:55 ` Anton Khirnov [this message]
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 24/35] fftools/ffmpeg: use the sync queues to handle -frames Anton Khirnov
2022-06-16 20:33   ` Andreas Rheinhardt
2022-06-17 10:46   ` Anton Khirnov
2022-06-22  8:27     ` Andreas Rheinhardt
2022-06-22 17:26   ` Anton Khirnov
2022-06-23 22:12   ` Michael Niedermayer
2022-07-04 16:11     ` [FFmpeg-devel] [PATCH] " Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 25/35] fftools/ffmpeg: stop using OutputStream.frame_number in print_report() Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 26/35] fftools/ffmpeg: only set OutputStream.frame_number for video encoding Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 27/35] fftools/ffmpeg: make the muxer AVFormatContext private to ffmpeg_mux.c Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 28/35] fftools/ffmpeg_mux: return errors from of_submit_packet() Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 29/35] fftools/ffmpeg_mux: return errors from submit_packet() Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 30/35] fftools/ffmpeg_mux: return errors from write_packet() Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 31/35] fftools/ffmpeg_mux: do not call exit_program() in print_sdp() Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 32/35] fftools/ffmpeg: stop using av_stream_get_end_pts() Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 33/35] fftools/ffmpeg: depend on threads Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 34/35] fftools: add a multistream thread-safe queue Anton Khirnov
2022-06-16 19:55 ` [FFmpeg-devel] [PATCH 35/35] fftools/ffmpeg: move each muxer to a separate thread Anton Khirnov
2022-06-17 10:27 ` [FFmpeg-devel] [PATCH 01/35] fftools/ffmpeg_mux: add private muxer context Anton Khirnov
2022-07-08 16:58   ` Michael Niedermayer
2022-07-13 10:58     ` Anton Khirnov
2022-07-13 22:12       ` Michael Niedermayer
2022-07-14  5:37         ` Anton Khirnov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220616195534.5278-23-anton@khirnov.net \
    --to=anton@khirnov.net \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git