Fix end of stream not properly being called when not streaming.

savonet · Jan 1, 2025 · ebaf1c7 · ebaf1c7
1 parent b3ee4dc
commit ebaf1c7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/core/encoder/encoders/ogg_encoder.ml b/src/core/encoder/encoders/ogg_encoder.ml
@@ -132,8 +132,7 @@ let encoder ~pos { Ogg_format.audio; video } =
     and ogg_stop () =
       let f track = track.id <- None in
       List.iter f tracks;
-      if Ogg_muxer.state ogg_enc = Ogg_muxer.Streaming then
-        Ogg_muxer.end_of_stream ogg_enc
+      Ogg_muxer.end_of_stream ogg_enc
     and stop () =
       ogg_stop ();
       Ogg_muxer.get_data ogg_enc

diff --git a/src/core/ogg_formats/ogg_muxer.ml b/src/core/ogg_formats/ogg_muxer.ml
@@ -219,9 +219,7 @@ let register_track ?fill encoder track_encoder =
 
 (** Start streams, set state to Streaming. *)
 let streams_start encoder =
-  if Hashtbl.length encoder.tracks = 0 then
-    log#info "%s: Starting stream with no ogg track.." encoder.id;
-  log#info "%s: Starting all streams" encoder.id;
+  log#info "%s: Starting %d tracks" encoder.id (Hashtbl.length encoder.tracks);
 
   (* Add skeleton information first. *)
   begin