迁移到gradle
This commit is contained in:
commit
3c66c078c7
42
.gitignore
vendored
Normal file
42
.gitignore
vendored
Normal file
@ -0,0 +1,42 @@
|
||||
.gradle
|
||||
build/
|
||||
!gradle/wrapper/gradle-wrapper.jar
|
||||
!**/src/main/**/build/
|
||||
!**/src/test/**/build/
|
||||
|
||||
### IntelliJ IDEA ###
|
||||
.idea/modules.xml
|
||||
.idea/jarRepositories.xml
|
||||
.idea/compiler.xml
|
||||
.idea/libraries/
|
||||
*.iws
|
||||
*.iml
|
||||
*.ipr
|
||||
out/
|
||||
!**/src/main/**/out/
|
||||
!**/src/test/**/out/
|
||||
|
||||
### Eclipse ###
|
||||
.apt_generated
|
||||
.classpath
|
||||
.factorypath
|
||||
.project
|
||||
.settings
|
||||
.springBeans
|
||||
.sts4-cache
|
||||
bin/
|
||||
!**/src/main/**/bin/
|
||||
!**/src/test/**/bin/
|
||||
|
||||
### NetBeans ###
|
||||
/nbproject/private/
|
||||
/nbbuild/
|
||||
/dist/
|
||||
/nbdist/
|
||||
/.nb-gradle/
|
||||
|
||||
### VS Code ###
|
||||
.vscode/
|
||||
|
||||
### Mac OS ###
|
||||
.DS_Store
|
8
.idea/.gitignore
generated
vendored
Normal file
8
.idea/.gitignore
generated
vendored
Normal file
@ -0,0 +1,8 @@
|
||||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
# Editor-based HTTP Client requests
|
||||
/httpRequests/
|
||||
# Datasource local storage ignored files
|
||||
/dataSources/
|
||||
/dataSources.local.xml
|
16
.idea/gradle.xml
generated
Normal file
16
.idea/gradle.xml
generated
Normal file
@ -0,0 +1,16 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="GradleSettings">
|
||||
<option name="linkedExternalProjectsSettings">
|
||||
<GradleProjectSettings>
|
||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||
<option name="gradleHome" value="" />
|
||||
<option name="modules">
|
||||
<set>
|
||||
<option value="$PROJECT_DIR$" />
|
||||
</set>
|
||||
</option>
|
||||
</GradleProjectSettings>
|
||||
</option>
|
||||
</component>
|
||||
</project>
|
3585
.idea/inspectionProfiles/Project_Default.xml
generated
Normal file
3585
.idea/inspectionProfiles/Project_Default.xml
generated
Normal file
File diff suppressed because it is too large
Load Diff
6
.idea/kotlinc.xml
generated
Normal file
6
.idea/kotlinc.xml
generated
Normal file
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="KotlinJpsPluginSettings">
|
||||
<option name="version" value="1.9.23" />
|
||||
</component>
|
||||
</project>
|
10
.idea/misc.xml
generated
Normal file
10
.idea/misc.xml
generated
Normal file
@ -0,0 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||
<component name="FrameworkDetectionExcludesConfiguration">
|
||||
<file type="web" url="file://$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-17" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/out" />
|
||||
</component>
|
||||
</project>
|
6
.idea/vcs.xml
generated
Normal file
6
.idea/vcs.xml
generated
Normal file
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
23
build.gradle.kts
Normal file
23
build.gradle.kts
Normal file
@ -0,0 +1,23 @@
|
||||
plugins {
|
||||
kotlin("jvm") version "1.9.23"
|
||||
}
|
||||
|
||||
group = "loli.ball"
|
||||
version = "1.0-SNAPSHOT"
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0-RC.2")
|
||||
implementation("io.github.jaredmdobson:concentus:1.0.2")
|
||||
testImplementation(kotlin("test"))
|
||||
}
|
||||
|
||||
tasks.test {
|
||||
useJUnitPlatform()
|
||||
}
|
||||
kotlin {
|
||||
jvmToolchain(17)
|
||||
}
|
1
gradle.properties
Normal file
1
gradle.properties
Normal file
@ -0,0 +1 @@
|
||||
kotlin.code.style=official
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
Binary file not shown.
6
gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
6
gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
@ -0,0 +1,6 @@
|
||||
#Sat Sep 07 20:30:58 CST 2024
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
234
gradlew
vendored
Normal file
234
gradlew
vendored
Normal file
@ -0,0 +1,234 @@
|
||||
#!/bin/sh
|
||||
|
||||
#
|
||||
# Copyright © 2015-2021 the original authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# https://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
# Gradle start up script for POSIX generated by Gradle.
|
||||
#
|
||||
# Important for running:
|
||||
#
|
||||
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
||||
# noncompliant, but you have some other compliant shell such as ksh or
|
||||
# bash, then to run this script, type that shell name before the whole
|
||||
# command line, like:
|
||||
#
|
||||
# ksh Gradle
|
||||
#
|
||||
# Busybox and similar reduced shells will NOT work, because this script
|
||||
# requires all of these POSIX shell features:
|
||||
# * functions;
|
||||
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
||||
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
||||
# * compound commands having a testable exit status, especially «case»;
|
||||
# * various built-in commands including «command», «set», and «ulimit».
|
||||
#
|
||||
# Important for patching:
|
||||
#
|
||||
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
||||
# by Bash, Ksh, etc; in particular arrays are avoided.
|
||||
#
|
||||
# The "traditional" practice of packing multiple parameters into a
|
||||
# space-separated string is a well documented source of bugs and security
|
||||
# problems, so this is (mostly) avoided, by progressively accumulating
|
||||
# options in "$@", and eventually passing that to Java.
|
||||
#
|
||||
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
||||
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
||||
# see the in-line comments for details.
|
||||
#
|
||||
# There are tweaks for specific operating systems such as AIX, CygWin,
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
|
||||
# Resolve links: $0 may be a link
|
||||
app_path=$0
|
||||
|
||||
# Need this for daisy-chained symlinks.
|
||||
while
|
||||
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
||||
[ -h "$app_path" ]
|
||||
do
|
||||
ls=$( ls -ld "$app_path" )
|
||||
link=${ls#*' -> '}
|
||||
case $link in #(
|
||||
/*) app_path=$link ;; #(
|
||||
*) app_path=$APP_HOME$link ;;
|
||||
esac
|
||||
done
|
||||
|
||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||
|
||||
APP_NAME="Gradle"
|
||||
APP_BASE_NAME=${0##*/}
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD=maximum
|
||||
|
||||
warn () {
|
||||
echo "$*"
|
||||
} >&2
|
||||
|
||||
die () {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
} >&2
|
||||
|
||||
# OS specific support (must be 'true' or 'false').
|
||||
cygwin=false
|
||||
msys=false
|
||||
darwin=false
|
||||
nonstop=false
|
||||
case "$( uname )" in #(
|
||||
CYGWIN* ) cygwin=true ;; #(
|
||||
Darwin* ) darwin=true ;; #(
|
||||
MSYS* | MINGW* ) msys=true ;; #(
|
||||
NONSTOP* ) nonstop=true ;;
|
||||
esac
|
||||
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD=$JAVA_HOME/jre/sh/java
|
||||
else
|
||||
JAVACMD=$JAVA_HOME/bin/java
|
||||
fi
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD=java
|
||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
case $MAX_FD in #(
|
||||
max*)
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
case $MAX_FD in #(
|
||||
'' | soft) :;; #(
|
||||
*)
|
||||
ulimit -n "$MAX_FD" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
fi
|
||||
|
||||
# Collect all arguments for the java command, stacking in reverse order:
|
||||
# * args from the command line
|
||||
# * the main class name
|
||||
# * -classpath
|
||||
# * -D...appname settings
|
||||
# * --module-path (only if needed)
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
||||
|
||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if "$cygwin" || "$msys" ; then
|
||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||
|
||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
for arg do
|
||||
if
|
||||
case $arg in #(
|
||||
-*) false ;; # don't mess with options #(
|
||||
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
||||
[ -e "$t" ] ;; #(
|
||||
*) false ;;
|
||||
esac
|
||||
then
|
||||
arg=$( cygpath --path --ignore --mixed "$arg" )
|
||||
fi
|
||||
# Roll the args list around exactly as many times as the number of
|
||||
# args, so each arg winds up back in the position where it started, but
|
||||
# possibly modified.
|
||||
#
|
||||
# NB: a `for` loop captures its iteration list before it begins, so
|
||||
# changing the positional parameters here affects neither the number of
|
||||
# iterations, nor the values presented in `arg`.
|
||||
shift # remove old arg
|
||||
set -- "$@" "$arg" # push replacement arg
|
||||
done
|
||||
fi
|
||||
|
||||
# Collect all arguments for the java command;
|
||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
||||
# shell script including quotes and variable substitutions, so put them in
|
||||
# double quotes to make sure that they get re-expanded; and
|
||||
# * put everything else in single quotes, so that it's not re-expanded.
|
||||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
-classpath "$CLASSPATH" \
|
||||
org.gradle.wrapper.GradleWrapperMain \
|
||||
"$@"
|
||||
|
||||
# Use "xargs" to parse quoted args.
|
||||
#
|
||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||
#
|
||||
# In Bash we could simply go:
|
||||
#
|
||||
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
||||
# set -- "${ARGS[@]}" "$@"
|
||||
#
|
||||
# but POSIX shell has neither arrays nor command substitution, so instead we
|
||||
# post-process each arg (as a line of input to sed) to backslash-escape any
|
||||
# character that might be a shell metacharacter, then use eval to reverse
|
||||
# that process (while maintaining the separation between arguments), and wrap
|
||||
# the whole thing up as a single "set" statement.
|
||||
#
|
||||
# This will of course break if any of these variables contains a newline or
|
||||
# an unmatched quote.
|
||||
#
|
||||
|
||||
eval "set -- $(
|
||||
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
||||
xargs -n1 |
|
||||
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
||||
tr '\n' ' '
|
||||
)" '"$@"'
|
||||
|
||||
exec "$JAVACMD" "$@"
|
89
gradlew.bat
vendored
Normal file
89
gradlew.bat
vendored
Normal file
@ -0,0 +1,89 @@
|
||||
@rem
|
||||
@rem Copyright 2015 the original author or authors.
|
||||
@rem
|
||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@rem you may not use this file except in compliance with the License.
|
||||
@rem You may obtain a copy of the License at
|
||||
@rem
|
||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
||||
@rem
|
||||
@rem Unless required by applicable law or agreed to in writing, software
|
||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%" == "" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem Gradle startup script for Windows
|
||||
@rem
|
||||
@rem ##########################################################################
|
||||
|
||||
@rem Set local scope for the variables with windows NT shell
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%" == "" set DIRNAME=.
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
||||
|
||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||
|
||||
@rem Find java.exe
|
||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if "%ERRORLEVEL%" == "0" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
:findJavaFromJavaHome
|
||||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
||||
|
||||
:fail
|
||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||
rem the _cmd.exe /c_ return code!
|
||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||
exit /b 1
|
||||
|
||||
:mainEnd
|
||||
if "%OS%"=="Windows_NT" endlocal
|
||||
|
||||
:omega
|
5
settings.gradle.kts
Normal file
5
settings.gradle.kts
Normal file
@ -0,0 +1,5 @@
|
||||
plugins {
|
||||
id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
|
||||
}
|
||||
rootProject.name = "VoiceChat2"
|
||||
|
75
src/main/kotlin/AudioConvert.kt
Normal file
75
src/main/kotlin/AudioConvert.kt
Normal file
@ -0,0 +1,75 @@
|
||||
import javax.sound.sampled.AudioFormat
|
||||
import kotlin.math.max
|
||||
import kotlin.math.min
|
||||
|
||||
object AudioConvert {
|
||||
fun getAudioFormat(sampleRate: Int, channels: Int): AudioFormat {
|
||||
return AudioFormat(
|
||||
AudioFormat.Encoding.PCM_SIGNED,
|
||||
sampleRate.toFloat(),
|
||||
16,
|
||||
channels,
|
||||
channels * 2,
|
||||
sampleRate.toFloat(),
|
||||
false
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* 将 float[] 转换为 short 的 byte[]。
|
||||
*
|
||||
* @param input 输入的 float[] 数据
|
||||
* @param output 转换后的 byte[] 数据
|
||||
*/
|
||||
fun convertFloatToShortByte(input: FloatArray, output: ByteArray) {
|
||||
require(input.size * 2 == output.size) { "output byte array length must be twice the length of the input float array." }
|
||||
|
||||
for (i in input.indices) {
|
||||
// 将 float 值限制在 -1.0 到 1.0 之间
|
||||
val sample = min(max(input[i].toDouble(), -1.0), 1.0).toFloat()
|
||||
|
||||
// 将 float 值转换为 short
|
||||
val shortSample = (sample * 32767).toInt().toShort()
|
||||
|
||||
// 将 short 值转换为两个字节,并存储在 lineBuffer 中
|
||||
output[i * 2] = (shortSample.toInt() and 0xFF).toByte() // 低位字节
|
||||
output[i * 2 + 1] = ((shortSample.toInt() shr 8) and 0xFF).toByte() // 高位字节
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 将 short 的 byte[] 转换为 float[]。
|
||||
*
|
||||
* @param input 输入的 byte[] 数据(每两个字节表示一个 short)
|
||||
* @param output 转换后的 float[] 数据
|
||||
*/
|
||||
fun convertShortByteToFloat(input: ByteArray, output: FloatArray) {
|
||||
require(input.size == output.size * 2) { "Input byte array length must be twice the length of the output float array." }
|
||||
|
||||
for (i in output.indices) {
|
||||
// 将两个字节转换为 short
|
||||
val low = input[i * 2].toInt() and 0xFF
|
||||
val high = input[i * 2 + 1].toInt() and 0xFF
|
||||
val shortSample = ((high shl 8) or low).toShort()
|
||||
|
||||
// 将 short 值转换为 float
|
||||
output[i] = shortSample / 32768.0f
|
||||
}
|
||||
}
|
||||
|
||||
fun bytes2shorts(input: ByteArray, output: ShortArray) {
|
||||
for (c in output.indices) {
|
||||
val low = input[(c * 2)].toInt() and 0xFF
|
||||
val high = input[(c * 2) + 1].toInt() shl 8
|
||||
output[c] = (low or high).toShort()
|
||||
}
|
||||
}
|
||||
|
||||
fun shorts2bytes(input: ShortArray, output: ByteArray) {
|
||||
for (c in input.indices) {
|
||||
output[c * 2] = (input[c].toInt() and 0xFF).toByte()
|
||||
output[c * 2 + 1] = ((input[c].toInt() shr 8) and 0xFF).toByte()
|
||||
}
|
||||
}
|
||||
|
||||
}
|
93
src/main/kotlin/Client.kt
Normal file
93
src/main/kotlin/Client.kt
Normal file
@ -0,0 +1,93 @@
|
||||
import io.github.jaredmdobson.concentus.OpusApplication
|
||||
import io.github.jaredmdobson.concentus.OpusDecoder
|
||||
import io.github.jaredmdobson.concentus.OpusEncoder
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlinx.coroutines.runBlocking
|
||||
import java.io.IOException
|
||||
import java.io.ObjectInputStream
|
||||
import java.io.ObjectOutputStream
|
||||
import java.io.Serializable
|
||||
import java.net.InetSocketAddress
|
||||
import java.net.Socket
|
||||
import javax.sound.sampled.AudioSystem
|
||||
import kotlin.system.measureTimeMillis
|
||||
|
||||
class Client {
|
||||
companion object {
|
||||
@JvmStatic
|
||||
fun main(args: Array<String>) {
|
||||
Client().mainClient()
|
||||
}
|
||||
}
|
||||
|
||||
val bufferOut = ByteArray(BUFFER_SIZE)
|
||||
val targetDataLine = AudioSystem.getTargetDataLine(AUDIO_FORMAT).also {
|
||||
it.open(AUDIO_FORMAT, bufferOut.size)
|
||||
it.start()
|
||||
}
|
||||
|
||||
val bufferIn = ByteArray(BUFFER_SIZE)
|
||||
val sourceDataLine = AudioSystem.getSourceDataLine(AUDIO_FORMAT).also {
|
||||
it.open(AUDIO_FORMAT, bufferIn.size)
|
||||
it.start()
|
||||
}
|
||||
|
||||
val decoder = OpusDecoder(SAMPLE_RATE, CHANNELS)
|
||||
val encoder = OpusEncoder(SAMPLE_RATE, CHANNELS, OpusApplication.OPUS_APPLICATION_AUDIO).also {
|
||||
it.bitrate = OPUS_BITRATE
|
||||
it.forceMode = OPUS_MODE
|
||||
it.signalType = OPUS_SIGNAL_TYPE
|
||||
it.complexity = OPUS_COMPLEXITY
|
||||
}
|
||||
|
||||
fun mainClient() {
|
||||
val socket = Socket()
|
||||
val scope = CoroutineScope(Dispatchers.IO)
|
||||
|
||||
val t = measureTimeMillis {
|
||||
socket.connect(InetSocketAddress(SERVER_HOST, SERVER_PORT))
|
||||
}
|
||||
"connect time $t".loge()
|
||||
|
||||
val out = ObjectOutputStream(socket.getOutputStream())
|
||||
val inp = ObjectInputStream(socket.getInputStream())
|
||||
|
||||
val recordJob = scope.launch {
|
||||
while (true) {
|
||||
targetDataLine.read(bufferOut, 0, bufferOut.size)
|
||||
try {
|
||||
out.writeObject(encoder.encode(bufferOut))
|
||||
out.flush()
|
||||
} catch (e: Exception) {
|
||||
e.printStackTrace()
|
||||
System.exit(0)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
val playJob = scope.launch {
|
||||
while (true) {
|
||||
try {
|
||||
// if (`in`!!.available() > bufferIn.size * 2) {
|
||||
// `in`!!.skip(`in`!!.available().toLong() - bufferIn.size)
|
||||
// println("丢弃")
|
||||
// }
|
||||
// `in`!!.read(bufferIn, 0, bufferIn.size)
|
||||
val dataPack = inp.readObject() as DataPack
|
||||
decoder.decode(dataPack, bufferIn)
|
||||
sourceDataLine.write(bufferIn, 0, bufferIn.size)
|
||||
} catch (e: IOException) {
|
||||
e.printStackTrace()
|
||||
System.exit(0)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
runBlocking {
|
||||
recordJob.join()
|
||||
playJob.join()
|
||||
}
|
||||
}
|
||||
}
|
10
src/main/kotlin/DataPack.kt
Normal file
10
src/main/kotlin/DataPack.kt
Normal file
@ -0,0 +1,10 @@
|
||||
import java.io.Serializable
|
||||
|
||||
/**
|
||||
* Created by LoliBall on 2024/8/31 23:02.
|
||||
* https://github.com/WhichWho
|
||||
*/
|
||||
data class DataPack(
|
||||
val timestamp: Long,
|
||||
val opus: ByteArray,
|
||||
) : Serializable
|
80
src/main/kotlin/Main.kt
Normal file
80
src/main/kotlin/Main.kt
Normal file
@ -0,0 +1,80 @@
|
||||
import io.github.jaredmdobson.concentus.*
|
||||
import kotlinx.coroutines.*
|
||||
import java.util.concurrent.atomic.AtomicInteger
|
||||
import javax.print.Doc
|
||||
import kotlin.concurrent.fixedRateTimer
|
||||
|
||||
/**
|
||||
* Created by LoliBall on 2024/8/31 5:26.
|
||||
* https://github.com/WhichWho
|
||||
*/
|
||||
|
||||
//val SERVER_HOST = "zedo.top"
|
||||
val SERVER_HOST = "127.0.0.1"
|
||||
val SERVER_PORT = 7860
|
||||
val ECHO_CANCELLATION = false // 回声消除
|
||||
val RAW_PCM_PASS = false // 不进行opus压缩pcm直传
|
||||
|
||||
// 2.5, 5, 10, 20, 40, 60 ms
|
||||
// 120, 240, 480, 960, 1920, 2880
|
||||
val PACKET_SAMPLES = 2880 // 48000Hz * 60ms = 2880
|
||||
val SAMPLE_RATE = 48000 // 8000、12000、16000、24000、48000
|
||||
val CHANNELS = 1
|
||||
val BUFFER_SIZE = PACKET_SAMPLES * CHANNELS * 2 // * 2是short | 48000Hz * 2(short) * 60ms = 5760B
|
||||
val AUDIO_FORMAT = AudioConvert.getAudioFormat(SAMPLE_RATE, CHANNELS)
|
||||
|
||||
val OPUS_BITRATE = OpusConstants.OPUS_AUTO // 500 - 300000
|
||||
val OPUS_COMPLEXITY = 10 // 0: 快,质量差 10: 慢,质量好
|
||||
val OPUS_SIGNAL_TYPE = OpusSignal.OPUS_SIGNAL_VOICE
|
||||
val OPUS_MODE = OpusMode.MODE_HYBRID
|
||||
|
||||
|
||||
// 下面是统计用的
|
||||
val compressRateOpus = AtomicInteger()
|
||||
val compressRatePcm = AtomicInteger()
|
||||
|
||||
fun main(args: Array<String>) {
|
||||
val scope = CoroutineScope(Dispatchers.IO)
|
||||
scope.launch {
|
||||
Server.main(emptyArray())
|
||||
}
|
||||
scope.launch {
|
||||
delay(1000) // 等服务器起来
|
||||
Client.main(emptyArray())
|
||||
}
|
||||
fixedRateTimer(period = 1000) {
|
||||
"compress rate: %.2f%%".format(compressRateOpus.get() * 100f / compressRatePcm.get()).loge()
|
||||
compressRateOpus.set(0)
|
||||
compressRatePcm.set(0)
|
||||
}
|
||||
}
|
||||
|
||||
val encodeOpusBuffer = mutableMapOf<OpusEncoder, ByteArray>()
|
||||
val encodePcmShortBuffer = mutableMapOf<OpusEncoder, ShortArray>()
|
||||
|
||||
// 1275是opus单帧包最大值
|
||||
fun OpusEncoder.encode(pcm: ByteArray): DataPack {
|
||||
if (RAW_PCM_PASS) {
|
||||
return DataPack(System.currentTimeMillis(), pcm.copyOf())
|
||||
}
|
||||
val opusBuffer = encodeOpusBuffer[this] ?: ByteArray(1275).also { encodeOpusBuffer[this] = it }
|
||||
val shortBuffer = encodePcmShortBuffer[this] ?: ShortArray(pcm.size / 2).also { encodePcmShortBuffer[this] = it }
|
||||
AudioConvert.bytes2shorts(pcm, shortBuffer)
|
||||
val bytesEncoded = encode(shortBuffer, 0, PACKET_SAMPLES, opusBuffer, 0, opusBuffer.size)
|
||||
compressRatePcm.addAndGet(pcm.size)
|
||||
compressRateOpus.addAndGet(bytesEncoded)
|
||||
return DataPack(System.currentTimeMillis(), opusBuffer.sliceArray(0..<bytesEncoded))
|
||||
}
|
||||
|
||||
val decodePcmShortBuffer = mutableMapOf<OpusDecoder, ShortArray>()
|
||||
fun OpusDecoder.decode(pack: DataPack, pcm: ByteArray) {
|
||||
if (RAW_PCM_PASS) {
|
||||
pack.opus.copyInto(pcm)
|
||||
return
|
||||
}
|
||||
val shortBuffer = decodePcmShortBuffer[this] ?: ShortArray(pcm.size / 2).also { decodePcmShortBuffer[this] = it }
|
||||
decode(pack.opus, 0, pack.opus.size, shortBuffer, 0, PACKET_SAMPLES, false)
|
||||
AudioConvert.shorts2bytes(shortBuffer, pcm)
|
||||
}
|
||||
|
||||
fun <T> T.loge() = also { println(this) }
|
111
src/main/kotlin/Server.kt
Normal file
111
src/main/kotlin/Server.kt
Normal file
@ -0,0 +1,111 @@
|
||||
import io.github.jaredmdobson.concentus.OpusApplication
|
||||
import io.github.jaredmdobson.concentus.OpusDecoder
|
||||
import io.github.jaredmdobson.concentus.OpusEncoder
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.launch
|
||||
import java.io.IOException
|
||||
import java.io.ObjectInputStream
|
||||
import java.io.ObjectOutputStream
|
||||
import java.net.ServerSocket
|
||||
import java.net.Socket
|
||||
import java.util.*
|
||||
import java.util.concurrent.CopyOnWriteArrayList
|
||||
|
||||
val clientAudios = CopyOnWriteArrayList<ClientAudio>()
|
||||
|
||||
object Server {
|
||||
|
||||
@JvmStatic
|
||||
fun main(args: Array<String>) {
|
||||
mainServer()
|
||||
}
|
||||
|
||||
fun mainServer() {
|
||||
|
||||
val scope = CoroutineScope(Dispatchers.IO)
|
||||
scope.launch {
|
||||
while (true) {
|
||||
for (client in clientAudios) {
|
||||
if (!client.isConnected) {
|
||||
clientAudios -= client
|
||||
continue
|
||||
}
|
||||
client.read()
|
||||
}
|
||||
|
||||
for (client in clientAudios) {
|
||||
launch {
|
||||
for (audio in clientAudios) {
|
||||
if (audio != client || !ECHO_CANCELLATION) {
|
||||
client.mix(audio.sample)
|
||||
}
|
||||
}
|
||||
client.send()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
val sever = ServerSocket(SERVER_PORT)
|
||||
while (true) {
|
||||
val socket = sever.accept()
|
||||
println("Accepted connection from " + socket.remoteSocketAddress)
|
||||
clientAudios += ClientAudio(socket)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
class ClientAudio(val socket: Socket) {
|
||||
|
||||
val inp = ObjectInputStream(socket.getInputStream())
|
||||
val out = ObjectOutputStream(socket.getOutputStream())
|
||||
val buffer = ByteArray(BUFFER_SIZE)
|
||||
val sample = FloatArray(PACKET_SAMPLES)
|
||||
val mixSample = FloatArray(PACKET_SAMPLES)
|
||||
val mixBuffer = ByteArray(BUFFER_SIZE)
|
||||
|
||||
val decoder = OpusDecoder(SAMPLE_RATE, CHANNELS)
|
||||
val encoder = OpusEncoder(SAMPLE_RATE, CHANNELS, OpusApplication.OPUS_APPLICATION_AUDIO).also {
|
||||
it.bitrate = OPUS_BITRATE
|
||||
it.forceMode = OPUS_MODE
|
||||
it.signalType = OPUS_SIGNAL_TYPE
|
||||
it.complexity = OPUS_COMPLEXITY
|
||||
}
|
||||
|
||||
var isConnected = true
|
||||
|
||||
fun send() {
|
||||
try {
|
||||
AudioConvert.convertFloatToShortByte(mixSample, mixBuffer)
|
||||
out.writeObject(encoder.encode(mixBuffer))
|
||||
out.flush()
|
||||
} catch (e: IOException) {
|
||||
isConnected = false
|
||||
}
|
||||
}
|
||||
|
||||
fun read() {
|
||||
try {
|
||||
// if (`in`!!.available() > bufferIn.size * 2) {
|
||||
// `in`!!.skip(`in`!!.available().toLong() - bufferIn.size)
|
||||
// println("丢弃")
|
||||
// }
|
||||
// `in`.read(buffer)
|
||||
val pack = inp.readObject() as DataPack
|
||||
// println("延迟: ${System.currentTimeMillis() - timestamp}ms")
|
||||
decoder.decode(pack, buffer)
|
||||
AudioConvert.convertShortByteToFloat(buffer, sample)
|
||||
Arrays.fill(mixSample, 0f)
|
||||
} catch (e: IOException) {
|
||||
isConnected = false
|
||||
}
|
||||
}
|
||||
|
||||
fun mix(sample: FloatArray) {
|
||||
for (i in sample.indices) {
|
||||
mixSample[i] += sample[i]
|
||||
}
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user