Compare commits
1 Commits
android-84
...
android-73
Author | SHA1 | Date | |
---|---|---|---|
bbe918aa01 |
@ -333,7 +333,6 @@ find_package(LLVM 17 MODULE COMPONENTS Demangle)
|
|||||||
find_package(lz4 REQUIRED)
|
find_package(lz4 REQUIRED)
|
||||||
find_package(nlohmann_json 3.8 REQUIRED)
|
find_package(nlohmann_json 3.8 REQUIRED)
|
||||||
find_package(Opus 1.3 MODULE)
|
find_package(Opus 1.3 MODULE)
|
||||||
find_package(RenderDoc MODULE)
|
|
||||||
find_package(VulkanMemoryAllocator CONFIG)
|
find_package(VulkanMemoryAllocator CONFIG)
|
||||||
find_package(ZLIB 1.2 REQUIRED)
|
find_package(ZLIB 1.2 REQUIRED)
|
||||||
find_package(zstd 1.5 REQUIRED)
|
find_package(zstd 1.5 REQUIRED)
|
||||||
|
@ -1,19 +0,0 @@
|
|||||||
# SPDX-FileCopyrightText: 2023 Alexandre Bouvier <contact@amb.tf>
|
|
||||||
#
|
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
|
|
||||||
find_path(RenderDoc_INCLUDE_DIR renderdoc_app.h)
|
|
||||||
|
|
||||||
include(FindPackageHandleStandardArgs)
|
|
||||||
find_package_handle_standard_args(RenderDoc
|
|
||||||
REQUIRED_VARS RenderDoc_INCLUDE_DIR
|
|
||||||
)
|
|
||||||
|
|
||||||
if (RenderDoc_FOUND AND NOT TARGET RenderDoc::API)
|
|
||||||
add_library(RenderDoc::API INTERFACE IMPORTED)
|
|
||||||
set_target_properties(RenderDoc::API PROPERTIES
|
|
||||||
INTERFACE_INCLUDE_DIRECTORIES "${RenderDoc_INCLUDE_DIR}"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
mark_as_advanced(RenderDoc_INCLUDE_DIR)
|
|
7
externals/CMakeLists.txt
vendored
7
externals/CMakeLists.txt
vendored
@ -174,11 +174,8 @@ target_include_directories(stb PUBLIC ./stb)
|
|||||||
add_library(bc_decoder bc_decoder/bc_decoder.cpp)
|
add_library(bc_decoder bc_decoder/bc_decoder.cpp)
|
||||||
target_include_directories(bc_decoder PUBLIC ./bc_decoder)
|
target_include_directories(bc_decoder PUBLIC ./bc_decoder)
|
||||||
|
|
||||||
if (NOT TARGET RenderDoc::API)
|
add_library(renderdoc INTERFACE)
|
||||||
add_library(renderdoc INTERFACE)
|
target_include_directories(renderdoc SYSTEM INTERFACE ./renderdoc)
|
||||||
target_include_directories(renderdoc SYSTEM INTERFACE ./renderdoc)
|
|
||||||
add_library(RenderDoc::API ALIAS renderdoc)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (ANDROID)
|
if (ANDROID)
|
||||||
if (ARCHITECTURE_arm64)
|
if (ARCHITECTURE_arm64)
|
||||||
|
3
src/android/.gitignore
vendored
3
src/android/.gitignore
vendored
@ -63,6 +63,3 @@ fastlane/Preview.html
|
|||||||
fastlane/screenshots
|
fastlane/screenshots
|
||||||
fastlane/test_output
|
fastlane/test_output
|
||||||
fastlane/readme.md
|
fastlane/readme.md
|
||||||
|
|
||||||
# Autogenerated library for vulkan validation layers
|
|
||||||
libVkLayer_khronos_validation.so
|
|
||||||
|
@ -77,30 +77,13 @@ android {
|
|||||||
buildConfigField("String", "BRANCH", "\"${getBranch()}\"")
|
buildConfigField("String", "BRANCH", "\"${getBranch()}\"")
|
||||||
}
|
}
|
||||||
|
|
||||||
val keystoreFile = System.getenv("ANDROID_KEYSTORE_FILE")
|
|
||||||
if (keystoreFile != null) {
|
|
||||||
signingConfigs {
|
|
||||||
create("release") {
|
|
||||||
storeFile = file(keystoreFile)
|
|
||||||
storePassword = System.getenv("ANDROID_KEYSTORE_PASS")
|
|
||||||
keyAlias = System.getenv("ANDROID_KEY_ALIAS")
|
|
||||||
keyPassword = System.getenv("ANDROID_KEYSTORE_PASS")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Define build types, which are orthogonal to product flavors.
|
// Define build types, which are orthogonal to product flavors.
|
||||||
buildTypes {
|
buildTypes {
|
||||||
|
|
||||||
// Signed by release key, allowing for upload to Play Store.
|
// Signed by release key, allowing for upload to Play Store.
|
||||||
release {
|
release {
|
||||||
signingConfig = if (keystoreFile != null) {
|
|
||||||
signingConfigs.getByName("release")
|
|
||||||
} else {
|
|
||||||
signingConfigs.getByName("debug")
|
|
||||||
}
|
|
||||||
|
|
||||||
resValue("string", "app_name_suffixed", "yuzu")
|
resValue("string", "app_name_suffixed", "yuzu")
|
||||||
|
signingConfig = signingConfigs.getByName("debug")
|
||||||
isMinifyEnabled = true
|
isMinifyEnabled = true
|
||||||
isDebuggable = false
|
isDebuggable = false
|
||||||
proguardFiles(
|
proguardFiles(
|
||||||
@ -214,7 +197,7 @@ dependencies {
|
|||||||
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")
|
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")
|
||||||
implementation("io.coil-kt:coil:2.2.2")
|
implementation("io.coil-kt:coil:2.2.2")
|
||||||
implementation("androidx.core:core-splashscreen:1.0.1")
|
implementation("androidx.core:core-splashscreen:1.0.1")
|
||||||
implementation("androidx.window:window:1.2.0-beta03")
|
implementation("androidx.window:window:1.1.0")
|
||||||
implementation("org.ini4j:ini4j:0.5.4")
|
implementation("org.ini4j:ini4j:0.5.4")
|
||||||
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
|
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
|
||||||
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
|
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
|
||||||
|
@ -247,12 +247,7 @@ object NativeLibrary {
|
|||||||
|
|
||||||
external fun setAppDirectory(directory: String)
|
external fun setAppDirectory(directory: String)
|
||||||
|
|
||||||
/**
|
external fun installFileToNand(filename: String): Int
|
||||||
* Installs a nsp or xci file to nand
|
|
||||||
* @param filename String representation of file uri
|
|
||||||
* @param extension Lowercase string representation of file extension without "."
|
|
||||||
*/
|
|
||||||
external fun installFileToNand(filename: String, extension: String): Int
|
|
||||||
|
|
||||||
external fun initializeGpuDriver(
|
external fun initializeGpuDriver(
|
||||||
hookLibDir: String?,
|
hookLibDir: String?,
|
||||||
@ -516,11 +511,6 @@ object NativeLibrary {
|
|||||||
*/
|
*/
|
||||||
external fun submitInlineKeyboardInput(key_code: Int)
|
external fun submitInlineKeyboardInput(key_code: Int)
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a generic user directory if it doesn't exist already
|
|
||||||
*/
|
|
||||||
external fun initializeEmptyUserDirectory()
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Button type for use in onTouchEvent
|
* Button type for use in onTouchEvent
|
||||||
*/
|
*/
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
package org.yuzu.yuzu_emu.activities
|
package org.yuzu.yuzu_emu.activities
|
||||||
|
|
||||||
import android.annotation.SuppressLint
|
|
||||||
import android.app.Activity
|
import android.app.Activity
|
||||||
import android.app.PendingIntent
|
import android.app.PendingIntent
|
||||||
import android.app.PictureInPictureParams
|
import android.app.PictureInPictureParams
|
||||||
@ -398,7 +397,6 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressLint("UnspecifiedRegisterReceiverFlag")
|
|
||||||
override fun onPictureInPictureModeChanged(
|
override fun onPictureInPictureModeChanged(
|
||||||
isInPictureInPictureMode: Boolean,
|
isInPictureInPictureMode: Boolean,
|
||||||
newConfig: Configuration
|
newConfig: Configuration
|
||||||
@ -411,11 +409,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
|
|||||||
addAction(actionMute)
|
addAction(actionMute)
|
||||||
addAction(actionUnmute)
|
addAction(actionUnmute)
|
||||||
}.also {
|
}.also {
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
registerReceiver(pictureInPictureReceiver, it)
|
||||||
registerReceiver(pictureInPictureReceiver, it, RECEIVER_EXPORTED)
|
|
||||||
} else {
|
|
||||||
registerReceiver(pictureInPictureReceiver, it)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
|
@ -49,7 +49,6 @@ class HomeSettingAdapter(
|
|||||||
holder.option.onClick.invoke()
|
holder.option.onClick.invoke()
|
||||||
} else {
|
} else {
|
||||||
MessageDialogFragment.newInstance(
|
MessageDialogFragment.newInstance(
|
||||||
activity,
|
|
||||||
titleId = holder.option.disabledTitleId,
|
titleId = holder.option.disabledTitleId,
|
||||||
descriptionId = holder.option.disabledMessageId
|
descriptionId = holder.option.disabledMessageId
|
||||||
).show(activity.supportFragmentManager, MessageDialogFragment.TAG)
|
).show(activity.supportFragmentManager, MessageDialogFragment.TAG)
|
||||||
|
@ -1,49 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
package org.yuzu.yuzu_emu.adapters
|
|
||||||
|
|
||||||
import android.view.LayoutInflater
|
|
||||||
import android.view.View
|
|
||||||
import android.view.ViewGroup
|
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
|
||||||
import org.yuzu.yuzu_emu.databinding.CardInstallableBinding
|
|
||||||
import org.yuzu.yuzu_emu.model.Installable
|
|
||||||
|
|
||||||
class InstallableAdapter(private val installables: List<Installable>) :
|
|
||||||
RecyclerView.Adapter<InstallableAdapter.InstallableViewHolder>() {
|
|
||||||
override fun onCreateViewHolder(
|
|
||||||
parent: ViewGroup,
|
|
||||||
viewType: Int
|
|
||||||
): InstallableAdapter.InstallableViewHolder {
|
|
||||||
val binding =
|
|
||||||
CardInstallableBinding.inflate(LayoutInflater.from(parent.context), parent, false)
|
|
||||||
return InstallableViewHolder(binding)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun getItemCount(): Int = installables.size
|
|
||||||
|
|
||||||
override fun onBindViewHolder(holder: InstallableAdapter.InstallableViewHolder, position: Int) =
|
|
||||||
holder.bind(installables[position])
|
|
||||||
|
|
||||||
inner class InstallableViewHolder(val binding: CardInstallableBinding) :
|
|
||||||
RecyclerView.ViewHolder(binding.root) {
|
|
||||||
lateinit var installable: Installable
|
|
||||||
|
|
||||||
fun bind(installable: Installable) {
|
|
||||||
this.installable = installable
|
|
||||||
|
|
||||||
binding.title.setText(installable.titleId)
|
|
||||||
binding.description.setText(installable.descriptionId)
|
|
||||||
|
|
||||||
if (installable.install != null) {
|
|
||||||
binding.buttonInstall.visibility = View.VISIBLE
|
|
||||||
binding.buttonInstall.setOnClickListener { installable.install.invoke() }
|
|
||||||
}
|
|
||||||
if (installable.export != null) {
|
|
||||||
binding.buttonExport.visibility = View.VISIBLE
|
|
||||||
binding.buttonExport.setOnClickListener { installable.export.invoke() }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -21,7 +21,6 @@ import androidx.navigation.navArgs
|
|||||||
import com.google.android.material.color.MaterialColors
|
import com.google.android.material.color.MaterialColors
|
||||||
import kotlinx.coroutines.flow.collectLatest
|
import kotlinx.coroutines.flow.collectLatest
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import org.yuzu.yuzu_emu.NativeLibrary
|
|
||||||
import java.io.IOException
|
import java.io.IOException
|
||||||
import org.yuzu.yuzu_emu.R
|
import org.yuzu.yuzu_emu.R
|
||||||
import org.yuzu.yuzu_emu.databinding.ActivitySettingsBinding
|
import org.yuzu.yuzu_emu.databinding.ActivitySettingsBinding
|
||||||
@ -169,7 +168,7 @@ class SettingsActivity : AppCompatActivity() {
|
|||||||
if (!settingsFile.delete()) {
|
if (!settingsFile.delete()) {
|
||||||
throw IOException("Failed to delete $settingsFile")
|
throw IOException("Failed to delete $settingsFile")
|
||||||
}
|
}
|
||||||
NativeLibrary.reloadSettings()
|
Settings.settingsList.forEach { it.reset() }
|
||||||
|
|
||||||
Toast.makeText(
|
Toast.makeText(
|
||||||
applicationContext,
|
applicationContext,
|
||||||
@ -182,14 +181,12 @@ class SettingsActivity : AppCompatActivity() {
|
|||||||
private fun setInsets() {
|
private fun setInsets() {
|
||||||
ViewCompat.setOnApplyWindowInsetsListener(
|
ViewCompat.setOnApplyWindowInsetsListener(
|
||||||
binding.navigationBarShade
|
binding.navigationBarShade
|
||||||
) { _: View, windowInsets: WindowInsetsCompat ->
|
) { view: View, windowInsets: WindowInsetsCompat ->
|
||||||
val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
|
val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
|
||||||
|
|
||||||
// The only situation where we care to have a nav bar shade is when it's at the bottom
|
val mlpShade = view.layoutParams as MarginLayoutParams
|
||||||
// of the screen where scrolling list elements can go behind it.
|
mlpShade.height = barInsets.bottom
|
||||||
val mlpNavShade = binding.navigationBarShade.layoutParams as MarginLayoutParams
|
view.layoutParams = mlpShade
|
||||||
mlpNavShade.height = barInsets.bottom
|
|
||||||
binding.navigationBarShade.layoutParams = mlpNavShade
|
|
||||||
|
|
||||||
windowInsets
|
windowInsets
|
||||||
}
|
}
|
||||||
|
@ -15,9 +15,9 @@ import android.net.Uri
|
|||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.os.Handler
|
import android.os.Handler
|
||||||
import android.os.Looper
|
import android.os.Looper
|
||||||
|
import android.util.Rational
|
||||||
import android.view.*
|
import android.view.*
|
||||||
import android.widget.TextView
|
import android.widget.TextView
|
||||||
import android.widget.Toast
|
|
||||||
import androidx.activity.OnBackPressedCallback
|
import androidx.activity.OnBackPressedCallback
|
||||||
import androidx.appcompat.widget.PopupMenu
|
import androidx.appcompat.widget.PopupMenu
|
||||||
import androidx.core.content.res.ResourcesCompat
|
import androidx.core.content.res.ResourcesCompat
|
||||||
@ -54,7 +54,6 @@ import org.yuzu.yuzu_emu.model.Game
|
|||||||
import org.yuzu.yuzu_emu.model.EmulationViewModel
|
import org.yuzu.yuzu_emu.model.EmulationViewModel
|
||||||
import org.yuzu.yuzu_emu.overlay.InputOverlay
|
import org.yuzu.yuzu_emu.overlay.InputOverlay
|
||||||
import org.yuzu.yuzu_emu.utils.*
|
import org.yuzu.yuzu_emu.utils.*
|
||||||
import java.lang.NullPointerException
|
|
||||||
|
|
||||||
class EmulationFragment : Fragment(), SurfaceHolder.Callback {
|
class EmulationFragment : Fragment(), SurfaceHolder.Callback {
|
||||||
private lateinit var preferences: SharedPreferences
|
private lateinit var preferences: SharedPreferences
|
||||||
@ -106,21 +105,10 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
|
|||||||
null
|
null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
game = if (args.game != null) {
|
||||||
try {
|
args.game!!
|
||||||
game = if (args.game != null) {
|
} else {
|
||||||
args.game!!
|
intentGame ?: error("[EmulationFragment] No bootable game present!")
|
||||||
} else {
|
|
||||||
intentGame!!
|
|
||||||
}
|
|
||||||
} catch (e: NullPointerException) {
|
|
||||||
Toast.makeText(
|
|
||||||
requireContext(),
|
|
||||||
R.string.no_game_present,
|
|
||||||
Toast.LENGTH_SHORT
|
|
||||||
).show()
|
|
||||||
requireActivity().finish()
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// So this fragment doesn't restart on configuration changes; i.e. rotation.
|
// So this fragment doesn't restart on configuration changes; i.e. rotation.
|
||||||
@ -144,11 +132,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
|
|||||||
// This is using the correct scope, lint is just acting up
|
// This is using the correct scope, lint is just acting up
|
||||||
@SuppressLint("UnsafeRepeatOnLifecycleDetector")
|
@SuppressLint("UnsafeRepeatOnLifecycleDetector")
|
||||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||||
super.onViewCreated(view, savedInstanceState)
|
|
||||||
if (requireActivity().isFinishing) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
binding.surfaceEmulation.holder.addCallback(this)
|
binding.surfaceEmulation.holder.addCallback(this)
|
||||||
binding.showFpsText.setTextColor(Color.YELLOW)
|
binding.showFpsText.setTextColor(Color.YELLOW)
|
||||||
binding.doneControlConfig.setOnClickListener { stopConfiguringControls() }
|
binding.doneControlConfig.setOnClickListener { stopConfiguringControls() }
|
||||||
@ -304,23 +287,24 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
|
|||||||
|
|
||||||
override fun onConfigurationChanged(newConfig: Configuration) {
|
override fun onConfigurationChanged(newConfig: Configuration) {
|
||||||
super.onConfigurationChanged(newConfig)
|
super.onConfigurationChanged(newConfig)
|
||||||
if (_binding == null) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
updateScreenLayout()
|
|
||||||
if (emulationActivity?.isInPictureInPictureMode == true) {
|
if (emulationActivity?.isInPictureInPictureMode == true) {
|
||||||
if (binding.drawerLayout.isOpen) {
|
if (binding.drawerLayout.isOpen) {
|
||||||
binding.drawerLayout.close()
|
binding.drawerLayout.close()
|
||||||
}
|
}
|
||||||
if (EmulationMenuSettings.showOverlay) {
|
if (EmulationMenuSettings.showOverlay) {
|
||||||
binding.surfaceInputOverlay.visibility = View.INVISIBLE
|
binding.surfaceInputOverlay.post {
|
||||||
|
binding.surfaceInputOverlay.visibility = View.VISIBLE
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (EmulationMenuSettings.showOverlay && emulationViewModel.emulationStarted.value) {
|
if (EmulationMenuSettings.showOverlay && emulationViewModel.emulationStarted.value) {
|
||||||
binding.surfaceInputOverlay.visibility = View.VISIBLE
|
binding.surfaceInputOverlay.post {
|
||||||
|
binding.surfaceInputOverlay.visibility = View.VISIBLE
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
binding.surfaceInputOverlay.visibility = View.INVISIBLE
|
binding.surfaceInputOverlay.post {
|
||||||
|
binding.surfaceInputOverlay.visibility = View.INVISIBLE
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (!isInFoldableLayout) {
|
if (!isInFoldableLayout) {
|
||||||
if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
|
if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
|
||||||
@ -344,7 +328,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun onPause() {
|
override fun onPause() {
|
||||||
if (emulationState.isRunning && emulationActivity?.isInPictureInPictureMode != true) {
|
if (emulationState.isRunning) {
|
||||||
emulationState.pause()
|
emulationState.pause()
|
||||||
}
|
}
|
||||||
super.onPause()
|
super.onPause()
|
||||||
@ -410,7 +394,16 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun updateScreenLayout() {
|
private fun updateScreenLayout() {
|
||||||
binding.surfaceEmulation.setAspectRatio(null)
|
binding.surfaceEmulation.setAspectRatio(
|
||||||
|
when (IntSetting.RENDERER_ASPECT_RATIO.int) {
|
||||||
|
0 -> Rational(16, 9)
|
||||||
|
1 -> Rational(4, 3)
|
||||||
|
2 -> Rational(21, 9)
|
||||||
|
3 -> Rational(16, 10)
|
||||||
|
4 -> null // Stretch
|
||||||
|
else -> Rational(16, 9)
|
||||||
|
}
|
||||||
|
)
|
||||||
emulationActivity?.buildPictureInPictureParams()
|
emulationActivity?.buildPictureInPictureParams()
|
||||||
updateOrientation()
|
updateOrientation()
|
||||||
}
|
}
|
||||||
@ -700,6 +693,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
|
|||||||
private class EmulationState(private val gamePath: String) {
|
private class EmulationState(private val gamePath: String) {
|
||||||
private var state: State
|
private var state: State
|
||||||
private var surface: Surface? = null
|
private var surface: Surface? = null
|
||||||
|
private var runWhenSurfaceIsValid = false
|
||||||
|
|
||||||
init {
|
init {
|
||||||
// Starting state is stopped.
|
// Starting state is stopped.
|
||||||
@ -757,6 +751,8 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
|
|||||||
// If the surface is set, run now. Otherwise, wait for it to get set.
|
// If the surface is set, run now. Otherwise, wait for it to get set.
|
||||||
if (surface != null) {
|
if (surface != null) {
|
||||||
runWithValidSurface()
|
runWithValidSurface()
|
||||||
|
} else {
|
||||||
|
runWhenSurfaceIsValid = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -764,7 +760,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
|
|||||||
@Synchronized
|
@Synchronized
|
||||||
fun newSurface(surface: Surface?) {
|
fun newSurface(surface: Surface?) {
|
||||||
this.surface = surface
|
this.surface = surface
|
||||||
if (this.surface != null) {
|
if (runWhenSurfaceIsValid) {
|
||||||
runWithValidSurface()
|
runWithValidSurface()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -792,9 +788,10 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun runWithValidSurface() {
|
private fun runWithValidSurface() {
|
||||||
NativeLibrary.surfaceChanged(surface)
|
runWhenSurfaceIsValid = false
|
||||||
when (state) {
|
when (state) {
|
||||||
State.STOPPED -> {
|
State.STOPPED -> {
|
||||||
|
NativeLibrary.surfaceChanged(surface)
|
||||||
val emulationThread = Thread({
|
val emulationThread = Thread({
|
||||||
Log.debug("[EmulationFragment] Starting emulation thread.")
|
Log.debug("[EmulationFragment] Starting emulation thread.")
|
||||||
NativeLibrary.run(gamePath)
|
NativeLibrary.run(gamePath)
|
||||||
@ -804,6 +801,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
|
|||||||
|
|
||||||
State.PAUSED -> {
|
State.PAUSED -> {
|
||||||
Log.debug("[EmulationFragment] Resuming emulation.")
|
Log.debug("[EmulationFragment] Resuming emulation.")
|
||||||
|
NativeLibrary.surfaceChanged(surface)
|
||||||
NativeLibrary.unpauseEmulation()
|
NativeLibrary.unpauseEmulation()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -118,13 +118,18 @@ class HomeSettingsFragment : Fragment() {
|
|||||||
)
|
)
|
||||||
add(
|
add(
|
||||||
HomeSetting(
|
HomeSetting(
|
||||||
R.string.manage_yuzu_data,
|
R.string.install_amiibo_keys,
|
||||||
R.string.manage_yuzu_data_description,
|
R.string.install_amiibo_keys_description,
|
||||||
R.drawable.ic_install,
|
R.drawable.ic_nfc,
|
||||||
{
|
{ mainActivity.getAmiiboKey.launch(arrayOf("*/*")) }
|
||||||
binding.root.findNavController()
|
)
|
||||||
.navigate(R.id.action_homeSettingsFragment_to_installableFragment)
|
)
|
||||||
}
|
add(
|
||||||
|
HomeSetting(
|
||||||
|
R.string.install_game_content,
|
||||||
|
R.string.install_game_content_description,
|
||||||
|
R.drawable.ic_system_update_alt,
|
||||||
|
{ mainActivity.installGameUpdate.launch(arrayOf("*/*")) }
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
add(
|
add(
|
||||||
@ -143,6 +148,35 @@ class HomeSettingsFragment : Fragment() {
|
|||||||
homeViewModel.gamesDir
|
homeViewModel.gamesDir
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
add(
|
||||||
|
HomeSetting(
|
||||||
|
R.string.manage_save_data,
|
||||||
|
R.string.import_export_saves_description,
|
||||||
|
R.drawable.ic_save,
|
||||||
|
{
|
||||||
|
ImportExportSavesFragment().show(
|
||||||
|
parentFragmentManager,
|
||||||
|
ImportExportSavesFragment.TAG
|
||||||
|
)
|
||||||
|
}
|
||||||
|
)
|
||||||
|
)
|
||||||
|
add(
|
||||||
|
HomeSetting(
|
||||||
|
R.string.install_prod_keys,
|
||||||
|
R.string.install_prod_keys_description,
|
||||||
|
R.drawable.ic_unlock,
|
||||||
|
{ mainActivity.getProdKey.launch(arrayOf("*/*")) }
|
||||||
|
)
|
||||||
|
)
|
||||||
|
add(
|
||||||
|
HomeSetting(
|
||||||
|
R.string.install_firmware,
|
||||||
|
R.string.install_firmware_description,
|
||||||
|
R.drawable.ic_firmware,
|
||||||
|
{ mainActivity.getFirmware.launch(arrayOf("application/zip")) }
|
||||||
|
)
|
||||||
|
)
|
||||||
add(
|
add(
|
||||||
HomeSetting(
|
HomeSetting(
|
||||||
R.string.share_log,
|
R.string.share_log,
|
||||||
|
@ -0,0 +1,213 @@
|
|||||||
|
// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
|
||||||
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
|
package org.yuzu.yuzu_emu.fragments
|
||||||
|
|
||||||
|
import android.app.Dialog
|
||||||
|
import android.content.Intent
|
||||||
|
import android.net.Uri
|
||||||
|
import android.os.Bundle
|
||||||
|
import android.provider.DocumentsContract
|
||||||
|
import android.widget.Toast
|
||||||
|
import androidx.activity.result.ActivityResultLauncher
|
||||||
|
import androidx.activity.result.contract.ActivityResultContracts
|
||||||
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
|
import androidx.documentfile.provider.DocumentFile
|
||||||
|
import androidx.fragment.app.DialogFragment
|
||||||
|
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
||||||
|
import java.io.BufferedOutputStream
|
||||||
|
import java.io.File
|
||||||
|
import java.io.FileOutputStream
|
||||||
|
import java.io.FilenameFilter
|
||||||
|
import java.time.LocalDateTime
|
||||||
|
import java.time.format.DateTimeFormatter
|
||||||
|
import java.util.zip.ZipEntry
|
||||||
|
import java.util.zip.ZipOutputStream
|
||||||
|
import kotlinx.coroutines.CoroutineScope
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.launch
|
||||||
|
import kotlinx.coroutines.withContext
|
||||||
|
import org.yuzu.yuzu_emu.R
|
||||||
|
import org.yuzu.yuzu_emu.YuzuApplication
|
||||||
|
import org.yuzu.yuzu_emu.features.DocumentProvider
|
||||||
|
import org.yuzu.yuzu_emu.getPublicFilesDir
|
||||||
|
import org.yuzu.yuzu_emu.utils.FileUtil
|
||||||
|
|
||||||
|
class ImportExportSavesFragment : DialogFragment() {
|
||||||
|
private val context = YuzuApplication.appContext
|
||||||
|
private val savesFolder =
|
||||||
|
"${context.getPublicFilesDir().canonicalPath}/nand/user/save/0000000000000000"
|
||||||
|
|
||||||
|
// Get first subfolder in saves folder (should be the user folder)
|
||||||
|
private val savesFolderRoot = File(savesFolder).listFiles()?.firstOrNull()?.canonicalPath ?: ""
|
||||||
|
private var lastZipCreated: File? = null
|
||||||
|
|
||||||
|
private lateinit var startForResultExportSave: ActivityResultLauncher<Intent>
|
||||||
|
private lateinit var documentPicker: ActivityResultLauncher<Array<String>>
|
||||||
|
|
||||||
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
|
super.onCreate(savedInstanceState)
|
||||||
|
val activity = requireActivity() as AppCompatActivity
|
||||||
|
|
||||||
|
val activityResultRegistry = requireActivity().activityResultRegistry
|
||||||
|
startForResultExportSave = activityResultRegistry.register(
|
||||||
|
"startForResultExportSaveKey",
|
||||||
|
ActivityResultContracts.StartActivityForResult()
|
||||||
|
) {
|
||||||
|
File(context.getPublicFilesDir().canonicalPath, "temp").deleteRecursively()
|
||||||
|
}
|
||||||
|
documentPicker = activityResultRegistry.register(
|
||||||
|
"documentPickerKey",
|
||||||
|
ActivityResultContracts.OpenDocument()
|
||||||
|
) {
|
||||||
|
it?.let { uri -> importSave(uri, activity) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
|
||||||
|
return if (savesFolderRoot == "") {
|
||||||
|
MaterialAlertDialogBuilder(requireContext())
|
||||||
|
.setTitle(R.string.manage_save_data)
|
||||||
|
.setMessage(R.string.import_export_saves_no_profile)
|
||||||
|
.setPositiveButton(android.R.string.ok, null)
|
||||||
|
.show()
|
||||||
|
} else {
|
||||||
|
MaterialAlertDialogBuilder(requireContext())
|
||||||
|
.setTitle(R.string.manage_save_data)
|
||||||
|
.setMessage(R.string.manage_save_data_description)
|
||||||
|
.setNegativeButton(R.string.export_saves) { _, _ ->
|
||||||
|
exportSave()
|
||||||
|
}
|
||||||
|
.setPositiveButton(R.string.import_saves) { _, _ ->
|
||||||
|
documentPicker.launch(arrayOf("application/zip"))
|
||||||
|
}
|
||||||
|
.setNeutralButton(android.R.string.cancel, null)
|
||||||
|
.show()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Zips the save files located in the given folder path and creates a new zip file with the current date and time.
|
||||||
|
* @return true if the zip file is successfully created, false otherwise.
|
||||||
|
*/
|
||||||
|
private fun zipSave(): Boolean {
|
||||||
|
try {
|
||||||
|
val tempFolder = File(requireContext().getPublicFilesDir().canonicalPath, "temp")
|
||||||
|
tempFolder.mkdirs()
|
||||||
|
val saveFolder = File(savesFolderRoot)
|
||||||
|
val outputZipFile = File(
|
||||||
|
tempFolder,
|
||||||
|
"yuzu saves - ${
|
||||||
|
LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))
|
||||||
|
}.zip"
|
||||||
|
)
|
||||||
|
outputZipFile.createNewFile()
|
||||||
|
ZipOutputStream(BufferedOutputStream(FileOutputStream(outputZipFile))).use { zos ->
|
||||||
|
saveFolder.walkTopDown().forEach { file ->
|
||||||
|
val zipFileName =
|
||||||
|
file.absolutePath.removePrefix(savesFolderRoot).removePrefix("/")
|
||||||
|
if (zipFileName == "") {
|
||||||
|
return@forEach
|
||||||
|
}
|
||||||
|
val entry = ZipEntry("$zipFileName${(if (file.isDirectory) "/" else "")}")
|
||||||
|
zos.putNextEntry(entry)
|
||||||
|
if (file.isFile) {
|
||||||
|
file.inputStream().use { fis -> fis.copyTo(zos) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
lastZipCreated = outputZipFile
|
||||||
|
} catch (e: Exception) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Exports the save file located in the given folder path by creating a zip file and sharing it via intent.
|
||||||
|
*/
|
||||||
|
private fun exportSave() {
|
||||||
|
CoroutineScope(Dispatchers.IO).launch {
|
||||||
|
val wasZipCreated = zipSave()
|
||||||
|
val lastZipFile = lastZipCreated
|
||||||
|
if (!wasZipCreated || lastZipFile == null) {
|
||||||
|
withContext(Dispatchers.Main) {
|
||||||
|
Toast.makeText(context, "Failed to export save", Toast.LENGTH_LONG).show()
|
||||||
|
}
|
||||||
|
return@launch
|
||||||
|
}
|
||||||
|
|
||||||
|
withContext(Dispatchers.Main) {
|
||||||
|
val file = DocumentFile.fromSingleUri(
|
||||||
|
context,
|
||||||
|
DocumentsContract.buildDocumentUri(
|
||||||
|
DocumentProvider.AUTHORITY,
|
||||||
|
"${DocumentProvider.ROOT_ID}/temp/${lastZipFile.name}"
|
||||||
|
)
|
||||||
|
)!!
|
||||||
|
val intent = Intent(Intent.ACTION_SEND)
|
||||||
|
.setDataAndType(file.uri, "application/zip")
|
||||||
|
.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
|
||||||
|
.putExtra(Intent.EXTRA_STREAM, file.uri)
|
||||||
|
startForResultExportSave.launch(Intent.createChooser(intent, "Share save file"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Imports the save files contained in the zip file, and replaces any existing ones with the new save file.
|
||||||
|
* @param zipUri The Uri of the zip file containing the save file(s) to import.
|
||||||
|
*/
|
||||||
|
private fun importSave(zipUri: Uri, activity: AppCompatActivity) {
|
||||||
|
val inputZip = context.contentResolver.openInputStream(zipUri)
|
||||||
|
// A zip needs to have at least one subfolder named after a TitleId in order to be considered valid.
|
||||||
|
var validZip = false
|
||||||
|
val savesFolder = File(savesFolderRoot)
|
||||||
|
val cacheSaveDir = File("${context.cacheDir.path}/saves/")
|
||||||
|
cacheSaveDir.mkdir()
|
||||||
|
|
||||||
|
if (inputZip == null) {
|
||||||
|
Toast.makeText(context, context.getString(R.string.fatal_error), Toast.LENGTH_LONG)
|
||||||
|
.show()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
val filterTitleId =
|
||||||
|
FilenameFilter { _, dirName -> dirName.matches(Regex("^0100[\\dA-Fa-f]{12}$")) }
|
||||||
|
|
||||||
|
try {
|
||||||
|
CoroutineScope(Dispatchers.IO).launch {
|
||||||
|
FileUtil.unzip(inputZip, cacheSaveDir)
|
||||||
|
cacheSaveDir.list(filterTitleId)?.forEach { savePath ->
|
||||||
|
File(savesFolder, savePath).deleteRecursively()
|
||||||
|
File(cacheSaveDir, savePath).copyRecursively(File(savesFolder, savePath), true)
|
||||||
|
validZip = true
|
||||||
|
}
|
||||||
|
|
||||||
|
withContext(Dispatchers.Main) {
|
||||||
|
if (!validZip) {
|
||||||
|
MessageDialogFragment.newInstance(
|
||||||
|
titleId = R.string.save_file_invalid_zip_structure,
|
||||||
|
descriptionId = R.string.save_file_invalid_zip_structure_description
|
||||||
|
).show(activity.supportFragmentManager, MessageDialogFragment.TAG)
|
||||||
|
return@withContext
|
||||||
|
}
|
||||||
|
Toast.makeText(
|
||||||
|
context,
|
||||||
|
context.getString(R.string.save_file_imported_success),
|
||||||
|
Toast.LENGTH_LONG
|
||||||
|
).show()
|
||||||
|
}
|
||||||
|
|
||||||
|
cacheSaveDir.deleteRecursively()
|
||||||
|
}
|
||||||
|
} catch (e: Exception) {
|
||||||
|
Toast.makeText(context, context.getString(R.string.fatal_error), Toast.LENGTH_LONG)
|
||||||
|
.show()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
const val TAG = "ImportExportSavesFragment"
|
||||||
|
}
|
||||||
|
}
|
@ -9,7 +9,6 @@ import android.view.LayoutInflater
|
|||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
import androidx.appcompat.app.AlertDialog
|
|
||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import androidx.fragment.app.DialogFragment
|
import androidx.fragment.app.DialogFragment
|
||||||
import androidx.fragment.app.activityViewModels
|
import androidx.fragment.app.activityViewModels
|
||||||
@ -19,7 +18,6 @@ import androidx.lifecycle.lifecycleScope
|
|||||||
import androidx.lifecycle.repeatOnLifecycle
|
import androidx.lifecycle.repeatOnLifecycle
|
||||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import org.yuzu.yuzu_emu.R
|
|
||||||
import org.yuzu.yuzu_emu.databinding.DialogProgressBarBinding
|
import org.yuzu.yuzu_emu.databinding.DialogProgressBarBinding
|
||||||
import org.yuzu.yuzu_emu.model.TaskViewModel
|
import org.yuzu.yuzu_emu.model.TaskViewModel
|
||||||
|
|
||||||
@ -30,25 +28,19 @@ class IndeterminateProgressDialogFragment : DialogFragment() {
|
|||||||
|
|
||||||
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
|
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
|
||||||
val titleId = requireArguments().getInt(TITLE)
|
val titleId = requireArguments().getInt(TITLE)
|
||||||
val cancellable = requireArguments().getBoolean(CANCELLABLE)
|
|
||||||
|
|
||||||
binding = DialogProgressBarBinding.inflate(layoutInflater)
|
binding = DialogProgressBarBinding.inflate(layoutInflater)
|
||||||
binding.progressBar.isIndeterminate = true
|
binding.progressBar.isIndeterminate = true
|
||||||
val dialog = MaterialAlertDialogBuilder(requireContext())
|
val dialog = MaterialAlertDialogBuilder(requireContext())
|
||||||
.setTitle(titleId)
|
.setTitle(titleId)
|
||||||
.setView(binding.root)
|
.setView(binding.root)
|
||||||
|
.create()
|
||||||
if (cancellable) {
|
dialog.setCanceledOnTouchOutside(false)
|
||||||
dialog.setNegativeButton(android.R.string.cancel, null)
|
|
||||||
}
|
|
||||||
|
|
||||||
val alertDialog = dialog.create()
|
|
||||||
alertDialog.setCanceledOnTouchOutside(false)
|
|
||||||
|
|
||||||
if (!taskViewModel.isRunning.value) {
|
if (!taskViewModel.isRunning.value) {
|
||||||
taskViewModel.runTask()
|
taskViewModel.runTask()
|
||||||
}
|
}
|
||||||
return alertDialog
|
return dialog
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onCreateView(
|
override fun onCreateView(
|
||||||
@ -61,50 +53,24 @@ class IndeterminateProgressDialogFragment : DialogFragment() {
|
|||||||
|
|
||||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||||
super.onViewCreated(view, savedInstanceState)
|
super.onViewCreated(view, savedInstanceState)
|
||||||
viewLifecycleOwner.lifecycleScope.apply {
|
viewLifecycleOwner.lifecycleScope.launch {
|
||||||
launch {
|
repeatOnLifecycle(Lifecycle.State.CREATED) {
|
||||||
repeatOnLifecycle(Lifecycle.State.CREATED) {
|
taskViewModel.isComplete.collect {
|
||||||
taskViewModel.isComplete.collect {
|
if (it) {
|
||||||
if (it) {
|
dismiss()
|
||||||
dismiss()
|
when (val result = taskViewModel.result.value) {
|
||||||
when (val result = taskViewModel.result.value) {
|
is String -> Toast.makeText(requireContext(), result, Toast.LENGTH_LONG)
|
||||||
is String -> Toast.makeText(
|
.show()
|
||||||
requireContext(),
|
|
||||||
result,
|
|
||||||
Toast.LENGTH_LONG
|
|
||||||
).show()
|
|
||||||
|
|
||||||
is MessageDialogFragment -> result.show(
|
is MessageDialogFragment -> result.show(
|
||||||
requireActivity().supportFragmentManager,
|
requireActivity().supportFragmentManager,
|
||||||
MessageDialogFragment.TAG
|
MessageDialogFragment.TAG
|
||||||
)
|
)
|
||||||
}
|
|
||||||
taskViewModel.clear()
|
|
||||||
}
|
}
|
||||||
|
taskViewModel.clear()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
launch {
|
|
||||||
repeatOnLifecycle(Lifecycle.State.CREATED) {
|
|
||||||
taskViewModel.cancelled.collect {
|
|
||||||
if (it) {
|
|
||||||
dialog?.setTitle(R.string.cancelling)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// By default, the ProgressDialog will immediately dismiss itself upon a button being pressed.
|
|
||||||
// Setting the OnClickListener again after the dialog is shown overrides this behavior.
|
|
||||||
override fun onResume() {
|
|
||||||
super.onResume()
|
|
||||||
val alertDialog = dialog as AlertDialog
|
|
||||||
val negativeButton = alertDialog.getButton(Dialog.BUTTON_NEGATIVE)
|
|
||||||
negativeButton.setOnClickListener {
|
|
||||||
alertDialog.setTitle(getString(R.string.cancelling))
|
|
||||||
taskViewModel.setCancelled(true)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -112,19 +78,16 @@ class IndeterminateProgressDialogFragment : DialogFragment() {
|
|||||||
const val TAG = "IndeterminateProgressDialogFragment"
|
const val TAG = "IndeterminateProgressDialogFragment"
|
||||||
|
|
||||||
private const val TITLE = "Title"
|
private const val TITLE = "Title"
|
||||||
private const val CANCELLABLE = "Cancellable"
|
|
||||||
|
|
||||||
fun newInstance(
|
fun newInstance(
|
||||||
activity: AppCompatActivity,
|
activity: AppCompatActivity,
|
||||||
titleId: Int,
|
titleId: Int,
|
||||||
cancellable: Boolean = false,
|
|
||||||
task: () -> Any
|
task: () -> Any
|
||||||
): IndeterminateProgressDialogFragment {
|
): IndeterminateProgressDialogFragment {
|
||||||
val dialog = IndeterminateProgressDialogFragment()
|
val dialog = IndeterminateProgressDialogFragment()
|
||||||
val args = Bundle()
|
val args = Bundle()
|
||||||
ViewModelProvider(activity)[TaskViewModel::class.java].task = task
|
ViewModelProvider(activity)[TaskViewModel::class.java].task = task
|
||||||
args.putInt(TITLE, titleId)
|
args.putInt(TITLE, titleId)
|
||||||
args.putBoolean(CANCELLABLE, cancellable)
|
|
||||||
dialog.arguments = args
|
dialog.arguments = args
|
||||||
return dialog
|
return dialog
|
||||||
}
|
}
|
||||||
|
@ -1,138 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
package org.yuzu.yuzu_emu.fragments
|
|
||||||
|
|
||||||
import android.os.Bundle
|
|
||||||
import android.view.LayoutInflater
|
|
||||||
import android.view.View
|
|
||||||
import android.view.ViewGroup
|
|
||||||
import androidx.core.view.ViewCompat
|
|
||||||
import androidx.core.view.WindowInsetsCompat
|
|
||||||
import androidx.core.view.updatePadding
|
|
||||||
import androidx.fragment.app.Fragment
|
|
||||||
import androidx.fragment.app.activityViewModels
|
|
||||||
import androidx.navigation.findNavController
|
|
||||||
import androidx.recyclerview.widget.GridLayoutManager
|
|
||||||
import com.google.android.material.transition.MaterialSharedAxis
|
|
||||||
import org.yuzu.yuzu_emu.R
|
|
||||||
import org.yuzu.yuzu_emu.adapters.InstallableAdapter
|
|
||||||
import org.yuzu.yuzu_emu.databinding.FragmentInstallablesBinding
|
|
||||||
import org.yuzu.yuzu_emu.model.HomeViewModel
|
|
||||||
import org.yuzu.yuzu_emu.model.Installable
|
|
||||||
import org.yuzu.yuzu_emu.ui.main.MainActivity
|
|
||||||
|
|
||||||
class InstallableFragment : Fragment() {
|
|
||||||
private var _binding: FragmentInstallablesBinding? = null
|
|
||||||
private val binding get() = _binding!!
|
|
||||||
|
|
||||||
private val homeViewModel: HomeViewModel by activityViewModels()
|
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
|
||||||
super.onCreate(savedInstanceState)
|
|
||||||
enterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
|
|
||||||
returnTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
|
|
||||||
reenterTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onCreateView(
|
|
||||||
inflater: LayoutInflater,
|
|
||||||
container: ViewGroup?,
|
|
||||||
savedInstanceState: Bundle?
|
|
||||||
): View {
|
|
||||||
_binding = FragmentInstallablesBinding.inflate(layoutInflater)
|
|
||||||
return binding.root
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
|
||||||
super.onViewCreated(view, savedInstanceState)
|
|
||||||
|
|
||||||
val mainActivity = requireActivity() as MainActivity
|
|
||||||
|
|
||||||
homeViewModel.setNavigationVisibility(visible = false, animated = true)
|
|
||||||
homeViewModel.setStatusBarShadeVisibility(visible = false)
|
|
||||||
|
|
||||||
binding.toolbarInstallables.setNavigationOnClickListener {
|
|
||||||
binding.root.findNavController().popBackStack()
|
|
||||||
}
|
|
||||||
|
|
||||||
val installables = listOf(
|
|
||||||
Installable(
|
|
||||||
R.string.user_data,
|
|
||||||
R.string.user_data_description,
|
|
||||||
install = { mainActivity.importUserData.launch(arrayOf("application/zip")) },
|
|
||||||
export = { mainActivity.exportUserData.launch("export.zip") }
|
|
||||||
),
|
|
||||||
Installable(
|
|
||||||
R.string.install_game_content,
|
|
||||||
R.string.install_game_content_description,
|
|
||||||
install = { mainActivity.installGameUpdate.launch(arrayOf("*/*")) }
|
|
||||||
),
|
|
||||||
Installable(
|
|
||||||
R.string.install_firmware,
|
|
||||||
R.string.install_firmware_description,
|
|
||||||
install = { mainActivity.getFirmware.launch(arrayOf("application/zip")) }
|
|
||||||
),
|
|
||||||
if (mainActivity.savesFolderRoot != "") {
|
|
||||||
Installable(
|
|
||||||
R.string.manage_save_data,
|
|
||||||
R.string.import_export_saves_description,
|
|
||||||
install = { mainActivity.importSaves.launch(arrayOf("application/zip")) },
|
|
||||||
export = { mainActivity.exportSave() }
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
Installable(
|
|
||||||
R.string.manage_save_data,
|
|
||||||
R.string.import_export_saves_description,
|
|
||||||
install = { mainActivity.importSaves.launch(arrayOf("application/zip")) }
|
|
||||||
)
|
|
||||||
},
|
|
||||||
Installable(
|
|
||||||
R.string.install_prod_keys,
|
|
||||||
R.string.install_prod_keys_description,
|
|
||||||
install = { mainActivity.getProdKey.launch(arrayOf("*/*")) }
|
|
||||||
),
|
|
||||||
Installable(
|
|
||||||
R.string.install_amiibo_keys,
|
|
||||||
R.string.install_amiibo_keys_description,
|
|
||||||
install = { mainActivity.getAmiiboKey.launch(arrayOf("*/*")) }
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
binding.listInstallables.apply {
|
|
||||||
layoutManager = GridLayoutManager(
|
|
||||||
requireContext(),
|
|
||||||
resources.getInteger(R.integer.grid_columns)
|
|
||||||
)
|
|
||||||
adapter = InstallableAdapter(installables)
|
|
||||||
}
|
|
||||||
|
|
||||||
setInsets()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setInsets() =
|
|
||||||
ViewCompat.setOnApplyWindowInsetsListener(
|
|
||||||
binding.root
|
|
||||||
) { _: View, windowInsets: WindowInsetsCompat ->
|
|
||||||
val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
|
|
||||||
val cutoutInsets = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout())
|
|
||||||
|
|
||||||
val leftInsets = barInsets.left + cutoutInsets.left
|
|
||||||
val rightInsets = barInsets.right + cutoutInsets.right
|
|
||||||
|
|
||||||
val mlpAppBar = binding.toolbarInstallables.layoutParams as ViewGroup.MarginLayoutParams
|
|
||||||
mlpAppBar.leftMargin = leftInsets
|
|
||||||
mlpAppBar.rightMargin = rightInsets
|
|
||||||
binding.toolbarInstallables.layoutParams = mlpAppBar
|
|
||||||
|
|
||||||
val mlpScrollAbout =
|
|
||||||
binding.listInstallables.layoutParams as ViewGroup.MarginLayoutParams
|
|
||||||
mlpScrollAbout.leftMargin = leftInsets
|
|
||||||
mlpScrollAbout.rightMargin = rightInsets
|
|
||||||
binding.listInstallables.layoutParams = mlpScrollAbout
|
|
||||||
|
|
||||||
binding.listInstallables.updatePadding(bottom = barInsets.bottom)
|
|
||||||
|
|
||||||
windowInsets
|
|
||||||
}
|
|
||||||
}
|
|
@ -4,21 +4,14 @@
|
|||||||
package org.yuzu.yuzu_emu.fragments
|
package org.yuzu.yuzu_emu.fragments
|
||||||
|
|
||||||
import android.app.Dialog
|
import android.app.Dialog
|
||||||
import android.content.DialogInterface
|
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import androidx.fragment.app.DialogFragment
|
import androidx.fragment.app.DialogFragment
|
||||||
import androidx.fragment.app.FragmentActivity
|
|
||||||
import androidx.fragment.app.activityViewModels
|
|
||||||
import androidx.lifecycle.ViewModelProvider
|
|
||||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
||||||
import org.yuzu.yuzu_emu.R
|
import org.yuzu.yuzu_emu.R
|
||||||
import org.yuzu.yuzu_emu.model.MessageDialogViewModel
|
|
||||||
|
|
||||||
class MessageDialogFragment : DialogFragment() {
|
class MessageDialogFragment : DialogFragment() {
|
||||||
private val messageDialogViewModel: MessageDialogViewModel by activityViewModels()
|
|
||||||
|
|
||||||
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
|
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
|
||||||
val titleId = requireArguments().getInt(TITLE_ID)
|
val titleId = requireArguments().getInt(TITLE_ID)
|
||||||
val titleString = requireArguments().getString(TITLE_STRING)!!
|
val titleString = requireArguments().getString(TITLE_STRING)!!
|
||||||
@ -44,12 +37,6 @@ class MessageDialogFragment : DialogFragment() {
|
|||||||
return dialog.show()
|
return dialog.show()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDismiss(dialog: DialogInterface) {
|
|
||||||
super.onDismiss(dialog)
|
|
||||||
messageDialogViewModel.dismissAction.invoke()
|
|
||||||
messageDialogViewModel.clear()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun openLink(link: String) {
|
private fun openLink(link: String) {
|
||||||
val intent = Intent(Intent.ACTION_VIEW, Uri.parse(link))
|
val intent = Intent(Intent.ACTION_VIEW, Uri.parse(link))
|
||||||
startActivity(intent)
|
startActivity(intent)
|
||||||
@ -65,13 +52,11 @@ class MessageDialogFragment : DialogFragment() {
|
|||||||
private const val HELP_LINK = "Link"
|
private const val HELP_LINK = "Link"
|
||||||
|
|
||||||
fun newInstance(
|
fun newInstance(
|
||||||
activity: FragmentActivity,
|
|
||||||
titleId: Int = 0,
|
titleId: Int = 0,
|
||||||
titleString: String = "",
|
titleString: String = "",
|
||||||
descriptionId: Int = 0,
|
descriptionId: Int = 0,
|
||||||
descriptionString: String = "",
|
descriptionString: String = "",
|
||||||
helpLinkId: Int = 0,
|
helpLinkId: Int = 0
|
||||||
dismissAction: () -> Unit = {}
|
|
||||||
): MessageDialogFragment {
|
): MessageDialogFragment {
|
||||||
val dialog = MessageDialogFragment()
|
val dialog = MessageDialogFragment()
|
||||||
val bundle = Bundle()
|
val bundle = Bundle()
|
||||||
@ -82,8 +67,6 @@ class MessageDialogFragment : DialogFragment() {
|
|||||||
putString(DESCRIPTION_STRING, descriptionString)
|
putString(DESCRIPTION_STRING, descriptionString)
|
||||||
putInt(HELP_LINK, helpLinkId)
|
putInt(HELP_LINK, helpLinkId)
|
||||||
}
|
}
|
||||||
ViewModelProvider(activity)[MessageDialogViewModel::class.java].dismissAction =
|
|
||||||
dismissAction
|
|
||||||
dialog.arguments = bundle
|
dialog.arguments = bundle
|
||||||
return dialog
|
return dialog
|
||||||
}
|
}
|
||||||
|
@ -295,10 +295,8 @@ class SetupFragment : Fragment() {
|
|||||||
|
|
||||||
override fun onSaveInstanceState(outState: Bundle) {
|
override fun onSaveInstanceState(outState: Bundle) {
|
||||||
super.onSaveInstanceState(outState)
|
super.onSaveInstanceState(outState)
|
||||||
if (_binding != null) {
|
outState.putBoolean(KEY_NEXT_VISIBILITY, binding.buttonNext.isVisible)
|
||||||
outState.putBoolean(KEY_NEXT_VISIBILITY, binding.buttonNext.isVisible)
|
outState.putBoolean(KEY_BACK_VISIBILITY, binding.buttonBack.isVisible)
|
||||||
outState.putBoolean(KEY_BACK_VISIBILITY, binding.buttonBack.isVisible)
|
|
||||||
}
|
|
||||||
outState.putBooleanArray(KEY_HAS_BEEN_WARNED, hasBeenWarned)
|
outState.putBooleanArray(KEY_HAS_BEEN_WARNED, hasBeenWarned)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -355,15 +353,11 @@ class SetupFragment : Fragment() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun pageForward() {
|
fun pageForward() {
|
||||||
if (_binding != null) {
|
binding.viewPager2.currentItem = binding.viewPager2.currentItem + 1
|
||||||
binding.viewPager2.currentItem += 1
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun pageBackward() {
|
fun pageBackward() {
|
||||||
if (_binding != null) {
|
binding.viewPager2.currentItem = binding.viewPager2.currentItem - 1
|
||||||
binding.viewPager2.currentItem -= 1
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun setPageWarned(page: Int) {
|
fun setPageWarned(page: Int) {
|
||||||
|
@ -1,13 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
package org.yuzu.yuzu_emu.model
|
|
||||||
|
|
||||||
import androidx.annotation.StringRes
|
|
||||||
|
|
||||||
data class Installable(
|
|
||||||
@StringRes val titleId: Int,
|
|
||||||
@StringRes val descriptionId: Int,
|
|
||||||
val install: (() -> Unit)? = null,
|
|
||||||
val export: (() -> Unit)? = null
|
|
||||||
)
|
|
@ -1,14 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
package org.yuzu.yuzu_emu.model
|
|
||||||
|
|
||||||
import androidx.lifecycle.ViewModel
|
|
||||||
|
|
||||||
class MessageDialogViewModel : ViewModel() {
|
|
||||||
var dismissAction: () -> Unit = {}
|
|
||||||
|
|
||||||
fun clear() {
|
|
||||||
dismissAction = {}
|
|
||||||
}
|
|
||||||
}
|
|
@ -20,20 +20,12 @@ class TaskViewModel : ViewModel() {
|
|||||||
val isRunning: StateFlow<Boolean> get() = _isRunning
|
val isRunning: StateFlow<Boolean> get() = _isRunning
|
||||||
private val _isRunning = MutableStateFlow(false)
|
private val _isRunning = MutableStateFlow(false)
|
||||||
|
|
||||||
val cancelled: StateFlow<Boolean> get() = _cancelled
|
|
||||||
private val _cancelled = MutableStateFlow(false)
|
|
||||||
|
|
||||||
lateinit var task: () -> Any
|
lateinit var task: () -> Any
|
||||||
|
|
||||||
fun clear() {
|
fun clear() {
|
||||||
_result.value = Any()
|
_result.value = Any()
|
||||||
_isComplete.value = false
|
_isComplete.value = false
|
||||||
_isRunning.value = false
|
_isRunning.value = false
|
||||||
_cancelled.value = false
|
|
||||||
}
|
|
||||||
|
|
||||||
fun setCancelled(value: Boolean) {
|
|
||||||
_cancelled.value = value
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun runTask() {
|
fun runTask() {
|
||||||
@ -50,9 +42,3 @@ class TaskViewModel : ViewModel() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
enum class TaskState {
|
|
||||||
Completed,
|
|
||||||
Failed,
|
|
||||||
Cancelled
|
|
||||||
}
|
|
||||||
|
@ -352,7 +352,7 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun addOverlayControls(layout: String) {
|
private fun addOverlayControls(layout: String) {
|
||||||
val windowSize = getSafeScreenSize(context, Pair(measuredWidth, measuredHeight))
|
val windowSize = getSafeScreenSize(context)
|
||||||
if (preferences.getBoolean(Settings.PREF_BUTTON_A, true)) {
|
if (preferences.getBoolean(Settings.PREF_BUTTON_A, true)) {
|
||||||
overlayButtons.add(
|
overlayButtons.add(
|
||||||
initializeOverlayButton(
|
initializeOverlayButton(
|
||||||
@ -593,7 +593,7 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun saveControlPosition(prefId: String, x: Int, y: Int, layout: String) {
|
private fun saveControlPosition(prefId: String, x: Int, y: Int, layout: String) {
|
||||||
val windowSize = getSafeScreenSize(context, Pair(measuredWidth, measuredHeight))
|
val windowSize = getSafeScreenSize(context)
|
||||||
val min = windowSize.first
|
val min = windowSize.first
|
||||||
val max = windowSize.second
|
val max = windowSize.second
|
||||||
PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext).edit()
|
PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext).edit()
|
||||||
@ -968,17 +968,14 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
|
|||||||
* @return A pair of points, the first being the top left corner of the safe area,
|
* @return A pair of points, the first being the top left corner of the safe area,
|
||||||
* the second being the bottom right corner of the safe area
|
* the second being the bottom right corner of the safe area
|
||||||
*/
|
*/
|
||||||
private fun getSafeScreenSize(
|
private fun getSafeScreenSize(context: Context): Pair<Point, Point> {
|
||||||
context: Context,
|
|
||||||
screenSize: Pair<Int, Int>
|
|
||||||
): Pair<Point, Point> {
|
|
||||||
// Get screen size
|
// Get screen size
|
||||||
val windowMetrics = WindowMetricsCalculator.getOrCreate()
|
val windowMetrics = WindowMetricsCalculator.getOrCreate()
|
||||||
.computeCurrentWindowMetrics(context as Activity)
|
.computeCurrentWindowMetrics(context as Activity)
|
||||||
var maxX = screenSize.first.toFloat()
|
var maxY = windowMetrics.bounds.height().toFloat()
|
||||||
var maxY = screenSize.second.toFloat()
|
var maxX = windowMetrics.bounds.width().toFloat()
|
||||||
var minX = 0
|
|
||||||
var minY = 0
|
var minY = 0
|
||||||
|
var minX = 0
|
||||||
|
|
||||||
// If we have API access, calculate the safe area to draw the overlay
|
// If we have API access, calculate the safe area to draw the overlay
|
||||||
var cutoutLeft = 0
|
var cutoutLeft = 0
|
||||||
|
@ -6,7 +6,6 @@ package org.yuzu.yuzu_emu.ui.main
|
|||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.provider.DocumentsContract
|
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup.MarginLayoutParams
|
import android.view.ViewGroup.MarginLayoutParams
|
||||||
import android.view.WindowManager
|
import android.view.WindowManager
|
||||||
@ -20,7 +19,6 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
|
|||||||
import androidx.core.view.ViewCompat
|
import androidx.core.view.ViewCompat
|
||||||
import androidx.core.view.WindowCompat
|
import androidx.core.view.WindowCompat
|
||||||
import androidx.core.view.WindowInsetsCompat
|
import androidx.core.view.WindowInsetsCompat
|
||||||
import androidx.documentfile.provider.DocumentFile
|
|
||||||
import androidx.lifecycle.Lifecycle
|
import androidx.lifecycle.Lifecycle
|
||||||
import androidx.lifecycle.lifecycleScope
|
import androidx.lifecycle.lifecycleScope
|
||||||
import androidx.lifecycle.repeatOnLifecycle
|
import androidx.lifecycle.repeatOnLifecycle
|
||||||
@ -31,7 +29,6 @@ import androidx.preference.PreferenceManager
|
|||||||
import com.google.android.material.color.MaterialColors
|
import com.google.android.material.color.MaterialColors
|
||||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
||||||
import com.google.android.material.navigation.NavigationBarView
|
import com.google.android.material.navigation.NavigationBarView
|
||||||
import kotlinx.coroutines.CoroutineScope
|
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import java.io.FilenameFilter
|
import java.io.FilenameFilter
|
||||||
import java.io.IOException
|
import java.io.IOException
|
||||||
@ -44,40 +41,21 @@ import org.yuzu.yuzu_emu.R
|
|||||||
import org.yuzu.yuzu_emu.activities.EmulationActivity
|
import org.yuzu.yuzu_emu.activities.EmulationActivity
|
||||||
import org.yuzu.yuzu_emu.databinding.ActivityMainBinding
|
import org.yuzu.yuzu_emu.databinding.ActivityMainBinding
|
||||||
import org.yuzu.yuzu_emu.databinding.DialogProgressBarBinding
|
import org.yuzu.yuzu_emu.databinding.DialogProgressBarBinding
|
||||||
import org.yuzu.yuzu_emu.features.DocumentProvider
|
|
||||||
import org.yuzu.yuzu_emu.features.settings.model.Settings
|
import org.yuzu.yuzu_emu.features.settings.model.Settings
|
||||||
import org.yuzu.yuzu_emu.fragments.IndeterminateProgressDialogFragment
|
import org.yuzu.yuzu_emu.fragments.IndeterminateProgressDialogFragment
|
||||||
import org.yuzu.yuzu_emu.fragments.MessageDialogFragment
|
import org.yuzu.yuzu_emu.fragments.MessageDialogFragment
|
||||||
import org.yuzu.yuzu_emu.getPublicFilesDir
|
|
||||||
import org.yuzu.yuzu_emu.model.GamesViewModel
|
import org.yuzu.yuzu_emu.model.GamesViewModel
|
||||||
import org.yuzu.yuzu_emu.model.HomeViewModel
|
import org.yuzu.yuzu_emu.model.HomeViewModel
|
||||||
import org.yuzu.yuzu_emu.model.TaskState
|
|
||||||
import org.yuzu.yuzu_emu.model.TaskViewModel
|
|
||||||
import org.yuzu.yuzu_emu.utils.*
|
import org.yuzu.yuzu_emu.utils.*
|
||||||
import java.io.BufferedInputStream
|
|
||||||
import java.io.BufferedOutputStream
|
|
||||||
import java.io.FileOutputStream
|
|
||||||
import java.time.LocalDateTime
|
|
||||||
import java.time.format.DateTimeFormatter
|
|
||||||
import java.util.zip.ZipEntry
|
|
||||||
import java.util.zip.ZipInputStream
|
|
||||||
|
|
||||||
class MainActivity : AppCompatActivity(), ThemeProvider {
|
class MainActivity : AppCompatActivity(), ThemeProvider {
|
||||||
private lateinit var binding: ActivityMainBinding
|
private lateinit var binding: ActivityMainBinding
|
||||||
|
|
||||||
private val homeViewModel: HomeViewModel by viewModels()
|
private val homeViewModel: HomeViewModel by viewModels()
|
||||||
private val gamesViewModel: GamesViewModel by viewModels()
|
private val gamesViewModel: GamesViewModel by viewModels()
|
||||||
private val taskViewModel: TaskViewModel by viewModels()
|
|
||||||
|
|
||||||
override var themeId: Int = 0
|
override var themeId: Int = 0
|
||||||
|
|
||||||
private val savesFolder
|
|
||||||
get() = "${getPublicFilesDir().canonicalPath}/nand/user/save/0000000000000000"
|
|
||||||
|
|
||||||
// Get first subfolder in saves folder (should be the user folder)
|
|
||||||
val savesFolderRoot get() = File(savesFolder).listFiles()?.firstOrNull()?.canonicalPath ?: ""
|
|
||||||
private var lastZipCreated: File? = null
|
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
val splashScreen = installSplashScreen()
|
val splashScreen = installSplashScreen()
|
||||||
splashScreen.setKeepOnScreenCondition { !DirectoryInitialization.areDirectoriesReady }
|
splashScreen.setKeepOnScreenCondition { !DirectoryInitialization.areDirectoriesReady }
|
||||||
@ -329,7 +307,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
|
|||||||
fun processKey(result: Uri): Boolean {
|
fun processKey(result: Uri): Boolean {
|
||||||
if (FileUtil.getExtension(result) != "keys") {
|
if (FileUtil.getExtension(result) != "keys") {
|
||||||
MessageDialogFragment.newInstance(
|
MessageDialogFragment.newInstance(
|
||||||
this,
|
|
||||||
titleId = R.string.reading_keys_failure,
|
titleId = R.string.reading_keys_failure,
|
||||||
descriptionId = R.string.install_prod_keys_failure_extension_description
|
descriptionId = R.string.install_prod_keys_failure_extension_description
|
||||||
).show(supportFragmentManager, MessageDialogFragment.TAG)
|
).show(supportFragmentManager, MessageDialogFragment.TAG)
|
||||||
@ -359,7 +336,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
|
|||||||
return true
|
return true
|
||||||
} else {
|
} else {
|
||||||
MessageDialogFragment.newInstance(
|
MessageDialogFragment.newInstance(
|
||||||
this,
|
|
||||||
titleId = R.string.invalid_keys_error,
|
titleId = R.string.invalid_keys_error,
|
||||||
descriptionId = R.string.install_keys_failure_description,
|
descriptionId = R.string.install_keys_failure_description,
|
||||||
helpLinkId = R.string.dumping_keys_quickstart_link
|
helpLinkId = R.string.dumping_keys_quickstart_link
|
||||||
@ -395,12 +371,11 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
|
|||||||
val task: () -> Any = {
|
val task: () -> Any = {
|
||||||
var messageToShow: Any
|
var messageToShow: Any
|
||||||
try {
|
try {
|
||||||
FileUtil.unzipToInternalStorage(BufferedInputStream(inputZip), cacheFirmwareDir)
|
FileUtil.unzip(inputZip, cacheFirmwareDir)
|
||||||
val unfilteredNumOfFiles = cacheFirmwareDir.list()?.size ?: -1
|
val unfilteredNumOfFiles = cacheFirmwareDir.list()?.size ?: -1
|
||||||
val filteredNumOfFiles = cacheFirmwareDir.list(filterNCA)?.size ?: -2
|
val filteredNumOfFiles = cacheFirmwareDir.list(filterNCA)?.size ?: -2
|
||||||
messageToShow = if (unfilteredNumOfFiles != filteredNumOfFiles) {
|
messageToShow = if (unfilteredNumOfFiles != filteredNumOfFiles) {
|
||||||
MessageDialogFragment.newInstance(
|
MessageDialogFragment.newInstance(
|
||||||
this,
|
|
||||||
titleId = R.string.firmware_installed_failure,
|
titleId = R.string.firmware_installed_failure,
|
||||||
descriptionId = R.string.firmware_installed_failure_description
|
descriptionId = R.string.firmware_installed_failure_description
|
||||||
)
|
)
|
||||||
@ -420,7 +395,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
|
|||||||
IndeterminateProgressDialogFragment.newInstance(
|
IndeterminateProgressDialogFragment.newInstance(
|
||||||
this,
|
this,
|
||||||
R.string.firmware_installing,
|
R.string.firmware_installing,
|
||||||
task = task
|
task
|
||||||
).show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
|
).show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -432,7 +407,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
|
|||||||
|
|
||||||
if (FileUtil.getExtension(result) != "bin") {
|
if (FileUtil.getExtension(result) != "bin") {
|
||||||
MessageDialogFragment.newInstance(
|
MessageDialogFragment.newInstance(
|
||||||
this,
|
|
||||||
titleId = R.string.reading_keys_failure,
|
titleId = R.string.reading_keys_failure,
|
||||||
descriptionId = R.string.install_amiibo_keys_failure_extension_description
|
descriptionId = R.string.install_amiibo_keys_failure_extension_description
|
||||||
).show(supportFragmentManager, MessageDialogFragment.TAG)
|
).show(supportFragmentManager, MessageDialogFragment.TAG)
|
||||||
@ -460,7 +434,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
|
|||||||
).show()
|
).show()
|
||||||
} else {
|
} else {
|
||||||
MessageDialogFragment.newInstance(
|
MessageDialogFragment.newInstance(
|
||||||
this,
|
|
||||||
titleId = R.string.invalid_keys_error,
|
titleId = R.string.invalid_keys_error,
|
||||||
descriptionId = R.string.install_keys_failure_description,
|
descriptionId = R.string.install_keys_failure_description,
|
||||||
helpLinkId = R.string.dumping_keys_quickstart_link
|
helpLinkId = R.string.dumping_keys_quickstart_link
|
||||||
@ -528,7 +501,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
|
|||||||
if (documents.isNotEmpty()) {
|
if (documents.isNotEmpty()) {
|
||||||
IndeterminateProgressDialogFragment.newInstance(
|
IndeterminateProgressDialogFragment.newInstance(
|
||||||
this@MainActivity,
|
this@MainActivity,
|
||||||
R.string.installing_game_content
|
R.string.install_game_content
|
||||||
) {
|
) {
|
||||||
var installSuccess = 0
|
var installSuccess = 0
|
||||||
var installOverwrite = 0
|
var installOverwrite = 0
|
||||||
@ -536,12 +509,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
|
|||||||
var errorExtension = 0
|
var errorExtension = 0
|
||||||
var errorOther = 0
|
var errorOther = 0
|
||||||
documents.forEach {
|
documents.forEach {
|
||||||
when (
|
when (NativeLibrary.installFileToNand(it.toString())) {
|
||||||
NativeLibrary.installFileToNand(
|
|
||||||
it.toString(),
|
|
||||||
FileUtil.getExtension(it)
|
|
||||||
)
|
|
||||||
) {
|
|
||||||
NativeLibrary.InstallFileToNandResult.Success -> {
|
NativeLibrary.InstallFileToNandResult.Success -> {
|
||||||
installSuccess += 1
|
installSuccess += 1
|
||||||
}
|
}
|
||||||
@ -615,14 +583,12 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
|
|||||||
installResult.append(separator)
|
installResult.append(separator)
|
||||||
}
|
}
|
||||||
return@newInstance MessageDialogFragment.newInstance(
|
return@newInstance MessageDialogFragment.newInstance(
|
||||||
this,
|
|
||||||
titleId = R.string.install_game_content_failure,
|
titleId = R.string.install_game_content_failure,
|
||||||
descriptionString = installResult.toString().trim(),
|
descriptionString = installResult.toString().trim(),
|
||||||
helpLinkId = R.string.install_game_content_help_link
|
helpLinkId = R.string.install_game_content_help_link
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
return@newInstance MessageDialogFragment.newInstance(
|
return@newInstance MessageDialogFragment.newInstance(
|
||||||
this,
|
|
||||||
titleId = R.string.install_game_content_success,
|
titleId = R.string.install_game_content_success,
|
||||||
descriptionString = installResult.toString().trim()
|
descriptionString = installResult.toString().trim()
|
||||||
)
|
)
|
||||||
@ -630,228 +596,4 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
|
|||||||
}.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
|
}.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val exportUserData = registerForActivityResult(
|
|
||||||
ActivityResultContracts.CreateDocument("application/zip")
|
|
||||||
) { result ->
|
|
||||||
if (result == null) {
|
|
||||||
return@registerForActivityResult
|
|
||||||
}
|
|
||||||
|
|
||||||
IndeterminateProgressDialogFragment.newInstance(
|
|
||||||
this,
|
|
||||||
R.string.exporting_user_data,
|
|
||||||
true
|
|
||||||
) {
|
|
||||||
val zipResult = FileUtil.zipFromInternalStorage(
|
|
||||||
File(DirectoryInitialization.userDirectory!!),
|
|
||||||
DirectoryInitialization.userDirectory!!,
|
|
||||||
BufferedOutputStream(contentResolver.openOutputStream(result)),
|
|
||||||
taskViewModel.cancelled
|
|
||||||
)
|
|
||||||
return@newInstance when (zipResult) {
|
|
||||||
TaskState.Completed -> getString(R.string.user_data_export_success)
|
|
||||||
TaskState.Failed -> R.string.export_failed
|
|
||||||
TaskState.Cancelled -> R.string.user_data_export_cancelled
|
|
||||||
}
|
|
||||||
}.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
|
|
||||||
}
|
|
||||||
|
|
||||||
val importUserData =
|
|
||||||
registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
|
|
||||||
if (result == null) {
|
|
||||||
return@registerForActivityResult
|
|
||||||
}
|
|
||||||
|
|
||||||
IndeterminateProgressDialogFragment.newInstance(
|
|
||||||
this,
|
|
||||||
R.string.importing_user_data
|
|
||||||
) {
|
|
||||||
val checkStream =
|
|
||||||
ZipInputStream(BufferedInputStream(contentResolver.openInputStream(result)))
|
|
||||||
var isYuzuBackup = false
|
|
||||||
checkStream.use { stream ->
|
|
||||||
var ze: ZipEntry? = null
|
|
||||||
while (stream.nextEntry?.also { ze = it } != null) {
|
|
||||||
val itemName = ze!!.name.trim()
|
|
||||||
if (itemName == "/config/config.ini" || itemName == "config/config.ini") {
|
|
||||||
isYuzuBackup = true
|
|
||||||
return@use
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!isYuzuBackup) {
|
|
||||||
return@newInstance MessageDialogFragment.newInstance(
|
|
||||||
this,
|
|
||||||
titleId = R.string.invalid_yuzu_backup,
|
|
||||||
descriptionId = R.string.user_data_import_failed_description
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Clear existing user data
|
|
||||||
File(DirectoryInitialization.userDirectory!!).deleteRecursively()
|
|
||||||
|
|
||||||
// Copy archive to internal storage
|
|
||||||
try {
|
|
||||||
FileUtil.unzipToInternalStorage(
|
|
||||||
BufferedInputStream(contentResolver.openInputStream(result)),
|
|
||||||
File(DirectoryInitialization.userDirectory!!)
|
|
||||||
)
|
|
||||||
} catch (e: Exception) {
|
|
||||||
return@newInstance MessageDialogFragment.newInstance(
|
|
||||||
this,
|
|
||||||
titleId = R.string.import_failed,
|
|
||||||
descriptionId = R.string.user_data_import_failed_description
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Reinitialize relevant data
|
|
||||||
NativeLibrary.initializeEmulation()
|
|
||||||
gamesViewModel.reloadGames(false)
|
|
||||||
|
|
||||||
return@newInstance getString(R.string.user_data_import_success)
|
|
||||||
}.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Zips the save files located in the given folder path and creates a new zip file with the current date and time.
|
|
||||||
* @return true if the zip file is successfully created, false otherwise.
|
|
||||||
*/
|
|
||||||
private fun zipSave(): Boolean {
|
|
||||||
try {
|
|
||||||
val tempFolder = File(getPublicFilesDir().canonicalPath, "temp")
|
|
||||||
tempFolder.mkdirs()
|
|
||||||
val saveFolder = File(savesFolderRoot)
|
|
||||||
val outputZipFile = File(
|
|
||||||
tempFolder,
|
|
||||||
"yuzu saves - ${
|
|
||||||
LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))
|
|
||||||
}.zip"
|
|
||||||
)
|
|
||||||
outputZipFile.createNewFile()
|
|
||||||
val result = FileUtil.zipFromInternalStorage(
|
|
||||||
saveFolder,
|
|
||||||
savesFolderRoot,
|
|
||||||
BufferedOutputStream(FileOutputStream(outputZipFile))
|
|
||||||
)
|
|
||||||
if (result == TaskState.Failed) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
lastZipCreated = outputZipFile
|
|
||||||
} catch (e: Exception) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Exports the save file located in the given folder path by creating a zip file and sharing it via intent.
|
|
||||||
*/
|
|
||||||
fun exportSave() {
|
|
||||||
CoroutineScope(Dispatchers.IO).launch {
|
|
||||||
val wasZipCreated = zipSave()
|
|
||||||
val lastZipFile = lastZipCreated
|
|
||||||
if (!wasZipCreated || lastZipFile == null) {
|
|
||||||
withContext(Dispatchers.Main) {
|
|
||||||
Toast.makeText(
|
|
||||||
this@MainActivity,
|
|
||||||
getString(R.string.export_save_failed),
|
|
||||||
Toast.LENGTH_LONG
|
|
||||||
).show()
|
|
||||||
}
|
|
||||||
return@launch
|
|
||||||
}
|
|
||||||
|
|
||||||
withContext(Dispatchers.Main) {
|
|
||||||
val file = DocumentFile.fromSingleUri(
|
|
||||||
this@MainActivity,
|
|
||||||
DocumentsContract.buildDocumentUri(
|
|
||||||
DocumentProvider.AUTHORITY,
|
|
||||||
"${DocumentProvider.ROOT_ID}/temp/${lastZipFile.name}"
|
|
||||||
)
|
|
||||||
)!!
|
|
||||||
val intent = Intent(Intent.ACTION_SEND)
|
|
||||||
.setDataAndType(file.uri, "application/zip")
|
|
||||||
.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
|
|
||||||
.putExtra(Intent.EXTRA_STREAM, file.uri)
|
|
||||||
startForResultExportSave.launch(
|
|
||||||
Intent.createChooser(
|
|
||||||
intent,
|
|
||||||
getString(R.string.share_save_file)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private val startForResultExportSave =
|
|
||||||
registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { _ ->
|
|
||||||
File(getPublicFilesDir().canonicalPath, "temp").deleteRecursively()
|
|
||||||
}
|
|
||||||
|
|
||||||
val importSaves =
|
|
||||||
registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
|
|
||||||
if (result == null) {
|
|
||||||
return@registerForActivityResult
|
|
||||||
}
|
|
||||||
|
|
||||||
NativeLibrary.initializeEmptyUserDirectory()
|
|
||||||
|
|
||||||
val inputZip = contentResolver.openInputStream(result)
|
|
||||||
// A zip needs to have at least one subfolder named after a TitleId in order to be considered valid.
|
|
||||||
var validZip = false
|
|
||||||
val savesFolder = File(savesFolderRoot)
|
|
||||||
val cacheSaveDir = File("${applicationContext.cacheDir.path}/saves/")
|
|
||||||
cacheSaveDir.mkdir()
|
|
||||||
|
|
||||||
if (inputZip == null) {
|
|
||||||
Toast.makeText(
|
|
||||||
applicationContext,
|
|
||||||
getString(R.string.fatal_error),
|
|
||||||
Toast.LENGTH_LONG
|
|
||||||
).show()
|
|
||||||
return@registerForActivityResult
|
|
||||||
}
|
|
||||||
|
|
||||||
val filterTitleId =
|
|
||||||
FilenameFilter { _, dirName -> dirName.matches(Regex("^0100[\\dA-Fa-f]{12}$")) }
|
|
||||||
|
|
||||||
try {
|
|
||||||
CoroutineScope(Dispatchers.IO).launch {
|
|
||||||
FileUtil.unzipToInternalStorage(BufferedInputStream(inputZip), cacheSaveDir)
|
|
||||||
cacheSaveDir.list(filterTitleId)?.forEach { savePath ->
|
|
||||||
File(savesFolder, savePath).deleteRecursively()
|
|
||||||
File(cacheSaveDir, savePath).copyRecursively(
|
|
||||||
File(savesFolder, savePath),
|
|
||||||
true
|
|
||||||
)
|
|
||||||
validZip = true
|
|
||||||
}
|
|
||||||
|
|
||||||
withContext(Dispatchers.Main) {
|
|
||||||
if (!validZip) {
|
|
||||||
MessageDialogFragment.newInstance(
|
|
||||||
this@MainActivity,
|
|
||||||
titleId = R.string.save_file_invalid_zip_structure,
|
|
||||||
descriptionId = R.string.save_file_invalid_zip_structure_description
|
|
||||||
).show(supportFragmentManager, MessageDialogFragment.TAG)
|
|
||||||
return@withContext
|
|
||||||
}
|
|
||||||
Toast.makeText(
|
|
||||||
applicationContext,
|
|
||||||
getString(R.string.save_file_imported_success),
|
|
||||||
Toast.LENGTH_LONG
|
|
||||||
).show()
|
|
||||||
}
|
|
||||||
|
|
||||||
cacheSaveDir.deleteRecursively()
|
|
||||||
}
|
|
||||||
} catch (e: Exception) {
|
|
||||||
Toast.makeText(
|
|
||||||
applicationContext,
|
|
||||||
getString(R.string.fatal_error),
|
|
||||||
Toast.LENGTH_LONG
|
|
||||||
).show()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -8,7 +8,6 @@ import android.database.Cursor
|
|||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.provider.DocumentsContract
|
import android.provider.DocumentsContract
|
||||||
import androidx.documentfile.provider.DocumentFile
|
import androidx.documentfile.provider.DocumentFile
|
||||||
import kotlinx.coroutines.flow.StateFlow
|
|
||||||
import java.io.BufferedInputStream
|
import java.io.BufferedInputStream
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import java.io.FileOutputStream
|
import java.io.FileOutputStream
|
||||||
@ -19,9 +18,6 @@ import java.util.zip.ZipEntry
|
|||||||
import java.util.zip.ZipInputStream
|
import java.util.zip.ZipInputStream
|
||||||
import org.yuzu.yuzu_emu.YuzuApplication
|
import org.yuzu.yuzu_emu.YuzuApplication
|
||||||
import org.yuzu.yuzu_emu.model.MinimalDocumentFile
|
import org.yuzu.yuzu_emu.model.MinimalDocumentFile
|
||||||
import org.yuzu.yuzu_emu.model.TaskState
|
|
||||||
import java.io.BufferedOutputStream
|
|
||||||
import java.util.zip.ZipOutputStream
|
|
||||||
|
|
||||||
object FileUtil {
|
object FileUtil {
|
||||||
const val PATH_TREE = "tree"
|
const val PATH_TREE = "tree"
|
||||||
@ -286,65 +282,30 @@ object FileUtil {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Extracts the given zip file into the given directory.
|
* Extracts the given zip file into the given directory.
|
||||||
|
* @exception IOException if the file was being created outside of the target directory
|
||||||
*/
|
*/
|
||||||
@Throws(SecurityException::class)
|
@Throws(SecurityException::class)
|
||||||
fun unzipToInternalStorage(zipStream: BufferedInputStream, destDir: File) {
|
fun unzip(zipStream: InputStream, destDir: File): Boolean {
|
||||||
ZipInputStream(zipStream).use { zis ->
|
ZipInputStream(BufferedInputStream(zipStream)).use { zis ->
|
||||||
var entry: ZipEntry? = zis.nextEntry
|
var entry: ZipEntry? = zis.nextEntry
|
||||||
while (entry != null) {
|
while (entry != null) {
|
||||||
val newFile = File(destDir, entry.name)
|
val entryName = entry.name
|
||||||
val destinationDirectory = if (entry.isDirectory) newFile else newFile.parentFile
|
val entryFile = File(destDir, entryName)
|
||||||
|
if (!entryFile.canonicalPath.startsWith(destDir.canonicalPath + File.separator)) {
|
||||||
if (!newFile.canonicalPath.startsWith(destDir.canonicalPath + File.separator)) {
|
throw SecurityException("Entry is outside of the target dir: " + entryFile.name)
|
||||||
throw SecurityException("Zip file attempted path traversal! ${entry.name}")
|
|
||||||
}
|
}
|
||||||
|
if (entry.isDirectory) {
|
||||||
if (!destinationDirectory.isDirectory && !destinationDirectory.mkdirs()) {
|
entryFile.mkdirs()
|
||||||
throw IOException("Failed to create directory $destinationDirectory")
|
} else {
|
||||||
}
|
entryFile.parentFile?.mkdirs()
|
||||||
|
entryFile.createNewFile()
|
||||||
if (!entry.isDirectory) {
|
entryFile.outputStream().use { fos -> zis.copyTo(fos) }
|
||||||
newFile.outputStream().use { fos -> zis.copyTo(fos) }
|
|
||||||
}
|
}
|
||||||
entry = zis.nextEntry
|
entry = zis.nextEntry
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
return true
|
||||||
* Creates a zip file from a directory within internal storage
|
|
||||||
* @param inputFile File representation of the item that will be zipped
|
|
||||||
* @param rootDir Directory containing the inputFile
|
|
||||||
* @param outputStream Stream where the zip file will be output
|
|
||||||
*/
|
|
||||||
fun zipFromInternalStorage(
|
|
||||||
inputFile: File,
|
|
||||||
rootDir: String,
|
|
||||||
outputStream: BufferedOutputStream,
|
|
||||||
cancelled: StateFlow<Boolean>? = null
|
|
||||||
): TaskState {
|
|
||||||
try {
|
|
||||||
ZipOutputStream(outputStream).use { zos ->
|
|
||||||
inputFile.walkTopDown().forEach { file ->
|
|
||||||
if (cancelled?.value == true) {
|
|
||||||
return TaskState.Cancelled
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!file.isDirectory) {
|
|
||||||
val entryName =
|
|
||||||
file.absolutePath.removePrefix(rootDir).removePrefix("/")
|
|
||||||
val entry = ZipEntry(entryName)
|
|
||||||
zos.putNextEntry(entry)
|
|
||||||
if (file.isFile) {
|
|
||||||
file.inputStream().use { fis -> fis.copyTo(zos) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (e: Exception) {
|
|
||||||
return TaskState.Failed
|
|
||||||
}
|
|
||||||
return TaskState.Completed
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun isRootTreeUri(uri: Uri): Boolean {
|
fun isRootTreeUri(uri: Uri): Boolean {
|
||||||
|
@ -11,12 +11,6 @@
|
|||||||
#include "jni/emu_window/emu_window.h"
|
#include "jni/emu_window/emu_window.h"
|
||||||
|
|
||||||
void EmuWindow_Android::OnSurfaceChanged(ANativeWindow* surface) {
|
void EmuWindow_Android::OnSurfaceChanged(ANativeWindow* surface) {
|
||||||
m_window_width = ANativeWindow_getWidth(surface);
|
|
||||||
m_window_height = ANativeWindow_getHeight(surface);
|
|
||||||
|
|
||||||
// Ensures that we emulate with the correct aspect ratio.
|
|
||||||
UpdateCurrentFramebufferLayout(m_window_width, m_window_height);
|
|
||||||
|
|
||||||
window_info.render_surface = reinterpret_cast<void*>(surface);
|
window_info.render_surface = reinterpret_cast<void*>(surface);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -68,8 +62,14 @@ EmuWindow_Android::EmuWindow_Android(InputCommon::InputSubsystem* input_subsyste
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
OnSurfaceChanged(surface);
|
m_window_width = ANativeWindow_getWidth(surface);
|
||||||
|
m_window_height = ANativeWindow_getHeight(surface);
|
||||||
|
|
||||||
|
// Ensures that we emulate with the correct aspect ratio.
|
||||||
|
UpdateCurrentFramebufferLayout(m_window_width, m_window_height);
|
||||||
|
|
||||||
window_info.type = Core::Frontend::WindowSystemType::Android;
|
window_info.type = Core::Frontend::WindowSystemType::Android;
|
||||||
|
window_info.render_surface = reinterpret_cast<void*>(surface);
|
||||||
|
|
||||||
m_input_subsystem->Initialize();
|
m_input_subsystem->Initialize();
|
||||||
}
|
}
|
||||||
|
@ -13,8 +13,6 @@
|
|||||||
|
|
||||||
#include <android/api-level.h>
|
#include <android/api-level.h>
|
||||||
#include <android/native_window_jni.h>
|
#include <android/native_window_jni.h>
|
||||||
#include <common/fs/fs.h>
|
|
||||||
#include <core/file_sys/savedata_factory.h>
|
|
||||||
#include <core/loader/nro.h>
|
#include <core/loader/nro.h>
|
||||||
#include <jni.h>
|
#include <jni.h>
|
||||||
|
|
||||||
@ -104,7 +102,7 @@ public:
|
|||||||
m_native_window = native_window;
|
m_native_window = native_window;
|
||||||
}
|
}
|
||||||
|
|
||||||
int InstallFileToNand(std::string filename, std::string file_extension) {
|
int InstallFileToNand(std::string filename) {
|
||||||
jconst copy_func = [](const FileSys::VirtualFile& src, const FileSys::VirtualFile& dest,
|
jconst copy_func = [](const FileSys::VirtualFile& src, const FileSys::VirtualFile& dest,
|
||||||
std::size_t block_size) {
|
std::size_t block_size) {
|
||||||
if (src == nullptr || dest == nullptr) {
|
if (src == nullptr || dest == nullptr) {
|
||||||
@ -136,12 +134,12 @@ public:
|
|||||||
m_system.GetFileSystemController().CreateFactories(*m_vfs);
|
m_system.GetFileSystemController().CreateFactories(*m_vfs);
|
||||||
|
|
||||||
[[maybe_unused]] std::shared_ptr<FileSys::NSP> nsp;
|
[[maybe_unused]] std::shared_ptr<FileSys::NSP> nsp;
|
||||||
if (file_extension == "nsp") {
|
if (filename.ends_with("nsp")) {
|
||||||
nsp = std::make_shared<FileSys::NSP>(m_vfs->OpenFile(filename, FileSys::Mode::Read));
|
nsp = std::make_shared<FileSys::NSP>(m_vfs->OpenFile(filename, FileSys::Mode::Read));
|
||||||
if (nsp->IsExtractedType()) {
|
if (nsp->IsExtractedType()) {
|
||||||
return InstallError;
|
return InstallError;
|
||||||
}
|
}
|
||||||
} else if (file_extension == "xci") {
|
} else if (filename.ends_with("xci")) {
|
||||||
jconst xci =
|
jconst xci =
|
||||||
std::make_shared<FileSys::XCI>(m_vfs->OpenFile(filename, FileSys::Mode::Read));
|
std::make_shared<FileSys::XCI>(m_vfs->OpenFile(filename, FileSys::Mode::Read));
|
||||||
nsp = xci->GetSecurePartitionNSP();
|
nsp = xci->GetSecurePartitionNSP();
|
||||||
@ -609,10 +607,8 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_setAppDirectory(JNIEnv* env, jobject
|
|||||||
}
|
}
|
||||||
|
|
||||||
int Java_org_yuzu_yuzu_1emu_NativeLibrary_installFileToNand(JNIEnv* env, jobject instance,
|
int Java_org_yuzu_yuzu_1emu_NativeLibrary_installFileToNand(JNIEnv* env, jobject instance,
|
||||||
jstring j_file,
|
[[maybe_unused]] jstring j_file) {
|
||||||
jstring j_file_extension) {
|
return EmulationSession::GetInstance().InstallFileToNand(GetJString(env, j_file));
|
||||||
return EmulationSession::GetInstance().InstallFileToNand(GetJString(env, j_file),
|
|
||||||
GetJString(env, j_file_extension));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_initializeGpuDriver(JNIEnv* env, jclass clazz,
|
void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_initializeGpuDriver(JNIEnv* env, jclass clazz,
|
||||||
@ -883,24 +879,4 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_submitInlineKeyboardInput(JNIEnv* env
|
|||||||
EmulationSession::GetInstance().SoftwareKeyboard()->SubmitInlineKeyboardInput(j_key_code);
|
EmulationSession::GetInstance().SoftwareKeyboard()->SubmitInlineKeyboardInput(j_key_code);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Java_org_yuzu_yuzu_1emu_NativeLibrary_initializeEmptyUserDirectory(JNIEnv* env,
|
|
||||||
jobject instance) {
|
|
||||||
const auto nand_dir = Common::FS::GetYuzuPath(Common::FS::YuzuPath::NANDDir);
|
|
||||||
auto vfs_nand_dir = EmulationSession::GetInstance().System().GetFilesystem()->OpenDirectory(
|
|
||||||
Common::FS::PathToUTF8String(nand_dir), FileSys::Mode::Read);
|
|
||||||
|
|
||||||
Service::Account::ProfileManager manager;
|
|
||||||
const auto user_id = manager.GetUser(static_cast<std::size_t>(0));
|
|
||||||
ASSERT(user_id);
|
|
||||||
|
|
||||||
const auto user_save_data_path = FileSys::SaveDataFactory::GetFullPath(
|
|
||||||
EmulationSession::GetInstance().System(), vfs_nand_dir, FileSys::SaveDataSpaceId::NandUser,
|
|
||||||
FileSys::SaveDataType::SaveData, 1, user_id->AsU128(), 0);
|
|
||||||
|
|
||||||
const auto full_path = Common::FS::ConcatPathSafe(nand_dir, user_save_data_path);
|
|
||||||
if (!Common::FS::CreateParentDirs(full_path)) {
|
|
||||||
LOG_WARNING(Frontend, "Failed to create full path of the default user's save directory");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} // extern "C"
|
} // extern "C"
|
||||||
|
@ -1,9 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24">
|
|
||||||
<path
|
|
||||||
android:fillColor="?attr/colorControlNormal"
|
|
||||||
android:pathData="M9,16h6v-6h4l-7,-7 -7,7h4zM5,18h14v2L5,20z" />
|
|
||||||
</vector>
|
|
@ -1,9 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24">
|
|
||||||
<path
|
|
||||||
android:fillColor="?attr/colorControlNormal"
|
|
||||||
android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z" />
|
|
||||||
</vector>
|
|
@ -22,7 +22,7 @@
|
|||||||
|
|
||||||
<View
|
<View
|
||||||
android:id="@+id/navigation_bar_shade"
|
android:id="@+id/navigation_bar_shade"
|
||||||
android:layout_width="0dp"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="1px"
|
android:layout_height="1px"
|
||||||
android:background="@android:color/transparent"
|
android:background="@android:color/transparent"
|
||||||
android:clickable="false"
|
android:clickable="false"
|
||||||
|
@ -1,71 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
style="?attr/materialCardViewOutlinedStyle"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginHorizontal="16dp"
|
|
||||||
android:layout_marginVertical="12dp">
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_margin="16dp"
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:layout_gravity="center">
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginEnd="16dp"
|
|
||||||
android:layout_weight="1"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<com.google.android.material.textview.MaterialTextView
|
|
||||||
android:id="@+id/title"
|
|
||||||
style="@style/TextAppearance.Material3.TitleMedium"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/user_data"
|
|
||||||
android:textAlignment="viewStart" />
|
|
||||||
|
|
||||||
<com.google.android.material.textview.MaterialTextView
|
|
||||||
android:id="@+id/description"
|
|
||||||
style="@style/TextAppearance.Material3.BodyMedium"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="6dp"
|
|
||||||
android:text="@string/user_data_description"
|
|
||||||
android:textAlignment="viewStart" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/button_export"
|
|
||||||
style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:contentDescription="@string/export"
|
|
||||||
android:tooltipText="@string/export"
|
|
||||||
android:visibility="gone"
|
|
||||||
app:icon="@drawable/ic_export"
|
|
||||||
tools:visibility="visible" />
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/button_install"
|
|
||||||
style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:layout_marginStart="12dp"
|
|
||||||
android:contentDescription="@string/string_import"
|
|
||||||
android:tooltipText="@string/string_import"
|
|
||||||
android:visibility="gone"
|
|
||||||
app:icon="@drawable/ic_import"
|
|
||||||
tools:visibility="visible" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
</com.google.android.material.card.MaterialCardView>
|
|
@ -1,8 +1,24 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<com.google.android.material.progressindicator.LinearProgressIndicator xmlns:android="http://schemas.android.com/apk/res/android"
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
android:id="@+id/progress_bar"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="match_parent"
|
||||||
android:padding="24dp"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
app:trackCornerRadius="4dp" />
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<com.google.android.material.progressindicator.LinearProgressIndicator
|
||||||
|
android:id="@+id/progress_bar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_margin="24dp"
|
||||||
|
app:trackCornerRadius="4dp" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/progress_text"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginLeft="24dp"
|
||||||
|
android:layout_marginRight="24dp"
|
||||||
|
android:layout_marginBottom="24dp"
|
||||||
|
android:gravity="end" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
@ -32,8 +32,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:focusable="false"
|
android:focusable="false">
|
||||||
android:clickable="false">
|
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
android:id="@+id/loading_layout"
|
android:id="@+id/loading_layout"
|
||||||
@ -156,7 +155,7 @@
|
|||||||
android:id="@+id/in_game_menu"
|
android:id="@+id/in_game_menu"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_gravity="start"
|
android:layout_gravity="start|bottom"
|
||||||
app:headerLayout="@layout/header_in_game"
|
app:headerLayout="@layout/header_in_game"
|
||||||
app:menu="@menu/menu_in_game"
|
app:menu="@menu/menu_in_game"
|
||||||
tools:visibility="gone" />
|
tools:visibility="gone" />
|
||||||
|
@ -1,31 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
android:id="@+id/coordinator_licenses"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:background="?attr/colorSurface">
|
|
||||||
|
|
||||||
<com.google.android.material.appbar.AppBarLayout
|
|
||||||
android:id="@+id/appbar_installables"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:fitsSystemWindows="true">
|
|
||||||
|
|
||||||
<com.google.android.material.appbar.MaterialToolbar
|
|
||||||
android:id="@+id/toolbar_installables"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="?attr/actionBarSize"
|
|
||||||
app:title="@string/manage_yuzu_data"
|
|
||||||
app:navigationIcon="@drawable/ic_back" />
|
|
||||||
|
|
||||||
</com.google.android.material.appbar.AppBarLayout>
|
|
||||||
|
|
||||||
<androidx.recyclerview.widget.RecyclerView
|
|
||||||
android:id="@+id/list_installables"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:clipToPadding="false"
|
|
||||||
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
|
|
||||||
|
|
||||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
@ -19,9 +19,6 @@
|
|||||||
<action
|
<action
|
||||||
android:id="@+id/action_homeSettingsFragment_to_earlyAccessFragment"
|
android:id="@+id/action_homeSettingsFragment_to_earlyAccessFragment"
|
||||||
app:destination="@id/earlyAccessFragment" />
|
app:destination="@id/earlyAccessFragment" />
|
||||||
<action
|
|
||||||
android:id="@+id/action_homeSettingsFragment_to_installableFragment"
|
|
||||||
app:destination="@id/installableFragment" />
|
|
||||||
</fragment>
|
</fragment>
|
||||||
|
|
||||||
<fragment
|
<fragment
|
||||||
@ -91,9 +88,5 @@
|
|||||||
<action
|
<action
|
||||||
android:id="@+id/action_global_settingsActivity"
|
android:id="@+id/action_global_settingsActivity"
|
||||||
app:destination="@id/settingsActivity" />
|
app:destination="@id/settingsActivity" />
|
||||||
<fragment
|
|
||||||
android:id="@+id/installableFragment"
|
|
||||||
android:name="org.yuzu.yuzu_emu.fragments.InstallableFragment"
|
|
||||||
android:label="InstallableFragment" />
|
|
||||||
|
|
||||||
</navigation>
|
</navigation>
|
||||||
|
@ -79,6 +79,7 @@
|
|||||||
<string name="manage_save_data">Speicherdaten verwalten</string>
|
<string name="manage_save_data">Speicherdaten verwalten</string>
|
||||||
<string name="manage_save_data_description">Speicherdaten gefunden. Bitte wähle unten eine Option aus.</string>
|
<string name="manage_save_data_description">Speicherdaten gefunden. Bitte wähle unten eine Option aus.</string>
|
||||||
<string name="import_export_saves_description">Speicherdaten importieren oder exportieren</string>
|
<string name="import_export_saves_description">Speicherdaten importieren oder exportieren</string>
|
||||||
|
<string name="import_export_saves_no_profile">Keine Speicherdaten gefunden. Bitte starte ein Spiel und versuche es erneut.</string>
|
||||||
<string name="save_file_imported_success">Erfolgreich importiert</string>
|
<string name="save_file_imported_success">Erfolgreich importiert</string>
|
||||||
<string name="save_file_invalid_zip_structure">Ungültige Speicherverzeichnisstruktur</string>
|
<string name="save_file_invalid_zip_structure">Ungültige Speicherverzeichnisstruktur</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">Der erste Unterordnername muss die Titel-ID des Spiels sein.</string>
|
<string name="save_file_invalid_zip_structure_description">Der erste Unterordnername muss die Titel-ID des Spiels sein.</string>
|
||||||
|
@ -81,6 +81,7 @@
|
|||||||
<string name="manage_save_data">Administrar datos de guardado</string>
|
<string name="manage_save_data">Administrar datos de guardado</string>
|
||||||
<string name="manage_save_data_description">Guardar los datos encontrados. Por favor, seleccione una opción de abajo.</string>
|
<string name="manage_save_data_description">Guardar los datos encontrados. Por favor, seleccione una opción de abajo.</string>
|
||||||
<string name="import_export_saves_description">Importar o exportar archivos de guardado</string>
|
<string name="import_export_saves_description">Importar o exportar archivos de guardado</string>
|
||||||
|
<string name="import_export_saves_no_profile">No se han encontrado datos de guardado. Por favor, ejecute un juego y vuelva a intentarlo.</string>
|
||||||
<string name="save_file_imported_success">Importado correctamente</string>
|
<string name="save_file_imported_success">Importado correctamente</string>
|
||||||
<string name="save_file_invalid_zip_structure">Estructura del directorio de guardado no válido</string>
|
<string name="save_file_invalid_zip_structure">Estructura del directorio de guardado no válido</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">El nombre de la primera subcarpeta debe ser el Title ID del juego.</string>
|
<string name="save_file_invalid_zip_structure_description">El nombre de la primera subcarpeta debe ser el Title ID del juego.</string>
|
||||||
|
@ -81,6 +81,7 @@
|
|||||||
<string name="manage_save_data">Gérer les données de sauvegarde</string>
|
<string name="manage_save_data">Gérer les données de sauvegarde</string>
|
||||||
<string name="manage_save_data_description">Données de sauvegarde trouvées. Veuillez sélectionner une option ci-dessous.</string>
|
<string name="manage_save_data_description">Données de sauvegarde trouvées. Veuillez sélectionner une option ci-dessous.</string>
|
||||||
<string name="import_export_saves_description">Importer ou exporter des fichiers de sauvegarde</string>
|
<string name="import_export_saves_description">Importer ou exporter des fichiers de sauvegarde</string>
|
||||||
|
<string name="import_export_saves_no_profile">Aucune données de sauvegarde trouvées. Veuillez lancer un jeu et réessayer.</string>
|
||||||
<string name="save_file_imported_success">Importé avec succès</string>
|
<string name="save_file_imported_success">Importé avec succès</string>
|
||||||
<string name="save_file_invalid_zip_structure">Structure de répertoire de sauvegarde non valide</string>
|
<string name="save_file_invalid_zip_structure">Structure de répertoire de sauvegarde non valide</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">Le nom du premier sous-dossier doit être l\'identifiant du titre du jeu.</string>
|
<string name="save_file_invalid_zip_structure_description">Le nom du premier sous-dossier doit être l\'identifiant du titre du jeu.</string>
|
||||||
|
@ -81,6 +81,7 @@
|
|||||||
<string name="manage_save_data">Gestisci i salvataggi</string>
|
<string name="manage_save_data">Gestisci i salvataggi</string>
|
||||||
<string name="manage_save_data_description">Salvataggio non trovato. Seleziona un\'opzione di seguito.</string>
|
<string name="manage_save_data_description">Salvataggio non trovato. Seleziona un\'opzione di seguito.</string>
|
||||||
<string name="import_export_saves_description">Importa o esporta i salvataggi</string>
|
<string name="import_export_saves_description">Importa o esporta i salvataggi</string>
|
||||||
|
<string name="import_export_saves_no_profile">Nessun salvataggio trovato. Avvia un gioco e riprova.</string>
|
||||||
<string name="save_file_imported_success">Importato con successo</string>
|
<string name="save_file_imported_success">Importato con successo</string>
|
||||||
<string name="save_file_invalid_zip_structure">La struttura della cartella dei salvataggi è invalida</string>
|
<string name="save_file_invalid_zip_structure">La struttura della cartella dei salvataggi è invalida</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">La prima sotto cartella <b>deve</b> chiamarsi come l\'ID del titolo del gioco.</string>
|
<string name="save_file_invalid_zip_structure_description">La prima sotto cartella <b>deve</b> chiamarsi come l\'ID del titolo del gioco.</string>
|
||||||
|
@ -80,6 +80,7 @@
|
|||||||
<string name="manage_save_data">セーブデータを管理</string>
|
<string name="manage_save_data">セーブデータを管理</string>
|
||||||
<string name="manage_save_data_description">セーブデータが見つかりました。以下のオプションから選択してください。</string>
|
<string name="manage_save_data_description">セーブデータが見つかりました。以下のオプションから選択してください。</string>
|
||||||
<string name="import_export_saves_description">セーブファイルをインポート/エクスポート</string>
|
<string name="import_export_saves_description">セーブファイルをインポート/エクスポート</string>
|
||||||
|
<string name="import_export_saves_no_profile">セーブデータがありません。ゲームを起動してから再度お試しください。</string>
|
||||||
<string name="save_file_imported_success">インポートが完了しました</string>
|
<string name="save_file_imported_success">インポートが完了しました</string>
|
||||||
<string name="save_file_invalid_zip_structure">セーブデータのディレクトリ構造が無効です</string>
|
<string name="save_file_invalid_zip_structure">セーブデータのディレクトリ構造が無効です</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">最初のサブフォルダ名は、ゲームのタイトルIDである必要があります。</string>
|
<string name="save_file_invalid_zip_structure_description">最初のサブフォルダ名は、ゲームのタイトルIDである必要があります。</string>
|
||||||
|
@ -81,6 +81,7 @@
|
|||||||
<string name="manage_save_data">저장 데이터 관리</string>
|
<string name="manage_save_data">저장 데이터 관리</string>
|
||||||
<string name="manage_save_data_description">데이터를 저장했습니다. 아래에서 옵션을 선택하세요.</string>
|
<string name="manage_save_data_description">데이터를 저장했습니다. 아래에서 옵션을 선택하세요.</string>
|
||||||
<string name="import_export_saves_description">저장 파일 가져오기 또는 내보내기</string>
|
<string name="import_export_saves_description">저장 파일 가져오기 또는 내보내기</string>
|
||||||
|
<string name="import_export_saves_no_profile">저장 데이터를 찾을 수 없습니다. 게임을 실행한 후 다시 시도하세요.</string>
|
||||||
<string name="save_file_imported_success">가져오기 성공</string>
|
<string name="save_file_imported_success">가져오기 성공</string>
|
||||||
<string name="save_file_invalid_zip_structure">저장 디렉터리 구조가 잘못됨</string>
|
<string name="save_file_invalid_zip_structure">저장 디렉터리 구조가 잘못됨</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">첫 번째 하위 폴더 이름은 게임의 타이틀 ID여야 합니다.</string>
|
<string name="save_file_invalid_zip_structure_description">첫 번째 하위 폴더 이름은 게임의 타이틀 ID여야 합니다.</string>
|
||||||
|
@ -81,6 +81,7 @@
|
|||||||
<string name="manage_save_data">Administrere lagringsdata</string>
|
<string name="manage_save_data">Administrere lagringsdata</string>
|
||||||
<string name="manage_save_data_description">Lagringsdata funnet. Velg et alternativ nedenfor.</string>
|
<string name="manage_save_data_description">Lagringsdata funnet. Velg et alternativ nedenfor.</string>
|
||||||
<string name="import_export_saves_description">Importer eller eksporter lagringsfiler</string>
|
<string name="import_export_saves_description">Importer eller eksporter lagringsfiler</string>
|
||||||
|
<string name="import_export_saves_no_profile">Ingen lagringsdata funnet. Start et nytt spill og prøv på nytt.</string>
|
||||||
<string name="save_file_imported_success">Vellykket import</string>
|
<string name="save_file_imported_success">Vellykket import</string>
|
||||||
<string name="save_file_invalid_zip_structure">Ugyldig struktur for lagringskatalog</string>
|
<string name="save_file_invalid_zip_structure">Ugyldig struktur for lagringskatalog</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">Det første undermappenavnet må være spillets tittel-ID.</string>
|
<string name="save_file_invalid_zip_structure_description">Det første undermappenavnet må være spillets tittel-ID.</string>
|
||||||
|
@ -81,6 +81,7 @@
|
|||||||
<string name="manage_save_data">Zarządzaj plikami zapisów gier</string>
|
<string name="manage_save_data">Zarządzaj plikami zapisów gier</string>
|
||||||
<string name="manage_save_data_description">Znaleziono pliki zapisów gier. Wybierz opcję poniżej.</string>
|
<string name="manage_save_data_description">Znaleziono pliki zapisów gier. Wybierz opcję poniżej.</string>
|
||||||
<string name="import_export_saves_description">Importuj lub wyeksportuj pliki zapisów</string>
|
<string name="import_export_saves_description">Importuj lub wyeksportuj pliki zapisów</string>
|
||||||
|
<string name="import_export_saves_no_profile">Nie znaleziono plików zapisów. Uruchom grę i spróbuj ponownie.</string>
|
||||||
<string name="save_file_imported_success">Zaimportowano pomyślnie</string>
|
<string name="save_file_imported_success">Zaimportowano pomyślnie</string>
|
||||||
<string name="save_file_invalid_zip_structure">Niepoprawna struktura folderów</string>
|
<string name="save_file_invalid_zip_structure">Niepoprawna struktura folderów</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">Pierwszy podkatalog musi zawierać w nazwie numer ID tytułu gry.</string>
|
<string name="save_file_invalid_zip_structure_description">Pierwszy podkatalog musi zawierać w nazwie numer ID tytułu gry.</string>
|
||||||
|
@ -81,6 +81,7 @@
|
|||||||
<string name="manage_save_data">Gerir dados guardados</string>
|
<string name="manage_save_data">Gerir dados guardados</string>
|
||||||
<string name="manage_save_data_description">Dados não encontrados. Por favor seleciona uma opção abaixo.</string>
|
<string name="manage_save_data_description">Dados não encontrados. Por favor seleciona uma opção abaixo.</string>
|
||||||
<string name="import_export_saves_description">Importa ou exporta dados guardados</string>
|
<string name="import_export_saves_description">Importa ou exporta dados guardados</string>
|
||||||
|
<string name="import_export_saves_no_profile">Dados não encontrados. Por favor lança o jogo e tenta novamente.</string>
|
||||||
<string name="save_file_imported_success">Importado com sucesso</string>
|
<string name="save_file_imported_success">Importado com sucesso</string>
|
||||||
<string name="save_file_invalid_zip_structure">Estrutura de diretório de dados invalida</string>
|
<string name="save_file_invalid_zip_structure">Estrutura de diretório de dados invalida</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">O nome da primeira sub pasta tem de ser a ID do jogo.</string>
|
<string name="save_file_invalid_zip_structure_description">O nome da primeira sub pasta tem de ser a ID do jogo.</string>
|
||||||
|
@ -81,6 +81,7 @@
|
|||||||
<string name="manage_save_data">Gerir dados guardados</string>
|
<string name="manage_save_data">Gerir dados guardados</string>
|
||||||
<string name="manage_save_data_description">Dados não encontrados. Por favor seleciona uma opção abaixo.</string>
|
<string name="manage_save_data_description">Dados não encontrados. Por favor seleciona uma opção abaixo.</string>
|
||||||
<string name="import_export_saves_description">Importa ou exporta dados guardados</string>
|
<string name="import_export_saves_description">Importa ou exporta dados guardados</string>
|
||||||
|
<string name="import_export_saves_no_profile">Dados não encontrados. Por favor lança o jogo e tenta novamente.</string>
|
||||||
<string name="save_file_imported_success">Importado com sucesso</string>
|
<string name="save_file_imported_success">Importado com sucesso</string>
|
||||||
<string name="save_file_invalid_zip_structure">Estrutura de diretório de dados invalida</string>
|
<string name="save_file_invalid_zip_structure">Estrutura de diretório de dados invalida</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">O nome da primeira sub pasta tem de ser a ID do jogo.</string>
|
<string name="save_file_invalid_zip_structure_description">O nome da primeira sub pasta tem de ser a ID do jogo.</string>
|
||||||
|
@ -81,6 +81,7 @@
|
|||||||
<string name="manage_save_data">Управление данными сохранений</string>
|
<string name="manage_save_data">Управление данными сохранений</string>
|
||||||
<string name="manage_save_data_description">Найдено данные сохранений. Пожалуйста, выберите вариант ниже.</string>
|
<string name="manage_save_data_description">Найдено данные сохранений. Пожалуйста, выберите вариант ниже.</string>
|
||||||
<string name="import_export_saves_description">Импорт или экспорт файлов сохранения</string>
|
<string name="import_export_saves_description">Импорт или экспорт файлов сохранения</string>
|
||||||
|
<string name="import_export_saves_no_profile">Данные сохранений не найдены. Пожалуйста, запустите игру и повторите попытку.</string>
|
||||||
<string name="save_file_imported_success">Успешно импортировано</string>
|
<string name="save_file_imported_success">Успешно импортировано</string>
|
||||||
<string name="save_file_invalid_zip_structure">Недопустимая структура папки сохранения</string>
|
<string name="save_file_invalid_zip_structure">Недопустимая структура папки сохранения</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">Название первой вложенной папки должно быть идентификатором игры.</string>
|
<string name="save_file_invalid_zip_structure_description">Название первой вложенной папки должно быть идентификатором игры.</string>
|
||||||
|
@ -81,6 +81,7 @@
|
|||||||
<string name="manage_save_data">Керування даними збережень</string>
|
<string name="manage_save_data">Керування даними збережень</string>
|
||||||
<string name="manage_save_data_description">Знайдено дані збережень. Будь ласка, виберіть варіант нижче.</string>
|
<string name="manage_save_data_description">Знайдено дані збережень. Будь ласка, виберіть варіант нижче.</string>
|
||||||
<string name="import_export_saves_description">Імпорт або експорт файлів збереження</string>
|
<string name="import_export_saves_description">Імпорт або експорт файлів збереження</string>
|
||||||
|
<string name="import_export_saves_no_profile">Дані збережень не знайдено. Будь ласка, запустіть гру та повторіть спробу.</string>
|
||||||
<string name="save_file_imported_success">Успішно імпортовано</string>
|
<string name="save_file_imported_success">Успішно імпортовано</string>
|
||||||
<string name="save_file_invalid_zip_structure">Неприпустима структура папки збереження</string>
|
<string name="save_file_invalid_zip_structure">Неприпустима структура папки збереження</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">Назва першої вкладеної папки має бути ідентифікатором гри.</string>
|
<string name="save_file_invalid_zip_structure_description">Назва першої вкладеної папки має бути ідентифікатором гри.</string>
|
||||||
|
@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
|
|
||||||
<integer name="grid_columns">2</integer>
|
|
||||||
|
|
||||||
</resources>
|
|
@ -81,6 +81,7 @@
|
|||||||
<string name="manage_save_data">管理存档数据</string>
|
<string name="manage_save_data">管理存档数据</string>
|
||||||
<string name="manage_save_data_description">已找到存档数据,请选择下方的选项。</string>
|
<string name="manage_save_data_description">已找到存档数据,请选择下方的选项。</string>
|
||||||
<string name="import_export_saves_description">导入或导出存档</string>
|
<string name="import_export_saves_description">导入或导出存档</string>
|
||||||
|
<string name="import_export_saves_no_profile">找不到存档数据,请启动游戏并重试。</string>
|
||||||
<string name="save_file_imported_success">已成功导入存档</string>
|
<string name="save_file_imported_success">已成功导入存档</string>
|
||||||
<string name="save_file_invalid_zip_structure">无效的存档目录</string>
|
<string name="save_file_invalid_zip_structure">无效的存档目录</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">第一个子文件夹名称必须为当前游戏的 ID。</string>
|
<string name="save_file_invalid_zip_structure_description">第一个子文件夹名称必须为当前游戏的 ID。</string>
|
||||||
|
@ -81,6 +81,7 @@
|
|||||||
<string name="manage_save_data">管理儲存資料</string>
|
<string name="manage_save_data">管理儲存資料</string>
|
||||||
<string name="manage_save_data_description">已找到儲存資料,請選取下方的選項。</string>
|
<string name="manage_save_data_description">已找到儲存資料,請選取下方的選項。</string>
|
||||||
<string name="import_export_saves_description">匯入或匯出儲存檔案</string>
|
<string name="import_export_saves_description">匯入或匯出儲存檔案</string>
|
||||||
|
<string name="import_export_saves_no_profile">找不到儲存資料,請啟動遊戲並重試。</string>
|
||||||
<string name="save_file_imported_success">已成功匯入</string>
|
<string name="save_file_imported_success">已成功匯入</string>
|
||||||
<string name="save_file_invalid_zip_structure">無效的儲存目錄結構</string>
|
<string name="save_file_invalid_zip_structure">無效的儲存目錄結構</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">首個子資料夾名稱必須為遊戲標題 ID。</string>
|
<string name="save_file_invalid_zip_structure_description">首個子資料夾名稱必須為遊戲標題 ID。</string>
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
<integer name="grid_columns">1</integer>
|
<integer name="game_title_lines">2</integer>
|
||||||
|
|
||||||
<!-- Default SWITCH landscape layout -->
|
<!-- Default SWITCH landscape layout -->
|
||||||
<integer name="SWITCH_BUTTON_A_X">760</integer>
|
<integer name="SWITCH_BUTTON_A_X">760</integer>
|
||||||
|
@ -90,6 +90,7 @@
|
|||||||
<string name="manage_save_data">Manage save data</string>
|
<string name="manage_save_data">Manage save data</string>
|
||||||
<string name="manage_save_data_description">Save data found. Please select an option below.</string>
|
<string name="manage_save_data_description">Save data found. Please select an option below.</string>
|
||||||
<string name="import_export_saves_description">Import or export save files</string>
|
<string name="import_export_saves_description">Import or export save files</string>
|
||||||
|
<string name="import_export_saves_no_profile">No save data found. Please launch a game and retry.</string>
|
||||||
<string name="save_file_imported_success">Imported successfully</string>
|
<string name="save_file_imported_success">Imported successfully</string>
|
||||||
<string name="save_file_invalid_zip_structure">Invalid save directory structure</string>
|
<string name="save_file_invalid_zip_structure">Invalid save directory structure</string>
|
||||||
<string name="save_file_invalid_zip_structure_description">The first subfolder name must be the title ID of the game.</string>
|
<string name="save_file_invalid_zip_structure_description">The first subfolder name must be the title ID of the game.</string>
|
||||||
@ -100,13 +101,12 @@
|
|||||||
<string name="firmware_installing">Installing firmware</string>
|
<string name="firmware_installing">Installing firmware</string>
|
||||||
<string name="firmware_installed_success">Firmware installed successfully</string>
|
<string name="firmware_installed_success">Firmware installed successfully</string>
|
||||||
<string name="firmware_installed_failure">Firmware installation failed</string>
|
<string name="firmware_installed_failure">Firmware installation failed</string>
|
||||||
<string name="firmware_installed_failure_description">Make sure the firmware nca files are at the root of the zip and try again.</string>
|
<string name="firmware_installed_failure_description">Verify that the ZIP contains valid firmware and try again.</string>
|
||||||
<string name="share_log">Share debug logs</string>
|
<string name="share_log">Share debug logs</string>
|
||||||
<string name="share_log_description">Share yuzu\'s log file to debug issues</string>
|
<string name="share_log_description">Share yuzu\'s log file to debug issues</string>
|
||||||
<string name="share_log_missing">No log file found</string>
|
<string name="share_log_missing">No log file found</string>
|
||||||
<string name="install_game_content">Install game content</string>
|
<string name="install_game_content">Install game content</string>
|
||||||
<string name="install_game_content_description">Install game updates or DLC</string>
|
<string name="install_game_content_description">Install game updates or DLC</string>
|
||||||
<string name="installing_game_content">Installing content…</string>
|
|
||||||
<string name="install_game_content_failure">Error installing file(s) to NAND</string>
|
<string name="install_game_content_failure">Error installing file(s) to NAND</string>
|
||||||
<string name="install_game_content_failure_description">Please ensure content(s) are valid and that the prod.keys file is installed.</string>
|
<string name="install_game_content_failure_description">Please ensure content(s) are valid and that the prod.keys file is installed.</string>
|
||||||
<string name="install_game_content_failure_base">Installation of base games isn\'t permitted in order to avoid possible conflicts.</string>
|
<string name="install_game_content_failure_base">Installation of base games isn\'t permitted in order to avoid possible conflicts.</string>
|
||||||
@ -118,10 +118,6 @@
|
|||||||
<string name="install_game_content_help_link">https://yuzu-emu.org/help/quickstart/#dumping-installed-updates</string>
|
<string name="install_game_content_help_link">https://yuzu-emu.org/help/quickstart/#dumping-installed-updates</string>
|
||||||
<string name="custom_driver_not_supported">Custom drivers not supported</string>
|
<string name="custom_driver_not_supported">Custom drivers not supported</string>
|
||||||
<string name="custom_driver_not_supported_description">Custom driver loading isn\'t currently supported for this device.\nCheck this option again in the future to see if support was added!</string>
|
<string name="custom_driver_not_supported_description">Custom driver loading isn\'t currently supported for this device.\nCheck this option again in the future to see if support was added!</string>
|
||||||
<string name="manage_yuzu_data">Manage yuzu data</string>
|
|
||||||
<string name="manage_yuzu_data_description">Import/export firmware, keys, user data, and more!</string>
|
|
||||||
<string name="share_save_file">Share save file</string>
|
|
||||||
<string name="export_save_failed">Failed to export save</string>
|
|
||||||
|
|
||||||
<!-- About screen strings -->
|
<!-- About screen strings -->
|
||||||
<string name="gaia_is_not_real">Gaia isn\'t real</string>
|
<string name="gaia_is_not_real">Gaia isn\'t real</string>
|
||||||
@ -132,16 +128,6 @@
|
|||||||
<string name="contributors_link">https://github.com/yuzu-emu/yuzu/graphs/contributors</string>
|
<string name="contributors_link">https://github.com/yuzu-emu/yuzu/graphs/contributors</string>
|
||||||
<string name="licenses_description">Projects that make yuzu for Android possible</string>
|
<string name="licenses_description">Projects that make yuzu for Android possible</string>
|
||||||
<string name="build">Build</string>
|
<string name="build">Build</string>
|
||||||
<string name="user_data">User data</string>
|
|
||||||
<string name="user_data_description">Import/export all app data.\n\nWhen importing user data, all existing user data will be deleted!</string>
|
|
||||||
<string name="exporting_user_data">Exporting user data…</string>
|
|
||||||
<string name="importing_user_data">Importing user data…</string>
|
|
||||||
<string name="import_user_data">Import user data</string>
|
|
||||||
<string name="invalid_yuzu_backup">Invalid yuzu backup</string>
|
|
||||||
<string name="user_data_export_success">User data exported successfully</string>
|
|
||||||
<string name="user_data_import_success">User data imported successfully</string>
|
|
||||||
<string name="user_data_export_cancelled">Export cancelled</string>
|
|
||||||
<string name="user_data_import_failed_description">Make sure the user data folders are at the root of the zip folder and contain a config file at config/config.ini and try again.</string>
|
|
||||||
<string name="support_link">https://discord.gg/u77vRWY</string>
|
<string name="support_link">https://discord.gg/u77vRWY</string>
|
||||||
<string name="website_link">https://yuzu-emu.org/</string>
|
<string name="website_link">https://yuzu-emu.org/</string>
|
||||||
<string name="github_link">https://github.com/yuzu-emu</string>
|
<string name="github_link">https://github.com/yuzu-emu</string>
|
||||||
@ -229,11 +215,6 @@
|
|||||||
<string name="auto">Auto</string>
|
<string name="auto">Auto</string>
|
||||||
<string name="submit">Submit</string>
|
<string name="submit">Submit</string>
|
||||||
<string name="string_null">Null</string>
|
<string name="string_null">Null</string>
|
||||||
<string name="string_import">Import</string>
|
|
||||||
<string name="export">Export</string>
|
|
||||||
<string name="export_failed">Export failed</string>
|
|
||||||
<string name="import_failed">Import failed</string>
|
|
||||||
<string name="cancelling">Cancelling</string>
|
|
||||||
|
|
||||||
<!-- GPU driver installation -->
|
<!-- GPU driver installation -->
|
||||||
<string name="select_gpu_driver">Select GPU driver</string>
|
<string name="select_gpu_driver">Select GPU driver</string>
|
||||||
@ -300,7 +281,6 @@
|
|||||||
<string name="performance_warning">Turning off this setting will significantly reduce emulation performance! For the best experience, it is recommended that you leave this setting enabled.</string>
|
<string name="performance_warning">Turning off this setting will significantly reduce emulation performance! For the best experience, it is recommended that you leave this setting enabled.</string>
|
||||||
<string name="device_memory_inadequate">Device RAM: %1$s\nRecommended: %2$s</string>
|
<string name="device_memory_inadequate">Device RAM: %1$s\nRecommended: %2$s</string>
|
||||||
<string name="memory_formatted">%1$s %2$s</string>
|
<string name="memory_formatted">%1$s %2$s</string>
|
||||||
<string name="no_game_present">No bootable game present!</string>
|
|
||||||
|
|
||||||
<!-- Region Names -->
|
<!-- Region Names -->
|
||||||
<string name="region_japan">Japan</string>
|
<string name="region_japan">Japan</string>
|
||||||
|
@ -10,13 +10,6 @@ add_library(audio_core STATIC
|
|||||||
adsp/apps/audio_renderer/command_buffer.h
|
adsp/apps/audio_renderer/command_buffer.h
|
||||||
adsp/apps/audio_renderer/command_list_processor.cpp
|
adsp/apps/audio_renderer/command_list_processor.cpp
|
||||||
adsp/apps/audio_renderer/command_list_processor.h
|
adsp/apps/audio_renderer/command_list_processor.h
|
||||||
adsp/apps/opus/opus_decoder.cpp
|
|
||||||
adsp/apps/opus/opus_decoder.h
|
|
||||||
adsp/apps/opus/opus_decode_object.cpp
|
|
||||||
adsp/apps/opus/opus_decode_object.h
|
|
||||||
adsp/apps/opus/opus_multistream_decode_object.cpp
|
|
||||||
adsp/apps/opus/opus_multistream_decode_object.h
|
|
||||||
adsp/apps/opus/shared_memory.h
|
|
||||||
audio_core.cpp
|
audio_core.cpp
|
||||||
audio_core.h
|
audio_core.h
|
||||||
audio_event.h
|
audio_event.h
|
||||||
@ -42,13 +35,6 @@ add_library(audio_core STATIC
|
|||||||
in/audio_in.h
|
in/audio_in.h
|
||||||
in/audio_in_system.cpp
|
in/audio_in_system.cpp
|
||||||
in/audio_in_system.h
|
in/audio_in_system.h
|
||||||
opus/hardware_opus.cpp
|
|
||||||
opus/hardware_opus.h
|
|
||||||
opus/decoder_manager.cpp
|
|
||||||
opus/decoder_manager.h
|
|
||||||
opus/decoder.cpp
|
|
||||||
opus/decoder.h
|
|
||||||
opus/parameters.h
|
|
||||||
out/audio_out.cpp
|
out/audio_out.cpp
|
||||||
out/audio_out.h
|
out/audio_out.h
|
||||||
out/audio_out_system.cpp
|
out/audio_out_system.cpp
|
||||||
@ -228,7 +214,7 @@ else()
|
|||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_link_libraries(audio_core PUBLIC common core Opus::opus)
|
target_link_libraries(audio_core PUBLIC common core)
|
||||||
if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)
|
if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)
|
||||||
target_link_libraries(audio_core PRIVATE dynarmic::dynarmic)
|
target_link_libraries(audio_core PRIVATE dynarmic::dynarmic)
|
||||||
endif()
|
endif()
|
||||||
|
@ -7,21 +7,12 @@
|
|||||||
namespace AudioCore::ADSP {
|
namespace AudioCore::ADSP {
|
||||||
|
|
||||||
ADSP::ADSP(Core::System& system, Sink::Sink& sink) {
|
ADSP::ADSP(Core::System& system, Sink::Sink& sink) {
|
||||||
audio_renderer = std::make_unique<AudioRenderer::AudioRenderer>(system, sink);
|
audio_renderer =
|
||||||
opus_decoder = std::make_unique<OpusDecoder::OpusDecoder>(system);
|
std::make_unique<AudioRenderer::AudioRenderer>(system, system.ApplicationMemory(), sink);
|
||||||
opus_decoder->Send(Direction::DSP, OpusDecoder::Message::Start);
|
|
||||||
if (opus_decoder->Receive(Direction::Host) != OpusDecoder::Message::StartOK) {
|
|
||||||
LOG_ERROR(Service_Audio, "OpusDeocder failed to initialize.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
AudioRenderer::AudioRenderer& ADSP::AudioRenderer() {
|
AudioRenderer::AudioRenderer& ADSP::AudioRenderer() {
|
||||||
return *audio_renderer.get();
|
return *audio_renderer.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
OpusDecoder::OpusDecoder& ADSP::OpusDecoder() {
|
|
||||||
return *opus_decoder.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace AudioCore::ADSP
|
} // namespace AudioCore::ADSP
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "audio_core/adsp/apps/audio_renderer/audio_renderer.h"
|
#include "audio_core/adsp/apps/audio_renderer/audio_renderer.h"
|
||||||
#include "audio_core/adsp/apps/opus/opus_decoder.h"
|
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
|
|
||||||
namespace Core {
|
namespace Core {
|
||||||
@ -41,12 +40,10 @@ public:
|
|||||||
~ADSP() = default;
|
~ADSP() = default;
|
||||||
|
|
||||||
AudioRenderer::AudioRenderer& AudioRenderer();
|
AudioRenderer::AudioRenderer& AudioRenderer();
|
||||||
OpusDecoder::OpusDecoder& OpusDecoder();
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/// AudioRenderer app
|
/// AudioRenderer app
|
||||||
std::unique_ptr<AudioRenderer::AudioRenderer> audio_renderer{};
|
std::unique_ptr<AudioRenderer::AudioRenderer> audio_renderer{};
|
||||||
std::unique_ptr<OpusDecoder::OpusDecoder> opus_decoder{};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace ADSP
|
} // namespace ADSP
|
||||||
|
@ -14,12 +14,13 @@
|
|||||||
#include "core/core.h"
|
#include "core/core.h"
|
||||||
#include "core/core_timing.h"
|
#include "core/core_timing.h"
|
||||||
|
|
||||||
MICROPROFILE_DEFINE(Audio_Renderer, "Audio", "DSP_AudioRenderer", MP_RGB(60, 19, 97));
|
MICROPROFILE_DEFINE(Audio_Renderer, "Audio", "DSP", MP_RGB(60, 19, 97));
|
||||||
|
|
||||||
namespace AudioCore::ADSP::AudioRenderer {
|
namespace AudioCore::ADSP::AudioRenderer {
|
||||||
|
|
||||||
AudioRenderer::AudioRenderer(Core::System& system_, Sink::Sink& sink_)
|
AudioRenderer::AudioRenderer(Core::System& system_, Core::Memory::Memory& memory_,
|
||||||
: system{system_}, sink{sink_} {}
|
Sink::Sink& sink_)
|
||||||
|
: system{system_}, memory{memory_}, sink{sink_} {}
|
||||||
|
|
||||||
AudioRenderer::~AudioRenderer() {
|
AudioRenderer::~AudioRenderer() {
|
||||||
Stop();
|
Stop();
|
||||||
@ -32,8 +33,8 @@ void AudioRenderer::Start() {
|
|||||||
|
|
||||||
main_thread = std::jthread([this](std::stop_token stop_token) { Main(stop_token); });
|
main_thread = std::jthread([this](std::stop_token stop_token) { Main(stop_token); });
|
||||||
|
|
||||||
mailbox.Send(Direction::DSP, Message::InitializeOK);
|
mailbox.Send(Direction::DSP, {Message::InitializeOK, {}});
|
||||||
if (mailbox.Receive(Direction::Host) != Message::InitializeOK) {
|
if (mailbox.Receive(Direction::Host).msg != Message::InitializeOK) {
|
||||||
LOG_ERROR(Service_Audio, "Host Audio Renderer -- Failed to receive shutdown "
|
LOG_ERROR(Service_Audio, "Host Audio Renderer -- Failed to receive shutdown "
|
||||||
"message response from ADSP!");
|
"message response from ADSP!");
|
||||||
return;
|
return;
|
||||||
@ -46,8 +47,8 @@ void AudioRenderer::Stop() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
mailbox.Send(Direction::DSP, Message::Shutdown);
|
mailbox.Send(Direction::DSP, {Message::Shutdown, {}});
|
||||||
if (mailbox.Receive(Direction::Host) != Message::Shutdown) {
|
if (mailbox.Receive(Direction::Host).msg != Message::Shutdown) {
|
||||||
LOG_ERROR(Service_Audio, "Host Audio Renderer -- Failed to receive shutdown "
|
LOG_ERROR(Service_Audio, "Host Audio Renderer -- Failed to receive shutdown "
|
||||||
"message response from ADSP!");
|
"message response from ADSP!");
|
||||||
}
|
}
|
||||||
@ -66,25 +67,25 @@ void AudioRenderer::Stop() {
|
|||||||
|
|
||||||
void AudioRenderer::Signal() {
|
void AudioRenderer::Signal() {
|
||||||
signalled_tick = system.CoreTiming().GetGlobalTimeNs().count();
|
signalled_tick = system.CoreTiming().GetGlobalTimeNs().count();
|
||||||
Send(Direction::DSP, Message::Render);
|
Send(Direction::DSP, {Message::Render, {}});
|
||||||
}
|
}
|
||||||
|
|
||||||
void AudioRenderer::Wait() {
|
void AudioRenderer::Wait() {
|
||||||
auto msg = Receive(Direction::Host);
|
auto received = Receive(Direction::Host);
|
||||||
if (msg != Message::RenderResponse) {
|
if (received.msg != Message::RenderResponse) {
|
||||||
LOG_ERROR(Service_Audio,
|
LOG_ERROR(Service_Audio,
|
||||||
"Did not receive the expected render response from the AudioRenderer! Expected "
|
"Did not receive the expected render response from the AudioRenderer! Expected "
|
||||||
"{}, got {}",
|
"{}, got {}",
|
||||||
Message::RenderResponse, msg);
|
Message::RenderResponse, received.msg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void AudioRenderer::Send(Direction dir, u32 message) {
|
void AudioRenderer::Send(Direction dir, MailboxMessage message) {
|
||||||
mailbox.Send(dir, std::move(message));
|
mailbox.Send(dir, std::move(message));
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 AudioRenderer::Receive(Direction dir) {
|
MailboxMessage AudioRenderer::Receive(Direction dir, bool block) {
|
||||||
return mailbox.Receive(dir);
|
return mailbox.Receive(dir, block);
|
||||||
}
|
}
|
||||||
|
|
||||||
void AudioRenderer::SetCommandBuffer(s32 session_id, CpuAddr buffer, u64 size, u64 time_limit,
|
void AudioRenderer::SetCommandBuffer(s32 session_id, CpuAddr buffer, u64 size, u64 time_limit,
|
||||||
@ -119,7 +120,7 @@ void AudioRenderer::CreateSinkStreams() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void AudioRenderer::Main(std::stop_token stop_token) {
|
void AudioRenderer::Main(std::stop_token stop_token) {
|
||||||
static constexpr char name[]{"DSP_AudioRenderer_Main"};
|
static constexpr char name[]{"AudioRenderer"};
|
||||||
MicroProfileOnThreadCreate(name);
|
MicroProfileOnThreadCreate(name);
|
||||||
Common::SetCurrentThreadName(name);
|
Common::SetCurrentThreadName(name);
|
||||||
Common::SetCurrentThreadPriority(Common::ThreadPriority::High);
|
Common::SetCurrentThreadPriority(Common::ThreadPriority::High);
|
||||||
@ -127,28 +128,28 @@ void AudioRenderer::Main(std::stop_token stop_token) {
|
|||||||
// TODO: Create buffer map/unmap thread + mailbox
|
// TODO: Create buffer map/unmap thread + mailbox
|
||||||
// TODO: Create gMix devices, initialize them here
|
// TODO: Create gMix devices, initialize them here
|
||||||
|
|
||||||
if (mailbox.Receive(Direction::DSP) != Message::InitializeOK) {
|
if (mailbox.Receive(Direction::DSP).msg != Message::InitializeOK) {
|
||||||
LOG_ERROR(Service_Audio,
|
LOG_ERROR(Service_Audio,
|
||||||
"ADSP Audio Renderer -- Failed to receive initialize message from host!");
|
"ADSP Audio Renderer -- Failed to receive initialize message from host!");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
mailbox.Send(Direction::Host, Message::InitializeOK);
|
mailbox.Send(Direction::Host, {Message::InitializeOK, {}});
|
||||||
|
|
||||||
// 0.12 seconds (2,304,000 / 19,200,000)
|
// 0.12 seconds (2,304,000 / 19,200,000)
|
||||||
constexpr u64 max_process_time{2'304'000ULL};
|
constexpr u64 max_process_time{2'304'000ULL};
|
||||||
|
|
||||||
while (!stop_token.stop_requested()) {
|
while (!stop_token.stop_requested()) {
|
||||||
auto msg{mailbox.Receive(Direction::DSP)};
|
auto received{mailbox.Receive(Direction::DSP)};
|
||||||
switch (msg) {
|
switch (received.msg) {
|
||||||
case Message::Shutdown:
|
case Message::Shutdown:
|
||||||
mailbox.Send(Direction::Host, Message::Shutdown);
|
mailbox.Send(Direction::Host, {Message::Shutdown, {}});
|
||||||
return;
|
return;
|
||||||
|
|
||||||
case Message::Render: {
|
case Message::Render: {
|
||||||
if (system.IsShuttingDown()) [[unlikely]] {
|
if (system.IsShuttingDown()) [[unlikely]] {
|
||||||
std::this_thread::sleep_for(std::chrono::milliseconds(5));
|
std::this_thread::sleep_for(std::chrono::milliseconds(5));
|
||||||
mailbox.Send(Direction::Host, Message::RenderResponse);
|
mailbox.Send(Direction::Host, {Message::RenderResponse, {}});
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
std::array<bool, MaxRendererSessions> buffers_reset{};
|
std::array<bool, MaxRendererSessions> buffers_reset{};
|
||||||
@ -204,12 +205,13 @@ void AudioRenderer::Main(std::stop_token stop_token) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
mailbox.Send(Direction::Host, Message::RenderResponse);
|
mailbox.Send(Direction::Host, {Message::RenderResponse, {}});
|
||||||
} break;
|
} break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
LOG_WARNING(Service_Audio,
|
LOG_WARNING(Service_Audio,
|
||||||
"ADSP AudioRenderer received an invalid message, msg={:02X}!", msg);
|
"ADSP AudioRenderer received an invalid message, msg={:02X}!",
|
||||||
|
received.msg);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -17,6 +17,13 @@
|
|||||||
|
|
||||||
namespace Core {
|
namespace Core {
|
||||||
class System;
|
class System;
|
||||||
|
namespace Timing {
|
||||||
|
struct EventType;
|
||||||
|
}
|
||||||
|
namespace Memory {
|
||||||
|
class Memory;
|
||||||
|
}
|
||||||
|
class System;
|
||||||
} // namespace Core
|
} // namespace Core
|
||||||
|
|
||||||
namespace AudioCore {
|
namespace AudioCore {
|
||||||
@ -27,19 +34,19 @@ class Sink;
|
|||||||
namespace ADSP::AudioRenderer {
|
namespace ADSP::AudioRenderer {
|
||||||
|
|
||||||
enum Message : u32 {
|
enum Message : u32 {
|
||||||
Invalid = 0,
|
Invalid = 0x00,
|
||||||
MapUnmap_Map = 1,
|
MapUnmap_Map = 0x01,
|
||||||
MapUnmap_MapResponse = 2,
|
MapUnmap_MapResponse = 0x02,
|
||||||
MapUnmap_Unmap = 3,
|
MapUnmap_Unmap = 0x03,
|
||||||
MapUnmap_UnmapResponse = 4,
|
MapUnmap_UnmapResponse = 0x04,
|
||||||
MapUnmap_InvalidateCache = 5,
|
MapUnmap_InvalidateCache = 0x05,
|
||||||
MapUnmap_InvalidateCacheResponse = 6,
|
MapUnmap_InvalidateCacheResponse = 0x06,
|
||||||
MapUnmap_Shutdown = 7,
|
MapUnmap_Shutdown = 0x07,
|
||||||
MapUnmap_ShutdownResponse = 8,
|
MapUnmap_ShutdownResponse = 0x08,
|
||||||
InitializeOK = 22,
|
InitializeOK = 0x16,
|
||||||
RenderResponse = 32,
|
RenderResponse = 0x20,
|
||||||
Render = 42,
|
Render = 0x2A,
|
||||||
Shutdown = 52,
|
Shutdown = 0x34,
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -47,7 +54,7 @@ enum Message : u32 {
|
|||||||
*/
|
*/
|
||||||
class AudioRenderer {
|
class AudioRenderer {
|
||||||
public:
|
public:
|
||||||
explicit AudioRenderer(Core::System& system, Sink::Sink& sink);
|
explicit AudioRenderer(Core::System& system, Core::Memory::Memory& memory, Sink::Sink& sink);
|
||||||
~AudioRenderer();
|
~AudioRenderer();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -65,8 +72,8 @@ public:
|
|||||||
void Signal();
|
void Signal();
|
||||||
void Wait();
|
void Wait();
|
||||||
|
|
||||||
void Send(Direction dir, u32 message);
|
void Send(Direction dir, MailboxMessage message);
|
||||||
u32 Receive(Direction dir);
|
MailboxMessage Receive(Direction dir, bool block = true);
|
||||||
|
|
||||||
void SetCommandBuffer(s32 session_id, CpuAddr buffer, u64 size, u64 time_limit,
|
void SetCommandBuffer(s32 session_id, CpuAddr buffer, u64 size, u64 time_limit,
|
||||||
u64 applet_resource_user_id, bool reset) noexcept;
|
u64 applet_resource_user_id, bool reset) noexcept;
|
||||||
@ -87,7 +94,9 @@ private:
|
|||||||
|
|
||||||
/// Core system
|
/// Core system
|
||||||
Core::System& system;
|
Core::System& system;
|
||||||
/// The output sink the AudioRenderer will send samples to
|
/// Memory
|
||||||
|
Core::Memory::Memory& memory;
|
||||||
|
/// The output sink the AudioRenderer will use
|
||||||
Sink::Sink& sink;
|
Sink::Sink& sink;
|
||||||
/// The active mailbox
|
/// The active mailbox
|
||||||
Mailbox mailbox;
|
Mailbox mailbox;
|
||||||
@ -95,13 +104,11 @@ private:
|
|||||||
std::jthread main_thread{};
|
std::jthread main_thread{};
|
||||||
/// The current state
|
/// The current state
|
||||||
std::atomic<bool> running{};
|
std::atomic<bool> running{};
|
||||||
/// Shared memory of input command buffers, set by host, read by DSP
|
|
||||||
std::array<CommandBuffer, MaxRendererSessions> command_buffers{};
|
std::array<CommandBuffer, MaxRendererSessions> command_buffers{};
|
||||||
/// The command lists to process
|
/// The command lists to process
|
||||||
std::array<CommandListProcessor, MaxRendererSessions> command_list_processors{};
|
std::array<CommandListProcessor, MaxRendererSessions> command_list_processors{};
|
||||||
/// The streams which will receive the processed samples
|
/// The streams which will receive the processed samples
|
||||||
std::array<Sink::SinkStream*, MaxRendererSessions> streams{};
|
std::array<Sink::SinkStream*, MaxRendererSessions> streams{};
|
||||||
/// CPU Tick when the DSP was signalled to process, uses time rather than tick
|
|
||||||
u64 signalled_tick{0};
|
u64 signalled_tick{0};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1,107 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#include "audio_core/adsp/apps/opus/opus_decode_object.h"
|
|
||||||
#include "common/assert.h"
|
|
||||||
|
|
||||||
namespace AudioCore::ADSP::OpusDecoder {
|
|
||||||
namespace {
|
|
||||||
bool IsValidChannelCount(u32 channel_count) {
|
|
||||||
return channel_count == 1 || channel_count == 2;
|
|
||||||
}
|
|
||||||
} // namespace
|
|
||||||
|
|
||||||
u32 OpusDecodeObject::GetWorkBufferSize(u32 channel_count) {
|
|
||||||
if (!IsValidChannelCount(channel_count)) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
return static_cast<u32>(sizeof(OpusDecodeObject)) + opus_decoder_get_size(channel_count);
|
|
||||||
}
|
|
||||||
|
|
||||||
OpusDecodeObject& OpusDecodeObject::Initialize(u64 buffer, u64 buffer2) {
|
|
||||||
auto* new_decoder = reinterpret_cast<OpusDecodeObject*>(buffer);
|
|
||||||
auto* comparison = reinterpret_cast<OpusDecodeObject*>(buffer2);
|
|
||||||
|
|
||||||
if (new_decoder->magic == DecodeObjectMagic) {
|
|
||||||
if (!new_decoder->initialized ||
|
|
||||||
(new_decoder->initialized && new_decoder->self == comparison)) {
|
|
||||||
new_decoder->state_valid = true;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
new_decoder->initialized = false;
|
|
||||||
new_decoder->state_valid = true;
|
|
||||||
}
|
|
||||||
return *new_decoder;
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 OpusDecodeObject::InitializeDecoder(u32 sample_rate, u32 channel_count) {
|
|
||||||
if (!state_valid) {
|
|
||||||
return OPUS_INVALID_STATE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (initialized) {
|
|
||||||
return OPUS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Unfortunately libopus does not expose the OpusDecoder struct publicly, so we can't include
|
|
||||||
// it in this class. Nintendo does not allocate memory, which is why we have a workbuffer
|
|
||||||
// provided.
|
|
||||||
// We could use _create and have libopus allocate it for us, but then we have to separately
|
|
||||||
// track which decoder is being used between this and multistream in order to call the correct
|
|
||||||
// destroy from the host side.
|
|
||||||
// This is a bit cringe, but is safe as these objects are only ever initialized inside the given
|
|
||||||
// workbuffer, and GetWorkBufferSize will guarantee there's enough space to follow.
|
|
||||||
decoder = (LibOpusDecoder*)(this + 1);
|
|
||||||
s32 ret = opus_decoder_init(decoder, sample_rate, channel_count);
|
|
||||||
if (ret == OPUS_OK) {
|
|
||||||
magic = DecodeObjectMagic;
|
|
||||||
initialized = true;
|
|
||||||
state_valid = true;
|
|
||||||
self = this;
|
|
||||||
final_range = 0;
|
|
||||||
}
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 OpusDecodeObject::Shutdown() {
|
|
||||||
if (!state_valid) {
|
|
||||||
return OPUS_INVALID_STATE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (initialized) {
|
|
||||||
magic = 0x0;
|
|
||||||
initialized = false;
|
|
||||||
state_valid = false;
|
|
||||||
self = nullptr;
|
|
||||||
final_range = 0;
|
|
||||||
decoder = nullptr;
|
|
||||||
}
|
|
||||||
return OPUS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 OpusDecodeObject::ResetDecoder() {
|
|
||||||
return opus_decoder_ctl(decoder, OPUS_RESET_STATE);
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 OpusDecodeObject::Decode(u32& out_sample_count, u64 output_data, u64 output_data_size,
|
|
||||||
u64 input_data, u64 input_data_size) {
|
|
||||||
ASSERT(initialized);
|
|
||||||
out_sample_count = 0;
|
|
||||||
|
|
||||||
if (!state_valid) {
|
|
||||||
return OPUS_INVALID_STATE;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto ret_code_or_samples = opus_decode(
|
|
||||||
decoder, reinterpret_cast<const u8*>(input_data), static_cast<opus_int32>(input_data_size),
|
|
||||||
reinterpret_cast<opus_int16*>(output_data), static_cast<opus_int32>(output_data_size), 0);
|
|
||||||
|
|
||||||
if (ret_code_or_samples < OPUS_OK) {
|
|
||||||
return ret_code_or_samples;
|
|
||||||
}
|
|
||||||
|
|
||||||
out_sample_count = ret_code_or_samples;
|
|
||||||
return opus_decoder_ctl(decoder, OPUS_GET_FINAL_RANGE_REQUEST, &final_range);
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace AudioCore::ADSP::OpusDecoder
|
|
@ -1,38 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <opus.h>
|
|
||||||
|
|
||||||
#include "common/common_types.h"
|
|
||||||
|
|
||||||
namespace AudioCore::ADSP::OpusDecoder {
|
|
||||||
using LibOpusDecoder = ::OpusDecoder;
|
|
||||||
static constexpr u32 DecodeObjectMagic = 0xDEADBEEF;
|
|
||||||
|
|
||||||
class OpusDecodeObject {
|
|
||||||
public:
|
|
||||||
static u32 GetWorkBufferSize(u32 channel_count);
|
|
||||||
static OpusDecodeObject& Initialize(u64 buffer, u64 buffer2);
|
|
||||||
|
|
||||||
s32 InitializeDecoder(u32 sample_rate, u32 channel_count);
|
|
||||||
s32 Shutdown();
|
|
||||||
s32 ResetDecoder();
|
|
||||||
s32 Decode(u32& out_sample_count, u64 output_data, u64 output_data_size, u64 input_data,
|
|
||||||
u64 input_data_size);
|
|
||||||
u32 GetFinalRange() const noexcept {
|
|
||||||
return final_range;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
u32 magic;
|
|
||||||
bool initialized;
|
|
||||||
bool state_valid;
|
|
||||||
OpusDecodeObject* self;
|
|
||||||
u32 final_range;
|
|
||||||
LibOpusDecoder* decoder;
|
|
||||||
};
|
|
||||||
static_assert(std::is_trivially_constructible_v<OpusDecodeObject>);
|
|
||||||
|
|
||||||
} // namespace AudioCore::ADSP::OpusDecoder
|
|
@ -1,269 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#include <array>
|
|
||||||
#include <chrono>
|
|
||||||
|
|
||||||
#include "audio_core/adsp/apps/opus/opus_decode_object.h"
|
|
||||||
#include "audio_core/adsp/apps/opus/opus_multistream_decode_object.h"
|
|
||||||
#include "audio_core/adsp/apps/opus/shared_memory.h"
|
|
||||||
#include "audio_core/audio_core.h"
|
|
||||||
#include "audio_core/common/common.h"
|
|
||||||
#include "common/logging/log.h"
|
|
||||||
#include "common/microprofile.h"
|
|
||||||
#include "common/thread.h"
|
|
||||||
#include "core/core.h"
|
|
||||||
#include "core/core_timing.h"
|
|
||||||
|
|
||||||
MICROPROFILE_DEFINE(OpusDecoder, "Audio", "DSP_OpusDecoder", MP_RGB(60, 19, 97));
|
|
||||||
|
|
||||||
namespace AudioCore::ADSP::OpusDecoder {
|
|
||||||
|
|
||||||
namespace {
|
|
||||||
constexpr size_t OpusStreamCountMax = 255;
|
|
||||||
|
|
||||||
bool IsValidChannelCount(u32 channel_count) {
|
|
||||||
return channel_count == 1 || channel_count == 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool IsValidMultiStreamChannelCount(u32 channel_count) {
|
|
||||||
return channel_count <= OpusStreamCountMax;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool IsValidMultiStreamStreamCounts(s32 total_stream_count, s32 sterero_stream_count) {
|
|
||||||
return IsValidMultiStreamChannelCount(total_stream_count) && total_stream_count > 0 &&
|
|
||||||
sterero_stream_count > 0 && sterero_stream_count <= total_stream_count;
|
|
||||||
}
|
|
||||||
} // namespace
|
|
||||||
|
|
||||||
OpusDecoder::OpusDecoder(Core::System& system_) : system{system_} {
|
|
||||||
init_thread = std::jthread([this](std::stop_token stop_token) { Init(stop_token); });
|
|
||||||
}
|
|
||||||
|
|
||||||
OpusDecoder::~OpusDecoder() {
|
|
||||||
if (!running) {
|
|
||||||
init_thread.request_stop();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Shutdown the thread
|
|
||||||
Send(Direction::DSP, Message::Shutdown);
|
|
||||||
auto msg = Receive(Direction::Host);
|
|
||||||
ASSERT_MSG(msg == Message::ShutdownOK, "Expected Opus shutdown code {}, got {}",
|
|
||||||
Message::ShutdownOK, msg);
|
|
||||||
main_thread.request_stop();
|
|
||||||
main_thread.join();
|
|
||||||
running = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
void OpusDecoder::Send(Direction dir, u32 message) {
|
|
||||||
mailbox.Send(dir, std::move(message));
|
|
||||||
}
|
|
||||||
|
|
||||||
u32 OpusDecoder::Receive(Direction dir, std::stop_token stop_token) {
|
|
||||||
return mailbox.Receive(dir, stop_token);
|
|
||||||
}
|
|
||||||
|
|
||||||
void OpusDecoder::Init(std::stop_token stop_token) {
|
|
||||||
Common::SetCurrentThreadName("DSP_OpusDecoder_Init");
|
|
||||||
|
|
||||||
if (Receive(Direction::DSP, stop_token) != Message::Start) {
|
|
||||||
LOG_ERROR(Service_Audio,
|
|
||||||
"DSP OpusDecoder failed to receive Start message. Opus initialization failed.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
main_thread = std::jthread([this](std::stop_token st) { Main(st); });
|
|
||||||
running = true;
|
|
||||||
Send(Direction::Host, Message::StartOK);
|
|
||||||
}
|
|
||||||
|
|
||||||
void OpusDecoder::Main(std::stop_token stop_token) {
|
|
||||||
Common::SetCurrentThreadName("DSP_OpusDecoder_Main");
|
|
||||||
|
|
||||||
while (!stop_token.stop_requested()) {
|
|
||||||
auto msg = Receive(Direction::DSP, stop_token);
|
|
||||||
switch (msg) {
|
|
||||||
case Shutdown:
|
|
||||||
Send(Direction::Host, Message::ShutdownOK);
|
|
||||||
return;
|
|
||||||
|
|
||||||
case GetWorkBufferSize: {
|
|
||||||
auto channel_count = static_cast<s32>(shared_memory->host_send_data[0]);
|
|
||||||
|
|
||||||
ASSERT(IsValidChannelCount(channel_count));
|
|
||||||
|
|
||||||
shared_memory->dsp_return_data[0] = OpusDecodeObject::GetWorkBufferSize(channel_count);
|
|
||||||
Send(Direction::Host, Message::GetWorkBufferSizeOK);
|
|
||||||
} break;
|
|
||||||
|
|
||||||
case InitializeDecodeObject: {
|
|
||||||
auto buffer = shared_memory->host_send_data[0];
|
|
||||||
auto buffer_size = shared_memory->host_send_data[1];
|
|
||||||
auto sample_rate = static_cast<s32>(shared_memory->host_send_data[2]);
|
|
||||||
auto channel_count = static_cast<s32>(shared_memory->host_send_data[3]);
|
|
||||||
|
|
||||||
ASSERT(sample_rate >= 0);
|
|
||||||
ASSERT(IsValidChannelCount(channel_count));
|
|
||||||
ASSERT(buffer_size >= OpusDecodeObject::GetWorkBufferSize(channel_count));
|
|
||||||
|
|
||||||
auto& decoder_object = OpusDecodeObject::Initialize(buffer, buffer);
|
|
||||||
shared_memory->dsp_return_data[0] =
|
|
||||||
decoder_object.InitializeDecoder(sample_rate, channel_count);
|
|
||||||
|
|
||||||
Send(Direction::Host, Message::InitializeDecodeObjectOK);
|
|
||||||
} break;
|
|
||||||
|
|
||||||
case ShutdownDecodeObject: {
|
|
||||||
auto buffer = shared_memory->host_send_data[0];
|
|
||||||
[[maybe_unused]] auto buffer_size = shared_memory->host_send_data[1];
|
|
||||||
|
|
||||||
auto& decoder_object = OpusDecodeObject::Initialize(buffer, buffer);
|
|
||||||
shared_memory->dsp_return_data[0] = decoder_object.Shutdown();
|
|
||||||
|
|
||||||
Send(Direction::Host, Message::ShutdownDecodeObjectOK);
|
|
||||||
} break;
|
|
||||||
|
|
||||||
case DecodeInterleaved: {
|
|
||||||
auto start_time = system.CoreTiming().GetGlobalTimeUs();
|
|
||||||
|
|
||||||
auto buffer = shared_memory->host_send_data[0];
|
|
||||||
auto input_data = shared_memory->host_send_data[1];
|
|
||||||
auto input_data_size = shared_memory->host_send_data[2];
|
|
||||||
auto output_data = shared_memory->host_send_data[3];
|
|
||||||
auto output_data_size = shared_memory->host_send_data[4];
|
|
||||||
auto final_range = static_cast<u32>(shared_memory->host_send_data[5]);
|
|
||||||
auto reset_requested = shared_memory->host_send_data[6];
|
|
||||||
|
|
||||||
u32 decoded_samples{0};
|
|
||||||
|
|
||||||
auto& decoder_object = OpusDecodeObject::Initialize(buffer, buffer);
|
|
||||||
s32 error_code{OPUS_OK};
|
|
||||||
if (reset_requested) {
|
|
||||||
error_code = decoder_object.ResetDecoder();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (error_code == OPUS_OK) {
|
|
||||||
error_code = decoder_object.Decode(decoded_samples, output_data, output_data_size,
|
|
||||||
input_data, input_data_size);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (error_code == OPUS_OK) {
|
|
||||||
if (final_range && decoder_object.GetFinalRange() != final_range) {
|
|
||||||
error_code = OPUS_INVALID_PACKET;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
auto end_time = system.CoreTiming().GetGlobalTimeUs();
|
|
||||||
shared_memory->dsp_return_data[0] = error_code;
|
|
||||||
shared_memory->dsp_return_data[1] = decoded_samples;
|
|
||||||
shared_memory->dsp_return_data[2] = (end_time - start_time).count();
|
|
||||||
|
|
||||||
Send(Direction::Host, Message::DecodeInterleavedOK);
|
|
||||||
} break;
|
|
||||||
|
|
||||||
case MapMemory: {
|
|
||||||
[[maybe_unused]] auto buffer = shared_memory->host_send_data[0];
|
|
||||||
[[maybe_unused]] auto buffer_size = shared_memory->host_send_data[1];
|
|
||||||
Send(Direction::Host, Message::MapMemoryOK);
|
|
||||||
} break;
|
|
||||||
|
|
||||||
case UnmapMemory: {
|
|
||||||
[[maybe_unused]] auto buffer = shared_memory->host_send_data[0];
|
|
||||||
[[maybe_unused]] auto buffer_size = shared_memory->host_send_data[1];
|
|
||||||
Send(Direction::Host, Message::UnmapMemoryOK);
|
|
||||||
} break;
|
|
||||||
|
|
||||||
case GetWorkBufferSizeForMultiStream: {
|
|
||||||
auto total_stream_count = static_cast<s32>(shared_memory->host_send_data[0]);
|
|
||||||
auto stereo_stream_count = static_cast<s32>(shared_memory->host_send_data[1]);
|
|
||||||
|
|
||||||
ASSERT(IsValidMultiStreamStreamCounts(total_stream_count, stereo_stream_count));
|
|
||||||
|
|
||||||
shared_memory->dsp_return_data[0] = OpusMultiStreamDecodeObject::GetWorkBufferSize(
|
|
||||||
total_stream_count, stereo_stream_count);
|
|
||||||
Send(Direction::Host, Message::GetWorkBufferSizeForMultiStreamOK);
|
|
||||||
} break;
|
|
||||||
|
|
||||||
case InitializeMultiStreamDecodeObject: {
|
|
||||||
auto buffer = shared_memory->host_send_data[0];
|
|
||||||
auto buffer_size = shared_memory->host_send_data[1];
|
|
||||||
auto sample_rate = static_cast<s32>(shared_memory->host_send_data[2]);
|
|
||||||
auto channel_count = static_cast<s32>(shared_memory->host_send_data[3]);
|
|
||||||
auto total_stream_count = static_cast<s32>(shared_memory->host_send_data[4]);
|
|
||||||
auto stereo_stream_count = static_cast<s32>(shared_memory->host_send_data[5]);
|
|
||||||
// Nintendo seem to have a bug here, they try to use &host_send_data[6] for the channel
|
|
||||||
// mappings, but [6] is never set, and there is not enough room in the argument data for
|
|
||||||
// more than 40 channels, when 255 are possible.
|
|
||||||
// It also means the mapping values are undefined, though likely always 0,
|
|
||||||
// and the mappings given by the game are ignored. The mappings are copied to this
|
|
||||||
// dedicated buffer host side, so let's do as intended.
|
|
||||||
auto mappings = shared_memory->channel_mapping.data();
|
|
||||||
|
|
||||||
ASSERT(IsValidMultiStreamStreamCounts(total_stream_count, stereo_stream_count));
|
|
||||||
ASSERT(sample_rate >= 0);
|
|
||||||
ASSERT(buffer_size >= OpusMultiStreamDecodeObject::GetWorkBufferSize(
|
|
||||||
total_stream_count, stereo_stream_count));
|
|
||||||
|
|
||||||
auto& decoder_object = OpusMultiStreamDecodeObject::Initialize(buffer, buffer);
|
|
||||||
shared_memory->dsp_return_data[0] = decoder_object.InitializeDecoder(
|
|
||||||
sample_rate, total_stream_count, channel_count, stereo_stream_count, mappings);
|
|
||||||
|
|
||||||
Send(Direction::Host, Message::InitializeMultiStreamDecodeObjectOK);
|
|
||||||
} break;
|
|
||||||
|
|
||||||
case ShutdownMultiStreamDecodeObject: {
|
|
||||||
auto buffer = shared_memory->host_send_data[0];
|
|
||||||
[[maybe_unused]] auto buffer_size = shared_memory->host_send_data[1];
|
|
||||||
|
|
||||||
auto& decoder_object = OpusMultiStreamDecodeObject::Initialize(buffer, buffer);
|
|
||||||
shared_memory->dsp_return_data[0] = decoder_object.Shutdown();
|
|
||||||
|
|
||||||
Send(Direction::Host, Message::ShutdownMultiStreamDecodeObjectOK);
|
|
||||||
} break;
|
|
||||||
|
|
||||||
case DecodeInterleavedForMultiStream: {
|
|
||||||
auto start_time = system.CoreTiming().GetGlobalTimeUs();
|
|
||||||
|
|
||||||
auto buffer = shared_memory->host_send_data[0];
|
|
||||||
auto input_data = shared_memory->host_send_data[1];
|
|
||||||
auto input_data_size = shared_memory->host_send_data[2];
|
|
||||||
auto output_data = shared_memory->host_send_data[3];
|
|
||||||
auto output_data_size = shared_memory->host_send_data[4];
|
|
||||||
auto final_range = static_cast<u32>(shared_memory->host_send_data[5]);
|
|
||||||
auto reset_requested = shared_memory->host_send_data[6];
|
|
||||||
|
|
||||||
u32 decoded_samples{0};
|
|
||||||
|
|
||||||
auto& decoder_object = OpusMultiStreamDecodeObject::Initialize(buffer, buffer);
|
|
||||||
s32 error_code{OPUS_OK};
|
|
||||||
if (reset_requested) {
|
|
||||||
error_code = decoder_object.ResetDecoder();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (error_code == OPUS_OK) {
|
|
||||||
error_code = decoder_object.Decode(decoded_samples, output_data, output_data_size,
|
|
||||||
input_data, input_data_size);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (error_code == OPUS_OK) {
|
|
||||||
if (final_range && decoder_object.GetFinalRange() != final_range) {
|
|
||||||
error_code = OPUS_INVALID_PACKET;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
auto end_time = system.CoreTiming().GetGlobalTimeUs();
|
|
||||||
shared_memory->dsp_return_data[0] = error_code;
|
|
||||||
shared_memory->dsp_return_data[1] = decoded_samples;
|
|
||||||
shared_memory->dsp_return_data[2] = (end_time - start_time).count();
|
|
||||||
|
|
||||||
Send(Direction::Host, Message::DecodeInterleavedForMultiStreamOK);
|
|
||||||
} break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
LOG_ERROR(Service_Audio, "Invalid OpusDecoder command {}", msg);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace AudioCore::ADSP::OpusDecoder
|
|
@ -1,92 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <memory>
|
|
||||||
#include <thread>
|
|
||||||
|
|
||||||
#include "audio_core/adsp/apps/opus/shared_memory.h"
|
|
||||||
#include "audio_core/adsp/mailbox.h"
|
|
||||||
#include "common/common_types.h"
|
|
||||||
|
|
||||||
namespace Core {
|
|
||||||
class System;
|
|
||||||
} // namespace Core
|
|
||||||
|
|
||||||
namespace AudioCore::ADSP::OpusDecoder {
|
|
||||||
|
|
||||||
enum Message : u32 {
|
|
||||||
Invalid = 0,
|
|
||||||
Start = 1,
|
|
||||||
Shutdown = 2,
|
|
||||||
StartOK = 11,
|
|
||||||
ShutdownOK = 12,
|
|
||||||
GetWorkBufferSize = 21,
|
|
||||||
InitializeDecodeObject = 22,
|
|
||||||
ShutdownDecodeObject = 23,
|
|
||||||
DecodeInterleaved = 24,
|
|
||||||
MapMemory = 25,
|
|
||||||
UnmapMemory = 26,
|
|
||||||
GetWorkBufferSizeForMultiStream = 27,
|
|
||||||
InitializeMultiStreamDecodeObject = 28,
|
|
||||||
ShutdownMultiStreamDecodeObject = 29,
|
|
||||||
DecodeInterleavedForMultiStream = 30,
|
|
||||||
|
|
||||||
GetWorkBufferSizeOK = 41,
|
|
||||||
InitializeDecodeObjectOK = 42,
|
|
||||||
ShutdownDecodeObjectOK = 43,
|
|
||||||
DecodeInterleavedOK = 44,
|
|
||||||
MapMemoryOK = 45,
|
|
||||||
UnmapMemoryOK = 46,
|
|
||||||
GetWorkBufferSizeForMultiStreamOK = 47,
|
|
||||||
InitializeMultiStreamDecodeObjectOK = 48,
|
|
||||||
ShutdownMultiStreamDecodeObjectOK = 49,
|
|
||||||
DecodeInterleavedForMultiStreamOK = 50,
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The AudioRenderer application running on the ADSP.
|
|
||||||
*/
|
|
||||||
class OpusDecoder {
|
|
||||||
public:
|
|
||||||
explicit OpusDecoder(Core::System& system);
|
|
||||||
~OpusDecoder();
|
|
||||||
|
|
||||||
bool IsRunning() const noexcept {
|
|
||||||
return running;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Send(Direction dir, u32 message);
|
|
||||||
u32 Receive(Direction dir, std::stop_token stop_token = {});
|
|
||||||
|
|
||||||
void SetSharedMemory(SharedMemory& shared_memory_) {
|
|
||||||
shared_memory = &shared_memory_;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
/**
|
|
||||||
* Initializing thread, launched at audio_core boot to avoid blocking the main emu boot thread.
|
|
||||||
*/
|
|
||||||
void Init(std::stop_token stop_token);
|
|
||||||
/**
|
|
||||||
* Main OpusDecoder thread, responsible for processing the incoming Opus packets.
|
|
||||||
*/
|
|
||||||
void Main(std::stop_token stop_token);
|
|
||||||
|
|
||||||
/// Core system
|
|
||||||
Core::System& system;
|
|
||||||
/// Mailbox to communicate messages with the host, drives the main thread
|
|
||||||
Mailbox mailbox;
|
|
||||||
/// Init thread
|
|
||||||
std::jthread init_thread{};
|
|
||||||
/// Main thread
|
|
||||||
std::jthread main_thread{};
|
|
||||||
/// The current state
|
|
||||||
bool running{};
|
|
||||||
/// Structure shared with the host, input data set by the host before sending a mailbox message,
|
|
||||||
/// and the responses are written back by the OpusDecoder.
|
|
||||||
SharedMemory* shared_memory{};
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace AudioCore::ADSP::OpusDecoder
|
|
@ -1,111 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#include "audio_core/adsp/apps/opus/opus_multistream_decode_object.h"
|
|
||||||
#include "common/assert.h"
|
|
||||||
|
|
||||||
namespace AudioCore::ADSP::OpusDecoder {
|
|
||||||
|
|
||||||
namespace {
|
|
||||||
bool IsValidChannelCount(u32 channel_count) {
|
|
||||||
return channel_count == 1 || channel_count == 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool IsValidStreamCounts(u32 total_stream_count, u32 stereo_stream_count) {
|
|
||||||
return total_stream_count > 0 && stereo_stream_count > 0 &&
|
|
||||||
stereo_stream_count <= total_stream_count && IsValidChannelCount(total_stream_count);
|
|
||||||
}
|
|
||||||
} // namespace
|
|
||||||
|
|
||||||
u32 OpusMultiStreamDecodeObject::GetWorkBufferSize(u32 total_stream_count,
|
|
||||||
u32 stereo_stream_count) {
|
|
||||||
if (IsValidStreamCounts(total_stream_count, stereo_stream_count)) {
|
|
||||||
return static_cast<u32>(sizeof(OpusMultiStreamDecodeObject)) +
|
|
||||||
opus_multistream_decoder_get_size(total_stream_count, stereo_stream_count);
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
OpusMultiStreamDecodeObject& OpusMultiStreamDecodeObject::Initialize(u64 buffer, u64 buffer2) {
|
|
||||||
auto* new_decoder = reinterpret_cast<OpusMultiStreamDecodeObject*>(buffer);
|
|
||||||
auto* comparison = reinterpret_cast<OpusMultiStreamDecodeObject*>(buffer2);
|
|
||||||
|
|
||||||
if (new_decoder->magic == DecodeMultiStreamObjectMagic) {
|
|
||||||
if (!new_decoder->initialized ||
|
|
||||||
(new_decoder->initialized && new_decoder->self == comparison)) {
|
|
||||||
new_decoder->state_valid = true;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
new_decoder->initialized = false;
|
|
||||||
new_decoder->state_valid = true;
|
|
||||||
}
|
|
||||||
return *new_decoder;
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 OpusMultiStreamDecodeObject::InitializeDecoder(u32 sample_rate, u32 total_stream_count,
|
|
||||||
u32 channel_count, u32 stereo_stream_count,
|
|
||||||
u8* mappings) {
|
|
||||||
if (!state_valid) {
|
|
||||||
return OPUS_INVALID_STATE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (initialized) {
|
|
||||||
return OPUS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
// See OpusDecodeObject::InitializeDecoder for an explanation of this
|
|
||||||
decoder = (LibOpusMSDecoder*)(this + 1);
|
|
||||||
s32 ret = opus_multistream_decoder_init(decoder, sample_rate, channel_count, total_stream_count,
|
|
||||||
stereo_stream_count, mappings);
|
|
||||||
if (ret == OPUS_OK) {
|
|
||||||
magic = DecodeMultiStreamObjectMagic;
|
|
||||||
initialized = true;
|
|
||||||
state_valid = true;
|
|
||||||
self = this;
|
|
||||||
final_range = 0;
|
|
||||||
}
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 OpusMultiStreamDecodeObject::Shutdown() {
|
|
||||||
if (!state_valid) {
|
|
||||||
return OPUS_INVALID_STATE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (initialized) {
|
|
||||||
magic = 0x0;
|
|
||||||
initialized = false;
|
|
||||||
state_valid = false;
|
|
||||||
self = nullptr;
|
|
||||||
final_range = 0;
|
|
||||||
decoder = nullptr;
|
|
||||||
}
|
|
||||||
return OPUS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 OpusMultiStreamDecodeObject::ResetDecoder() {
|
|
||||||
return opus_multistream_decoder_ctl(decoder, OPUS_RESET_STATE);
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 OpusMultiStreamDecodeObject::Decode(u32& out_sample_count, u64 output_data,
|
|
||||||
u64 output_data_size, u64 input_data, u64 input_data_size) {
|
|
||||||
ASSERT(initialized);
|
|
||||||
out_sample_count = 0;
|
|
||||||
|
|
||||||
if (!state_valid) {
|
|
||||||
return OPUS_INVALID_STATE;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto ret_code_or_samples = opus_multistream_decode(
|
|
||||||
decoder, reinterpret_cast<const u8*>(input_data), static_cast<opus_int32>(input_data_size),
|
|
||||||
reinterpret_cast<opus_int16*>(output_data), static_cast<opus_int32>(output_data_size), 0);
|
|
||||||
|
|
||||||
if (ret_code_or_samples < OPUS_OK) {
|
|
||||||
return ret_code_or_samples;
|
|
||||||
}
|
|
||||||
|
|
||||||
out_sample_count = ret_code_or_samples;
|
|
||||||
return opus_multistream_decoder_ctl(decoder, OPUS_GET_FINAL_RANGE_REQUEST, &final_range);
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace AudioCore::ADSP::OpusDecoder
|
|
@ -1,39 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <opus_multistream.h>
|
|
||||||
|
|
||||||
#include "common/common_types.h"
|
|
||||||
|
|
||||||
namespace AudioCore::ADSP::OpusDecoder {
|
|
||||||
using LibOpusMSDecoder = ::OpusMSDecoder;
|
|
||||||
static constexpr u32 DecodeMultiStreamObjectMagic = 0xDEADBEEF;
|
|
||||||
|
|
||||||
class OpusMultiStreamDecodeObject {
|
|
||||||
public:
|
|
||||||
static u32 GetWorkBufferSize(u32 total_stream_count, u32 stereo_stream_count);
|
|
||||||
static OpusMultiStreamDecodeObject& Initialize(u64 buffer, u64 buffer2);
|
|
||||||
|
|
||||||
s32 InitializeDecoder(u32 sample_rate, u32 total_stream_count, u32 channel_count,
|
|
||||||
u32 stereo_stream_count, u8* mappings);
|
|
||||||
s32 Shutdown();
|
|
||||||
s32 ResetDecoder();
|
|
||||||
s32 Decode(u32& out_sample_count, u64 output_data, u64 output_data_size, u64 input_data,
|
|
||||||
u64 input_data_size);
|
|
||||||
u32 GetFinalRange() const noexcept {
|
|
||||||
return final_range;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
u32 magic;
|
|
||||||
bool initialized;
|
|
||||||
bool state_valid;
|
|
||||||
OpusMultiStreamDecodeObject* self;
|
|
||||||
u32 final_range;
|
|
||||||
LibOpusMSDecoder* decoder;
|
|
||||||
};
|
|
||||||
static_assert(std::is_trivially_constructible_v<OpusMultiStreamDecodeObject>);
|
|
||||||
|
|
||||||
} // namespace AudioCore::ADSP::OpusDecoder
|
|
@ -1,17 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "common/common_funcs.h"
|
|
||||||
#include "common/common_types.h"
|
|
||||||
|
|
||||||
namespace AudioCore::ADSP::OpusDecoder {
|
|
||||||
|
|
||||||
struct SharedMemory {
|
|
||||||
std::array<u8, 0x100> channel_mapping{};
|
|
||||||
std::array<u64, 16> host_send_data{};
|
|
||||||
std::array<u64, 16> dsp_return_data{};
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace AudioCore::ADSP::OpusDecoder
|
|
@ -3,8 +3,6 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <span>
|
|
||||||
|
|
||||||
#include "common/bounded_threadsafe_queue.h"
|
#include "common/bounded_threadsafe_queue.h"
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
|
|
||||||
@ -21,6 +19,11 @@ enum class Direction : u32 {
|
|||||||
DSP,
|
DSP,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct MailboxMessage {
|
||||||
|
u32 msg;
|
||||||
|
std::span<u8> data;
|
||||||
|
};
|
||||||
|
|
||||||
class Mailbox {
|
class Mailbox {
|
||||||
public:
|
public:
|
||||||
void Initialize(AppMailboxId id_) {
|
void Initialize(AppMailboxId id_) {
|
||||||
@ -32,19 +35,25 @@ public:
|
|||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Send(Direction dir, u32 message) {
|
void Send(Direction dir, MailboxMessage&& message) {
|
||||||
auto& queue = dir == Direction::Host ? host_queue : adsp_queue;
|
auto& queue = dir == Direction::Host ? host_queue : adsp_queue;
|
||||||
queue.EmplaceWait(message);
|
queue.EmplaceWait(std::move(message));
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 Receive(Direction dir, std::stop_token stop_token = {}) {
|
MailboxMessage Receive(Direction dir, bool block = true) {
|
||||||
auto& queue = dir == Direction::Host ? host_queue : adsp_queue;
|
auto& queue = dir == Direction::Host ? host_queue : adsp_queue;
|
||||||
return queue.PopWait(stop_token);
|
MailboxMessage t;
|
||||||
|
if (block) {
|
||||||
|
queue.PopWait(t);
|
||||||
|
} else {
|
||||||
|
queue.TryPop(t);
|
||||||
|
}
|
||||||
|
return t;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Reset() {
|
void Reset() {
|
||||||
id = AppMailboxId::Invalid;
|
id = AppMailboxId::Invalid;
|
||||||
u32 t{};
|
MailboxMessage t;
|
||||||
while (host_queue.TryPop(t)) {
|
while (host_queue.TryPop(t)) {
|
||||||
}
|
}
|
||||||
while (adsp_queue.TryPop(t)) {
|
while (adsp_queue.TryPop(t)) {
|
||||||
@ -53,8 +62,8 @@ public:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
AppMailboxId id{0};
|
AppMailboxId id{0};
|
||||||
Common::SPSCQueue<u32> host_queue;
|
Common::SPSCQueue<MailboxMessage> host_queue;
|
||||||
Common::SPSCQueue<u32> adsp_queue;
|
Common::SPSCQueue<MailboxMessage> adsp_queue;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace AudioCore::ADSP
|
} // namespace AudioCore::ADSP
|
||||||
|
@ -1,179 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#include "audio_core/opus/decoder.h"
|
|
||||||
#include "audio_core/opus/hardware_opus.h"
|
|
||||||
#include "audio_core/opus/parameters.h"
|
|
||||||
#include "common/alignment.h"
|
|
||||||
#include "common/swap.h"
|
|
||||||
#include "core/core.h"
|
|
||||||
|
|
||||||
namespace AudioCore::OpusDecoder {
|
|
||||||
using namespace Service::Audio;
|
|
||||||
namespace {
|
|
||||||
OpusPacketHeader ReverseHeader(OpusPacketHeader header) {
|
|
||||||
OpusPacketHeader out;
|
|
||||||
out.size = Common::swap32(header.size);
|
|
||||||
out.final_range = Common::swap32(header.final_range);
|
|
||||||
return out;
|
|
||||||
}
|
|
||||||
} // namespace
|
|
||||||
|
|
||||||
OpusDecoder::OpusDecoder(Core::System& system_, HardwareOpus& hardware_opus_)
|
|
||||||
: system{system_}, hardware_opus{hardware_opus_} {}
|
|
||||||
|
|
||||||
OpusDecoder::~OpusDecoder() {
|
|
||||||
if (decode_object_initialized) {
|
|
||||||
hardware_opus.ShutdownDecodeObject(shared_buffer.get(), shared_buffer_size);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Result OpusDecoder::Initialize(OpusParametersEx& params, Kernel::KTransferMemory* transfer_memory,
|
|
||||||
u64 transfer_memory_size) {
|
|
||||||
auto frame_size{params.use_large_frame_size ? 5760 : 1920};
|
|
||||||
shared_buffer_size = transfer_memory_size;
|
|
||||||
shared_buffer = std::make_unique<u8[]>(shared_buffer_size);
|
|
||||||
shared_memory_mapped = true;
|
|
||||||
|
|
||||||
buffer_size =
|
|
||||||
Common::AlignUp((frame_size * params.channel_count) / (48'000 / params.sample_rate), 16);
|
|
||||||
|
|
||||||
out_data = {shared_buffer.get() + shared_buffer_size - buffer_size, buffer_size};
|
|
||||||
size_t in_data_size{0x600u};
|
|
||||||
in_data = {out_data.data() - in_data_size, in_data_size};
|
|
||||||
|
|
||||||
ON_RESULT_FAILURE {
|
|
||||||
if (shared_memory_mapped) {
|
|
||||||
shared_memory_mapped = false;
|
|
||||||
ASSERT(R_SUCCEEDED(hardware_opus.UnmapMemory(shared_buffer.get(), shared_buffer_size)));
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
R_TRY(hardware_opus.InitializeDecodeObject(params.sample_rate, params.channel_count,
|
|
||||||
shared_buffer.get(), shared_buffer_size));
|
|
||||||
|
|
||||||
sample_rate = params.sample_rate;
|
|
||||||
channel_count = params.channel_count;
|
|
||||||
use_large_frame_size = params.use_large_frame_size;
|
|
||||||
decode_object_initialized = true;
|
|
||||||
R_SUCCEED();
|
|
||||||
}
|
|
||||||
|
|
||||||
Result OpusDecoder::Initialize(OpusMultiStreamParametersEx& params,
|
|
||||||
Kernel::KTransferMemory* transfer_memory, u64 transfer_memory_size) {
|
|
||||||
auto frame_size{params.use_large_frame_size ? 5760 : 1920};
|
|
||||||
shared_buffer_size = transfer_memory_size;
|
|
||||||
shared_buffer = std::make_unique<u8[]>(shared_buffer_size);
|
|
||||||
shared_memory_mapped = true;
|
|
||||||
|
|
||||||
buffer_size =
|
|
||||||
Common::AlignUp((frame_size * params.channel_count) / (48'000 / params.sample_rate), 16);
|
|
||||||
|
|
||||||
out_data = {shared_buffer.get() + shared_buffer_size - buffer_size, buffer_size};
|
|
||||||
size_t in_data_size{Common::AlignUp(1500ull * params.total_stream_count, 64u)};
|
|
||||||
in_data = {out_data.data() - in_data_size, in_data_size};
|
|
||||||
|
|
||||||
ON_RESULT_FAILURE {
|
|
||||||
if (shared_memory_mapped) {
|
|
||||||
shared_memory_mapped = false;
|
|
||||||
ASSERT(R_SUCCEEDED(hardware_opus.UnmapMemory(shared_buffer.get(), shared_buffer_size)));
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
R_TRY(hardware_opus.InitializeMultiStreamDecodeObject(
|
|
||||||
params.sample_rate, params.channel_count, params.total_stream_count,
|
|
||||||
params.stereo_stream_count, params.mappings.data(), shared_buffer.get(),
|
|
||||||
shared_buffer_size));
|
|
||||||
|
|
||||||
sample_rate = params.sample_rate;
|
|
||||||
channel_count = params.channel_count;
|
|
||||||
total_stream_count = params.total_stream_count;
|
|
||||||
stereo_stream_count = params.stereo_stream_count;
|
|
||||||
use_large_frame_size = params.use_large_frame_size;
|
|
||||||
decode_object_initialized = true;
|
|
||||||
R_SUCCEED();
|
|
||||||
}
|
|
||||||
|
|
||||||
Result OpusDecoder::DecodeInterleaved(u32* out_data_size, u64* out_time_taken,
|
|
||||||
u32* out_sample_count, std::span<const u8> input_data,
|
|
||||||
std::span<u8> output_data, bool reset) {
|
|
||||||
u32 out_samples;
|
|
||||||
u64 time_taken{};
|
|
||||||
|
|
||||||
R_UNLESS(input_data.size_bytes() > sizeof(OpusPacketHeader), ResultInputDataTooSmall);
|
|
||||||
|
|
||||||
auto* header_p{reinterpret_cast<const OpusPacketHeader*>(input_data.data())};
|
|
||||||
OpusPacketHeader header{ReverseHeader(*header_p)};
|
|
||||||
|
|
||||||
R_UNLESS(in_data.size_bytes() >= header.size &&
|
|
||||||
header.size + sizeof(OpusPacketHeader) <= input_data.size_bytes(),
|
|
||||||
ResultBufferTooSmall);
|
|
||||||
|
|
||||||
if (!shared_memory_mapped) {
|
|
||||||
R_TRY(hardware_opus.MapMemory(shared_buffer.get(), shared_buffer_size));
|
|
||||||
shared_memory_mapped = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::memcpy(in_data.data(), input_data.data() + sizeof(OpusPacketHeader), header.size);
|
|
||||||
|
|
||||||
R_TRY(hardware_opus.DecodeInterleaved(out_samples, out_data.data(), out_data.size_bytes(),
|
|
||||||
channel_count, in_data.data(), header.size,
|
|
||||||
shared_buffer.get(), time_taken, reset));
|
|
||||||
|
|
||||||
std::memcpy(output_data.data(), out_data.data(), out_samples * channel_count * sizeof(s16));
|
|
||||||
|
|
||||||
*out_data_size = header.size + sizeof(OpusPacketHeader);
|
|
||||||
*out_sample_count = out_samples;
|
|
||||||
if (out_time_taken) {
|
|
||||||
*out_time_taken = time_taken / 1000;
|
|
||||||
}
|
|
||||||
R_SUCCEED();
|
|
||||||
}
|
|
||||||
|
|
||||||
Result OpusDecoder::SetContext([[maybe_unused]] std::span<const u8> context) {
|
|
||||||
R_SUCCEED_IF(shared_memory_mapped);
|
|
||||||
shared_memory_mapped = true;
|
|
||||||
R_RETURN(hardware_opus.MapMemory(shared_buffer.get(), shared_buffer_size));
|
|
||||||
}
|
|
||||||
|
|
||||||
Result OpusDecoder::DecodeInterleavedForMultiStream(u32* out_data_size, u64* out_time_taken,
|
|
||||||
u32* out_sample_count,
|
|
||||||
std::span<const u8> input_data,
|
|
||||||
std::span<u8> output_data, bool reset) {
|
|
||||||
u32 out_samples;
|
|
||||||
u64 time_taken{};
|
|
||||||
|
|
||||||
R_UNLESS(input_data.size_bytes() > sizeof(OpusPacketHeader), ResultInputDataTooSmall);
|
|
||||||
|
|
||||||
auto* header_p{reinterpret_cast<const OpusPacketHeader*>(input_data.data())};
|
|
||||||
OpusPacketHeader header{ReverseHeader(*header_p)};
|
|
||||||
|
|
||||||
LOG_ERROR(Service_Audio, "header size 0x{:X} input data size 0x{:X} in_data size 0x{:X}",
|
|
||||||
header.size, input_data.size_bytes(), in_data.size_bytes());
|
|
||||||
|
|
||||||
R_UNLESS(in_data.size_bytes() >= header.size &&
|
|
||||||
header.size + sizeof(OpusPacketHeader) <= input_data.size_bytes(),
|
|
||||||
ResultBufferTooSmall);
|
|
||||||
|
|
||||||
if (!shared_memory_mapped) {
|
|
||||||
R_TRY(hardware_opus.MapMemory(shared_buffer.get(), shared_buffer_size));
|
|
||||||
shared_memory_mapped = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::memcpy(in_data.data(), input_data.data() + sizeof(OpusPacketHeader), header.size);
|
|
||||||
|
|
||||||
R_TRY(hardware_opus.DecodeInterleavedForMultiStream(
|
|
||||||
out_samples, out_data.data(), out_data.size_bytes(), channel_count, in_data.data(),
|
|
||||||
header.size, shared_buffer.get(), time_taken, reset));
|
|
||||||
|
|
||||||
std::memcpy(output_data.data(), out_data.data(), out_samples * channel_count * sizeof(s16));
|
|
||||||
|
|
||||||
*out_data_size = header.size + sizeof(OpusPacketHeader);
|
|
||||||
*out_sample_count = out_samples;
|
|
||||||
if (out_time_taken) {
|
|
||||||
*out_time_taken = time_taken / 1000;
|
|
||||||
}
|
|
||||||
R_SUCCEED();
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace AudioCore::OpusDecoder
|
|
@ -1,53 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <span>
|
|
||||||
|
|
||||||
#include "audio_core/opus/parameters.h"
|
|
||||||
#include "common/common_types.h"
|
|
||||||
#include "core/hle/kernel/k_transfer_memory.h"
|
|
||||||
#include "core/hle/service/audio/errors.h"
|
|
||||||
|
|
||||||
namespace Core {
|
|
||||||
class System;
|
|
||||||
}
|
|
||||||
|
|
||||||
namespace AudioCore::OpusDecoder {
|
|
||||||
class HardwareOpus;
|
|
||||||
|
|
||||||
class OpusDecoder {
|
|
||||||
public:
|
|
||||||
explicit OpusDecoder(Core::System& system, HardwareOpus& hardware_opus_);
|
|
||||||
~OpusDecoder();
|
|
||||||
|
|
||||||
Result Initialize(OpusParametersEx& params, Kernel::KTransferMemory* transfer_memory,
|
|
||||||
u64 transfer_memory_size);
|
|
||||||
Result Initialize(OpusMultiStreamParametersEx& params, Kernel::KTransferMemory* transfer_memory,
|
|
||||||
u64 transfer_memory_size);
|
|
||||||
Result DecodeInterleaved(u32* out_data_size, u64* out_time_taken, u32* out_sample_count,
|
|
||||||
std::span<const u8> input_data, std::span<u8> output_data, bool reset);
|
|
||||||
Result SetContext([[maybe_unused]] std::span<const u8> context);
|
|
||||||
Result DecodeInterleavedForMultiStream(u32* out_data_size, u64* out_time_taken,
|
|
||||||
u32* out_sample_count, std::span<const u8> input_data,
|
|
||||||
std::span<u8> output_data, bool reset);
|
|
||||||
|
|
||||||
private:
|
|
||||||
Core::System& system;
|
|
||||||
HardwareOpus& hardware_opus;
|
|
||||||
std::unique_ptr<u8[]> shared_buffer{};
|
|
||||||
u64 shared_buffer_size;
|
|
||||||
std::span<u8> in_data{};
|
|
||||||
std::span<u8> out_data{};
|
|
||||||
u64 buffer_size{};
|
|
||||||
s32 sample_rate{};
|
|
||||||
s32 channel_count{};
|
|
||||||
bool use_large_frame_size{false};
|
|
||||||
s32 total_stream_count{};
|
|
||||||
s32 stereo_stream_count{};
|
|
||||||
bool shared_memory_mapped{false};
|
|
||||||
bool decode_object_initialized{false};
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace AudioCore::OpusDecoder
|
|
@ -1,102 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#include "audio_core/adsp/apps/opus/opus_decoder.h"
|
|
||||||
#include "audio_core/opus/decoder_manager.h"
|
|
||||||
#include "common/alignment.h"
|
|
||||||
#include "core/core.h"
|
|
||||||
|
|
||||||
namespace AudioCore::OpusDecoder {
|
|
||||||
using namespace Service::Audio;
|
|
||||||
|
|
||||||
namespace {
|
|
||||||
bool IsValidChannelCount(u32 channel_count) {
|
|
||||||
return channel_count == 1 || channel_count == 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool IsValidMultiStreamChannelCount(u32 channel_count) {
|
|
||||||
return channel_count > 0 && channel_count <= OpusStreamCountMax;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool IsValidSampleRate(u32 sample_rate) {
|
|
||||||
return sample_rate == 8'000 || sample_rate == 12'000 || sample_rate == 16'000 ||
|
|
||||||
sample_rate == 24'000 || sample_rate == 48'000;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool IsValidStreamCount(u32 channel_count, u32 total_stream_count, u32 stereo_stream_count) {
|
|
||||||
return total_stream_count > 0 && stereo_stream_count > 0 &&
|
|
||||||
stereo_stream_count <= total_stream_count &&
|
|
||||||
total_stream_count + stereo_stream_count <= channel_count;
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace
|
|
||||||
|
|
||||||
OpusDecoderManager::OpusDecoderManager(Core::System& system_)
|
|
||||||
: system{system_}, hardware_opus{system} {
|
|
||||||
for (u32 i = 0; i < MaxChannels; i++) {
|
|
||||||
required_workbuffer_sizes[i] = hardware_opus.GetWorkBufferSize(1 + i);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Result OpusDecoderManager::GetWorkBufferSize(OpusParameters& params, u64& out_size) {
|
|
||||||
OpusParametersEx ex{
|
|
||||||
.sample_rate = params.sample_rate,
|
|
||||||
.channel_count = params.channel_count,
|
|
||||||
.use_large_frame_size = false,
|
|
||||||
};
|
|
||||||
R_RETURN(GetWorkBufferSizeExEx(ex, out_size));
|
|
||||||
}
|
|
||||||
|
|
||||||
Result OpusDecoderManager::GetWorkBufferSizeEx(OpusParametersEx& params, u64& out_size) {
|
|
||||||
R_RETURN(GetWorkBufferSizeExEx(params, out_size));
|
|
||||||
}
|
|
||||||
|
|
||||||
Result OpusDecoderManager::GetWorkBufferSizeExEx(OpusParametersEx& params, u64& out_size) {
|
|
||||||
R_UNLESS(IsValidChannelCount(params.channel_count), ResultInvalidOpusChannelCount);
|
|
||||||
R_UNLESS(IsValidSampleRate(params.sample_rate), ResultInvalidOpusSampleRate);
|
|
||||||
|
|
||||||
auto work_buffer_size{required_workbuffer_sizes[params.channel_count - 1]};
|
|
||||||
auto frame_size{params.use_large_frame_size ? 5760 : 1920};
|
|
||||||
work_buffer_size +=
|
|
||||||
Common::AlignUp((frame_size * params.channel_count) / (48'000 / params.sample_rate), 64);
|
|
||||||
out_size = work_buffer_size + 0x600;
|
|
||||||
R_SUCCEED();
|
|
||||||
}
|
|
||||||
|
|
||||||
Result OpusDecoderManager::GetWorkBufferSizeForMultiStream(OpusMultiStreamParameters& params,
|
|
||||||
u64& out_size) {
|
|
||||||
OpusMultiStreamParametersEx ex{
|
|
||||||
.sample_rate = params.sample_rate,
|
|
||||||
.channel_count = params.channel_count,
|
|
||||||
.total_stream_count = params.total_stream_count,
|
|
||||||
.stereo_stream_count = params.stereo_stream_count,
|
|
||||||
.use_large_frame_size = false,
|
|
||||||
.mappings = {},
|
|
||||||
};
|
|
||||||
R_RETURN(GetWorkBufferSizeForMultiStreamExEx(ex, out_size));
|
|
||||||
}
|
|
||||||
|
|
||||||
Result OpusDecoderManager::GetWorkBufferSizeForMultiStreamEx(OpusMultiStreamParametersEx& params,
|
|
||||||
u64& out_size) {
|
|
||||||
R_RETURN(GetWorkBufferSizeForMultiStreamExEx(params, out_size));
|
|
||||||
}
|
|
||||||
|
|
||||||
Result OpusDecoderManager::GetWorkBufferSizeForMultiStreamExEx(OpusMultiStreamParametersEx& params,
|
|
||||||
u64& out_size) {
|
|
||||||
R_UNLESS(IsValidMultiStreamChannelCount(params.channel_count), ResultInvalidOpusChannelCount);
|
|
||||||
R_UNLESS(IsValidSampleRate(params.sample_rate), ResultInvalidOpusSampleRate);
|
|
||||||
R_UNLESS(IsValidStreamCount(params.channel_count, params.total_stream_count,
|
|
||||||
params.stereo_stream_count),
|
|
||||||
ResultInvalidOpusSampleRate);
|
|
||||||
|
|
||||||
auto work_buffer_size{hardware_opus.GetWorkBufferSizeForMultiStream(
|
|
||||||
params.total_stream_count, params.stereo_stream_count)};
|
|
||||||
auto frame_size{params.use_large_frame_size ? 5760 : 1920};
|
|
||||||
work_buffer_size += Common::AlignUp(1500 * params.total_stream_count, 64);
|
|
||||||
work_buffer_size +=
|
|
||||||
Common::AlignUp((frame_size * params.channel_count) / (48'000 / params.sample_rate), 64);
|
|
||||||
out_size = work_buffer_size;
|
|
||||||
R_SUCCEED();
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace AudioCore::OpusDecoder
|
|
@ -1,38 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "audio_core/opus/hardware_opus.h"
|
|
||||||
#include "audio_core/opus/parameters.h"
|
|
||||||
#include "common/common_types.h"
|
|
||||||
#include "core/hle/service/audio/errors.h"
|
|
||||||
|
|
||||||
namespace Core {
|
|
||||||
class System;
|
|
||||||
}
|
|
||||||
|
|
||||||
namespace AudioCore::OpusDecoder {
|
|
||||||
|
|
||||||
class OpusDecoderManager {
|
|
||||||
public:
|
|
||||||
OpusDecoderManager(Core::System& system);
|
|
||||||
|
|
||||||
HardwareOpus& GetHardwareOpus() {
|
|
||||||
return hardware_opus;
|
|
||||||
}
|
|
||||||
|
|
||||||
Result GetWorkBufferSize(OpusParameters& params, u64& out_size);
|
|
||||||
Result GetWorkBufferSizeEx(OpusParametersEx& params, u64& out_size);
|
|
||||||
Result GetWorkBufferSizeExEx(OpusParametersEx& params, u64& out_size);
|
|
||||||
Result GetWorkBufferSizeForMultiStream(OpusMultiStreamParameters& params, u64& out_size);
|
|
||||||
Result GetWorkBufferSizeForMultiStreamEx(OpusMultiStreamParametersEx& params, u64& out_size);
|
|
||||||
Result GetWorkBufferSizeForMultiStreamExEx(OpusMultiStreamParametersEx& params, u64& out_size);
|
|
||||||
|
|
||||||
private:
|
|
||||||
Core::System& system;
|
|
||||||
HardwareOpus hardware_opus;
|
|
||||||
std::array<u64, MaxChannels> required_workbuffer_sizes{};
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace AudioCore::OpusDecoder
|
|
@ -1,241 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#include <array>
|
|
||||||
|
|
||||||
#include "audio_core/audio_core.h"
|
|
||||||
#include "audio_core/opus/hardware_opus.h"
|
|
||||||
#include "core/core.h"
|
|
||||||
|
|
||||||
namespace AudioCore::OpusDecoder {
|
|
||||||
namespace {
|
|
||||||
using namespace Service::Audio;
|
|
||||||
|
|
||||||
static constexpr Result ResultCodeFromLibOpusErrorCode(u64 error_code) {
|
|
||||||
s32 error{static_cast<s32>(error_code)};
|
|
||||||
ASSERT(error <= OPUS_OK);
|
|
||||||
switch (error) {
|
|
||||||
case OPUS_ALLOC_FAIL:
|
|
||||||
R_THROW(ResultLibOpusAllocFail);
|
|
||||||
case OPUS_INVALID_STATE:
|
|
||||||
R_THROW(ResultLibOpusInvalidState);
|
|
||||||
case OPUS_UNIMPLEMENTED:
|
|
||||||
R_THROW(ResultLibOpusUnimplemented);
|
|
||||||
case OPUS_INVALID_PACKET:
|
|
||||||
R_THROW(ResultLibOpusInvalidPacket);
|
|
||||||
case OPUS_INTERNAL_ERROR:
|
|
||||||
R_THROW(ResultLibOpusInternalError);
|
|
||||||
case OPUS_BUFFER_TOO_SMALL:
|
|
||||||
R_THROW(ResultBufferTooSmall);
|
|
||||||
case OPUS_BAD_ARG:
|
|
||||||
R_THROW(ResultLibOpusBadArg);
|
|
||||||
case OPUS_OK:
|
|
||||||
R_RETURN(ResultSuccess);
|
|
||||||
}
|
|
||||||
UNREACHABLE();
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace
|
|
||||||
|
|
||||||
HardwareOpus::HardwareOpus(Core::System& system_)
|
|
||||||
: system{system_}, opus_decoder{system.AudioCore().ADSP().OpusDecoder()} {
|
|
||||||
opus_decoder.SetSharedMemory(shared_memory);
|
|
||||||
}
|
|
||||||
|
|
||||||
u64 HardwareOpus::GetWorkBufferSize(u32 channel) {
|
|
||||||
if (!opus_decoder.IsRunning()) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
std::scoped_lock l{mutex};
|
|
||||||
shared_memory.host_send_data[0] = channel;
|
|
||||||
opus_decoder.Send(ADSP::Direction::DSP, ADSP::OpusDecoder::Message::GetWorkBufferSize);
|
|
||||||
auto msg = opus_decoder.Receive(ADSP::Direction::Host);
|
|
||||||
if (msg != ADSP::OpusDecoder::Message::GetWorkBufferSizeOK) {
|
|
||||||
LOG_ERROR(Service_Audio, "OpusDecoder returned invalid message. Expected {} got {}",
|
|
||||||
ADSP::OpusDecoder::Message::GetWorkBufferSizeOK, msg);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
return shared_memory.dsp_return_data[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
u64 HardwareOpus::GetWorkBufferSizeForMultiStream(u32 total_stream_count, u32 stereo_stream_count) {
|
|
||||||
std::scoped_lock l{mutex};
|
|
||||||
shared_memory.host_send_data[0] = total_stream_count;
|
|
||||||
shared_memory.host_send_data[1] = stereo_stream_count;
|
|
||||||
opus_decoder.Send(ADSP::Direction::DSP,
|
|
||||||
ADSP::OpusDecoder::Message::GetWorkBufferSizeForMultiStream);
|
|
||||||
auto msg = opus_decoder.Receive(ADSP::Direction::Host);
|
|
||||||
if (msg != ADSP::OpusDecoder::Message::GetWorkBufferSizeForMultiStreamOK) {
|
|
||||||
LOG_ERROR(Service_Audio, "OpusDecoder returned invalid message. Expected {} got {}",
|
|
||||||
ADSP::OpusDecoder::Message::GetWorkBufferSizeForMultiStreamOK, msg);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
return shared_memory.dsp_return_data[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
Result HardwareOpus::InitializeDecodeObject(u32 sample_rate, u32 channel_count, void* buffer,
|
|
||||||
u64 buffer_size) {
|
|
||||||
std::scoped_lock l{mutex};
|
|
||||||
shared_memory.host_send_data[0] = (u64)buffer;
|
|
||||||
shared_memory.host_send_data[1] = buffer_size;
|
|
||||||
shared_memory.host_send_data[2] = sample_rate;
|
|
||||||
shared_memory.host_send_data[3] = channel_count;
|
|
||||||
|
|
||||||
opus_decoder.Send(ADSP::Direction::DSP, ADSP::OpusDecoder::Message::InitializeDecodeObject);
|
|
||||||
auto msg = opus_decoder.Receive(ADSP::Direction::Host);
|
|
||||||
if (msg != ADSP::OpusDecoder::Message::InitializeDecodeObjectOK) {
|
|
||||||
LOG_ERROR(Service_Audio, "OpusDecoder returned invalid message. Expected {} got {}",
|
|
||||||
ADSP::OpusDecoder::Message::InitializeDecodeObjectOK, msg);
|
|
||||||
R_THROW(ResultInvalidOpusDSPReturnCode);
|
|
||||||
}
|
|
||||||
|
|
||||||
R_RETURN(ResultCodeFromLibOpusErrorCode(shared_memory.dsp_return_data[0]));
|
|
||||||
}
|
|
||||||
|
|
||||||
Result HardwareOpus::InitializeMultiStreamDecodeObject(u32 sample_rate, u32 channel_count,
|
|
||||||
u32 total_stream_count,
|
|
||||||
u32 stereo_stream_count, void* mappings,
|
|
||||||
void* buffer, u64 buffer_size) {
|
|
||||||
std::scoped_lock l{mutex};
|
|
||||||
shared_memory.host_send_data[0] = (u64)buffer;
|
|
||||||
shared_memory.host_send_data[1] = buffer_size;
|
|
||||||
shared_memory.host_send_data[2] = sample_rate;
|
|
||||||
shared_memory.host_send_data[3] = channel_count;
|
|
||||||
shared_memory.host_send_data[4] = total_stream_count;
|
|
||||||
shared_memory.host_send_data[5] = stereo_stream_count;
|
|
||||||
|
|
||||||
ASSERT(channel_count <= MaxChannels);
|
|
||||||
std::memcpy(shared_memory.channel_mapping.data(), mappings, channel_count * sizeof(u8));
|
|
||||||
|
|
||||||
opus_decoder.Send(ADSP::Direction::DSP,
|
|
||||||
ADSP::OpusDecoder::Message::InitializeMultiStreamDecodeObject);
|
|
||||||
auto msg = opus_decoder.Receive(ADSP::Direction::Host);
|
|
||||||
if (msg != ADSP::OpusDecoder::Message::InitializeMultiStreamDecodeObjectOK) {
|
|
||||||
LOG_ERROR(Service_Audio, "OpusDecoder returned invalid message. Expected {} got {}",
|
|
||||||
ADSP::OpusDecoder::Message::InitializeMultiStreamDecodeObjectOK, msg);
|
|
||||||
R_THROW(ResultInvalidOpusDSPReturnCode);
|
|
||||||
}
|
|
||||||
|
|
||||||
R_RETURN(ResultCodeFromLibOpusErrorCode(shared_memory.dsp_return_data[0]));
|
|
||||||
}
|
|
||||||
|
|
||||||
Result HardwareOpus::ShutdownDecodeObject(void* buffer, u64 buffer_size) {
|
|
||||||
std::scoped_lock l{mutex};
|
|
||||||
shared_memory.host_send_data[0] = (u64)buffer;
|
|
||||||
shared_memory.host_send_data[1] = buffer_size;
|
|
||||||
|
|
||||||
opus_decoder.Send(ADSP::Direction::DSP, ADSP::OpusDecoder::Message::ShutdownDecodeObject);
|
|
||||||
auto msg = opus_decoder.Receive(ADSP::Direction::Host);
|
|
||||||
ASSERT_MSG(msg == ADSP::OpusDecoder::Message::ShutdownDecodeObjectOK,
|
|
||||||
"Expected Opus shutdown code {}, got {}",
|
|
||||||
ADSP::OpusDecoder::Message::ShutdownDecodeObjectOK, msg);
|
|
||||||
|
|
||||||
R_RETURN(ResultCodeFromLibOpusErrorCode(shared_memory.dsp_return_data[0]));
|
|
||||||
}
|
|
||||||
|
|
||||||
Result HardwareOpus::ShutdownMultiStreamDecodeObject(void* buffer, u64 buffer_size) {
|
|
||||||
std::scoped_lock l{mutex};
|
|
||||||
shared_memory.host_send_data[0] = (u64)buffer;
|
|
||||||
shared_memory.host_send_data[1] = buffer_size;
|
|
||||||
|
|
||||||
opus_decoder.Send(ADSP::Direction::DSP,
|
|
||||||
ADSP::OpusDecoder::Message::ShutdownMultiStreamDecodeObject);
|
|
||||||
auto msg = opus_decoder.Receive(ADSP::Direction::Host);
|
|
||||||
ASSERT_MSG(msg == ADSP::OpusDecoder::Message::ShutdownMultiStreamDecodeObjectOK,
|
|
||||||
"Expected Opus shutdown code {}, got {}",
|
|
||||||
ADSP::OpusDecoder::Message::ShutdownMultiStreamDecodeObjectOK, msg);
|
|
||||||
|
|
||||||
R_RETURN(ResultCodeFromLibOpusErrorCode(shared_memory.dsp_return_data[0]));
|
|
||||||
}
|
|
||||||
|
|
||||||
Result HardwareOpus::DecodeInterleaved(u32& out_sample_count, void* output_data,
|
|
||||||
u64 output_data_size, u32 channel_count, void* input_data,
|
|
||||||
u64 input_data_size, void* buffer, u64& out_time_taken,
|
|
||||||
bool reset) {
|
|
||||||
std::scoped_lock l{mutex};
|
|
||||||
shared_memory.host_send_data[0] = (u64)buffer;
|
|
||||||
shared_memory.host_send_data[1] = (u64)input_data;
|
|
||||||
shared_memory.host_send_data[2] = input_data_size;
|
|
||||||
shared_memory.host_send_data[3] = (u64)output_data;
|
|
||||||
shared_memory.host_send_data[4] = output_data_size;
|
|
||||||
shared_memory.host_send_data[5] = 0;
|
|
||||||
shared_memory.host_send_data[6] = reset;
|
|
||||||
|
|
||||||
opus_decoder.Send(ADSP::Direction::DSP, ADSP::OpusDecoder::Message::DecodeInterleaved);
|
|
||||||
auto msg = opus_decoder.Receive(ADSP::Direction::Host);
|
|
||||||
if (msg != ADSP::OpusDecoder::Message::DecodeInterleavedOK) {
|
|
||||||
LOG_ERROR(Service_Audio, "OpusDecoder returned invalid message. Expected {} got {}",
|
|
||||||
ADSP::OpusDecoder::Message::DecodeInterleavedOK, msg);
|
|
||||||
R_THROW(ResultInvalidOpusDSPReturnCode);
|
|
||||||
}
|
|
||||||
|
|
||||||
auto error_code{static_cast<s32>(shared_memory.dsp_return_data[0])};
|
|
||||||
if (error_code == OPUS_OK) {
|
|
||||||
out_sample_count = static_cast<u32>(shared_memory.dsp_return_data[1]);
|
|
||||||
out_time_taken = 1000 * shared_memory.dsp_return_data[2];
|
|
||||||
}
|
|
||||||
R_RETURN(ResultCodeFromLibOpusErrorCode(error_code));
|
|
||||||
}
|
|
||||||
|
|
||||||
Result HardwareOpus::DecodeInterleavedForMultiStream(u32& out_sample_count, void* output_data,
|
|
||||||
u64 output_data_size, u32 channel_count,
|
|
||||||
void* input_data, u64 input_data_size,
|
|
||||||
void* buffer, u64& out_time_taken,
|
|
||||||
bool reset) {
|
|
||||||
std::scoped_lock l{mutex};
|
|
||||||
shared_memory.host_send_data[0] = (u64)buffer;
|
|
||||||
shared_memory.host_send_data[1] = (u64)input_data;
|
|
||||||
shared_memory.host_send_data[2] = input_data_size;
|
|
||||||
shared_memory.host_send_data[3] = (u64)output_data;
|
|
||||||
shared_memory.host_send_data[4] = output_data_size;
|
|
||||||
shared_memory.host_send_data[5] = 0;
|
|
||||||
shared_memory.host_send_data[6] = reset;
|
|
||||||
|
|
||||||
opus_decoder.Send(ADSP::Direction::DSP,
|
|
||||||
ADSP::OpusDecoder::Message::DecodeInterleavedForMultiStream);
|
|
||||||
auto msg = opus_decoder.Receive(ADSP::Direction::Host);
|
|
||||||
if (msg != ADSP::OpusDecoder::Message::DecodeInterleavedForMultiStreamOK) {
|
|
||||||
LOG_ERROR(Service_Audio, "OpusDecoder returned invalid message. Expected {} got {}",
|
|
||||||
ADSP::OpusDecoder::Message::DecodeInterleavedForMultiStreamOK, msg);
|
|
||||||
R_THROW(ResultInvalidOpusDSPReturnCode);
|
|
||||||
}
|
|
||||||
|
|
||||||
auto error_code{static_cast<s32>(shared_memory.dsp_return_data[0])};
|
|
||||||
if (error_code == OPUS_OK) {
|
|
||||||
out_sample_count = static_cast<u32>(shared_memory.dsp_return_data[1]);
|
|
||||||
out_time_taken = 1000 * shared_memory.dsp_return_data[2];
|
|
||||||
}
|
|
||||||
R_RETURN(ResultCodeFromLibOpusErrorCode(error_code));
|
|
||||||
}
|
|
||||||
|
|
||||||
Result HardwareOpus::MapMemory(void* buffer, u64 buffer_size) {
|
|
||||||
std::scoped_lock l{mutex};
|
|
||||||
shared_memory.host_send_data[0] = (u64)buffer;
|
|
||||||
shared_memory.host_send_data[1] = buffer_size;
|
|
||||||
|
|
||||||
opus_decoder.Send(ADSP::Direction::DSP, ADSP::OpusDecoder::Message::MapMemory);
|
|
||||||
auto msg = opus_decoder.Receive(ADSP::Direction::Host);
|
|
||||||
if (msg != ADSP::OpusDecoder::Message::MapMemoryOK) {
|
|
||||||
LOG_ERROR(Service_Audio, "OpusDecoder returned invalid message. Expected {} got {}",
|
|
||||||
ADSP::OpusDecoder::Message::MapMemoryOK, msg);
|
|
||||||
R_THROW(ResultInvalidOpusDSPReturnCode);
|
|
||||||
}
|
|
||||||
R_SUCCEED();
|
|
||||||
}
|
|
||||||
|
|
||||||
Result HardwareOpus::UnmapMemory(void* buffer, u64 buffer_size) {
|
|
||||||
std::scoped_lock l{mutex};
|
|
||||||
shared_memory.host_send_data[0] = (u64)buffer;
|
|
||||||
shared_memory.host_send_data[1] = buffer_size;
|
|
||||||
|
|
||||||
opus_decoder.Send(ADSP::Direction::DSP, ADSP::OpusDecoder::Message::UnmapMemory);
|
|
||||||
auto msg = opus_decoder.Receive(ADSP::Direction::Host);
|
|
||||||
if (msg != ADSP::OpusDecoder::Message::UnmapMemoryOK) {
|
|
||||||
LOG_ERROR(Service_Audio, "OpusDecoder returned invalid message. Expected {} got {}",
|
|
||||||
ADSP::OpusDecoder::Message::UnmapMemoryOK, msg);
|
|
||||||
R_THROW(ResultInvalidOpusDSPReturnCode);
|
|
||||||
}
|
|
||||||
R_SUCCEED();
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace AudioCore::OpusDecoder
|
|
@ -1,45 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <mutex>
|
|
||||||
#include <opus.h>
|
|
||||||
|
|
||||||
#include "audio_core/adsp/apps/opus/opus_decoder.h"
|
|
||||||
#include "audio_core/adsp/apps/opus/shared_memory.h"
|
|
||||||
#include "audio_core/adsp/mailbox.h"
|
|
||||||
#include "core/hle/service/audio/errors.h"
|
|
||||||
|
|
||||||
namespace AudioCore::OpusDecoder {
|
|
||||||
class HardwareOpus {
|
|
||||||
public:
|
|
||||||
HardwareOpus(Core::System& system);
|
|
||||||
|
|
||||||
u64 GetWorkBufferSize(u32 channel);
|
|
||||||
u64 GetWorkBufferSizeForMultiStream(u32 total_stream_count, u32 stereo_stream_count);
|
|
||||||
|
|
||||||
Result InitializeDecodeObject(u32 sample_rate, u32 channel_count, void* buffer,
|
|
||||||
u64 buffer_size);
|
|
||||||
Result InitializeMultiStreamDecodeObject(u32 sample_rate, u32 channel_count,
|
|
||||||
u32 totaL_stream_count, u32 stereo_stream_count,
|
|
||||||
void* mappings, void* buffer, u64 buffer_size);
|
|
||||||
Result ShutdownDecodeObject(void* buffer, u64 buffer_size);
|
|
||||||
Result ShutdownMultiStreamDecodeObject(void* buffer, u64 buffer_size);
|
|
||||||
Result DecodeInterleaved(u32& out_sample_count, void* output_data, u64 output_data_size,
|
|
||||||
u32 channel_count, void* input_data, u64 input_data_size, void* buffer,
|
|
||||||
u64& out_time_taken, bool reset);
|
|
||||||
Result DecodeInterleavedForMultiStream(u32& out_sample_count, void* output_data,
|
|
||||||
u64 output_data_size, u32 channel_count,
|
|
||||||
void* input_data, u64 input_data_size, void* buffer,
|
|
||||||
u64& out_time_taken, bool reset);
|
|
||||||
Result MapMemory(void* buffer, u64 buffer_size);
|
|
||||||
Result UnmapMemory(void* buffer, u64 buffer_size);
|
|
||||||
|
|
||||||
private:
|
|
||||||
Core::System& system;
|
|
||||||
std::mutex mutex;
|
|
||||||
ADSP::OpusDecoder::OpusDecoder& opus_decoder;
|
|
||||||
ADSP::OpusDecoder::SharedMemory shared_memory;
|
|
||||||
};
|
|
||||||
} // namespace AudioCore::OpusDecoder
|
|
@ -1,54 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "common/common_funcs.h"
|
|
||||||
#include "common/common_types.h"
|
|
||||||
|
|
||||||
namespace AudioCore::OpusDecoder {
|
|
||||||
constexpr size_t OpusStreamCountMax = 255;
|
|
||||||
constexpr size_t MaxChannels = 2;
|
|
||||||
|
|
||||||
struct OpusParameters {
|
|
||||||
/* 0x00 */ u32 sample_rate;
|
|
||||||
/* 0x04 */ u32 channel_count;
|
|
||||||
}; // size = 0x8
|
|
||||||
static_assert(sizeof(OpusParameters) == 0x8, "OpusParameters has the wrong size!");
|
|
||||||
|
|
||||||
struct OpusParametersEx {
|
|
||||||
/* 0x00 */ u32 sample_rate;
|
|
||||||
/* 0x04 */ u32 channel_count;
|
|
||||||
/* 0x08 */ bool use_large_frame_size;
|
|
||||||
/* 0x09 */ INSERT_PADDING_BYTES(7);
|
|
||||||
}; // size = 0x10
|
|
||||||
static_assert(sizeof(OpusParametersEx) == 0x10, "OpusParametersEx has the wrong size!");
|
|
||||||
|
|
||||||
struct OpusMultiStreamParameters {
|
|
||||||
/* 0x00 */ u32 sample_rate;
|
|
||||||
/* 0x04 */ u32 channel_count;
|
|
||||||
/* 0x08 */ u32 total_stream_count;
|
|
||||||
/* 0x0C */ u32 stereo_stream_count;
|
|
||||||
/* 0x10 */ std::array<u8, OpusStreamCountMax + 1> mappings;
|
|
||||||
}; // size = 0x110
|
|
||||||
static_assert(sizeof(OpusMultiStreamParameters) == 0x110,
|
|
||||||
"OpusMultiStreamParameters has the wrong size!");
|
|
||||||
|
|
||||||
struct OpusMultiStreamParametersEx {
|
|
||||||
/* 0x00 */ u32 sample_rate;
|
|
||||||
/* 0x04 */ u32 channel_count;
|
|
||||||
/* 0x08 */ u32 total_stream_count;
|
|
||||||
/* 0x0C */ u32 stereo_stream_count;
|
|
||||||
/* 0x10 */ bool use_large_frame_size;
|
|
||||||
/* 0x11 */ INSERT_PADDING_BYTES(7);
|
|
||||||
/* 0x18 */ std::array<u8, OpusStreamCountMax + 1> mappings;
|
|
||||||
}; // size = 0x118
|
|
||||||
static_assert(sizeof(OpusMultiStreamParametersEx) == 0x118,
|
|
||||||
"OpusMultiStreamParametersEx has the wrong size!");
|
|
||||||
|
|
||||||
struct OpusPacketHeader {
|
|
||||||
/* 0x00 */ u32 size;
|
|
||||||
/* 0x04 */ u32 final_range;
|
|
||||||
}; // size = 0x8
|
|
||||||
static_assert(sizeof(OpusPacketHeader) == 0x8, "OpusPacketHeader has the wrong size!");
|
|
||||||
} // namespace AudioCore::OpusDecoder
|
|
@ -27,12 +27,12 @@ u32 CommandProcessingTimeEstimatorVersion1::Estimate(
|
|||||||
|
|
||||||
u32 CommandProcessingTimeEstimatorVersion1::Estimate(
|
u32 CommandProcessingTimeEstimatorVersion1::Estimate(
|
||||||
const AdpcmDataSourceVersion1Command& command) const {
|
const AdpcmDataSourceVersion1Command& command) const {
|
||||||
return static_cast<u32>(command.pitch * 0.46f * 1.2f);
|
return static_cast<u32>(command.pitch * 0.25f * 1.2f);
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 CommandProcessingTimeEstimatorVersion1::Estimate(
|
u32 CommandProcessingTimeEstimatorVersion1::Estimate(
|
||||||
const AdpcmDataSourceVersion2Command& command) const {
|
const AdpcmDataSourceVersion2Command& command) const {
|
||||||
return static_cast<u32>(command.pitch * 0.46f * 1.2f);
|
return static_cast<u32>(command.pitch * 0.25f * 1.2f);
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 CommandProcessingTimeEstimatorVersion1::Estimate(
|
u32 CommandProcessingTimeEstimatorVersion1::Estimate(
|
||||||
|
@ -684,11 +684,11 @@ u64 System::GenerateCommand(std::span<u8> in_command_buffer,
|
|||||||
sink_context, splitter_context, perf_manager};
|
sink_context, splitter_context, perf_manager};
|
||||||
|
|
||||||
voice_context.SortInfo();
|
voice_context.SortInfo();
|
||||||
command_generator.GenerateVoiceCommands();
|
|
||||||
|
|
||||||
const auto start_estimated_time{drop_voice_param *
|
const auto start_estimated_time{drop_voice_param *
|
||||||
static_cast<f32>(command_buffer.estimated_process_time)};
|
static_cast<f32>(command_buffer.estimated_process_time)};
|
||||||
|
|
||||||
|
command_generator.GenerateVoiceCommands();
|
||||||
command_generator.GenerateSubMixCommands();
|
command_generator.GenerateSubMixCommands();
|
||||||
command_generator.GenerateFinalMixCommands();
|
command_generator.GenerateFinalMixCommands();
|
||||||
command_generator.GenerateSinkCommands();
|
command_generator.GenerateSinkCommands();
|
||||||
@ -708,13 +708,11 @@ u64 System::GenerateCommand(std::span<u8> in_command_buffer,
|
|||||||
|
|
||||||
const auto end_estimated_time{drop_voice_param *
|
const auto end_estimated_time{drop_voice_param *
|
||||||
static_cast<f32>(command_buffer.estimated_process_time)};
|
static_cast<f32>(command_buffer.estimated_process_time)};
|
||||||
|
|
||||||
const auto dsp_time_limit{((time_limit_percent / 100.0f) * 2'880'000.0f) *
|
|
||||||
(static_cast<f32>(render_time_limit_percent) / 100.0f)};
|
|
||||||
|
|
||||||
const auto estimated_time{start_estimated_time - end_estimated_time};
|
const auto estimated_time{start_estimated_time - end_estimated_time};
|
||||||
|
|
||||||
const auto time_limit{static_cast<u32>(std::max(dsp_time_limit + estimated_time, 0.0f))};
|
const auto time_limit{static_cast<u32>(
|
||||||
|
estimated_time + (((time_limit_percent / 100.0f) * 2'880'000.0) *
|
||||||
|
(static_cast<f32>(render_time_limit_percent) / 100.0f)))};
|
||||||
num_voices_dropped =
|
num_voices_dropped =
|
||||||
DropVoices(command_buffer, static_cast<u32>(start_estimated_time), time_limit);
|
DropVoices(command_buffer, static_cast<u32>(start_estimated_time), time_limit);
|
||||||
}
|
}
|
||||||
|
@ -26,11 +26,12 @@ add_library(common STATIC
|
|||||||
assert.h
|
assert.h
|
||||||
atomic_helpers.h
|
atomic_helpers.h
|
||||||
atomic_ops.h
|
atomic_ops.h
|
||||||
|
detached_tasks.cpp
|
||||||
|
detached_tasks.h
|
||||||
bit_cast.h
|
bit_cast.h
|
||||||
bit_field.h
|
bit_field.h
|
||||||
bit_set.h
|
bit_set.h
|
||||||
bit_util.h
|
bit_util.h
|
||||||
bounded_threadsafe_queue.h
|
|
||||||
cityhash.cpp
|
cityhash.cpp
|
||||||
cityhash.h
|
cityhash.h
|
||||||
common_funcs.h
|
common_funcs.h
|
||||||
@ -40,8 +41,6 @@ add_library(common STATIC
|
|||||||
container_hash.h
|
container_hash.h
|
||||||
demangle.cpp
|
demangle.cpp
|
||||||
demangle.h
|
demangle.h
|
||||||
detached_tasks.cpp
|
|
||||||
detached_tasks.h
|
|
||||||
div_ceil.h
|
div_ceil.h
|
||||||
dynamic_library.cpp
|
dynamic_library.cpp
|
||||||
dynamic_library.h
|
dynamic_library.h
|
||||||
|
@ -45,13 +45,13 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
T PopWait() {
|
T PopWait() {
|
||||||
T t{};
|
T t;
|
||||||
Pop<PopMode::Wait>(t);
|
Pop<PopMode::Wait>(t);
|
||||||
return t;
|
return t;
|
||||||
}
|
}
|
||||||
|
|
||||||
T PopWait(std::stop_token stop_token) {
|
T PopWait(std::stop_token stop_token) {
|
||||||
T t{};
|
T t;
|
||||||
Pop<PopMode::WaitWithStopToken>(t, stop_token);
|
Pop<PopMode::WaitWithStopToken>(t, stop_token);
|
||||||
return t;
|
return t;
|
||||||
}
|
}
|
||||||
|
@ -130,17 +130,13 @@ void LogSettings() {
|
|||||||
log_path("DataStorage_SDMCDir", Common::FS::GetYuzuPath(Common::FS::YuzuPath::SDMCDir));
|
log_path("DataStorage_SDMCDir", Common::FS::GetYuzuPath(Common::FS::YuzuPath::SDMCDir));
|
||||||
}
|
}
|
||||||
|
|
||||||
void UpdateGPUAccuracy() {
|
|
||||||
values.current_gpu_accuracy = values.gpu_accuracy.GetValue();
|
|
||||||
}
|
|
||||||
|
|
||||||
bool IsGPULevelExtreme() {
|
bool IsGPULevelExtreme() {
|
||||||
return values.current_gpu_accuracy == GpuAccuracy::Extreme;
|
return values.gpu_accuracy.GetValue() == GpuAccuracy::Extreme;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IsGPULevelHigh() {
|
bool IsGPULevelHigh() {
|
||||||
return values.current_gpu_accuracy == GpuAccuracy::Extreme ||
|
return values.gpu_accuracy.GetValue() == GpuAccuracy::Extreme ||
|
||||||
values.current_gpu_accuracy == GpuAccuracy::High;
|
values.gpu_accuracy.GetValue() == GpuAccuracy::High;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IsFastmemEnabled() {
|
bool IsFastmemEnabled() {
|
||||||
|
@ -307,7 +307,6 @@ struct Values {
|
|||||||
Specialization::Default,
|
Specialization::Default,
|
||||||
true,
|
true,
|
||||||
true};
|
true};
|
||||||
GpuAccuracy current_gpu_accuracy{GpuAccuracy::High};
|
|
||||||
SwitchableSetting<AnisotropyMode, true> max_anisotropy{
|
SwitchableSetting<AnisotropyMode, true> max_anisotropy{
|
||||||
linkage, AnisotropyMode::Automatic, AnisotropyMode::Automatic, AnisotropyMode::X16,
|
linkage, AnisotropyMode::Automatic, AnisotropyMode::Automatic, AnisotropyMode::X16,
|
||||||
"max_anisotropy", Category::RendererAdvanced};
|
"max_anisotropy", Category::RendererAdvanced};
|
||||||
@ -523,7 +522,6 @@ struct Values {
|
|||||||
|
|
||||||
extern Values values;
|
extern Values values;
|
||||||
|
|
||||||
void UpdateGPUAccuracy();
|
|
||||||
bool IsGPULevelExtreme();
|
bool IsGPULevelExtreme();
|
||||||
bool IsGPULevelHigh();
|
bool IsGPULevelHigh();
|
||||||
|
|
||||||
|
@ -187,8 +187,6 @@ public:
|
|||||||
this->SetValue(input == "true");
|
this->SetValue(input == "true");
|
||||||
} else if constexpr (std::is_same_v<Type, float>) {
|
} else if constexpr (std::is_same_v<Type, float>) {
|
||||||
this->SetValue(std::stof(input));
|
this->SetValue(std::stof(input));
|
||||||
} else if constexpr (std::is_same_v<Type, AudioEngine>) {
|
|
||||||
this->SetValue(ToEnum<AudioEngine>(input));
|
|
||||||
} else {
|
} else {
|
||||||
this->SetValue(static_cast<Type>(std::stoll(input)));
|
this->SetValue(static_cast<Type>(std::stoll(input)));
|
||||||
}
|
}
|
||||||
|
@ -596,10 +596,6 @@ add_library(core STATIC
|
|||||||
hle/service/mii/types/ver3_store_data.h
|
hle/service/mii/types/ver3_store_data.h
|
||||||
hle/service/mii/mii.cpp
|
hle/service/mii/mii.cpp
|
||||||
hle/service/mii/mii.h
|
hle/service/mii/mii.h
|
||||||
hle/service/mii/mii_database.cpp
|
|
||||||
hle/service/mii/mii_database.h
|
|
||||||
hle/service/mii/mii_database_manager.cpp
|
|
||||||
hle/service/mii/mii_database_manager.h
|
|
||||||
hle/service/mii/mii_manager.cpp
|
hle/service/mii/mii_manager.cpp
|
||||||
hle/service/mii/mii_manager.h
|
hle/service/mii/mii_manager.h
|
||||||
hle/service/mii/mii_result.h
|
hle/service/mii/mii_result.h
|
||||||
@ -894,7 +890,7 @@ endif()
|
|||||||
create_target_directory_groups(core)
|
create_target_directory_groups(core)
|
||||||
|
|
||||||
target_link_libraries(core PUBLIC common PRIVATE audio_core network video_core nx_tzdb)
|
target_link_libraries(core PUBLIC common PRIVATE audio_core network video_core nx_tzdb)
|
||||||
target_link_libraries(core PUBLIC Boost::headers PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls RenderDoc::API)
|
target_link_libraries(core PUBLIC Boost::headers PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls Opus::opus renderdoc)
|
||||||
if (MINGW)
|
if (MINGW)
|
||||||
target_link_libraries(core PRIVATE ${MSWSOCK_LIBRARY})
|
target_link_libraries(core PRIVATE ${MSWSOCK_LIBRARY})
|
||||||
endif()
|
endif()
|
||||||
|
@ -47,7 +47,6 @@ PartitionFilesystem::PartitionFilesystem(VirtualFile file) {
|
|||||||
// Actually read in now...
|
// Actually read in now...
|
||||||
std::vector<u8> file_data = file->ReadBytes(metadata_size);
|
std::vector<u8> file_data = file->ReadBytes(metadata_size);
|
||||||
const std::size_t total_size = file_data.size();
|
const std::size_t total_size = file_data.size();
|
||||||
file_data.push_back(0);
|
|
||||||
|
|
||||||
if (total_size != metadata_size) {
|
if (total_size != metadata_size) {
|
||||||
status = Loader::ResultStatus::ErrorIncorrectPFSFileSize;
|
status = Loader::ResultStatus::ErrorIncorrectPFSFileSize;
|
||||||
|
@ -752,9 +752,7 @@ bool RegisteredCache::RemoveExistingEntry(u64 title_id) const {
|
|||||||
for (u8 i = 0; i < 0x10; i++) {
|
for (u8 i = 0; i < 0x10; i++) {
|
||||||
const auto meta_dir = dir->CreateDirectoryRelative("yuzu_meta");
|
const auto meta_dir = dir->CreateDirectoryRelative("yuzu_meta");
|
||||||
const auto filename = GetCNMTName(TitleType::Update, title_id + i);
|
const auto filename = GetCNMTName(TitleType::Update, title_id + i);
|
||||||
if (meta_dir->GetFile(filename)) {
|
removed_data |= meta_dir->DeleteFile(filename);
|
||||||
removed_data |= meta_dir->DeleteFile(filename);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return removed_data;
|
return removed_data;
|
||||||
|
@ -62,7 +62,7 @@ enum class ErrorModule : u32 {
|
|||||||
XCD = 108,
|
XCD = 108,
|
||||||
TMP451 = 109,
|
TMP451 = 109,
|
||||||
NIFM = 110,
|
NIFM = 110,
|
||||||
HwOpus = 111,
|
Hwopus = 111,
|
||||||
LSM6DS3 = 112,
|
LSM6DS3 = 112,
|
||||||
Bluetooth = 113,
|
Bluetooth = 113,
|
||||||
VI = 114,
|
VI = 114,
|
||||||
|
@ -19,7 +19,6 @@
|
|||||||
#include "core/hle/service/am/am.h"
|
#include "core/hle/service/am/am.h"
|
||||||
#include "core/hle/service/am/applet_ae.h"
|
#include "core/hle/service/am/applet_ae.h"
|
||||||
#include "core/hle/service/am/applet_oe.h"
|
#include "core/hle/service/am/applet_oe.h"
|
||||||
#include "core/hle/service/am/applets/applet_mii_edit_types.h"
|
|
||||||
#include "core/hle/service/am/applets/applet_profile_select.h"
|
#include "core/hle/service/am/applets/applet_profile_select.h"
|
||||||
#include "core/hle/service/am/applets/applet_web_browser.h"
|
#include "core/hle/service/am/applets/applet_web_browser.h"
|
||||||
#include "core/hle/service/am/applets/applets.h"
|
#include "core/hle/service/am/applets/applets.h"
|
||||||
@ -191,7 +190,7 @@ IDisplayController::IDisplayController(Core::System& system_)
|
|||||||
{5, nullptr, "GetLastForegroundCaptureImageEx"},
|
{5, nullptr, "GetLastForegroundCaptureImageEx"},
|
||||||
{6, nullptr, "GetLastApplicationCaptureImageEx"},
|
{6, nullptr, "GetLastApplicationCaptureImageEx"},
|
||||||
{7, nullptr, "GetCallerAppletCaptureImageEx"},
|
{7, nullptr, "GetCallerAppletCaptureImageEx"},
|
||||||
{8, &IDisplayController::TakeScreenShotOfOwnLayer, "TakeScreenShotOfOwnLayer"},
|
{8, nullptr, "TakeScreenShotOfOwnLayer"},
|
||||||
{9, nullptr, "CopyBetweenCaptureBuffers"},
|
{9, nullptr, "CopyBetweenCaptureBuffers"},
|
||||||
{10, nullptr, "AcquireLastApplicationCaptureBuffer"},
|
{10, nullptr, "AcquireLastApplicationCaptureBuffer"},
|
||||||
{11, nullptr, "ReleaseLastApplicationCaptureBuffer"},
|
{11, nullptr, "ReleaseLastApplicationCaptureBuffer"},
|
||||||
@ -219,13 +218,6 @@ IDisplayController::IDisplayController(Core::System& system_)
|
|||||||
|
|
||||||
IDisplayController::~IDisplayController() = default;
|
IDisplayController::~IDisplayController() = default;
|
||||||
|
|
||||||
void IDisplayController::TakeScreenShotOfOwnLayer(HLERequestContext& ctx) {
|
|
||||||
LOG_WARNING(Service_AM, "(STUBBED) called");
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
|
||||||
rb.Push(ResultSuccess);
|
|
||||||
}
|
|
||||||
|
|
||||||
IDebugFunctions::IDebugFunctions(Core::System& system_)
|
IDebugFunctions::IDebugFunctions(Core::System& system_)
|
||||||
: ServiceFramework{system_, "IDebugFunctions"} {
|
: ServiceFramework{system_, "IDebugFunctions"} {
|
||||||
// clang-format off
|
// clang-format off
|
||||||
@ -732,7 +724,7 @@ ICommonStateGetter::ICommonStateGetter(Core::System& system_,
|
|||||||
{110, nullptr, "OpenMyGpuErrorHandler"},
|
{110, nullptr, "OpenMyGpuErrorHandler"},
|
||||||
{120, nullptr, "GetAppletLaunchedHistory"},
|
{120, nullptr, "GetAppletLaunchedHistory"},
|
||||||
{200, nullptr, "GetOperationModeSystemInfo"},
|
{200, nullptr, "GetOperationModeSystemInfo"},
|
||||||
{300, &ICommonStateGetter::GetSettingsPlatformRegion, "GetSettingsPlatformRegion"},
|
{300, nullptr, "GetSettingsPlatformRegion"},
|
||||||
{400, nullptr, "ActivateMigrationService"},
|
{400, nullptr, "ActivateMigrationService"},
|
||||||
{401, nullptr, "DeactivateMigrationService"},
|
{401, nullptr, "DeactivateMigrationService"},
|
||||||
{500, nullptr, "DisableSleepTillShutdown"},
|
{500, nullptr, "DisableSleepTillShutdown"},
|
||||||
@ -744,10 +736,6 @@ ICommonStateGetter::ICommonStateGetter(Core::System& system_,
|
|||||||
// clang-format on
|
// clang-format on
|
||||||
|
|
||||||
RegisterHandlers(functions);
|
RegisterHandlers(functions);
|
||||||
|
|
||||||
// Configure applets to be in foreground state
|
|
||||||
msg_queue->PushMessage(AppletMessageQueue::AppletMessage::FocusStateChanged);
|
|
||||||
msg_queue->PushMessage(AppletMessageQueue::AppletMessage::ChangeIntoForeground);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ICommonStateGetter::~ICommonStateGetter() = default;
|
ICommonStateGetter::~ICommonStateGetter() = default;
|
||||||
@ -879,14 +867,6 @@ void ICommonStateGetter::PerformSystemButtonPressingIfInFocus(HLERequestContext&
|
|||||||
rb.Push(ResultSuccess);
|
rb.Push(ResultSuccess);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ICommonStateGetter::GetSettingsPlatformRegion(HLERequestContext& ctx) {
|
|
||||||
LOG_WARNING(Service_AM, "(STUBBED) called");
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 3};
|
|
||||||
rb.Push(ResultSuccess);
|
|
||||||
rb.PushEnum(SysPlatformRegion::Global);
|
|
||||||
}
|
|
||||||
|
|
||||||
void ICommonStateGetter::SetRequestExitToLibraryAppletAtExecuteNextProgramEnabled(
|
void ICommonStateGetter::SetRequestExitToLibraryAppletAtExecuteNextProgramEnabled(
|
||||||
HLERequestContext& ctx) {
|
HLERequestContext& ctx) {
|
||||||
LOG_WARNING(Service_AM, "(STUBBED) called");
|
LOG_WARNING(Service_AM, "(STUBBED) called");
|
||||||
@ -1344,19 +1324,18 @@ void ILibraryAppletCreator::CreateHandleStorage(HLERequestContext& ctx) {
|
|||||||
|
|
||||||
ILibraryAppletSelfAccessor::ILibraryAppletSelfAccessor(Core::System& system_)
|
ILibraryAppletSelfAccessor::ILibraryAppletSelfAccessor(Core::System& system_)
|
||||||
: ServiceFramework{system_, "ILibraryAppletSelfAccessor"} {
|
: ServiceFramework{system_, "ILibraryAppletSelfAccessor"} {
|
||||||
// clang-format off
|
|
||||||
static const FunctionInfo functions[] = {
|
static const FunctionInfo functions[] = {
|
||||||
{0, &ILibraryAppletSelfAccessor::PopInData, "PopInData"},
|
{0, nullptr, "PopInData"},
|
||||||
{1, &ILibraryAppletSelfAccessor::PushOutData, "PushOutData"},
|
{1, nullptr, "PushOutData"},
|
||||||
{2, nullptr, "PopInteractiveInData"},
|
{2, nullptr, "PopInteractiveInData"},
|
||||||
{3, nullptr, "PushInteractiveOutData"},
|
{3, nullptr, "PushInteractiveOutData"},
|
||||||
{5, nullptr, "GetPopInDataEvent"},
|
{5, nullptr, "GetPopInDataEvent"},
|
||||||
{6, nullptr, "GetPopInteractiveInDataEvent"},
|
{6, nullptr, "GetPopInteractiveInDataEvent"},
|
||||||
{10, &ILibraryAppletSelfAccessor::ExitProcessAndReturn, "ExitProcessAndReturn"},
|
{10, nullptr, "ExitProcessAndReturn"},
|
||||||
{11, &ILibraryAppletSelfAccessor::GetLibraryAppletInfo, "GetLibraryAppletInfo"},
|
{11, nullptr, "GetLibraryAppletInfo"},
|
||||||
{12, nullptr, "GetMainAppletIdentityInfo"},
|
{12, nullptr, "GetMainAppletIdentityInfo"},
|
||||||
{13, nullptr, "CanUseApplicationCore"},
|
{13, nullptr, "CanUseApplicationCore"},
|
||||||
{14, &ILibraryAppletSelfAccessor::GetCallerAppletIdentityInfo, "GetCallerAppletIdentityInfo"},
|
{14, nullptr, "GetCallerAppletIdentityInfo"},
|
||||||
{15, nullptr, "GetMainAppletApplicationControlProperty"},
|
{15, nullptr, "GetMainAppletApplicationControlProperty"},
|
||||||
{16, nullptr, "GetMainAppletStorageId"},
|
{16, nullptr, "GetMainAppletStorageId"},
|
||||||
{17, nullptr, "GetCallerAppletIdentityInfoStack"},
|
{17, nullptr, "GetCallerAppletIdentityInfoStack"},
|
||||||
@ -1382,142 +1361,10 @@ ILibraryAppletSelfAccessor::ILibraryAppletSelfAccessor(Core::System& system_)
|
|||||||
{140, nullptr, "SetApplicationMemoryReservation"},
|
{140, nullptr, "SetApplicationMemoryReservation"},
|
||||||
{150, nullptr, "ShouldSetGpuTimeSliceManually"},
|
{150, nullptr, "ShouldSetGpuTimeSliceManually"},
|
||||||
};
|
};
|
||||||
// clang-format on
|
|
||||||
RegisterHandlers(functions);
|
RegisterHandlers(functions);
|
||||||
|
|
||||||
PushInShowMiiEditData();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ILibraryAppletSelfAccessor::~ILibraryAppletSelfAccessor() = default;
|
ILibraryAppletSelfAccessor::~ILibraryAppletSelfAccessor() = default;
|
||||||
void ILibraryAppletSelfAccessor::PopInData(HLERequestContext& ctx) {
|
|
||||||
LOG_INFO(Service_AM, "called");
|
|
||||||
|
|
||||||
if (queue_data.empty()) {
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
|
||||||
rb.Push(ResultNoDataInChannel);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto data = queue_data.front();
|
|
||||||
queue_data.pop_front();
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
|
||||||
rb.Push(ResultSuccess);
|
|
||||||
rb.PushIpcInterface<IStorage>(system, std::move(data));
|
|
||||||
}
|
|
||||||
|
|
||||||
void ILibraryAppletSelfAccessor::PushOutData(HLERequestContext& ctx) {
|
|
||||||
LOG_WARNING(Service_AM, "(STUBBED) called");
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
|
||||||
rb.Push(ResultSuccess);
|
|
||||||
}
|
|
||||||
|
|
||||||
void ILibraryAppletSelfAccessor::ExitProcessAndReturn(HLERequestContext& ctx) {
|
|
||||||
LOG_WARNING(Service_AM, "(STUBBED) called");
|
|
||||||
|
|
||||||
system.Exit();
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
|
||||||
rb.Push(ResultSuccess);
|
|
||||||
}
|
|
||||||
|
|
||||||
void ILibraryAppletSelfAccessor::GetLibraryAppletInfo(HLERequestContext& ctx) {
|
|
||||||
struct LibraryAppletInfo {
|
|
||||||
Applets::AppletId applet_id;
|
|
||||||
Applets::LibraryAppletMode library_applet_mode;
|
|
||||||
};
|
|
||||||
|
|
||||||
LOG_WARNING(Service_AM, "(STUBBED) called");
|
|
||||||
|
|
||||||
const LibraryAppletInfo applet_info{
|
|
||||||
.applet_id = Applets::AppletId::MiiEdit,
|
|
||||||
.library_applet_mode = Applets::LibraryAppletMode::AllForeground,
|
|
||||||
};
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 4};
|
|
||||||
rb.Push(ResultSuccess);
|
|
||||||
rb.PushRaw(applet_info);
|
|
||||||
}
|
|
||||||
|
|
||||||
void ILibraryAppletSelfAccessor::GetCallerAppletIdentityInfo(HLERequestContext& ctx) {
|
|
||||||
struct AppletIdentityInfo {
|
|
||||||
Applets::AppletId applet_id;
|
|
||||||
INSERT_PADDING_BYTES(0x4);
|
|
||||||
u64 application_id;
|
|
||||||
};
|
|
||||||
|
|
||||||
LOG_WARNING(Service_AM, "(STUBBED) called");
|
|
||||||
|
|
||||||
const AppletIdentityInfo applet_info{
|
|
||||||
.applet_id = Applets::AppletId::QLaunch,
|
|
||||||
.application_id = 0x0100000000001000ull,
|
|
||||||
};
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 6};
|
|
||||||
rb.Push(ResultSuccess);
|
|
||||||
rb.PushRaw(applet_info);
|
|
||||||
}
|
|
||||||
|
|
||||||
void ILibraryAppletSelfAccessor::PushInShowMiiEditData() {
|
|
||||||
struct MiiEditV3 {
|
|
||||||
Applets::MiiEditAppletInputCommon common;
|
|
||||||
Applets::MiiEditAppletInputV3 input;
|
|
||||||
};
|
|
||||||
static_assert(sizeof(MiiEditV3) == 0x100, "MiiEditV3 has incorrect size.");
|
|
||||||
|
|
||||||
MiiEditV3 mii_arguments{
|
|
||||||
.common =
|
|
||||||
{
|
|
||||||
.version = Applets::MiiEditAppletVersion::Version3,
|
|
||||||
.applet_mode = Applets::MiiEditAppletMode::ShowMiiEdit,
|
|
||||||
},
|
|
||||||
.input{},
|
|
||||||
};
|
|
||||||
|
|
||||||
std::vector<u8> argument_data(sizeof(mii_arguments));
|
|
||||||
std::memcpy(argument_data.data(), &mii_arguments, sizeof(mii_arguments));
|
|
||||||
|
|
||||||
queue_data.emplace_back(std::move(argument_data));
|
|
||||||
}
|
|
||||||
|
|
||||||
IAppletCommonFunctions::IAppletCommonFunctions(Core::System& system_)
|
|
||||||
: ServiceFramework{system_, "IAppletCommonFunctions"} {
|
|
||||||
// clang-format off
|
|
||||||
static const FunctionInfo functions[] = {
|
|
||||||
{0, nullptr, "SetTerminateResult"},
|
|
||||||
{10, nullptr, "ReadThemeStorage"},
|
|
||||||
{11, nullptr, "WriteThemeStorage"},
|
|
||||||
{20, nullptr, "PushToAppletBoundChannel"},
|
|
||||||
{21, nullptr, "TryPopFromAppletBoundChannel"},
|
|
||||||
{40, nullptr, "GetDisplayLogicalResolution"},
|
|
||||||
{42, nullptr, "SetDisplayMagnification"},
|
|
||||||
{50, nullptr, "SetHomeButtonDoubleClickEnabled"},
|
|
||||||
{51, nullptr, "GetHomeButtonDoubleClickEnabled"},
|
|
||||||
{52, nullptr, "IsHomeButtonShortPressedBlocked"},
|
|
||||||
{60, nullptr, "IsVrModeCurtainRequired"},
|
|
||||||
{61, nullptr, "IsSleepRequiredByHighTemperature"},
|
|
||||||
{62, nullptr, "IsSleepRequiredByLowBattery"},
|
|
||||||
{70, &IAppletCommonFunctions::SetCpuBoostRequestPriority, "SetCpuBoostRequestPriority"},
|
|
||||||
{80, nullptr, "SetHandlingCaptureButtonShortPressedMessageEnabledForApplet"},
|
|
||||||
{81, nullptr, "SetHandlingCaptureButtonLongPressedMessageEnabledForApplet"},
|
|
||||||
{90, nullptr, "OpenNamedChannelAsParent"},
|
|
||||||
{91, nullptr, "OpenNamedChannelAsChild"},
|
|
||||||
{100, nullptr, "SetApplicationCoreUsageMode"},
|
|
||||||
};
|
|
||||||
// clang-format on
|
|
||||||
|
|
||||||
RegisterHandlers(functions);
|
|
||||||
}
|
|
||||||
|
|
||||||
IAppletCommonFunctions::~IAppletCommonFunctions() = default;
|
|
||||||
|
|
||||||
void IAppletCommonFunctions::SetCpuBoostRequestPriority(HLERequestContext& ctx) {
|
|
||||||
LOG_WARNING(Service_AM, "(STUBBED) called");
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
|
||||||
rb.Push(ResultSuccess);
|
|
||||||
}
|
|
||||||
|
|
||||||
IApplicationFunctions::IApplicationFunctions(Core::System& system_)
|
IApplicationFunctions::IApplicationFunctions(Core::System& system_)
|
||||||
: ServiceFramework{system_, "IApplicationFunctions"}, service_context{system,
|
: ServiceFramework{system_, "IApplicationFunctions"}, service_context{system,
|
||||||
@ -2202,8 +2049,8 @@ IProcessWindingController::IProcessWindingController(Core::System& system_)
|
|||||||
: ServiceFramework{system_, "IProcessWindingController"} {
|
: ServiceFramework{system_, "IProcessWindingController"} {
|
||||||
// clang-format off
|
// clang-format off
|
||||||
static const FunctionInfo functions[] = {
|
static const FunctionInfo functions[] = {
|
||||||
{0, &IProcessWindingController::GetLaunchReason, "GetLaunchReason"},
|
{0, nullptr, "GetLaunchReason"},
|
||||||
{11, &IProcessWindingController::OpenCallingLibraryApplet, "OpenCallingLibraryApplet"},
|
{11, nullptr, "OpenCallingLibraryApplet"},
|
||||||
{21, nullptr, "PushContext"},
|
{21, nullptr, "PushContext"},
|
||||||
{22, nullptr, "PopContext"},
|
{22, nullptr, "PopContext"},
|
||||||
{23, nullptr, "CancelWindingReservation"},
|
{23, nullptr, "CancelWindingReservation"},
|
||||||
@ -2217,46 +2064,4 @@ IProcessWindingController::IProcessWindingController(Core::System& system_)
|
|||||||
}
|
}
|
||||||
|
|
||||||
IProcessWindingController::~IProcessWindingController() = default;
|
IProcessWindingController::~IProcessWindingController() = default;
|
||||||
|
|
||||||
void IProcessWindingController::GetLaunchReason(HLERequestContext& ctx) {
|
|
||||||
LOG_WARNING(Service_AM, "(STUBBED) called");
|
|
||||||
|
|
||||||
struct AppletProcessLaunchReason {
|
|
||||||
u8 flag;
|
|
||||||
INSERT_PADDING_BYTES(3);
|
|
||||||
};
|
|
||||||
static_assert(sizeof(AppletProcessLaunchReason) == 0x4,
|
|
||||||
"AppletProcessLaunchReason is an invalid size");
|
|
||||||
|
|
||||||
AppletProcessLaunchReason reason{
|
|
||||||
.flag = 0,
|
|
||||||
};
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 3};
|
|
||||||
rb.Push(ResultSuccess);
|
|
||||||
rb.PushRaw(reason);
|
|
||||||
}
|
|
||||||
|
|
||||||
void IProcessWindingController::OpenCallingLibraryApplet(HLERequestContext& ctx) {
|
|
||||||
const auto applet_id = Applets::AppletId::MiiEdit;
|
|
||||||
const auto applet_mode = Applets::LibraryAppletMode::AllForeground;
|
|
||||||
|
|
||||||
LOG_WARNING(Service_AM, "(STUBBED) called with applet_id={:08X}, applet_mode={:08X}", applet_id,
|
|
||||||
applet_mode);
|
|
||||||
|
|
||||||
const auto& applet_manager{system.GetAppletManager()};
|
|
||||||
const auto applet = applet_manager.GetApplet(applet_id, applet_mode);
|
|
||||||
|
|
||||||
if (applet == nullptr) {
|
|
||||||
LOG_ERROR(Service_AM, "Applet doesn't exist! applet_id={}", applet_id);
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
|
||||||
rb.Push(ResultUnknown);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
|
||||||
rb.Push(ResultSuccess);
|
|
||||||
rb.PushIpcInterface<ILibraryAppletAccessor>(system, applet);
|
|
||||||
}
|
|
||||||
} // namespace Service::AM
|
} // namespace Service::AM
|
||||||
|
@ -120,9 +120,6 @@ class IDisplayController final : public ServiceFramework<IDisplayController> {
|
|||||||
public:
|
public:
|
||||||
explicit IDisplayController(Core::System& system_);
|
explicit IDisplayController(Core::System& system_);
|
||||||
~IDisplayController() override;
|
~IDisplayController() override;
|
||||||
|
|
||||||
private:
|
|
||||||
void TakeScreenShotOfOwnLayer(HLERequestContext& ctx);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
class IDebugFunctions final : public ServiceFramework<IDebugFunctions> {
|
class IDebugFunctions final : public ServiceFramework<IDebugFunctions> {
|
||||||
@ -215,11 +212,6 @@ private:
|
|||||||
CaptureButtonLongPressing,
|
CaptureButtonLongPressing,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum class SysPlatformRegion : s32 {
|
|
||||||
Global = 1,
|
|
||||||
Terra = 2,
|
|
||||||
};
|
|
||||||
|
|
||||||
void GetEventHandle(HLERequestContext& ctx);
|
void GetEventHandle(HLERequestContext& ctx);
|
||||||
void ReceiveMessage(HLERequestContext& ctx);
|
void ReceiveMessage(HLERequestContext& ctx);
|
||||||
void GetCurrentFocusState(HLERequestContext& ctx);
|
void GetCurrentFocusState(HLERequestContext& ctx);
|
||||||
@ -235,7 +227,6 @@ private:
|
|||||||
void GetDefaultDisplayResolution(HLERequestContext& ctx);
|
void GetDefaultDisplayResolution(HLERequestContext& ctx);
|
||||||
void SetCpuBoostMode(HLERequestContext& ctx);
|
void SetCpuBoostMode(HLERequestContext& ctx);
|
||||||
void PerformSystemButtonPressingIfInFocus(HLERequestContext& ctx);
|
void PerformSystemButtonPressingIfInFocus(HLERequestContext& ctx);
|
||||||
void GetSettingsPlatformRegion(HLERequestContext& ctx);
|
|
||||||
void SetRequestExitToLibraryAppletAtExecuteNextProgramEnabled(HLERequestContext& ctx);
|
void SetRequestExitToLibraryAppletAtExecuteNextProgramEnabled(HLERequestContext& ctx);
|
||||||
|
|
||||||
std::shared_ptr<AppletMessageQueue> msg_queue;
|
std::shared_ptr<AppletMessageQueue> msg_queue;
|
||||||
@ -303,26 +294,6 @@ class ILibraryAppletSelfAccessor final : public ServiceFramework<ILibraryAppletS
|
|||||||
public:
|
public:
|
||||||
explicit ILibraryAppletSelfAccessor(Core::System& system_);
|
explicit ILibraryAppletSelfAccessor(Core::System& system_);
|
||||||
~ILibraryAppletSelfAccessor() override;
|
~ILibraryAppletSelfAccessor() override;
|
||||||
|
|
||||||
private:
|
|
||||||
void PopInData(HLERequestContext& ctx);
|
|
||||||
void PushOutData(HLERequestContext& ctx);
|
|
||||||
void GetLibraryAppletInfo(HLERequestContext& ctx);
|
|
||||||
void ExitProcessAndReturn(HLERequestContext& ctx);
|
|
||||||
void GetCallerAppletIdentityInfo(HLERequestContext& ctx);
|
|
||||||
|
|
||||||
void PushInShowMiiEditData();
|
|
||||||
|
|
||||||
std::deque<std::vector<u8>> queue_data;
|
|
||||||
};
|
|
||||||
|
|
||||||
class IAppletCommonFunctions final : public ServiceFramework<IAppletCommonFunctions> {
|
|
||||||
public:
|
|
||||||
explicit IAppletCommonFunctions(Core::System& system_);
|
|
||||||
~IAppletCommonFunctions() override;
|
|
||||||
|
|
||||||
private:
|
|
||||||
void SetCpuBoostRequestPriority(HLERequestContext& ctx);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
class IApplicationFunctions final : public ServiceFramework<IApplicationFunctions> {
|
class IApplicationFunctions final : public ServiceFramework<IApplicationFunctions> {
|
||||||
@ -407,10 +378,6 @@ class IProcessWindingController final : public ServiceFramework<IProcessWindingC
|
|||||||
public:
|
public:
|
||||||
explicit IProcessWindingController(Core::System& system_);
|
explicit IProcessWindingController(Core::System& system_);
|
||||||
~IProcessWindingController() override;
|
~IProcessWindingController() override;
|
||||||
|
|
||||||
private:
|
|
||||||
void GetLaunchReason(HLERequestContext& ctx);
|
|
||||||
void OpenCallingLibraryApplet(HLERequestContext& ctx);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
void LoopProcess(Nvnflinger::Nvnflinger& nvnflinger, Core::System& system);
|
void LoopProcess(Nvnflinger::Nvnflinger& nvnflinger, Core::System& system);
|
||||||
|
@ -27,7 +27,7 @@ public:
|
|||||||
{10, &ILibraryAppletProxy::GetProcessWindingController, "GetProcessWindingController"},
|
{10, &ILibraryAppletProxy::GetProcessWindingController, "GetProcessWindingController"},
|
||||||
{11, &ILibraryAppletProxy::GetLibraryAppletCreator, "GetLibraryAppletCreator"},
|
{11, &ILibraryAppletProxy::GetLibraryAppletCreator, "GetLibraryAppletCreator"},
|
||||||
{20, &ILibraryAppletProxy::OpenLibraryAppletSelfAccessor, "OpenLibraryAppletSelfAccessor"},
|
{20, &ILibraryAppletProxy::OpenLibraryAppletSelfAccessor, "OpenLibraryAppletSelfAccessor"},
|
||||||
{21, &ILibraryAppletProxy::GetAppletCommonFunctions, "GetAppletCommonFunctions"},
|
{21, nullptr, "GetAppletCommonFunctions"},
|
||||||
{22, nullptr, "GetHomeMenuFunctions"},
|
{22, nullptr, "GetHomeMenuFunctions"},
|
||||||
{23, nullptr, "GetGlobalStateController"},
|
{23, nullptr, "GetGlobalStateController"},
|
||||||
{1000, &ILibraryAppletProxy::GetDebugFunctions, "GetDebugFunctions"},
|
{1000, &ILibraryAppletProxy::GetDebugFunctions, "GetDebugFunctions"},
|
||||||
@ -86,6 +86,14 @@ private:
|
|||||||
rb.PushIpcInterface<IProcessWindingController>(system);
|
rb.PushIpcInterface<IProcessWindingController>(system);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GetDebugFunctions(HLERequestContext& ctx) {
|
||||||
|
LOG_DEBUG(Service_AM, "called");
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
rb.PushIpcInterface<IDebugFunctions>(system);
|
||||||
|
}
|
||||||
|
|
||||||
void GetLibraryAppletCreator(HLERequestContext& ctx) {
|
void GetLibraryAppletCreator(HLERequestContext& ctx) {
|
||||||
LOG_DEBUG(Service_AM, "called");
|
LOG_DEBUG(Service_AM, "called");
|
||||||
|
|
||||||
@ -102,22 +110,6 @@ private:
|
|||||||
rb.PushIpcInterface<ILibraryAppletSelfAccessor>(system);
|
rb.PushIpcInterface<ILibraryAppletSelfAccessor>(system);
|
||||||
}
|
}
|
||||||
|
|
||||||
void GetAppletCommonFunctions(HLERequestContext& ctx) {
|
|
||||||
LOG_DEBUG(Service_AM, "called");
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
|
||||||
rb.Push(ResultSuccess);
|
|
||||||
rb.PushIpcInterface<IAppletCommonFunctions>(system);
|
|
||||||
}
|
|
||||||
|
|
||||||
void GetDebugFunctions(HLERequestContext& ctx) {
|
|
||||||
LOG_DEBUG(Service_AM, "called");
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
|
||||||
rb.Push(ResultSuccess);
|
|
||||||
rb.PushIpcInterface<IDebugFunctions>(system);
|
|
||||||
}
|
|
||||||
|
|
||||||
Nvnflinger::Nvnflinger& nvnflinger;
|
Nvnflinger::Nvnflinger& nvnflinger;
|
||||||
std::shared_ptr<AppletMessageQueue> msg_queue;
|
std::shared_ptr<AppletMessageQueue> msg_queue;
|
||||||
};
|
};
|
||||||
@ -141,7 +133,7 @@ public:
|
|||||||
{20, &ISystemAppletProxy::GetHomeMenuFunctions, "GetHomeMenuFunctions"},
|
{20, &ISystemAppletProxy::GetHomeMenuFunctions, "GetHomeMenuFunctions"},
|
||||||
{21, &ISystemAppletProxy::GetGlobalStateController, "GetGlobalStateController"},
|
{21, &ISystemAppletProxy::GetGlobalStateController, "GetGlobalStateController"},
|
||||||
{22, &ISystemAppletProxy::GetApplicationCreator, "GetApplicationCreator"},
|
{22, &ISystemAppletProxy::GetApplicationCreator, "GetApplicationCreator"},
|
||||||
{23, &ISystemAppletProxy::GetAppletCommonFunctions, "GetAppletCommonFunctions"},
|
{23, nullptr, "GetAppletCommonFunctions"},
|
||||||
{1000, &ISystemAppletProxy::GetDebugFunctions, "GetDebugFunctions"},
|
{1000, &ISystemAppletProxy::GetDebugFunctions, "GetDebugFunctions"},
|
||||||
};
|
};
|
||||||
// clang-format on
|
// clang-format on
|
||||||
@ -190,6 +182,14 @@ private:
|
|||||||
rb.PushIpcInterface<IDisplayController>(system);
|
rb.PushIpcInterface<IDisplayController>(system);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GetDebugFunctions(HLERequestContext& ctx) {
|
||||||
|
LOG_DEBUG(Service_AM, "called");
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
rb.PushIpcInterface<IDebugFunctions>(system);
|
||||||
|
}
|
||||||
|
|
||||||
void GetLibraryAppletCreator(HLERequestContext& ctx) {
|
void GetLibraryAppletCreator(HLERequestContext& ctx) {
|
||||||
LOG_DEBUG(Service_AM, "called");
|
LOG_DEBUG(Service_AM, "called");
|
||||||
|
|
||||||
@ -222,22 +222,6 @@ private:
|
|||||||
rb.PushIpcInterface<IApplicationCreator>(system);
|
rb.PushIpcInterface<IApplicationCreator>(system);
|
||||||
}
|
}
|
||||||
|
|
||||||
void GetAppletCommonFunctions(HLERequestContext& ctx) {
|
|
||||||
LOG_DEBUG(Service_AM, "called");
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
|
||||||
rb.Push(ResultSuccess);
|
|
||||||
rb.PushIpcInterface<IAppletCommonFunctions>(system);
|
|
||||||
}
|
|
||||||
|
|
||||||
void GetDebugFunctions(HLERequestContext& ctx) {
|
|
||||||
LOG_DEBUG(Service_AM, "called");
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
|
||||||
rb.Push(ResultSuccess);
|
|
||||||
rb.PushIpcInterface<IDebugFunctions>(system);
|
|
||||||
}
|
|
||||||
|
|
||||||
Nvnflinger::Nvnflinger& nvnflinger;
|
Nvnflinger::Nvnflinger& nvnflinger;
|
||||||
std::shared_ptr<AppletMessageQueue> msg_queue;
|
std::shared_ptr<AppletMessageQueue> msg_queue;
|
||||||
};
|
};
|
||||||
|
@ -7,9 +7,7 @@
|
|||||||
#include "core/frontend/applets/mii_edit.h"
|
#include "core/frontend/applets/mii_edit.h"
|
||||||
#include "core/hle/service/am/am.h"
|
#include "core/hle/service/am/am.h"
|
||||||
#include "core/hle/service/am/applets/applet_mii_edit.h"
|
#include "core/hle/service/am/applets/applet_mii_edit.h"
|
||||||
#include "core/hle/service/mii/mii.h"
|
|
||||||
#include "core/hle/service/mii/mii_manager.h"
|
#include "core/hle/service/mii/mii_manager.h"
|
||||||
#include "core/hle/service/sm/sm.h"
|
|
||||||
|
|
||||||
namespace Service::AM::Applets {
|
namespace Service::AM::Applets {
|
||||||
|
|
||||||
@ -58,12 +56,6 @@ void MiiEdit::Initialize() {
|
|||||||
sizeof(MiiEditAppletInputV4));
|
sizeof(MiiEditAppletInputV4));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
manager = system.ServiceManager().GetService<Mii::MiiDBModule>("mii:e")->GetMiiManager();
|
|
||||||
if (manager == nullptr) {
|
|
||||||
manager = std::make_shared<Mii::MiiManager>();
|
|
||||||
}
|
|
||||||
manager->Initialize(metadata);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool MiiEdit::TransactionComplete() const {
|
bool MiiEdit::TransactionComplete() const {
|
||||||
@ -86,46 +78,22 @@ void MiiEdit::Execute() {
|
|||||||
// This is a default stub for each of the MiiEdit applet modes.
|
// This is a default stub for each of the MiiEdit applet modes.
|
||||||
switch (applet_input_common.applet_mode) {
|
switch (applet_input_common.applet_mode) {
|
||||||
case MiiEditAppletMode::ShowMiiEdit:
|
case MiiEditAppletMode::ShowMiiEdit:
|
||||||
|
case MiiEditAppletMode::AppendMii:
|
||||||
case MiiEditAppletMode::AppendMiiImage:
|
case MiiEditAppletMode::AppendMiiImage:
|
||||||
case MiiEditAppletMode::UpdateMiiImage:
|
case MiiEditAppletMode::UpdateMiiImage:
|
||||||
MiiEditOutput(MiiEditResult::Success, 0);
|
MiiEditOutput(MiiEditResult::Success, 0);
|
||||||
break;
|
break;
|
||||||
case MiiEditAppletMode::AppendMii: {
|
case MiiEditAppletMode::CreateMii:
|
||||||
Mii::StoreData store_data{};
|
|
||||||
store_data.BuildRandom(Mii::Age::All, Mii::Gender::All, Mii::Race::All);
|
|
||||||
store_data.SetNickname({u'y', u'u', u'z', u'u'});
|
|
||||||
store_data.SetChecksum();
|
|
||||||
const auto result = manager->AddOrReplace(metadata, store_data);
|
|
||||||
|
|
||||||
if (result.IsError()) {
|
|
||||||
MiiEditOutput(MiiEditResult::Cancel, 0);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 index = manager->FindIndex(store_data.GetCreateId(), false);
|
|
||||||
|
|
||||||
if (index == -1) {
|
|
||||||
MiiEditOutput(MiiEditResult::Cancel, 0);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
MiiEditOutput(MiiEditResult::Success, index);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case MiiEditAppletMode::CreateMii: {
|
|
||||||
Mii::CharInfo char_info{};
|
|
||||||
manager->BuildRandom(char_info, Mii::Age::All, Mii::Gender::All, Mii::Race::All);
|
|
||||||
|
|
||||||
const MiiEditCharInfo edit_char_info{
|
|
||||||
.mii_info{char_info},
|
|
||||||
};
|
|
||||||
|
|
||||||
MiiEditOutputForCharInfoEditing(MiiEditResult::Success, edit_char_info);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case MiiEditAppletMode::EditMii: {
|
case MiiEditAppletMode::EditMii: {
|
||||||
|
Mii::CharInfo char_info{};
|
||||||
|
Mii::StoreData store_data{};
|
||||||
|
store_data.BuildBase(Mii::Gender::Male);
|
||||||
|
char_info.SetFromStoreData(store_data);
|
||||||
|
|
||||||
const MiiEditCharInfo edit_char_info{
|
const MiiEditCharInfo edit_char_info{
|
||||||
.mii_info{applet_input_v4.char_info.mii_info},
|
.mii_info{applet_input_common.applet_mode == MiiEditAppletMode::EditMii
|
||||||
|
? applet_input_v4.char_info.mii_info
|
||||||
|
: char_info},
|
||||||
};
|
};
|
||||||
|
|
||||||
MiiEditOutputForCharInfoEditing(MiiEditResult::Success, edit_char_info);
|
MiiEditOutputForCharInfoEditing(MiiEditResult::Success, edit_char_info);
|
||||||
|
@ -11,11 +11,6 @@ namespace Core {
|
|||||||
class System;
|
class System;
|
||||||
} // namespace Core
|
} // namespace Core
|
||||||
|
|
||||||
namespace Service::Mii {
|
|
||||||
struct DatabaseSessionMetadata;
|
|
||||||
class MiiManager;
|
|
||||||
} // namespace Service::Mii
|
|
||||||
|
|
||||||
namespace Service::AM::Applets {
|
namespace Service::AM::Applets {
|
||||||
|
|
||||||
class MiiEdit final : public Applet {
|
class MiiEdit final : public Applet {
|
||||||
@ -45,8 +40,6 @@ private:
|
|||||||
MiiEditAppletInputV4 applet_input_v4{};
|
MiiEditAppletInputV4 applet_input_v4{};
|
||||||
|
|
||||||
bool is_complete{false};
|
bool is_complete{false};
|
||||||
std::shared_ptr<Mii::MiiManager> manager = nullptr;
|
|
||||||
Mii::DatabaseSessionMetadata metadata{};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Service::AM::Applets
|
} // namespace Service::AM::Applets
|
||||||
|
@ -22,8 +22,6 @@
|
|||||||
|
|
||||||
namespace Service::AOC {
|
namespace Service::AOC {
|
||||||
|
|
||||||
constexpr Result ResultNoPurchasedProductInfoAvailable{ErrorModule::NIMShop, 400};
|
|
||||||
|
|
||||||
static bool CheckAOCTitleIDMatchesBase(u64 title_id, u64 base) {
|
static bool CheckAOCTitleIDMatchesBase(u64 title_id, u64 base) {
|
||||||
return FileSys::GetBaseTitleID(title_id) == base;
|
return FileSys::GetBaseTitleID(title_id) == base;
|
||||||
}
|
}
|
||||||
@ -56,8 +54,8 @@ public:
|
|||||||
{0, &IPurchaseEventManager::SetDefaultDeliveryTarget, "SetDefaultDeliveryTarget"},
|
{0, &IPurchaseEventManager::SetDefaultDeliveryTarget, "SetDefaultDeliveryTarget"},
|
||||||
{1, &IPurchaseEventManager::SetDeliveryTarget, "SetDeliveryTarget"},
|
{1, &IPurchaseEventManager::SetDeliveryTarget, "SetDeliveryTarget"},
|
||||||
{2, &IPurchaseEventManager::GetPurchasedEventReadableHandle, "GetPurchasedEventReadableHandle"},
|
{2, &IPurchaseEventManager::GetPurchasedEventReadableHandle, "GetPurchasedEventReadableHandle"},
|
||||||
{3, &IPurchaseEventManager::PopPurchasedProductInfo, "PopPurchasedProductInfo"},
|
{3, nullptr, "PopPurchasedProductInfo"},
|
||||||
{4, &IPurchaseEventManager::PopPurchasedProductInfoWithUid, "PopPurchasedProductInfoWithUid"},
|
{4, nullptr, "PopPurchasedProductInfoWithUid"},
|
||||||
};
|
};
|
||||||
// clang-format on
|
// clang-format on
|
||||||
|
|
||||||
@ -103,20 +101,6 @@ private:
|
|||||||
rb.PushCopyObjects(purchased_event->GetReadableEvent());
|
rb.PushCopyObjects(purchased_event->GetReadableEvent());
|
||||||
}
|
}
|
||||||
|
|
||||||
void PopPurchasedProductInfo(HLERequestContext& ctx) {
|
|
||||||
LOG_DEBUG(Service_AOC, "(STUBBED) called");
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
|
||||||
rb.Push(ResultNoPurchasedProductInfoAvailable);
|
|
||||||
}
|
|
||||||
|
|
||||||
void PopPurchasedProductInfoWithUid(HLERequestContext& ctx) {
|
|
||||||
LOG_DEBUG(Service_AOC, "(STUBBED) called");
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
|
||||||
rb.Push(ResultNoPurchasedProductInfoAvailable);
|
|
||||||
}
|
|
||||||
|
|
||||||
KernelHelpers::ServiceContext service_context;
|
KernelHelpers::ServiceContext service_context;
|
||||||
|
|
||||||
Kernel::KEvent* purchased_event;
|
Kernel::KEvent* purchased_event;
|
||||||
|
@ -20,16 +20,4 @@ constexpr Result ResultNotSupported{ErrorModule::Audio, 513};
|
|||||||
constexpr Result ResultInvalidHandle{ErrorModule::Audio, 1536};
|
constexpr Result ResultInvalidHandle{ErrorModule::Audio, 1536};
|
||||||
constexpr Result ResultInvalidRevision{ErrorModule::Audio, 1537};
|
constexpr Result ResultInvalidRevision{ErrorModule::Audio, 1537};
|
||||||
|
|
||||||
constexpr Result ResultLibOpusAllocFail{ErrorModule::HwOpus, 7};
|
|
||||||
constexpr Result ResultInputDataTooSmall{ErrorModule::HwOpus, 8};
|
|
||||||
constexpr Result ResultLibOpusInvalidState{ErrorModule::HwOpus, 6};
|
|
||||||
constexpr Result ResultLibOpusUnimplemented{ErrorModule::HwOpus, 5};
|
|
||||||
constexpr Result ResultLibOpusInvalidPacket{ErrorModule::HwOpus, 17};
|
|
||||||
constexpr Result ResultLibOpusInternalError{ErrorModule::HwOpus, 4};
|
|
||||||
constexpr Result ResultBufferTooSmall{ErrorModule::HwOpus, 3};
|
|
||||||
constexpr Result ResultLibOpusBadArg{ErrorModule::HwOpus, 2};
|
|
||||||
constexpr Result ResultInvalidOpusDSPReturnCode{ErrorModule::HwOpus, 259};
|
|
||||||
constexpr Result ResultInvalidOpusSampleRate{ErrorModule::HwOpus, 1001};
|
|
||||||
constexpr Result ResultInvalidOpusChannelCount{ErrorModule::HwOpus, 1002};
|
|
||||||
|
|
||||||
} // namespace Service::Audio
|
} // namespace Service::Audio
|
||||||
|
@ -1,506 +1,420 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
|
#include <chrono>
|
||||||
|
#include <cstring>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "audio_core/opus/decoder.h"
|
#include <opus.h>
|
||||||
#include "audio_core/opus/parameters.h"
|
#include <opus_multistream.h>
|
||||||
|
|
||||||
#include "common/assert.h"
|
#include "common/assert.h"
|
||||||
#include "common/logging/log.h"
|
#include "common/logging/log.h"
|
||||||
#include "common/scratch_buffer.h"
|
#include "common/scratch_buffer.h"
|
||||||
#include "core/core.h"
|
|
||||||
#include "core/hle/service/audio/hwopus.h"
|
#include "core/hle/service/audio/hwopus.h"
|
||||||
#include "core/hle/service/ipc_helpers.h"
|
#include "core/hle/service/ipc_helpers.h"
|
||||||
|
|
||||||
namespace Service::Audio {
|
namespace Service::Audio {
|
||||||
using namespace AudioCore::OpusDecoder;
|
namespace {
|
||||||
|
struct OpusDeleter {
|
||||||
|
void operator()(OpusMSDecoder* ptr) const {
|
||||||
|
opus_multistream_decoder_destroy(ptr);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
class IHardwareOpusDecoder final : public ServiceFramework<IHardwareOpusDecoder> {
|
using OpusDecoderPtr = std::unique_ptr<OpusMSDecoder, OpusDeleter>;
|
||||||
|
|
||||||
|
struct OpusPacketHeader {
|
||||||
|
// Packet size in bytes.
|
||||||
|
u32_be size;
|
||||||
|
// Indicates the final range of the codec's entropy coder.
|
||||||
|
u32_be final_range;
|
||||||
|
};
|
||||||
|
static_assert(sizeof(OpusPacketHeader) == 0x8, "OpusHeader is an invalid size");
|
||||||
|
|
||||||
|
class OpusDecoderState {
|
||||||
public:
|
public:
|
||||||
explicit IHardwareOpusDecoder(Core::System& system_, HardwareOpus& hardware_opus)
|
/// Describes extra behavior that may be asked of the decoding context.
|
||||||
: ServiceFramework{system_, "IHardwareOpusDecoder"},
|
enum class ExtraBehavior {
|
||||||
impl{std::make_unique<AudioCore::OpusDecoder::OpusDecoder>(system_, hardware_opus)} {
|
/// No extra behavior.
|
||||||
|
None,
|
||||||
|
|
||||||
|
/// Resets the decoder context back to a freshly initialized state.
|
||||||
|
ResetContext,
|
||||||
|
};
|
||||||
|
|
||||||
|
enum class PerfTime {
|
||||||
|
Disabled,
|
||||||
|
Enabled,
|
||||||
|
};
|
||||||
|
|
||||||
|
explicit OpusDecoderState(OpusDecoderPtr decoder_, u32 sample_rate_, u32 channel_count_)
|
||||||
|
: decoder{std::move(decoder_)}, sample_rate{sample_rate_}, channel_count{channel_count_} {}
|
||||||
|
|
||||||
|
// Decodes interleaved Opus packets. Optionally allows reporting time taken to
|
||||||
|
// perform the decoding, as well as any relevant extra behavior.
|
||||||
|
void DecodeInterleaved(HLERequestContext& ctx, PerfTime perf_time,
|
||||||
|
ExtraBehavior extra_behavior) {
|
||||||
|
if (perf_time == PerfTime::Disabled) {
|
||||||
|
DecodeInterleavedHelper(ctx, nullptr, extra_behavior);
|
||||||
|
} else {
|
||||||
|
u64 performance = 0;
|
||||||
|
DecodeInterleavedHelper(ctx, &performance, extra_behavior);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
void DecodeInterleavedHelper(HLERequestContext& ctx, u64* performance,
|
||||||
|
ExtraBehavior extra_behavior) {
|
||||||
|
u32 consumed = 0;
|
||||||
|
u32 sample_count = 0;
|
||||||
|
samples.resize_destructive(ctx.GetWriteBufferNumElements<opus_int16>());
|
||||||
|
|
||||||
|
if (extra_behavior == ExtraBehavior::ResetContext) {
|
||||||
|
ResetDecoderContext();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!DecodeOpusData(consumed, sample_count, ctx.ReadBuffer(), samples, performance)) {
|
||||||
|
LOG_ERROR(Audio, "Failed to decode opus data");
|
||||||
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
|
// TODO(ogniK): Use correct error code
|
||||||
|
rb.Push(ResultUnknown);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const u32 param_size = performance != nullptr ? 6 : 4;
|
||||||
|
IPC::ResponseBuilder rb{ctx, param_size};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
rb.Push<u32>(consumed);
|
||||||
|
rb.Push<u32>(sample_count);
|
||||||
|
if (performance) {
|
||||||
|
rb.Push<u64>(*performance);
|
||||||
|
}
|
||||||
|
ctx.WriteBuffer(samples);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool DecodeOpusData(u32& consumed, u32& sample_count, std::span<const u8> input,
|
||||||
|
std::span<opus_int16> output, u64* out_performance_time) const {
|
||||||
|
const auto start_time = std::chrono::steady_clock::now();
|
||||||
|
const std::size_t raw_output_sz = output.size() * sizeof(opus_int16);
|
||||||
|
if (sizeof(OpusPacketHeader) > input.size()) {
|
||||||
|
LOG_ERROR(Audio, "Input is smaller than the header size, header_sz={}, input_sz={}",
|
||||||
|
sizeof(OpusPacketHeader), input.size());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
OpusPacketHeader hdr{};
|
||||||
|
std::memcpy(&hdr, input.data(), sizeof(OpusPacketHeader));
|
||||||
|
if (sizeof(OpusPacketHeader) + static_cast<u32>(hdr.size) > input.size()) {
|
||||||
|
LOG_ERROR(Audio, "Input does not fit in the opus header size. data_sz={}, input_sz={}",
|
||||||
|
sizeof(OpusPacketHeader) + static_cast<u32>(hdr.size), input.size());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const auto frame = input.data() + sizeof(OpusPacketHeader);
|
||||||
|
const auto decoded_sample_count = opus_packet_get_nb_samples(
|
||||||
|
frame, static_cast<opus_int32>(input.size() - sizeof(OpusPacketHeader)),
|
||||||
|
static_cast<opus_int32>(sample_rate));
|
||||||
|
if (decoded_sample_count * channel_count * sizeof(u16) > raw_output_sz) {
|
||||||
|
LOG_ERROR(
|
||||||
|
Audio,
|
||||||
|
"Decoded data does not fit into the output data, decoded_sz={}, raw_output_sz={}",
|
||||||
|
decoded_sample_count * channel_count * sizeof(u16), raw_output_sz);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const int frame_size = (static_cast<int>(raw_output_sz / sizeof(s16) / channel_count));
|
||||||
|
const auto out_sample_count =
|
||||||
|
opus_multistream_decode(decoder.get(), frame, hdr.size, output.data(), frame_size, 0);
|
||||||
|
if (out_sample_count < 0) {
|
||||||
|
LOG_ERROR(Audio,
|
||||||
|
"Incorrect sample count received from opus_decode, "
|
||||||
|
"output_sample_count={}, frame_size={}, data_sz_from_hdr={}",
|
||||||
|
out_sample_count, frame_size, static_cast<u32>(hdr.size));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const auto end_time = std::chrono::steady_clock::now() - start_time;
|
||||||
|
sample_count = out_sample_count;
|
||||||
|
consumed = static_cast<u32>(sizeof(OpusPacketHeader) + hdr.size);
|
||||||
|
if (out_performance_time != nullptr) {
|
||||||
|
*out_performance_time =
|
||||||
|
std::chrono::duration_cast<std::chrono::milliseconds>(end_time).count();
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void ResetDecoderContext() {
|
||||||
|
ASSERT(decoder != nullptr);
|
||||||
|
|
||||||
|
opus_multistream_decoder_ctl(decoder.get(), OPUS_RESET_STATE);
|
||||||
|
}
|
||||||
|
|
||||||
|
OpusDecoderPtr decoder;
|
||||||
|
u32 sample_rate;
|
||||||
|
u32 channel_count;
|
||||||
|
Common::ScratchBuffer<opus_int16> samples;
|
||||||
|
};
|
||||||
|
|
||||||
|
class IHardwareOpusDecoderManager final : public ServiceFramework<IHardwareOpusDecoderManager> {
|
||||||
|
public:
|
||||||
|
explicit IHardwareOpusDecoderManager(Core::System& system_, OpusDecoderState decoder_state_)
|
||||||
|
: ServiceFramework{system_, "IHardwareOpusDecoderManager"}, decoder_state{
|
||||||
|
std::move(decoder_state_)} {
|
||||||
// clang-format off
|
// clang-format off
|
||||||
static const FunctionInfo functions[] = {
|
static const FunctionInfo functions[] = {
|
||||||
{0, &IHardwareOpusDecoder::DecodeInterleavedOld, "DecodeInterleavedOld"},
|
{0, &IHardwareOpusDecoderManager::DecodeInterleavedOld, "DecodeInterleavedOld"},
|
||||||
{1, &IHardwareOpusDecoder::SetContext, "SetContext"},
|
{1, nullptr, "SetContext"},
|
||||||
{2, &IHardwareOpusDecoder::DecodeInterleavedForMultiStreamOld, "DecodeInterleavedForMultiStreamOld"},
|
{2, nullptr, "DecodeInterleavedForMultiStreamOld"},
|
||||||
{3, &IHardwareOpusDecoder::SetContextForMultiStream, "SetContextForMultiStream"},
|
{3, nullptr, "SetContextForMultiStream"},
|
||||||
{4, &IHardwareOpusDecoder::DecodeInterleavedWithPerfOld, "DecodeInterleavedWithPerfOld"},
|
{4, &IHardwareOpusDecoderManager::DecodeInterleavedWithPerfOld, "DecodeInterleavedWithPerfOld"},
|
||||||
{5, &IHardwareOpusDecoder::DecodeInterleavedForMultiStreamWithPerfOld, "DecodeInterleavedForMultiStreamWithPerfOld"},
|
{5, nullptr, "DecodeInterleavedForMultiStreamWithPerfOld"},
|
||||||
{6, &IHardwareOpusDecoder::DecodeInterleavedWithPerfAndResetOld, "DecodeInterleavedWithPerfAndResetOld"},
|
{6, &IHardwareOpusDecoderManager::DecodeInterleaved, "DecodeInterleavedWithPerfAndResetOld"},
|
||||||
{7, &IHardwareOpusDecoder::DecodeInterleavedForMultiStreamWithPerfAndResetOld, "DecodeInterleavedForMultiStreamWithPerfAndResetOld"},
|
{7, nullptr, "DecodeInterleavedForMultiStreamWithPerfAndResetOld"},
|
||||||
{8, &IHardwareOpusDecoder::DecodeInterleaved, "DecodeInterleaved"},
|
{8, &IHardwareOpusDecoderManager::DecodeInterleaved, "DecodeInterleaved"},
|
||||||
{9, &IHardwareOpusDecoder::DecodeInterleavedForMultiStream, "DecodeInterleavedForMultiStream"},
|
{9, &IHardwareOpusDecoderManager::DecodeInterleavedForMultiStream, "DecodeInterleavedForMultiStream"},
|
||||||
};
|
};
|
||||||
// clang-format on
|
// clang-format on
|
||||||
|
|
||||||
RegisterHandlers(functions);
|
RegisterHandlers(functions);
|
||||||
}
|
}
|
||||||
|
|
||||||
Result Initialize(OpusParametersEx& params, Kernel::KTransferMemory* transfer_memory,
|
|
||||||
u64 transfer_memory_size) {
|
|
||||||
return impl->Initialize(params, transfer_memory, transfer_memory_size);
|
|
||||||
}
|
|
||||||
|
|
||||||
Result Initialize(OpusMultiStreamParametersEx& params, Kernel::KTransferMemory* transfer_memory,
|
|
||||||
u64 transfer_memory_size) {
|
|
||||||
return impl->Initialize(params, transfer_memory, transfer_memory_size);
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void DecodeInterleavedOld(HLERequestContext& ctx) {
|
void DecodeInterleavedOld(HLERequestContext& ctx) {
|
||||||
IPC::RequestParser rp{ctx};
|
LOG_DEBUG(Audio, "called");
|
||||||
|
|
||||||
auto input_data{ctx.ReadBuffer(0)};
|
decoder_state.DecodeInterleaved(ctx, OpusDecoderState::PerfTime::Disabled,
|
||||||
output_data.resize_destructive(ctx.GetWriteBufferSize());
|
OpusDecoderState::ExtraBehavior::None);
|
||||||
|
|
||||||
u32 size{};
|
|
||||||
u32 sample_count{};
|
|
||||||
auto result =
|
|
||||||
impl->DecodeInterleaved(&size, nullptr, &sample_count, input_data, output_data, false);
|
|
||||||
|
|
||||||
LOG_DEBUG(Service_Audio, "bytes read 0x{:X} samples generated {}", size, sample_count);
|
|
||||||
|
|
||||||
ctx.WriteBuffer(output_data);
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 4};
|
|
||||||
rb.Push(result);
|
|
||||||
rb.Push(size);
|
|
||||||
rb.Push(sample_count);
|
|
||||||
}
|
|
||||||
|
|
||||||
void SetContext(HLERequestContext& ctx) {
|
|
||||||
IPC::RequestParser rp{ctx};
|
|
||||||
|
|
||||||
LOG_DEBUG(Service_Audio, "called");
|
|
||||||
|
|
||||||
auto input_data{ctx.ReadBuffer(0)};
|
|
||||||
auto result = impl->SetContext(input_data);
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
|
||||||
rb.Push(result);
|
|
||||||
}
|
|
||||||
|
|
||||||
void DecodeInterleavedForMultiStreamOld(HLERequestContext& ctx) {
|
|
||||||
IPC::RequestParser rp{ctx};
|
|
||||||
|
|
||||||
auto input_data{ctx.ReadBuffer(0)};
|
|
||||||
output_data.resize_destructive(ctx.GetWriteBufferSize());
|
|
||||||
|
|
||||||
u32 size{};
|
|
||||||
u32 sample_count{};
|
|
||||||
auto result = impl->DecodeInterleavedForMultiStream(&size, nullptr, &sample_count,
|
|
||||||
input_data, output_data, false);
|
|
||||||
|
|
||||||
LOG_DEBUG(Service_Audio, "bytes read 0x{:X} samples generated {}", size, sample_count);
|
|
||||||
|
|
||||||
ctx.WriteBuffer(output_data);
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 4};
|
|
||||||
rb.Push(result);
|
|
||||||
rb.Push(size);
|
|
||||||
rb.Push(sample_count);
|
|
||||||
}
|
|
||||||
|
|
||||||
void SetContextForMultiStream(HLERequestContext& ctx) {
|
|
||||||
IPC::RequestParser rp{ctx};
|
|
||||||
|
|
||||||
LOG_DEBUG(Service_Audio, "called");
|
|
||||||
|
|
||||||
auto input_data{ctx.ReadBuffer(0)};
|
|
||||||
auto result = impl->SetContext(input_data);
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
|
||||||
rb.Push(result);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void DecodeInterleavedWithPerfOld(HLERequestContext& ctx) {
|
void DecodeInterleavedWithPerfOld(HLERequestContext& ctx) {
|
||||||
IPC::RequestParser rp{ctx};
|
LOG_DEBUG(Audio, "called");
|
||||||
|
|
||||||
auto input_data{ctx.ReadBuffer(0)};
|
decoder_state.DecodeInterleaved(ctx, OpusDecoderState::PerfTime::Enabled,
|
||||||
output_data.resize_destructive(ctx.GetWriteBufferSize());
|
OpusDecoderState::ExtraBehavior::None);
|
||||||
|
|
||||||
u32 size{};
|
|
||||||
u32 sample_count{};
|
|
||||||
u64 time_taken{};
|
|
||||||
auto result = impl->DecodeInterleaved(&size, &time_taken, &sample_count, input_data,
|
|
||||||
output_data, false);
|
|
||||||
|
|
||||||
LOG_DEBUG(Service_Audio, "bytes read 0x{:X} samples generated {} time taken {}", size,
|
|
||||||
sample_count, time_taken);
|
|
||||||
|
|
||||||
ctx.WriteBuffer(output_data);
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 6};
|
|
||||||
rb.Push(result);
|
|
||||||
rb.Push(size);
|
|
||||||
rb.Push(sample_count);
|
|
||||||
rb.Push(time_taken);
|
|
||||||
}
|
|
||||||
|
|
||||||
void DecodeInterleavedForMultiStreamWithPerfOld(HLERequestContext& ctx) {
|
|
||||||
IPC::RequestParser rp{ctx};
|
|
||||||
|
|
||||||
auto input_data{ctx.ReadBuffer(0)};
|
|
||||||
output_data.resize_destructive(ctx.GetWriteBufferSize());
|
|
||||||
|
|
||||||
u32 size{};
|
|
||||||
u32 sample_count{};
|
|
||||||
u64 time_taken{};
|
|
||||||
auto result = impl->DecodeInterleavedForMultiStream(&size, &time_taken, &sample_count,
|
|
||||||
input_data, output_data, false);
|
|
||||||
|
|
||||||
LOG_DEBUG(Service_Audio, "bytes read 0x{:X} samples generated {} time taken {}", size,
|
|
||||||
sample_count, time_taken);
|
|
||||||
|
|
||||||
ctx.WriteBuffer(output_data);
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 6};
|
|
||||||
rb.Push(result);
|
|
||||||
rb.Push(size);
|
|
||||||
rb.Push(sample_count);
|
|
||||||
rb.Push(time_taken);
|
|
||||||
}
|
|
||||||
|
|
||||||
void DecodeInterleavedWithPerfAndResetOld(HLERequestContext& ctx) {
|
|
||||||
IPC::RequestParser rp{ctx};
|
|
||||||
|
|
||||||
auto reset{rp.Pop<bool>()};
|
|
||||||
|
|
||||||
auto input_data{ctx.ReadBuffer(0)};
|
|
||||||
output_data.resize_destructive(ctx.GetWriteBufferSize());
|
|
||||||
|
|
||||||
u32 size{};
|
|
||||||
u32 sample_count{};
|
|
||||||
u64 time_taken{};
|
|
||||||
auto result = impl->DecodeInterleaved(&size, &time_taken, &sample_count, input_data,
|
|
||||||
output_data, reset);
|
|
||||||
|
|
||||||
LOG_DEBUG(Service_Audio, "reset {} bytes read 0x{:X} samples generated {} time taken {}",
|
|
||||||
reset, size, sample_count, time_taken);
|
|
||||||
|
|
||||||
ctx.WriteBuffer(output_data);
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 6};
|
|
||||||
rb.Push(result);
|
|
||||||
rb.Push(size);
|
|
||||||
rb.Push(sample_count);
|
|
||||||
rb.Push(time_taken);
|
|
||||||
}
|
|
||||||
|
|
||||||
void DecodeInterleavedForMultiStreamWithPerfAndResetOld(HLERequestContext& ctx) {
|
|
||||||
IPC::RequestParser rp{ctx};
|
|
||||||
|
|
||||||
auto reset{rp.Pop<bool>()};
|
|
||||||
|
|
||||||
auto input_data{ctx.ReadBuffer(0)};
|
|
||||||
output_data.resize_destructive(ctx.GetWriteBufferSize());
|
|
||||||
|
|
||||||
u32 size{};
|
|
||||||
u32 sample_count{};
|
|
||||||
u64 time_taken{};
|
|
||||||
auto result = impl->DecodeInterleavedForMultiStream(&size, &time_taken, &sample_count,
|
|
||||||
input_data, output_data, reset);
|
|
||||||
|
|
||||||
LOG_DEBUG(Service_Audio, "reset {} bytes read 0x{:X} samples generated {} time taken {}",
|
|
||||||
reset, size, sample_count, time_taken);
|
|
||||||
|
|
||||||
ctx.WriteBuffer(output_data);
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 6};
|
|
||||||
rb.Push(result);
|
|
||||||
rb.Push(size);
|
|
||||||
rb.Push(sample_count);
|
|
||||||
rb.Push(time_taken);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void DecodeInterleaved(HLERequestContext& ctx) {
|
void DecodeInterleaved(HLERequestContext& ctx) {
|
||||||
|
LOG_DEBUG(Audio, "called");
|
||||||
|
|
||||||
IPC::RequestParser rp{ctx};
|
IPC::RequestParser rp{ctx};
|
||||||
|
const auto extra_behavior = rp.Pop<bool>() ? OpusDecoderState::ExtraBehavior::ResetContext
|
||||||
|
: OpusDecoderState::ExtraBehavior::None;
|
||||||
|
|
||||||
auto reset{rp.Pop<bool>()};
|
decoder_state.DecodeInterleaved(ctx, OpusDecoderState::PerfTime::Enabled, extra_behavior);
|
||||||
|
|
||||||
auto input_data{ctx.ReadBuffer(0)};
|
|
||||||
output_data.resize_destructive(ctx.GetWriteBufferSize());
|
|
||||||
|
|
||||||
u32 size{};
|
|
||||||
u32 sample_count{};
|
|
||||||
u64 time_taken{};
|
|
||||||
auto result = impl->DecodeInterleaved(&size, &time_taken, &sample_count, input_data,
|
|
||||||
output_data, reset);
|
|
||||||
|
|
||||||
LOG_DEBUG(Service_Audio, "reset {} bytes read 0x{:X} samples generated {} time taken {}",
|
|
||||||
reset, size, sample_count, time_taken);
|
|
||||||
|
|
||||||
ctx.WriteBuffer(output_data);
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 6};
|
|
||||||
rb.Push(result);
|
|
||||||
rb.Push(size);
|
|
||||||
rb.Push(sample_count);
|
|
||||||
rb.Push(time_taken);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void DecodeInterleavedForMultiStream(HLERequestContext& ctx) {
|
void DecodeInterleavedForMultiStream(HLERequestContext& ctx) {
|
||||||
|
LOG_DEBUG(Audio, "called");
|
||||||
|
|
||||||
IPC::RequestParser rp{ctx};
|
IPC::RequestParser rp{ctx};
|
||||||
|
const auto extra_behavior = rp.Pop<bool>() ? OpusDecoderState::ExtraBehavior::ResetContext
|
||||||
|
: OpusDecoderState::ExtraBehavior::None;
|
||||||
|
|
||||||
auto reset{rp.Pop<bool>()};
|
decoder_state.DecodeInterleaved(ctx, OpusDecoderState::PerfTime::Enabled, extra_behavior);
|
||||||
|
|
||||||
auto input_data{ctx.ReadBuffer(0)};
|
|
||||||
output_data.resize_destructive(ctx.GetWriteBufferSize());
|
|
||||||
|
|
||||||
u32 size{};
|
|
||||||
u32 sample_count{};
|
|
||||||
u64 time_taken{};
|
|
||||||
auto result = impl->DecodeInterleavedForMultiStream(&size, &time_taken, &sample_count,
|
|
||||||
input_data, output_data, reset);
|
|
||||||
|
|
||||||
LOG_DEBUG(Service_Audio, "reset {} bytes read 0x{:X} samples generated {} time taken {}",
|
|
||||||
reset, size, sample_count, time_taken);
|
|
||||||
|
|
||||||
ctx.WriteBuffer(output_data);
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 6};
|
|
||||||
rb.Push(result);
|
|
||||||
rb.Push(size);
|
|
||||||
rb.Push(sample_count);
|
|
||||||
rb.Push(time_taken);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
std::unique_ptr<AudioCore::OpusDecoder::OpusDecoder> impl;
|
OpusDecoderState decoder_state;
|
||||||
Common::ScratchBuffer<u8> output_data;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
void HwOpus::OpenHardwareOpusDecoder(HLERequestContext& ctx) {
|
std::size_t WorkerBufferSize(u32 channel_count) {
|
||||||
IPC::RequestParser rp{ctx};
|
ASSERT_MSG(channel_count == 1 || channel_count == 2, "Invalid channel count");
|
||||||
|
constexpr int num_streams = 1;
|
||||||
auto params = rp.PopRaw<OpusParameters>();
|
const int num_stereo_streams = channel_count == 2 ? 1 : 0;
|
||||||
auto transfer_memory_size{rp.Pop<u32>()};
|
return opus_multistream_decoder_get_size(num_streams, num_stereo_streams);
|
||||||
auto transfer_memory_handle{ctx.GetCopyHandle(0)};
|
|
||||||
auto transfer_memory{
|
|
||||||
system.ApplicationProcess()->GetHandleTable().GetObject<Kernel::KTransferMemory>(
|
|
||||||
transfer_memory_handle)};
|
|
||||||
|
|
||||||
LOG_DEBUG(Service_Audio, "sample_rate {} channel_count {} transfer_memory_size 0x{:X}",
|
|
||||||
params.sample_rate, params.channel_count, transfer_memory_size);
|
|
||||||
|
|
||||||
auto decoder{std::make_shared<IHardwareOpusDecoder>(system, impl.GetHardwareOpus())};
|
|
||||||
|
|
||||||
OpusParametersEx ex{
|
|
||||||
.sample_rate = params.sample_rate,
|
|
||||||
.channel_count = params.channel_count,
|
|
||||||
.use_large_frame_size = false,
|
|
||||||
};
|
|
||||||
auto result = decoder->Initialize(ex, transfer_memory.GetPointerUnsafe(), transfer_memory_size);
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
|
||||||
rb.Push(result);
|
|
||||||
rb.PushIpcInterface(decoder);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Creates the mapping table that maps the input channels to the particular
|
||||||
|
// output channels. In the stereo case, we map the left and right input channels
|
||||||
|
// to the left and right output channels respectively.
|
||||||
|
//
|
||||||
|
// However, in the monophonic case, we only map the one available channel
|
||||||
|
// to the sole output channel. We specify 255 for the would-be right channel
|
||||||
|
// as this is a special value defined by Opus to indicate to the decoder to
|
||||||
|
// ignore that channel.
|
||||||
|
std::array<u8, 2> CreateMappingTable(u32 channel_count) {
|
||||||
|
if (channel_count == 2) {
|
||||||
|
return {{0, 1}};
|
||||||
|
}
|
||||||
|
|
||||||
|
return {{0, 255}};
|
||||||
|
}
|
||||||
|
} // Anonymous namespace
|
||||||
|
|
||||||
void HwOpus::GetWorkBufferSize(HLERequestContext& ctx) {
|
void HwOpus::GetWorkBufferSize(HLERequestContext& ctx) {
|
||||||
IPC::RequestParser rp{ctx};
|
IPC::RequestParser rp{ctx};
|
||||||
auto params = rp.PopRaw<OpusParameters>();
|
const auto sample_rate = rp.Pop<u32>();
|
||||||
|
const auto channel_count = rp.Pop<u32>();
|
||||||
|
|
||||||
u64 size{};
|
LOG_DEBUG(Audio, "called with sample_rate={}, channel_count={}", sample_rate, channel_count);
|
||||||
auto result = impl.GetWorkBufferSize(params, size);
|
|
||||||
|
|
||||||
LOG_DEBUG(Service_Audio, "sample_rate {} channel_count {} -- returned size 0x{:X}",
|
ASSERT_MSG(sample_rate == 48000 || sample_rate == 24000 || sample_rate == 16000 ||
|
||||||
params.sample_rate, params.channel_count, size);
|
sample_rate == 12000 || sample_rate == 8000,
|
||||||
|
"Invalid sample rate");
|
||||||
|
ASSERT_MSG(channel_count == 1 || channel_count == 2, "Invalid channel count");
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 4};
|
const u32 worker_buffer_sz = static_cast<u32>(WorkerBufferSize(channel_count));
|
||||||
rb.Push(result);
|
LOG_DEBUG(Audio, "worker_buffer_sz={}", worker_buffer_sz);
|
||||||
rb.Push(size);
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 3};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
rb.Push<u32>(worker_buffer_sz);
|
||||||
}
|
}
|
||||||
|
|
||||||
void HwOpus::OpenHardwareOpusDecoderForMultiStream(HLERequestContext& ctx) {
|
void HwOpus::GetWorkBufferSizeEx(HLERequestContext& ctx) {
|
||||||
|
GetWorkBufferSize(ctx);
|
||||||
|
}
|
||||||
|
|
||||||
|
void HwOpus::GetWorkBufferSizeExEx(HLERequestContext& ctx) {
|
||||||
|
GetWorkBufferSizeEx(ctx);
|
||||||
|
}
|
||||||
|
|
||||||
|
void HwOpus::GetWorkBufferSizeForMultiStreamEx(HLERequestContext& ctx) {
|
||||||
|
OpusMultiStreamParametersEx param;
|
||||||
|
std::memcpy(¶m, ctx.ReadBuffer().data(), ctx.GetReadBufferSize());
|
||||||
|
|
||||||
|
const auto sample_rate = param.sample_rate;
|
||||||
|
const auto channel_count = param.channel_count;
|
||||||
|
const auto number_streams = param.number_streams;
|
||||||
|
const auto number_stereo_streams = param.number_stereo_streams;
|
||||||
|
|
||||||
|
LOG_DEBUG(
|
||||||
|
Audio,
|
||||||
|
"called with sample_rate={}, channel_count={}, number_streams={}, number_stereo_streams={}",
|
||||||
|
sample_rate, channel_count, number_streams, number_stereo_streams);
|
||||||
|
|
||||||
|
ASSERT_MSG(sample_rate == 48000 || sample_rate == 24000 || sample_rate == 16000 ||
|
||||||
|
sample_rate == 12000 || sample_rate == 8000,
|
||||||
|
"Invalid sample rate");
|
||||||
|
|
||||||
|
const u32 worker_buffer_sz =
|
||||||
|
static_cast<u32>(opus_multistream_decoder_get_size(number_streams, number_stereo_streams));
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 3};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
rb.Push<u32>(worker_buffer_sz);
|
||||||
|
}
|
||||||
|
|
||||||
|
void HwOpus::OpenHardwareOpusDecoder(HLERequestContext& ctx) {
|
||||||
IPC::RequestParser rp{ctx};
|
IPC::RequestParser rp{ctx};
|
||||||
|
const auto sample_rate = rp.Pop<u32>();
|
||||||
|
const auto channel_count = rp.Pop<u32>();
|
||||||
|
const auto buffer_sz = rp.Pop<u32>();
|
||||||
|
|
||||||
auto input{ctx.ReadBuffer()};
|
LOG_DEBUG(Audio, "called sample_rate={}, channel_count={}, buffer_size={}", sample_rate,
|
||||||
OpusMultiStreamParameters params;
|
channel_count, buffer_sz);
|
||||||
std::memcpy(¶ms, input.data(), sizeof(OpusMultiStreamParameters));
|
|
||||||
|
|
||||||
auto transfer_memory_size{rp.Pop<u32>()};
|
ASSERT_MSG(sample_rate == 48000 || sample_rate == 24000 || sample_rate == 16000 ||
|
||||||
auto transfer_memory_handle{ctx.GetCopyHandle(0)};
|
sample_rate == 12000 || sample_rate == 8000,
|
||||||
auto transfer_memory{
|
"Invalid sample rate");
|
||||||
system.ApplicationProcess()->GetHandleTable().GetObject<Kernel::KTransferMemory>(
|
ASSERT_MSG(channel_count == 1 || channel_count == 2, "Invalid channel count");
|
||||||
transfer_memory_handle)};
|
|
||||||
|
|
||||||
LOG_DEBUG(Service_Audio,
|
const std::size_t worker_sz = WorkerBufferSize(channel_count);
|
||||||
"sample_rate {} channel_count {} total_stream_count {} stereo_stream_count {} "
|
ASSERT_MSG(buffer_sz >= worker_sz, "Worker buffer too large");
|
||||||
"transfer_memory_size 0x{:X}",
|
|
||||||
params.sample_rate, params.channel_count, params.total_stream_count,
|
|
||||||
params.stereo_stream_count, transfer_memory_size);
|
|
||||||
|
|
||||||
auto decoder{std::make_shared<IHardwareOpusDecoder>(system, impl.GetHardwareOpus())};
|
const int num_stereo_streams = channel_count == 2 ? 1 : 0;
|
||||||
|
const auto mapping_table = CreateMappingTable(channel_count);
|
||||||
|
|
||||||
OpusMultiStreamParametersEx ex{
|
int error = 0;
|
||||||
.sample_rate = params.sample_rate,
|
OpusDecoderPtr decoder{
|
||||||
.channel_count = params.channel_count,
|
opus_multistream_decoder_create(sample_rate, static_cast<int>(channel_count), 1,
|
||||||
.total_stream_count = params.total_stream_count,
|
num_stereo_streams, mapping_table.data(), &error)};
|
||||||
.stereo_stream_count = params.stereo_stream_count,
|
if (error != OPUS_OK || decoder == nullptr) {
|
||||||
.use_large_frame_size = false,
|
LOG_ERROR(Audio, "Failed to create Opus decoder (error={}).", error);
|
||||||
.mappings{},
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
};
|
// TODO(ogniK): Use correct error code
|
||||||
std::memcpy(ex.mappings.data(), params.mappings.data(), sizeof(params.mappings));
|
rb.Push(ResultUnknown);
|
||||||
auto result = decoder->Initialize(ex, transfer_memory.GetPointerUnsafe(), transfer_memory_size);
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
||||||
rb.Push(result);
|
rb.Push(ResultSuccess);
|
||||||
rb.PushIpcInterface(decoder);
|
rb.PushIpcInterface<IHardwareOpusDecoderManager>(
|
||||||
}
|
system, OpusDecoderState{std::move(decoder), sample_rate, channel_count});
|
||||||
|
|
||||||
void HwOpus::GetWorkBufferSizeForMultiStream(HLERequestContext& ctx) {
|
|
||||||
IPC::RequestParser rp{ctx};
|
|
||||||
|
|
||||||
auto input{ctx.ReadBuffer()};
|
|
||||||
OpusMultiStreamParameters params;
|
|
||||||
std::memcpy(¶ms, input.data(), sizeof(OpusMultiStreamParameters));
|
|
||||||
|
|
||||||
u64 size{};
|
|
||||||
auto result = impl.GetWorkBufferSizeForMultiStream(params, size);
|
|
||||||
|
|
||||||
LOG_DEBUG(Service_Audio, "size 0x{:X}", size);
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 4};
|
|
||||||
rb.Push(result);
|
|
||||||
rb.Push(size);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void HwOpus::OpenHardwareOpusDecoderEx(HLERequestContext& ctx) {
|
void HwOpus::OpenHardwareOpusDecoderEx(HLERequestContext& ctx) {
|
||||||
IPC::RequestParser rp{ctx};
|
IPC::RequestParser rp{ctx};
|
||||||
|
const auto sample_rate = rp.Pop<u32>();
|
||||||
|
const auto channel_count = rp.Pop<u32>();
|
||||||
|
|
||||||
auto params = rp.PopRaw<OpusParametersEx>();
|
LOG_DEBUG(Audio, "called sample_rate={}, channel_count={}", sample_rate, channel_count);
|
||||||
auto transfer_memory_size{rp.Pop<u32>()};
|
|
||||||
auto transfer_memory_handle{ctx.GetCopyHandle(0)};
|
|
||||||
auto transfer_memory{
|
|
||||||
system.ApplicationProcess()->GetHandleTable().GetObject<Kernel::KTransferMemory>(
|
|
||||||
transfer_memory_handle)};
|
|
||||||
|
|
||||||
LOG_DEBUG(Service_Audio, "sample_rate {} channel_count {} transfer_memory_size 0x{:X}",
|
ASSERT_MSG(sample_rate == 48000 || sample_rate == 24000 || sample_rate == 16000 ||
|
||||||
params.sample_rate, params.channel_count, transfer_memory_size);
|
sample_rate == 12000 || sample_rate == 8000,
|
||||||
|
"Invalid sample rate");
|
||||||
|
ASSERT_MSG(channel_count == 1 || channel_count == 2, "Invalid channel count");
|
||||||
|
|
||||||
auto decoder{std::make_shared<IHardwareOpusDecoder>(system, impl.GetHardwareOpus())};
|
const int num_stereo_streams = channel_count == 2 ? 1 : 0;
|
||||||
|
const auto mapping_table = CreateMappingTable(channel_count);
|
||||||
|
|
||||||
auto result =
|
int error = 0;
|
||||||
decoder->Initialize(params, transfer_memory.GetPointerUnsafe(), transfer_memory_size);
|
OpusDecoderPtr decoder{
|
||||||
|
opus_multistream_decoder_create(sample_rate, static_cast<int>(channel_count), 1,
|
||||||
|
num_stereo_streams, mapping_table.data(), &error)};
|
||||||
|
if (error != OPUS_OK || decoder == nullptr) {
|
||||||
|
LOG_ERROR(Audio, "Failed to create Opus decoder (error={}).", error);
|
||||||
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
|
// TODO(ogniK): Use correct error code
|
||||||
|
rb.Push(ResultUnknown);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
||||||
rb.Push(result);
|
rb.Push(ResultSuccess);
|
||||||
rb.PushIpcInterface(decoder);
|
rb.PushIpcInterface<IHardwareOpusDecoderManager>(
|
||||||
}
|
system, OpusDecoderState{std::move(decoder), sample_rate, channel_count});
|
||||||
|
|
||||||
void HwOpus::GetWorkBufferSizeEx(HLERequestContext& ctx) {
|
|
||||||
IPC::RequestParser rp{ctx};
|
|
||||||
auto params = rp.PopRaw<OpusParametersEx>();
|
|
||||||
|
|
||||||
u64 size{};
|
|
||||||
auto result = impl.GetWorkBufferSizeEx(params, size);
|
|
||||||
|
|
||||||
LOG_DEBUG(Service_Audio, "size 0x{:X}", size);
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 4};
|
|
||||||
rb.Push(result);
|
|
||||||
rb.Push(size);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void HwOpus::OpenHardwareOpusDecoderForMultiStreamEx(HLERequestContext& ctx) {
|
void HwOpus::OpenHardwareOpusDecoderForMultiStreamEx(HLERequestContext& ctx) {
|
||||||
IPC::RequestParser rp{ctx};
|
|
||||||
|
|
||||||
auto input{ctx.ReadBuffer()};
|
|
||||||
OpusMultiStreamParametersEx params;
|
OpusMultiStreamParametersEx params;
|
||||||
std::memcpy(¶ms, input.data(), sizeof(OpusMultiStreamParametersEx));
|
std::memcpy(¶ms, ctx.ReadBuffer().data(), ctx.GetReadBufferSize());
|
||||||
|
|
||||||
auto transfer_memory_size{rp.Pop<u32>()};
|
const auto& sample_rate = params.sample_rate;
|
||||||
auto transfer_memory_handle{ctx.GetCopyHandle(0)};
|
const auto& channel_count = params.channel_count;
|
||||||
auto transfer_memory{
|
|
||||||
system.ApplicationProcess()->GetHandleTable().GetObject<Kernel::KTransferMemory>(
|
|
||||||
transfer_memory_handle)};
|
|
||||||
|
|
||||||
LOG_DEBUG(Service_Audio,
|
LOG_INFO(
|
||||||
"sample_rate {} channel_count {} total_stream_count {} stereo_stream_count {} "
|
Audio,
|
||||||
"use_large_frame_size {}"
|
"called with sample_rate={}, channel_count={}, number_streams={}, number_stereo_streams={}",
|
||||||
"transfer_memory_size 0x{:X}",
|
sample_rate, channel_count, params.number_streams, params.number_stereo_streams);
|
||||||
params.sample_rate, params.channel_count, params.total_stream_count,
|
|
||||||
params.stereo_stream_count, params.use_large_frame_size, transfer_memory_size);
|
|
||||||
|
|
||||||
auto decoder{std::make_shared<IHardwareOpusDecoder>(system, impl.GetHardwareOpus())};
|
ASSERT_MSG(sample_rate == 48000 || sample_rate == 24000 || sample_rate == 16000 ||
|
||||||
|
sample_rate == 12000 || sample_rate == 8000,
|
||||||
|
"Invalid sample rate");
|
||||||
|
|
||||||
auto result =
|
int error = 0;
|
||||||
decoder->Initialize(params, transfer_memory.GetPointerUnsafe(), transfer_memory_size);
|
OpusDecoderPtr decoder{opus_multistream_decoder_create(
|
||||||
|
sample_rate, static_cast<int>(channel_count), params.number_streams,
|
||||||
|
params.number_stereo_streams, params.channel_mappings.data(), &error)};
|
||||||
|
if (error != OPUS_OK || decoder == nullptr) {
|
||||||
|
LOG_ERROR(Audio, "Failed to create Opus decoder (error={}).", error);
|
||||||
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
|
// TODO(ogniK): Use correct error code
|
||||||
|
rb.Push(ResultUnknown);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
||||||
rb.Push(result);
|
rb.Push(ResultSuccess);
|
||||||
rb.PushIpcInterface(decoder);
|
rb.PushIpcInterface<IHardwareOpusDecoderManager>(
|
||||||
|
system, OpusDecoderState{std::move(decoder), sample_rate, channel_count});
|
||||||
}
|
}
|
||||||
|
|
||||||
void HwOpus::GetWorkBufferSizeForMultiStreamEx(HLERequestContext& ctx) {
|
HwOpus::HwOpus(Core::System& system_) : ServiceFramework{system_, "hwopus"} {
|
||||||
IPC::RequestParser rp{ctx};
|
|
||||||
|
|
||||||
auto input{ctx.ReadBuffer()};
|
|
||||||
OpusMultiStreamParametersEx params;
|
|
||||||
std::memcpy(¶ms, input.data(), sizeof(OpusMultiStreamParametersEx));
|
|
||||||
|
|
||||||
u64 size{};
|
|
||||||
auto result = impl.GetWorkBufferSizeForMultiStreamEx(params, size);
|
|
||||||
|
|
||||||
LOG_DEBUG(Service_Audio,
|
|
||||||
"sample_rate {} channel_count {} total_stream_count {} stereo_stream_count {} "
|
|
||||||
"use_large_frame_size {} -- returned size 0x{:X}",
|
|
||||||
params.sample_rate, params.channel_count, params.total_stream_count,
|
|
||||||
params.stereo_stream_count, params.use_large_frame_size, size);
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 4};
|
|
||||||
rb.Push(result);
|
|
||||||
rb.Push(size);
|
|
||||||
}
|
|
||||||
|
|
||||||
void HwOpus::GetWorkBufferSizeExEx(HLERequestContext& ctx) {
|
|
||||||
IPC::RequestParser rp{ctx};
|
|
||||||
auto params = rp.PopRaw<OpusParametersEx>();
|
|
||||||
|
|
||||||
u64 size{};
|
|
||||||
auto result = impl.GetWorkBufferSizeExEx(params, size);
|
|
||||||
|
|
||||||
LOG_DEBUG(Service_Audio, "size 0x{:X}", size);
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 4};
|
|
||||||
rb.Push(result);
|
|
||||||
rb.Push(size);
|
|
||||||
}
|
|
||||||
|
|
||||||
void HwOpus::GetWorkBufferSizeForMultiStreamExEx(HLERequestContext& ctx) {
|
|
||||||
IPC::RequestParser rp{ctx};
|
|
||||||
|
|
||||||
auto input{ctx.ReadBuffer()};
|
|
||||||
OpusMultiStreamParametersEx params;
|
|
||||||
std::memcpy(¶ms, input.data(), sizeof(OpusMultiStreamParametersEx));
|
|
||||||
|
|
||||||
u64 size{};
|
|
||||||
auto result = impl.GetWorkBufferSizeForMultiStreamExEx(params, size);
|
|
||||||
|
|
||||||
LOG_DEBUG(Service_Audio, "size 0x{:X}", size);
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 4};
|
|
||||||
rb.Push(result);
|
|
||||||
rb.Push(size);
|
|
||||||
}
|
|
||||||
|
|
||||||
HwOpus::HwOpus(Core::System& system_)
|
|
||||||
: ServiceFramework{system_, "hwopus"}, system{system_}, impl{system} {
|
|
||||||
static const FunctionInfo functions[] = {
|
static const FunctionInfo functions[] = {
|
||||||
{0, &HwOpus::OpenHardwareOpusDecoder, "OpenHardwareOpusDecoder"},
|
{0, &HwOpus::OpenHardwareOpusDecoder, "OpenHardwareOpusDecoder"},
|
||||||
{1, &HwOpus::GetWorkBufferSize, "GetWorkBufferSize"},
|
{1, &HwOpus::GetWorkBufferSize, "GetWorkBufferSize"},
|
||||||
{2, &HwOpus::OpenHardwareOpusDecoderForMultiStream, "OpenOpusDecoderForMultiStream"},
|
{2, nullptr, "OpenOpusDecoderForMultiStream"},
|
||||||
{3, &HwOpus::GetWorkBufferSizeForMultiStream, "GetWorkBufferSizeForMultiStream"},
|
{3, nullptr, "GetWorkBufferSizeForMultiStream"},
|
||||||
{4, &HwOpus::OpenHardwareOpusDecoderEx, "OpenHardwareOpusDecoderEx"},
|
{4, &HwOpus::OpenHardwareOpusDecoderEx, "OpenHardwareOpusDecoderEx"},
|
||||||
{5, &HwOpus::GetWorkBufferSizeEx, "GetWorkBufferSizeEx"},
|
{5, &HwOpus::GetWorkBufferSizeEx, "GetWorkBufferSizeEx"},
|
||||||
{6, &HwOpus::OpenHardwareOpusDecoderForMultiStreamEx,
|
{6, &HwOpus::OpenHardwareOpusDecoderForMultiStreamEx,
|
||||||
"OpenHardwareOpusDecoderForMultiStreamEx"},
|
"OpenHardwareOpusDecoderForMultiStreamEx"},
|
||||||
{7, &HwOpus::GetWorkBufferSizeForMultiStreamEx, "GetWorkBufferSizeForMultiStreamEx"},
|
{7, &HwOpus::GetWorkBufferSizeForMultiStreamEx, "GetWorkBufferSizeForMultiStreamEx"},
|
||||||
{8, &HwOpus::GetWorkBufferSizeExEx, "GetWorkBufferSizeExEx"},
|
{8, &HwOpus::GetWorkBufferSizeExEx, "GetWorkBufferSizeExEx"},
|
||||||
{9, &HwOpus::GetWorkBufferSizeForMultiStreamExEx, "GetWorkBufferSizeForMultiStreamExEx"},
|
{9, nullptr, "GetWorkBufferSizeForMultiStreamExEx"},
|
||||||
};
|
};
|
||||||
RegisterHandlers(functions);
|
RegisterHandlers(functions);
|
||||||
}
|
}
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "audio_core/opus/decoder_manager.h"
|
|
||||||
#include "core/hle/service/service.h"
|
#include "core/hle/service/service.h"
|
||||||
|
|
||||||
namespace Core {
|
namespace Core {
|
||||||
@ -12,6 +11,18 @@ class System;
|
|||||||
|
|
||||||
namespace Service::Audio {
|
namespace Service::Audio {
|
||||||
|
|
||||||
|
struct OpusMultiStreamParametersEx {
|
||||||
|
u32 sample_rate;
|
||||||
|
u32 channel_count;
|
||||||
|
u32 number_streams;
|
||||||
|
u32 number_stereo_streams;
|
||||||
|
u32 use_large_frame_size;
|
||||||
|
u32 padding;
|
||||||
|
std::array<u8, 0x100> channel_mappings;
|
||||||
|
};
|
||||||
|
static_assert(sizeof(OpusMultiStreamParametersEx) == 0x118,
|
||||||
|
"OpusMultiStreamParametersEx has incorrect size");
|
||||||
|
|
||||||
class HwOpus final : public ServiceFramework<HwOpus> {
|
class HwOpus final : public ServiceFramework<HwOpus> {
|
||||||
public:
|
public:
|
||||||
explicit HwOpus(Core::System& system_);
|
explicit HwOpus(Core::System& system_);
|
||||||
@ -19,18 +30,12 @@ public:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
void OpenHardwareOpusDecoder(HLERequestContext& ctx);
|
void OpenHardwareOpusDecoder(HLERequestContext& ctx);
|
||||||
void GetWorkBufferSize(HLERequestContext& ctx);
|
|
||||||
void OpenHardwareOpusDecoderForMultiStream(HLERequestContext& ctx);
|
|
||||||
void GetWorkBufferSizeForMultiStream(HLERequestContext& ctx);
|
|
||||||
void OpenHardwareOpusDecoderEx(HLERequestContext& ctx);
|
void OpenHardwareOpusDecoderEx(HLERequestContext& ctx);
|
||||||
void GetWorkBufferSizeEx(HLERequestContext& ctx);
|
|
||||||
void OpenHardwareOpusDecoderForMultiStreamEx(HLERequestContext& ctx);
|
void OpenHardwareOpusDecoderForMultiStreamEx(HLERequestContext& ctx);
|
||||||
void GetWorkBufferSizeForMultiStreamEx(HLERequestContext& ctx);
|
void GetWorkBufferSize(HLERequestContext& ctx);
|
||||||
|
void GetWorkBufferSizeEx(HLERequestContext& ctx);
|
||||||
void GetWorkBufferSizeExEx(HLERequestContext& ctx);
|
void GetWorkBufferSizeExEx(HLERequestContext& ctx);
|
||||||
void GetWorkBufferSizeForMultiStreamExEx(HLERequestContext& ctx);
|
void GetWorkBufferSizeForMultiStreamEx(HLERequestContext& ctx);
|
||||||
|
|
||||||
Core::System& system;
|
|
||||||
AudioCore::OpusDecoder::OpusDecoderManager impl;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Service::Audio
|
} // namespace Service::Audio
|
||||||
|
@ -698,7 +698,7 @@ FSP_SRV::FSP_SRV(Core::System& system_)
|
|||||||
{19, nullptr, "FormatSdCardFileSystem"},
|
{19, nullptr, "FormatSdCardFileSystem"},
|
||||||
{21, nullptr, "DeleteSaveDataFileSystem"},
|
{21, nullptr, "DeleteSaveDataFileSystem"},
|
||||||
{22, &FSP_SRV::CreateSaveDataFileSystem, "CreateSaveDataFileSystem"},
|
{22, &FSP_SRV::CreateSaveDataFileSystem, "CreateSaveDataFileSystem"},
|
||||||
{23, &FSP_SRV::CreateSaveDataFileSystemBySystemSaveDataId, "CreateSaveDataFileSystemBySystemSaveDataId"},
|
{23, nullptr, "CreateSaveDataFileSystemBySystemSaveDataId"},
|
||||||
{24, nullptr, "RegisterSaveDataFileSystemAtomicDeletion"},
|
{24, nullptr, "RegisterSaveDataFileSystemAtomicDeletion"},
|
||||||
{25, nullptr, "DeleteSaveDataFileSystemBySaveDataSpaceId"},
|
{25, nullptr, "DeleteSaveDataFileSystemBySaveDataSpaceId"},
|
||||||
{26, nullptr, "FormatSdCardDryRun"},
|
{26, nullptr, "FormatSdCardDryRun"},
|
||||||
@ -712,7 +712,7 @@ FSP_SRV::FSP_SRV(Core::System& system_)
|
|||||||
{35, nullptr, "CreateSaveDataFileSystemByHashSalt"},
|
{35, nullptr, "CreateSaveDataFileSystemByHashSalt"},
|
||||||
{36, nullptr, "OpenHostFileSystemWithOption"},
|
{36, nullptr, "OpenHostFileSystemWithOption"},
|
||||||
{51, &FSP_SRV::OpenSaveDataFileSystem, "OpenSaveDataFileSystem"},
|
{51, &FSP_SRV::OpenSaveDataFileSystem, "OpenSaveDataFileSystem"},
|
||||||
{52, &FSP_SRV::OpenSaveDataFileSystemBySystemSaveDataId, "OpenSaveDataFileSystemBySystemSaveDataId"},
|
{52, nullptr, "OpenSaveDataFileSystemBySystemSaveDataId"},
|
||||||
{53, &FSP_SRV::OpenReadOnlySaveDataFileSystem, "OpenReadOnlySaveDataFileSystem"},
|
{53, &FSP_SRV::OpenReadOnlySaveDataFileSystem, "OpenReadOnlySaveDataFileSystem"},
|
||||||
{57, nullptr, "ReadSaveDataFileSystemExtraDataBySaveDataSpaceId"},
|
{57, nullptr, "ReadSaveDataFileSystemExtraDataBySaveDataSpaceId"},
|
||||||
{58, nullptr, "ReadSaveDataFileSystemExtraData"},
|
{58, nullptr, "ReadSaveDataFileSystemExtraData"},
|
||||||
@ -870,21 +870,6 @@ void FSP_SRV::CreateSaveDataFileSystem(HLERequestContext& ctx) {
|
|||||||
rb.Push(ResultSuccess);
|
rb.Push(ResultSuccess);
|
||||||
}
|
}
|
||||||
|
|
||||||
void FSP_SRV::CreateSaveDataFileSystemBySystemSaveDataId(HLERequestContext& ctx) {
|
|
||||||
IPC::RequestParser rp{ctx};
|
|
||||||
|
|
||||||
auto save_struct = rp.PopRaw<FileSys::SaveDataAttribute>();
|
|
||||||
[[maybe_unused]] auto save_create_struct = rp.PopRaw<std::array<u8, 0x40>>();
|
|
||||||
|
|
||||||
LOG_DEBUG(Service_FS, "called save_struct = {}", save_struct.DebugInfo());
|
|
||||||
|
|
||||||
FileSys::VirtualDir save_data_dir{};
|
|
||||||
fsc.CreateSaveData(&save_data_dir, FileSys::SaveDataSpaceId::NandSystem, save_struct);
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
|
||||||
rb.Push(ResultSuccess);
|
|
||||||
}
|
|
||||||
|
|
||||||
void FSP_SRV::OpenSaveDataFileSystem(HLERequestContext& ctx) {
|
void FSP_SRV::OpenSaveDataFileSystem(HLERequestContext& ctx) {
|
||||||
IPC::RequestParser rp{ctx};
|
IPC::RequestParser rp{ctx};
|
||||||
|
|
||||||
@ -931,11 +916,6 @@ void FSP_SRV::OpenSaveDataFileSystem(HLERequestContext& ctx) {
|
|||||||
rb.PushIpcInterface<IFileSystem>(std::move(filesystem));
|
rb.PushIpcInterface<IFileSystem>(std::move(filesystem));
|
||||||
}
|
}
|
||||||
|
|
||||||
void FSP_SRV::OpenSaveDataFileSystemBySystemSaveDataId(HLERequestContext& ctx) {
|
|
||||||
LOG_WARNING(Service_FS, "(STUBBED) called, delegating to 51 OpenSaveDataFilesystem");
|
|
||||||
OpenSaveDataFileSystem(ctx);
|
|
||||||
}
|
|
||||||
|
|
||||||
void FSP_SRV::OpenReadOnlySaveDataFileSystem(HLERequestContext& ctx) {
|
void FSP_SRV::OpenReadOnlySaveDataFileSystem(HLERequestContext& ctx) {
|
||||||
LOG_WARNING(Service_FS, "(STUBBED) called, delegating to 51 OpenSaveDataFilesystem");
|
LOG_WARNING(Service_FS, "(STUBBED) called, delegating to 51 OpenSaveDataFilesystem");
|
||||||
OpenSaveDataFileSystem(ctx);
|
OpenSaveDataFileSystem(ctx);
|
||||||
|
@ -39,9 +39,7 @@ private:
|
|||||||
void OpenFileSystemWithPatch(HLERequestContext& ctx);
|
void OpenFileSystemWithPatch(HLERequestContext& ctx);
|
||||||
void OpenSdCardFileSystem(HLERequestContext& ctx);
|
void OpenSdCardFileSystem(HLERequestContext& ctx);
|
||||||
void CreateSaveDataFileSystem(HLERequestContext& ctx);
|
void CreateSaveDataFileSystem(HLERequestContext& ctx);
|
||||||
void CreateSaveDataFileSystemBySystemSaveDataId(HLERequestContext& ctx);
|
|
||||||
void OpenSaveDataFileSystem(HLERequestContext& ctx);
|
void OpenSaveDataFileSystem(HLERequestContext& ctx);
|
||||||
void OpenSaveDataFileSystemBySystemSaveDataId(HLERequestContext& ctx);
|
|
||||||
void OpenReadOnlySaveDataFileSystem(HLERequestContext& ctx);
|
void OpenReadOnlySaveDataFileSystem(HLERequestContext& ctx);
|
||||||
void OpenSaveDataInfoReaderBySaveDataSpaceId(HLERequestContext& ctx);
|
void OpenSaveDataInfoReaderBySaveDataSpaceId(HLERequestContext& ctx);
|
||||||
void OpenSaveDataInfoReaderOnlyCacheStorage(HLERequestContext& ctx);
|
void OpenSaveDataInfoReaderOnlyCacheStorage(HLERequestContext& ctx);
|
||||||
|
@ -346,7 +346,6 @@ void Controller_NPad::InitNewlyAddedController(Core::HID::NpadIdType npad_id) {
|
|||||||
}
|
}
|
||||||
SignalStyleSetChangedEvent(npad_id);
|
SignalStyleSetChangedEvent(npad_id);
|
||||||
WriteEmptyEntry(controller.shared_memory);
|
WriteEmptyEntry(controller.shared_memory);
|
||||||
hid_core.SetLastActiveController(npad_id);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Controller_NPad::OnInit() {
|
void Controller_NPad::OnInit() {
|
||||||
|
@ -8,9 +8,6 @@
|
|||||||
#include "core/hle/service/mii/mii.h"
|
#include "core/hle/service/mii/mii.h"
|
||||||
#include "core/hle/service/mii/mii_manager.h"
|
#include "core/hle/service/mii/mii_manager.h"
|
||||||
#include "core/hle/service/mii/mii_result.h"
|
#include "core/hle/service/mii/mii_result.h"
|
||||||
#include "core/hle/service/mii/types/char_info.h"
|
|
||||||
#include "core/hle/service/mii/types/store_data.h"
|
|
||||||
#include "core/hle/service/mii/types/ver3_store_data.h"
|
|
||||||
#include "core/hle/service/server_manager.h"
|
#include "core/hle/service/server_manager.h"
|
||||||
#include "core/hle/service/service.h"
|
#include "core/hle/service/service.h"
|
||||||
|
|
||||||
@ -18,10 +15,8 @@ namespace Service::Mii {
|
|||||||
|
|
||||||
class IDatabaseService final : public ServiceFramework<IDatabaseService> {
|
class IDatabaseService final : public ServiceFramework<IDatabaseService> {
|
||||||
public:
|
public:
|
||||||
explicit IDatabaseService(Core::System& system_, std::shared_ptr<MiiManager> mii_manager,
|
explicit IDatabaseService(Core::System& system_, bool is_system_)
|
||||||
bool is_system_)
|
: ServiceFramework{system_, "IDatabaseService"}, is_system{is_system_} {
|
||||||
: ServiceFramework{system_, "IDatabaseService"}, manager{mii_manager}, is_system{
|
|
||||||
is_system_} {
|
|
||||||
// clang-format off
|
// clang-format off
|
||||||
static const FunctionInfo functions[] = {
|
static const FunctionInfo functions[] = {
|
||||||
{0, &IDatabaseService::IsUpdated, "IsUpdated"},
|
{0, &IDatabaseService::IsUpdated, "IsUpdated"},
|
||||||
@ -32,31 +27,29 @@ public:
|
|||||||
{5, &IDatabaseService::UpdateLatest, "UpdateLatest"},
|
{5, &IDatabaseService::UpdateLatest, "UpdateLatest"},
|
||||||
{6, &IDatabaseService::BuildRandom, "BuildRandom"},
|
{6, &IDatabaseService::BuildRandom, "BuildRandom"},
|
||||||
{7, &IDatabaseService::BuildDefault, "BuildDefault"},
|
{7, &IDatabaseService::BuildDefault, "BuildDefault"},
|
||||||
{8, &IDatabaseService::Get2, "Get2"},
|
{8, nullptr, "Get2"},
|
||||||
{9, &IDatabaseService::Get3, "Get3"},
|
{9, nullptr, "Get3"},
|
||||||
{10, &IDatabaseService::UpdateLatest1, "UpdateLatest1"},
|
{10, nullptr, "UpdateLatest1"},
|
||||||
{11, &IDatabaseService::FindIndex, "FindIndex"},
|
{11, nullptr, "FindIndex"},
|
||||||
{12, &IDatabaseService::Move, "Move"},
|
{12, nullptr, "Move"},
|
||||||
{13, &IDatabaseService::AddOrReplace, "AddOrReplace"},
|
{13, nullptr, "AddOrReplace"},
|
||||||
{14, &IDatabaseService::Delete, "Delete"},
|
{14, nullptr, "Delete"},
|
||||||
{15, &IDatabaseService::DestroyFile, "DestroyFile"},
|
{15, nullptr, "DestroyFile"},
|
||||||
{16, &IDatabaseService::DeleteFile, "DeleteFile"},
|
{16, nullptr, "DeleteFile"},
|
||||||
{17, &IDatabaseService::Format, "Format"},
|
{17, nullptr, "Format"},
|
||||||
{18, nullptr, "Import"},
|
{18, nullptr, "Import"},
|
||||||
{19, nullptr, "Export"},
|
{19, nullptr, "Export"},
|
||||||
{20, &IDatabaseService::IsBrokenDatabaseWithClearFlag, "IsBrokenDatabaseWithClearFlag"},
|
{20, nullptr, "IsBrokenDatabaseWithClearFlag"},
|
||||||
{21, &IDatabaseService::GetIndex, "GetIndex"},
|
{21, &IDatabaseService::GetIndex, "GetIndex"},
|
||||||
{22, &IDatabaseService::SetInterfaceVersion, "SetInterfaceVersion"},
|
{22, &IDatabaseService::SetInterfaceVersion, "SetInterfaceVersion"},
|
||||||
{23, &IDatabaseService::Convert, "Convert"},
|
{23, &IDatabaseService::Convert, "Convert"},
|
||||||
{24, &IDatabaseService::ConvertCoreDataToCharInfo, "ConvertCoreDataToCharInfo"},
|
{24, nullptr, "ConvertCoreDataToCharInfo"},
|
||||||
{25, &IDatabaseService::ConvertCharInfoToCoreData, "ConvertCharInfoToCoreData"},
|
{25, nullptr, "ConvertCharInfoToCoreData"},
|
||||||
{26, &IDatabaseService::Append, "Append"},
|
{26, nullptr, "Append"},
|
||||||
};
|
};
|
||||||
// clang-format on
|
// clang-format on
|
||||||
|
|
||||||
RegisterHandlers(functions);
|
RegisterHandlers(functions);
|
||||||
|
|
||||||
manager->Initialize(metadata);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@ -66,7 +59,7 @@ private:
|
|||||||
|
|
||||||
LOG_DEBUG(Service_Mii, "called with source_flag={}", source_flag);
|
LOG_DEBUG(Service_Mii, "called with source_flag={}", source_flag);
|
||||||
|
|
||||||
const bool is_updated = manager->IsUpdated(metadata, source_flag);
|
const bool is_updated = manager.IsUpdated(metadata, source_flag);
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 3};
|
IPC::ResponseBuilder rb{ctx, 3};
|
||||||
rb.Push(ResultSuccess);
|
rb.Push(ResultSuccess);
|
||||||
@ -76,7 +69,7 @@ private:
|
|||||||
void IsFullDatabase(HLERequestContext& ctx) {
|
void IsFullDatabase(HLERequestContext& ctx) {
|
||||||
LOG_DEBUG(Service_Mii, "called");
|
LOG_DEBUG(Service_Mii, "called");
|
||||||
|
|
||||||
const bool is_full_database = manager->IsFullDatabase();
|
const bool is_full_database = manager.IsFullDatabase();
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 3};
|
IPC::ResponseBuilder rb{ctx, 3};
|
||||||
rb.Push(ResultSuccess);
|
rb.Push(ResultSuccess);
|
||||||
@ -87,9 +80,9 @@ private:
|
|||||||
IPC::RequestParser rp{ctx};
|
IPC::RequestParser rp{ctx};
|
||||||
const auto source_flag{rp.PopRaw<SourceFlag>()};
|
const auto source_flag{rp.PopRaw<SourceFlag>()};
|
||||||
|
|
||||||
const u32 mii_count = manager->GetCount(metadata, source_flag);
|
LOG_DEBUG(Service_Mii, "called with source_flag={}", source_flag);
|
||||||
|
|
||||||
LOG_DEBUG(Service_Mii, "called with source_flag={}, mii_count={}", source_flag, mii_count);
|
const u32 mii_count = manager.GetCount(metadata, source_flag);
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 3};
|
IPC::ResponseBuilder rb{ctx, 3};
|
||||||
rb.Push(ResultSuccess);
|
rb.Push(ResultSuccess);
|
||||||
@ -101,17 +94,16 @@ private:
|
|||||||
const auto source_flag{rp.PopRaw<SourceFlag>()};
|
const auto source_flag{rp.PopRaw<SourceFlag>()};
|
||||||
const auto output_size{ctx.GetWriteBufferNumElements<CharInfoElement>()};
|
const auto output_size{ctx.GetWriteBufferNumElements<CharInfoElement>()};
|
||||||
|
|
||||||
|
LOG_DEBUG(Service_Mii, "called with source_flag={}, out_size={}", source_flag, output_size);
|
||||||
|
|
||||||
u32 mii_count{};
|
u32 mii_count{};
|
||||||
std::vector<CharInfoElement> char_info_elements(output_size);
|
std::vector<CharInfoElement> char_info_elements(output_size);
|
||||||
const auto result = manager->Get(metadata, char_info_elements, mii_count, source_flag);
|
Result result = manager.Get(metadata, char_info_elements, mii_count, source_flag);
|
||||||
|
|
||||||
if (mii_count != 0) {
|
if (mii_count != 0) {
|
||||||
ctx.WriteBuffer(char_info_elements);
|
ctx.WriteBuffer(char_info_elements);
|
||||||
}
|
}
|
||||||
|
|
||||||
LOG_INFO(Service_Mii, "called with source_flag={}, out_size={}, mii_count={}", source_flag,
|
|
||||||
output_size, mii_count);
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 3};
|
IPC::ResponseBuilder rb{ctx, 3};
|
||||||
rb.Push(result);
|
rb.Push(result);
|
||||||
rb.Push(mii_count);
|
rb.Push(mii_count);
|
||||||
@ -122,17 +114,16 @@ private:
|
|||||||
const auto source_flag{rp.PopRaw<SourceFlag>()};
|
const auto source_flag{rp.PopRaw<SourceFlag>()};
|
||||||
const auto output_size{ctx.GetWriteBufferNumElements<CharInfo>()};
|
const auto output_size{ctx.GetWriteBufferNumElements<CharInfo>()};
|
||||||
|
|
||||||
|
LOG_DEBUG(Service_Mii, "called with source_flag={}, out_size={}", source_flag, output_size);
|
||||||
|
|
||||||
u32 mii_count{};
|
u32 mii_count{};
|
||||||
std::vector<CharInfo> char_info(output_size);
|
std::vector<CharInfo> char_info(output_size);
|
||||||
const auto result = manager->Get(metadata, char_info, mii_count, source_flag);
|
Result result = manager.Get(metadata, char_info, mii_count, source_flag);
|
||||||
|
|
||||||
if (mii_count != 0) {
|
if (mii_count != 0) {
|
||||||
ctx.WriteBuffer(char_info);
|
ctx.WriteBuffer(char_info);
|
||||||
}
|
}
|
||||||
|
|
||||||
LOG_INFO(Service_Mii, "called with source_flag={}, out_size={}, mii_count={}", source_flag,
|
|
||||||
output_size, mii_count);
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 3};
|
IPC::ResponseBuilder rb{ctx, 3};
|
||||||
rb.Push(result);
|
rb.Push(result);
|
||||||
rb.Push(mii_count);
|
rb.Push(mii_count);
|
||||||
@ -143,10 +134,10 @@ private:
|
|||||||
const auto char_info{rp.PopRaw<CharInfo>()};
|
const auto char_info{rp.PopRaw<CharInfo>()};
|
||||||
const auto source_flag{rp.PopRaw<SourceFlag>()};
|
const auto source_flag{rp.PopRaw<SourceFlag>()};
|
||||||
|
|
||||||
LOG_INFO(Service_Mii, "called with source_flag={}", source_flag);
|
LOG_DEBUG(Service_Mii, "called with source_flag={}", source_flag);
|
||||||
|
|
||||||
CharInfo new_char_info{};
|
CharInfo new_char_info{};
|
||||||
const auto result = manager->UpdateLatest(metadata, new_char_info, char_info, source_flag);
|
const auto result = manager.UpdateLatest(metadata, new_char_info, char_info, source_flag);
|
||||||
if (result.IsFailure()) {
|
if (result.IsFailure()) {
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
rb.Push(result);
|
rb.Push(result);
|
||||||
@ -155,7 +146,7 @@ private:
|
|||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2 + sizeof(CharInfo) / sizeof(u32)};
|
IPC::ResponseBuilder rb{ctx, 2 + sizeof(CharInfo) / sizeof(u32)};
|
||||||
rb.Push(ResultSuccess);
|
rb.Push(ResultSuccess);
|
||||||
rb.PushRaw(new_char_info);
|
rb.PushRaw<CharInfo>(new_char_info);
|
||||||
}
|
}
|
||||||
|
|
||||||
void BuildRandom(HLERequestContext& ctx) {
|
void BuildRandom(HLERequestContext& ctx) {
|
||||||
@ -185,18 +176,18 @@ private:
|
|||||||
}
|
}
|
||||||
|
|
||||||
CharInfo char_info{};
|
CharInfo char_info{};
|
||||||
manager->BuildRandom(char_info, age, gender, race);
|
manager.BuildRandom(char_info, age, gender, race);
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2 + sizeof(CharInfo) / sizeof(u32)};
|
IPC::ResponseBuilder rb{ctx, 2 + sizeof(CharInfo) / sizeof(u32)};
|
||||||
rb.Push(ResultSuccess);
|
rb.Push(ResultSuccess);
|
||||||
rb.PushRaw(char_info);
|
rb.PushRaw<CharInfo>(char_info);
|
||||||
}
|
}
|
||||||
|
|
||||||
void BuildDefault(HLERequestContext& ctx) {
|
void BuildDefault(HLERequestContext& ctx) {
|
||||||
IPC::RequestParser rp{ctx};
|
IPC::RequestParser rp{ctx};
|
||||||
const auto index{rp.Pop<u32>()};
|
const auto index{rp.Pop<u32>()};
|
||||||
|
|
||||||
LOG_DEBUG(Service_Mii, "called with index={}", index);
|
LOG_INFO(Service_Mii, "called with index={}", index);
|
||||||
|
|
||||||
if (index > 5) {
|
if (index > 5) {
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
@ -205,243 +196,11 @@ private:
|
|||||||
}
|
}
|
||||||
|
|
||||||
CharInfo char_info{};
|
CharInfo char_info{};
|
||||||
manager->BuildDefault(char_info, index);
|
manager.BuildDefault(char_info, index);
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2 + sizeof(CharInfo) / sizeof(u32)};
|
IPC::ResponseBuilder rb{ctx, 2 + sizeof(CharInfo) / sizeof(u32)};
|
||||||
rb.Push(ResultSuccess);
|
rb.Push(ResultSuccess);
|
||||||
rb.PushRaw(char_info);
|
rb.PushRaw<CharInfo>(char_info);
|
||||||
}
|
|
||||||
|
|
||||||
void Get2(HLERequestContext& ctx) {
|
|
||||||
IPC::RequestParser rp{ctx};
|
|
||||||
const auto source_flag{rp.PopRaw<SourceFlag>()};
|
|
||||||
const auto output_size{ctx.GetWriteBufferNumElements<StoreDataElement>()};
|
|
||||||
|
|
||||||
u32 mii_count{};
|
|
||||||
std::vector<StoreDataElement> store_data_elements(output_size);
|
|
||||||
const auto result = manager->Get(metadata, store_data_elements, mii_count, source_flag);
|
|
||||||
|
|
||||||
if (mii_count != 0) {
|
|
||||||
ctx.WriteBuffer(store_data_elements);
|
|
||||||
}
|
|
||||||
|
|
||||||
LOG_INFO(Service_Mii, "called with source_flag={}, out_size={}, mii_count={}", source_flag,
|
|
||||||
output_size, mii_count);
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 3};
|
|
||||||
rb.Push(result);
|
|
||||||
rb.Push(mii_count);
|
|
||||||
}
|
|
||||||
|
|
||||||
void Get3(HLERequestContext& ctx) {
|
|
||||||
IPC::RequestParser rp{ctx};
|
|
||||||
const auto source_flag{rp.PopRaw<SourceFlag>()};
|
|
||||||
const auto output_size{ctx.GetWriteBufferNumElements<StoreData>()};
|
|
||||||
|
|
||||||
u32 mii_count{};
|
|
||||||
std::vector<StoreData> store_data(output_size);
|
|
||||||
const auto result = manager->Get(metadata, store_data, mii_count, source_flag);
|
|
||||||
|
|
||||||
if (mii_count != 0) {
|
|
||||||
ctx.WriteBuffer(store_data);
|
|
||||||
}
|
|
||||||
|
|
||||||
LOG_INFO(Service_Mii, "called with source_flag={}, out_size={}, mii_count={}", source_flag,
|
|
||||||
output_size, mii_count);
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 3};
|
|
||||||
rb.Push(result);
|
|
||||||
rb.Push(mii_count);
|
|
||||||
}
|
|
||||||
|
|
||||||
void UpdateLatest1(HLERequestContext& ctx) {
|
|
||||||
IPC::RequestParser rp{ctx};
|
|
||||||
const auto store_data{rp.PopRaw<StoreData>()};
|
|
||||||
const auto source_flag{rp.PopRaw<SourceFlag>()};
|
|
||||||
|
|
||||||
LOG_INFO(Service_Mii, "called with source_flag={}", source_flag);
|
|
||||||
|
|
||||||
Result result = ResultSuccess;
|
|
||||||
if (!is_system) {
|
|
||||||
result = ResultPermissionDenied;
|
|
||||||
}
|
|
||||||
|
|
||||||
StoreData new_store_data{};
|
|
||||||
if (result.IsSuccess()) {
|
|
||||||
result = manager->UpdateLatest(metadata, new_store_data, store_data, source_flag);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (result.IsFailure()) {
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
|
||||||
rb.Push(result);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2 + sizeof(StoreData) / sizeof(u32)};
|
|
||||||
rb.Push(ResultSuccess);
|
|
||||||
rb.PushRaw<StoreData>(new_store_data);
|
|
||||||
}
|
|
||||||
|
|
||||||
void FindIndex(HLERequestContext& ctx) {
|
|
||||||
IPC::RequestParser rp{ctx};
|
|
||||||
const auto create_id{rp.PopRaw<Common::UUID>()};
|
|
||||||
const auto is_special{rp.PopRaw<bool>()};
|
|
||||||
|
|
||||||
LOG_INFO(Service_Mii, "called with create_id={}, is_special={}",
|
|
||||||
create_id.FormattedString(), is_special);
|
|
||||||
|
|
||||||
const s32 index = manager->FindIndex(create_id, is_special);
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 3};
|
|
||||||
rb.Push(ResultSuccess);
|
|
||||||
rb.Push(index);
|
|
||||||
}
|
|
||||||
|
|
||||||
void Move(HLERequestContext& ctx) {
|
|
||||||
IPC::RequestParser rp{ctx};
|
|
||||||
const auto create_id{rp.PopRaw<Common::UUID>()};
|
|
||||||
const auto new_index{rp.PopRaw<s32>()};
|
|
||||||
|
|
||||||
LOG_INFO(Service_Mii, "called with create_id={}, new_index={}", create_id.FormattedString(),
|
|
||||||
new_index);
|
|
||||||
|
|
||||||
Result result = ResultSuccess;
|
|
||||||
if (!is_system) {
|
|
||||||
result = ResultPermissionDenied;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (result.IsSuccess()) {
|
|
||||||
const u32 count = manager->GetCount(metadata, SourceFlag::Database);
|
|
||||||
if (new_index < 0 || new_index >= static_cast<s32>(count)) {
|
|
||||||
result = ResultInvalidArgument;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (result.IsSuccess()) {
|
|
||||||
result = manager->Move(metadata, new_index, create_id);
|
|
||||||
}
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
|
||||||
rb.Push(result);
|
|
||||||
}
|
|
||||||
|
|
||||||
void AddOrReplace(HLERequestContext& ctx) {
|
|
||||||
IPC::RequestParser rp{ctx};
|
|
||||||
const auto store_data{rp.PopRaw<StoreData>()};
|
|
||||||
|
|
||||||
LOG_INFO(Service_Mii, "called");
|
|
||||||
|
|
||||||
Result result = ResultSuccess;
|
|
||||||
|
|
||||||
if (!is_system) {
|
|
||||||
result = ResultPermissionDenied;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (result.IsSuccess()) {
|
|
||||||
result = manager->AddOrReplace(metadata, store_data);
|
|
||||||
}
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
|
||||||
rb.Push(result);
|
|
||||||
}
|
|
||||||
|
|
||||||
void Delete(HLERequestContext& ctx) {
|
|
||||||
IPC::RequestParser rp{ctx};
|
|
||||||
const auto create_id{rp.PopRaw<Common::UUID>()};
|
|
||||||
|
|
||||||
LOG_INFO(Service_Mii, "called, create_id={}", create_id.FormattedString());
|
|
||||||
|
|
||||||
Result result = ResultSuccess;
|
|
||||||
|
|
||||||
if (!is_system) {
|
|
||||||
result = ResultPermissionDenied;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (result.IsSuccess()) {
|
|
||||||
result = manager->Delete(metadata, create_id);
|
|
||||||
}
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
|
||||||
rb.Push(result);
|
|
||||||
}
|
|
||||||
|
|
||||||
void DestroyFile(HLERequestContext& ctx) {
|
|
||||||
// This calls nn::settings::fwdbg::GetSettingsItemValue("is_db_test_mode_enabled");
|
|
||||||
const bool is_db_test_mode_enabled = false;
|
|
||||||
|
|
||||||
LOG_INFO(Service_Mii, "called is_db_test_mode_enabled={}", is_db_test_mode_enabled);
|
|
||||||
|
|
||||||
Result result = ResultSuccess;
|
|
||||||
|
|
||||||
if (!is_db_test_mode_enabled) {
|
|
||||||
result = ResultTestModeOnly;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (result.IsSuccess()) {
|
|
||||||
result = manager->DestroyFile(metadata);
|
|
||||||
}
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
|
||||||
rb.Push(result);
|
|
||||||
}
|
|
||||||
|
|
||||||
void DeleteFile(HLERequestContext& ctx) {
|
|
||||||
// This calls nn::settings::fwdbg::GetSettingsItemValue("is_db_test_mode_enabled");
|
|
||||||
const bool is_db_test_mode_enabled = false;
|
|
||||||
|
|
||||||
LOG_INFO(Service_Mii, "called is_db_test_mode_enabled={}", is_db_test_mode_enabled);
|
|
||||||
|
|
||||||
Result result = ResultSuccess;
|
|
||||||
|
|
||||||
if (!is_db_test_mode_enabled) {
|
|
||||||
result = ResultTestModeOnly;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (result.IsSuccess()) {
|
|
||||||
result = manager->DeleteFile();
|
|
||||||
}
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
|
||||||
rb.Push(result);
|
|
||||||
}
|
|
||||||
|
|
||||||
void Format(HLERequestContext& ctx) {
|
|
||||||
// This calls nn::settings::fwdbg::GetSettingsItemValue("is_db_test_mode_enabled");
|
|
||||||
const bool is_db_test_mode_enabled = false;
|
|
||||||
|
|
||||||
LOG_INFO(Service_Mii, "called is_db_test_mode_enabled={}", is_db_test_mode_enabled);
|
|
||||||
|
|
||||||
Result result = ResultSuccess;
|
|
||||||
|
|
||||||
if (!is_db_test_mode_enabled) {
|
|
||||||
result = ResultTestModeOnly;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (result.IsSuccess()) {
|
|
||||||
result = manager->Format(metadata);
|
|
||||||
}
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
|
||||||
rb.Push(result);
|
|
||||||
}
|
|
||||||
|
|
||||||
void IsBrokenDatabaseWithClearFlag(HLERequestContext& ctx) {
|
|
||||||
LOG_DEBUG(Service_Mii, "called");
|
|
||||||
|
|
||||||
bool is_broken_with_clear_flag = false;
|
|
||||||
Result result = ResultSuccess;
|
|
||||||
|
|
||||||
if (!is_system) {
|
|
||||||
result = ResultPermissionDenied;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (result.IsSuccess()) {
|
|
||||||
is_broken_with_clear_flag = manager->IsBrokenWithClearFlag(metadata);
|
|
||||||
}
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 3};
|
|
||||||
rb.Push(result);
|
|
||||||
rb.Push<u8>(is_broken_with_clear_flag);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void GetIndex(HLERequestContext& ctx) {
|
void GetIndex(HLERequestContext& ctx) {
|
||||||
@ -451,7 +210,7 @@ private:
|
|||||||
LOG_DEBUG(Service_Mii, "called");
|
LOG_DEBUG(Service_Mii, "called");
|
||||||
|
|
||||||
s32 index{};
|
s32 index{};
|
||||||
const auto result = manager->GetIndex(metadata, info, index);
|
const auto result = manager.GetIndex(metadata, info, index);
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 3};
|
IPC::ResponseBuilder rb{ctx, 3};
|
||||||
rb.Push(result);
|
rb.Push(result);
|
||||||
@ -464,7 +223,7 @@ private:
|
|||||||
|
|
||||||
LOG_INFO(Service_Mii, "called, interface_version={:08X}", interface_version);
|
LOG_INFO(Service_Mii, "called, interface_version={:08X}", interface_version);
|
||||||
|
|
||||||
manager->SetInterfaceVersion(metadata, interface_version);
|
manager.SetInterfaceVersion(metadata, interface_version);
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
rb.Push(ResultSuccess);
|
rb.Push(ResultSuccess);
|
||||||
@ -477,96 +236,51 @@ private:
|
|||||||
LOG_INFO(Service_Mii, "called");
|
LOG_INFO(Service_Mii, "called");
|
||||||
|
|
||||||
CharInfo char_info{};
|
CharInfo char_info{};
|
||||||
const auto result = manager->ConvertV3ToCharInfo(char_info, mii_v3);
|
manager.ConvertV3ToCharInfo(char_info, mii_v3);
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2 + sizeof(CharInfo) / sizeof(u32)};
|
IPC::ResponseBuilder rb{ctx, 2 + sizeof(CharInfo) / sizeof(u32)};
|
||||||
rb.Push(result);
|
rb.Push(ResultSuccess);
|
||||||
rb.PushRaw<CharInfo>(char_info);
|
rb.PushRaw<CharInfo>(char_info);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ConvertCoreDataToCharInfo(HLERequestContext& ctx) {
|
MiiManager manager{};
|
||||||
IPC::RequestParser rp{ctx};
|
|
||||||
const auto core_data{rp.PopRaw<CoreData>()};
|
|
||||||
|
|
||||||
LOG_INFO(Service_Mii, "called");
|
|
||||||
|
|
||||||
CharInfo char_info{};
|
|
||||||
const auto result = manager->ConvertCoreDataToCharInfo(char_info, core_data);
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2 + sizeof(CharInfo) / sizeof(u32)};
|
|
||||||
rb.Push(result);
|
|
||||||
rb.PushRaw<CharInfo>(char_info);
|
|
||||||
}
|
|
||||||
|
|
||||||
void ConvertCharInfoToCoreData(HLERequestContext& ctx) {
|
|
||||||
IPC::RequestParser rp{ctx};
|
|
||||||
const auto char_info{rp.PopRaw<CharInfo>()};
|
|
||||||
|
|
||||||
LOG_INFO(Service_Mii, "called");
|
|
||||||
|
|
||||||
CoreData core_data{};
|
|
||||||
const auto result = manager->ConvertCharInfoToCoreData(core_data, char_info);
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2 + sizeof(CoreData) / sizeof(u32)};
|
|
||||||
rb.Push(result);
|
|
||||||
rb.PushRaw<CoreData>(core_data);
|
|
||||||
}
|
|
||||||
|
|
||||||
void Append(HLERequestContext& ctx) {
|
|
||||||
IPC::RequestParser rp{ctx};
|
|
||||||
const auto char_info{rp.PopRaw<CharInfo>()};
|
|
||||||
|
|
||||||
LOG_INFO(Service_Mii, "called");
|
|
||||||
|
|
||||||
const auto result = manager->Append(metadata, char_info);
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
|
||||||
rb.Push(result);
|
|
||||||
}
|
|
||||||
|
|
||||||
std::shared_ptr<MiiManager> manager = nullptr;
|
|
||||||
DatabaseSessionMetadata metadata{};
|
DatabaseSessionMetadata metadata{};
|
||||||
bool is_system{};
|
bool is_system{};
|
||||||
};
|
};
|
||||||
|
|
||||||
MiiDBModule::MiiDBModule(Core::System& system_, const char* name_,
|
class MiiDBModule final : public ServiceFramework<MiiDBModule> {
|
||||||
std::shared_ptr<MiiManager> mii_manager, bool is_system_)
|
public:
|
||||||
: ServiceFramework{system_, name_}, manager{mii_manager}, is_system{is_system_} {
|
explicit MiiDBModule(Core::System& system_, const char* name_, bool is_system_)
|
||||||
// clang-format off
|
: ServiceFramework{system_, name_}, is_system{is_system_} {
|
||||||
static const FunctionInfo functions[] = {
|
// clang-format off
|
||||||
{0, &MiiDBModule::GetDatabaseService, "GetDatabaseService"},
|
static const FunctionInfo functions[] = {
|
||||||
};
|
{0, &MiiDBModule::GetDatabaseService, "GetDatabaseService"},
|
||||||
// clang-format on
|
};
|
||||||
|
// clang-format on
|
||||||
|
|
||||||
RegisterHandlers(functions);
|
RegisterHandlers(functions);
|
||||||
|
|
||||||
if (manager == nullptr) {
|
|
||||||
manager = std::make_shared<MiiManager>();
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
MiiDBModule::~MiiDBModule() = default;
|
private:
|
||||||
|
void GetDatabaseService(HLERequestContext& ctx) {
|
||||||
|
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
||||||
|
rb.Push(ResultSuccess);
|
||||||
|
rb.PushIpcInterface<IDatabaseService>(system, is_system);
|
||||||
|
|
||||||
void MiiDBModule::GetDatabaseService(HLERequestContext& ctx) {
|
LOG_DEBUG(Service_Mii, "called");
|
||||||
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
}
|
||||||
rb.Push(ResultSuccess);
|
|
||||||
rb.PushIpcInterface<IDatabaseService>(system, manager, is_system);
|
|
||||||
|
|
||||||
LOG_DEBUG(Service_Mii, "called");
|
bool is_system{};
|
||||||
}
|
};
|
||||||
|
|
||||||
std::shared_ptr<MiiManager> MiiDBModule::GetMiiManager() {
|
|
||||||
return manager;
|
|
||||||
}
|
|
||||||
|
|
||||||
class MiiImg final : public ServiceFramework<MiiImg> {
|
class MiiImg final : public ServiceFramework<MiiImg> {
|
||||||
public:
|
public:
|
||||||
explicit MiiImg(Core::System& system_) : ServiceFramework{system_, "miiimg"} {
|
explicit MiiImg(Core::System& system_) : ServiceFramework{system_, "miiimg"} {
|
||||||
// clang-format off
|
// clang-format off
|
||||||
static const FunctionInfo functions[] = {
|
static const FunctionInfo functions[] = {
|
||||||
{0, &MiiImg::Initialize, "Initialize"},
|
{0, nullptr, "Initialize"},
|
||||||
{10, nullptr, "Reload"},
|
{10, nullptr, "Reload"},
|
||||||
{11, &MiiImg::GetCount, "GetCount"},
|
{11, nullptr, "GetCount"},
|
||||||
{12, nullptr, "IsEmpty"},
|
{12, nullptr, "IsEmpty"},
|
||||||
{13, nullptr, "IsFull"},
|
{13, nullptr, "IsFull"},
|
||||||
{14, nullptr, "GetAttribute"},
|
{14, nullptr, "GetAttribute"},
|
||||||
@ -583,32 +297,15 @@ public:
|
|||||||
|
|
||||||
RegisterHandlers(functions);
|
RegisterHandlers(functions);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
|
||||||
void Initialize(HLERequestContext& ctx) {
|
|
||||||
LOG_INFO(Service_Mii, "called");
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
|
||||||
rb.Push(ResultSuccess);
|
|
||||||
}
|
|
||||||
|
|
||||||
void GetCount(HLERequestContext& ctx) {
|
|
||||||
LOG_DEBUG(Service_Mii, "called");
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 3};
|
|
||||||
rb.Push(ResultSuccess);
|
|
||||||
rb.Push(0);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
void LoopProcess(Core::System& system) {
|
void LoopProcess(Core::System& system) {
|
||||||
auto server_manager = std::make_unique<ServerManager>(system);
|
auto server_manager = std::make_unique<ServerManager>(system);
|
||||||
std::shared_ptr<MiiManager> manager = nullptr;
|
|
||||||
|
|
||||||
server_manager->RegisterNamedService(
|
server_manager->RegisterNamedService("mii:e",
|
||||||
"mii:e", std::make_shared<MiiDBModule>(system, "mii:e", manager, true));
|
std::make_shared<MiiDBModule>(system, "mii:e", true));
|
||||||
server_manager->RegisterNamedService(
|
server_manager->RegisterNamedService("mii:u",
|
||||||
"mii:u", std::make_shared<MiiDBModule>(system, "mii:u", manager, false));
|
std::make_shared<MiiDBModule>(system, "mii:u", false));
|
||||||
server_manager->RegisterNamedService("miiimg", std::make_shared<MiiImg>(system));
|
server_manager->RegisterNamedService("miiimg", std::make_shared<MiiImg>(system));
|
||||||
ServerManager::RunServer(std::move(server_manager));
|
ServerManager::RunServer(std::move(server_manager));
|
||||||
}
|
}
|
||||||
|
@ -3,29 +3,11 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "core/hle/service/service.h"
|
|
||||||
|
|
||||||
namespace Core {
|
namespace Core {
|
||||||
class System;
|
class System;
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace Service::Mii {
|
namespace Service::Mii {
|
||||||
class MiiManager;
|
|
||||||
|
|
||||||
class MiiDBModule final : public ServiceFramework<MiiDBModule> {
|
|
||||||
public:
|
|
||||||
explicit MiiDBModule(Core::System& system_, const char* name_,
|
|
||||||
std::shared_ptr<MiiManager> mii_manager, bool is_system_);
|
|
||||||
~MiiDBModule() override;
|
|
||||||
|
|
||||||
std::shared_ptr<MiiManager> GetMiiManager();
|
|
||||||
|
|
||||||
private:
|
|
||||||
void GetDatabaseService(HLERequestContext& ctx);
|
|
||||||
|
|
||||||
std::shared_ptr<MiiManager> manager = nullptr;
|
|
||||||
bool is_system{};
|
|
||||||
};
|
|
||||||
|
|
||||||
void LoopProcess(Core::System& system);
|
void LoopProcess(Core::System& system);
|
||||||
|
|
||||||
|
@ -1,142 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#include "core/hle/service/mii/mii_database.h"
|
|
||||||
#include "core/hle/service/mii/mii_result.h"
|
|
||||||
#include "core/hle/service/mii/mii_util.h"
|
|
||||||
|
|
||||||
namespace Service::Mii {
|
|
||||||
|
|
||||||
u8 NintendoFigurineDatabase::GetDatabaseLength() const {
|
|
||||||
return database_length;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool NintendoFigurineDatabase::IsFull() const {
|
|
||||||
return database_length >= MaxDatabaseLength;
|
|
||||||
}
|
|
||||||
|
|
||||||
StoreData NintendoFigurineDatabase::Get(std::size_t index) const {
|
|
||||||
StoreData store_data = miis.at(index);
|
|
||||||
|
|
||||||
// This hack is to make external database dumps compatible
|
|
||||||
store_data.SetDeviceChecksum();
|
|
||||||
|
|
||||||
return store_data;
|
|
||||||
}
|
|
||||||
|
|
||||||
u32 NintendoFigurineDatabase::GetCount(const DatabaseSessionMetadata& metadata) const {
|
|
||||||
if (magic == MiiMagic) {
|
|
||||||
return GetDatabaseLength();
|
|
||||||
}
|
|
||||||
|
|
||||||
u32 mii_count{};
|
|
||||||
for (std::size_t index = 0; index < mii_count; ++index) {
|
|
||||||
const auto& store_data = Get(index);
|
|
||||||
if (!store_data.IsSpecial()) {
|
|
||||||
mii_count++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return mii_count;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool NintendoFigurineDatabase::GetIndexByCreatorId(u32& out_index,
|
|
||||||
const Common::UUID& create_id) const {
|
|
||||||
for (std::size_t index = 0; index < database_length; ++index) {
|
|
||||||
if (miis[index].GetCreateId() == create_id) {
|
|
||||||
out_index = static_cast<u32>(index);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
Result NintendoFigurineDatabase::Move(u32 current_index, u32 new_index) {
|
|
||||||
if (current_index == new_index) {
|
|
||||||
return ResultNotUpdated;
|
|
||||||
}
|
|
||||||
|
|
||||||
const StoreData store_data = miis[current_index];
|
|
||||||
|
|
||||||
if (new_index > current_index) {
|
|
||||||
// Shift left
|
|
||||||
const u32 index_diff = new_index - current_index;
|
|
||||||
for (std::size_t i = 0; i < index_diff; i++) {
|
|
||||||
miis[current_index + i] = miis[current_index + i + 1];
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Shift right
|
|
||||||
const u32 index_diff = current_index - new_index;
|
|
||||||
for (std::size_t i = 0; i < index_diff; i++) {
|
|
||||||
miis[current_index - i] = miis[current_index - i - 1];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
miis[new_index] = store_data;
|
|
||||||
crc = GenerateDatabaseCrc();
|
|
||||||
return ResultSuccess;
|
|
||||||
}
|
|
||||||
|
|
||||||
void NintendoFigurineDatabase::Replace(u32 index, const StoreData& store_data) {
|
|
||||||
miis[index] = store_data;
|
|
||||||
crc = GenerateDatabaseCrc();
|
|
||||||
}
|
|
||||||
|
|
||||||
void NintendoFigurineDatabase::Add(const StoreData& store_data) {
|
|
||||||
miis[database_length] = store_data;
|
|
||||||
database_length++;
|
|
||||||
crc = GenerateDatabaseCrc();
|
|
||||||
}
|
|
||||||
|
|
||||||
void NintendoFigurineDatabase::Delete(u32 index) {
|
|
||||||
// Shift left
|
|
||||||
const s32 new_database_size = database_length - 1;
|
|
||||||
if (static_cast<s32>(index) < new_database_size) {
|
|
||||||
for (std::size_t i = index; i < static_cast<std::size_t>(new_database_size); i++) {
|
|
||||||
miis[i] = miis[i + 1];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
database_length = static_cast<u8>(new_database_size);
|
|
||||||
crc = GenerateDatabaseCrc();
|
|
||||||
}
|
|
||||||
|
|
||||||
void NintendoFigurineDatabase::CleanDatabase() {
|
|
||||||
miis = {};
|
|
||||||
version = 1;
|
|
||||||
magic = DatabaseMagic;
|
|
||||||
database_length = 0;
|
|
||||||
crc = GenerateDatabaseCrc();
|
|
||||||
}
|
|
||||||
|
|
||||||
void NintendoFigurineDatabase::CorruptCrc() {
|
|
||||||
crc = GenerateDatabaseCrc();
|
|
||||||
crc = ~crc;
|
|
||||||
}
|
|
||||||
|
|
||||||
Result NintendoFigurineDatabase::CheckIntegrity() {
|
|
||||||
if (magic != DatabaseMagic) {
|
|
||||||
return ResultInvalidDatabaseSignature;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (version != 1) {
|
|
||||||
return ResultInvalidDatabaseVersion;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (crc != GenerateDatabaseCrc()) {
|
|
||||||
return ResultInvalidDatabaseChecksum;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (database_length >= MaxDatabaseLength) {
|
|
||||||
return ResultInvalidDatabaseLength;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ResultSuccess;
|
|
||||||
}
|
|
||||||
|
|
||||||
u16 NintendoFigurineDatabase::GenerateDatabaseCrc() {
|
|
||||||
return MiiUtil::CalculateCrc16(&magic, sizeof(NintendoFigurineDatabase) - sizeof(crc));
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace Service::Mii
|
|
@ -1,66 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "core/hle/result.h"
|
|
||||||
#include "core/hle/service/mii/types/store_data.h"
|
|
||||||
|
|
||||||
namespace Service::Mii {
|
|
||||||
|
|
||||||
constexpr std::size_t MaxDatabaseLength{100};
|
|
||||||
constexpr u32 MiiMagic{0xa523b78f};
|
|
||||||
constexpr u32 DatabaseMagic{0x4244464e}; // NFDB
|
|
||||||
|
|
||||||
class NintendoFigurineDatabase {
|
|
||||||
public:
|
|
||||||
/// Returns the total mii count.
|
|
||||||
u8 GetDatabaseLength() const;
|
|
||||||
|
|
||||||
/// Returns true if database is full.
|
|
||||||
bool IsFull() const;
|
|
||||||
|
|
||||||
/// Returns the mii of the specified index.
|
|
||||||
StoreData Get(std::size_t index) const;
|
|
||||||
|
|
||||||
/// Returns the total mii count. Ignoring special mii.
|
|
||||||
u32 GetCount(const DatabaseSessionMetadata& metadata) const;
|
|
||||||
|
|
||||||
/// Returns the index of a mii. If the mii isn't found returns false.
|
|
||||||
bool GetIndexByCreatorId(u32& out_index, const Common::UUID& create_id) const;
|
|
||||||
|
|
||||||
/// Moves the location of a specific mii.
|
|
||||||
Result Move(u32 current_index, u32 new_index);
|
|
||||||
|
|
||||||
/// Replaces mii with new data.
|
|
||||||
void Replace(u32 index, const StoreData& store_data);
|
|
||||||
|
|
||||||
/// Adds a new mii to the end of the database.
|
|
||||||
void Add(const StoreData& store_data);
|
|
||||||
|
|
||||||
/// Removes mii from database and shifts left the remainding data.
|
|
||||||
void Delete(u32 index);
|
|
||||||
|
|
||||||
/// Deletes all contents with a fresh database
|
|
||||||
void CleanDatabase();
|
|
||||||
|
|
||||||
/// Intentionally sets a bad checksum
|
|
||||||
void CorruptCrc();
|
|
||||||
|
|
||||||
/// Returns success if database is valid otherwise returns the corresponding error code.
|
|
||||||
Result CheckIntegrity();
|
|
||||||
|
|
||||||
private:
|
|
||||||
/// Returns the checksum of the database
|
|
||||||
u16 GenerateDatabaseCrc();
|
|
||||||
|
|
||||||
u32 magic{}; // 'NFDB'
|
|
||||||
std::array<StoreData, MaxDatabaseLength> miis{};
|
|
||||||
u8 version{};
|
|
||||||
u8 database_length{};
|
|
||||||
u16 crc{};
|
|
||||||
};
|
|
||||||
static_assert(sizeof(NintendoFigurineDatabase) == 0x1A98,
|
|
||||||
"NintendoFigurineDatabase has incorrect size.");
|
|
||||||
|
|
||||||
}; // namespace Service::Mii
|
|
@ -1,420 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#include "common/assert.h"
|
|
||||||
#include "common/fs/file.h"
|
|
||||||
#include "common/fs/fs.h"
|
|
||||||
#include "common/fs/path_util.h"
|
|
||||||
#include "common/logging/log.h"
|
|
||||||
#include "common/string_util.h"
|
|
||||||
|
|
||||||
#include "core/hle/service/mii/mii_database_manager.h"
|
|
||||||
#include "core/hle/service/mii/mii_result.h"
|
|
||||||
#include "core/hle/service/mii/mii_util.h"
|
|
||||||
#include "core/hle/service/mii/types/char_info.h"
|
|
||||||
#include "core/hle/service/mii/types/store_data.h"
|
|
||||||
|
|
||||||
namespace Service::Mii {
|
|
||||||
const char* DbFileName = "MiiDatabase.dat";
|
|
||||||
|
|
||||||
DatabaseManager::DatabaseManager() {}
|
|
||||||
|
|
||||||
Result DatabaseManager::MountSaveData() {
|
|
||||||
if (!is_save_data_mounted) {
|
|
||||||
system_save_dir =
|
|
||||||
Common::FS::GetYuzuPath(Common::FS::YuzuPath::NANDDir) / "system/save/8000000000000030";
|
|
||||||
if (is_test_db) {
|
|
||||||
system_save_dir = Common::FS::GetYuzuPath(Common::FS::YuzuPath::NANDDir) /
|
|
||||||
"system/save/8000000000000031";
|
|
||||||
}
|
|
||||||
|
|
||||||
// mount point should be "mii:"
|
|
||||||
|
|
||||||
if (!Common::FS::CreateDirs(system_save_dir)) {
|
|
||||||
return ResultUnknown;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
is_save_data_mounted = true;
|
|
||||||
return ResultSuccess;
|
|
||||||
}
|
|
||||||
|
|
||||||
Result DatabaseManager::Initialize(DatabaseSessionMetadata& metadata, bool& is_database_broken) {
|
|
||||||
is_database_broken = false;
|
|
||||||
if (!is_save_data_mounted) {
|
|
||||||
return ResultInvalidArgument;
|
|
||||||
}
|
|
||||||
|
|
||||||
database.CleanDatabase();
|
|
||||||
update_counter++;
|
|
||||||
metadata.update_counter = update_counter;
|
|
||||||
|
|
||||||
const Common::FS::IOFile db_file{system_save_dir / DbFileName, Common::FS::FileAccessMode::Read,
|
|
||||||
Common::FS::FileType::BinaryFile};
|
|
||||||
|
|
||||||
if (!db_file.IsOpen()) {
|
|
||||||
return SaveDatabase();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Common::FS::GetSize(system_save_dir / DbFileName) != sizeof(NintendoFigurineDatabase)) {
|
|
||||||
is_database_broken = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (db_file.Read(database) != 1) {
|
|
||||||
is_database_broken = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (is_database_broken) {
|
|
||||||
// Dragons happen here for simplicity just clean the database
|
|
||||||
LOG_ERROR(Service_Mii, "Mii database is corrupted");
|
|
||||||
database.CleanDatabase();
|
|
||||||
return ResultUnknown;
|
|
||||||
}
|
|
||||||
|
|
||||||
const auto result = database.CheckIntegrity();
|
|
||||||
|
|
||||||
if (result.IsError()) {
|
|
||||||
LOG_ERROR(Service_Mii, "Mii database is corrupted 0x{:0x}", result.raw);
|
|
||||||
database.CleanDatabase();
|
|
||||||
return ResultSuccess;
|
|
||||||
}
|
|
||||||
|
|
||||||
LOG_INFO(Service_Mii, "Successfully loaded mii database. size={}",
|
|
||||||
database.GetDatabaseLength());
|
|
||||||
return ResultSuccess;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool DatabaseManager::IsFullDatabase() const {
|
|
||||||
return database.GetDatabaseLength() == MaxDatabaseLength;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool DatabaseManager::IsModified() const {
|
|
||||||
return is_moddified;
|
|
||||||
}
|
|
||||||
|
|
||||||
u64 DatabaseManager::GetUpdateCounter() const {
|
|
||||||
return update_counter;
|
|
||||||
}
|
|
||||||
|
|
||||||
u32 DatabaseManager::GetCount(const DatabaseSessionMetadata& metadata) const {
|
|
||||||
const u32 database_size = database.GetDatabaseLength();
|
|
||||||
if (metadata.magic == MiiMagic) {
|
|
||||||
return database_size;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Special mii can't be used. Skip those.
|
|
||||||
|
|
||||||
u32 mii_count{};
|
|
||||||
for (std::size_t index = 0; index < database_size; ++index) {
|
|
||||||
const auto& store_data = database.Get(index);
|
|
||||||
if (store_data.IsSpecial()) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
mii_count++;
|
|
||||||
}
|
|
||||||
|
|
||||||
return mii_count;
|
|
||||||
}
|
|
||||||
|
|
||||||
void DatabaseManager::Get(StoreData& out_store_data, std::size_t index,
|
|
||||||
const DatabaseSessionMetadata& metadata) const {
|
|
||||||
if (metadata.magic == MiiMagic) {
|
|
||||||
out_store_data = database.Get(index);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// The index refeers to the mii index without special mii.
|
|
||||||
// Search on the database until we find it
|
|
||||||
|
|
||||||
u32 virtual_index = 0;
|
|
||||||
const u32 database_size = database.GetDatabaseLength();
|
|
||||||
for (std::size_t i = 0; i < database_size; ++i) {
|
|
||||||
const auto& store_data = database.Get(i);
|
|
||||||
if (store_data.IsSpecial()) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (virtual_index == index) {
|
|
||||||
out_store_data = store_data;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
virtual_index++;
|
|
||||||
}
|
|
||||||
|
|
||||||
// This function doesn't fail. It returns the first mii instead
|
|
||||||
out_store_data = database.Get(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
Result DatabaseManager::FindIndex(s32& out_index, const Common::UUID& create_id,
|
|
||||||
bool is_special) const {
|
|
||||||
u32 index{};
|
|
||||||
const bool is_found = database.GetIndexByCreatorId(index, create_id);
|
|
||||||
|
|
||||||
if (!is_found) {
|
|
||||||
return ResultNotFound;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (is_special) {
|
|
||||||
out_index = index;
|
|
||||||
return ResultSuccess;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (database.Get(index).IsSpecial()) {
|
|
||||||
return ResultNotFound;
|
|
||||||
}
|
|
||||||
|
|
||||||
out_index = 0;
|
|
||||||
|
|
||||||
if (index < 1) {
|
|
||||||
return ResultSuccess;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (std::size_t i = 0; i <= index; ++i) {
|
|
||||||
if (database.Get(i).IsSpecial()) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
out_index++;
|
|
||||||
}
|
|
||||||
return ResultSuccess;
|
|
||||||
}
|
|
||||||
|
|
||||||
Result DatabaseManager::FindIndex(const DatabaseSessionMetadata& metadata, u32& out_index,
|
|
||||||
const Common::UUID& create_id) const {
|
|
||||||
u32 index{};
|
|
||||||
const bool is_found = database.GetIndexByCreatorId(index, create_id);
|
|
||||||
|
|
||||||
if (!is_found) {
|
|
||||||
return ResultNotFound;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (metadata.magic == MiiMagic) {
|
|
||||||
out_index = index;
|
|
||||||
return ResultSuccess;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (database.Get(index).IsSpecial()) {
|
|
||||||
return ResultNotFound;
|
|
||||||
}
|
|
||||||
|
|
||||||
out_index = 0;
|
|
||||||
|
|
||||||
if (index < 1) {
|
|
||||||
return ResultSuccess;
|
|
||||||
}
|
|
||||||
|
|
||||||
// The index refeers to the mii index without special mii.
|
|
||||||
// Search on the database until we find it
|
|
||||||
|
|
||||||
for (std::size_t i = 0; i <= index; ++i) {
|
|
||||||
const auto& store_data = database.Get(i);
|
|
||||||
if (store_data.IsSpecial()) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
out_index++;
|
|
||||||
}
|
|
||||||
return ResultSuccess;
|
|
||||||
}
|
|
||||||
|
|
||||||
Result DatabaseManager::FindMoveIndex(u32& out_index, u32 new_index,
|
|
||||||
const Common::UUID& create_id) const {
|
|
||||||
const auto database_size = database.GetDatabaseLength();
|
|
||||||
|
|
||||||
if (database_size >= 1) {
|
|
||||||
u32 virtual_index{};
|
|
||||||
for (std::size_t i = 0; i < database_size; ++i) {
|
|
||||||
const StoreData& store_data = database.Get(i);
|
|
||||||
if (store_data.IsSpecial()) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (virtual_index == new_index) {
|
|
||||||
const bool is_found = database.GetIndexByCreatorId(out_index, create_id);
|
|
||||||
if (!is_found) {
|
|
||||||
return ResultNotFound;
|
|
||||||
}
|
|
||||||
if (store_data.IsSpecial()) {
|
|
||||||
return ResultInvalidOperation;
|
|
||||||
}
|
|
||||||
return ResultSuccess;
|
|
||||||
}
|
|
||||||
virtual_index++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const bool is_found = database.GetIndexByCreatorId(out_index, create_id);
|
|
||||||
if (!is_found) {
|
|
||||||
return ResultNotFound;
|
|
||||||
}
|
|
||||||
const StoreData& store_data = database.Get(out_index);
|
|
||||||
if (store_data.IsSpecial()) {
|
|
||||||
return ResultInvalidOperation;
|
|
||||||
}
|
|
||||||
return ResultSuccess;
|
|
||||||
}
|
|
||||||
|
|
||||||
Result DatabaseManager::Move(DatabaseSessionMetadata& metadata, u32 new_index,
|
|
||||||
const Common::UUID& create_id) {
|
|
||||||
u32 current_index{};
|
|
||||||
if (metadata.magic == MiiMagic) {
|
|
||||||
const bool is_found = database.GetIndexByCreatorId(current_index, create_id);
|
|
||||||
if (!is_found) {
|
|
||||||
return ResultNotFound;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
const auto result = FindMoveIndex(current_index, new_index, create_id);
|
|
||||||
if (result.IsError()) {
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const auto result = database.Move(current_index, new_index);
|
|
||||||
if (result.IsFailure()) {
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
is_moddified = true;
|
|
||||||
update_counter++;
|
|
||||||
metadata.update_counter = update_counter;
|
|
||||||
return ResultSuccess;
|
|
||||||
}
|
|
||||||
|
|
||||||
Result DatabaseManager::AddOrReplace(DatabaseSessionMetadata& metadata,
|
|
||||||
const StoreData& store_data) {
|
|
||||||
if (store_data.IsValid() != ValidationResult::NoErrors) {
|
|
||||||
return ResultInvalidStoreData;
|
|
||||||
}
|
|
||||||
if (metadata.magic != MiiMagic && store_data.IsSpecial()) {
|
|
||||||
return ResultInvalidOperation;
|
|
||||||
}
|
|
||||||
|
|
||||||
u32 index{};
|
|
||||||
const bool is_found = database.GetIndexByCreatorId(index, store_data.GetCreateId());
|
|
||||||
if (is_found) {
|
|
||||||
const StoreData& old_store_data = database.Get(index);
|
|
||||||
|
|
||||||
if (store_data.IsSpecial() != old_store_data.IsSpecial()) {
|
|
||||||
return ResultInvalidOperation;
|
|
||||||
}
|
|
||||||
|
|
||||||
database.Replace(index, store_data);
|
|
||||||
} else {
|
|
||||||
if (database.IsFull()) {
|
|
||||||
return ResultDatabaseFull;
|
|
||||||
}
|
|
||||||
|
|
||||||
database.Add(store_data);
|
|
||||||
}
|
|
||||||
|
|
||||||
is_moddified = true;
|
|
||||||
update_counter++;
|
|
||||||
metadata.update_counter = update_counter;
|
|
||||||
return ResultSuccess;
|
|
||||||
}
|
|
||||||
|
|
||||||
Result DatabaseManager::Delete(DatabaseSessionMetadata& metadata, const Common::UUID& create_id) {
|
|
||||||
u32 index{};
|
|
||||||
const bool is_found = database.GetIndexByCreatorId(index, create_id);
|
|
||||||
if (!is_found) {
|
|
||||||
return ResultNotFound;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (metadata.magic != MiiMagic) {
|
|
||||||
const auto& store_data = database.Get(index);
|
|
||||||
if (store_data.IsSpecial()) {
|
|
||||||
return ResultInvalidOperation;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
database.Delete(index);
|
|
||||||
|
|
||||||
is_moddified = true;
|
|
||||||
update_counter++;
|
|
||||||
metadata.update_counter = update_counter;
|
|
||||||
return ResultSuccess;
|
|
||||||
}
|
|
||||||
|
|
||||||
Result DatabaseManager::Append(DatabaseSessionMetadata& metadata, const CharInfo& char_info) {
|
|
||||||
if (char_info.Verify() != ValidationResult::NoErrors) {
|
|
||||||
return ResultInvalidCharInfo2;
|
|
||||||
}
|
|
||||||
if (char_info.GetType() == 1) {
|
|
||||||
return ResultInvalidCharInfoType;
|
|
||||||
}
|
|
||||||
|
|
||||||
u32 index{};
|
|
||||||
StoreData store_data{};
|
|
||||||
|
|
||||||
// Loop until the mii we created is not on the database
|
|
||||||
do {
|
|
||||||
store_data.BuildWithCharInfo(char_info);
|
|
||||||
} while (database.GetIndexByCreatorId(index, store_data.GetCreateId()));
|
|
||||||
|
|
||||||
const Result result = store_data.Restore();
|
|
||||||
|
|
||||||
if (result.IsSuccess() || result == ResultNotUpdated) {
|
|
||||||
return AddOrReplace(metadata, store_data);
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
Result DatabaseManager::DestroyFile(DatabaseSessionMetadata& metadata) {
|
|
||||||
database.CorruptCrc();
|
|
||||||
|
|
||||||
is_moddified = true;
|
|
||||||
update_counter++;
|
|
||||||
metadata.update_counter = update_counter;
|
|
||||||
|
|
||||||
const auto result = SaveDatabase();
|
|
||||||
database.CleanDatabase();
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
Result DatabaseManager::DeleteFile() {
|
|
||||||
const bool result = Common::FS::RemoveFile(system_save_dir / DbFileName);
|
|
||||||
// TODO: Return proper FS error here
|
|
||||||
return result ? ResultSuccess : ResultUnknown;
|
|
||||||
}
|
|
||||||
|
|
||||||
void DatabaseManager::Format(DatabaseSessionMetadata& metadata) {
|
|
||||||
database.CleanDatabase();
|
|
||||||
is_moddified = true;
|
|
||||||
update_counter++;
|
|
||||||
metadata.update_counter = update_counter;
|
|
||||||
}
|
|
||||||
|
|
||||||
Result DatabaseManager::SaveDatabase() {
|
|
||||||
// TODO: Replace unknown error codes with proper FS error codes when available
|
|
||||||
|
|
||||||
if (!Common::FS::Exists(system_save_dir / DbFileName)) {
|
|
||||||
if (!Common::FS::NewFile(system_save_dir / DbFileName)) {
|
|
||||||
LOG_ERROR(Service_Mii, "Failed to create mii database");
|
|
||||||
return ResultUnknown;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const auto file_size = Common::FS::GetSize(system_save_dir / DbFileName);
|
|
||||||
if (file_size != 0 && file_size != sizeof(NintendoFigurineDatabase)) {
|
|
||||||
if (!Common::FS::RemoveFile(system_save_dir / DbFileName)) {
|
|
||||||
LOG_ERROR(Service_Mii, "Failed to delete mii database");
|
|
||||||
return ResultUnknown;
|
|
||||||
}
|
|
||||||
if (!Common::FS::NewFile(system_save_dir / DbFileName)) {
|
|
||||||
LOG_ERROR(Service_Mii, "Failed to create mii database");
|
|
||||||
return ResultUnknown;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const Common::FS::IOFile db_file{system_save_dir / DbFileName,
|
|
||||||
Common::FS::FileAccessMode::ReadWrite,
|
|
||||||
Common::FS::FileType::BinaryFile};
|
|
||||||
|
|
||||||
if (db_file.Write(database) != 1) {
|
|
||||||
LOG_ERROR(Service_Mii, "Failed to save mii database");
|
|
||||||
return ResultUnknown;
|
|
||||||
}
|
|
||||||
|
|
||||||
is_moddified = false;
|
|
||||||
return ResultSuccess;
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace Service::Mii
|
|
@ -1,58 +0,0 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "common/fs/fs.h"
|
|
||||||
#include "core/hle/result.h"
|
|
||||||
#include "core/hle/service/mii/mii_database.h"
|
|
||||||
|
|
||||||
namespace Service::Mii {
|
|
||||||
class CharInfo;
|
|
||||||
class StoreData;
|
|
||||||
|
|
||||||
class DatabaseManager {
|
|
||||||
public:
|
|
||||||
DatabaseManager();
|
|
||||||
Result MountSaveData();
|
|
||||||
Result Initialize(DatabaseSessionMetadata& metadata, bool& is_database_broken);
|
|
||||||
|
|
||||||
bool IsFullDatabase() const;
|
|
||||||
bool IsModified() const;
|
|
||||||
u64 GetUpdateCounter() const;
|
|
||||||
|
|
||||||
void Get(StoreData& out_store_data, std::size_t index,
|
|
||||||
const DatabaseSessionMetadata& metadata) const;
|
|
||||||
u32 GetCount(const DatabaseSessionMetadata& metadata) const;
|
|
||||||
|
|
||||||
Result FindIndex(s32& out_index, const Common::UUID& create_id, bool is_special) const;
|
|
||||||
Result FindIndex(const DatabaseSessionMetadata& metadata, u32& out_index,
|
|
||||||
const Common::UUID& create_id) const;
|
|
||||||
Result FindMoveIndex(u32& out_index, u32 new_index, const Common::UUID& create_id) const;
|
|
||||||
|
|
||||||
Result Move(DatabaseSessionMetadata& metadata, u32 current_index,
|
|
||||||
const Common::UUID& create_id);
|
|
||||||
Result AddOrReplace(DatabaseSessionMetadata& metadata, const StoreData& out_store_data);
|
|
||||||
Result Delete(DatabaseSessionMetadata& metadata, const Common::UUID& create_id);
|
|
||||||
Result Append(DatabaseSessionMetadata& metadata, const CharInfo& char_info);
|
|
||||||
|
|
||||||
Result DestroyFile(DatabaseSessionMetadata& metadata);
|
|
||||||
Result DeleteFile();
|
|
||||||
void Format(DatabaseSessionMetadata& metadata);
|
|
||||||
|
|
||||||
Result SaveDatabase();
|
|
||||||
|
|
||||||
private:
|
|
||||||
// This is the global value of
|
|
||||||
// nn::settings::fwdbg::GetSettingsItemValue("is_db_test_mode_enabled");
|
|
||||||
bool is_test_db{};
|
|
||||||
|
|
||||||
bool is_moddified{};
|
|
||||||
bool is_save_data_mounted{};
|
|
||||||
u64 update_counter{};
|
|
||||||
NintendoFigurineDatabase database{};
|
|
||||||
|
|
||||||
std::filesystem::path system_save_dir{};
|
|
||||||
};
|
|
||||||
|
|
||||||
}; // namespace Service::Mii
|
|
@ -1,26 +1,59 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
|
#include <cstring>
|
||||||
|
#include <random>
|
||||||
|
|
||||||
|
#include "common/assert.h"
|
||||||
#include "common/logging/log.h"
|
#include "common/logging/log.h"
|
||||||
#include "core/hle/service/mii/mii_database_manager.h"
|
#include "common/string_util.h"
|
||||||
|
|
||||||
|
#include "core/hle/service/acc/profile_manager.h"
|
||||||
#include "core/hle/service/mii/mii_manager.h"
|
#include "core/hle/service/mii/mii_manager.h"
|
||||||
#include "core/hle/service/mii/mii_result.h"
|
#include "core/hle/service/mii/mii_result.h"
|
||||||
#include "core/hle/service/mii/mii_util.h"
|
#include "core/hle/service/mii/mii_util.h"
|
||||||
#include "core/hle/service/mii/types/char_info.h"
|
|
||||||
#include "core/hle/service/mii/types/core_data.h"
|
#include "core/hle/service/mii/types/core_data.h"
|
||||||
#include "core/hle/service/mii/types/raw_data.h"
|
#include "core/hle/service/mii/types/raw_data.h"
|
||||||
#include "core/hle/service/mii/types/store_data.h"
|
|
||||||
#include "core/hle/service/mii/types/ver3_store_data.h"
|
|
||||||
|
|
||||||
namespace Service::Mii {
|
namespace Service::Mii {
|
||||||
constexpr std::size_t DefaultMiiCount{RawData::DefaultMii.size()};
|
constexpr std::size_t DefaultMiiCount{RawData::DefaultMii.size()};
|
||||||
|
|
||||||
MiiManager::MiiManager() {}
|
MiiManager::MiiManager() {}
|
||||||
|
|
||||||
Result MiiManager::Initialize(DatabaseSessionMetadata& metadata) {
|
bool MiiManager::IsUpdated(DatabaseSessionMetadata& metadata, SourceFlag source_flag) const {
|
||||||
database_manager.MountSaveData();
|
if ((source_flag & SourceFlag::Database) == SourceFlag::None) {
|
||||||
database_manager.Initialize(metadata, is_broken_with_clear_flag);
|
return false;
|
||||||
return ResultSuccess;
|
}
|
||||||
|
|
||||||
|
const auto metadata_update_counter = metadata.update_counter;
|
||||||
|
metadata.update_counter = update_counter;
|
||||||
|
return metadata_update_counter != update_counter;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool MiiManager::IsFullDatabase() const {
|
||||||
|
// TODO(bunnei): We don't implement the Mii database, so it cannot be full
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
u32 MiiManager::GetCount(const DatabaseSessionMetadata& metadata, SourceFlag source_flag) const {
|
||||||
|
u32 mii_count{};
|
||||||
|
if ((source_flag & SourceFlag::Default) != SourceFlag::None) {
|
||||||
|
mii_count += DefaultMiiCount;
|
||||||
|
}
|
||||||
|
if ((source_flag & SourceFlag::Database) != SourceFlag::None) {
|
||||||
|
// TODO(bunnei): We don't implement the Mii database, but when we do, update this
|
||||||
|
}
|
||||||
|
return mii_count;
|
||||||
|
}
|
||||||
|
|
||||||
|
Result MiiManager::UpdateLatest(DatabaseSessionMetadata& metadata, CharInfo& out_char_info,
|
||||||
|
const CharInfo& char_info, SourceFlag source_flag) {
|
||||||
|
if ((source_flag & SourceFlag::Database) == SourceFlag::None) {
|
||||||
|
return ResultNotFound;
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO(bunnei): We don't implement the Mii database, so we can't have an entry
|
||||||
|
return ResultNotFound;
|
||||||
}
|
}
|
||||||
|
|
||||||
void MiiManager::BuildDefault(CharInfo& out_char_info, u32 index) const {
|
void MiiManager::BuildDefault(CharInfo& out_char_info, u32 index) const {
|
||||||
@ -41,368 +74,39 @@ void MiiManager::BuildRandom(CharInfo& out_char_info, Age age, Gender gender, Ra
|
|||||||
out_char_info.SetFromStoreData(store_data);
|
out_char_info.SetFromStoreData(store_data);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool MiiManager::IsFullDatabase() const {
|
void MiiManager::ConvertV3ToCharInfo(CharInfo& out_char_info, const Ver3StoreData& mii_v3) const {
|
||||||
return database_manager.IsFullDatabase();
|
|
||||||
}
|
|
||||||
|
|
||||||
void MiiManager::SetInterfaceVersion(DatabaseSessionMetadata& metadata, u32 version) const {
|
|
||||||
metadata.interface_version = version;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool MiiManager::IsUpdated(DatabaseSessionMetadata& metadata, SourceFlag source_flag) const {
|
|
||||||
if ((source_flag & SourceFlag::Database) == SourceFlag::None) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
const u64 metadata_update_counter = metadata.update_counter;
|
|
||||||
const u64 database_update_counter = database_manager.GetUpdateCounter();
|
|
||||||
metadata.update_counter = database_update_counter;
|
|
||||||
return metadata_update_counter != database_update_counter;
|
|
||||||
}
|
|
||||||
|
|
||||||
u32 MiiManager::GetCount(const DatabaseSessionMetadata& metadata, SourceFlag source_flag) const {
|
|
||||||
u32 mii_count{};
|
|
||||||
if ((source_flag & SourceFlag::Default) != SourceFlag::None) {
|
|
||||||
mii_count += DefaultMiiCount;
|
|
||||||
}
|
|
||||||
if ((source_flag & SourceFlag::Database) != SourceFlag::None) {
|
|
||||||
mii_count += database_manager.GetCount(metadata);
|
|
||||||
}
|
|
||||||
return mii_count;
|
|
||||||
}
|
|
||||||
|
|
||||||
Result MiiManager::Move(DatabaseSessionMetadata& metadata, u32 index,
|
|
||||||
const Common::UUID& create_id) {
|
|
||||||
const auto result = database_manager.Move(metadata, index, create_id);
|
|
||||||
|
|
||||||
if (result.IsFailure()) {
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!database_manager.IsModified()) {
|
|
||||||
return ResultNotUpdated;
|
|
||||||
}
|
|
||||||
|
|
||||||
return database_manager.SaveDatabase();
|
|
||||||
}
|
|
||||||
|
|
||||||
Result MiiManager::AddOrReplace(DatabaseSessionMetadata& metadata, const StoreData& store_data) {
|
|
||||||
const auto result = database_manager.AddOrReplace(metadata, store_data);
|
|
||||||
|
|
||||||
if (result.IsFailure()) {
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!database_manager.IsModified()) {
|
|
||||||
return ResultNotUpdated;
|
|
||||||
}
|
|
||||||
|
|
||||||
return database_manager.SaveDatabase();
|
|
||||||
}
|
|
||||||
|
|
||||||
Result MiiManager::Delete(DatabaseSessionMetadata& metadata, const Common::UUID& create_id) {
|
|
||||||
const auto result = database_manager.Delete(metadata, create_id);
|
|
||||||
|
|
||||||
if (result.IsFailure()) {
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!database_manager.IsModified()) {
|
|
||||||
return ResultNotUpdated;
|
|
||||||
}
|
|
||||||
|
|
||||||
return database_manager.SaveDatabase();
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 MiiManager::FindIndex(const Common::UUID& create_id, bool is_special) const {
|
|
||||||
s32 index{};
|
|
||||||
const auto result = database_manager.FindIndex(index, create_id, is_special);
|
|
||||||
if (result.IsError()) {
|
|
||||||
index = -1;
|
|
||||||
}
|
|
||||||
return index;
|
|
||||||
}
|
|
||||||
|
|
||||||
Result MiiManager::GetIndex(const DatabaseSessionMetadata& metadata, const CharInfo& char_info,
|
|
||||||
s32& out_index) const {
|
|
||||||
if (char_info.Verify() != ValidationResult::NoErrors) {
|
|
||||||
return ResultInvalidCharInfo;
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 index{};
|
|
||||||
const bool is_special = metadata.magic == MiiMagic;
|
|
||||||
const auto result = database_manager.FindIndex(index, char_info.GetCreateId(), is_special);
|
|
||||||
|
|
||||||
if (result.IsError()) {
|
|
||||||
index = -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (index == -1) {
|
|
||||||
return ResultNotFound;
|
|
||||||
}
|
|
||||||
|
|
||||||
out_index = index;
|
|
||||||
return ResultSuccess;
|
|
||||||
}
|
|
||||||
|
|
||||||
Result MiiManager::Append(DatabaseSessionMetadata& metadata, const CharInfo& char_info) {
|
|
||||||
const auto result = database_manager.Append(metadata, char_info);
|
|
||||||
|
|
||||||
if (result.IsError()) {
|
|
||||||
return ResultNotFound;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!database_manager.IsModified()) {
|
|
||||||
return ResultNotUpdated;
|
|
||||||
}
|
|
||||||
|
|
||||||
return database_manager.SaveDatabase();
|
|
||||||
}
|
|
||||||
|
|
||||||
bool MiiManager::IsBrokenWithClearFlag(DatabaseSessionMetadata& metadata) {
|
|
||||||
const bool is_broken = is_broken_with_clear_flag;
|
|
||||||
if (is_broken_with_clear_flag) {
|
|
||||||
is_broken_with_clear_flag = false;
|
|
||||||
database_manager.Format(metadata);
|
|
||||||
database_manager.SaveDatabase();
|
|
||||||
}
|
|
||||||
return is_broken;
|
|
||||||
}
|
|
||||||
|
|
||||||
Result MiiManager::DestroyFile(DatabaseSessionMetadata& metadata) {
|
|
||||||
is_broken_with_clear_flag = true;
|
|
||||||
return database_manager.DestroyFile(metadata);
|
|
||||||
}
|
|
||||||
|
|
||||||
Result MiiManager::DeleteFile() {
|
|
||||||
return database_manager.DeleteFile();
|
|
||||||
}
|
|
||||||
|
|
||||||
Result MiiManager::Format(DatabaseSessionMetadata& metadata) {
|
|
||||||
database_manager.Format(metadata);
|
|
||||||
|
|
||||||
if (!database_manager.IsModified()) {
|
|
||||||
return ResultNotUpdated;
|
|
||||||
}
|
|
||||||
return database_manager.SaveDatabase();
|
|
||||||
}
|
|
||||||
|
|
||||||
Result MiiManager::ConvertV3ToCharInfo(CharInfo& out_char_info, const Ver3StoreData& mii_v3) const {
|
|
||||||
if (!mii_v3.IsValid()) {
|
|
||||||
return ResultInvalidCharInfo;
|
|
||||||
}
|
|
||||||
|
|
||||||
StoreData store_data{};
|
StoreData store_data{};
|
||||||
mii_v3.BuildToStoreData(store_data);
|
mii_v3.BuildToStoreData(store_data);
|
||||||
const auto name = store_data.GetNickname();
|
|
||||||
if (!MiiUtil::IsFontRegionValid(store_data.GetFontRegion(), name.data)) {
|
|
||||||
store_data.SetInvalidName();
|
|
||||||
}
|
|
||||||
|
|
||||||
out_char_info.SetFromStoreData(store_data);
|
out_char_info.SetFromStoreData(store_data);
|
||||||
return ResultSuccess;
|
|
||||||
}
|
|
||||||
|
|
||||||
Result MiiManager::ConvertCoreDataToCharInfo(CharInfo& out_char_info,
|
|
||||||
const CoreData& core_data) const {
|
|
||||||
if (core_data.IsValid() != ValidationResult::NoErrors) {
|
|
||||||
return ResultInvalidCharInfo;
|
|
||||||
}
|
|
||||||
|
|
||||||
StoreData store_data{};
|
|
||||||
store_data.BuildWithCoreData(core_data);
|
|
||||||
const auto name = store_data.GetNickname();
|
|
||||||
if (!MiiUtil::IsFontRegionValid(store_data.GetFontRegion(), name.data)) {
|
|
||||||
store_data.SetInvalidName();
|
|
||||||
}
|
|
||||||
|
|
||||||
out_char_info.SetFromStoreData(store_data);
|
|
||||||
return ResultSuccess;
|
|
||||||
}
|
|
||||||
|
|
||||||
Result MiiManager::ConvertCharInfoToCoreData(CoreData& out_core_data,
|
|
||||||
const CharInfo& char_info) const {
|
|
||||||
if (char_info.Verify() != ValidationResult::NoErrors) {
|
|
||||||
return ResultInvalidCharInfo;
|
|
||||||
}
|
|
||||||
|
|
||||||
out_core_data.BuildFromCharInfo(char_info);
|
|
||||||
const auto name = out_core_data.GetNickname();
|
|
||||||
if (!MiiUtil::IsFontRegionValid(out_core_data.GetFontRegion(), name.data)) {
|
|
||||||
out_core_data.SetNickname(out_core_data.GetInvalidNickname());
|
|
||||||
}
|
|
||||||
|
|
||||||
return ResultSuccess;
|
|
||||||
}
|
|
||||||
|
|
||||||
Result MiiManager::UpdateLatest(const DatabaseSessionMetadata& metadata, CharInfo& out_char_info,
|
|
||||||
const CharInfo& char_info, SourceFlag source_flag) const {
|
|
||||||
if ((source_flag & SourceFlag::Database) == SourceFlag::None) {
|
|
||||||
return ResultNotFound;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (metadata.IsInterfaceVersionSupported(1)) {
|
|
||||||
if (char_info.Verify() != ValidationResult::NoErrors) {
|
|
||||||
return ResultInvalidCharInfo;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
u32 index{};
|
|
||||||
Result result = database_manager.FindIndex(metadata, index, char_info.GetCreateId());
|
|
||||||
|
|
||||||
if (result.IsError()) {
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
StoreData store_data{};
|
|
||||||
database_manager.Get(store_data, index, metadata);
|
|
||||||
|
|
||||||
if (store_data.GetType() != char_info.GetType()) {
|
|
||||||
return ResultNotFound;
|
|
||||||
}
|
|
||||||
|
|
||||||
out_char_info.SetFromStoreData(store_data);
|
|
||||||
|
|
||||||
if (char_info == out_char_info) {
|
|
||||||
return ResultNotUpdated;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ResultSuccess;
|
|
||||||
}
|
|
||||||
|
|
||||||
Result MiiManager::UpdateLatest(const DatabaseSessionMetadata& metadata, StoreData& out_store_data,
|
|
||||||
const StoreData& store_data, SourceFlag source_flag) const {
|
|
||||||
if ((source_flag & SourceFlag::Database) == SourceFlag::None) {
|
|
||||||
return ResultNotFound;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (metadata.IsInterfaceVersionSupported(1)) {
|
|
||||||
if (store_data.IsValid() != ValidationResult::NoErrors) {
|
|
||||||
return ResultInvalidCharInfo;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
u32 index{};
|
|
||||||
Result result = database_manager.FindIndex(metadata, index, store_data.GetCreateId());
|
|
||||||
|
|
||||||
if (result.IsError()) {
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
database_manager.Get(out_store_data, index, metadata);
|
|
||||||
|
|
||||||
if (out_store_data.GetType() != store_data.GetType()) {
|
|
||||||
return ResultNotFound;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (store_data == out_store_data) {
|
|
||||||
return ResultNotUpdated;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ResultSuccess;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Result MiiManager::Get(const DatabaseSessionMetadata& metadata,
|
Result MiiManager::Get(const DatabaseSessionMetadata& metadata,
|
||||||
std::span<CharInfoElement> out_elements, u32& out_count,
|
std::span<CharInfoElement> out_elements, u32& out_count,
|
||||||
SourceFlag source_flag) const {
|
SourceFlag source_flag) {
|
||||||
if ((source_flag & SourceFlag::Database) == SourceFlag::None) {
|
if ((source_flag & SourceFlag::Database) == SourceFlag::None) {
|
||||||
return BuildDefault(out_elements, out_count, source_flag);
|
return BuildDefault(out_elements, out_count, source_flag);
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto mii_count = database_manager.GetCount(metadata);
|
// TODO(bunnei): We don't implement the Mii database, so we can't have an entry
|
||||||
|
|
||||||
for (std::size_t index = 0; index < mii_count; ++index) {
|
|
||||||
if (out_elements.size() <= static_cast<std::size_t>(out_count)) {
|
|
||||||
return ResultInvalidArgumentSize;
|
|
||||||
}
|
|
||||||
|
|
||||||
StoreData store_data{};
|
|
||||||
database_manager.Get(store_data, index, metadata);
|
|
||||||
|
|
||||||
out_elements[out_count].source = Source::Database;
|
|
||||||
out_elements[out_count].char_info.SetFromStoreData(store_data);
|
|
||||||
out_count++;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Include default Mii at the end of the list
|
// Include default Mii at the end of the list
|
||||||
return BuildDefault(out_elements, out_count, source_flag);
|
return BuildDefault(out_elements, out_count, source_flag);
|
||||||
}
|
}
|
||||||
|
|
||||||
Result MiiManager::Get(const DatabaseSessionMetadata& metadata, std::span<CharInfo> out_char_info,
|
Result MiiManager::Get(const DatabaseSessionMetadata& metadata, std::span<CharInfo> out_char_info,
|
||||||
u32& out_count, SourceFlag source_flag) const {
|
u32& out_count, SourceFlag source_flag) {
|
||||||
if ((source_flag & SourceFlag::Database) == SourceFlag::None) {
|
if ((source_flag & SourceFlag::Database) == SourceFlag::None) {
|
||||||
return BuildDefault(out_char_info, out_count, source_flag);
|
return BuildDefault(out_char_info, out_count, source_flag);
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto mii_count = database_manager.GetCount(metadata);
|
// TODO(bunnei): We don't implement the Mii database, so we can't have an entry
|
||||||
|
|
||||||
for (std::size_t index = 0; index < mii_count; ++index) {
|
|
||||||
if (out_char_info.size() <= static_cast<std::size_t>(out_count)) {
|
|
||||||
return ResultInvalidArgumentSize;
|
|
||||||
}
|
|
||||||
|
|
||||||
StoreData store_data{};
|
|
||||||
database_manager.Get(store_data, index, metadata);
|
|
||||||
|
|
||||||
out_char_info[out_count].SetFromStoreData(store_data);
|
|
||||||
out_count++;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Include default Mii at the end of the list
|
// Include default Mii at the end of the list
|
||||||
return BuildDefault(out_char_info, out_count, source_flag);
|
return BuildDefault(out_char_info, out_count, source_flag);
|
||||||
}
|
}
|
||||||
|
|
||||||
Result MiiManager::Get(const DatabaseSessionMetadata& metadata,
|
|
||||||
std::span<StoreDataElement> out_elements, u32& out_count,
|
|
||||||
SourceFlag source_flag) const {
|
|
||||||
if ((source_flag & SourceFlag::Database) == SourceFlag::None) {
|
|
||||||
return BuildDefault(out_elements, out_count, source_flag);
|
|
||||||
}
|
|
||||||
|
|
||||||
const auto mii_count = database_manager.GetCount(metadata);
|
|
||||||
|
|
||||||
for (std::size_t index = 0; index < mii_count; ++index) {
|
|
||||||
if (out_elements.size() <= static_cast<std::size_t>(out_count)) {
|
|
||||||
return ResultInvalidArgumentSize;
|
|
||||||
}
|
|
||||||
|
|
||||||
StoreData store_data{};
|
|
||||||
database_manager.Get(store_data, index, metadata);
|
|
||||||
|
|
||||||
out_elements[out_count].store_data = store_data;
|
|
||||||
out_elements[out_count].source = Source::Database;
|
|
||||||
out_count++;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Include default Mii at the end of the list
|
|
||||||
return BuildDefault(out_elements, out_count, source_flag);
|
|
||||||
}
|
|
||||||
|
|
||||||
Result MiiManager::Get(const DatabaseSessionMetadata& metadata, std::span<StoreData> out_store_data,
|
|
||||||
u32& out_count, SourceFlag source_flag) const {
|
|
||||||
if ((source_flag & SourceFlag::Database) == SourceFlag::None) {
|
|
||||||
return BuildDefault(out_store_data, out_count, source_flag);
|
|
||||||
}
|
|
||||||
|
|
||||||
const auto mii_count = database_manager.GetCount(metadata);
|
|
||||||
|
|
||||||
for (std::size_t index = 0; index < mii_count; ++index) {
|
|
||||||
if (out_store_data.size() <= static_cast<std::size_t>(out_count)) {
|
|
||||||
return ResultInvalidArgumentSize;
|
|
||||||
}
|
|
||||||
|
|
||||||
StoreData store_data{};
|
|
||||||
database_manager.Get(store_data, index, metadata);
|
|
||||||
|
|
||||||
out_store_data[out_count] = store_data;
|
|
||||||
out_count++;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Include default Mii at the end of the list
|
|
||||||
return BuildDefault(out_store_data, out_count, source_flag);
|
|
||||||
}
|
|
||||||
Result MiiManager::BuildDefault(std::span<CharInfoElement> out_elements, u32& out_count,
|
Result MiiManager::BuildDefault(std::span<CharInfoElement> out_elements, u32& out_count,
|
||||||
SourceFlag source_flag) const {
|
SourceFlag source_flag) {
|
||||||
if ((source_flag & SourceFlag::Default) == SourceFlag::None) {
|
if ((source_flag & SourceFlag::Default) == SourceFlag::None) {
|
||||||
return ResultSuccess;
|
return ResultSuccess;
|
||||||
}
|
}
|
||||||
@ -425,7 +129,7 @@ Result MiiManager::BuildDefault(std::span<CharInfoElement> out_elements, u32& ou
|
|||||||
}
|
}
|
||||||
|
|
||||||
Result MiiManager::BuildDefault(std::span<CharInfo> out_char_info, u32& out_count,
|
Result MiiManager::BuildDefault(std::span<CharInfo> out_char_info, u32& out_count,
|
||||||
SourceFlag source_flag) const {
|
SourceFlag source_flag) {
|
||||||
if ((source_flag & SourceFlag::Default) == SourceFlag::None) {
|
if ((source_flag & SourceFlag::Default) == SourceFlag::None) {
|
||||||
return ResultSuccess;
|
return ResultSuccess;
|
||||||
}
|
}
|
||||||
@ -446,41 +150,23 @@ Result MiiManager::BuildDefault(std::span<CharInfo> out_char_info, u32& out_coun
|
|||||||
return ResultSuccess;
|
return ResultSuccess;
|
||||||
}
|
}
|
||||||
|
|
||||||
Result MiiManager::BuildDefault(std::span<StoreDataElement> out_elements, u32& out_count,
|
Result MiiManager::GetIndex(const DatabaseSessionMetadata& metadata, const CharInfo& char_info,
|
||||||
SourceFlag source_flag) const {
|
s32& out_index) {
|
||||||
if ((source_flag & SourceFlag::Default) == SourceFlag::None) {
|
|
||||||
return ResultSuccess;
|
if (char_info.Verify() != ValidationResult::NoErrors) {
|
||||||
|
return ResultInvalidCharInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (std::size_t index = 0; index < DefaultMiiCount; ++index) {
|
constexpr u32 INVALID_INDEX{0xFFFFFFFF};
|
||||||
if (out_elements.size() <= static_cast<std::size_t>(out_count)) {
|
|
||||||
return ResultInvalidArgumentSize;
|
|
||||||
}
|
|
||||||
|
|
||||||
out_elements[out_count].store_data.BuildDefault(static_cast<u32>(index));
|
out_index = INVALID_INDEX;
|
||||||
out_elements[out_count].source = Source::Default;
|
|
||||||
out_count++;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ResultSuccess;
|
// TODO(bunnei): We don't implement the Mii database, so we can't have an index
|
||||||
|
return ResultNotFound;
|
||||||
}
|
}
|
||||||
|
|
||||||
Result MiiManager::BuildDefault(std::span<StoreData> out_char_info, u32& out_count,
|
void MiiManager::SetInterfaceVersion(DatabaseSessionMetadata& metadata, u32 version) {
|
||||||
SourceFlag source_flag) const {
|
metadata.interface_version = version;
|
||||||
if ((source_flag & SourceFlag::Default) == SourceFlag::None) {
|
|
||||||
return ResultSuccess;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (std::size_t index = 0; index < DefaultMiiCount; ++index) {
|
|
||||||
if (out_char_info.size() <= static_cast<std::size_t>(out_count)) {
|
|
||||||
return ResultInvalidArgumentSize;
|
|
||||||
}
|
|
||||||
|
|
||||||
out_char_info[out_count].BuildDefault(static_cast<u32>(index));
|
|
||||||
out_count++;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ResultSuccess;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace Service::Mii
|
} // namespace Service::Mii
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user