[downloader/f4m] Minor cleanup
authorAntti Ajanki <antti.ajanki@iki.fi>
Mon, 5 Jan 2015 18:30:40 +0000 (20:30 +0200)
committerAntti Ajanki <antti.ajanki@iki.fi>
Mon, 5 Jan 2015 19:12:33 +0000 (21:12 +0200)
youtube_dl/downloader/f4m.py

index 744bf91cb58b387120d1653a468ecb96d42a7279..c460c167a2db78be7a1cdb8e81a3efe89e677ed1 100644 (file)
@@ -191,6 +191,10 @@ def write_unsigned_int(stream, val):
     stream.write(struct_pack('!I', val))
 
 
+def write_unsigned_int_24(stream, val):
+    stream.write(struct_pack('!I', val)[1:])
+
+
 def write_flv_header(stream):
     """Writes the FLV header to stream"""
     # FLV header
@@ -202,13 +206,12 @@ def write_flv_header(stream):
 
 def write_metadata_tag(stream, metadata):
     """Writes optional metadata tag to stream"""
+    SCRIPT_TAG = b'\x12'
     FLV_TAG_HEADER_LEN = 11
 
     if metadata:
-        # Script data
-        stream.write(b'\x12')
-        # Size of the metadata with 3 bytes
-        stream.write(struct_pack('!L', len(metadata))[1:])
+        stream.write(SCRIPT_TAG)
+        write_unsigned_int_24(stream, len(metadata))
         stream.write(b'\x00\x00\x00\x00\x00\x00\x00')
         stream.write(metadata)
         write_unsigned_int(stream, FLV_TAG_HEADER_LEN + len(metadata))