fix _paddleaudio import

pull/2164/head
YangZhou 3 years ago
parent 38c55e44e8
commit 76b7616f26

@ -120,7 +120,7 @@ def _init_ffmpeg():
if _FFMPEG_INITIALIZED: if _FFMPEG_INITIALIZED:
return return
if not paddlespeech.audio.paddlleaudio.is_ffmpeg_available(): if not paddlespeech.audio._paddlleaudio.is_ffmpeg_available():
raise RuntimeError( raise RuntimeError(
"paddlleaudio is not compiled with FFmpeg integration. Please set USE_FFMPEG=1 when compiling paddlleaudio." "paddlleaudio is not compiled with FFmpeg integration. Please set USE_FFMPEG=1 when compiling paddlleaudio."
) )
@ -133,9 +133,9 @@ def _init_ffmpeg():
import paddllespeech.audio._paddlleaudio_ffmpeg # noqa import paddllespeech.audio._paddlleaudio_ffmpeg # noqa
paddlespeech.audio.paddlleaudio.ffmpeg_init() paddlespeech.audio._paddlleaudio.ffmpeg_init()
if paddlespeech.audio.paddlleaudio.ffmpeg_get_log_level() > 8: if paddlespeech.audio._paddlleaudio.ffmpeg_get_log_level() > 8:
paddlespeech.audio.paddlleaudio.ffmpeg_set_log_level(8) paddlespeech.audio._paddlleaudio.ffmpeg_set_log_level(8)
_FFMPEG_INITIALIZED = True _FFMPEG_INITIALIZED = True

@ -13,12 +13,6 @@
# limitations under the License. # limitations under the License.
from paddlespeech.audio._internal import module_utils from paddlespeech.audio._internal import module_utils
from paddlespeech.audio._paddleaudio import ComputeFbank as ComputeFbank
from paddlespeech.audio._paddleaudio import PitchExtractionOptions as PitchExtractionOptions
from paddlespeech.audio._paddleaudio import FrameExtractionOptions as FrameExtractionOptions
from paddlespeech.audio._paddleaudio import MelBanksOptions as MelBanksOptions
from paddlespeech.audio._paddleaudio import FbankOptions as FbankOptions
from paddlespeech.audio._paddleaudio import ComputeKaldiPitch as ComputeKaldiPitch
__all__ = [ __all__ = [
'fbank', 'fbank',
@ -55,9 +49,9 @@ def fbank(
htk_compat: bool=False, htk_compat: bool=False,
use_log_fbank: bool=True, use_log_fbank: bool=True,
use_power: bool=True): use_power: bool=True):
frame_opts = FrameExtractionOptions() frame_opts = paddlespeech.audio._paddleaudio.FrameExtractionOptions()
mel_opts = MelBanksOptions() mel_opts = paddlespeech.audio._paddleaudio.MelBanksOptions()
fbank_opts = FbankOptions() fbank_opts = paddlespeech.audio._paddleaudio.FbankOptions()
frame_opts.samp_freq = samp_freq frame_opts.samp_freq = samp_freq
frame_opts.frame_shift_ms = frame_shift_ms frame_opts.frame_shift_ms = frame_shift_ms
frame_opts.frame_length_ms = frame_length_ms frame_opts.frame_length_ms = frame_length_ms
@ -86,7 +80,7 @@ def fbank(
fbank_opts.htk_compat = htk_compat fbank_opts.htk_compat = htk_compat
fbank_opts.use_log_fbank = use_log_fbank fbank_opts.use_log_fbank = use_log_fbank
fbank_opts.use_power = use_power fbank_opts.use_power = use_power
feat = ComputeFbank(frame_opts, mel_opts, fbank_opts, wav) feat = paddlespeech.audio._paddleaudio.CopmputeFbank(frame_opts, mel_opts, fbank_opts, wav)
return feat return feat
@ -112,7 +106,7 @@ def pitch(wav,
recompute_frame: int=500, recompute_frame: int=500,
nccf_ballast_online: bool=False, nccf_ballast_online: bool=False,
snip_edges: bool=True): snip_edges: bool=True):
pitch_opts = PitchExtractionOptions() pitch_opts = paddlespeech.audio._paddleaudio.PitchExtractionOptions()
pitch_opts.samp_freq = samp_freq pitch_opts.samp_freq = samp_freq
pitch_opts.frame_shift_ms = frame_shift_ms pitch_opts.frame_shift_ms = frame_shift_ms
pitch_opts.frame_length_ms = frame_length_ms pitch_opts.frame_length_ms = frame_length_ms
@ -133,5 +127,5 @@ def pitch(wav,
pitch_opts.recompute_frame = recompute_frame pitch_opts.recompute_frame = recompute_frame
pitch_opts.nccf_ballast_online = nccf_ballast_online pitch_opts.nccf_ballast_online = nccf_ballast_online
pitch_opts.snip_edges = snip_edges pitch_opts.snip_edges = snip_edges
pitch = ComputeKaldiPitch(pitch_opts, wav) pitch = paddlespeech.audio._paddleaudio.ComputeKaldiPitch(pitch_opts, wav)
return pitch return pitch

Loading…
Cancel
Save