]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[downloader/f4m] The last value in a tag is the tag length
authorAntti Ajanki <antti.ajanki@iki.fi>
Mon, 5 Jan 2015 18:22:17 +0000 (20:22 +0200)
committerAntti Ajanki <antti.ajanki@iki.fi>
Mon, 5 Jan 2015 19:07:15 +0000 (21:07 +0200)
youtube_dl/downloader/f4m.py

index 87d3150c705037c4ff520c02e82679805b18b9d4..744bf91cb58b387120d1653a468ecb96d42a7279 100644 (file)
@@ -187,6 +187,10 @@ def build_fragments_list(boot_info):
     return res
 
 
+def write_unsigned_int(stream, val):
+    stream.write(struct_pack('!I', val))
+
+
 def write_flv_header(stream):
     """Writes the FLV header to stream"""
     # FLV header
@@ -198,6 +202,8 @@ def write_flv_header(stream):
 
 def write_metadata_tag(stream, metadata):
     """Writes optional metadata tag to stream"""
+    FLV_TAG_HEADER_LEN = 11
+
     if metadata:
         # Script data
         stream.write(b'\x12')
@@ -205,9 +211,7 @@ def write_metadata_tag(stream, metadata):
         stream.write(struct_pack('!L', len(metadata))[1:])
         stream.write(b'\x00\x00\x00\x00\x00\x00\x00')
         stream.write(metadata)
-        # Magic numbers extracted from the output files produced by AdobeHDS.php
-        # (https://github.com/K-S-V/Scripts)
-        stream.write(b'\x00\x00\x01\x73')
+        write_unsigned_int(stream, FLV_TAG_HEADER_LEN + len(metadata))
 
 
 def _add_ns(prop):