jacob.eva/openCom-Companion
1
0
Fork 0
mirror of https://github.com/liberatedsystems/openCom-Companion.git synced 2024-10-26 02:50:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Detect codec2 shared libs and display message if not available

Browse Source
This commit is contained in:
Mark Qvist 2024-06-04 16:18:32 +02:00
parent fb725ea4de
commit 288bebb787
2 changed files with 48 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
sbapp/main.py
View File

@ -1520,6 +1520,23 @@ class SidebandApp(MDApp):
ok_button.bind(on_release=ate_dialog.dismiss) ok_button.bind(on_release=ate_dialog.dismiss)
ate_dialog.open() ate_dialog.open()
def display_codec2_error(self):
if self.compat_error_dialog == None:
def cb(sender):
self.compat_error_dialog.dismiss()
self.compat_error_dialog = MDDialog(
title="Could not load Codec2",
text="The Codec2 library could not be loaded. This likely means that you do not have the [b]codec2[/b] package or shared library installed on your system.\n\nThis library is normally installed automatically when Sideband is installed, but on some systems, this is not possible.\n\nTry installing it with a command such as [b]pamac install codec2[/b] or [b]apt install codec2[/b], or by compiling it from source for this system.",
buttons=[
MDRectangleFlatButton(
text="OK",
font_size=dp(18),
on_release=cb
)
],
)
self.compat_error_dialog.open()
def play_audio_field(self, audio_field): def play_audio_field(self, audio_field):
if RNS.vendor.platformutils.is_darwin(): if RNS.vendor.platformutils.is_darwin():
if self.compat_error_dialog == None: if self.compat_error_dialog == None:
@ -1569,16 +1586,20 @@ class SidebandApp(MDApp):
elif audio_field[0] >= LXMF.AM_CODEC2_700C and audio_field[0] <= LXMF.AM_CODEC2_3200: elif audio_field[0] >= LXMF.AM_CODEC2_700C and audio_field[0] <= LXMF.AM_CODEC2_3200:
temp_path = self.sideband.rec_cache+"/msg.ogg" temp_path = self.sideband.rec_cache+"/msg.ogg"
from sideband.audioproc import samples_to_ogg, decode_codec2 from sideband.audioproc import samples_to_ogg, decode_codec2, detect_codec2
target_rate = 8000 target_rate = 8000
if RNS.vendor.platformutils.is_linux(): if RNS.vendor.platformutils.is_linux():
target_rate = 48000 target_rate = 48000
if samples_to_ogg(decode_codec2(audio_field[1], audio_field[0]), temp_path, input_rate=8000, output_rate=target_rate): if detect_codec2():
RNS.log("Wrote OGG file to: "+temp_path, RNS.LOG_DEBUG) if samples_to_ogg(decode_codec2(audio_field[1], audio_field[0]), temp_path, input_rate=8000, output_rate=target_rate):
RNS.log("Wrote OGG file to: "+temp_path, RNS.LOG_DEBUG)
else:
RNS.log("OGG write failed", RNS.LOG_DEBUG)
else: else:
RNS.log("OGG write failed", RNS.LOG_DEBUG) self.display_codec2_error()
return
else: else:
raise NotImplementedError(audio_field[0]) raise NotImplementedError(audio_field[0])
@ -1681,17 +1702,21 @@ class SidebandApp(MDApp):
audio = audio.set_sample_width(2) audio = audio.set_sample_width(2)
samples = audio.get_array_of_samples() samples = audio.get_array_of_samples()
from sideband.audioproc import encode_codec2 from sideband.audioproc import encode_codec2, detect_codec2
encoded = encode_codec2(samples, self.audio_msg_mode) if detect_codec2():
encoded = encode_codec2(samples, self.audio_msg_mode)
ap_duration = time.time() - ap_start ap_duration = time.time() - ap_start
RNS.log("Audio processing complete in "+RNS.prettytime(ap_duration), RNS.LOG_DEBUG) RNS.log("Audio processing complete in "+RNS.prettytime(ap_duration), RNS.LOG_DEBUG)
export_path = self.sideband.rec_cache+"/recording.enc" export_path = self.sideband.rec_cache+"/recording.enc"
with open(export_path, "wb") as export_file: with open(export_path, "wb") as export_file:
export_file.write(encoded) export_file.write(encoded)
self.attach_path = export_path self.attach_path = export_path
os.unlink(self.msg_audio._file_path) os.unlink(self.msg_audio._file_path)
else:
self.display_codec2_error()
return
self.update_message_widgets() self.update_message_widgets()
toast("Added recorded audio to message") toast("Added recorded audio to message")

10
sbapp/sideband/audioproc.py
View File

@ -99,6 +99,16 @@ def samples_to_wav(samples=None, file_path=None):
wf.writeframes(samples) wf.writeframes(samples)
return True return True
def detect_codec2():
try:
import pycodec2
return True
except Exception as e:
RNS.log("Could not import codec2 module, libcodec2 is probably not installed or available", RNS.LOG_ERROR)
RNS.trace_exception(e)
return False
# Samples must be 8KHz, 16-bit, 1 channel # Samples must be 8KHz, 16-bit, 1 channel
def encode_codec2(samples, mode): def encode_codec2(samples, mode):
ap_start = time.time() ap_start = time.time()