feat(VDURLDDetecter): add missing fields in dash (#995)

Author: Nemo2011

bilibili_api/video.py

@@ -2209,7 +2209,7 @@ class AudioQuality(Enum):
 
     _64K = 30216
     _132K = 30232
-    DOLBY = 30255
+    DOLBY = 30250
     HI_RES = 30251
     _192K = 30280
 
@@ -2222,14 +2222,32 @@ class VideoStreamDownloadURL:
     视频流 URL 类
 
     Attributes:
-        url           (str)         : 视频流 url
+        url (str): 视频流 url
         video_quality (VideoQuality): 视频流清晰度
-        video_codecs  (VideoCodecs) : 视频流编码
+        video_codecs (VideoCodecs) : 视频流编码
+        backup_url (list[str]): 备用链接
+        bandwidth (int): 码率
+        codecs (str): 视频流详细编码
+        frame_rate (float): 帧率
+        scale (tuple[int, int]): 画面尺寸
+        sar (tuple[int, int]): 采样纵横比
+        mime_type (str): MIME 类型
+        segment_base_initialization (str): SegmentBase.Initialization
+        segment_base_index_range (str): SegmentBase.indexRange
     """
 
     url: str
     video_quality: VideoQuality
     video_codecs: VideoCodecs
+    backup_url: list[str]
+    bandwidth: int
+    codecs: str
+    frame_rate: float
+    scale: tuple[int, int]
+    sar: tuple[int, int]
+    mime_type: str
+    segment_base_initialization: str
+    segment_base_index_range: str
 
 
 @dataclass
@@ -2240,12 +2258,24 @@ class AudioStreamDownloadURL:
     音频流 URL 类
 
     Attributes:
-        url           (str)         : 音频流 url
+        url (str): 音频流 url
         audio_quality (AudioQuality): 音频流清晰度
+        backup_url (list[str]): 备用链接
+        bandwidth (int): 码率
+        codecs (str): 视频流详细编码
+        mime_type (str): MIME 类型
+        segment_base_initialization (str): SegmentBase.Initialization
+        segment_base_index_range (str): SegmentBase.indexRange
     """
 
     url: str
     audio_quality: AudioQuality
+    backup_url: list[str]
+    bandwidth: int
+    codecs: str
+    mime_type: str
+    segment_base_initialization: str
+    segment_base_index_range: str
 
 
 @dataclass
@@ -2405,10 +2435,7 @@ def detect(
             flac_data = self.__data["dash"].get("flac")
             dolby_data = self.__data["dash"].get("dolby")
             for video_data in videos_data:
-                if video_data.get("baseUrl"):
-                    video_stream_url = video_data["baseUrl"]
-                else:
-                    video_stream_url = video_data["base_url"]
+                video_stream_url = video_data["base_url"]
                 video_stream_quality = VideoQuality(video_data["id"])
                 if video_stream_quality == VideoQuality.HDR and no_hdr:
                     continue
@@ -2444,14 +2471,20 @@ def detect(
                     url=video_stream_url,
                     video_quality=video_stream_quality,
                     video_codecs=video_stream_codecs,  # type: ignore
+                    backup_url=video_data["backup_url"],
+                    bandwidth=video_data["bandwidth"],
+                    codecs=video_data["codecs"],
+                    frame_rate=float(video_data["frame_rate"]),
+                    scale=(video_data["width"], video_data["height"]),
+                    sar=tuple([int(x) for x in video_data["sar"].split(":")]),
+                    mime_type=video_data["mime_type"],
+                    segment_base_initialization=video_data["segment_base"]["initialization"],
+                    segment_base_index_range=video_data["segment_base"]["index_range"]
                 )
                 streams.append(video_stream)
             if audios_data:
                 for audio_data in audios_data:
-                    if audio_data.get("baseUrl"):
-                        audio_stream_url = audio_data["baseUrl"]
-                    else:
-                        audio_stream_url = audio_data["base_url"]
+                    audio_stream_url = audio_data["base_url"]
                     audio_stream_quality = AudioQuality(audio_data["id"])
                     if audio_stream_quality.value > audio_max_quality.value:
                         continue
@@ -2460,15 +2493,29 @@ def detect(
                     if not audio_stream_quality in audio_accepted_qualities:
                         continue
                     audio_stream = AudioStreamDownloadURL(
-                        url=audio_stream_url, audio_quality=audio_stream_quality
+                        url=audio_stream_url,
+                        audio_quality=audio_stream_quality,
+                        backup_url=audio_data["backup_url"],
+                        bandwidth=audio_data["bandwidth"],
+                        codecs=audio_data["codecs"],
+                        mime_type=audio_data["mime_type"],
+                        segment_base_initialization=audio_data["segment_base"]["initialization"],
+                        segment_base_index_range=audio_data["segment_base"]["index_range"]
                     )
                     streams.append(audio_stream)
             if flac_data and (not no_hires):
                 if flac_data["audio"]:
                     flac_stream_url = flac_data["audio"]["base_url"]
                     flac_stream_quality = AudioQuality(flac_data["audio"]["id"])
                     flac_stream = AudioStreamDownloadURL(
-                        url=flac_stream_url, audio_quality=flac_stream_quality
+                        url=flac_stream_url,
+                        audio_quality=flac_stream_quality,
+                        backup_url=flac_data["audio"]["backup_url"],
+                        bandwidth=flac_data["audio"]["bandwidth"],
+                        codecs=flac_data["audio"]["codecs"],
+                        mime_type=flac_data["audio"]["mime_type"],
+                        segment_base_initialization=flac_data["audio"]["segment_base"]["initialization"],
+                        segment_base_index_range=flac_data["audio"]["segment_base"]["index_range"]
                     )
                     streams.append(flac_stream)
             if dolby_data and (not no_dolby_audio):
@@ -2477,7 +2524,14 @@ def detect(
                     dolby_stream_url = dolby_stream_data["base_url"]
                     dolby_stream_quality = AudioQuality(dolby_stream_data["id"])
                     dolby_stream = AudioStreamDownloadURL(
-                        url=dolby_stream_url, audio_quality=dolby_stream_quality
+                        url=dolby_stream_url,
+                        audio_quality=dolby_stream_quality,
+                        backup_url=dolby_stream_data["backup_url"],
+                        bandwidth=dolby_stream_data["bandwidth"],
+                        codecs=dolby_stream_data["codecs"],
+                        mime_type=dolby_stream_data["mime_type"],
+                        segment_base_initialization=dolby_stream_data["segment_base"]["initialization"],
+                        segment_base_index_range=dolby_stream_data["segment_base"]["index_range"]
                     )
                     streams.append(dolby_stream)
             return streams