Put structs common to backends in backend.common

torchaudio/backend/__init__.py

@@ -12,7 +12,7 @@
     get_sox_encoding_t,
     get_sox_bool,
 )
-from .soundfile_backend import (
+from .common import (
     SignalInfo,
     EncodingInfo,
 )

torchaudio/backend/common.py

@@ -0,0 +1,31 @@
+from typing import Any, Optional, Tuple
+
+
+class SignalInfo:
+    def __init__(self,
+                 channels: Optional[int] = None,
+                 rate: Optional[float] = None,
+                 precision: Optional[int] = None,
+                 length: Optional[int] = None) -> None:
+        self.channels = channels
+        self.rate = rate
+        self.precision = precision
+        self.length = length
+
+
+class EncodingInfo:
+    def __init__(self,
+                 encoding: Any = None,
+                 bits_per_sample: Optional[int] = None,
+                 compression: Optional[float] = None,
+                 reverse_bytes: Any = None,
+                 reverse_nibbles: Any = None,
+                 reverse_bits: Any = None,
+                 opposite_endian: Optional[bool] = None) -> None:
+        self.encoding = encoding
+        self.bits_per_sample = bits_per_sample
+        self.compression = compression
+        self.reverse_bytes = reverse_bytes
+        self.reverse_nibbles = reverse_nibbles
+        self.reverse_bits = reverse_bits
+        self.opposite_endian = opposite_endian

torchaudio/backend/soundfile_backend.py

@@ -1,5 +1,5 @@
 import os
-from typing import Any, Optional, Tuple
+from typing import Optional, Tuple
 
 import torch
 from torch import Tensor
@@ -8,6 +8,7 @@
     module_utils as _mod_utils,
     misc_ops as _misc_ops,
 )
+from .common import SignalInfo, EncodingInfo
 
 if _mod_utils.is_module_available('soundfile'):
     import soundfile
@@ -22,36 +23,6 @@
 }
 
 
-class SignalInfo:
-    def __init__(self,
-                 channels: Optional[int] = None,
-                 rate: Optional[float] = None,
-                 precision: Optional[int] = None,
-                 length: Optional[int] = None) -> None:
-        self.channels = channels
-        self.rate = rate
-        self.precision = precision
-        self.length = length
-
-
-class EncodingInfo:
-    def __init__(self,
-                 encoding: Any = None,
-                 bits_per_sample: Optional[int] = None,
-                 compression: Optional[float] = None,
-                 reverse_bytes: Any = None,
-                 reverse_nibbles: Any = None,
-                 reverse_bits: Any = None,
-                 opposite_endian: Optional[bool] = None) -> None:
-        self.encoding = encoding
-        self.bits_per_sample = bits_per_sample
-        self.compression = compression
-        self.reverse_bytes = reverse_bytes
-        self.reverse_nibbles = reverse_nibbles
-        self.reverse_bits = reverse_bits
-        self.opposite_endian = opposite_endian
-
-
 @_mod_utils.requires_module('soundfile')
 def load(filepath: str,
          out: Optional[Tensor] = None,

torchaudio/backend/sox_backend.py

@@ -8,7 +8,7 @@
     module_utils as _mod_utils,
     misc_ops as _misc_ops,
 )
-from .soundfile_backend import SignalInfo, EncodingInfo
+from .common import SignalInfo, EncodingInfo
 
 if _mod_utils.is_module_available('torchaudio._torchaudio'):
     from torchaudio import _torchaudio