From d76d782e72babd795abdee5e784d109ea3e3c268 Mon Sep 17 00:00:00 2001 From: Elias Steurer Date: Mon, 16 Aug 2021 11:48:06 +0200 Subject: [PATCH] Add missing ffmpeg prebuild bin to setup for mac --- Tools/download_ffmpeg.py | 22 ++++++++++++++-------- Tools/setup.py | 2 ++ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Tools/download_ffmpeg.py b/Tools/download_ffmpeg.py index 29780640..aac502a9 100644 --- a/Tools/download_ffmpeg.py +++ b/Tools/download_ffmpeg.py @@ -24,13 +24,19 @@ def download_and_extract(file_base_path, name): print("Delete tmp file: ", path_and_filename) os.remove(path_and_filename) -ffmpeg_7zip_name = 'ffmpeg-4.4.zip' -ffprobe_7zip_name = 'ffprobe-4.4.zip' -current_path = os.path.join(os.path.abspath(os.getcwd()),"") -extraction_path = os.path.abspath(os.path.join(current_path, "../Common/ffmpeg")) +def download_prebuild_ffmpeg(): + ffmpeg_7zip_name = 'ffmpeg-4.4.zip' + ffprobe_7zip_name = 'ffprobe-4.4.zip' + current_path = os.path.join(os.path.abspath(os.getcwd()),"") + extraction_path = os.path.abspath(os.path.join(current_path, "../Common/ffmpeg")) -if not os.path.exists(extraction_path): - os.makedirs(extraction_path) + if not os.path.exists(extraction_path): + os.makedirs(extraction_path) + + download_and_extract(current_path, ffmpeg_7zip_name) + download_and_extract(current_path, ffprobe_7zip_name) + + +if __name__ == "__main__": + download_prebuild_ffmpeg() -download_and_extract(current_path, ffmpeg_7zip_name) -download_and_extract(current_path, ffprobe_7zip_name) diff --git a/Tools/setup.py b/Tools/setup.py index 82bfc312..515196d7 100644 --- a/Tools/setup.py +++ b/Tools/setup.py @@ -2,6 +2,7 @@ import os import sys import argparse from execute_util import execute +from download_ffmpeg import download_prebuild_ffmpeg if __name__ == "__main__": parser = argparse.ArgumentParser( @@ -60,6 +61,7 @@ if __name__ == "__main__": execute("./bootstrap-vcpkg.sh", vcpkg_path, False) execute("chmod +x vcpkg", vcpkg_path) vcpkg_triplet = "x64-osx" + download_prebuild_ffmpeg() elif sys.platform == "linux": vcpkg_command = "./vcpkg" #vcpkg_packages_list.append("infoware[opengl]")