Make it work with discontinuities.

Author: toots

src/outputs/hls_output.ml

@@ -158,6 +158,7 @@ type stream = {
   codecs : string Lazy.t;  (** codecs (see RFC 6381) *)
   extname : string;
   mutable init_state : init_state;
+  mutable init_position : int;
   mutable position : int;
   mutable current_segment : segment option;
   mutable discontinuity_count : int;
@@ -346,7 +347,8 @@ class hls_output p =
         video_size;
         extname;
         init_state = `Todo;
-        position = 0;
+        init_position = 0;
+        position = 1;
         current_segment = None;
         discontinuity_count = 0;
       }
@@ -607,19 +609,21 @@ class hls_output p =
         (fun stream (name, pos, discontinuity_count) ->
           assert (name = stream.name);
           stream.discontinuity_count <- discontinuity_count;
-          stream.position <- pos)
+          stream.init_position <- pos;
+          stream.position <- pos + 1)
         streams p;
       segments <- s
 
-    method private process_init ~init ({ extname; name; position } as s) =
+    method private process_init ~init ({ extname; name; init_position } as s) =
       match init with
         | None -> s.init_state <- `No_init
         | Some data ->
-            let init_filename = segment_name ~position ~extname name in
+            let init_filename =
+              segment_name ~position:init_position ~extname name
+            in
             let oc = self#open_out init_filename in
             Strings.iter (output_substring oc) data;
             self#close_out ~filename:init_filename oc;
-            s.position <- s.position + 1;
             s.init_state <- `Has_init init_filename
 
     method encode frame ofs len =