@@ -834,9 +834,9 @@ async def download_img(
834834
835835 async def download_av_and_merge (
836836 self ,
837- v_url : str ,
838- a_url : str ,
839- merga_name : str ,
837+ video_url : str ,
838+ audio_url : str ,
839+ merge_name : str ,
840840 video_name : str | None = None ,
841841 audio_name : str | None = None ,
842842 ext_headers : dict [str , str ] | None = None ,
@@ -845,35 +845,35 @@ async def download_av_and_merge(
845845 """
846846 下载音频和视频文件并合并
847847
848- :param v_url : 视频流下载地址
849- :param a_url : 音频流下载地址
850- :param merga_name : 合并后输出文件名(不含扩展名)
848+ :param video_url : 视频流下载地址
849+ :param audio_url : 音频流下载地址
850+ :param merge_name : 合并后输出文件名(不含扩展名)
851851 :param video_name: 保存到本地的视频文件名,为空时根据 url 自动生成 mp4 文件名
852852 :param audio_name: 保存到本地的音频文件名,为空时根据 url 自动生成 mp3 文件名
853853 :param ext_headers: 额外的请求头,会与默认请求头合并
854854 :param use_curl_cffi: 是否使用 curl_cffi 下载
855- :return: 合并后的视频文件本地路径
855+ :return: 合并后的视频文件本地路径(mp4)
856856 :raise DownloadException: 下载或合并过程中发生错误时抛出
857857 """
858858 cache_dir = await CacheManager .ensure_dir (CacheManager .MEDIA )
859- output_path = cache_dir / f"{ merga_name } .mp4"
859+ output_path = cache_dir / f"{ merge_name } .mp4"
860860 if await output_path .exists ():
861861 return output_path
862862 v_path , a_path = await asyncio .gather (
863863 self .download_video (
864- url = v_url ,
864+ url = video_url ,
865865 video_name = video_name ,
866866 ext_headers = ext_headers ,
867867 use_curl_cffi = use_curl_cffi ,
868868 ),
869869 self .download_audio (
870- url = a_url ,
870+ url = audio_url ,
871871 audio_name = audio_name ,
872872 ext_headers = ext_headers ,
873873 use_curl_cffi = use_curl_cffi ,
874874 ),
875875 )
876- return await FFmpeg .merge_av (v_path = v_path , a_path = a_path , file_name = merga_name )
876+ return await FFmpeg .merge_av (v_path = v_path , a_path = a_path , file_name = merge_name )
877877
878878 @staticmethod
879879 @contextlib .contextmanager
0 commit comments