From 2c814286b90943c1ac6dddd6b2627495d0cd3688 Mon Sep 17 00:00:00 2001 From: Prabhat Roy Date: Wed, 15 Sep 2021 12:48:08 +0100 Subject: [PATCH 1/4] Enable building torchvision with ffmpeg regardless of version on Linux --- setup.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index 09f951b1090..475b6a2979c 100644 --- a/setup.py +++ b/setup.py @@ -355,13 +355,8 @@ def get_extensions(): has_ffmpeg = False if has_ffmpeg: try: - # this splits on both dots and spaces as the output format differs across versions / platforms - ffmpeg_version_str = str(subprocess.check_output(["ffmpeg", "-version"])) - ffmpeg_version = re.split(r"ffmpeg version |\.| |-", ffmpeg_version_str)[1:3] - ffmpeg_version = ".".join(ffmpeg_version) - if StrictVersion(ffmpeg_version) >= StrictVersion('4.3'): - print(f'ffmpeg {ffmpeg_version} not supported yet, please use ffmpeg 4.2.') - has_ffmpeg = False + # This is to check if ffmpeg is installed properly. + _ = subprocess.check_output(["ffmpeg", "-version"]) except (subprocess.CalledProcessError, IndexError, ValueError): print('Error fetching ffmpeg version, ignoring ffmpeg.') has_ffmpeg = False From 8369cc87801587a7d34abcfe60ad938b9b0e1139 Mon Sep 17 00:00:00 2001 From: Prabhat Roy Date: Wed, 15 Sep 2021 13:35:58 +0100 Subject: [PATCH 2/4] Skip tests with python 3.9 --- test/test_video_reader.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/test_video_reader.py b/test/test_video_reader.py index 66e92d88dba..20b3495346e 100644 --- a/test/test_video_reader.py +++ b/test/test_video_reader.py @@ -1234,6 +1234,7 @@ def test_invalid_file(self): with pytest.raises(RuntimeError): io.read_video('foo.mp4') + @PY39_SKIP def test_audio_present_pts(self): """Test if audio frames are returned with pts unit.""" backends = ['video_reader', 'pyav'] @@ -1250,6 +1251,7 @@ def test_audio_present_pts(self): full_path, start_offset, end_offset, pts_unit='pts') assert all([dimension > 0 for dimension in audio.shape[:2]]) + @PY39_SKIP def test_audio_present_sec(self): """Test if audio frames are returned with sec unit.""" backends = ['video_reader', 'pyav'] From cad1804585ed1c3efccf6518113e5610dd22c620 Mon Sep 17 00:00:00 2001 From: Prabhat Roy Date: Thu, 16 Sep 2021 11:07:22 +0100 Subject: [PATCH 3/4] Removed PY39_SKIP --- test/test_video_reader.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/test_video_reader.py b/test/test_video_reader.py index 610afe37dba..41ca3e9b08a 100644 --- a/test/test_video_reader.py +++ b/test/test_video_reader.py @@ -1226,7 +1226,6 @@ def test_invalid_file(self): with pytest.raises(RuntimeError): io.read_video('foo.mp4') - @PY39_SKIP def test_audio_present_pts(self): """Test if audio frames are returned with pts unit.""" backends = ['video_reader', 'pyav'] @@ -1243,7 +1242,6 @@ def test_audio_present_pts(self): full_path, start_offset, end_offset, pts_unit='pts') assert all([dimension > 0 for dimension in audio.shape[:2]]) - @PY39_SKIP def test_audio_present_sec(self): """Test if audio frames are returned with sec unit.""" backends = ['video_reader', 'pyav'] From 959accf7e69bb692f3c9e75e681b3de66f1a04cb Mon Sep 17 00:00:00 2001 From: Prabhat Roy Date: Thu, 16 Sep 2021 11:17:34 +0100 Subject: [PATCH 4/4] Cleaned up a bit --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 053a5cc8e86..981c7e33563 100644 --- a/setup.py +++ b/setup.py @@ -361,8 +361,8 @@ def get_extensions(): if has_ffmpeg: try: # This is to check if ffmpeg is installed properly. - _ = subprocess.check_output(["ffmpeg", "-version"]) - except (subprocess.CalledProcessError, IndexError, ValueError): + subprocess.check_output(["ffmpeg", "-version"]) + except subprocess.CalledProcessError: print('Error fetching ffmpeg version, ignoring ffmpeg.') has_ffmpeg = False