Merge pull request #14 from fumiama/ffmpeg

feat: use av instead of ffmpeg

.gitignore

@@ -159,4 +159,6 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
 
+.DS_Store
 /models
+/logs

requirements.txt

@@ -1,4 +1,3 @@
-Cython
 librosa==0.9.1
 matplotlib
 numpy
@@ -15,3 +14,4 @@ transformers
 pypinyin
 cn2an
 gradio
+av

server.py

@@ -1,28 +1,16 @@
 from flask import Flask, request, Response
 from io import BytesIO
-import ffmpeg
-import base64
-import os
-import sys
-import json
-import math
 import torch
-from torch import nn
+from av import open as avopen
-from torch.nn import functional as F
-from torch.utils.data import DataLoader
 
-import time
 import commons
 import utils
 from models import SynthesizerTrn
 from text.symbols import symbols
-from text import cleaned_text_to_sequence,_symbol_to_id, get_bert
+from text import cleaned_text_to_sequence, get_bert
 from text.cleaner import clean_text
 from scipy.io import wavfile
 
-# Get ffmpeg path
-ffmpeg_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "ffmpeg")
-
 # Flask Init
 app = Flask(__name__)
 app.config['JSON_AS_ASCII'] = False
@@ -67,6 +55,21 @@ def replace_punctuation(text, i=2):
         text = text.replace(char, char * i)
     return text
 
+def wav2(i, o, format):
+    inp = avopen(i, 'rb')
+    out = avopen(o, 'wb', format=format)
+    if format == "ogg": format = "libvorbis"
+
+    ostream = out.add_stream(format)
+
+    for frame in inp.decode(audio=0):
+        for p in ostream.encode(frame): out.mux(p)
+
+    for p in ostream.encode(None): out.mux(p)
+
+    out.close()
+    inp.close()
+
 # Load Generator
 hps = utils.get_hparams_from_file("./configs/config.json")
 
@@ -98,24 +101,23 @@ def main():
             fmt = request.args.get("format", "wav")
             if None in (speaker, text):
                 return "Missing Parameter"
-            if fmt not in ("mp3", "wav"):
+            if fmt not in ("mp3", "wav", "ogg"):
                 return "Invalid Format"
         except:
             return "Invalid Parameter"
 
-
         with torch.no_grad():
             audio = infer(text, sdp_ratio=sdp_ratio, noise_scale=noise, noise_scale_w=noisew, length_scale=length, sid=speaker)
-        wav = BytesIO()
+
-        wavfile.write(wav, hps.data.sampling_rate, audio)
+        with BytesIO() as wav:
-        torch.cuda.empty_cache()
+            wavfile.write(wav, hps.data.sampling_rate, audio)
-        if fmt == "mp3":
+            torch.cuda.empty_cache()
-            process = (
+            if fmt == "wav":
-	    ffmpeg
+                return Response(wav.getvalue(), mimetype="audio/wav")
-            .input("pipe:", format='wav', channel_layout="mono")
+            wav.seek(0, 0)
-            .output("pipe:", format='mp3', audio_bitrate="320k")
+            with BytesIO() as ofp:
-            .run_async(pipe_stdin=True, pipe_stdout=True, pipe_stderr=True, cmd=ffmpeg_path)
+                wav2(wav, ofp, fmt)
-        )
+                return Response(
-            out, _ = process.communicate(input=wav.read())
+                    ofp.getvalue(),
-            return Response(out, mimetype="audio/mpeg")
+                    mimetype="audio/mpeg" if fmt == "mp3" else "audio/ogg"
-        return Response(wav.read(), mimetype="audio/wav")
+                )