Compare commits
44 Commits
Author | SHA1 | Date | |
---|---|---|---|
4cf2419e6c | |||
440abac9f8 | |||
732714349e | |||
016262514d | |||
326749498b | |||
fec8291c17 | |||
c5d9e67cb2 | |||
e5261228d7 | |||
e61c09bc85 | |||
ac2444f908 | |||
9c6071a645 | |||
fa32ef9275 | |||
7805d27e67 | |||
6c515e1822 | |||
8a363b5df2 | |||
2b5abac809 | |||
c19c8bbade | |||
1c7a90ef35 | |||
3b46bb73f7 | |||
2457cfc911 | |||
515fc32b21 | |||
0684b00b3c | |||
02b5c7ea89 | |||
801b71a128 | |||
12c5f6ee89 | |||
79a1314ee4 | |||
e9848339dd | |||
6e28a4dd13 | |||
7c989f88bd | |||
16fa983704 | |||
40daca5684 | |||
981e0c082d | |||
cebfa54467 | |||
fc20d9b925 | |||
0a75b73fa4 | |||
46b7c905f5 | |||
40f2bd37e3 | |||
9288ffd26d | |||
2cdc82cb91 | |||
6aa8d71588 | |||
9becbd7d72 | |||
e055217292 | |||
fbaf62c230 | |||
b186ec9fc5 |
8
.github/assign/audio.yml
vendored
8
.github/assign/audio.yml
vendored
@ -1,8 +0,0 @@
|
|||||||
addReviewers: true
|
|
||||||
|
|
||||||
reviewers:
|
|
||||||
- marysaka
|
|
||||||
|
|
||||||
filterLabels:
|
|
||||||
include:
|
|
||||||
- audio
|
|
11
.github/assign/cpu.yml
vendored
11
.github/assign/cpu.yml
vendored
@ -1,11 +0,0 @@
|
|||||||
addReviewers: true
|
|
||||||
|
|
||||||
reviewers:
|
|
||||||
- gdkchan
|
|
||||||
- riperiperi
|
|
||||||
- marysaka
|
|
||||||
- LDj3SNuD
|
|
||||||
|
|
||||||
filterLabels:
|
|
||||||
include:
|
|
||||||
- cpu
|
|
4
.github/assign/global.yml
vendored
4
.github/assign/global.yml
vendored
@ -1,4 +0,0 @@
|
|||||||
addReviewers: true
|
|
||||||
|
|
||||||
reviewers:
|
|
||||||
- Ryujinx/developers
|
|
10
.github/assign/gpu.yml
vendored
10
.github/assign/gpu.yml
vendored
@ -1,10 +0,0 @@
|
|||||||
addReviewers: true
|
|
||||||
|
|
||||||
reviewers:
|
|
||||||
- gdkchan
|
|
||||||
- riperiperi
|
|
||||||
- marysaka
|
|
||||||
|
|
||||||
filterLabels:
|
|
||||||
include:
|
|
||||||
- gpu
|
|
11
.github/assign/gui.yml
vendored
11
.github/assign/gui.yml
vendored
@ -1,11 +0,0 @@
|
|||||||
addReviewers: true
|
|
||||||
|
|
||||||
reviewers:
|
|
||||||
- Ack77
|
|
||||||
- emmauss
|
|
||||||
- TSRBerry
|
|
||||||
- marysaka
|
|
||||||
|
|
||||||
filterLabels:
|
|
||||||
include:
|
|
||||||
- gui
|
|
11
.github/assign/horizon.yml
vendored
11
.github/assign/horizon.yml
vendored
@ -1,11 +0,0 @@
|
|||||||
addReviewers: true
|
|
||||||
|
|
||||||
reviewers:
|
|
||||||
- gdkchan
|
|
||||||
- Ack77
|
|
||||||
- marysaka
|
|
||||||
- TSRBerry
|
|
||||||
|
|
||||||
filterLabels:
|
|
||||||
include:
|
|
||||||
- horizon
|
|
9
.github/assign/infra.yml
vendored
9
.github/assign/infra.yml
vendored
@ -1,9 +0,0 @@
|
|||||||
addReviewers: true
|
|
||||||
|
|
||||||
reviewers:
|
|
||||||
- marysaka
|
|
||||||
- TSRBerry
|
|
||||||
|
|
||||||
filterLabels:
|
|
||||||
include:
|
|
||||||
- infra
|
|
32
.github/reviewers.yml
vendored
Normal file
32
.github/reviewers.yml
vendored
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
audio:
|
||||||
|
- marysaka
|
||||||
|
|
||||||
|
cpu:
|
||||||
|
- gdkchan
|
||||||
|
- riperiperi
|
||||||
|
- marysaka
|
||||||
|
- LDj3SNuD
|
||||||
|
|
||||||
|
gpu:
|
||||||
|
- gdkchan
|
||||||
|
- riperiperi
|
||||||
|
- marysaka
|
||||||
|
|
||||||
|
gui:
|
||||||
|
- Ack77
|
||||||
|
- emmauss
|
||||||
|
- TSRBerry
|
||||||
|
- marysaka
|
||||||
|
|
||||||
|
horizon:
|
||||||
|
- gdkchan
|
||||||
|
- Ack77
|
||||||
|
- marysaka
|
||||||
|
- TSRBerry
|
||||||
|
|
||||||
|
infra:
|
||||||
|
- marysaka
|
||||||
|
- TSRBerry
|
||||||
|
|
||||||
|
default:
|
||||||
|
- marysaka
|
79
.github/update_reviewers.py
vendored
Normal file
79
.github/update_reviewers.py
vendored
Normal file
@ -0,0 +1,79 @@
|
|||||||
|
from pathlib import Path
|
||||||
|
from typing import List, Set
|
||||||
|
from github import Github
|
||||||
|
from github.Repository import Repository
|
||||||
|
from github.GithubException import GithubException
|
||||||
|
|
||||||
|
import sys
|
||||||
|
import yaml
|
||||||
|
|
||||||
|
|
||||||
|
def add_reviewers(
|
||||||
|
reviewers: Set[str], team_reviewers: Set[str], new_entries: List[str]
|
||||||
|
):
|
||||||
|
for reviewer in new_entries:
|
||||||
|
if reviewer.startswith("@"):
|
||||||
|
team_reviewers.add(reviewer[1:])
|
||||||
|
else:
|
||||||
|
reviewers.add(reviewer)
|
||||||
|
|
||||||
|
|
||||||
|
def update_reviewers(config, repo: Repository, pr_id: int) -> int:
|
||||||
|
pull_request = repo.get_pull(pr_id)
|
||||||
|
|
||||||
|
if not pull_request:
|
||||||
|
sys.stderr.writable(f"Unknown PR #{pr_id}\n")
|
||||||
|
return 1
|
||||||
|
|
||||||
|
pull_request_author = pull_request.user.login
|
||||||
|
reviewers = set()
|
||||||
|
team_reviewers = set()
|
||||||
|
|
||||||
|
for label in pull_request.labels:
|
||||||
|
if label.name in config:
|
||||||
|
add_reviewers(reviewers, team_reviewers, config[label.name])
|
||||||
|
|
||||||
|
if "default" in config:
|
||||||
|
add_reviewers(reviewers, team_reviewers, config["default"])
|
||||||
|
|
||||||
|
if pull_request_author in reviewers:
|
||||||
|
reviewers.remove(pull_request_author)
|
||||||
|
|
||||||
|
try:
|
||||||
|
reviewers = list(reviewers)
|
||||||
|
team_reviewers = list(team_reviewers)
|
||||||
|
print(
|
||||||
|
f"Attempting to assign reviewers ({reviewers}) and team_reviewers ({team_reviewers})"
|
||||||
|
)
|
||||||
|
pull_request.create_review_request(reviewers, team_reviewers)
|
||||||
|
return 0
|
||||||
|
except GithubException as e:
|
||||||
|
sys.stderr.write(f"Cannot assign review request for PR #{pr_id}: {e}\n")
|
||||||
|
return 1
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
if len(sys.argv) != 5:
|
||||||
|
sys.stderr.write("usage: <token> <repo_path> <pr_id> <config_path>\n")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
token = sys.argv[1]
|
||||||
|
repo_path = sys.argv[2]
|
||||||
|
pr_id = int(sys.argv[3])
|
||||||
|
config_path = Path(sys.argv[4])
|
||||||
|
|
||||||
|
g = Github(token)
|
||||||
|
repo = g.get_repo(repo_path)
|
||||||
|
|
||||||
|
if not repo:
|
||||||
|
sys.stderr.write("Repository not found!\n")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
if not config_path.exists():
|
||||||
|
sys.stderr.write(f'Config "{config_path}" not found!\n')
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
with open(config_path, "r") as f:
|
||||||
|
config = yaml.safe_load(f)
|
||||||
|
|
||||||
|
sys.exit(update_reviewers(config, repo, pr_id))
|
48
.github/workflows/pr_triage.yml
vendored
48
.github/workflows/pr_triage.yml
vendored
@ -12,43 +12,23 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
# Grab sources to get update_reviewers.py and reviewers.yml
|
||||||
|
- name: Fetch sources
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
with:
|
||||||
|
# Ensure we pin the source origin as pull_request_target run under forks.
|
||||||
|
fetch-depth: 0
|
||||||
|
repository: Ryujinx/Ryujinx
|
||||||
|
ref: master
|
||||||
|
|
||||||
- name: Update labels based on changes
|
- name: Update labels based on changes
|
||||||
uses: actions/labeler@v4
|
uses: actions/labeler@v4
|
||||||
with:
|
with:
|
||||||
sync-labels: true
|
sync-labels: true
|
||||||
dot: true
|
dot: true
|
||||||
|
|
||||||
- name: Auto Assign [Audio]
|
- name: Assign reviewers
|
||||||
uses: kentaro-m/auto-assign-action@v1.2.5
|
run: |
|
||||||
with:
|
pip3 install PyGithub
|
||||||
configuration-path: '.github/assign/audio.yml'
|
python3 .github/update_reviewers.py ${{ secrets.GITHUB_TOKEN }} ${{ github.repository }} ${{ github.event.pull_request.number }} .github/reviewers.yml
|
||||||
|
shell: bash
|
||||||
- name: Auto Assign [CPU]
|
|
||||||
uses: kentaro-m/auto-assign-action@v1.2.5
|
|
||||||
with:
|
|
||||||
configuration-path: '.github/assign/cpu.yml'
|
|
||||||
|
|
||||||
- name: Auto Assign [GPU]
|
|
||||||
uses: kentaro-m/auto-assign-action@v1.2.5
|
|
||||||
with:
|
|
||||||
configuration-path: '.github/assign/gpu.yml'
|
|
||||||
|
|
||||||
- name: Auto Assign [GUI]
|
|
||||||
uses: kentaro-m/auto-assign-action@v1.2.5
|
|
||||||
with:
|
|
||||||
configuration-path: '.github/assign/gui.yml'
|
|
||||||
|
|
||||||
- name: Auto Assign [Horizon]
|
|
||||||
uses: kentaro-m/auto-assign-action@v1.2.5
|
|
||||||
with:
|
|
||||||
configuration-path: '.github/assign/horizon.yml'
|
|
||||||
|
|
||||||
- name: Auto Assign [Infra]
|
|
||||||
uses: kentaro-m/auto-assign-action@v1.2.5
|
|
||||||
with:
|
|
||||||
configuration-path: '.github/assign/infra.yml'
|
|
||||||
|
|
||||||
- name: Auto Assign [Global]
|
|
||||||
uses: kentaro-m/auto-assign-action@v1.2.5
|
|
||||||
with:
|
|
||||||
configuration-path: '.github/assign/global.yml'
|
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
<PackageVersion Include="LibHac" Version="0.18.0" />
|
<PackageVersion Include="LibHac" Version="0.18.0" />
|
||||||
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
|
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
|
||||||
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
|
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
|
||||||
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
|
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
|
||||||
<PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
|
<PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
|
||||||
<PackageVersion Include="MsgPack.Cli" Version="1.0.1" />
|
<PackageVersion Include="MsgPack.Cli" Version="1.0.1" />
|
||||||
<PackageVersion Include="NUnit" Version="3.13.3" />
|
<PackageVersion Include="NUnit" Version="3.13.3" />
|
||||||
@ -34,7 +34,7 @@
|
|||||||
<PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.1-build13" />
|
<PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.1-build13" />
|
||||||
<PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
|
<PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
|
||||||
<PackageVersion Include="Ryujinx.GtkSharp" Version="3.24.24.59-ryujinx" />
|
<PackageVersion Include="Ryujinx.GtkSharp" Version="3.24.24.59-ryujinx" />
|
||||||
<PackageVersion Include="Ryujinx.SDL2-CS" Version="2.26.3-build25" />
|
<PackageVersion Include="Ryujinx.SDL2-CS" Version="2.28.1-build28" />
|
||||||
<PackageVersion Include="shaderc.net" Version="0.1.0" />
|
<PackageVersion Include="shaderc.net" Version="0.1.0" />
|
||||||
<PackageVersion Include="SharpZipLib" Version="1.4.2" />
|
<PackageVersion Include="SharpZipLib" Version="1.4.2" />
|
||||||
<PackageVersion Include="Silk.NET.Vulkan" Version="2.16.0" />
|
<PackageVersion Include="Silk.NET.Vulkan" Version="2.16.0" />
|
||||||
|
@ -35,12 +35,12 @@ EXECUTABLE_SUB_PATH=Contents/MacOS/Ryujinx
|
|||||||
rm -rf "$TEMP_DIRECTORY"
|
rm -rf "$TEMP_DIRECTORY"
|
||||||
mkdir -p "$TEMP_DIRECTORY"
|
mkdir -p "$TEMP_DIRECTORY"
|
||||||
|
|
||||||
DOTNET_COMMON_ARGS="-p:DebugType=embedded -p:Version=$VERSION -p:SourceRevisionId=$SOURCE_REVISION_ID --self-contained true $EXTRA_ARGS"
|
DOTNET_COMMON_ARGS=(-p:DebugType=embedded -p:Version="$VERSION" -p:SourceRevisionId="$SOURCE_REVISION_ID" --self-contained true $EXTRA_ARGS)
|
||||||
|
|
||||||
dotnet restore
|
dotnet restore
|
||||||
dotnet build -c $CONFIGURATION src/Ryujinx.Ava
|
dotnet build -c "$CONFIGURATION" src/Ryujinx.Ava
|
||||||
dotnet publish -c $CONFIGURATION -r osx-arm64 -o "$TEMP_DIRECTORY/publish_arm64" $DOTNET_COMMON_ARGS src/Ryujinx.Ava
|
dotnet publish -c "$CONFIGURATION" -r osx-arm64 -o "$TEMP_DIRECTORY/publish_arm64" "${DOTNET_COMMON_ARGS[@]}" src/Ryujinx.Ava
|
||||||
dotnet publish -c $CONFIGURATION -r osx-x64 -o "$TEMP_DIRECTORY/publish_x64" $DOTNET_COMMON_ARGS src/Ryujinx.Ava
|
dotnet publish -c "$CONFIGURATION" -r osx-x64 -o "$TEMP_DIRECTORY/publish_x64" "${DOTNET_COMMON_ARGS[@]}" src/Ryujinx.Ava
|
||||||
|
|
||||||
# Get rid of the support library for ARMeilleure for x64 (that's only for arm64)
|
# Get rid of the support library for ARMeilleure for x64 (that's only for arm64)
|
||||||
rm -rf "$TEMP_DIRECTORY/publish_x64/libarmeilleure-jitsupport.dylib"
|
rm -rf "$TEMP_DIRECTORY/publish_x64/libarmeilleure-jitsupport.dylib"
|
||||||
@ -104,10 +104,10 @@ fi
|
|||||||
|
|
||||||
echo "Creating archive"
|
echo "Creating archive"
|
||||||
pushd "$OUTPUT_DIRECTORY"
|
pushd "$OUTPUT_DIRECTORY"
|
||||||
tar --exclude "Ryujinx.app/Contents/MacOS/Ryujinx" -cvf $RELEASE_TAR_FILE_NAME Ryujinx.app 1> /dev/null
|
tar --exclude "Ryujinx.app/Contents/MacOS/Ryujinx" -cvf "$RELEASE_TAR_FILE_NAME" Ryujinx.app 1> /dev/null
|
||||||
python3 "$BASE_DIR/distribution/misc/add_tar_exec.py" $RELEASE_TAR_FILE_NAME "Ryujinx.app/Contents/MacOS/Ryujinx" "Ryujinx.app/Contents/MacOS/Ryujinx"
|
python3 "$BASE_DIR/distribution/misc/add_tar_exec.py" "$RELEASE_TAR_FILE_NAME" "Ryujinx.app/Contents/MacOS/Ryujinx" "Ryujinx.app/Contents/MacOS/Ryujinx"
|
||||||
gzip -9 < $RELEASE_TAR_FILE_NAME > $RELEASE_TAR_FILE_NAME.gz
|
gzip -9 < "$RELEASE_TAR_FILE_NAME" > "$RELEASE_TAR_FILE_NAME.gz"
|
||||||
rm $RELEASE_TAR_FILE_NAME
|
rm "$RELEASE_TAR_FILE_NAME"
|
||||||
popd
|
popd
|
||||||
|
|
||||||
echo "Done"
|
echo "Done"
|
@ -5,7 +5,7 @@ set -e
|
|||||||
INSTALL_DIRECTORY=$1
|
INSTALL_DIRECTORY=$1
|
||||||
NEW_APP_DIRECTORY=$2
|
NEW_APP_DIRECTORY=$2
|
||||||
APP_PID=$3
|
APP_PID=$3
|
||||||
APP_ARGUMENTS="${@:4}"
|
APP_ARGUMENTS=("${@:4}")
|
||||||
|
|
||||||
error_handler() {
|
error_handler() {
|
||||||
local lineno="$1"
|
local lineno="$1"
|
||||||
@ -33,7 +33,7 @@ trap 'error_handler ${LINENO}' ERR
|
|||||||
|
|
||||||
attempt=0
|
attempt=0
|
||||||
while true; do
|
while true; do
|
||||||
if lsof -p $APP_PID +r 1 &>/dev/null || ps -p "$APP_PID" &>/dev/null; then
|
if lsof -p "$APP_PID" +r 1 &>/dev/null || ps -p "$APP_PID" &>/dev/null; then
|
||||||
if [ "$attempt" -eq 4 ]; then
|
if [ "$attempt" -eq 4 ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
@ -53,5 +53,5 @@ mv "$NEW_APP_DIRECTORY" "$INSTALL_DIRECTORY"
|
|||||||
if [ "$#" -le 3 ]; then
|
if [ "$#" -le 3 ]; then
|
||||||
open -a "$INSTALL_DIRECTORY"
|
open -a "$INSTALL_DIRECTORY"
|
||||||
else
|
else
|
||||||
open -a "$INSTALL_DIRECTORY" --args "$APP_ARGUMENTS"
|
open -a "$INSTALL_DIRECTORY" --args "${APP_ARGUMENTS[@]}"
|
||||||
fi
|
fi
|
@ -1296,11 +1296,11 @@ namespace ARMeilleure.CodeGen.X86
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
const byte mask = 0b01_00_11_10;
|
const byte Mask = 0b01_00_11_10;
|
||||||
|
|
||||||
context.Assembler.Pshufd(src1, src1, mask);
|
context.Assembler.Pshufd(src1, src1, Mask);
|
||||||
context.Assembler.Movq(dest, src1);
|
context.Assembler.Movq(dest, src1);
|
||||||
context.Assembler.Pshufd(src1, src1, mask);
|
context.Assembler.Pshufd(src1, src1, Mask);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -1853,9 +1853,9 @@ namespace ARMeilleure.CodeGen.X86
|
|||||||
// that the OS will map all pages that we'll use. We do that by
|
// that the OS will map all pages that we'll use. We do that by
|
||||||
// doing a dummy read on those pages, forcing a page fault and
|
// doing a dummy read on those pages, forcing a page fault and
|
||||||
// the OS to map them. If they are already mapped, nothing happens.
|
// the OS to map them. If they are already mapped, nothing happens.
|
||||||
const int pageMask = PageSize - 1;
|
const int PageMask = PageSize - 1;
|
||||||
|
|
||||||
size = (size + pageMask) & ~pageMask;
|
size = (size + PageMask) & ~PageMask;
|
||||||
|
|
||||||
Operand rsp = Register(X86Register.Rsp);
|
Operand rsp = Register(X86Register.Rsp);
|
||||||
Operand temp = Register(CallingConvention.GetIntReturnRegister());
|
Operand temp = Register(CallingConvention.GetIntReturnRegister());
|
||||||
|
@ -304,9 +304,9 @@ namespace ARMeilleure.Decoders
|
|||||||
}
|
}
|
||||||
else if (opCode is IOpCode32MemMult opMemMult)
|
else if (opCode is IOpCode32MemMult opMemMult)
|
||||||
{
|
{
|
||||||
const int pcMask = 1 << RegisterAlias.Aarch32Pc;
|
const int PCMask = 1 << RegisterAlias.Aarch32Pc;
|
||||||
|
|
||||||
rt = (opMemMult.RegisterMask & pcMask) != 0 ? RegisterAlias.Aarch32Pc : 0;
|
rt = (opMemMult.RegisterMask & PCMask) != 0 ? RegisterAlias.Aarch32Pc : 0;
|
||||||
rn = opMemMult.Rn;
|
rn = opMemMult.Rn;
|
||||||
wBack = opMemMult.PostOffset != 0;
|
wBack = opMemMult.PostOffset != 0;
|
||||||
isLoad = opMemMult.IsLoad;
|
isLoad = opMemMult.IsLoad;
|
||||||
|
23
src/ARMeilleure/Decoders/OpCode32SimdCvtFFixed.cs
Normal file
23
src/ARMeilleure/Decoders/OpCode32SimdCvtFFixed.cs
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
namespace ARMeilleure.Decoders
|
||||||
|
{
|
||||||
|
class OpCode32SimdCvtFFixed : OpCode32Simd
|
||||||
|
{
|
||||||
|
public int Fbits { get; protected set; }
|
||||||
|
|
||||||
|
public new static OpCode Create(InstDescriptor inst, ulong address, int opCode) => new OpCode32SimdCvtFFixed(inst, address, opCode, false);
|
||||||
|
public new static OpCode CreateT32(InstDescriptor inst, ulong address, int opCode) => new OpCode32SimdCvtFFixed(inst, address, opCode, true);
|
||||||
|
|
||||||
|
public OpCode32SimdCvtFFixed(InstDescriptor inst, ulong address, int opCode, bool isThumb) : base(inst, address, opCode, isThumb)
|
||||||
|
{
|
||||||
|
Opc = (opCode >> 8) & 0x1;
|
||||||
|
|
||||||
|
Size = Opc == 1 ? 0 : 2;
|
||||||
|
Fbits = 64 - ((opCode >> 16) & 0x3f);
|
||||||
|
|
||||||
|
if (DecoderHelper.VectorArgumentsInvalid(Q, Vd, Vm))
|
||||||
|
{
|
||||||
|
Instruction = InstDescriptor.Undefined;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -918,6 +918,7 @@ namespace ARMeilleure.Decoders
|
|||||||
SetAsimd("111100111x11xx01xxxx0x100xx0xxxx", InstName.Vclt, InstEmit32.Vclt_Z, OpCode32SimdCmpZ.Create, OpCode32SimdCmpZ.CreateT32);
|
SetAsimd("111100111x11xx01xxxx0x100xx0xxxx", InstName.Vclt, InstEmit32.Vclt_Z, OpCode32SimdCmpZ.Create, OpCode32SimdCmpZ.CreateT32);
|
||||||
SetAsimd("111100111x110000xxxx01010xx0xxxx", InstName.Vcnt, InstEmit32.Vcnt, OpCode32SimdCmpZ.Create, OpCode32SimdCmpZ.CreateT32);
|
SetAsimd("111100111x110000xxxx01010xx0xxxx", InstName.Vcnt, InstEmit32.Vcnt, OpCode32SimdCmpZ.Create, OpCode32SimdCmpZ.CreateT32);
|
||||||
SetAsimd("111100111x111011xxxx011xxxx0xxxx", InstName.Vcvt, InstEmit32.Vcvt_V, OpCode32SimdCmpZ.Create, OpCode32SimdCmpZ.CreateT32); // FP and integer, vector.
|
SetAsimd("111100111x111011xxxx011xxxx0xxxx", InstName.Vcvt, InstEmit32.Vcvt_V, OpCode32SimdCmpZ.Create, OpCode32SimdCmpZ.CreateT32); // FP and integer, vector.
|
||||||
|
SetAsimd("1111001x1x1xxxxxxxxx111x0xx1xxxx", InstName.Vcvt, InstEmit32.Vcvt_V_Fixed, OpCode32SimdCvtFFixed.Create, OpCode32SimdCvtFFixed.CreateT32); // Between floating point and fixed point, vector.
|
||||||
SetAsimd("111100111x11xxxxxxxx11000xx0xxxx", InstName.Vdup, InstEmit32.Vdup_1, OpCode32SimdDupElem.Create, OpCode32SimdDupElem.CreateT32);
|
SetAsimd("111100111x11xxxxxxxx11000xx0xxxx", InstName.Vdup, InstEmit32.Vdup_1, OpCode32SimdDupElem.Create, OpCode32SimdDupElem.CreateT32);
|
||||||
SetAsimd("111100110x00xxxxxxxx0001xxx1xxxx", InstName.Veor, InstEmit32.Veor_I, OpCode32SimdBinary.Create, OpCode32SimdBinary.CreateT32);
|
SetAsimd("111100110x00xxxxxxxx0001xxx1xxxx", InstName.Veor, InstEmit32.Veor_I, OpCode32SimdBinary.Create, OpCode32SimdBinary.CreateT32);
|
||||||
SetAsimd("111100101x11xxxxxxxxxxxxxxx0xxxx", InstName.Vext, InstEmit32.Vext, OpCode32SimdExt.Create, OpCode32SimdExt.CreateT32);
|
SetAsimd("111100101x11xxxxxxxxxxxxxxx0xxxx", InstName.Vext, InstEmit32.Vext, OpCode32SimdExt.Create, OpCode32SimdExt.CreateT32);
|
||||||
@ -1130,7 +1131,7 @@ namespace ARMeilleure.Decoders
|
|||||||
SetT16("1101<<<xxxxxxxxx", InstName.B, InstEmit32.B, OpCodeT16BImm8.Create);
|
SetT16("1101<<<xxxxxxxxx", InstName.B, InstEmit32.B, OpCodeT16BImm8.Create);
|
||||||
SetT16("11011111xxxxxxxx", InstName.Svc, InstEmit32.Svc, OpCodeT16Exception.Create);
|
SetT16("11011111xxxxxxxx", InstName.Svc, InstEmit32.Svc, OpCodeT16Exception.Create);
|
||||||
SetT16("11100xxxxxxxxxxx", InstName.B, InstEmit32.B, OpCodeT16BImm11.Create);
|
SetT16("11100xxxxxxxxxxx", InstName.B, InstEmit32.B, OpCodeT16BImm11.Create);
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region "OpCode Table (AArch32, T32)"
|
#region "OpCode Table (AArch32, T32)"
|
||||||
// Base
|
// Base
|
||||||
@ -1298,7 +1299,7 @@ namespace ARMeilleure.Decoders
|
|||||||
SetT32("11110011101011111000000000000010", InstName.Wfe, InstEmit32.Nop, OpCodeT32.Create);
|
SetT32("11110011101011111000000000000010", InstName.Wfe, InstEmit32.Nop, OpCodeT32.Create);
|
||||||
SetT32("11110011101011111000000000000011", InstName.Wfi, InstEmit32.Nop, OpCodeT32.Create);
|
SetT32("11110011101011111000000000000011", InstName.Wfi, InstEmit32.Nop, OpCodeT32.Create);
|
||||||
SetT32("11110011101011111000000000000001", InstName.Yield, InstEmit32.Nop, OpCodeT32.Create);
|
SetT32("11110011101011111000000000000001", InstName.Yield, InstEmit32.Nop, OpCodeT32.Create);
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
FillFastLookupTable(_instA32FastLookup, _allInstA32, ToFastLookupIndexA);
|
FillFastLookupTable(_instA32FastLookup, _allInstA32, ToFastLookupIndexA);
|
||||||
FillFastLookupTable(_instT32FastLookup, _allInstT32, ToFastLookupIndexT);
|
FillFastLookupTable(_instT32FastLookup, _allInstT32, ToFastLookupIndexT);
|
||||||
|
@ -17,7 +17,7 @@ namespace ARMeilleure.Decoders.Optimizations
|
|||||||
throw new InvalidOperationException("Function entry point is not contained in a block.");
|
throw new InvalidOperationException("Function entry point is not contained in a block.");
|
||||||
}
|
}
|
||||||
|
|
||||||
const ulong allowance = 4;
|
const ulong Allowance = 4;
|
||||||
|
|
||||||
Block entryBlock = blocks[entryBlockId];
|
Block entryBlock = blocks[entryBlockId];
|
||||||
|
|
||||||
@ -31,7 +31,7 @@ namespace ARMeilleure.Decoders.Optimizations
|
|||||||
{
|
{
|
||||||
Block block = blocks[i];
|
Block block = blocks[i];
|
||||||
|
|
||||||
if (endBlock.EndAddress < block.Address - allowance)
|
if (endBlock.EndAddress < block.Address - Allowance)
|
||||||
{
|
{
|
||||||
break; // End of contiguous function.
|
break; // End of contiguous function.
|
||||||
}
|
}
|
||||||
@ -44,7 +44,7 @@ namespace ARMeilleure.Decoders.Optimizations
|
|||||||
{
|
{
|
||||||
Block block = blocks[i];
|
Block block = blocks[i];
|
||||||
|
|
||||||
if (startBlock.Address > block.EndAddress + allowance)
|
if (startBlock.Address > block.EndAddress + Allowance)
|
||||||
{
|
{
|
||||||
break; // End of contiguous function.
|
break; // End of contiguous function.
|
||||||
}
|
}
|
||||||
|
@ -114,6 +114,35 @@ namespace ARMeilleure.Instructions
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void Vcvt_V_Fixed(ArmEmitterContext context)
|
||||||
|
{
|
||||||
|
OpCode32SimdCvtFFixed op = (OpCode32SimdCvtFFixed)context.CurrOp;
|
||||||
|
|
||||||
|
var toFixed = op.Opc == 1;
|
||||||
|
int fracBits = op.Fbits;
|
||||||
|
var unsigned = op.U;
|
||||||
|
|
||||||
|
if (toFixed) // F32 to S32 or U32 (fixed)
|
||||||
|
{
|
||||||
|
EmitVectorUnaryOpF32(context, (op1) =>
|
||||||
|
{
|
||||||
|
var scaledValue = context.Multiply(op1, ConstF(MathF.Pow(2f, fracBits)));
|
||||||
|
MethodInfo info = unsigned ? typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF32ToU32)) : typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF32ToS32));
|
||||||
|
|
||||||
|
return context.Call(info, scaledValue);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else // S32 or U32 (fixed) to F32
|
||||||
|
{
|
||||||
|
EmitVectorUnaryOpI32(context, (op1) =>
|
||||||
|
{
|
||||||
|
var floatValue = unsigned ? context.ConvertToFPUI(OperandType.FP32, op1) : context.ConvertToFP(OperandType.FP32, op1);
|
||||||
|
|
||||||
|
return context.Multiply(floatValue, ConstF(1f / MathF.Pow(2f, fracBits)));
|
||||||
|
}, !unsigned);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static void Vcvt_FD(ArmEmitterContext context)
|
public static void Vcvt_FD(ArmEmitterContext context)
|
||||||
{
|
{
|
||||||
OpCode32SimdS op = (OpCode32SimdS)context.CurrOp;
|
OpCode32SimdS op = (OpCode32SimdS)context.CurrOp;
|
||||||
|
@ -1299,17 +1299,17 @@ namespace ARMeilleure.Instructions
|
|||||||
|
|
||||||
Debug.Assert((op.Size & 1) == 0 && op.RegisterSize == RegisterSize.Simd128);
|
Debug.Assert((op.Size & 1) == 0 && op.RegisterSize == RegisterSize.Simd128);
|
||||||
|
|
||||||
const int sm0 = 0 << 6 | 0 << 4 | 0 << 2 | 0 << 0;
|
const int SM0 = 0 << 6 | 0 << 4 | 0 << 2 | 0 << 0;
|
||||||
const int sm1 = 1 << 6 | 1 << 4 | 1 << 2 | 1 << 0;
|
const int SM1 = 1 << 6 | 1 << 4 | 1 << 2 | 1 << 0;
|
||||||
const int sm2 = 2 << 6 | 2 << 4 | 2 << 2 | 2 << 0;
|
const int SM2 = 2 << 6 | 2 << 4 | 2 << 2 | 2 << 0;
|
||||||
const int sm3 = 3 << 6 | 3 << 4 | 3 << 2 | 3 << 0;
|
const int SM3 = 3 << 6 | 3 << 4 | 3 << 2 | 3 << 0;
|
||||||
|
|
||||||
Operand nCopy = context.Copy(GetVec(op.Rn));
|
Operand nCopy = context.Copy(GetVec(op.Rn));
|
||||||
|
|
||||||
Operand part0 = context.AddIntrinsic(Intrinsic.X86Shufps, nCopy, nCopy, Const(sm0));
|
Operand part0 = context.AddIntrinsic(Intrinsic.X86Shufps, nCopy, nCopy, Const(SM0));
|
||||||
Operand part1 = context.AddIntrinsic(Intrinsic.X86Shufps, nCopy, nCopy, Const(sm1));
|
Operand part1 = context.AddIntrinsic(Intrinsic.X86Shufps, nCopy, nCopy, Const(SM1));
|
||||||
Operand part2 = context.AddIntrinsic(Intrinsic.X86Shufps, nCopy, nCopy, Const(sm2));
|
Operand part2 = context.AddIntrinsic(Intrinsic.X86Shufps, nCopy, nCopy, Const(SM2));
|
||||||
Operand part3 = context.AddIntrinsic(Intrinsic.X86Shufps, nCopy, nCopy, Const(sm3));
|
Operand part3 = context.AddIntrinsic(Intrinsic.X86Shufps, nCopy, nCopy, Const(SM3));
|
||||||
|
|
||||||
Operand res = emit(emit(part0, part1), emit(part2, part3));
|
Operand res = emit(emit(part0, part1), emit(part2, part3));
|
||||||
|
|
||||||
@ -1340,13 +1340,13 @@ namespace ARMeilleure.Instructions
|
|||||||
|
|
||||||
if ((op.Size & 1) == 0)
|
if ((op.Size & 1) == 0)
|
||||||
{
|
{
|
||||||
const int sm0 = 2 << 6 | 2 << 4 | 2 << 2 | 0 << 0;
|
const int SM0 = 2 << 6 | 2 << 4 | 2 << 2 | 0 << 0;
|
||||||
const int sm1 = 2 << 6 | 2 << 4 | 2 << 2 | 1 << 0;
|
const int SM1 = 2 << 6 | 2 << 4 | 2 << 2 | 1 << 0;
|
||||||
|
|
||||||
Operand zeroN = context.VectorZeroUpper64(n);
|
Operand zeroN = context.VectorZeroUpper64(n);
|
||||||
|
|
||||||
op0 = context.AddIntrinsic(Intrinsic.X86Pshufd, zeroN, Const(sm0));
|
op0 = context.AddIntrinsic(Intrinsic.X86Pshufd, zeroN, Const(SM0));
|
||||||
op1 = context.AddIntrinsic(Intrinsic.X86Pshufd, zeroN, Const(sm1));
|
op1 = context.AddIntrinsic(Intrinsic.X86Pshufd, zeroN, Const(SM1));
|
||||||
}
|
}
|
||||||
else /* if ((op.Size & 1) == 1) */
|
else /* if ((op.Size & 1) == 1) */
|
||||||
{
|
{
|
||||||
@ -1412,11 +1412,11 @@ namespace ARMeilleure.Instructions
|
|||||||
}
|
}
|
||||||
else /* if (op.RegisterSize == RegisterSize.Simd128) */
|
else /* if (op.RegisterSize == RegisterSize.Simd128) */
|
||||||
{
|
{
|
||||||
const int sm0 = 2 << 6 | 0 << 4 | 2 << 2 | 0 << 0;
|
const int SM0 = 2 << 6 | 0 << 4 | 2 << 2 | 0 << 0;
|
||||||
const int sm1 = 3 << 6 | 1 << 4 | 3 << 2 | 1 << 0;
|
const int SM1 = 3 << 6 | 1 << 4 | 3 << 2 | 1 << 0;
|
||||||
|
|
||||||
Operand part0 = context.AddIntrinsic(Intrinsic.X86Shufps, nCopy, mCopy, Const(sm0));
|
Operand part0 = context.AddIntrinsic(Intrinsic.X86Shufps, nCopy, mCopy, Const(SM0));
|
||||||
Operand part1 = context.AddIntrinsic(Intrinsic.X86Shufps, nCopy, mCopy, Const(sm1));
|
Operand part1 = context.AddIntrinsic(Intrinsic.X86Shufps, nCopy, mCopy, Const(SM1));
|
||||||
|
|
||||||
context.Copy(GetVec(op.Rd), emit(part0, part1));
|
context.Copy(GetVec(op.Rd), emit(part0, part1));
|
||||||
}
|
}
|
||||||
|
@ -408,7 +408,7 @@ namespace ARMeilleure.Instructions
|
|||||||
|
|
||||||
if (Optimizations.UseGfni)
|
if (Optimizations.UseGfni)
|
||||||
{
|
{
|
||||||
const long bitMatrix =
|
const long BitMatrix =
|
||||||
(0b10000000L << 56) |
|
(0b10000000L << 56) |
|
||||||
(0b01000000L << 48) |
|
(0b01000000L << 48) |
|
||||||
(0b00100000L << 40) |
|
(0b00100000L << 40) |
|
||||||
@ -418,7 +418,7 @@ namespace ARMeilleure.Instructions
|
|||||||
(0b00000010L << 8) |
|
(0b00000010L << 8) |
|
||||||
(0b00000001L << 0);
|
(0b00000001L << 0);
|
||||||
|
|
||||||
Operand vBitMatrix = X86GetAllElements(context, bitMatrix);
|
Operand vBitMatrix = X86GetAllElements(context, BitMatrix);
|
||||||
|
|
||||||
Operand res = context.AddIntrinsic(Intrinsic.X86Gf2p8affineqb, GetVec(op.Rn), vBitMatrix, Const(0));
|
Operand res = context.AddIntrinsic(Intrinsic.X86Gf2p8affineqb, GetVec(op.Rn), vBitMatrix, Const(0));
|
||||||
|
|
||||||
@ -469,12 +469,12 @@ namespace ARMeilleure.Instructions
|
|||||||
|
|
||||||
Operand n = GetVec(op.Rn);
|
Operand n = GetVec(op.Rn);
|
||||||
|
|
||||||
const long maskE0 = 06L << 56 | 07L << 48 | 04L << 40 | 05L << 32 | 02L << 24 | 03L << 16 | 00L << 8 | 01L << 0;
|
const long MaskE0 = 06L << 56 | 07L << 48 | 04L << 40 | 05L << 32 | 02L << 24 | 03L << 16 | 00L << 8 | 01L << 0;
|
||||||
const long maskE1 = 14L << 56 | 15L << 48 | 12L << 40 | 13L << 32 | 10L << 24 | 11L << 16 | 08L << 8 | 09L << 0;
|
const long MaskE1 = 14L << 56 | 15L << 48 | 12L << 40 | 13L << 32 | 10L << 24 | 11L << 16 | 08L << 8 | 09L << 0;
|
||||||
|
|
||||||
Operand mask = X86GetScalar(context, maskE0);
|
Operand mask = X86GetScalar(context, MaskE0);
|
||||||
|
|
||||||
mask = EmitVectorInsert(context, mask, Const(maskE1), 1, 3);
|
mask = EmitVectorInsert(context, mask, Const(MaskE1), 1, 3);
|
||||||
|
|
||||||
Operand res = context.AddIntrinsic(Intrinsic.X86Pshufb, n, mask);
|
Operand res = context.AddIntrinsic(Intrinsic.X86Pshufb, n, mask);
|
||||||
|
|
||||||
@ -503,21 +503,21 @@ namespace ARMeilleure.Instructions
|
|||||||
|
|
||||||
if (op.Size == 0)
|
if (op.Size == 0)
|
||||||
{
|
{
|
||||||
const long maskE0 = 04L << 56 | 05L << 48 | 06L << 40 | 07L << 32 | 00L << 24 | 01L << 16 | 02L << 8 | 03L << 0;
|
const long MaskE0 = 04L << 56 | 05L << 48 | 06L << 40 | 07L << 32 | 00L << 24 | 01L << 16 | 02L << 8 | 03L << 0;
|
||||||
const long maskE1 = 12L << 56 | 13L << 48 | 14L << 40 | 15L << 32 | 08L << 24 | 09L << 16 | 10L << 8 | 11L << 0;
|
const long MaskE1 = 12L << 56 | 13L << 48 | 14L << 40 | 15L << 32 | 08L << 24 | 09L << 16 | 10L << 8 | 11L << 0;
|
||||||
|
|
||||||
mask = X86GetScalar(context, maskE0);
|
mask = X86GetScalar(context, MaskE0);
|
||||||
|
|
||||||
mask = EmitVectorInsert(context, mask, Const(maskE1), 1, 3);
|
mask = EmitVectorInsert(context, mask, Const(MaskE1), 1, 3);
|
||||||
}
|
}
|
||||||
else /* if (op.Size == 1) */
|
else /* if (op.Size == 1) */
|
||||||
{
|
{
|
||||||
const long maskE0 = 05L << 56 | 04L << 48 | 07L << 40 | 06L << 32 | 01L << 24 | 00L << 16 | 03L << 8 | 02L << 0;
|
const long MaskE0 = 05L << 56 | 04L << 48 | 07L << 40 | 06L << 32 | 01L << 24 | 00L << 16 | 03L << 8 | 02L << 0;
|
||||||
const long maskE1 = 13L << 56 | 12L << 48 | 15L << 40 | 14L << 32 | 09L << 24 | 08L << 16 | 11L << 8 | 10L << 0;
|
const long MaskE1 = 13L << 56 | 12L << 48 | 15L << 40 | 14L << 32 | 09L << 24 | 08L << 16 | 11L << 8 | 10L << 0;
|
||||||
|
|
||||||
mask = X86GetScalar(context, maskE0);
|
mask = X86GetScalar(context, MaskE0);
|
||||||
|
|
||||||
mask = EmitVectorInsert(context, mask, Const(maskE1), 1, 3);
|
mask = EmitVectorInsert(context, mask, Const(MaskE1), 1, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
Operand res = context.AddIntrinsic(Intrinsic.X86Pshufb, n, mask);
|
Operand res = context.AddIntrinsic(Intrinsic.X86Pshufb, n, mask);
|
||||||
@ -547,30 +547,30 @@ namespace ARMeilleure.Instructions
|
|||||||
|
|
||||||
if (op.Size == 0)
|
if (op.Size == 0)
|
||||||
{
|
{
|
||||||
const long maskE0 = 00L << 56 | 01L << 48 | 02L << 40 | 03L << 32 | 04L << 24 | 05L << 16 | 06L << 8 | 07L << 0;
|
const long MaskE0 = 00L << 56 | 01L << 48 | 02L << 40 | 03L << 32 | 04L << 24 | 05L << 16 | 06L << 8 | 07L << 0;
|
||||||
const long maskE1 = 08L << 56 | 09L << 48 | 10L << 40 | 11L << 32 | 12L << 24 | 13L << 16 | 14L << 8 | 15L << 0;
|
const long MaskE1 = 08L << 56 | 09L << 48 | 10L << 40 | 11L << 32 | 12L << 24 | 13L << 16 | 14L << 8 | 15L << 0;
|
||||||
|
|
||||||
mask = X86GetScalar(context, maskE0);
|
mask = X86GetScalar(context, MaskE0);
|
||||||
|
|
||||||
mask = EmitVectorInsert(context, mask, Const(maskE1), 1, 3);
|
mask = EmitVectorInsert(context, mask, Const(MaskE1), 1, 3);
|
||||||
}
|
}
|
||||||
else if (op.Size == 1)
|
else if (op.Size == 1)
|
||||||
{
|
{
|
||||||
const long maskE0 = 01L << 56 | 00L << 48 | 03L << 40 | 02L << 32 | 05L << 24 | 04L << 16 | 07L << 8 | 06L << 0;
|
const long MaskE0 = 01L << 56 | 00L << 48 | 03L << 40 | 02L << 32 | 05L << 24 | 04L << 16 | 07L << 8 | 06L << 0;
|
||||||
const long maskE1 = 09L << 56 | 08L << 48 | 11L << 40 | 10L << 32 | 13L << 24 | 12L << 16 | 15L << 8 | 14L << 0;
|
const long MaskE1 = 09L << 56 | 08L << 48 | 11L << 40 | 10L << 32 | 13L << 24 | 12L << 16 | 15L << 8 | 14L << 0;
|
||||||
|
|
||||||
mask = X86GetScalar(context, maskE0);
|
mask = X86GetScalar(context, MaskE0);
|
||||||
|
|
||||||
mask = EmitVectorInsert(context, mask, Const(maskE1), 1, 3);
|
mask = EmitVectorInsert(context, mask, Const(MaskE1), 1, 3);
|
||||||
}
|
}
|
||||||
else /* if (op.Size == 2) */
|
else /* if (op.Size == 2) */
|
||||||
{
|
{
|
||||||
const long maskE0 = 03L << 56 | 02L << 48 | 01L << 40 | 00L << 32 | 07L << 24 | 06L << 16 | 05L << 8 | 04L << 0;
|
const long MaskE0 = 03L << 56 | 02L << 48 | 01L << 40 | 00L << 32 | 07L << 24 | 06L << 16 | 05L << 8 | 04L << 0;
|
||||||
const long maskE1 = 11L << 56 | 10L << 48 | 09L << 40 | 08L << 32 | 15L << 24 | 14L << 16 | 13L << 8 | 12L << 0;
|
const long MaskE1 = 11L << 56 | 10L << 48 | 09L << 40 | 08L << 32 | 15L << 24 | 14L << 16 | 13L << 8 | 12L << 0;
|
||||||
|
|
||||||
mask = X86GetScalar(context, maskE0);
|
mask = X86GetScalar(context, MaskE0);
|
||||||
|
|
||||||
mask = EmitVectorInsert(context, mask, Const(maskE1), 1, 3);
|
mask = EmitVectorInsert(context, mask, Const(MaskE1), 1, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
Operand res = context.AddIntrinsic(Intrinsic.X86Pshufb, n, mask);
|
Operand res = context.AddIntrinsic(Intrinsic.X86Pshufb, n, mask);
|
||||||
|
@ -175,10 +175,10 @@ namespace ARMeilleure.Instructions
|
|||||||
|
|
||||||
public static ushort FPRoundCv(double real, ExecutionContext context)
|
public static ushort FPRoundCv(double real, ExecutionContext context)
|
||||||
{
|
{
|
||||||
const int minimumExp = -14;
|
const int MinimumExp = -14;
|
||||||
|
|
||||||
const int e = 5;
|
const int E = 5;
|
||||||
const int f = 10;
|
const int F = 10;
|
||||||
|
|
||||||
bool sign;
|
bool sign;
|
||||||
double mantissa;
|
double mantissa;
|
||||||
@ -208,15 +208,15 @@ namespace ARMeilleure.Instructions
|
|||||||
exponent++;
|
exponent++;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint biasedExp = (uint)Math.Max(exponent - minimumExp + 1, 0);
|
uint biasedExp = (uint)Math.Max(exponent - MinimumExp + 1, 0);
|
||||||
|
|
||||||
if (biasedExp == 0u)
|
if (biasedExp == 0u)
|
||||||
{
|
{
|
||||||
mantissa /= Math.Pow(2d, minimumExp - exponent);
|
mantissa /= Math.Pow(2d, MinimumExp - exponent);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint intMant = (uint)Math.Floor(mantissa * Math.Pow(2d, f));
|
uint intMant = (uint)Math.Floor(mantissa * Math.Pow(2d, F));
|
||||||
double error = mantissa * Math.Pow(2d, f) - (double)intMant;
|
double error = mantissa * Math.Pow(2d, F) - (double)intMant;
|
||||||
|
|
||||||
if (biasedExp == 0u && (error != 0d || (context.Fpcr & FPCR.Ufe) != 0))
|
if (biasedExp == 0u && (error != 0d || (context.Fpcr & FPCR.Ufe) != 0))
|
||||||
{
|
{
|
||||||
@ -256,12 +256,12 @@ namespace ARMeilleure.Instructions
|
|||||||
{
|
{
|
||||||
intMant++;
|
intMant++;
|
||||||
|
|
||||||
if (intMant == 1u << f)
|
if (intMant == 1u << F)
|
||||||
{
|
{
|
||||||
biasedExp = 1u;
|
biasedExp = 1u;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (intMant == 1u << (f + 1))
|
if (intMant == 1u << (F + 1))
|
||||||
{
|
{
|
||||||
biasedExp++;
|
biasedExp++;
|
||||||
intMant >>= 1;
|
intMant >>= 1;
|
||||||
@ -272,7 +272,7 @@ namespace ARMeilleure.Instructions
|
|||||||
|
|
||||||
if ((context.Fpcr & FPCR.Ahp) == 0)
|
if ((context.Fpcr & FPCR.Ahp) == 0)
|
||||||
{
|
{
|
||||||
if (biasedExp >= (1u << e) - 1u)
|
if (biasedExp >= (1u << E) - 1u)
|
||||||
{
|
{
|
||||||
resultBits = overflowToInf ? FPInfinity(sign) : FPMaxNormal(sign);
|
resultBits = overflowToInf ? FPInfinity(sign) : FPMaxNormal(sign);
|
||||||
|
|
||||||
@ -287,7 +287,7 @@ namespace ARMeilleure.Instructions
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (biasedExp >= 1u << e)
|
if (biasedExp >= 1u << E)
|
||||||
{
|
{
|
||||||
resultBits = (ushort)((sign ? 1u : 0u) << 15 | 0x7FFFu);
|
resultBits = (ushort)((sign ? 1u : 0u) << 15 | 0x7FFFu);
|
||||||
|
|
||||||
@ -354,10 +354,10 @@ namespace ARMeilleure.Instructions
|
|||||||
|
|
||||||
private static float FPRoundCv(double real, ExecutionContext context)
|
private static float FPRoundCv(double real, ExecutionContext context)
|
||||||
{
|
{
|
||||||
const int minimumExp = -126;
|
const int MinimumExp = -126;
|
||||||
|
|
||||||
const int e = 8;
|
const int E = 8;
|
||||||
const int f = 23;
|
const int F = 23;
|
||||||
|
|
||||||
bool sign;
|
bool sign;
|
||||||
double mantissa;
|
double mantissa;
|
||||||
@ -387,22 +387,22 @@ namespace ARMeilleure.Instructions
|
|||||||
exponent++;
|
exponent++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((context.Fpcr & FPCR.Fz) != 0 && exponent < minimumExp)
|
if ((context.Fpcr & FPCR.Fz) != 0 && exponent < MinimumExp)
|
||||||
{
|
{
|
||||||
context.Fpsr |= FPSR.Ufc;
|
context.Fpsr |= FPSR.Ufc;
|
||||||
|
|
||||||
return SoftFloat32.FPZero(sign);
|
return SoftFloat32.FPZero(sign);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint biasedExp = (uint)Math.Max(exponent - minimumExp + 1, 0);
|
uint biasedExp = (uint)Math.Max(exponent - MinimumExp + 1, 0);
|
||||||
|
|
||||||
if (biasedExp == 0u)
|
if (biasedExp == 0u)
|
||||||
{
|
{
|
||||||
mantissa /= Math.Pow(2d, minimumExp - exponent);
|
mantissa /= Math.Pow(2d, MinimumExp - exponent);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint intMant = (uint)Math.Floor(mantissa * Math.Pow(2d, f));
|
uint intMant = (uint)Math.Floor(mantissa * Math.Pow(2d, F));
|
||||||
double error = mantissa * Math.Pow(2d, f) - (double)intMant;
|
double error = mantissa * Math.Pow(2d, F) - (double)intMant;
|
||||||
|
|
||||||
if (biasedExp == 0u && (error != 0d || (context.Fpcr & FPCR.Ufe) != 0))
|
if (biasedExp == 0u && (error != 0d || (context.Fpcr & FPCR.Ufe) != 0))
|
||||||
{
|
{
|
||||||
@ -442,12 +442,12 @@ namespace ARMeilleure.Instructions
|
|||||||
{
|
{
|
||||||
intMant++;
|
intMant++;
|
||||||
|
|
||||||
if (intMant == 1u << f)
|
if (intMant == 1u << F)
|
||||||
{
|
{
|
||||||
biasedExp = 1u;
|
biasedExp = 1u;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (intMant == 1u << (f + 1))
|
if (intMant == 1u << (F + 1))
|
||||||
{
|
{
|
||||||
biasedExp++;
|
biasedExp++;
|
||||||
intMant >>= 1;
|
intMant >>= 1;
|
||||||
@ -456,7 +456,7 @@ namespace ARMeilleure.Instructions
|
|||||||
|
|
||||||
float result;
|
float result;
|
||||||
|
|
||||||
if (biasedExp >= (1u << e) - 1u)
|
if (biasedExp >= (1u << E) - 1u)
|
||||||
{
|
{
|
||||||
result = overflowToInf ? SoftFloat32.FPInfinity(sign) : SoftFloat32.FPMaxNormal(sign);
|
result = overflowToInf ? SoftFloat32.FPInfinity(sign) : SoftFloat32.FPMaxNormal(sign);
|
||||||
|
|
||||||
@ -529,10 +529,10 @@ namespace ARMeilleure.Instructions
|
|||||||
|
|
||||||
private static double FPRoundCv(double real, ExecutionContext context)
|
private static double FPRoundCv(double real, ExecutionContext context)
|
||||||
{
|
{
|
||||||
const int minimumExp = -1022;
|
const int MinimumExp = -1022;
|
||||||
|
|
||||||
const int e = 11;
|
const int E = 11;
|
||||||
const int f = 52;
|
const int F = 52;
|
||||||
|
|
||||||
bool sign;
|
bool sign;
|
||||||
double mantissa;
|
double mantissa;
|
||||||
@ -562,22 +562,22 @@ namespace ARMeilleure.Instructions
|
|||||||
exponent++;
|
exponent++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((context.Fpcr & FPCR.Fz) != 0 && exponent < minimumExp)
|
if ((context.Fpcr & FPCR.Fz) != 0 && exponent < MinimumExp)
|
||||||
{
|
{
|
||||||
context.Fpsr |= FPSR.Ufc;
|
context.Fpsr |= FPSR.Ufc;
|
||||||
|
|
||||||
return SoftFloat64.FPZero(sign);
|
return SoftFloat64.FPZero(sign);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint biasedExp = (uint)Math.Max(exponent - minimumExp + 1, 0);
|
uint biasedExp = (uint)Math.Max(exponent - MinimumExp + 1, 0);
|
||||||
|
|
||||||
if (biasedExp == 0u)
|
if (biasedExp == 0u)
|
||||||
{
|
{
|
||||||
mantissa /= Math.Pow(2d, minimumExp - exponent);
|
mantissa /= Math.Pow(2d, MinimumExp - exponent);
|
||||||
}
|
}
|
||||||
|
|
||||||
ulong intMant = (ulong)Math.Floor(mantissa * Math.Pow(2d, f));
|
ulong intMant = (ulong)Math.Floor(mantissa * Math.Pow(2d, F));
|
||||||
double error = mantissa * Math.Pow(2d, f) - (double)intMant;
|
double error = mantissa * Math.Pow(2d, F) - (double)intMant;
|
||||||
|
|
||||||
if (biasedExp == 0u && (error != 0d || (context.Fpcr & FPCR.Ufe) != 0))
|
if (biasedExp == 0u && (error != 0d || (context.Fpcr & FPCR.Ufe) != 0))
|
||||||
{
|
{
|
||||||
@ -617,12 +617,12 @@ namespace ARMeilleure.Instructions
|
|||||||
{
|
{
|
||||||
intMant++;
|
intMant++;
|
||||||
|
|
||||||
if (intMant == 1ul << f)
|
if (intMant == 1ul << F)
|
||||||
{
|
{
|
||||||
biasedExp = 1u;
|
biasedExp = 1u;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (intMant == 1ul << (f + 1))
|
if (intMant == 1ul << (F + 1))
|
||||||
{
|
{
|
||||||
biasedExp++;
|
biasedExp++;
|
||||||
intMant >>= 1;
|
intMant >>= 1;
|
||||||
@ -631,7 +631,7 @@ namespace ARMeilleure.Instructions
|
|||||||
|
|
||||||
double result;
|
double result;
|
||||||
|
|
||||||
if (biasedExp >= (1u << e) - 1u)
|
if (biasedExp >= (1u << E) - 1u)
|
||||||
{
|
{
|
||||||
result = overflowToInf ? SoftFloat64.FPInfinity(sign) : SoftFloat64.FPMaxNormal(sign);
|
result = overflowToInf ? SoftFloat64.FPInfinity(sign) : SoftFloat64.FPMaxNormal(sign);
|
||||||
|
|
||||||
@ -1448,6 +1448,7 @@ namespace ARMeilleure.Instructions
|
|||||||
{
|
{
|
||||||
var overflowToInf = fpcr.GetRoundingMode() switch
|
var overflowToInf = fpcr.GetRoundingMode() switch
|
||||||
{
|
{
|
||||||
|
FPRoundingMode.ToNearest => true,
|
||||||
FPRoundingMode.TowardsPlusInfinity => !sign,
|
FPRoundingMode.TowardsPlusInfinity => !sign,
|
||||||
FPRoundingMode.TowardsMinusInfinity => sign,
|
FPRoundingMode.TowardsMinusInfinity => sign,
|
||||||
FPRoundingMode.TowardsZero => false,
|
FPRoundingMode.TowardsZero => false,
|
||||||
@ -2879,6 +2880,7 @@ namespace ARMeilleure.Instructions
|
|||||||
{
|
{
|
||||||
var overflowToInf = fpcr.GetRoundingMode() switch
|
var overflowToInf = fpcr.GetRoundingMode() switch
|
||||||
{
|
{
|
||||||
|
FPRoundingMode.ToNearest => true,
|
||||||
FPRoundingMode.TowardsPlusInfinity => !sign,
|
FPRoundingMode.TowardsPlusInfinity => !sign,
|
||||||
FPRoundingMode.TowardsMinusInfinity => sign,
|
FPRoundingMode.TowardsMinusInfinity => sign,
|
||||||
FPRoundingMode.TowardsZero => false,
|
FPRoundingMode.TowardsZero => false,
|
||||||
|
@ -5,7 +5,6 @@ using ARMeilleure.Translation.Cache;
|
|||||||
using System;
|
using System;
|
||||||
using System.Runtime.CompilerServices;
|
using System.Runtime.CompilerServices;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
using static ARMeilleure.IntermediateRepresentation.Operand.Factory;
|
using static ARMeilleure.IntermediateRepresentation.Operand.Factory;
|
||||||
|
|
||||||
namespace ARMeilleure.Signal
|
namespace ARMeilleure.Signal
|
||||||
@ -261,20 +260,20 @@ namespace ARMeilleure.Signal
|
|||||||
{
|
{
|
||||||
if (OperatingSystem.IsMacOS())
|
if (OperatingSystem.IsMacOS())
|
||||||
{
|
{
|
||||||
const ulong mcontextOffset = 48; // uc_mcontext
|
const ulong McontextOffset = 48; // uc_mcontext
|
||||||
Operand ctxPtr = context.Load(OperandType.I64, context.Add(ucontextPtr, Const(mcontextOffset)));
|
Operand ctxPtr = context.Load(OperandType.I64, context.Add(ucontextPtr, Const(McontextOffset)));
|
||||||
|
|
||||||
if (RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
|
if (RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
|
||||||
{
|
{
|
||||||
const ulong esrOffset = 8; // __es.__esr
|
const ulong EsrOffset = 8; // __es.__esr
|
||||||
Operand esr = context.Load(OperandType.I64, context.Add(ctxPtr, Const(esrOffset)));
|
Operand esr = context.Load(OperandType.I64, context.Add(ctxPtr, Const(EsrOffset)));
|
||||||
return context.BitwiseAnd(esr, Const(0x40ul));
|
return context.BitwiseAnd(esr, Const(0x40ul));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (RuntimeInformation.ProcessArchitecture == Architecture.X64)
|
if (RuntimeInformation.ProcessArchitecture == Architecture.X64)
|
||||||
{
|
{
|
||||||
const ulong errOffset = 4; // __es.__err
|
const ulong ErrOffset = 4; // __es.__err
|
||||||
Operand err = context.Load(OperandType.I64, context.Add(ctxPtr, Const(errOffset)));
|
Operand err = context.Load(OperandType.I64, context.Add(ctxPtr, Const(ErrOffset)));
|
||||||
return context.BitwiseAnd(err, Const(2ul));
|
return context.BitwiseAnd(err, Const(2ul));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -287,10 +286,10 @@ namespace ARMeilleure.Signal
|
|||||||
Operand loopLabel = Label();
|
Operand loopLabel = Label();
|
||||||
Operand successLabel = Label();
|
Operand successLabel = Label();
|
||||||
|
|
||||||
const ulong auxOffset = 464; // uc_mcontext.__reserved
|
const ulong AuxOffset = 464; // uc_mcontext.__reserved
|
||||||
const uint esrMagic = 0x45535201;
|
const uint EsrMagic = 0x45535201;
|
||||||
|
|
||||||
context.Copy(auxPtr, context.Add(ucontextPtr, Const(auxOffset)));
|
context.Copy(auxPtr, context.Add(ucontextPtr, Const(AuxOffset)));
|
||||||
|
|
||||||
context.MarkLabel(loopLabel);
|
context.MarkLabel(loopLabel);
|
||||||
|
|
||||||
@ -299,7 +298,7 @@ namespace ARMeilleure.Signal
|
|||||||
// _aarch64_ctx::size
|
// _aarch64_ctx::size
|
||||||
Operand size = context.Load(OperandType.I32, context.Add(auxPtr, Const(4ul)));
|
Operand size = context.Load(OperandType.I32, context.Add(auxPtr, Const(4ul)));
|
||||||
|
|
||||||
context.BranchIf(successLabel, magic, Const(esrMagic), Comparison.Equal);
|
context.BranchIf(successLabel, magic, Const(EsrMagic), Comparison.Equal);
|
||||||
|
|
||||||
context.Copy(auxPtr, context.Add(auxPtr, context.ZeroExtend32(OperandType.I64, size)));
|
context.Copy(auxPtr, context.Add(auxPtr, context.ZeroExtend32(OperandType.I64, size)));
|
||||||
|
|
||||||
@ -314,8 +313,8 @@ namespace ARMeilleure.Signal
|
|||||||
|
|
||||||
if (RuntimeInformation.ProcessArchitecture == Architecture.X64)
|
if (RuntimeInformation.ProcessArchitecture == Architecture.X64)
|
||||||
{
|
{
|
||||||
const int errOffset = 192; // uc_mcontext.gregs[REG_ERR]
|
const int ErrOffset = 192; // uc_mcontext.gregs[REG_ERR]
|
||||||
Operand err = context.Load(OperandType.I64, context.Add(ucontextPtr, Const(errOffset)));
|
Operand err = context.Load(OperandType.I64, context.Add(ucontextPtr, Const(ErrOffset)));
|
||||||
return context.BitwiseAnd(err, Const(2ul));
|
return context.BitwiseAnd(err, Const(2ul));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -29,7 +29,7 @@ namespace ARMeilleure.Translation.PTC
|
|||||||
private const string OuterHeaderMagicString = "PTCohd\0\0";
|
private const string OuterHeaderMagicString = "PTCohd\0\0";
|
||||||
private const string InnerHeaderMagicString = "PTCihd\0\0";
|
private const string InnerHeaderMagicString = "PTCihd\0\0";
|
||||||
|
|
||||||
private const uint InternalVersion = 5292; //! To be incremented manually for each change to the ARMeilleure project.
|
private const uint InternalVersion = 5343; //! To be incremented manually for each change to the ARMeilleure project.
|
||||||
|
|
||||||
private const string ActualDir = "0";
|
private const string ActualDir = "0";
|
||||||
private const string BackupDir = "1";
|
private const string BackupDir = "1";
|
||||||
@ -880,7 +880,7 @@ namespace ARMeilleure.Translation.PTC
|
|||||||
|
|
||||||
private void ReportProgress(object state)
|
private void ReportProgress(object state)
|
||||||
{
|
{
|
||||||
const int refreshRate = 50; // ms.
|
const int RefreshRate = 50; // ms.
|
||||||
|
|
||||||
AutoResetEvent endEvent = (AutoResetEvent)state;
|
AutoResetEvent endEvent = (AutoResetEvent)state;
|
||||||
|
|
||||||
@ -896,7 +896,7 @@ namespace ARMeilleure.Translation.PTC
|
|||||||
count = newCount;
|
count = newCount;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
while (!endEvent.WaitOne(refreshRate));
|
while (!endEvent.WaitOne(RefreshRate));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Hash128 ComputeHash(IMemoryManager memory, ulong address, ulong guestSize)
|
public static Hash128 ComputeHash(IMemoryManager memory, ulong address, ulong guestSize)
|
||||||
|
@ -16,17 +16,17 @@ namespace Ryujinx.Audio
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Events signaled when the driver played audio buffers.
|
/// Events signaled when the driver played audio buffers.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private ManualResetEvent[] _updateRequiredEvents;
|
private readonly ManualResetEvent[] _updateRequiredEvents;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Action to execute when the driver played audio buffers.
|
/// Action to execute when the driver played audio buffers.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private Action[] _actions;
|
private readonly Action[] _actions;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The worker thread in charge of handling sessions update.
|
/// The worker thread in charge of handling sessions update.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private Thread _workerThread;
|
private readonly Thread _workerThread;
|
||||||
|
|
||||||
private bool _isRunning;
|
private bool _isRunning;
|
||||||
|
|
||||||
@ -44,7 +44,7 @@ namespace Ryujinx.Audio
|
|||||||
|
|
||||||
_workerThread = new Thread(Update)
|
_workerThread = new Thread(Update)
|
||||||
{
|
{
|
||||||
Name = "AudioManager.Worker"
|
Name = "AudioManager.Worker",
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -115,6 +115,7 @@ namespace Ryujinx.Audio
|
|||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
|
GC.SuppressFinalize(this);
|
||||||
Dispose(true);
|
Dispose(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -66,10 +66,7 @@ namespace Ryujinx.Audio.Backends.Common
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (buffer.Data == null)
|
buffer.Data ??= samples;
|
||||||
{
|
|
||||||
buffer.Data = samples;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -6,14 +6,13 @@ using Ryujinx.Common.Logging;
|
|||||||
using Ryujinx.Memory;
|
using Ryujinx.Memory;
|
||||||
using System;
|
using System;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
|
|
||||||
using static Ryujinx.Audio.Integration.IHardwareDeviceDriver;
|
using static Ryujinx.Audio.Integration.IHardwareDeviceDriver;
|
||||||
|
|
||||||
namespace Ryujinx.Audio.Backends.CompatLayer
|
namespace Ryujinx.Audio.Backends.CompatLayer
|
||||||
{
|
{
|
||||||
public class CompatLayerHardwareDeviceDriver : IHardwareDeviceDriver
|
public class CompatLayerHardwareDeviceDriver : IHardwareDeviceDriver
|
||||||
{
|
{
|
||||||
private IHardwareDeviceDriver _realDriver;
|
private readonly IHardwareDeviceDriver _realDriver;
|
||||||
|
|
||||||
public static bool IsSupported => true;
|
public static bool IsSupported => true;
|
||||||
|
|
||||||
@ -24,6 +23,7 @@ namespace Ryujinx.Audio.Backends.CompatLayer
|
|||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
|
GC.SuppressFinalize(this);
|
||||||
_realDriver.Dispose();
|
_realDriver.Dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -49,7 +49,7 @@ namespace Ryujinx.Audio.Backends.CompatLayer
|
|||||||
6 => SelectHardwareChannelCount(2),
|
6 => SelectHardwareChannelCount(2),
|
||||||
2 => SelectHardwareChannelCount(1),
|
2 => SelectHardwareChannelCount(1),
|
||||||
1 => throw new ArgumentException("No valid channel configuration found!"),
|
1 => throw new ArgumentException("No valid channel configuration found!"),
|
||||||
_ => throw new ArgumentException($"Invalid targetChannelCount {targetChannelCount}")
|
_ => throw new ArgumentException($"Invalid targetChannelCount {targetChannelCount}"),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -110,7 +110,7 @@ namespace Ryujinx.Audio.Backends.CompatLayer
|
|||||||
{
|
{
|
||||||
Logger.Warning?.Print(LogClass.Audio, "The selected audio backend doesn't support audio input, fallback to dummy...");
|
Logger.Warning?.Print(LogClass.Audio, "The selected audio backend doesn't support audio input, fallback to dummy...");
|
||||||
|
|
||||||
return new DummyHardwareDeviceSessionInput(this, memoryManager, sampleFormat, sampleRate, channelCount);
|
return new DummyHardwareDeviceSessionInput(this, memoryManager);
|
||||||
}
|
}
|
||||||
|
|
||||||
throw new NotImplementedException();
|
throw new NotImplementedException();
|
||||||
@ -138,12 +138,12 @@ namespace Ryujinx.Audio.Backends.CompatLayer
|
|||||||
|
|
||||||
if (direction == Direction.Input)
|
if (direction == Direction.Input)
|
||||||
{
|
{
|
||||||
Logger.Warning?.Print(LogClass.Audio, $"The selected audio backend doesn't support the requested audio input configuration, fallback to dummy...");
|
Logger.Warning?.Print(LogClass.Audio, "The selected audio backend doesn't support the requested audio input configuration, fallback to dummy...");
|
||||||
|
|
||||||
// TODO: We currently don't support audio input upsampling/downsampling, implement this.
|
// TODO: We currently don't support audio input upsampling/downsampling, implement this.
|
||||||
realSession.Dispose();
|
realSession.Dispose();
|
||||||
|
|
||||||
return new DummyHardwareDeviceSessionInput(this, memoryManager, sampleFormat, sampleRate, channelCount);
|
return new DummyHardwareDeviceSessionInput(this, memoryManager);
|
||||||
}
|
}
|
||||||
|
|
||||||
// It must be a HardwareDeviceSessionOutputBase.
|
// It must be a HardwareDeviceSessionOutputBase.
|
||||||
|
@ -8,9 +8,9 @@ namespace Ryujinx.Audio.Backends.CompatLayer
|
|||||||
{
|
{
|
||||||
class CompatLayerHardwareDeviceSession : HardwareDeviceSessionOutputBase
|
class CompatLayerHardwareDeviceSession : HardwareDeviceSessionOutputBase
|
||||||
{
|
{
|
||||||
private HardwareDeviceSessionOutputBase _realSession;
|
private readonly HardwareDeviceSessionOutputBase _realSession;
|
||||||
private SampleFormat _userSampleFormat;
|
private readonly SampleFormat _userSampleFormat;
|
||||||
private uint _userChannelCount;
|
private readonly uint _userChannelCount;
|
||||||
|
|
||||||
public CompatLayerHardwareDeviceSession(HardwareDeviceSessionOutputBase realSession, SampleFormat userSampleFormat, uint userChannelCount) : base(realSession.MemoryManager, realSession.RequestedSampleFormat, realSession.RequestedSampleRate, userChannelCount)
|
public CompatLayerHardwareDeviceSession(HardwareDeviceSessionOutputBase realSession, SampleFormat userSampleFormat, uint userChannelCount) : base(realSession.MemoryManager, realSession.RequestedSampleFormat, realSession.RequestedSampleRate, userChannelCount)
|
||||||
{
|
{
|
||||||
@ -116,11 +116,11 @@ namespace Ryujinx.Audio.Backends.CompatLayer
|
|||||||
samples = MemoryMarshal.Cast<short, byte>(samplesPCM16).ToArray();
|
samples = MemoryMarshal.Cast<short, byte>(samplesPCM16).ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
AudioBuffer fakeBuffer = new AudioBuffer
|
AudioBuffer fakeBuffer = new()
|
||||||
{
|
{
|
||||||
BufferTag = buffer.BufferTag,
|
BufferTag = buffer.BufferTag,
|
||||||
DataPointer = buffer.DataPointer,
|
DataPointer = buffer.DataPointer,
|
||||||
DataSize = (ulong)samples.Length
|
DataSize = (ulong)samples.Length,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool result = _realSession.RegisterBuffer(fakeBuffer, samples);
|
bool result = _realSession.RegisterBuffer(fakeBuffer, samples);
|
||||||
|
@ -31,18 +31,18 @@ namespace Ryujinx.Audio.Backends.CompatLayer
|
|||||||
private const int Minus6dBInQ15 = (int)(0.501f * RawQ15One);
|
private const int Minus6dBInQ15 = (int)(0.501f * RawQ15One);
|
||||||
private const int Minus12dBInQ15 = (int)(0.251f * RawQ15One);
|
private const int Minus12dBInQ15 = (int)(0.251f * RawQ15One);
|
||||||
|
|
||||||
private static readonly int[] DefaultSurroundToStereoCoefficients = new int[4]
|
private static readonly int[] _defaultSurroundToStereoCoefficients = new int[4]
|
||||||
{
|
{
|
||||||
RawQ15One,
|
RawQ15One,
|
||||||
Minus3dBInQ15,
|
Minus3dBInQ15,
|
||||||
Minus12dBInQ15,
|
Minus12dBInQ15,
|
||||||
Minus3dBInQ15
|
Minus3dBInQ15,
|
||||||
};
|
};
|
||||||
|
|
||||||
private static readonly int[] DefaultStereoToMonoCoefficients = new int[2]
|
private static readonly int[] _defaultStereoToMonoCoefficients = new int[2]
|
||||||
{
|
{
|
||||||
Minus6dBInQ15,
|
Minus6dBInQ15,
|
||||||
Minus6dBInQ15
|
Minus6dBInQ15,
|
||||||
};
|
};
|
||||||
|
|
||||||
private const int SurroundChannelCount = 6;
|
private const int SurroundChannelCount = 6;
|
||||||
@ -114,12 +114,12 @@ namespace Ryujinx.Audio.Backends.CompatLayer
|
|||||||
|
|
||||||
public static short[] DownMixStereoToMono(ReadOnlySpan<short> data)
|
public static short[] DownMixStereoToMono(ReadOnlySpan<short> data)
|
||||||
{
|
{
|
||||||
return DownMixStereoToMono(DefaultStereoToMonoCoefficients, data);
|
return DownMixStereoToMono(_defaultStereoToMonoCoefficients, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static short[] DownMixSurroundToStereo(ReadOnlySpan<short> data)
|
public static short[] DownMixSurroundToStereo(ReadOnlySpan<short> data)
|
||||||
{
|
{
|
||||||
return DownMixSurroundToStereo(DefaultSurroundToStereoCoefficients, data);
|
return DownMixSurroundToStereo(_defaultSurroundToStereoCoefficients, data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,16 +1,16 @@
|
|||||||
using Ryujinx.Audio.Common;
|
using Ryujinx.Audio.Common;
|
||||||
using Ryujinx.Audio.Integration;
|
using Ryujinx.Audio.Integration;
|
||||||
using Ryujinx.Memory;
|
using Ryujinx.Memory;
|
||||||
|
using System;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
|
|
||||||
using static Ryujinx.Audio.Integration.IHardwareDeviceDriver;
|
using static Ryujinx.Audio.Integration.IHardwareDeviceDriver;
|
||||||
|
|
||||||
namespace Ryujinx.Audio.Backends.Dummy
|
namespace Ryujinx.Audio.Backends.Dummy
|
||||||
{
|
{
|
||||||
public class DummyHardwareDeviceDriver : IHardwareDeviceDriver
|
public class DummyHardwareDeviceDriver : IHardwareDeviceDriver
|
||||||
{
|
{
|
||||||
private ManualResetEvent _updateRequiredEvent;
|
private readonly ManualResetEvent _updateRequiredEvent;
|
||||||
private ManualResetEvent _pauseEvent;
|
private readonly ManualResetEvent _pauseEvent;
|
||||||
|
|
||||||
public static bool IsSupported => true;
|
public static bool IsSupported => true;
|
||||||
|
|
||||||
@ -36,10 +36,8 @@ namespace Ryujinx.Audio.Backends.Dummy
|
|||||||
{
|
{
|
||||||
return new DummyHardwareDeviceSessionOutput(this, memoryManager, sampleFormat, sampleRate, channelCount, volume);
|
return new DummyHardwareDeviceSessionOutput(this, memoryManager, sampleFormat, sampleRate, channelCount, volume);
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
return new DummyHardwareDeviceSessionInput(this, memoryManager);
|
||||||
return new DummyHardwareDeviceSessionInput(this, memoryManager, sampleFormat, sampleRate, channelCount);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public ManualResetEvent GetUpdateRequiredEvent()
|
public ManualResetEvent GetUpdateRequiredEvent()
|
||||||
@ -54,6 +52,7 @@ namespace Ryujinx.Audio.Backends.Dummy
|
|||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
|
GC.SuppressFinalize(this);
|
||||||
Dispose(true);
|
Dispose(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -8,10 +8,10 @@ namespace Ryujinx.Audio.Backends.Dummy
|
|||||||
class DummyHardwareDeviceSessionInput : IHardwareDeviceSession
|
class DummyHardwareDeviceSessionInput : IHardwareDeviceSession
|
||||||
{
|
{
|
||||||
private float _volume;
|
private float _volume;
|
||||||
private IHardwareDeviceDriver _manager;
|
private readonly IHardwareDeviceDriver _manager;
|
||||||
private IVirtualMemoryManager _memoryManager;
|
private readonly IVirtualMemoryManager _memoryManager;
|
||||||
|
|
||||||
public DummyHardwareDeviceSessionInput(IHardwareDeviceDriver manager, IVirtualMemoryManager memoryManager, SampleFormat requestedSampleFormat, uint requestedSampleRate, uint requestedChannelCount)
|
public DummyHardwareDeviceSessionInput(IHardwareDeviceDriver manager, IVirtualMemoryManager memoryManager)
|
||||||
{
|
{
|
||||||
_volume = 1.0f;
|
_volume = 1.0f;
|
||||||
_manager = manager;
|
_manager = manager;
|
||||||
|
@ -9,7 +9,7 @@ namespace Ryujinx.Audio.Backends.Dummy
|
|||||||
internal class DummyHardwareDeviceSessionOutput : HardwareDeviceSessionOutputBase
|
internal class DummyHardwareDeviceSessionOutput : HardwareDeviceSessionOutputBase
|
||||||
{
|
{
|
||||||
private float _volume;
|
private float _volume;
|
||||||
private IHardwareDeviceDriver _manager;
|
private readonly IHardwareDeviceDriver _manager;
|
||||||
|
|
||||||
private ulong _playedSampleCount;
|
private ulong _playedSampleCount;
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@ namespace Ryujinx.Audio.Common
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Array of all buffers currently used or released.
|
/// Array of all buffers currently used or released.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private AudioBuffer[] _buffers;
|
private readonly AudioBuffer[] _buffers;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The server index inside <see cref="_buffers"/> (appended but not queued to device driver).
|
/// The server index inside <see cref="_buffers"/> (appended but not queued to device driver).
|
||||||
@ -58,17 +58,17 @@ namespace Ryujinx.Audio.Common
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// The released buffer event.
|
/// The released buffer event.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private IWritableEvent _bufferEvent;
|
private readonly IWritableEvent _bufferEvent;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The session on the device driver.
|
/// The session on the device driver.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private IHardwareDeviceSession _hardwareDeviceSession;
|
private readonly IHardwareDeviceSession _hardwareDeviceSession;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Max number of buffers that can be registered to the device driver at a time.
|
/// Max number of buffers that can be registered to the device driver at a time.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private uint _bufferRegisteredLimit;
|
private readonly uint _bufferRegisteredLimit;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Create a new <see cref="AudioDeviceSession"/>.
|
/// Create a new <see cref="AudioDeviceSession"/>.
|
||||||
@ -311,9 +311,9 @@ namespace Ryujinx.Audio.Common
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool AppendUacBuffer(AudioBuffer buffer, uint handle)
|
public static bool AppendUacBuffer(AudioBuffer buffer, uint handle)
|
||||||
{
|
{
|
||||||
// NOTE: On hardware, there is another RegisterBuffer method taking an handle.
|
// NOTE: On hardware, there is another RegisterBuffer method taking a handle.
|
||||||
// This variant of the call always return false (stubbed?) as a result this logic will never succeed.
|
// This variant of the call always return false (stubbed?) as a result this logic will never succeed.
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
@ -425,11 +425,9 @@ namespace Ryujinx.Audio.Common
|
|||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
return _hardwareDeviceSession.GetPlayedSampleCount();
|
return _hardwareDeviceSession.GetPlayedSampleCount();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Flush all buffers to the initial state.
|
/// Flush all buffers to the initial state.
|
||||||
|
@ -13,6 +13,6 @@ namespace Ryujinx.Audio.Common
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// The audio device is stopped.
|
/// The audio device is stopped.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
Stopped
|
Stopped,
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -24,6 +24,6 @@ namespace Ryujinx.Audio.Common
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Reserved/unused.
|
/// Reserved/unused.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private ushort _reserved;
|
private readonly ushort _reserved;
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -38,6 +38,6 @@ namespace Ryujinx.Audio.Common
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// ADPCM sample format. (Also known as GC-ADPCM)
|
/// ADPCM sample format. (Also known as GC-ADPCM)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
Adpcm = 6
|
Adpcm = 6,
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -24,7 +24,7 @@ namespace Ryujinx.Audio.Input
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// The session ids allocation table.
|
/// The session ids allocation table.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private int[] _sessionIds;
|
private readonly int[] _sessionIds;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The device driver.
|
/// The device driver.
|
||||||
@ -39,7 +39,7 @@ namespace Ryujinx.Audio.Input
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// The <see cref="AudioInputSystem"/> session instances.
|
/// The <see cref="AudioInputSystem"/> session instances.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private AudioInputSystem[] _sessions;
|
private readonly AudioInputSystem[] _sessions;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The count of active sessions.
|
/// The count of active sessions.
|
||||||
@ -166,6 +166,7 @@ namespace Ryujinx.Audio.Input
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="filtered">If true, filter disconnected devices</param>
|
/// <param name="filtered">If true, filter disconnected devices</param>
|
||||||
/// <returns>The list of all audio inputs name</returns>
|
/// <returns>The list of all audio inputs name</returns>
|
||||||
|
#pragma warning disable CA1822 // Mark member as static
|
||||||
public string[] ListAudioIns(bool filtered)
|
public string[] ListAudioIns(bool filtered)
|
||||||
{
|
{
|
||||||
if (filtered)
|
if (filtered)
|
||||||
@ -173,8 +174,9 @@ namespace Ryujinx.Audio.Input
|
|||||||
// TODO: Detect if the driver supports audio input
|
// TODO: Detect if the driver supports audio input
|
||||||
}
|
}
|
||||||
|
|
||||||
return new string[] { Constants.DefaultDeviceInputName };
|
return new[] { Constants.DefaultDeviceInputName };
|
||||||
}
|
}
|
||||||
|
#pragma warning restore CA1822
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Open a new <see cref="AudioInputSystem"/>.
|
/// Open a new <see cref="AudioInputSystem"/>.
|
||||||
@ -205,7 +207,7 @@ namespace Ryujinx.Audio.Input
|
|||||||
|
|
||||||
IHardwareDeviceSession deviceSession = _deviceDriver.OpenDeviceSession(IHardwareDeviceDriver.Direction.Input, memoryManager, sampleFormat, parameter.SampleRate, parameter.ChannelCount);
|
IHardwareDeviceSession deviceSession = _deviceDriver.OpenDeviceSession(IHardwareDeviceDriver.Direction.Input, memoryManager, sampleFormat, parameter.SampleRate, parameter.ChannelCount);
|
||||||
|
|
||||||
AudioInputSystem audioIn = new AudioInputSystem(this, _lock, deviceSession, _sessionsBufferEvents[sessionId]);
|
AudioInputSystem audioIn = new(this, _lock, deviceSession, _sessionsBufferEvents[sessionId]);
|
||||||
|
|
||||||
ResultCode result = audioIn.Initialize(inputDeviceName, sampleFormat, ref parameter, sessionId);
|
ResultCode result = audioIn.Initialize(inputDeviceName, sampleFormat, ref parameter, sessionId);
|
||||||
|
|
||||||
@ -238,6 +240,8 @@ namespace Ryujinx.Audio.Input
|
|||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
|
GC.SuppressFinalize(this);
|
||||||
|
|
||||||
if (Interlocked.CompareExchange(ref _disposeState, 1, 0) == 0)
|
if (Interlocked.CompareExchange(ref _disposeState, 1, 0) == 0)
|
||||||
{
|
{
|
||||||
Dispose(true);
|
Dispose(true);
|
||||||
|
@ -18,7 +18,7 @@ namespace Ryujinx.Audio.Input
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// The session the <see cref="AudioInputSystem"/>.
|
/// The session the <see cref="AudioInputSystem"/>.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private AudioDeviceSession _session;
|
private readonly AudioDeviceSession _session;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The target device name of the <see cref="AudioInputSystem"/>.
|
/// The target device name of the <see cref="AudioInputSystem"/>.
|
||||||
@ -43,7 +43,7 @@ namespace Ryujinx.Audio.Input
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// The <see cref="AudioInputManager"/> owning this.
|
/// The <see cref="AudioInputManager"/> owning this.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private AudioInputManager _manager;
|
private readonly AudioInputManager _manager;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The lock of the parent.
|
/// The lock of the parent.
|
||||||
@ -90,11 +90,13 @@ namespace Ryujinx.Audio.Input
|
|||||||
{
|
{
|
||||||
return ResultCode.DeviceNotFound;
|
return ResultCode.DeviceNotFound;
|
||||||
}
|
}
|
||||||
else if (configuration.SampleRate != 0 && configuration.SampleRate != Constants.TargetSampleRate)
|
|
||||||
|
if (configuration.SampleRate != 0 && configuration.SampleRate != Constants.TargetSampleRate)
|
||||||
{
|
{
|
||||||
return ResultCode.UnsupportedSampleRate;
|
return ResultCode.UnsupportedSampleRate;
|
||||||
}
|
}
|
||||||
else if (configuration.ChannelCount != 0 && configuration.ChannelCount != 1 && configuration.ChannelCount != 2 && configuration.ChannelCount != 6)
|
|
||||||
|
if (configuration.ChannelCount != 0 && configuration.ChannelCount != 1 && configuration.ChannelCount != 2 && configuration.ChannelCount != 6)
|
||||||
{
|
{
|
||||||
return ResultCode.UnsupportedChannelConfiguration;
|
return ResultCode.UnsupportedChannelConfiguration;
|
||||||
}
|
}
|
||||||
@ -185,11 +187,11 @@ namespace Ryujinx.Audio.Input
|
|||||||
{
|
{
|
||||||
lock (_parentLock)
|
lock (_parentLock)
|
||||||
{
|
{
|
||||||
AudioBuffer buffer = new AudioBuffer
|
AudioBuffer buffer = new()
|
||||||
{
|
{
|
||||||
BufferTag = bufferTag,
|
BufferTag = bufferTag,
|
||||||
DataPointer = userBuffer.Data,
|
DataPointer = userBuffer.Data,
|
||||||
DataSize = userBuffer.DataSize
|
DataSize = userBuffer.DataSize,
|
||||||
};
|
};
|
||||||
|
|
||||||
if (_session.AppendBuffer(buffer))
|
if (_session.AppendBuffer(buffer))
|
||||||
@ -213,14 +215,14 @@ namespace Ryujinx.Audio.Input
|
|||||||
{
|
{
|
||||||
lock (_parentLock)
|
lock (_parentLock)
|
||||||
{
|
{
|
||||||
AudioBuffer buffer = new AudioBuffer
|
AudioBuffer buffer = new()
|
||||||
{
|
{
|
||||||
BufferTag = bufferTag,
|
BufferTag = bufferTag,
|
||||||
DataPointer = userBuffer.Data,
|
DataPointer = userBuffer.Data,
|
||||||
DataSize = userBuffer.DataSize
|
DataSize = userBuffer.DataSize,
|
||||||
};
|
};
|
||||||
|
|
||||||
if (_session.AppendUacBuffer(buffer, handle))
|
if (AudioDeviceSession.AppendUacBuffer(buffer, handle))
|
||||||
{
|
{
|
||||||
return ResultCode.Success;
|
return ResultCode.Success;
|
||||||
}
|
}
|
||||||
@ -373,6 +375,8 @@ namespace Ryujinx.Audio.Input
|
|||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
|
GC.SuppressFinalize(this);
|
||||||
|
|
||||||
if (Interlocked.CompareExchange(ref _disposeState, 1, 0) == 0)
|
if (Interlocked.CompareExchange(ref _disposeState, 1, 0) == 0)
|
||||||
{
|
{
|
||||||
Dispose(true);
|
Dispose(true);
|
||||||
|
@ -6,12 +6,12 @@ namespace Ryujinx.Audio.Integration
|
|||||||
{
|
{
|
||||||
public class HardwareDeviceImpl : IHardwareDevice
|
public class HardwareDeviceImpl : IHardwareDevice
|
||||||
{
|
{
|
||||||
private IHardwareDeviceSession _session;
|
private readonly IHardwareDeviceSession _session;
|
||||||
private uint _channelCount;
|
private readonly uint _channelCount;
|
||||||
private uint _sampleRate;
|
private readonly uint _sampleRate;
|
||||||
private uint _currentBufferTag;
|
private uint _currentBufferTag;
|
||||||
|
|
||||||
private byte[] _buffer;
|
private readonly byte[] _buffer;
|
||||||
|
|
||||||
public HardwareDeviceImpl(IHardwareDeviceDriver deviceDriver, uint channelCount, uint sampleRate, float volume)
|
public HardwareDeviceImpl(IHardwareDeviceDriver deviceDriver, uint channelCount, uint sampleRate, float volume)
|
||||||
{
|
{
|
||||||
@ -36,7 +36,7 @@ namespace Ryujinx.Audio.Integration
|
|||||||
DataSize = (ulong)_buffer.Length,
|
DataSize = (ulong)_buffer.Length,
|
||||||
});
|
});
|
||||||
|
|
||||||
_currentBufferTag = _currentBufferTag % 4;
|
_currentBufferTag %= 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetVolume(float volume)
|
public void SetVolume(float volume)
|
||||||
@ -61,6 +61,7 @@ namespace Ryujinx.Audio.Integration
|
|||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
|
GC.SuppressFinalize(this);
|
||||||
Dispose(true);
|
Dispose(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ namespace Ryujinx.Audio.Integration
|
|||||||
public enum Direction
|
public enum Direction
|
||||||
{
|
{
|
||||||
Input,
|
Input,
|
||||||
Output
|
Output,
|
||||||
}
|
}
|
||||||
|
|
||||||
IHardwareDeviceSession OpenDeviceSession(Direction direction, IVirtualMemoryManager memoryManager, SampleFormat sampleFormat, uint sampleRate, uint channelCount, float volume = 1f);
|
IHardwareDeviceSession OpenDeviceSession(Direction direction, IVirtualMemoryManager memoryManager, SampleFormat sampleFormat, uint sampleRate, uint channelCount, float volume = 1f);
|
||||||
|
@ -24,7 +24,7 @@ namespace Ryujinx.Audio.Output
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// The session ids allocation table.
|
/// The session ids allocation table.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private int[] _sessionIds;
|
private readonly int[] _sessionIds;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The device driver.
|
/// The device driver.
|
||||||
@ -39,7 +39,7 @@ namespace Ryujinx.Audio.Output
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// The <see cref="AudioOutputSystem"/> session instances.
|
/// The <see cref="AudioOutputSystem"/> session instances.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private AudioOutputSystem[] _sessions;
|
private readonly AudioOutputSystem[] _sessions;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The count of active sessions.
|
/// The count of active sessions.
|
||||||
@ -165,10 +165,12 @@ namespace Ryujinx.Audio.Output
|
|||||||
/// Get the list of all audio outputs name.
|
/// Get the list of all audio outputs name.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>The list of all audio outputs name</returns>
|
/// <returns>The list of all audio outputs name</returns>
|
||||||
|
#pragma warning disable CA1822 // Mark member as static
|
||||||
public string[] ListAudioOuts()
|
public string[] ListAudioOuts()
|
||||||
{
|
{
|
||||||
return new string[] { Constants.DefaultDeviceOutputName };
|
return new[] { Constants.DefaultDeviceOutputName };
|
||||||
}
|
}
|
||||||
|
#pragma warning restore CA1822
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Open a new <see cref="AudioOutputSystem"/>.
|
/// Open a new <see cref="AudioOutputSystem"/>.
|
||||||
@ -182,6 +184,7 @@ namespace Ryujinx.Audio.Output
|
|||||||
/// <param name="parameter">The user configuration</param>
|
/// <param name="parameter">The user configuration</param>
|
||||||
/// <param name="appletResourceUserId">The applet resource user id of the application</param>
|
/// <param name="appletResourceUserId">The applet resource user id of the application</param>
|
||||||
/// <param name="processHandle">The process handle of the application</param>
|
/// <param name="processHandle">The process handle of the application</param>
|
||||||
|
/// <param name="volume">The volume level to request</param>
|
||||||
/// <returns>A <see cref="ResultCode"/> reporting an error or a success</returns>
|
/// <returns>A <see cref="ResultCode"/> reporting an error or a success</returns>
|
||||||
public ResultCode OpenAudioOut(out string outputDeviceName,
|
public ResultCode OpenAudioOut(out string outputDeviceName,
|
||||||
out AudioOutputConfiguration outputConfiguration,
|
out AudioOutputConfiguration outputConfiguration,
|
||||||
@ -200,7 +203,7 @@ namespace Ryujinx.Audio.Output
|
|||||||
|
|
||||||
IHardwareDeviceSession deviceSession = _deviceDriver.OpenDeviceSession(IHardwareDeviceDriver.Direction.Output, memoryManager, sampleFormat, parameter.SampleRate, parameter.ChannelCount, volume);
|
IHardwareDeviceSession deviceSession = _deviceDriver.OpenDeviceSession(IHardwareDeviceDriver.Direction.Output, memoryManager, sampleFormat, parameter.SampleRate, parameter.ChannelCount, volume);
|
||||||
|
|
||||||
AudioOutputSystem audioOut = new AudioOutputSystem(this, _lock, deviceSession, _sessionsBufferEvents[sessionId]);
|
AudioOutputSystem audioOut = new(this, _lock, deviceSession, _sessionsBufferEvents[sessionId]);
|
||||||
|
|
||||||
ResultCode result = audioOut.Initialize(inputDeviceName, sampleFormat, ref parameter, sessionId);
|
ResultCode result = audioOut.Initialize(inputDeviceName, sampleFormat, ref parameter, sessionId);
|
||||||
|
|
||||||
@ -268,6 +271,8 @@ namespace Ryujinx.Audio.Output
|
|||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
|
GC.SuppressFinalize(this);
|
||||||
|
|
||||||
if (Interlocked.CompareExchange(ref _disposeState, 1, 0) == 0)
|
if (Interlocked.CompareExchange(ref _disposeState, 1, 0) == 0)
|
||||||
{
|
{
|
||||||
Dispose(true);
|
Dispose(true);
|
||||||
|
@ -18,7 +18,7 @@ namespace Ryujinx.Audio.Output
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// The session the <see cref="AudioOutputSystem"/>.
|
/// The session the <see cref="AudioOutputSystem"/>.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private AudioDeviceSession _session;
|
private readonly AudioDeviceSession _session;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The target device name of the <see cref="AudioOutputSystem"/>.
|
/// The target device name of the <see cref="AudioOutputSystem"/>.
|
||||||
@ -43,7 +43,7 @@ namespace Ryujinx.Audio.Output
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// The <see cref="AudioOutputManager"/> owning this.
|
/// The <see cref="AudioOutputManager"/> owning this.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private AudioOutputManager _manager;
|
private readonly AudioOutputManager _manager;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// THe lock of the parent.
|
/// THe lock of the parent.
|
||||||
@ -90,11 +90,13 @@ namespace Ryujinx.Audio.Output
|
|||||||
{
|
{
|
||||||
return ResultCode.DeviceNotFound;
|
return ResultCode.DeviceNotFound;
|
||||||
}
|
}
|
||||||
else if (configuration.SampleRate != 0 && configuration.SampleRate != Constants.TargetSampleRate)
|
|
||||||
|
if (configuration.SampleRate != 0 && configuration.SampleRate != Constants.TargetSampleRate)
|
||||||
{
|
{
|
||||||
return ResultCode.UnsupportedSampleRate;
|
return ResultCode.UnsupportedSampleRate;
|
||||||
}
|
}
|
||||||
else if (configuration.ChannelCount != 0 && configuration.ChannelCount != 1 && configuration.ChannelCount != 2 && configuration.ChannelCount != 6)
|
|
||||||
|
if (configuration.ChannelCount != 0 && configuration.ChannelCount != 1 && configuration.ChannelCount != 2 && configuration.ChannelCount != 6)
|
||||||
{
|
{
|
||||||
return ResultCode.UnsupportedChannelConfiguration;
|
return ResultCode.UnsupportedChannelConfiguration;
|
||||||
}
|
}
|
||||||
@ -185,11 +187,11 @@ namespace Ryujinx.Audio.Output
|
|||||||
{
|
{
|
||||||
lock (_parentLock)
|
lock (_parentLock)
|
||||||
{
|
{
|
||||||
AudioBuffer buffer = new AudioBuffer
|
AudioBuffer buffer = new()
|
||||||
{
|
{
|
||||||
BufferTag = bufferTag,
|
BufferTag = bufferTag,
|
||||||
DataPointer = userBuffer.Data,
|
DataPointer = userBuffer.Data,
|
||||||
DataSize = userBuffer.DataSize
|
DataSize = userBuffer.DataSize,
|
||||||
};
|
};
|
||||||
|
|
||||||
if (_session.AppendBuffer(buffer))
|
if (_session.AppendBuffer(buffer))
|
||||||
@ -346,6 +348,8 @@ namespace Ryujinx.Audio.Output
|
|||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
|
GC.SuppressFinalize(this);
|
||||||
|
|
||||||
if (Interlocked.CompareExchange(ref _disposeState, 1, 0) == 0)
|
if (Interlocked.CompareExchange(ref _disposeState, 1, 0) == 0)
|
||||||
{
|
{
|
||||||
Dispose(true);
|
Dispose(true);
|
||||||
|
@ -16,7 +16,7 @@ namespace Ryujinx.Audio.Renderer.Common
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Reserved/padding.
|
/// Reserved/padding.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private uint _padding;
|
private readonly uint _padding;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The flags given controlling behaviour of the audio renderer
|
/// The flags given controlling behaviour of the audio renderer
|
||||||
@ -38,7 +38,7 @@ namespace Ryujinx.Audio.Renderer.Common
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Reserved/padding.
|
/// Reserved/padding.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private uint _padding;
|
private readonly uint _padding;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Extra information given with the <see cref="ResultCode"/>
|
/// Extra information given with the <see cref="ResultCode"/>
|
||||||
|
@ -38,6 +38,6 @@ namespace Ryujinx.Audio.Renderer.Common
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// The memory pool is released. (client side only)
|
/// The memory pool is released. (client side only)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
Released = 6
|
Released = 6,
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -28,6 +28,6 @@ namespace Ryujinx.Audio.Renderer.Common
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Performance monitoring related node id (performance commands)
|
/// Performance monitoring related node id (performance commands)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
Performance = 15
|
Performance = 15,
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -53,17 +53,17 @@ namespace Ryujinx.Audio.Renderer.Common
|
|||||||
}
|
}
|
||||||
|
|
||||||
private int _nodeCount;
|
private int _nodeCount;
|
||||||
private EdgeMatrix _discovered;
|
private readonly EdgeMatrix _discovered;
|
||||||
private EdgeMatrix _finished;
|
private readonly EdgeMatrix _finished;
|
||||||
private Memory<int> _resultArray;
|
private Memory<int> _resultArray;
|
||||||
private Stack _stack;
|
private readonly Stack _stack;
|
||||||
private int _tsortResultIndex;
|
private int _tsortResultIndex;
|
||||||
|
|
||||||
private enum NodeState : byte
|
private enum NodeState : byte
|
||||||
{
|
{
|
||||||
Unknown,
|
Unknown,
|
||||||
Discovered,
|
Discovered,
|
||||||
Finished
|
Finished,
|
||||||
}
|
}
|
||||||
|
|
||||||
public NodeStates()
|
public NodeStates()
|
||||||
@ -88,16 +88,16 @@ namespace Ryujinx.Audio.Renderer.Common
|
|||||||
|
|
||||||
int edgeMatrixWorkBufferSize = EdgeMatrix.GetWorkBufferSize(nodeCount);
|
int edgeMatrixWorkBufferSize = EdgeMatrix.GetWorkBufferSize(nodeCount);
|
||||||
|
|
||||||
_discovered.Initialize(nodeStatesWorkBuffer.Slice(0, edgeMatrixWorkBufferSize), nodeCount);
|
_discovered.Initialize(nodeStatesWorkBuffer[..edgeMatrixWorkBufferSize], nodeCount);
|
||||||
_finished.Initialize(nodeStatesWorkBuffer.Slice(edgeMatrixWorkBufferSize, edgeMatrixWorkBufferSize), nodeCount);
|
_finished.Initialize(nodeStatesWorkBuffer.Slice(edgeMatrixWorkBufferSize, edgeMatrixWorkBufferSize), nodeCount);
|
||||||
|
|
||||||
nodeStatesWorkBuffer = nodeStatesWorkBuffer.Slice(edgeMatrixWorkBufferSize * 2);
|
nodeStatesWorkBuffer = nodeStatesWorkBuffer[(edgeMatrixWorkBufferSize * 2)..];
|
||||||
|
|
||||||
_resultArray = SpanMemoryManager<int>.Cast(nodeStatesWorkBuffer.Slice(0, sizeof(int) * nodeCount));
|
_resultArray = SpanMemoryManager<int>.Cast(nodeStatesWorkBuffer[..(sizeof(int) * nodeCount)]);
|
||||||
|
|
||||||
nodeStatesWorkBuffer = nodeStatesWorkBuffer.Slice(sizeof(int) * nodeCount);
|
nodeStatesWorkBuffer = nodeStatesWorkBuffer[(sizeof(int) * nodeCount)..];
|
||||||
|
|
||||||
Memory<int> stackWorkBuffer = SpanMemoryManager<int>.Cast(nodeStatesWorkBuffer.Slice(0, Stack.CalcBufferSize(nodeCount * nodeCount)));
|
Memory<int> stackWorkBuffer = SpanMemoryManager<int>.Cast(nodeStatesWorkBuffer[..Stack.CalcBufferSize(nodeCount * nodeCount)]);
|
||||||
|
|
||||||
_stack.Reset(stackWorkBuffer, nodeCount * nodeCount);
|
_stack.Reset(stackWorkBuffer, nodeCount * nodeCount);
|
||||||
}
|
}
|
||||||
@ -120,7 +120,8 @@ namespace Ryujinx.Audio.Renderer.Common
|
|||||||
|
|
||||||
return NodeState.Discovered;
|
return NodeState.Discovered;
|
||||||
}
|
}
|
||||||
else if (_finished.Test(index))
|
|
||||||
|
if (_finished.Test(index))
|
||||||
{
|
{
|
||||||
Debug.Assert(!_discovered.Test(index));
|
Debug.Assert(!_discovered.Test(index));
|
||||||
|
|
||||||
@ -158,7 +159,7 @@ namespace Ryujinx.Audio.Renderer.Common
|
|||||||
|
|
||||||
public ReadOnlySpan<int> GetTsortResult()
|
public ReadOnlySpan<int> GetTsortResult()
|
||||||
{
|
{
|
||||||
return _resultArray.Span.Slice(0, _tsortResultIndex);
|
return _resultArray.Span[.._tsortResultIndex];
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool Sort(EdgeMatrix edgeMatrix)
|
public bool Sort(EdgeMatrix edgeMatrix)
|
||||||
|
@ -15,6 +15,6 @@ namespace Ryujinx.Audio.Renderer.Common
|
|||||||
PcmFloat,
|
PcmFloat,
|
||||||
Limiter,
|
Limiter,
|
||||||
CaptureBuffer,
|
CaptureBuffer,
|
||||||
Compressor
|
Compressor,
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -6,6 +6,6 @@ namespace Ryujinx.Audio.Renderer.Common
|
|||||||
Voice,
|
Voice,
|
||||||
SubMix,
|
SubMix,
|
||||||
FinalMix,
|
FinalMix,
|
||||||
Sink
|
Sink,
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -18,6 +18,6 @@ namespace Ryujinx.Audio.Renderer.Common
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// The user request the voice to be paused.
|
/// The user request the voice to be paused.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
Pause
|
Pause,
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -28,6 +28,6 @@ namespace Ryujinx.Audio.Renderer.Common
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// No early reflection.
|
/// No early reflection.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
Disabled
|
Disabled,
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -33,6 +33,6 @@ namespace Ryujinx.Audio.Renderer.Common
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Max delay. (used for delay line limits)
|
/// Max delay. (used for delay line limits)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
Limit = NoDelay
|
Limit = NoDelay,
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -18,6 +18,6 @@ namespace Ryujinx.Audio.Renderer.Common
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// The sink is a circular buffer.
|
/// The sink is a circular buffer.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
CircularBuffer
|
CircularBuffer,
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,3 +1,4 @@
|
|||||||
|
using Ryujinx.Common.Memory;
|
||||||
using System.Runtime.CompilerServices;
|
using System.Runtime.CompilerServices;
|
||||||
|
|
||||||
namespace Ryujinx.Audio.Renderer.Common
|
namespace Ryujinx.Audio.Renderer.Common
|
||||||
@ -19,7 +20,9 @@ namespace Ryujinx.Audio.Renderer.Common
|
|||||||
public uint Unknown24;
|
public uint Unknown24;
|
||||||
public uint RenderInfoSize;
|
public uint RenderInfoSize;
|
||||||
|
|
||||||
private unsafe fixed int _reserved[4];
|
#pragma warning disable IDE0051, CS0169 // Remove unused field
|
||||||
|
private Array4<int> _reserved;
|
||||||
|
#pragma warning restore IDE0051, CS0169
|
||||||
|
|
||||||
public uint TotalSize;
|
public uint TotalSize;
|
||||||
|
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
using DspAddr = System.UInt64;
|
using DspAddr = System.UInt64;
|
||||||
|
|
||||||
namespace Ryujinx.Audio.Renderer.Common
|
namespace Ryujinx.Audio.Renderer.Common
|
||||||
@ -77,6 +76,6 @@ namespace Ryujinx.Audio.Renderer.Common
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Padding/Reserved.
|
/// Padding/Reserved.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private ushort _padding;
|
private readonly ushort _padding;
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -23,7 +23,7 @@ namespace Ryujinx.Audio.Renderer.Common
|
|||||||
|
|
||||||
if (size != 0)
|
if (size != 0)
|
||||||
{
|
{
|
||||||
ulong alignedOffset = BitUtils.AlignUp<ulong>(Offset, (ulong)align);
|
ulong alignedOffset = BitUtils.AlignUp(Offset, (ulong)align);
|
||||||
|
|
||||||
if (alignedOffset + size <= (ulong)BackingMemory.Length)
|
if (alignedOffset + size <= (ulong)BackingMemory.Length)
|
||||||
{
|
{
|
||||||
@ -32,7 +32,7 @@ namespace Ryujinx.Audio.Renderer.Common
|
|||||||
Offset = alignedOffset + size;
|
Offset = alignedOffset + size;
|
||||||
|
|
||||||
// Clear the memory to be sure that is does not contain any garbage.
|
// Clear the memory to be sure that is does not contain any garbage.
|
||||||
result.Span.Fill(0);
|
result.Span.Clear();
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
@ -55,7 +55,7 @@ namespace Ryujinx.Audio.Renderer.Common
|
|||||||
|
|
||||||
public static ulong GetTargetSize<T>(ulong currentSize, ulong count, int align) where T : unmanaged
|
public static ulong GetTargetSize<T>(ulong currentSize, ulong count, int align) where T : unmanaged
|
||||||
{
|
{
|
||||||
return BitUtils.AlignUp<ulong>(currentSize, (ulong)align) + (ulong)Unsafe.SizeOf<T>() * count;
|
return BitUtils.AlignUp(currentSize, (ulong)align) + (ulong)Unsafe.SizeOf<T>() * count;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -12,11 +12,11 @@ namespace Ryujinx.Audio.Renderer.Device
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public static readonly VirtualDevice[] Devices = new VirtualDevice[5]
|
public static readonly VirtualDevice[] Devices = new VirtualDevice[5]
|
||||||
{
|
{
|
||||||
new VirtualDevice("AudioStereoJackOutput", 2, true),
|
new("AudioStereoJackOutput", 2, true),
|
||||||
new VirtualDevice("AudioBuiltInSpeakerOutput", 2, false),
|
new("AudioBuiltInSpeakerOutput", 2, false),
|
||||||
new VirtualDevice("AudioTvOutput", 6, false),
|
new("AudioTvOutput", 6, false),
|
||||||
new VirtualDevice("AudioUsbDeviceOutput", 2, true),
|
new("AudioUsbDeviceOutput", 2, true),
|
||||||
new VirtualDevice("AudioExternalOutput", 6, true),
|
new("AudioExternalOutput", 6, true),
|
||||||
};
|
};
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -11,13 +11,15 @@ namespace Ryujinx.Audio.Renderer.Device
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// The session registry, used to store the sessions of a given AppletResourceId.
|
/// The session registry, used to store the sessions of a given AppletResourceId.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private Dictionary<ulong, VirtualDeviceSession[]> _sessionsRegistry = new Dictionary<ulong, VirtualDeviceSession[]>();
|
private readonly Dictionary<ulong, VirtualDeviceSession[]> _sessionsRegistry = new();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The default <see cref="VirtualDevice"/>.
|
/// The default <see cref="VirtualDevice"/>.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <remarks>This is used when the USB device is the default one on older revision.</remarks>
|
/// <remarks>This is used when the USB device is the default one on older revision.</remarks>
|
||||||
|
#pragma warning disable CA1822 // Mark member as static
|
||||||
public VirtualDevice DefaultDevice => VirtualDevice.Devices[0];
|
public VirtualDevice DefaultDevice => VirtualDevice.Devices[0];
|
||||||
|
#pragma warning restore CA1822
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The current active <see cref="VirtualDevice"/>.
|
/// The current active <see cref="VirtualDevice"/>.
|
||||||
|
@ -12,7 +12,9 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
private const int SamplesPerFrame = 14;
|
private const int SamplesPerFrame = 14;
|
||||||
private const int NibblesPerFrame = SamplesPerFrame + 2;
|
private const int NibblesPerFrame = SamplesPerFrame + 2;
|
||||||
private const int BytesPerFrame = 8;
|
private const int BytesPerFrame = 8;
|
||||||
|
#pragma warning disable IDE0051 // Remove unused private member
|
||||||
private const int BitsPerFrame = BytesPerFrame * 8;
|
private const int BitsPerFrame = BytesPerFrame * 8;
|
||||||
|
#pragma warning restore IDE0051
|
||||||
|
|
||||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
public static uint GetAdpcmDataSize(int sampleCount)
|
public static uint GetAdpcmDataSize(int sampleCount)
|
||||||
@ -64,10 +66,14 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
private static short Saturate(int value)
|
private static short Saturate(int value)
|
||||||
{
|
{
|
||||||
if (value > short.MaxValue)
|
if (value > short.MaxValue)
|
||||||
|
{
|
||||||
value = short.MaxValue;
|
value = short.MaxValue;
|
||||||
|
}
|
||||||
|
|
||||||
if (value < short.MinValue)
|
if (value < short.MinValue)
|
||||||
|
{
|
||||||
value = short.MinValue;
|
value = short.MinValue;
|
||||||
|
}
|
||||||
|
|
||||||
return (short)value;
|
return (short)value;
|
||||||
}
|
}
|
||||||
@ -109,7 +115,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
|
|
||||||
ReadOnlySpan<byte> targetInput;
|
ReadOnlySpan<byte> targetInput;
|
||||||
|
|
||||||
targetInput = input.Slice(nibbles / 2);
|
targetInput = input[(nibbles / 2)..];
|
||||||
|
|
||||||
while (remaining > 0)
|
while (remaining > 0)
|
||||||
{
|
{
|
||||||
|
@ -18,7 +18,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
Start,
|
Start,
|
||||||
Stop,
|
Stop,
|
||||||
RenderStart,
|
RenderStart,
|
||||||
RenderEnd
|
RenderEnd,
|
||||||
}
|
}
|
||||||
|
|
||||||
private class RendererSession
|
private class RendererSession
|
||||||
@ -36,7 +36,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
|
|
||||||
private long _lastTime;
|
private long _lastTime;
|
||||||
private long _playbackEnds;
|
private long _playbackEnds;
|
||||||
private ManualResetEvent _event;
|
private readonly ManualResetEvent _event;
|
||||||
|
|
||||||
private ManualResetEvent _pauseEvent;
|
private ManualResetEvent _pauseEvent;
|
||||||
|
|
||||||
@ -45,6 +45,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
_event = new ManualResetEvent(false);
|
_event = new ManualResetEvent(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#pragma warning disable IDE0051 // Remove unused private member
|
||||||
private static uint GetHardwareChannelCount(IHardwareDeviceDriver deviceDriver)
|
private static uint GetHardwareChannelCount(IHardwareDeviceDriver deviceDriver)
|
||||||
{
|
{
|
||||||
// Get the real device driver (In case the compat layer is on top of it).
|
// Get the real device driver (In case the compat layer is on top of it).
|
||||||
@ -54,12 +55,11 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
{
|
{
|
||||||
return 6;
|
return 6;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
// NOTE: We default to stereo as this will get downmixed to mono by the compat layer if it's not compatible.
|
// NOTE: We default to stereo as this will get downmixed to mono by the compat layer if it's not compatible.
|
||||||
return 2;
|
return 2;
|
||||||
}
|
}
|
||||||
}
|
#pragma warning restore IDE0051
|
||||||
|
|
||||||
public void Start(IHardwareDeviceDriver deviceDriver, float volume)
|
public void Start(IHardwareDeviceDriver deviceDriver, float volume)
|
||||||
{
|
{
|
||||||
@ -110,7 +110,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
{
|
{
|
||||||
CommandList = commands,
|
CommandList = commands,
|
||||||
RenderingLimit = renderingLimit,
|
RenderingLimit = renderingLimit,
|
||||||
AppletResourceId = appletResourceId
|
AppletResourceId = appletResourceId,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -171,7 +171,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
{
|
{
|
||||||
_workerThread = new Thread(Work)
|
_workerThread = new Thread(Work)
|
||||||
{
|
{
|
||||||
Name = "AudioProcessor.Worker"
|
Name = "AudioProcessor.Worker",
|
||||||
};
|
};
|
||||||
|
|
||||||
_workerThread.Start();
|
_workerThread.Start();
|
||||||
@ -260,6 +260,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
|
GC.SuppressFinalize(this);
|
||||||
Dispose(true);
|
Dispose(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,7 +1,9 @@
|
|||||||
using Ryujinx.Audio.Common;
|
using Ryujinx.Audio.Common;
|
||||||
using Ryujinx.Audio.Renderer.Common;
|
using Ryujinx.Audio.Renderer.Common;
|
||||||
|
using Ryujinx.Audio.Renderer.Server.Voice;
|
||||||
using System;
|
using System;
|
||||||
using static Ryujinx.Audio.Renderer.Parameter.VoiceInParameter;
|
using static Ryujinx.Audio.Renderer.Parameter.VoiceInParameter;
|
||||||
|
using WaveBuffer = Ryujinx.Audio.Renderer.Common.WaveBuffer;
|
||||||
|
|
||||||
namespace Ryujinx.Audio.Renderer.Dsp.Command
|
namespace Ryujinx.Audio.Renderer.Dsp.Command
|
||||||
{
|
{
|
||||||
@ -29,7 +31,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
|
|
||||||
public DecodingBehaviour DecodingBehaviour { get; }
|
public DecodingBehaviour DecodingBehaviour { get; }
|
||||||
|
|
||||||
public AdpcmDataSourceCommandVersion1(ref Server.Voice.VoiceState serverState, Memory<VoiceUpdateState> state, ushort outputBufferIndex, int nodeId)
|
public AdpcmDataSourceCommandVersion1(ref VoiceState serverState, Memory<VoiceUpdateState> state, ushort outputBufferIndex, int nodeId)
|
||||||
{
|
{
|
||||||
Enabled = true;
|
Enabled = true;
|
||||||
NodeId = nodeId;
|
NodeId = nodeId;
|
||||||
@ -57,7 +59,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
{
|
{
|
||||||
Span<float> outputBuffer = context.GetBuffer(OutputBufferIndex);
|
Span<float> outputBuffer = context.GetBuffer(OutputBufferIndex);
|
||||||
|
|
||||||
DataSourceHelper.WaveBufferInformation info = new DataSourceHelper.WaveBufferInformation
|
DataSourceHelper.WaveBufferInformation info = new()
|
||||||
{
|
{
|
||||||
SourceSampleRate = SampleRate,
|
SourceSampleRate = SampleRate,
|
||||||
SampleFormat = SampleFormat.Adpcm,
|
SampleFormat = SampleFormat.Adpcm,
|
||||||
|
@ -155,7 +155,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
|
|
||||||
if (readResult != context.SampleCount)
|
if (readResult != context.SampleCount)
|
||||||
{
|
{
|
||||||
outputBuffer.Slice((int)readResult, (int)context.SampleCount - (int)readResult).Fill(0);
|
outputBuffer[(int)readResult..(int)context.SampleCount].Clear();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -43,7 +43,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
|
|
||||||
public void Process(CommandList context)
|
public void Process(CommandList context)
|
||||||
{
|
{
|
||||||
const int targetChannelCount = 2;
|
const int TargetChannelCount = 2;
|
||||||
|
|
||||||
ulong currentOffset = CurrentOffset;
|
ulong currentOffset = CurrentOffset;
|
||||||
|
|
||||||
@ -59,10 +59,10 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
|
|
||||||
for (int y = 0; y < context.SampleCount; y++)
|
for (int y = 0; y < context.SampleCount; y++)
|
||||||
{
|
{
|
||||||
context.MemoryManager.Write(targetOffset + (ulong)y * targetChannelCount, PcmHelper.Saturate(inputBuffer[y]));
|
context.MemoryManager.Write(targetOffset + (ulong)y * TargetChannelCount, PcmHelper.Saturate(inputBuffer[y]));
|
||||||
}
|
}
|
||||||
|
|
||||||
currentOffset += context.SampleCount * targetChannelCount;
|
currentOffset += context.SampleCount * TargetChannelCount;
|
||||||
|
|
||||||
if (currentOffset >= CircularBufferSize)
|
if (currentOffset >= CircularBufferSize)
|
||||||
{
|
{
|
||||||
|
@ -71,7 +71,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
return (IntPtr)((float*)_buffersMemoryHandle.Pointer + index * _sampleCount);
|
return (IntPtr)((float*)_buffersMemoryHandle.Pointer + index * _sampleCount);
|
||||||
}
|
}
|
||||||
|
|
||||||
throw new ArgumentOutOfRangeException();
|
throw new ArgumentOutOfRangeException(nameof(index), index, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
@ -149,6 +149,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
|
GC.SuppressFinalize(this);
|
||||||
_buffersMemoryHandle.Dispose();
|
_buffersMemoryHandle.Dispose();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -32,6 +32,6 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
LimiterVersion2,
|
LimiterVersion2,
|
||||||
GroupedBiquadFilter,
|
GroupedBiquadFilter,
|
||||||
CaptureBuffer,
|
CaptureBuffer,
|
||||||
Compressor
|
Compressor,
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,6 +1,7 @@
|
|||||||
using Ryujinx.Audio.Renderer.Dsp.Effect;
|
using Ryujinx.Audio.Renderer.Dsp.Effect;
|
||||||
using Ryujinx.Audio.Renderer.Dsp.State;
|
using Ryujinx.Audio.Renderer.Dsp.State;
|
||||||
using Ryujinx.Audio.Renderer.Parameter.Effect;
|
using Ryujinx.Audio.Renderer.Parameter.Effect;
|
||||||
|
using Ryujinx.Audio.Renderer.Server.Effect;
|
||||||
using System;
|
using System;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
|
|
||||||
@ -51,11 +52,11 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
|
|
||||||
if (IsEffectEnabled)
|
if (IsEffectEnabled)
|
||||||
{
|
{
|
||||||
if (_parameter.Status == Server.Effect.UsageState.Invalid)
|
if (_parameter.Status == UsageState.Invalid)
|
||||||
{
|
{
|
||||||
state = new CompressorState(ref _parameter);
|
state = new CompressorState(ref _parameter);
|
||||||
}
|
}
|
||||||
else if (_parameter.Status == Server.Effect.UsageState.New)
|
else if (_parameter.Status == UsageState.New)
|
||||||
{
|
{
|
||||||
state.UpdateParameter(ref _parameter);
|
state.UpdateParameter(ref _parameter);
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,9 @@
|
|||||||
using Ryujinx.Audio.Common;
|
using Ryujinx.Audio.Common;
|
||||||
using Ryujinx.Audio.Renderer.Common;
|
using Ryujinx.Audio.Renderer.Common;
|
||||||
|
using Ryujinx.Audio.Renderer.Server.Voice;
|
||||||
using System;
|
using System;
|
||||||
using static Ryujinx.Audio.Renderer.Parameter.VoiceInParameter;
|
using static Ryujinx.Audio.Renderer.Parameter.VoiceInParameter;
|
||||||
|
using WaveBuffer = Ryujinx.Audio.Renderer.Common.WaveBuffer;
|
||||||
|
|
||||||
namespace Ryujinx.Audio.Renderer.Dsp.Command
|
namespace Ryujinx.Audio.Renderer.Dsp.Command
|
||||||
{
|
{
|
||||||
@ -37,7 +39,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
|
|
||||||
public SampleRateConversionQuality SrcQuality { get; }
|
public SampleRateConversionQuality SrcQuality { get; }
|
||||||
|
|
||||||
public DataSourceVersion2Command(ref Server.Voice.VoiceState serverState, Memory<VoiceUpdateState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
|
public DataSourceVersion2Command(ref VoiceState serverState, Memory<VoiceUpdateState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
|
||||||
{
|
{
|
||||||
Enabled = true;
|
Enabled = true;
|
||||||
NodeId = nodeId;
|
NodeId = nodeId;
|
||||||
@ -72,24 +74,20 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
|
|
||||||
private static CommandType GetCommandTypeBySampleFormat(SampleFormat sampleFormat)
|
private static CommandType GetCommandTypeBySampleFormat(SampleFormat sampleFormat)
|
||||||
{
|
{
|
||||||
switch (sampleFormat)
|
return sampleFormat switch
|
||||||
{
|
{
|
||||||
case SampleFormat.Adpcm:
|
SampleFormat.Adpcm => CommandType.AdpcmDataSourceVersion2,
|
||||||
return CommandType.AdpcmDataSourceVersion2;
|
SampleFormat.PcmInt16 => CommandType.PcmInt16DataSourceVersion2,
|
||||||
case SampleFormat.PcmInt16:
|
SampleFormat.PcmFloat => CommandType.PcmFloatDataSourceVersion2,
|
||||||
return CommandType.PcmInt16DataSourceVersion2;
|
_ => throw new NotImplementedException($"{sampleFormat}"),
|
||||||
case SampleFormat.PcmFloat:
|
};
|
||||||
return CommandType.PcmFloatDataSourceVersion2;
|
|
||||||
default:
|
|
||||||
throw new NotImplementedException($"{sampleFormat}");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Process(CommandList context)
|
public void Process(CommandList context)
|
||||||
{
|
{
|
||||||
Span<float> outputBuffer = context.GetBuffer(OutputBufferIndex);
|
Span<float> outputBuffer = context.GetBuffer(OutputBufferIndex);
|
||||||
|
|
||||||
DataSourceHelper.WaveBufferInformation info = new DataSourceHelper.WaveBufferInformation
|
DataSourceHelper.WaveBufferInformation info = new()
|
||||||
{
|
{
|
||||||
SourceSampleRate = SampleRate,
|
SourceSampleRate = SampleRate,
|
||||||
SampleFormat = SampleFormat,
|
SampleFormat = SampleFormat,
|
||||||
@ -99,7 +97,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
ExtraParameterSize = ExtraParameterSize,
|
ExtraParameterSize = ExtraParameterSize,
|
||||||
ChannelIndex = (int)ChannelIndex,
|
ChannelIndex = (int)ChannelIndex,
|
||||||
ChannelCount = (int)ChannelCount,
|
ChannelCount = (int)ChannelCount,
|
||||||
SrcQuality = SrcQuality
|
SrcQuality = SrcQuality,
|
||||||
};
|
};
|
||||||
|
|
||||||
DataSourceHelper.ProcessWaveBuffers(context.MemoryManager, outputBuffer, ref info, WaveBuffers, ref State.Span[0], context.SampleRate, (int)context.SampleCount);
|
DataSourceHelper.ProcessWaveBuffers(context.MemoryManager, outputBuffer, ref info, WaveBuffers, ref State.Span[0], context.SampleRate, (int)context.SampleCount);
|
||||||
|
@ -56,7 +56,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
|
[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
|
||||||
private unsafe void ProcessDelayMono(ref DelayState state, float* outputBuffer, float* inputBuffer, uint sampleCount)
|
private unsafe void ProcessDelayMono(ref DelayState state, float* outputBuffer, float* inputBuffer, uint sampleCount)
|
||||||
{
|
{
|
||||||
const ushort channelCount = 1;
|
const ushort ChannelCount = 1;
|
||||||
|
|
||||||
float feedbackGain = FixedPointHelper.ToFloat(Parameter.FeedbackGain, FixedPointPrecision);
|
float feedbackGain = FixedPointHelper.ToFloat(Parameter.FeedbackGain, FixedPointPrecision);
|
||||||
float inGain = FixedPointHelper.ToFloat(Parameter.InGain, FixedPointPrecision);
|
float inGain = FixedPointHelper.ToFloat(Parameter.InGain, FixedPointPrecision);
|
||||||
@ -70,7 +70,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
|
|
||||||
float temp = input * inGain + delayLineValue * feedbackGain;
|
float temp = input * inGain + delayLineValue * feedbackGain;
|
||||||
|
|
||||||
state.UpdateLowPassFilter(ref temp, channelCount);
|
state.UpdateLowPassFilter(ref temp, ChannelCount);
|
||||||
|
|
||||||
outputBuffer[i] = (input * dryGain + delayLineValue * outGain) / 64;
|
outputBuffer[i] = (input * dryGain + delayLineValue * outGain) / 64;
|
||||||
}
|
}
|
||||||
@ -79,7 +79,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
|
[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
|
||||||
private unsafe void ProcessDelayStereo(ref DelayState state, Span<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
|
private unsafe void ProcessDelayStereo(ref DelayState state, Span<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
|
||||||
{
|
{
|
||||||
const ushort channelCount = 2;
|
const ushort ChannelCount = 2;
|
||||||
|
|
||||||
float delayFeedbackBaseGain = state.DelayFeedbackBaseGain;
|
float delayFeedbackBaseGain = state.DelayFeedbackBaseGain;
|
||||||
float delayFeedbackCrossGain = state.DelayFeedbackCrossGain;
|
float delayFeedbackCrossGain = state.DelayFeedbackCrossGain;
|
||||||
@ -87,18 +87,18 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
float dryGain = FixedPointHelper.ToFloat(Parameter.DryGain, FixedPointPrecision);
|
float dryGain = FixedPointHelper.ToFloat(Parameter.DryGain, FixedPointPrecision);
|
||||||
float outGain = FixedPointHelper.ToFloat(Parameter.OutGain, FixedPointPrecision);
|
float outGain = FixedPointHelper.ToFloat(Parameter.OutGain, FixedPointPrecision);
|
||||||
|
|
||||||
Matrix2x2 delayFeedback = new Matrix2x2(delayFeedbackBaseGain, delayFeedbackCrossGain,
|
Matrix2x2 delayFeedback = new(delayFeedbackBaseGain, delayFeedbackCrossGain,
|
||||||
delayFeedbackCrossGain, delayFeedbackBaseGain);
|
delayFeedbackCrossGain, delayFeedbackBaseGain);
|
||||||
|
|
||||||
for (int i = 0; i < sampleCount; i++)
|
for (int i = 0; i < sampleCount; i++)
|
||||||
{
|
{
|
||||||
Vector2 channelInput = new Vector2
|
Vector2 channelInput = new()
|
||||||
{
|
{
|
||||||
X = *((float*)inputBuffers[0] + i) * 64,
|
X = *((float*)inputBuffers[0] + i) * 64,
|
||||||
Y = *((float*)inputBuffers[1] + i) * 64,
|
Y = *((float*)inputBuffers[1] + i) * 64,
|
||||||
};
|
};
|
||||||
|
|
||||||
Vector2 delayLineValues = new Vector2()
|
Vector2 delayLineValues = new()
|
||||||
{
|
{
|
||||||
X = state.DelayLines[0].Read(),
|
X = state.DelayLines[0].Read(),
|
||||||
Y = state.DelayLines[1].Read(),
|
Y = state.DelayLines[1].Read(),
|
||||||
@ -106,7 +106,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
|
|
||||||
Vector2 temp = MatrixHelper.Transform(ref delayLineValues, ref delayFeedback) + channelInput * inGain;
|
Vector2 temp = MatrixHelper.Transform(ref delayLineValues, ref delayFeedback) + channelInput * inGain;
|
||||||
|
|
||||||
state.UpdateLowPassFilter(ref Unsafe.As<Vector2, float>(ref temp), channelCount);
|
state.UpdateLowPassFilter(ref Unsafe.As<Vector2, float>(ref temp), ChannelCount);
|
||||||
|
|
||||||
*((float*)outputBuffers[0] + i) = (channelInput.X * dryGain + delayLineValues.X * outGain) / 64;
|
*((float*)outputBuffers[0] + i) = (channelInput.X * dryGain + delayLineValues.X * outGain) / 64;
|
||||||
*((float*)outputBuffers[1] + i) = (channelInput.Y * dryGain + delayLineValues.Y * outGain) / 64;
|
*((float*)outputBuffers[1] + i) = (channelInput.Y * dryGain + delayLineValues.Y * outGain) / 64;
|
||||||
@ -116,7 +116,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
|
[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
|
||||||
private unsafe void ProcessDelayQuadraphonic(ref DelayState state, Span<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
|
private unsafe void ProcessDelayQuadraphonic(ref DelayState state, Span<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
|
||||||
{
|
{
|
||||||
const ushort channelCount = 4;
|
const ushort ChannelCount = 4;
|
||||||
|
|
||||||
float delayFeedbackBaseGain = state.DelayFeedbackBaseGain;
|
float delayFeedbackBaseGain = state.DelayFeedbackBaseGain;
|
||||||
float delayFeedbackCrossGain = state.DelayFeedbackCrossGain;
|
float delayFeedbackCrossGain = state.DelayFeedbackCrossGain;
|
||||||
@ -124,7 +124,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
float dryGain = FixedPointHelper.ToFloat(Parameter.DryGain, FixedPointPrecision);
|
float dryGain = FixedPointHelper.ToFloat(Parameter.DryGain, FixedPointPrecision);
|
||||||
float outGain = FixedPointHelper.ToFloat(Parameter.OutGain, FixedPointPrecision);
|
float outGain = FixedPointHelper.ToFloat(Parameter.OutGain, FixedPointPrecision);
|
||||||
|
|
||||||
Matrix4x4 delayFeedback = new Matrix4x4(delayFeedbackBaseGain, delayFeedbackCrossGain, delayFeedbackCrossGain, 0.0f,
|
Matrix4x4 delayFeedback = new(delayFeedbackBaseGain, delayFeedbackCrossGain, delayFeedbackCrossGain, 0.0f,
|
||||||
delayFeedbackCrossGain, delayFeedbackBaseGain, 0.0f, delayFeedbackCrossGain,
|
delayFeedbackCrossGain, delayFeedbackBaseGain, 0.0f, delayFeedbackCrossGain,
|
||||||
delayFeedbackCrossGain, 0.0f, delayFeedbackBaseGain, delayFeedbackCrossGain,
|
delayFeedbackCrossGain, 0.0f, delayFeedbackBaseGain, delayFeedbackCrossGain,
|
||||||
0.0f, delayFeedbackCrossGain, delayFeedbackCrossGain, delayFeedbackBaseGain);
|
0.0f, delayFeedbackCrossGain, delayFeedbackCrossGain, delayFeedbackBaseGain);
|
||||||
@ -132,25 +132,25 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
|
|
||||||
for (int i = 0; i < sampleCount; i++)
|
for (int i = 0; i < sampleCount; i++)
|
||||||
{
|
{
|
||||||
Vector4 channelInput = new Vector4
|
Vector4 channelInput = new()
|
||||||
{
|
{
|
||||||
X = *((float*)inputBuffers[0] + i) * 64,
|
X = *((float*)inputBuffers[0] + i) * 64,
|
||||||
Y = *((float*)inputBuffers[1] + i) * 64,
|
Y = *((float*)inputBuffers[1] + i) * 64,
|
||||||
Z = *((float*)inputBuffers[2] + i) * 64,
|
Z = *((float*)inputBuffers[2] + i) * 64,
|
||||||
W = *((float*)inputBuffers[3] + i) * 64
|
W = *((float*)inputBuffers[3] + i) * 64,
|
||||||
};
|
};
|
||||||
|
|
||||||
Vector4 delayLineValues = new Vector4()
|
Vector4 delayLineValues = new()
|
||||||
{
|
{
|
||||||
X = state.DelayLines[0].Read(),
|
X = state.DelayLines[0].Read(),
|
||||||
Y = state.DelayLines[1].Read(),
|
Y = state.DelayLines[1].Read(),
|
||||||
Z = state.DelayLines[2].Read(),
|
Z = state.DelayLines[2].Read(),
|
||||||
W = state.DelayLines[3].Read()
|
W = state.DelayLines[3].Read(),
|
||||||
};
|
};
|
||||||
|
|
||||||
Vector4 temp = MatrixHelper.Transform(ref delayLineValues, ref delayFeedback) + channelInput * inGain;
|
Vector4 temp = MatrixHelper.Transform(ref delayLineValues, ref delayFeedback) + channelInput * inGain;
|
||||||
|
|
||||||
state.UpdateLowPassFilter(ref Unsafe.As<Vector4, float>(ref temp), channelCount);
|
state.UpdateLowPassFilter(ref Unsafe.As<Vector4, float>(ref temp), ChannelCount);
|
||||||
|
|
||||||
*((float*)outputBuffers[0] + i) = (channelInput.X * dryGain + delayLineValues.X * outGain) / 64;
|
*((float*)outputBuffers[0] + i) = (channelInput.X * dryGain + delayLineValues.X * outGain) / 64;
|
||||||
*((float*)outputBuffers[1] + i) = (channelInput.Y * dryGain + delayLineValues.Y * outGain) / 64;
|
*((float*)outputBuffers[1] + i) = (channelInput.Y * dryGain + delayLineValues.Y * outGain) / 64;
|
||||||
@ -162,7 +162,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
|
[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
|
||||||
private unsafe void ProcessDelaySurround(ref DelayState state, Span<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
|
private unsafe void ProcessDelaySurround(ref DelayState state, Span<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
|
||||||
{
|
{
|
||||||
const ushort channelCount = 6;
|
const ushort ChannelCount = 6;
|
||||||
|
|
||||||
float feedbackGain = FixedPointHelper.ToFloat(Parameter.FeedbackGain, FixedPointPrecision);
|
float feedbackGain = FixedPointHelper.ToFloat(Parameter.FeedbackGain, FixedPointPrecision);
|
||||||
float delayFeedbackBaseGain = state.DelayFeedbackBaseGain;
|
float delayFeedbackBaseGain = state.DelayFeedbackBaseGain;
|
||||||
@ -171,7 +171,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
float dryGain = FixedPointHelper.ToFloat(Parameter.DryGain, FixedPointPrecision);
|
float dryGain = FixedPointHelper.ToFloat(Parameter.DryGain, FixedPointPrecision);
|
||||||
float outGain = FixedPointHelper.ToFloat(Parameter.OutGain, FixedPointPrecision);
|
float outGain = FixedPointHelper.ToFloat(Parameter.OutGain, FixedPointPrecision);
|
||||||
|
|
||||||
Matrix6x6 delayFeedback = new Matrix6x6(delayFeedbackBaseGain, 0.0f, delayFeedbackCrossGain, 0.0f, delayFeedbackCrossGain, 0.0f,
|
Matrix6x6 delayFeedback = new(delayFeedbackBaseGain, 0.0f, delayFeedbackCrossGain, 0.0f, delayFeedbackCrossGain, 0.0f,
|
||||||
0.0f, delayFeedbackBaseGain, delayFeedbackCrossGain, 0.0f, 0.0f, delayFeedbackCrossGain,
|
0.0f, delayFeedbackBaseGain, delayFeedbackCrossGain, 0.0f, 0.0f, delayFeedbackCrossGain,
|
||||||
delayFeedbackCrossGain, delayFeedbackCrossGain, delayFeedbackBaseGain, 0.0f, 0.0f, 0.0f,
|
delayFeedbackCrossGain, delayFeedbackCrossGain, delayFeedbackBaseGain, 0.0f, 0.0f, 0.0f,
|
||||||
0.0f, 0.0f, 0.0f, feedbackGain, 0.0f, 0.0f,
|
0.0f, 0.0f, 0.0f, feedbackGain, 0.0f, 0.0f,
|
||||||
@ -180,29 +180,29 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
|
|
||||||
for (int i = 0; i < sampleCount; i++)
|
for (int i = 0; i < sampleCount; i++)
|
||||||
{
|
{
|
||||||
Vector6 channelInput = new Vector6
|
Vector6 channelInput = new()
|
||||||
{
|
{
|
||||||
X = *((float*)inputBuffers[0] + i) * 64,
|
X = *((float*)inputBuffers[0] + i) * 64,
|
||||||
Y = *((float*)inputBuffers[1] + i) * 64,
|
Y = *((float*)inputBuffers[1] + i) * 64,
|
||||||
Z = *((float*)inputBuffers[2] + i) * 64,
|
Z = *((float*)inputBuffers[2] + i) * 64,
|
||||||
W = *((float*)inputBuffers[3] + i) * 64,
|
W = *((float*)inputBuffers[3] + i) * 64,
|
||||||
V = *((float*)inputBuffers[4] + i) * 64,
|
V = *((float*)inputBuffers[4] + i) * 64,
|
||||||
U = *((float*)inputBuffers[5] + i) * 64
|
U = *((float*)inputBuffers[5] + i) * 64,
|
||||||
};
|
};
|
||||||
|
|
||||||
Vector6 delayLineValues = new Vector6
|
Vector6 delayLineValues = new()
|
||||||
{
|
{
|
||||||
X = state.DelayLines[0].Read(),
|
X = state.DelayLines[0].Read(),
|
||||||
Y = state.DelayLines[1].Read(),
|
Y = state.DelayLines[1].Read(),
|
||||||
Z = state.DelayLines[2].Read(),
|
Z = state.DelayLines[2].Read(),
|
||||||
W = state.DelayLines[3].Read(),
|
W = state.DelayLines[3].Read(),
|
||||||
V = state.DelayLines[4].Read(),
|
V = state.DelayLines[4].Read(),
|
||||||
U = state.DelayLines[5].Read()
|
U = state.DelayLines[5].Read(),
|
||||||
};
|
};
|
||||||
|
|
||||||
Vector6 temp = MatrixHelper.Transform(ref delayLineValues, ref delayFeedback) + channelInput * inGain;
|
Vector6 temp = MatrixHelper.Transform(ref delayLineValues, ref delayFeedback) + channelInput * inGain;
|
||||||
|
|
||||||
state.UpdateLowPassFilter(ref Unsafe.As<Vector6, float>(ref temp), channelCount);
|
state.UpdateLowPassFilter(ref Unsafe.As<Vector6, float>(ref temp), ChannelCount);
|
||||||
|
|
||||||
*((float*)outputBuffers[0] + i) = (channelInput.X * dryGain + delayLineValues.X * outGain) / 64;
|
*((float*)outputBuffers[0] + i) = (channelInput.X * dryGain + delayLineValues.X * outGain) / 64;
|
||||||
*((float*)outputBuffers[1] + i) = (channelInput.Y * dryGain + delayLineValues.Y * outGain) / 64;
|
*((float*)outputBuffers[1] + i) = (channelInput.Y * dryGain + delayLineValues.Y * outGain) / 64;
|
||||||
|
@ -55,8 +55,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
|
|
||||||
return -depopValue;
|
return -depopValue;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
for (int i = 0; i < sampleCount; i++)
|
for (int i = 0; i < sampleCount; i++)
|
||||||
{
|
{
|
||||||
depopValue = FloatingPointHelper.MultiplyRoundDown(Decay, depopValue);
|
depopValue = FloatingPointHelper.MultiplyRoundDown(Decay, depopValue);
|
||||||
@ -66,7 +65,6 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
|
|
||||||
return depopValue;
|
return depopValue;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public void Process(CommandList context)
|
public void Process(CommandList context)
|
||||||
{
|
{
|
||||||
|
@ -65,7 +65,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
int channelCount = (int)device.GetChannelCount();
|
int channelCount = (int)device.GetChannelCount();
|
||||||
uint bufferCount = Math.Min(device.GetChannelCount(), InputCount);
|
uint bufferCount = Math.Min(device.GetChannelCount(), InputCount);
|
||||||
|
|
||||||
const int sampleCount = Constants.TargetSampleCount;
|
const int SampleCount = Constants.TargetSampleCount;
|
||||||
|
|
||||||
uint inputCount;
|
uint inputCount;
|
||||||
|
|
||||||
@ -79,13 +79,13 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
inputCount = bufferCount;
|
inputCount = bufferCount;
|
||||||
}
|
}
|
||||||
|
|
||||||
short[] outputBuffer = new short[inputCount * sampleCount];
|
short[] outputBuffer = new short[inputCount * SampleCount];
|
||||||
|
|
||||||
for (int i = 0; i < bufferCount; i++)
|
for (int i = 0; i < bufferCount; i++)
|
||||||
{
|
{
|
||||||
ReadOnlySpan<float> inputBuffer = GetBuffer(InputBufferIndices[i], sampleCount);
|
ReadOnlySpan<float> inputBuffer = GetBuffer(InputBufferIndices[i], SampleCount);
|
||||||
|
|
||||||
for (int j = 0; j < sampleCount; j++)
|
for (int j = 0; j < SampleCount; j++)
|
||||||
{
|
{
|
||||||
outputBuffer[i + j * channelCount] = PcmHelper.Saturate(inputBuffer[j]);
|
outputBuffer[i + j * channelCount] = PcmHelper.Saturate(inputBuffer[j]);
|
||||||
}
|
}
|
||||||
|
@ -14,11 +14,11 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
|
|
||||||
public uint EstimatedProcessingTime { get; set; }
|
public uint EstimatedProcessingTime { get; set; }
|
||||||
|
|
||||||
private BiquadFilterParameter[] _parameters;
|
private readonly BiquadFilterParameter[] _parameters;
|
||||||
private Memory<BiquadFilterState> _biquadFilterStates;
|
private readonly Memory<BiquadFilterState> _biquadFilterStates;
|
||||||
private int _inputBufferIndex;
|
private readonly int _inputBufferIndex;
|
||||||
private int _outputBufferIndex;
|
private readonly int _outputBufferIndex;
|
||||||
private bool[] _isInitialized;
|
private readonly bool[] _isInitialized;
|
||||||
|
|
||||||
public GroupedBiquadFilterCommand(int baseIndex, ReadOnlySpan<BiquadFilterParameter> filters, Memory<BiquadFilterState> biquadFilterStateMemory, int inputBufferOffset, int outputBufferOffset, ReadOnlySpan<bool> isInitialized, int nodeId)
|
public GroupedBiquadFilterCommand(int baseIndex, ReadOnlySpan<BiquadFilterParameter> filters, Memory<BiquadFilterState> biquadFilterStateMemory, int inputBufferOffset, int outputBufferOffset, ReadOnlySpan<bool> isInitialized, int nodeId)
|
||||||
{
|
{
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
using Ryujinx.Audio.Renderer.Dsp.State;
|
using Ryujinx.Audio.Renderer.Dsp.State;
|
||||||
using Ryujinx.Audio.Renderer.Parameter.Effect;
|
using Ryujinx.Audio.Renderer.Parameter.Effect;
|
||||||
|
using Ryujinx.Audio.Renderer.Server.Effect;
|
||||||
using System;
|
using System;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
|
|
||||||
@ -50,13 +51,13 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
|
|
||||||
if (IsEffectEnabled)
|
if (IsEffectEnabled)
|
||||||
{
|
{
|
||||||
if (Parameter.Status == Server.Effect.UsageState.Invalid)
|
if (Parameter.Status == UsageState.Invalid)
|
||||||
{
|
{
|
||||||
state = new LimiterState(ref _parameter, WorkBuffer);
|
state = new LimiterState(ref _parameter, WorkBuffer);
|
||||||
}
|
}
|
||||||
else if (Parameter.Status == Server.Effect.UsageState.New)
|
else if (Parameter.Status == UsageState.New)
|
||||||
{
|
{
|
||||||
state.UpdateParameter(ref _parameter);
|
LimiterState.UpdateParameter(ref _parameter);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
using Ryujinx.Audio.Renderer.Dsp.State;
|
using Ryujinx.Audio.Renderer.Dsp.State;
|
||||||
using Ryujinx.Audio.Renderer.Parameter;
|
using Ryujinx.Audio.Renderer.Parameter;
|
||||||
using Ryujinx.Audio.Renderer.Parameter.Effect;
|
using Ryujinx.Audio.Renderer.Parameter.Effect;
|
||||||
|
using Ryujinx.Audio.Renderer.Server.Effect;
|
||||||
using System;
|
using System;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
@ -54,13 +55,13 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
|
|
||||||
if (IsEffectEnabled)
|
if (IsEffectEnabled)
|
||||||
{
|
{
|
||||||
if (Parameter.Status == Server.Effect.UsageState.Invalid)
|
if (Parameter.Status == UsageState.Invalid)
|
||||||
{
|
{
|
||||||
state = new LimiterState(ref _parameter, WorkBuffer);
|
state = new LimiterState(ref _parameter, WorkBuffer);
|
||||||
}
|
}
|
||||||
else if (Parameter.Status == Server.Effect.UsageState.New)
|
else if (Parameter.Status == UsageState.New)
|
||||||
{
|
{
|
||||||
state.UpdateParameter(ref _parameter);
|
LimiterState.UpdateParameter(ref _parameter);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -48,7 +48,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
}
|
}
|
||||||
|
|
||||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
private float ProcessMixRampGrouped(Span<float> outputBuffer, ReadOnlySpan<float> inputBuffer, float volume0, float volume1, int sampleCount)
|
private static float ProcessMixRampGrouped(Span<float> outputBuffer, ReadOnlySpan<float> inputBuffer, float volume0, float volume1, int sampleCount)
|
||||||
{
|
{
|
||||||
float ramp = (volume1 - volume0) / sampleCount;
|
float ramp = (volume1 - volume0) / sampleCount;
|
||||||
float volume = volume0;
|
float volume = volume0;
|
||||||
|
@ -1,7 +1,9 @@
|
|||||||
using Ryujinx.Audio.Common;
|
using Ryujinx.Audio.Common;
|
||||||
using Ryujinx.Audio.Renderer.Common;
|
using Ryujinx.Audio.Renderer.Common;
|
||||||
|
using Ryujinx.Audio.Renderer.Server.Voice;
|
||||||
using System;
|
using System;
|
||||||
using static Ryujinx.Audio.Renderer.Parameter.VoiceInParameter;
|
using static Ryujinx.Audio.Renderer.Parameter.VoiceInParameter;
|
||||||
|
using WaveBuffer = Ryujinx.Audio.Renderer.Common.WaveBuffer;
|
||||||
|
|
||||||
namespace Ryujinx.Audio.Renderer.Dsp.Command
|
namespace Ryujinx.Audio.Renderer.Dsp.Command
|
||||||
{
|
{
|
||||||
@ -28,7 +30,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
public Memory<VoiceUpdateState> State { get; }
|
public Memory<VoiceUpdateState> State { get; }
|
||||||
public DecodingBehaviour DecodingBehaviour { get; }
|
public DecodingBehaviour DecodingBehaviour { get; }
|
||||||
|
|
||||||
public PcmFloatDataSourceCommandVersion1(ref Server.Voice.VoiceState serverState, Memory<VoiceUpdateState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
|
public PcmFloatDataSourceCommandVersion1(ref VoiceState serverState, Memory<VoiceUpdateState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
|
||||||
{
|
{
|
||||||
Enabled = true;
|
Enabled = true;
|
||||||
NodeId = nodeId;
|
NodeId = nodeId;
|
||||||
@ -56,7 +58,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
{
|
{
|
||||||
Span<float> outputBuffer = context.GetBuffer(OutputBufferIndex);
|
Span<float> outputBuffer = context.GetBuffer(OutputBufferIndex);
|
||||||
|
|
||||||
DataSourceHelper.WaveBufferInformation info = new DataSourceHelper.WaveBufferInformation
|
DataSourceHelper.WaveBufferInformation info = new()
|
||||||
{
|
{
|
||||||
SourceSampleRate = SampleRate,
|
SourceSampleRate = SampleRate,
|
||||||
SampleFormat = SampleFormat.PcmFloat,
|
SampleFormat = SampleFormat.PcmFloat,
|
||||||
|
@ -1,7 +1,9 @@
|
|||||||
using Ryujinx.Audio.Common;
|
using Ryujinx.Audio.Common;
|
||||||
using Ryujinx.Audio.Renderer.Common;
|
using Ryujinx.Audio.Renderer.Common;
|
||||||
|
using Ryujinx.Audio.Renderer.Server.Voice;
|
||||||
using System;
|
using System;
|
||||||
using static Ryujinx.Audio.Renderer.Parameter.VoiceInParameter;
|
using static Ryujinx.Audio.Renderer.Parameter.VoiceInParameter;
|
||||||
|
using WaveBuffer = Ryujinx.Audio.Renderer.Common.WaveBuffer;
|
||||||
|
|
||||||
namespace Ryujinx.Audio.Renderer.Dsp.Command
|
namespace Ryujinx.Audio.Renderer.Dsp.Command
|
||||||
{
|
{
|
||||||
@ -28,7 +30,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
public Memory<VoiceUpdateState> State { get; }
|
public Memory<VoiceUpdateState> State { get; }
|
||||||
public DecodingBehaviour DecodingBehaviour { get; }
|
public DecodingBehaviour DecodingBehaviour { get; }
|
||||||
|
|
||||||
public PcmInt16DataSourceCommandVersion1(ref Server.Voice.VoiceState serverState, Memory<VoiceUpdateState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
|
public PcmInt16DataSourceCommandVersion1(ref VoiceState serverState, Memory<VoiceUpdateState> state, ushort outputBufferIndex, ushort channelIndex, int nodeId)
|
||||||
{
|
{
|
||||||
Enabled = true;
|
Enabled = true;
|
||||||
NodeId = nodeId;
|
NodeId = nodeId;
|
||||||
@ -56,7 +58,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
{
|
{
|
||||||
Span<float> outputBuffer = context.GetBuffer(OutputBufferIndex);
|
Span<float> outputBuffer = context.GetBuffer(OutputBufferIndex);
|
||||||
|
|
||||||
DataSourceHelper.WaveBufferInformation info = new DataSourceHelper.WaveBufferInformation
|
DataSourceHelper.WaveBufferInformation info = new()
|
||||||
{
|
{
|
||||||
SourceSampleRate = SampleRate,
|
SourceSampleRate = SampleRate,
|
||||||
SampleFormat = SampleFormat.PcmInt16,
|
SampleFormat = SampleFormat.PcmInt16,
|
||||||
|
@ -8,7 +8,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
{
|
{
|
||||||
Invalid,
|
Invalid,
|
||||||
Start,
|
Start,
|
||||||
End
|
End,
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool Enabled { get; set; }
|
public bool Enabled { get; set; }
|
||||||
|
@ -9,21 +9,21 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
{
|
{
|
||||||
public class Reverb3dCommand : ICommand
|
public class Reverb3dCommand : ICommand
|
||||||
{
|
{
|
||||||
private static readonly int[] OutputEarlyIndicesTableMono = new int[20] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
|
private static readonly int[] _outputEarlyIndicesTableMono = new int[20] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
|
||||||
private static readonly int[] TargetEarlyDelayLineIndicesTableMono = new int[20] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 };
|
private static readonly int[] _targetEarlyDelayLineIndicesTableMono = new int[20] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 };
|
||||||
private static readonly int[] TargetOutputFeedbackIndicesTableMono = new int[1] { 0 };
|
private static readonly int[] _targetOutputFeedbackIndicesTableMono = new int[1] { 0 };
|
||||||
|
|
||||||
private static readonly int[] OutputEarlyIndicesTableStereo = new int[20] { 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1 };
|
private static readonly int[] _outputEarlyIndicesTableStereo = new int[20] { 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1 };
|
||||||
private static readonly int[] TargetEarlyDelayLineIndicesTableStereo = new int[20] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 };
|
private static readonly int[] _targetEarlyDelayLineIndicesTableStereo = new int[20] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 };
|
||||||
private static readonly int[] TargetOutputFeedbackIndicesTableStereo = new int[2] { 0, 1 };
|
private static readonly int[] _targetOutputFeedbackIndicesTableStereo = new int[2] { 0, 1 };
|
||||||
|
|
||||||
private static readonly int[] OutputEarlyIndicesTableQuadraphonic = new int[20] { 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 1, 1, 1, 0, 0, 0, 0, 3, 3, 3 };
|
private static readonly int[] _outputEarlyIndicesTableQuadraphonic = new int[20] { 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 1, 1, 1, 0, 0, 0, 0, 3, 3, 3 };
|
||||||
private static readonly int[] TargetEarlyDelayLineIndicesTableQuadraphonic = new int[20] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 };
|
private static readonly int[] _targetEarlyDelayLineIndicesTableQuadraphonic = new int[20] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 };
|
||||||
private static readonly int[] TargetOutputFeedbackIndicesTableQuadraphonic = new int[4] { 0, 1, 2, 3 };
|
private static readonly int[] _targetOutputFeedbackIndicesTableQuadraphonic = new int[4] { 0, 1, 2, 3 };
|
||||||
|
|
||||||
private static readonly int[] OutputEarlyIndicesTableSurround = new int[40] { 4, 5, 0, 5, 0, 5, 1, 5, 1, 5, 1, 5, 1, 5, 2, 5, 2, 5, 2, 5, 1, 5, 1, 5, 1, 5, 0, 5, 0, 5, 0, 5, 0, 5, 3, 5, 3, 5, 3, 5 };
|
private static readonly int[] _outputEarlyIndicesTableSurround = new int[40] { 4, 5, 0, 5, 0, 5, 1, 5, 1, 5, 1, 5, 1, 5, 2, 5, 2, 5, 2, 5, 1, 5, 1, 5, 1, 5, 0, 5, 0, 5, 0, 5, 0, 5, 3, 5, 3, 5, 3, 5 };
|
||||||
private static readonly int[] TargetEarlyDelayLineIndicesTableSurround = new int[40] { 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19 };
|
private static readonly int[] _targetEarlyDelayLineIndicesTableSurround = new int[40] { 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19 };
|
||||||
private static readonly int[] TargetOutputFeedbackIndicesTableSurround = new int[6] { 0, 1, 2, 3, -1, 3 };
|
private static readonly int[] _targetOutputFeedbackIndicesTableSurround = new int[6] { 0, 1, 2, 3, -1, 3 };
|
||||||
|
|
||||||
public bool Enabled { get; set; }
|
public bool Enabled { get; set; }
|
||||||
|
|
||||||
@ -73,30 +73,30 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
private void ProcessReverb3dMono(ref Reverb3dState state, ReadOnlySpan<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
|
private void ProcessReverb3dMono(ref Reverb3dState state, ReadOnlySpan<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
|
||||||
{
|
{
|
||||||
ProcessReverb3dGeneric(ref state, outputBuffers, inputBuffers, sampleCount, OutputEarlyIndicesTableMono, TargetEarlyDelayLineIndicesTableMono, TargetOutputFeedbackIndicesTableMono);
|
ProcessReverb3dGeneric(ref state, outputBuffers, inputBuffers, sampleCount, _outputEarlyIndicesTableMono, _targetEarlyDelayLineIndicesTableMono, _targetOutputFeedbackIndicesTableMono);
|
||||||
}
|
}
|
||||||
|
|
||||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
private void ProcessReverb3dStereo(ref Reverb3dState state, ReadOnlySpan<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
|
private void ProcessReverb3dStereo(ref Reverb3dState state, ReadOnlySpan<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
|
||||||
{
|
{
|
||||||
ProcessReverb3dGeneric(ref state, outputBuffers, inputBuffers, sampleCount, OutputEarlyIndicesTableStereo, TargetEarlyDelayLineIndicesTableStereo, TargetOutputFeedbackIndicesTableStereo);
|
ProcessReverb3dGeneric(ref state, outputBuffers, inputBuffers, sampleCount, _outputEarlyIndicesTableStereo, _targetEarlyDelayLineIndicesTableStereo, _targetOutputFeedbackIndicesTableStereo);
|
||||||
}
|
}
|
||||||
|
|
||||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
private void ProcessReverb3dQuadraphonic(ref Reverb3dState state, ReadOnlySpan<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
|
private void ProcessReverb3dQuadraphonic(ref Reverb3dState state, ReadOnlySpan<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
|
||||||
{
|
{
|
||||||
ProcessReverb3dGeneric(ref state, outputBuffers, inputBuffers, sampleCount, OutputEarlyIndicesTableQuadraphonic, TargetEarlyDelayLineIndicesTableQuadraphonic, TargetOutputFeedbackIndicesTableQuadraphonic);
|
ProcessReverb3dGeneric(ref state, outputBuffers, inputBuffers, sampleCount, _outputEarlyIndicesTableQuadraphonic, _targetEarlyDelayLineIndicesTableQuadraphonic, _targetOutputFeedbackIndicesTableQuadraphonic);
|
||||||
}
|
}
|
||||||
|
|
||||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
private void ProcessReverb3dSurround(ref Reverb3dState state, ReadOnlySpan<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
|
private void ProcessReverb3dSurround(ref Reverb3dState state, ReadOnlySpan<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount)
|
||||||
{
|
{
|
||||||
ProcessReverb3dGeneric(ref state, outputBuffers, inputBuffers, sampleCount, OutputEarlyIndicesTableSurround, TargetEarlyDelayLineIndicesTableSurround, TargetOutputFeedbackIndicesTableSurround);
|
ProcessReverb3dGeneric(ref state, outputBuffers, inputBuffers, sampleCount, _outputEarlyIndicesTableSurround, _targetEarlyDelayLineIndicesTableSurround, _targetOutputFeedbackIndicesTableSurround);
|
||||||
}
|
}
|
||||||
|
|
||||||
private unsafe void ProcessReverb3dGeneric(ref Reverb3dState state, ReadOnlySpan<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount, ReadOnlySpan<int> outputEarlyIndicesTable, ReadOnlySpan<int> targetEarlyDelayLineIndicesTable, ReadOnlySpan<int> targetOutputFeedbackIndicesTable)
|
private unsafe void ProcessReverb3dGeneric(ref Reverb3dState state, ReadOnlySpan<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount, ReadOnlySpan<int> outputEarlyIndicesTable, ReadOnlySpan<int> targetEarlyDelayLineIndicesTable, ReadOnlySpan<int> targetOutputFeedbackIndicesTable)
|
||||||
{
|
{
|
||||||
const int delayLineSampleIndexOffset = 1;
|
const int DelayLineSampleIndexOffset = 1;
|
||||||
|
|
||||||
bool isMono = Parameter.ChannelCount == 1;
|
bool isMono = Parameter.ChannelCount == 1;
|
||||||
bool isSurround = Parameter.ChannelCount == 6;
|
bool isSurround = Parameter.ChannelCount == 6;
|
||||||
@ -109,16 +109,16 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
|
|
||||||
for (int sampleIndex = 0; sampleIndex < sampleCount; sampleIndex++)
|
for (int sampleIndex = 0; sampleIndex < sampleCount; sampleIndex++)
|
||||||
{
|
{
|
||||||
outputValues.Fill(0);
|
outputValues.Clear();
|
||||||
|
|
||||||
float tapOut = state.PreDelayLine.TapUnsafe(state.ReflectionDelayTime, delayLineSampleIndexOffset);
|
float tapOut = state.PreDelayLine.TapUnsafe(state.ReflectionDelayTime, DelayLineSampleIndexOffset);
|
||||||
|
|
||||||
for (int i = 0; i < targetEarlyDelayLineIndicesTable.Length; i++)
|
for (int i = 0; i < targetEarlyDelayLineIndicesTable.Length; i++)
|
||||||
{
|
{
|
||||||
int earlyDelayIndex = targetEarlyDelayLineIndicesTable[i];
|
int earlyDelayIndex = targetEarlyDelayLineIndicesTable[i];
|
||||||
int outputIndex = outputEarlyIndicesTable[earlyDelayIndex];
|
int outputIndex = outputEarlyIndicesTable[earlyDelayIndex];
|
||||||
|
|
||||||
float tempTapOut = state.PreDelayLine.TapUnsafe(state.EarlyDelayTime[earlyDelayIndex], delayLineSampleIndexOffset);
|
float tempTapOut = state.PreDelayLine.TapUnsafe(state.EarlyDelayTime[earlyDelayIndex], DelayLineSampleIndexOffset);
|
||||||
|
|
||||||
outputValues[outputIndex] += tempTapOut * state.EarlyGain[earlyDelayIndex];
|
outputValues[outputIndex] += tempTapOut * state.EarlyGain[earlyDelayIndex];
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
using Ryujinx.Audio.Renderer.Dsp.State;
|
using Ryujinx.Audio.Renderer.Dsp.State;
|
||||||
using Ryujinx.Audio.Renderer.Parameter.Effect;
|
using Ryujinx.Audio.Renderer.Parameter.Effect;
|
||||||
|
using Ryujinx.Audio.Renderer.Server.Effect;
|
||||||
using System;
|
using System;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.Runtime.CompilerServices;
|
using System.Runtime.CompilerServices;
|
||||||
@ -8,25 +9,25 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
{
|
{
|
||||||
public class ReverbCommand : ICommand
|
public class ReverbCommand : ICommand
|
||||||
{
|
{
|
||||||
private static readonly int[] OutputEarlyIndicesTableMono = new int[10] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
|
private static readonly int[] _outputEarlyIndicesTableMono = new int[10] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
|
||||||
private static readonly int[] TargetEarlyDelayLineIndicesTableMono = new int[10] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
|
private static readonly int[] _targetEarlyDelayLineIndicesTableMono = new int[10] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
|
||||||
private static readonly int[] OutputIndicesTableMono = new int[4] { 0, 0, 0, 0 };
|
private static readonly int[] _outputIndicesTableMono = new int[4] { 0, 0, 0, 0 };
|
||||||
private static readonly int[] TargetOutputFeedbackIndicesTableMono = new int[4] { 0, 1, 2, 3 };
|
private static readonly int[] _targetOutputFeedbackIndicesTableMono = new int[4] { 0, 1, 2, 3 };
|
||||||
|
|
||||||
private static readonly int[] OutputEarlyIndicesTableStereo = new int[10] { 0, 0, 1, 1, 0, 1, 0, 0, 1, 1 };
|
private static readonly int[] _outputEarlyIndicesTableStereo = new int[10] { 0, 0, 1, 1, 0, 1, 0, 0, 1, 1 };
|
||||||
private static readonly int[] TargetEarlyDelayLineIndicesTableStereo = new int[10] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
|
private static readonly int[] _targetEarlyDelayLineIndicesTableStereo = new int[10] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
|
||||||
private static readonly int[] OutputIndicesTableStereo = new int[4] { 0, 0, 1, 1 };
|
private static readonly int[] _outputIndicesTableStereo = new int[4] { 0, 0, 1, 1 };
|
||||||
private static readonly int[] TargetOutputFeedbackIndicesTableStereo = new int[4] { 2, 0, 3, 1 };
|
private static readonly int[] _targetOutputFeedbackIndicesTableStereo = new int[4] { 2, 0, 3, 1 };
|
||||||
|
|
||||||
private static readonly int[] OutputEarlyIndicesTableQuadraphonic = new int[10] { 0, 0, 1, 1, 0, 1, 2, 2, 3, 3 };
|
private static readonly int[] _outputEarlyIndicesTableQuadraphonic = new int[10] { 0, 0, 1, 1, 0, 1, 2, 2, 3, 3 };
|
||||||
private static readonly int[] TargetEarlyDelayLineIndicesTableQuadraphonic = new int[10] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
|
private static readonly int[] _targetEarlyDelayLineIndicesTableQuadraphonic = new int[10] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
|
||||||
private static readonly int[] OutputIndicesTableQuadraphonic = new int[4] { 0, 1, 2, 3 };
|
private static readonly int[] _outputIndicesTableQuadraphonic = new int[4] { 0, 1, 2, 3 };
|
||||||
private static readonly int[] TargetOutputFeedbackIndicesTableQuadraphonic = new int[4] { 0, 1, 2, 3 };
|
private static readonly int[] _targetOutputFeedbackIndicesTableQuadraphonic = new int[4] { 0, 1, 2, 3 };
|
||||||
|
|
||||||
private static readonly int[] OutputEarlyIndicesTableSurround = new int[20] { 0, 5, 0, 5, 1, 5, 1, 5, 4, 5, 4, 5, 2, 5, 2, 5, 3, 5, 3, 5 };
|
private static readonly int[] _outputEarlyIndicesTableSurround = new int[20] { 0, 5, 0, 5, 1, 5, 1, 5, 4, 5, 4, 5, 2, 5, 2, 5, 3, 5, 3, 5 };
|
||||||
private static readonly int[] TargetEarlyDelayLineIndicesTableSurround = new int[20] { 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9 };
|
private static readonly int[] _targetEarlyDelayLineIndicesTableSurround = new int[20] { 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9 };
|
||||||
private static readonly int[] OutputIndicesTableSurround = new int[Constants.ChannelCountMax] { 0, 1, 2, 3, 4, 5 };
|
private static readonly int[] _outputIndicesTableSurround = new int[Constants.ChannelCountMax] { 0, 1, 2, 3, 4, 5 };
|
||||||
private static readonly int[] TargetOutputFeedbackIndicesTableSurround = new int[Constants.ChannelCountMax] { 0, 1, 2, 3, -1, 3 };
|
private static readonly int[] _targetOutputFeedbackIndicesTableSurround = new int[Constants.ChannelCountMax] { 0, 1, 2, 3, -1, 3 };
|
||||||
|
|
||||||
public bool Enabled { get; set; }
|
public bool Enabled { get; set; }
|
||||||
|
|
||||||
@ -82,10 +83,10 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
outputBuffers,
|
outputBuffers,
|
||||||
inputBuffers,
|
inputBuffers,
|
||||||
sampleCount,
|
sampleCount,
|
||||||
OutputEarlyIndicesTableMono,
|
_outputEarlyIndicesTableMono,
|
||||||
TargetEarlyDelayLineIndicesTableMono,
|
_targetEarlyDelayLineIndicesTableMono,
|
||||||
TargetOutputFeedbackIndicesTableMono,
|
_targetOutputFeedbackIndicesTableMono,
|
||||||
OutputIndicesTableMono);
|
_outputIndicesTableMono);
|
||||||
}
|
}
|
||||||
|
|
||||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
@ -95,10 +96,10 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
outputBuffers,
|
outputBuffers,
|
||||||
inputBuffers,
|
inputBuffers,
|
||||||
sampleCount,
|
sampleCount,
|
||||||
OutputEarlyIndicesTableStereo,
|
_outputEarlyIndicesTableStereo,
|
||||||
TargetEarlyDelayLineIndicesTableStereo,
|
_targetEarlyDelayLineIndicesTableStereo,
|
||||||
TargetOutputFeedbackIndicesTableStereo,
|
_targetOutputFeedbackIndicesTableStereo,
|
||||||
OutputIndicesTableStereo);
|
_outputIndicesTableStereo);
|
||||||
}
|
}
|
||||||
|
|
||||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
@ -108,10 +109,10 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
outputBuffers,
|
outputBuffers,
|
||||||
inputBuffers,
|
inputBuffers,
|
||||||
sampleCount,
|
sampleCount,
|
||||||
OutputEarlyIndicesTableQuadraphonic,
|
_outputEarlyIndicesTableQuadraphonic,
|
||||||
TargetEarlyDelayLineIndicesTableQuadraphonic,
|
_targetEarlyDelayLineIndicesTableQuadraphonic,
|
||||||
TargetOutputFeedbackIndicesTableQuadraphonic,
|
_targetOutputFeedbackIndicesTableQuadraphonic,
|
||||||
OutputIndicesTableQuadraphonic);
|
_outputIndicesTableQuadraphonic);
|
||||||
}
|
}
|
||||||
|
|
||||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
@ -121,10 +122,10 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
outputBuffers,
|
outputBuffers,
|
||||||
inputBuffers,
|
inputBuffers,
|
||||||
sampleCount,
|
sampleCount,
|
||||||
OutputEarlyIndicesTableSurround,
|
_outputEarlyIndicesTableSurround,
|
||||||
TargetEarlyDelayLineIndicesTableSurround,
|
_targetEarlyDelayLineIndicesTableSurround,
|
||||||
TargetOutputFeedbackIndicesTableSurround,
|
_targetOutputFeedbackIndicesTableSurround,
|
||||||
OutputIndicesTableSurround);
|
_outputIndicesTableSurround);
|
||||||
}
|
}
|
||||||
|
|
||||||
private unsafe void ProcessReverbGeneric(ref ReverbState state, ReadOnlySpan<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount, ReadOnlySpan<int> outputEarlyIndicesTable, ReadOnlySpan<int> targetEarlyDelayLineIndicesTable, ReadOnlySpan<int> targetOutputFeedbackIndicesTable, ReadOnlySpan<int> outputIndicesTable)
|
private unsafe void ProcessReverbGeneric(ref ReverbState state, ReadOnlySpan<IntPtr> outputBuffers, ReadOnlySpan<IntPtr> inputBuffers, uint sampleCount, ReadOnlySpan<int> outputEarlyIndicesTable, ReadOnlySpan<int> targetEarlyDelayLineIndicesTable, ReadOnlySpan<int> targetOutputFeedbackIndicesTable, ReadOnlySpan<int> outputIndicesTable)
|
||||||
@ -143,7 +144,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
|
|
||||||
for (int sampleIndex = 0; sampleIndex < sampleCount; sampleIndex++)
|
for (int sampleIndex = 0; sampleIndex < sampleCount; sampleIndex++)
|
||||||
{
|
{
|
||||||
outputValues.Fill(0);
|
outputValues.Clear();
|
||||||
|
|
||||||
for (int i = 0; i < targetEarlyDelayLineIndicesTable.Length; i++)
|
for (int i = 0; i < targetEarlyDelayLineIndicesTable.Length; i++)
|
||||||
{
|
{
|
||||||
@ -263,11 +264,11 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
|
|
||||||
if (IsEffectEnabled)
|
if (IsEffectEnabled)
|
||||||
{
|
{
|
||||||
if (Parameter.Status == Server.Effect.UsageState.Invalid)
|
if (Parameter.Status == UsageState.Invalid)
|
||||||
{
|
{
|
||||||
state = new ReverbState(ref _parameter, WorkBuffer, IsLongSizePreDelaySupported);
|
state = new ReverbState(ref _parameter, WorkBuffer, IsLongSizePreDelaySupported);
|
||||||
}
|
}
|
||||||
else if (Parameter.Status == Server.Effect.UsageState.New)
|
else if (Parameter.Status == UsageState.New)
|
||||||
{
|
{
|
||||||
state.UpdateParameter(ref _parameter);
|
state.UpdateParameter(ref _parameter);
|
||||||
}
|
}
|
||||||
|
@ -44,9 +44,9 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
|
|
||||||
public static void ProcessWaveBuffers(IVirtualMemoryManager memoryManager, Span<float> outputBuffer, ref WaveBufferInformation info, Span<WaveBuffer> wavebuffers, ref VoiceUpdateState voiceState, uint targetSampleRate, int sampleCount)
|
public static void ProcessWaveBuffers(IVirtualMemoryManager memoryManager, Span<float> outputBuffer, ref WaveBufferInformation info, Span<WaveBuffer> wavebuffers, ref VoiceUpdateState voiceState, uint targetSampleRate, int sampleCount)
|
||||||
{
|
{
|
||||||
const int tempBufferSize = 0x3F00;
|
const int TempBufferSize = 0x3F00;
|
||||||
|
|
||||||
Span<short> tempBuffer = stackalloc short[tempBufferSize];
|
Span<short> tempBuffer = stackalloc short[TempBufferSize];
|
||||||
|
|
||||||
float sampleRateRatio = (float)info.SourceSampleRate / targetSampleRate * info.Pitch;
|
float sampleRateRatio = (float)info.SourceSampleRate / targetSampleRate * info.Pitch;
|
||||||
|
|
||||||
@ -60,11 +60,11 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
|
|
||||||
int totalNeededSize = (int)MathF.Truncate(fraction + sampleRateRatio * sampleCount);
|
int totalNeededSize = (int)MathF.Truncate(fraction + sampleRateRatio * sampleCount);
|
||||||
|
|
||||||
if (totalNeededSize + pitchMaxLength <= tempBufferSize && totalNeededSize >= 0)
|
if (totalNeededSize + pitchMaxLength <= TempBufferSize && totalNeededSize >= 0)
|
||||||
{
|
{
|
||||||
int sourceSampleCountToProcess = sampleCount;
|
int sourceSampleCountToProcess = sampleCount;
|
||||||
|
|
||||||
int maxSampleCountPerIteration = Math.Min((int)MathF.Truncate((tempBufferSize - fraction) / sampleRateRatio), sampleCount);
|
int maxSampleCountPerIteration = Math.Min((int)MathF.Truncate((TempBufferSize - fraction) / sampleRateRatio), sampleCount);
|
||||||
|
|
||||||
bool isStarving = false;
|
bool isStarving = false;
|
||||||
|
|
||||||
@ -76,7 +76,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
|
|
||||||
if (!info.DecodingBehaviour.HasFlag(DecodingBehaviour.SkipPitchAndSampleRateConversion))
|
if (!info.DecodingBehaviour.HasFlag(DecodingBehaviour.SkipPitchAndSampleRateConversion))
|
||||||
{
|
{
|
||||||
voiceState.Pitch.AsSpan().Slice(0, pitchMaxLength).CopyTo(tempBuffer);
|
voiceState.Pitch.AsSpan()[..pitchMaxLength].CopyTo(tempBuffer);
|
||||||
tempBufferIndex += pitchMaxLength;
|
tempBufferIndex += pitchMaxLength;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -107,7 +107,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
voiceState.LoopContext = memoryManager.Read<AdpcmLoopContext>(waveBuffer.Context);
|
voiceState.LoopContext = memoryManager.Read<AdpcmLoopContext>(waveBuffer.Context);
|
||||||
}
|
}
|
||||||
|
|
||||||
Span<short> tempSpan = tempBuffer.Slice(tempBufferIndex + y);
|
Span<short> tempSpan = tempBuffer[(tempBufferIndex + y)..];
|
||||||
|
|
||||||
int decodedSampleCount = -1;
|
int decodedSampleCount = -1;
|
||||||
|
|
||||||
@ -168,7 +168,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
decodedSampleCount = PcmHelper.Decode(tempSpan, waveBufferPcmFloat, targetSampleStartOffset, targetSampleEndOffset, info.ChannelIndex, info.ChannelCount);
|
decodedSampleCount = PcmHelper.Decode(tempSpan, waveBufferPcmFloat, targetSampleStartOffset, targetSampleEndOffset, info.ChannelIndex, info.ChannelCount);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
Logger.Error?.Print(LogClass.AudioRenderer, $"Unsupported sample format " + info.SampleFormat);
|
Logger.Error?.Print(LogClass.AudioRenderer, "Unsupported sample format " + info.SampleFormat);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -220,7 +220,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Span<int> outputSpanInt = MemoryMarshal.Cast<float, int>(outputBuffer.Slice(i));
|
Span<int> outputSpanInt = MemoryMarshal.Cast<float, int>(outputBuffer[i..]);
|
||||||
|
|
||||||
if (info.DecodingBehaviour.HasFlag(DecodingBehaviour.SkipPitchAndSampleRateConversion))
|
if (info.DecodingBehaviour.HasFlag(DecodingBehaviour.SkipPitchAndSampleRateConversion))
|
||||||
{
|
{
|
||||||
@ -231,9 +231,9 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Span<short> tempSpan = tempBuffer.Slice(tempBufferIndex + y);
|
Span<short> tempSpan = tempBuffer[(tempBufferIndex + y)..];
|
||||||
|
|
||||||
tempSpan.Slice(0, sampleCountToDecode - y).Fill(0);
|
tempSpan[..(sampleCountToDecode - y)].Clear();
|
||||||
|
|
||||||
ToFloat(outputBuffer, outputSpanInt, sampleCountToProcess);
|
ToFloat(outputBuffer, outputSpanInt, sampleCountToProcess);
|
||||||
|
|
||||||
|
@ -4,8 +4,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Effect
|
|||||||
{
|
{
|
||||||
public class DelayLine : IDelayLine
|
public class DelayLine : IDelayLine
|
||||||
{
|
{
|
||||||
private float[] _workBuffer;
|
private readonly float[] _workBuffer;
|
||||||
private uint _sampleRate;
|
private readonly uint _sampleRate;
|
||||||
private uint _currentSampleIndex;
|
private uint _currentSampleIndex;
|
||||||
private uint _lastSampleIndex;
|
private uint _lastSampleIndex;
|
||||||
|
|
||||||
|
@ -4,8 +4,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Effect
|
|||||||
{
|
{
|
||||||
public class DelayLine3d : IDelayLine
|
public class DelayLine3d : IDelayLine
|
||||||
{
|
{
|
||||||
private float[] _workBuffer;
|
private readonly float[] _workBuffer;
|
||||||
private uint _sampleRate;
|
private readonly uint _sampleRate;
|
||||||
private uint _currentSampleIndex;
|
private uint _currentSampleIndex;
|
||||||
private uint _lastSampleIndex;
|
private uint _lastSampleIndex;
|
||||||
|
|
||||||
|
@ -1,6 +1,4 @@
|
|||||||
using System.Runtime.CompilerServices;
|
namespace Ryujinx.Audio.Renderer.Dsp.Effect
|
||||||
|
|
||||||
namespace Ryujinx.Audio.Renderer.Dsp.Effect
|
|
||||||
{
|
{
|
||||||
public struct ExponentialMovingAverage
|
public struct ExponentialMovingAverage
|
||||||
{
|
{
|
||||||
@ -11,7 +9,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Effect
|
|||||||
_mean = mean;
|
_mean = mean;
|
||||||
}
|
}
|
||||||
|
|
||||||
public float Read()
|
public readonly float Read()
|
||||||
{
|
{
|
||||||
return _mean;
|
return _mean;
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Reflection.Metadata;
|
|
||||||
using System.Runtime.CompilerServices;
|
using System.Runtime.CompilerServices;
|
||||||
|
|
||||||
namespace Ryujinx.Audio.Renderer.Dsp
|
namespace Ryujinx.Audio.Renderer.Dsp
|
||||||
@ -39,7 +38,8 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
{
|
{
|
||||||
return 1.0f;
|
return 1.0f;
|
||||||
}
|
}
|
||||||
else if (x <= -5.3f)
|
|
||||||
|
if (x <= -5.3f)
|
||||||
{
|
{
|
||||||
return 0.0f;
|
return 0.0f;
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Numerics;
|
|
||||||
using System.Runtime.CompilerServices;
|
using System.Runtime.CompilerServices;
|
||||||
|
|
||||||
namespace Ryujinx.Audio.Renderer.Dsp
|
namespace Ryujinx.Audio.Renderer.Dsp
|
||||||
@ -62,7 +61,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
{
|
{
|
||||||
for (int i = 0; i < input.Length; i++)
|
for (int i = 0; i < input.Length; i++)
|
||||||
{
|
{
|
||||||
output[i] = ((int)input[i]) << 16;
|
output[i] = input[i] << 16;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Numerics;
|
|
||||||
using System.Runtime.CompilerServices;
|
using System.Runtime.CompilerServices;
|
||||||
using System.Runtime.Intrinsics;
|
using System.Runtime.Intrinsics;
|
||||||
using System.Runtime.Intrinsics.X86;
|
using System.Runtime.Intrinsics.X86;
|
||||||
@ -11,8 +10,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
public static class ResamplerHelper
|
public static class ResamplerHelper
|
||||||
{
|
{
|
||||||
#region "Default Quality Lookup Tables"
|
#region "Default Quality Lookup Tables"
|
||||||
private static short[] _normalCurveLut0 = new short[]
|
private static readonly short[] _normalCurveLut0 = {
|
||||||
{
|
|
||||||
6600, 19426, 6722, 3, 6479, 19424, 6845, 9, 6359, 19419, 6968, 15, 6239, 19412, 7093, 22,
|
6600, 19426, 6722, 3, 6479, 19424, 6845, 9, 6359, 19419, 6968, 15, 6239, 19412, 7093, 22,
|
||||||
6121, 19403, 7219, 28, 6004, 19391, 7345, 34, 5888, 19377, 7472, 41, 5773, 19361, 7600, 48,
|
6121, 19403, 7219, 28, 6004, 19391, 7345, 34, 5888, 19377, 7472, 41, 5773, 19361, 7600, 48,
|
||||||
5659, 19342, 7728, 55, 5546, 19321, 7857, 62, 5434, 19298, 7987, 69, 5323, 19273, 8118, 77,
|
5659, 19342, 7728, 55, 5546, 19321, 7857, 62, 5434, 19298, 7987, 69, 5323, 19273, 8118, 77,
|
||||||
@ -44,11 +42,10 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
109, 8646, 19148, 4890, 101, 8513, 19183, 4997, 92, 8381, 19215, 5104, 84, 8249, 19245, 5213,
|
109, 8646, 19148, 4890, 101, 8513, 19183, 4997, 92, 8381, 19215, 5104, 84, 8249, 19245, 5213,
|
||||||
77, 8118, 19273, 5323, 69, 7987, 19298, 5434, 62, 7857, 19321, 5546, 55, 7728, 19342, 5659,
|
77, 8118, 19273, 5323, 69, 7987, 19298, 5434, 62, 7857, 19321, 5546, 55, 7728, 19342, 5659,
|
||||||
48, 7600, 19361, 5773, 41, 7472, 19377, 5888, 34, 7345, 19391, 6004, 28, 7219, 19403, 6121,
|
48, 7600, 19361, 5773, 41, 7472, 19377, 5888, 34, 7345, 19391, 6004, 28, 7219, 19403, 6121,
|
||||||
22, 7093, 19412, 6239, 15, 6968, 19419, 6359, 9, 6845, 19424, 6479, 3, 6722, 19426, 6600
|
22, 7093, 19412, 6239, 15, 6968, 19419, 6359, 9, 6845, 19424, 6479, 3, 6722, 19426, 6600,
|
||||||
};
|
};
|
||||||
|
|
||||||
private static short[] _normalCurveLut1 = new short[]
|
private static readonly short[] _normalCurveLut1 = {
|
||||||
{
|
|
||||||
-68, 32639, 69, -5, -200, 32630, 212, -15, -328, 32613, 359, -26, -450, 32586, 512, -36,
|
-68, 32639, 69, -5, -200, 32630, 212, -15, -328, 32613, 359, -26, -450, 32586, 512, -36,
|
||||||
-568, 32551, 669, -47, -680, 32507, 832, -58, -788, 32454, 1000, -69, -891, 32393, 1174, -80,
|
-568, 32551, 669, -47, -680, 32507, 832, -58, -788, 32454, 1000, -69, -891, 32393, 1174, -80,
|
||||||
-990, 32323, 1352, -92, -1084, 32244, 1536, -103, -1173, 32157, 1724, -115, -1258, 32061, 1919, -128,
|
-990, 32323, 1352, -92, -1084, 32244, 1536, -103, -1173, 32157, 1724, -115, -1258, 32061, 1919, -128,
|
||||||
@ -80,11 +77,10 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
-180, 2747, 31593, -1554, -167, 2532, 31723, -1486, -153, 2322, 31844, -1414, -140, 2118, 31956, -1338,
|
-180, 2747, 31593, -1554, -167, 2532, 31723, -1486, -153, 2322, 31844, -1414, -140, 2118, 31956, -1338,
|
||||||
-128, 1919, 32061, -1258, -115, 1724, 32157, -1173, -103, 1536, 32244, -1084, -92, 1352, 32323, -990,
|
-128, 1919, 32061, -1258, -115, 1724, 32157, -1173, -103, 1536, 32244, -1084, -92, 1352, 32323, -990,
|
||||||
-80, 1174, 32393, -891, -69, 1000, 32454, -788, -58, 832, 32507, -680, -47, 669, 32551, -568,
|
-80, 1174, 32393, -891, -69, 1000, 32454, -788, -58, 832, 32507, -680, -47, 669, 32551, -568,
|
||||||
-36, 512, 32586, -450, -26, 359, 32613, -328, -15, 212, 32630, -200, -5, 69, 32639, -68
|
-36, 512, 32586, -450, -26, 359, 32613, -328, -15, 212, 32630, -200, -5, 69, 32639, -68,
|
||||||
};
|
};
|
||||||
|
|
||||||
private static short[] _normalCurveLut2 = new short[]
|
private static readonly short[] _normalCurveLut2 = {
|
||||||
{
|
|
||||||
3195, 26287, 3329, -32, 3064, 26281, 3467, -34, 2936, 26270, 3608, -38, 2811, 26253, 3751, -42,
|
3195, 26287, 3329, -32, 3064, 26281, 3467, -34, 2936, 26270, 3608, -38, 2811, 26253, 3751, -42,
|
||||||
2688, 26230, 3897, -46, 2568, 26202, 4046, -50, 2451, 26169, 4199, -54, 2338, 26130, 4354, -58,
|
2688, 26230, 3897, -46, 2568, 26202, 4046, -50, 2451, 26169, 4199, -54, 2338, 26130, 4354, -58,
|
||||||
2227, 26085, 4512, -63, 2120, 26035, 4673, -67, 2015, 25980, 4837, -72, 1912, 25919, 5004, -76,
|
2227, 26085, 4512, -63, 2120, 26035, 4673, -67, 2015, 25980, 4837, -72, 1912, 25919, 5004, -76,
|
||||||
@ -116,13 +112,12 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
-98, 5701, 25621, 1531, -92, 5522, 25704, 1622, -87, 5347, 25780, 1716, -81, 5174, 25852, 1813,
|
-98, 5701, 25621, 1531, -92, 5522, 25704, 1622, -87, 5347, 25780, 1716, -81, 5174, 25852, 1813,
|
||||||
-76, 5004, 25919, 1912, -72, 4837, 25980, 2015, -67, 4673, 26035, 2120, -63, 4512, 26085, 2227,
|
-76, 5004, 25919, 1912, -72, 4837, 25980, 2015, -67, 4673, 26035, 2120, -63, 4512, 26085, 2227,
|
||||||
-58, 4354, 26130, 2338, -54, 4199, 26169, 2451, -50, 4046, 26202, 2568, -46, 3897, 26230, 2688,
|
-58, 4354, 26130, 2338, -54, 4199, 26169, 2451, -50, 4046, 26202, 2568, -46, 3897, 26230, 2688,
|
||||||
-42, 3751, 26253, 2811, -38, 3608, 26270, 2936, -34, 3467, 26281, 3064, -32, 3329, 26287, 3195
|
-42, 3751, 26253, 2811, -38, 3608, 26270, 2936, -34, 3467, 26281, 3064, -32, 3329, 26287, 3195,
|
||||||
};
|
};
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region "High Quality Lookup Tables"
|
#region "High Quality Lookup Tables"
|
||||||
private static short[] _highCurveLut0 = new short[]
|
private static readonly short[] _highCurveLut0 = {
|
||||||
{
|
|
||||||
-582, -23, 8740, 16386, 8833, 8, -590, 0, -573, -54, 8647, 16385, 8925, 40, -598, -1,
|
-582, -23, 8740, 16386, 8833, 8, -590, 0, -573, -54, 8647, 16385, 8925, 40, -598, -1,
|
||||||
-565, -84, 8555, 16383, 9018, 72, -606, -1, -557, -113, 8462, 16379, 9110, 105, -614, -2,
|
-565, -84, 8555, 16383, 9018, 72, -606, -1, -557, -113, 8462, 16379, 9110, 105, -614, -2,
|
||||||
-549, -142, 8370, 16375, 9203, 139, -622, -2, -541, -170, 8277, 16369, 9295, 173, -630, -3,
|
-549, -142, 8370, 16375, 9203, 139, -622, -2, -541, -170, 8277, 16369, 9295, 173, -630, -3,
|
||||||
@ -189,8 +184,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
-1, -598, 40, 8925, 16385, 8647, -54, -573, 0, -590, 8, 8833, 16386, 8740, -23, -582,
|
-1, -598, 40, 8925, 16385, 8647, -54, -573, 0, -590, 8, 8833, 16386, 8740, -23, -582,
|
||||||
};
|
};
|
||||||
|
|
||||||
private static short[] _highCurveLut1 = new short[]
|
private static readonly short[] _highCurveLut1 = {
|
||||||
{
|
|
||||||
-12, 47, -134, 32767, 81, -16, 2, 0, -26, 108, -345, 32760, 301, -79, 17, -1,
|
-12, 47, -134, 32767, 81, -16, 2, 0, -26, 108, -345, 32760, 301, -79, 17, -1,
|
||||||
-40, 168, -552, 32745, 526, -144, 32, -2, -53, 226, -753, 32723, 755, -210, 47, -3,
|
-40, 168, -552, 32745, 526, -144, 32, -2, -53, 226, -753, 32723, 755, -210, 47, -3,
|
||||||
-66, 284, -950, 32694, 989, -277, 63, -5, -78, 340, -1143, 32658, 1226, -346, 79, -6,
|
-66, 284, -950, 32694, 989, -277, 63, -5, -78, 340, -1143, 32658, 1226, -346, 79, -6,
|
||||||
@ -257,8 +251,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
-1, 17, -79, 301, 32760, -345, 108, -26, 0, 2, -16, 81, 32767, -134, 47, -12,
|
-1, 17, -79, 301, 32760, -345, 108, -26, 0, 2, -16, 81, 32767, -134, 47, -12,
|
||||||
};
|
};
|
||||||
|
|
||||||
private static short[] _highCurveLut2 = new short[]
|
private static readonly short[] _highCurveLut2 = {
|
||||||
{
|
|
||||||
418, -2538, 6118, 24615, 6298, -2563, 417, 0, 420, -2512, 5939, 24611, 6479, -2588, 415, 1,
|
418, -2538, 6118, 24615, 6298, -2563, 417, 0, 420, -2512, 5939, 24611, 6479, -2588, 415, 1,
|
||||||
421, -2485, 5761, 24605, 6662, -2612, 412, 2, 422, -2458, 5585, 24595, 6846, -2635, 409, 3,
|
421, -2485, 5761, 24605, 6662, -2612, 412, 2, 422, -2458, 5585, 24595, 6846, -2635, 409, 3,
|
||||||
423, -2430, 5410, 24582, 7030, -2658, 406, 4, 423, -2402, 5236, 24565, 7216, -2680, 403, 5,
|
423, -2430, 5410, 24582, 7030, -2658, 406, 4, 423, -2402, 5236, 24565, 7216, -2680, 403, 5,
|
||||||
@ -326,13 +319,13 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
};
|
};
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
private static float[] _normalCurveLut0F;
|
private static readonly float[] _normalCurveLut0F;
|
||||||
private static float[] _normalCurveLut1F;
|
private static readonly float[] _normalCurveLut1F;
|
||||||
private static float[] _normalCurveLut2F;
|
private static readonly float[] _normalCurveLut2F;
|
||||||
|
|
||||||
private static float[] _highCurveLut0F;
|
private static readonly float[] _highCurveLut0F;
|
||||||
private static float[] _highCurveLut1F;
|
private static readonly float[] _highCurveLut1F;
|
||||||
private static float[] _highCurveLut2F;
|
private static readonly float[] _highCurveLut2F;
|
||||||
|
|
||||||
static ResamplerHelper()
|
static ResamplerHelper()
|
||||||
{
|
{
|
||||||
@ -373,7 +366,8 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
{
|
{
|
||||||
return _normalCurveLut1F;
|
return _normalCurveLut1F;
|
||||||
}
|
}
|
||||||
else if (ratio > 1.333313f)
|
|
||||||
|
if (ratio > 1.333313f)
|
||||||
{
|
{
|
||||||
return _normalCurveLut0F;
|
return _normalCurveLut0F;
|
||||||
}
|
}
|
||||||
@ -514,7 +508,8 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
{
|
{
|
||||||
return _highCurveLut1F;
|
return _highCurveLut1F;
|
||||||
}
|
}
|
||||||
else if (ratio > 1.333313f)
|
|
||||||
|
if (ratio > 1.333313f)
|
||||||
{
|
{
|
||||||
return _highCurveLut0F;
|
return _highCurveLut0F;
|
||||||
}
|
}
|
||||||
|
@ -20,12 +20,12 @@ namespace Ryujinx.Audio.Renderer.Dsp.State
|
|||||||
|
|
||||||
DetectorAverage.AsSpan().Fill(new ExponentialMovingAverage(0.0f));
|
DetectorAverage.AsSpan().Fill(new ExponentialMovingAverage(0.0f));
|
||||||
CompressionGainAverage.AsSpan().Fill(new ExponentialMovingAverage(1.0f));
|
CompressionGainAverage.AsSpan().Fill(new ExponentialMovingAverage(1.0f));
|
||||||
DelayedSampleBufferPosition.AsSpan().Fill(0);
|
DelayedSampleBufferPosition.AsSpan().Clear();
|
||||||
DelayedSampleBuffer.AsSpan().Fill(0.0f);
|
DelayedSampleBuffer.AsSpan().Clear();
|
||||||
|
|
||||||
UpdateParameter(ref parameter);
|
UpdateParameter(ref parameter);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void UpdateParameter(ref LimiterParameter parameter) { }
|
public static void UpdateParameter(ref LimiterParameter parameter) { }
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -6,11 +6,11 @@ namespace Ryujinx.Audio.Renderer.Dsp.State
|
|||||||
{
|
{
|
||||||
public class Reverb3dState
|
public class Reverb3dState
|
||||||
{
|
{
|
||||||
private readonly float[] FdnDelayMinTimes = new float[4] { 5.0f, 6.0f, 13.0f, 14.0f };
|
private readonly float[] _fdnDelayMinTimes = new float[4] { 5.0f, 6.0f, 13.0f, 14.0f };
|
||||||
private readonly float[] FdnDelayMaxTimes = new float[4] { 45.704f, 82.782f, 149.94f, 271.58f };
|
private readonly float[] _fdnDelayMaxTimes = new float[4] { 45.704f, 82.782f, 149.94f, 271.58f };
|
||||||
private readonly float[] DecayDelayMaxTimes1 = new float[4] { 17.0f, 13.0f, 9.0f, 7.0f };
|
private readonly float[] _decayDelayMaxTimes1 = new float[4] { 17.0f, 13.0f, 9.0f, 7.0f };
|
||||||
private readonly float[] DecayDelayMaxTimes2 = new float[4] { 19.0f, 11.0f, 10.0f, 6.0f };
|
private readonly float[] _decayDelayMaxTimes2 = new float[4] { 19.0f, 11.0f, 10.0f, 6.0f };
|
||||||
private readonly float[] EarlyDelayTimes = new float[20] { 0.017136f, 0.059154f, 0.16173f, 0.39019f, 0.42526f, 0.45541f, 0.68974f, 0.74591f, 0.83384f, 0.8595f, 0.0f, 0.075024f, 0.16879f, 0.2999f, 0.33744f, 0.3719f, 0.59901f, 0.71674f, 0.81786f, 0.85166f };
|
private readonly float[] _earlyDelayTimes = new float[20] { 0.017136f, 0.059154f, 0.16173f, 0.39019f, 0.42526f, 0.45541f, 0.68974f, 0.74591f, 0.83384f, 0.8595f, 0.0f, 0.075024f, 0.16879f, 0.2999f, 0.33744f, 0.3719f, 0.59901f, 0.71674f, 0.81786f, 0.85166f };
|
||||||
public readonly float[] EarlyGain = new float[20] { 0.67096f, 0.61027f, 1.0f, 0.35680f, 0.68361f, 0.65978f, 0.51939f, 0.24712f, 0.45945f, 0.45021f, 0.64196f, 0.54879f, 0.92925f, 0.38270f, 0.72867f, 0.69794f, 0.5464f, 0.24563f, 0.45214f, 0.44042f };
|
public readonly float[] EarlyGain = new float[20] { 0.67096f, 0.61027f, 1.0f, 0.35680f, 0.68361f, 0.65978f, 0.51939f, 0.24712f, 0.45945f, 0.45021f, 0.64196f, 0.54879f, 0.92925f, 0.38270f, 0.72867f, 0.69794f, 0.5464f, 0.24563f, 0.45214f, 0.44042f };
|
||||||
|
|
||||||
public IDelayLine[] FdnDelayLines { get; }
|
public IDelayLine[] FdnDelayLines { get; }
|
||||||
@ -46,9 +46,9 @@ namespace Ryujinx.Audio.Renderer.Dsp.State
|
|||||||
|
|
||||||
for (int i = 0; i < 4; i++)
|
for (int i = 0; i < 4; i++)
|
||||||
{
|
{
|
||||||
FdnDelayLines[i] = new DelayLine3d(sampleRate, FdnDelayMaxTimes[i]);
|
FdnDelayLines[i] = new DelayLine3d(sampleRate, _fdnDelayMaxTimes[i]);
|
||||||
DecayDelays1[i] = new DecayDelay(new DelayLine3d(sampleRate, DecayDelayMaxTimes1[i]));
|
DecayDelays1[i] = new DecayDelay(new DelayLine3d(sampleRate, _decayDelayMaxTimes1[i]));
|
||||||
DecayDelays2[i] = new DecayDelay(new DelayLine3d(sampleRate, DecayDelayMaxTimes2[i]));
|
DecayDelays2[i] = new DecayDelay(new DelayLine3d(sampleRate, _decayDelayMaxTimes2[i]));
|
||||||
}
|
}
|
||||||
|
|
||||||
PreDelayLine = new DelayLine3d(sampleRate, 400);
|
PreDelayLine = new DelayLine3d(sampleRate, 400);
|
||||||
@ -63,7 +63,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.State
|
|||||||
|
|
||||||
EarlyDelayTime = new uint[20];
|
EarlyDelayTime = new uint[20];
|
||||||
DryGain = parameter.DryGain;
|
DryGain = parameter.DryGain;
|
||||||
PreviousFeedbackOutputDecayed.AsSpan().Fill(0);
|
PreviousFeedbackOutputDecayed.AsSpan().Clear();
|
||||||
PreviousPreDelayValue = 0;
|
PreviousPreDelayValue = 0;
|
||||||
|
|
||||||
EarlyReflectionsGain = FloatingPointHelper.Pow10(Math.Min(parameter.RoomGain + parameter.ReflectionsGain, 5000.0f) / 2000.0f);
|
EarlyReflectionsGain = FloatingPointHelper.Pow10(Math.Min(parameter.RoomGain + parameter.ReflectionsGain, 5000.0f) / 2000.0f);
|
||||||
@ -91,7 +91,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.State
|
|||||||
|
|
||||||
for (int i = 0; i < FdnDelayLines.Length; i++)
|
for (int i = 0; i < FdnDelayLines.Length; i++)
|
||||||
{
|
{
|
||||||
FdnDelayLines[i].SetDelay(FdnDelayMinTimes[i] + (parameter.Density / 100 * (FdnDelayMaxTimes[i] - FdnDelayMinTimes[i])));
|
FdnDelayLines[i].SetDelay(_fdnDelayMinTimes[i] + (parameter.Density / 100 * (_fdnDelayMaxTimes[i] - _fdnDelayMinTimes[i])));
|
||||||
|
|
||||||
uint tempSampleCount = FdnDelayLines[i].CurrentSampleCount + DecayDelays1[i].CurrentSampleCount + DecayDelays2[i].CurrentSampleCount;
|
uint tempSampleCount = FdnDelayLines[i].CurrentSampleCount + DecayDelays1[i].CurrentSampleCount + DecayDelays2[i].CurrentSampleCount;
|
||||||
|
|
||||||
@ -111,7 +111,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.State
|
|||||||
|
|
||||||
for (int i = 0; i < EarlyDelayTime.Length; i++)
|
for (int i = 0; i < EarlyDelayTime.Length; i++)
|
||||||
{
|
{
|
||||||
uint sampleCount = Math.Min(IDelayLine.GetSampleCount(sampleRate, (parameter.ReflectionDelay * 1000.0f) + (EarlyDelayTimes[i] * 1000.0f * ((parameter.ReverbDelayTime * 0.9998f) + 0.02f))), PreDelayLine.SampleCountMax);
|
uint sampleCount = Math.Min(IDelayLine.GetSampleCount(sampleRate, (parameter.ReflectionDelay * 1000.0f) + (_earlyDelayTimes[i] * 1000.0f * ((parameter.ReverbDelayTime * 0.9998f) + 0.02f))), PreDelayLine.SampleCountMax);
|
||||||
EarlyDelayTime[i] = sampleCount;
|
EarlyDelayTime[i] = sampleCount;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -7,7 +7,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.State
|
|||||||
{
|
{
|
||||||
public class ReverbState
|
public class ReverbState
|
||||||
{
|
{
|
||||||
private static readonly float[] FdnDelayTimes = new float[20]
|
private static readonly float[] _fdnDelayTimes = new float[20]
|
||||||
{
|
{
|
||||||
// Room
|
// Room
|
||||||
53.953247f, 79.192566f, 116.238770f, 130.615295f,
|
53.953247f, 79.192566f, 116.238770f, 130.615295f,
|
||||||
@ -21,7 +21,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.State
|
|||||||
53.953247f, 79.192566f, 116.238770f, 170.615295f,
|
53.953247f, 79.192566f, 116.238770f, 170.615295f,
|
||||||
};
|
};
|
||||||
|
|
||||||
private static readonly float[] DecayDelayTimes = new float[20]
|
private static readonly float[] _decayDelayTimes = new float[20]
|
||||||
{
|
{
|
||||||
// Room
|
// Room
|
||||||
7f, 9f, 13f, 17f,
|
7f, 9f, 13f, 17f,
|
||||||
@ -35,7 +35,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.State
|
|||||||
7f, 9f, 13f, 17f,
|
7f, 9f, 13f, 17f,
|
||||||
};
|
};
|
||||||
|
|
||||||
private static readonly float[] EarlyDelayTimes = new float[50]
|
private static readonly float[] _earlyDelayTimes = new float[50]
|
||||||
{
|
{
|
||||||
// Room
|
// Room
|
||||||
0.0f, 3.5f, 2.8f, 3.9f, 2.7f, 13.4f, 7.9f, 8.4f, 9.9f, 12.0f,
|
0.0f, 3.5f, 2.8f, 3.9f, 2.7f, 13.4f, 7.9f, 8.4f, 9.9f, 12.0f,
|
||||||
@ -46,10 +46,10 @@ namespace Ryujinx.Audio.Renderer.Dsp.State
|
|||||||
// Cathedral
|
// Cathedral
|
||||||
33.1f, 43.3f, 22.8f, 37.9f, 14.9f, 35.3f, 17.9f, 34.2f, 0.0f, 43.3f,
|
33.1f, 43.3f, 22.8f, 37.9f, 14.9f, 35.3f, 17.9f, 34.2f, 0.0f, 43.3f,
|
||||||
// Disabled
|
// Disabled
|
||||||
0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f
|
0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
|
||||||
};
|
};
|
||||||
|
|
||||||
private static readonly float[] EarlyGainBase = new float[50]
|
private static readonly float[] _earlyGainBase = new float[50]
|
||||||
{
|
{
|
||||||
// Room
|
// Room
|
||||||
0.70f, 0.68f, 0.70f, 0.68f, 0.70f, 0.68f, 0.70f, 0.68f, 0.68f, 0.68f,
|
0.70f, 0.68f, 0.70f, 0.68f, 0.70f, 0.68f, 0.70f, 0.68f, 0.68f, 0.68f,
|
||||||
@ -60,10 +60,10 @@ namespace Ryujinx.Audio.Renderer.Dsp.State
|
|||||||
// Cathedral
|
// Cathedral
|
||||||
0.93f, 0.92f, 0.87f, 0.86f, 0.94f, 0.81f, 0.80f, 0.77f, 0.76f, 0.65f,
|
0.93f, 0.92f, 0.87f, 0.86f, 0.94f, 0.81f, 0.80f, 0.77f, 0.76f, 0.65f,
|
||||||
// Disabled
|
// Disabled
|
||||||
0.00f, 0.00f, 0.00f, 0.00f, 0.00f, 0.00f, 0.00f, 0.00f, 0.00f, 0.00f
|
0.00f, 0.00f, 0.00f, 0.00f, 0.00f, 0.00f, 0.00f, 0.00f, 0.00f, 0.00f,
|
||||||
};
|
};
|
||||||
|
|
||||||
private static readonly float[] PreDelayTimes = new float[5]
|
private static readonly float[] _preDelayTimes = new float[5]
|
||||||
{
|
{
|
||||||
// Room
|
// Room
|
||||||
12.5f,
|
12.5f,
|
||||||
@ -74,7 +74,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.State
|
|||||||
// Cathedral
|
// Cathedral
|
||||||
50.0f,
|
50.0f,
|
||||||
// Disabled
|
// Disabled
|
||||||
0.0f
|
0.0f,
|
||||||
};
|
};
|
||||||
|
|
||||||
public DelayLine[] FdnDelayLines { get; }
|
public DelayLine[] FdnDelayLines { get; }
|
||||||
@ -93,14 +93,14 @@ namespace Ryujinx.Audio.Renderer.Dsp.State
|
|||||||
|
|
||||||
private const int FixedPointPrecision = 14;
|
private const int FixedPointPrecision = 14;
|
||||||
|
|
||||||
private ReadOnlySpan<float> GetFdnDelayTimesByLateMode(ReverbLateMode lateMode)
|
private static ReadOnlySpan<float> GetFdnDelayTimesByLateMode(ReverbLateMode lateMode)
|
||||||
{
|
{
|
||||||
return FdnDelayTimes.AsSpan((int)lateMode * 4, 4);
|
return _fdnDelayTimes.AsSpan((int)lateMode * 4, 4);
|
||||||
}
|
}
|
||||||
|
|
||||||
private ReadOnlySpan<float> GetDecayDelayTimesByLateMode(ReverbLateMode lateMode)
|
private static ReadOnlySpan<float> GetDecayDelayTimesByLateMode(ReverbLateMode lateMode)
|
||||||
{
|
{
|
||||||
return DecayDelayTimes.AsSpan((int)lateMode * 4, 4);
|
return _decayDelayTimes.AsSpan((int)lateMode * 4, 4);
|
||||||
}
|
}
|
||||||
|
|
||||||
public ReverbState(ref ReverbParameter parameter, ulong workBuffer, bool isLongSizePreDelaySupported)
|
public ReverbState(ref ReverbParameter parameter, ulong workBuffer, bool isLongSizePreDelaySupported)
|
||||||
@ -148,8 +148,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.State
|
|||||||
|
|
||||||
for (int i = 0; i < 10; i++)
|
for (int i = 0; i < 10; i++)
|
||||||
{
|
{
|
||||||
EarlyDelayTime[i] = Math.Min(IDelayLine.GetSampleCount(sampleRate, EarlyDelayTimes[i] + preDelayTimeInMilliseconds), PreDelayLine.SampleCountMax) + 1;
|
EarlyDelayTime[i] = Math.Min(IDelayLine.GetSampleCount(sampleRate, _earlyDelayTimes[i] + preDelayTimeInMilliseconds), PreDelayLine.SampleCountMax) + 1;
|
||||||
EarlyGain[i] = EarlyGainBase[i] * earlyGain;
|
EarlyGain[i] = _earlyGainBase[i] * earlyGain;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (parameter.ChannelCount == 2)
|
if (parameter.ChannelCount == 2)
|
||||||
@ -158,7 +158,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.State
|
|||||||
EarlyGain[5] = EarlyGain[5] * 0.5f;
|
EarlyGain[5] = EarlyGain[5] * 0.5f;
|
||||||
}
|
}
|
||||||
|
|
||||||
PreDelayLineDelayTime = Math.Min(IDelayLine.GetSampleCount(sampleRate, PreDelayTimes[(int)parameter.EarlyMode] + preDelayTimeInMilliseconds), PreDelayLine.SampleCountMax);
|
PreDelayLineDelayTime = Math.Min(IDelayLine.GetSampleCount(sampleRate, _preDelayTimes[(int)parameter.EarlyMode] + preDelayTimeInMilliseconds), PreDelayLine.SampleCountMax);
|
||||||
|
|
||||||
ReadOnlySpan<float> fdnDelayTimes = GetFdnDelayTimesByLateMode(parameter.LateMode);
|
ReadOnlySpan<float> fdnDelayTimes = GetFdnDelayTimesByLateMode(parameter.LateMode);
|
||||||
ReadOnlySpan<float> decayDelayTimes = GetDecayDelayTimesByLateMode(parameter.LateMode);
|
ReadOnlySpan<float> decayDelayTimes = GetDecayDelayTimesByLateMode(parameter.LateMode);
|
||||||
|
@ -13,11 +13,11 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
private const int FilterBankLength = 20;
|
private const int FilterBankLength = 20;
|
||||||
// Bank0 = [0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
|
// Bank0 = [0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
|
||||||
private const int Bank0CenterIndex = 9;
|
private const int Bank0CenterIndex = 9;
|
||||||
private static readonly Array20<float> Bank1 = PrecomputeFilterBank(1.0f / 6.0f);
|
private static readonly Array20<float> _bank1 = PrecomputeFilterBank(1.0f / 6.0f);
|
||||||
private static readonly Array20<float> Bank2 = PrecomputeFilterBank(2.0f / 6.0f);
|
private static readonly Array20<float> _bank2 = PrecomputeFilterBank(2.0f / 6.0f);
|
||||||
private static readonly Array20<float> Bank3 = PrecomputeFilterBank(3.0f / 6.0f);
|
private static readonly Array20<float> _bank3 = PrecomputeFilterBank(3.0f / 6.0f);
|
||||||
private static readonly Array20<float> Bank4 = PrecomputeFilterBank(4.0f / 6.0f);
|
private static readonly Array20<float> _bank4 = PrecomputeFilterBank(4.0f / 6.0f);
|
||||||
private static readonly Array20<float> Bank5 = PrecomputeFilterBank(5.0f / 6.0f);
|
private static readonly Array20<float> _bank5 = PrecomputeFilterBank(5.0f / 6.0f);
|
||||||
|
|
||||||
private static Array20<float> PrecomputeFilterBank(float offset)
|
private static Array20<float> PrecomputeFilterBank(float offset)
|
||||||
{
|
{
|
||||||
@ -32,14 +32,14 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
|
|
||||||
float BlackmanWindow(float x)
|
float BlackmanWindow(float x)
|
||||||
{
|
{
|
||||||
const float a = 0.18f;
|
const float A = 0.18f;
|
||||||
const float a0 = 0.5f - 0.5f * a;
|
const float A0 = 0.5f - 0.5f * A;
|
||||||
const float a1 = -0.5f;
|
const float A1 = -0.5f;
|
||||||
const float a2 = 0.5f * a;
|
const float A2 = 0.5f * A;
|
||||||
return a0 + a1 * MathF.Cos(2 * MathF.PI * x) + a2 * MathF.Cos(4 * MathF.PI * x);
|
return A0 + A1 * MathF.Cos(2 * MathF.PI * x) + A2 * MathF.Cos(4 * MathF.PI * x);
|
||||||
}
|
}
|
||||||
|
|
||||||
Array20<float> result = new Array20<float>();
|
Array20<float> result = new();
|
||||||
|
|
||||||
for (int i = 0; i < FilterBankLength; i++)
|
for (int i = 0; i < FilterBankLength; i++)
|
||||||
{
|
{
|
||||||
@ -61,7 +61,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
40 => 6.0f,
|
40 => 6.0f,
|
||||||
80 => 3.0f,
|
80 => 3.0f,
|
||||||
160 => 1.5f,
|
160 => 1.5f,
|
||||||
_ => throw new ArgumentOutOfRangeException()
|
_ => throw new ArgumentOutOfRangeException(nameof(inputSampleCount), inputSampleCount, null),
|
||||||
};
|
};
|
||||||
state.Initialized = true;
|
state.Initialized = true;
|
||||||
}
|
}
|
||||||
@ -105,7 +105,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
void NextInput(ref UpsamplerBufferState state, float input)
|
void NextInput(ref UpsamplerBufferState state, float input)
|
||||||
{
|
{
|
||||||
state.History.AsSpan().Slice(1).CopyTo(state.History.AsSpan());
|
state.History.AsSpan()[1..].CopyTo(state.History.AsSpan());
|
||||||
state.History[HistoryLength - 1] = input;
|
state.History[HistoryLength - 1] = input;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -123,19 +123,19 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
outputBuffer[i] = state.History[Bank0CenterIndex];
|
outputBuffer[i] = state.History[Bank0CenterIndex];
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
outputBuffer[i] = DoFilterBank(ref state, Bank1);
|
outputBuffer[i] = DoFilterBank(ref state, _bank1);
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
outputBuffer[i] = DoFilterBank(ref state, Bank2);
|
outputBuffer[i] = DoFilterBank(ref state, _bank2);
|
||||||
break;
|
break;
|
||||||
case 3:
|
case 3:
|
||||||
outputBuffer[i] = DoFilterBank(ref state, Bank3);
|
outputBuffer[i] = DoFilterBank(ref state, _bank3);
|
||||||
break;
|
break;
|
||||||
case 4:
|
case 4:
|
||||||
outputBuffer[i] = DoFilterBank(ref state, Bank4);
|
outputBuffer[i] = DoFilterBank(ref state, _bank4);
|
||||||
break;
|
break;
|
||||||
case 5:
|
case 5:
|
||||||
outputBuffer[i] = DoFilterBank(ref state, Bank5);
|
outputBuffer[i] = DoFilterBank(ref state, _bank5);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -152,10 +152,10 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
outputBuffer[i] = state.History[Bank0CenterIndex];
|
outputBuffer[i] = state.History[Bank0CenterIndex];
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
outputBuffer[i] = DoFilterBank(ref state, Bank2);
|
outputBuffer[i] = DoFilterBank(ref state, _bank2);
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
outputBuffer[i] = DoFilterBank(ref state, Bank4);
|
outputBuffer[i] = DoFilterBank(ref state, _bank4);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -173,11 +173,11 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
outputBuffer[i] = state.History[Bank0CenterIndex];
|
outputBuffer[i] = state.History[Bank0CenterIndex];
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
outputBuffer[i] = DoFilterBank(ref state, Bank4);
|
outputBuffer[i] = DoFilterBank(ref state, _bank4);
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
NextInput(ref state, inputBuffer[inputBufferIndex++]);
|
NextInput(ref state, inputBuffer[inputBufferIndex++]);
|
||||||
outputBuffer[i] = DoFilterBank(ref state, Bank2);
|
outputBuffer[i] = DoFilterBank(ref state, _bank2);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -185,7 +185,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
throw new ArgumentOutOfRangeException();
|
throw new ArgumentOutOfRangeException(nameof(state), state.Scale, null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -60,7 +60,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Reserved/unused
|
/// Reserved/unused
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private byte _reserved;
|
private readonly byte _reserved;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The target rendering device.
|
/// The target rendering device.
|
||||||
|
@ -18,7 +18,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Reserved/padding.
|
/// Reserved/padding.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private byte _reserved;
|
private readonly byte _reserved;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Biquad filter numerator (b0, b1, b2).
|
/// Biquad filter numerator (b0, b1, b2).
|
||||||
|
@ -98,7 +98,7 @@ namespace Ryujinx.Audio.Renderer.Parameter.Effect
|
|||||||
/// Check if the <see cref="ChannelCount"/> is valid.
|
/// Check if the <see cref="ChannelCount"/> is valid.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>Returns true if the <see cref="ChannelCount"/> is valid.</returns>
|
/// <returns>Returns true if the <see cref="ChannelCount"/> is valid.</returns>
|
||||||
public bool IsChannelCountValid()
|
public readonly bool IsChannelCountValid()
|
||||||
{
|
{
|
||||||
return EffectInParameterVersion1.IsChannelCountValid(ChannelCount);
|
return EffectInParameterVersion1.IsChannelCountValid(ChannelCount);
|
||||||
}
|
}
|
||||||
@ -107,7 +107,7 @@ namespace Ryujinx.Audio.Renderer.Parameter.Effect
|
|||||||
/// Check if the <see cref="ChannelCountMax"/> is valid.
|
/// Check if the <see cref="ChannelCountMax"/> is valid.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>Returns true if the <see cref="ChannelCountMax"/> is valid.</returns>
|
/// <returns>Returns true if the <see cref="ChannelCountMax"/> is valid.</returns>
|
||||||
public bool IsChannelCountMaxValid()
|
public readonly bool IsChannelCountMaxValid()
|
||||||
{
|
{
|
||||||
return EffectInParameterVersion1.IsChannelCountValid(ChannelCountMax);
|
return EffectInParameterVersion1.IsChannelCountValid(ChannelCountMax);
|
||||||
}
|
}
|
||||||
|
@ -84,7 +84,7 @@ namespace Ryujinx.Audio.Renderer.Parameter.Effect
|
|||||||
/// Check if the <see cref="ChannelCount"/> is valid.
|
/// Check if the <see cref="ChannelCount"/> is valid.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>Returns true if the <see cref="ChannelCount"/> is valid.</returns>
|
/// <returns>Returns true if the <see cref="ChannelCount"/> is valid.</returns>
|
||||||
public bool IsChannelCountValid()
|
public readonly bool IsChannelCountValid()
|
||||||
{
|
{
|
||||||
return EffectInParameterVersion1.IsChannelCountValid(ChannelCount);
|
return EffectInParameterVersion1.IsChannelCountValid(ChannelCount);
|
||||||
}
|
}
|
||||||
@ -93,7 +93,7 @@ namespace Ryujinx.Audio.Renderer.Parameter.Effect
|
|||||||
/// Check if the <see cref="ChannelCountMax"/> is valid.
|
/// Check if the <see cref="ChannelCountMax"/> is valid.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>Returns true if the <see cref="ChannelCountMax"/> is valid.</returns>
|
/// <returns>Returns true if the <see cref="ChannelCountMax"/> is valid.</returns>
|
||||||
public bool IsChannelCountMaxValid()
|
public readonly bool IsChannelCountMaxValid()
|
||||||
{
|
{
|
||||||
return EffectInParameterVersion1.IsChannelCountValid(ChannelCountMax);
|
return EffectInParameterVersion1.IsChannelCountValid(ChannelCountMax);
|
||||||
}
|
}
|
||||||
|
@ -115,13 +115,13 @@ namespace Ryujinx.Audio.Renderer.Parameter.Effect
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Reserved/padding.
|
/// Reserved/padding.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private byte _reserved;
|
private readonly byte _reserved;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Check if the <see cref="ChannelCount"/> is valid.
|
/// Check if the <see cref="ChannelCount"/> is valid.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>Returns true if the <see cref="ChannelCount"/> is valid.</returns>
|
/// <returns>Returns true if the <see cref="ChannelCount"/> is valid.</returns>
|
||||||
public bool IsChannelCountValid()
|
public readonly bool IsChannelCountValid()
|
||||||
{
|
{
|
||||||
return EffectInParameterVersion1.IsChannelCountValid(ChannelCount);
|
return EffectInParameterVersion1.IsChannelCountValid(ChannelCount);
|
||||||
}
|
}
|
||||||
@ -130,7 +130,7 @@ namespace Ryujinx.Audio.Renderer.Parameter.Effect
|
|||||||
/// Check if the <see cref="ChannelCountMax"/> is valid.
|
/// Check if the <see cref="ChannelCountMax"/> is valid.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>Returns true if the <see cref="ChannelCountMax"/> is valid.</returns>
|
/// <returns>Returns true if the <see cref="ChannelCountMax"/> is valid.</returns>
|
||||||
public bool IsChannelCountMaxValid()
|
public readonly bool IsChannelCountMaxValid()
|
||||||
{
|
{
|
||||||
return EffectInParameterVersion1.IsChannelCountValid(ChannelCountMax);
|
return EffectInParameterVersion1.IsChannelCountValid(ChannelCountMax);
|
||||||
}
|
}
|
||||||
|
@ -24,7 +24,7 @@ namespace Ryujinx.Audio.Renderer.Parameter.Effect
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public void Reset()
|
public void Reset()
|
||||||
{
|
{
|
||||||
InputMax.AsSpan().Fill(0.0f);
|
InputMax.AsSpan().Clear();
|
||||||
CompressionGainMin.AsSpan().Fill(1.0f);
|
CompressionGainMin.AsSpan().Fill(1.0f);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -33,7 +33,7 @@ namespace Ryujinx.Audio.Renderer.Parameter.Effect
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Reserved/unused.
|
/// Reserved/unused.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private uint _reserved;
|
private readonly uint _reserved;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The target sample rate.
|
/// The target sample rate.
|
||||||
@ -110,7 +110,7 @@ namespace Ryujinx.Audio.Renderer.Parameter.Effect
|
|||||||
/// Check if the <see cref="ChannelCount"/> is valid.
|
/// Check if the <see cref="ChannelCount"/> is valid.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>Returns true if the <see cref="ChannelCount"/> is valid.</returns>
|
/// <returns>Returns true if the <see cref="ChannelCount"/> is valid.</returns>
|
||||||
public bool IsChannelCountValid()
|
public readonly bool IsChannelCountValid()
|
||||||
{
|
{
|
||||||
return EffectInParameterVersion1.IsChannelCountValid(ChannelCount);
|
return EffectInParameterVersion1.IsChannelCountValid(ChannelCount);
|
||||||
}
|
}
|
||||||
@ -119,7 +119,7 @@ namespace Ryujinx.Audio.Renderer.Parameter.Effect
|
|||||||
/// Check if the <see cref="ChannelCountMax"/> is valid.
|
/// Check if the <see cref="ChannelCountMax"/> is valid.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>Returns true if the <see cref="ChannelCountMax"/> is valid.</returns>
|
/// <returns>Returns true if the <see cref="ChannelCountMax"/> is valid.</returns>
|
||||||
public bool IsChannelCountMaxValid()
|
public readonly bool IsChannelCountMaxValid()
|
||||||
{
|
{
|
||||||
return EffectInParameterVersion1.IsChannelCountValid(ChannelCountMax);
|
return EffectInParameterVersion1.IsChannelCountValid(ChannelCountMax);
|
||||||
}
|
}
|
||||||
|
@ -102,7 +102,7 @@ namespace Ryujinx.Audio.Renderer.Parameter.Effect
|
|||||||
/// Check if the <see cref="ChannelCount"/> is valid.
|
/// Check if the <see cref="ChannelCount"/> is valid.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>Returns true if the <see cref="ChannelCount"/> is valid.</returns>
|
/// <returns>Returns true if the <see cref="ChannelCount"/> is valid.</returns>
|
||||||
public bool IsChannelCountValid()
|
public readonly bool IsChannelCountValid()
|
||||||
{
|
{
|
||||||
return EffectInParameterVersion1.IsChannelCountValid(ChannelCount);
|
return EffectInParameterVersion1.IsChannelCountValid(ChannelCount);
|
||||||
}
|
}
|
||||||
@ -111,7 +111,7 @@ namespace Ryujinx.Audio.Renderer.Parameter.Effect
|
|||||||
/// Check if the <see cref="ChannelCountMax"/> is valid.
|
/// Check if the <see cref="ChannelCountMax"/> is valid.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>Returns true if the <see cref="ChannelCountMax"/> is valid.</returns>
|
/// <returns>Returns true if the <see cref="ChannelCountMax"/> is valid.</returns>
|
||||||
public bool IsChannelCountMaxValid()
|
public readonly bool IsChannelCountMaxValid()
|
||||||
{
|
{
|
||||||
return EffectInParameterVersion1.IsChannelCountValid(ChannelCountMax);
|
return EffectInParameterVersion1.IsChannelCountValid(ChannelCountMax);
|
||||||
}
|
}
|
||||||
|
@ -31,7 +31,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Reserved/padding.
|
/// Reserved/padding.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private byte _reserved1;
|
private readonly byte _reserved1;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The target mix id of the effect.
|
/// The target mix id of the effect.
|
||||||
@ -58,7 +58,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Reserved/padding.
|
/// Reserved/padding.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private uint _reserved2;
|
private readonly uint _reserved2;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Specific data storage.
|
/// Specific data storage.
|
||||||
@ -70,19 +70,19 @@ namespace Ryujinx.Audio.Renderer.Parameter
|
|||||||
|
|
||||||
public Span<byte> SpecificData => SpanHelpers.AsSpan<SpecificDataStruct, byte>(ref _specificDataStart);
|
public Span<byte> SpecificData => SpanHelpers.AsSpan<SpecificDataStruct, byte>(ref _specificDataStart);
|
||||||
|
|
||||||
EffectType IEffectInParameter.Type => Type;
|
readonly EffectType IEffectInParameter.Type => Type;
|
||||||
|
|
||||||
bool IEffectInParameter.IsNew => IsNew;
|
readonly bool IEffectInParameter.IsNew => IsNew;
|
||||||
|
|
||||||
bool IEffectInParameter.IsEnabled => IsEnabled;
|
readonly bool IEffectInParameter.IsEnabled => IsEnabled;
|
||||||
|
|
||||||
int IEffectInParameter.MixId => MixId;
|
readonly int IEffectInParameter.MixId => MixId;
|
||||||
|
|
||||||
ulong IEffectInParameter.BufferBase => BufferBase;
|
readonly ulong IEffectInParameter.BufferBase => BufferBase;
|
||||||
|
|
||||||
ulong IEffectInParameter.BufferSize => BufferSize;
|
readonly ulong IEffectInParameter.BufferSize => BufferSize;
|
||||||
|
|
||||||
uint IEffectInParameter.ProcessingOrder => ProcessingOrder;
|
readonly uint IEffectInParameter.ProcessingOrder => ProcessingOrder;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Check if the given channel count is valid.
|
/// Check if the given channel count is valid.
|
||||||
|
@ -31,7 +31,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Reserved/padding.
|
/// Reserved/padding.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private byte _reserved1;
|
private readonly byte _reserved1;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The target mix id of the effect.
|
/// The target mix id of the effect.
|
||||||
@ -58,7 +58,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Reserved/padding.
|
/// Reserved/padding.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private uint _reserved2;
|
private readonly uint _reserved2;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Specific data storage.
|
/// Specific data storage.
|
||||||
@ -70,19 +70,19 @@ namespace Ryujinx.Audio.Renderer.Parameter
|
|||||||
|
|
||||||
public Span<byte> SpecificData => SpanHelpers.AsSpan<SpecificDataStruct, byte>(ref _specificDataStart);
|
public Span<byte> SpecificData => SpanHelpers.AsSpan<SpecificDataStruct, byte>(ref _specificDataStart);
|
||||||
|
|
||||||
EffectType IEffectInParameter.Type => Type;
|
readonly EffectType IEffectInParameter.Type => Type;
|
||||||
|
|
||||||
bool IEffectInParameter.IsNew => IsNew;
|
readonly bool IEffectInParameter.IsNew => IsNew;
|
||||||
|
|
||||||
bool IEffectInParameter.IsEnabled => IsEnabled;
|
readonly bool IEffectInParameter.IsEnabled => IsEnabled;
|
||||||
|
|
||||||
int IEffectInParameter.MixId => MixId;
|
readonly int IEffectInParameter.MixId => MixId;
|
||||||
|
|
||||||
ulong IEffectInParameter.BufferBase => BufferBase;
|
readonly ulong IEffectInParameter.BufferBase => BufferBase;
|
||||||
|
|
||||||
ulong IEffectInParameter.BufferSize => BufferSize;
|
readonly ulong IEffectInParameter.BufferSize => BufferSize;
|
||||||
|
|
||||||
uint IEffectInParameter.ProcessingOrder => ProcessingOrder;
|
readonly uint IEffectInParameter.ProcessingOrder => ProcessingOrder;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Check if the given channel count is valid.
|
/// Check if the given channel count is valid.
|
||||||
|
@ -18,6 +18,6 @@ namespace Ryujinx.Audio.Renderer.Parameter
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private unsafe fixed byte _reserved[15];
|
private unsafe fixed byte _reserved[15];
|
||||||
|
|
||||||
EffectState IEffectOutStatus.State { get => State; set => State = value; }
|
EffectState IEffectOutStatus.State { readonly get => State; set => State = value; }
|
||||||
}
|
}
|
||||||
}
|
}
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user