remove _ffmpeg_initialized

pytorch · Jul 8, 2023 · 6a3885c · 6a3885c
1 parent 8aa24f4
commit 6a3885c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/test/torchaudio_unittest/common_utils/case_utils.py b/test/torchaudio_unittest/common_utils/case_utils.py
@@ -112,7 +112,7 @@ class TorchaudioTestCase(TestBaseMixin, PytorchTestCase):
 
 
 def is_ffmpeg_available():
-    return torchaudio._extension._FFMPEG_INITIALIZED
+    return torchaudio._extension._FFMPEG_EXT is not None
 
 
 _IS_CTC_DECODER_AVAILABLE = None

diff --git a/torchaudio/_backend/utils.py b/torchaudio/_backend/utils.py
@@ -6,10 +6,10 @@
 
 import torch
 import torchaudio.backend.soundfile_backend as soundfile_backend
-from torchaudio._extension import _FFMPEG_INITIALIZED, _SOX_INITIALIZED
+from torchaudio._extension import _FFMPEG_EXT, _SOX_INITIALIZED
 from torchaudio.backend.common import AudioMetaData
 
-if _FFMPEG_INITIALIZED:
+if _FFMPEG_EXT is not None:
     from torchaudio.io._compat import info_audio, info_audio_fileobj, load_audio, load_audio_fileobj, save_audio
 
 
@@ -262,7 +262,7 @@ def can_encode(uri, format) -> bool:
 @lru_cache(None)
 def get_available_backends() -> Dict[str, Backend]:
     backend_specs = {}
-    if _FFMPEG_INITIALIZED:
+    if _FFMPEG_EXT is not None:
         backend_specs["ffmpeg"] = FFmpegBackend
     if _SOX_INITIALIZED:
         backend_specs["sox"] = SoXBackend

diff --git a/torchaudio/_extension/__init__.py b/torchaudio/_extension/__init__.py
@@ -20,7 +20,6 @@
     "_IS_TORCHAUDIO_EXT_AVAILABLE",
     "_IS_RIR_AVAILABLE",
     "_SOX_INITIALIZED",
-    "_FFMPEG_INITIALIZED",
     "_FFMPEG_EXT",
 ]
 
@@ -60,12 +59,10 @@
 
 
 # Initialize FFmpeg-related features
-_FFMPEG_INITIALIZED = False
 _FFMPEG_EXT = None
 if _IS_TORCHAUDIO_EXT_AVAILABLE:
     try:
         _FFMPEG_EXT = _init_ffmpeg()
-        _FFMPEG_INITIALIZED = True
     except Exception:
         # The initialization of FFmpeg extension will fail if supported FFmpeg
         # libraries are not found in the system.
@@ -83,7 +80,7 @@
     )
 )
 
-fail_if_no_ffmpeg = no_op if _FFMPEG_INITIALIZED else _fail_since_no_ffmpeg
+fail_if_no_ffmpeg = _fail_since_no_ffmpeg if _FFMPEG_EXT is None else no_op
 
 fail_if_no_rir = (
     no_op

diff --git a/torchaudio/backend/sox_io_backend.py b/torchaudio/backend/sox_io_backend.py
@@ -24,7 +24,7 @@ def _fail_load(
     raise RuntimeError("Failed to load audio from {}".format(filepath))
 
 
-if torchaudio._extension._FFMPEG_INITIALIZED:
+if torchaudio._extension._FFMPEG_EXT is not None:
     import torchaudio.io._compat as _compat
 
     _fallback_info = _compat.info_audio