Updated FFmpeg per dev comment, reupdated-dependencies and initialize…

…d more values
sudachi-emu · Mar 11, 2024 · 169fe4f · 169fe4f
1 parent a0ce82c
commit 169fe4f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/externals/ffmpeg/ffmpeg b/externals/ffmpeg/ffmpeg
diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts
@@ -25,9 +25,9 @@ val autoVersion = (((System.currentTimeMillis() / 1000) - 1451606400) / 10).toIn
 @Suppress("UnstableApiUsage")
 android {
     namespace = "org.yuzu.yuzu_emu"
+    compileSdk = 34
 
-    compileSdkVersion = "android-34"
-    ndkVersion = "26.1.10909125"
+    ndkVersion = "26.2.11394342"
 
     buildFeatures {
         viewBinding = true
@@ -161,6 +161,7 @@ android {
             path = file("../../../CMakeLists.txt")
         }
     }
+    buildToolsVersion = "34.0.0"
 
     defaultConfig {
         externalNativeBuild {
@@ -232,15 +233,15 @@ dependencies {
     implementation("com.google.android.material:material:1.11.0")
     implementation("androidx.preference:preference-ktx:1.2.1")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0")
-    implementation("io.coil-kt:coil:2.2.2")
+    implementation("io.coil-kt:coil:2.6.0")
     implementation("androidx.core:core-splashscreen:1.0.1")
     implementation("androidx.window:window:1.2.0")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
     implementation("androidx.navigation:navigation-fragment-ktx:2.7.7")
     implementation("androidx.navigation:navigation-ui-ktx:2.7.7")
     implementation("info.debatty:java-string-similarity:2.0.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
 }
 
 fun runGitCommand(command: List<String>): String {

diff --git a/src/input_common/drivers/gc_adapter.cpp b/src/input_common/drivers/gc_adapter.cpp
@@ -38,7 +38,7 @@ class LibUSBContext {
     }
 
 private:
-    libusb_context* ctx;
+    libusb_context* ctx = nullptr;
     int init_result{};
 };
 
@@ -66,7 +66,7 @@ class LibUSBDeviceHandle {
     }
 
 private:
-    libusb_device_handle* handle{};
+    libusb_device_handle* handle = nullptr;
 };
 
 GCAdapter::GCAdapter(std::string input_engine_) : InputEngine(std::move(input_engine_)) {
@@ -218,8 +218,7 @@ void GCAdapter::AdapterScanThread(std::stop_token stop_token) {
     Common::SetCurrentThreadName("ScanGCAdapter");
     usb_adapter_handle = nullptr;
     pads = {};
-    while (!Setup() && Common::StoppableTimedWait(stop_token, std::chrono::seconds{2})) {
-    }
+    while (!Setup() && Common::StoppableTimedWait(stop_token, std::chrono::seconds{2})) {}
 }
 
 bool GCAdapter::Setup() {

diff --git a/src/input_common/drivers/gc_adapter.h b/src/input_common/drivers/gc_adapter.h
@@ -117,7 +117,7 @@ class GCAdapter : public InputEngine {
     Common::Input::ButtonNames GetUIButtonName(const Common::ParamPackage& params) const;
 
     std::unique_ptr<LibUSBDeviceHandle> usb_adapter_handle;
-    std::array<GCController, 4> pads;
+    std::array<GCController, 4> pads{};
 
     std::jthread adapter_input_thread;
     std::jthread adapter_scan_thread;

diff --git a/src/video_core/renderer_opengl/gl_buffer_cache.cpp b/src/video_core/renderer_opengl/gl_buffer_cache.cpp
@@ -241,8 +241,8 @@ void BufferCacheRuntime::BindVertexBuffer(u32 index, Buffer& buffer, u32 offset,
 
 void BufferCacheRuntime::BindVertexBuffers(VideoCommon::HostBindings<Buffer>& bindings) {
     // TODO: Should HostBindings provide the correct runtime types to avoid these transforms?
-    std::array<GLuint, 32> buffer_handles;
-    std::array<GLsizei, 32> buffer_strides;
+    std::array<GLuint, 32> buffer_handles{};
+    std::array<GLsizei, 32> buffer_strides{};
     std::ranges::transform(bindings.buffers, buffer_handles.begin(),
                            [](const Buffer* const buffer) { return buffer->Handle(); });
     std::ranges::transform(bindings.strides, buffer_strides.begin(),