[Bink2] rework bridge to use FFmpeg's native Bink2 decoder instead of a C bridge

CONTRIBUTING.md

@@ -26,25 +26,6 @@ Before opening a pull request, please keep the following in mind:
 
 If you're unsure about a design decision, feel free to open a discussion or draft PR first.
 
-## Pull Request Expectations
-
-Pull requests should provide real, observable emulator behavior rather than only suppressing errors or unresolved imports.
-
-Changes that only return success, zero, or fabricated handles without implementing the expected state, output, or side effects will generally not be accepted. Functions that create resources, write output structures, register callbacks, or expose runtime state should model the behavior required by the guest.
-
-When applicable, PRs should include:
-
-- The affected game or application.
-- Relevant logs or failing imports.
-- Behavior before and after the change.
-- Real game testing and known limitations.
-
-Avoid submitting large collections of speculative NIDs or unrelated exports. Keep each PR focused on one problem or a closely related set of changes.
-
-Large architectural changes should be discussed with the maintainers before implementation. Contributors are encouraged to ask first when they are uncertain whether a proposed direction fits the project.
-
-Opening a PR does not guarantee that it will be merged. Maintainers evaluate changes based on correctness, evidence, testing, scope, maintenance cost, and the long-term direction of the project.
-
 ## AI-Assisted Contributions
 
 AI-assisted development is welcome and may be used for research, reverse engineering, code generation, or documentation.

Directory.Build.props

@@ -9,7 +9,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <SharpEmuVersion>0.0.2-beta.5</SharpEmuVersion>
+    <SharpEmuVersion>0.0.2-beta.4</SharpEmuVersion>
     <Version>$(SharpEmuVersion)</Version>
 
     <RepoRoot>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)'))</RepoRoot>

src/SharpEmu.CLI/Program.cs

@@ -573,7 +573,12 @@ internal static partial class Program
             return false;
         }
 
-        string[] childArgs = [MitigatedChildFlag, .. args];
+        var childArgs = new string[args.Length + 1];
+        childArgs[0] = MitigatedChildFlag;
+        for (var i = 0; i < args.Length; i++)
+        {
+            childArgs[i + 1] = args[i];
+        }
 
         var commandLine = BuildCommandLine(processPath, childArgs);
         var startupInfoEx = new STARTUPINFOEX();

src/SharpEmu.Libs/Agc/AgcExports.cs

@@ -965,20 +965,6 @@ public static partial class AgcExports
         return ReturnPointer(ctx, commandAddress);
     }
 
-    // RenderThread/Subrender probe this before writing a NOP. Unresolved
-    // GetSize returns NOT_FOUND and leaves command-buffer sizing broken.
-    // CbNop rejects dwordCount < 2, so report that floor.
-    [SysAbiExport(
-        Nid = "t7PlZ9nt5Lc",
-        ExportName = "sceAgcCbNopGetSize",
-        Target = Generation.Gen5,
-        LibraryName = "libSceAgc")]
-    public static int CbNopGetSize(CpuContext ctx)
-    {
-        ctx[CpuRegister.Rax] = 2u * sizeof(uint);
-        return (int)ctx[CpuRegister.Rax];
-    }
-
     [SysAbiExport(
         Nid = "k3GhuSNmBLU",
         ExportName = "sceAgcCbDispatch",
@@ -1176,18 +1162,6 @@ public static partial class AgcExports
         return ReturnPointer(ctx, commandAddress);
     }
 
-    // Matches the fixed 8-dword ACQUIRE_MEM packet AcbAcquireMem writes above.
-    [SysAbiExport(
-        Nid = "ewobAQeMo5k",
-        ExportName = "sceAgcAcbAcquireMemGetSize",
-        Target = Generation.Gen5,
-        LibraryName = "libSceAgc")]
-    public static int AcbAcquireMemGetSize(CpuContext ctx)
-    {
-        ctx[CpuRegister.Rax] = 8u * sizeof(uint);
-        return (int)ctx[CpuRegister.Rax];
-    }
-
     [SysAbiExport(
         Nid = "htn36gPnBk4",
         ExportName = "sceAgcAcbWaitRegMem",
@@ -1763,18 +1737,6 @@ public static partial class AgcExports
         return ReturnPointer(ctx, commandAddress);
     }
 
-    // Matches the fixed 8-dword ACQUIRE_MEM packet DcbAcquireMem writes above.
-    [SysAbiExport(
-        Nid = "-vnlTPPXPrw",
-        ExportName = "sceAgcDcbAcquireMemGetSize",
-        Target = Generation.Gen5,
-        LibraryName = "libSceAgc")]
-    public static int DcbAcquireMemGetSize(CpuContext ctx)
-    {
-        ctx[CpuRegister.Rax] = 8u * sizeof(uint);
-        return (int)ctx[CpuRegister.Rax];
-    }
-
     [SysAbiExport(
         Nid = "i1jyy49AjXU",
         ExportName = "sceAgcDcbWriteData",
@@ -2428,20 +2390,6 @@ public static partial class AgcExports
                 : OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
     }
 
-    // PatchAddress/PatchData touch UInt64 fields at +12/+20 of an RReleaseMem
-    // packet, so the packet is at least 7 dwords; use the 8-dword RELEASE_MEM
-    // family size already used elsewhere in this file.
-    [SysAbiExport(
-        Nid = "hL7C0IRpWZI",
-        ExportName = "sceAgcCbQueueEndOfPipeActionGetSize",
-        Target = Generation.Gen5,
-        LibraryName = "libSceAgc")]
-    public static int CbQueueEndOfPipeActionGetSize(CpuContext ctx)
-    {
-        ctx[CpuRegister.Rax] = 8u * sizeof(uint);
-        return (int)ctx[CpuRegister.Rax];
-    }
-
     [SysAbiExport(
         Nid = "0fWWK5uG9rQ",
         ExportName = "sceAgcQueueEndOfPipeActionPatchAddress",
@@ -11521,34 +11469,6 @@ public static partial class AgcExports
             $"[LOADER][TRACE] agc.create_shader dst=0x{destinationAddress:X16} header=0x{headerAddress:X16} code=0x{codeAddress:X16} {detail}");
     }
 
-    // Hardware REWIND is a fixed 2-dword header + valid-bit packet (same floor
-    // as CbNopGetSize). No Rewind writer is implemented yet; size-only is enough
-    // for callers that allocate the packet before filling it.
-    [SysAbiExport(
-        Nid = "QIXCsbipds0",
-        ExportName = "sceAgcDcbRewindGetSize",
-        Target = Generation.Gen5,
-        LibraryName = "libSceAgc")]
-    public static int DcbRewindGetSize(CpuContext ctx)
-    {
-        ctx[CpuRegister.Rax] = 2u * sizeof(uint);
-        return (int)ctx[CpuRegister.Rax];
-    }
-
-    // Matches the 4-dword INDIRECT_BUFFER packet DcbJump writes below.
-    // Returning NOT_FOUND here left callers with a null packet pointer and an
-    // immediate write AV on RenderThread.
-    [SysAbiExport(
-        Nid = "VEGu4dixjUg",
-        ExportName = "sceAgcDcbJumpGetSize",
-        Target = Generation.Gen5,
-        LibraryName = "libSceAgc")]
-    public static int DcbJumpGetSize(CpuContext ctx)
-    {
-        ctx[CpuRegister.Rax] = 4u * sizeof(uint);
-        return (int)ctx[CpuRegister.Rax];
-    }
-
     [SysAbiExport(
         Nid = "xSAR0LTcRKM",
         ExportName = "sceAgcDcbJump",

src/SharpEmu.Libs/Audio/AjmExports.cs

@@ -21,7 +21,6 @@ public static class AjmExports
     private const int MaxInstanceIndex = 0x2FFF;
     private static readonly ConcurrentDictionary<uint, AjmContextState> Contexts = new();
     private static int _nextContextId;
-    private static int _nextBatchId;
 
     private sealed class AjmContextState
     {
@@ -228,250 +227,10 @@ public static class AjmExports
         return 0;
     }
 
-    /// <summary>
-    /// Enqueues a decode job on a batch. Titles call this on the Bink/AJM hot
-    /// path; leaving it unresolved floods Import WARN spam. This is a silence
-    /// stub, not a codec: advance the batch cursor and report the input as
-    /// consumed with silence produced so the title does not spin on the same
-    /// packet.
-    /// </summary>
-    [SysAbiExport(
-        Nid = "39WxhR-ePew",
-        ExportName = "sceAjmBatchJobDecode",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceAjm")]
-    public static int AjmBatchJobDecode(CpuContext ctx)
-    {
-        var infoAddress = ctx[CpuRegister.Rdi];
-        var instanceId = unchecked((uint)ctx[CpuRegister.Rsi]);
-        var inputAddress = ctx[CpuRegister.Rdx];
-        var inputSize = ctx[CpuRegister.Rcx];
-        var outputAddress = ctx[CpuRegister.R8];
-        var outputSize = ctx[CpuRegister.R9];
-        var resultAddress = ReadStackArg64(ctx, 0);
-
-        if (infoAddress == 0)
-        {
-            return ctx.SetReturn(OrbisAjmErrorInvalidParameter);
-        }
-
-        // Best-effort: bump the batch cursor when the guest filled AjmBatchInfo.
-        // Still succeed without it — the unresolved stub returned 0 and titles
-        // keep calling; failing here would reintroduce hot-path spam via retries.
-        _ = TryAppendBatchJob(ctx, infoAddress, AjmJobRunSize);
-
-        // Silence: clear PCM out and claim full input consumed so the guest
-        // advances its bitstream cursor instead of re-submitting forever.
-        if (outputAddress != 0 && outputSize != 0 && outputSize <= MaxSilentPcmBytes)
-        {
-            ClearGuestMemory(ctx, outputAddress, outputSize);
-        }
-
-        WriteDecodeStreamResult(
-            ctx,
-            resultAddress,
-            inputConsumed: inputSize > int.MaxValue ? int.MaxValue : (int)inputSize,
-            outputWritten: 0,
-            totalDecodedSamples: 0,
-            frames: inputSize != 0 || outputSize != 0 ? 1u : 0u);
-
-        Trace(
-            $"batch_job_decode info=0x{infoAddress:X16} instance=0x{instanceId:X8} " +
-            $"in=0x{inputAddress:X16}+0x{inputSize:X} out=0x{outputAddress:X16}+0x{outputSize:X} " +
-            $"result=0x{resultAddress:X16}");
-        return ctx.SetReturn(0);
-    }
-
-    /// <summary>
-    /// Submits a built batch. Instant-complete silence stub: publish a batch id
-    /// and clear any error out. Decode sidebands were already filled at
-    /// job-enqueue time.
-    /// </summary>
-    [SysAbiExport(
-        Nid = "5tOfnaClcqM",
-        ExportName = "sceAjmBatchStart",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceAjm")]
-    public static int AjmBatchStart(CpuContext ctx)
-    {
-        var contextId = unchecked((uint)ctx[CpuRegister.Rdi]);
-        var infoAddress = ctx[CpuRegister.Rsi];
-        var priority = unchecked((int)ctx[CpuRegister.Rdx]);
-        var errorAddress = ctx[CpuRegister.Rcx];
-        var batchOutAddress = ctx[CpuRegister.R8];
-
-        if (infoAddress == 0 || batchOutAddress == 0)
-        {
-            return ctx.SetReturn(OrbisAjmErrorInvalidParameter);
-        }
-
-        ClearAjmBatchError(ctx, errorAddress);
-
-        var batchId = unchecked((uint)Interlocked.Increment(ref _nextBatchId));
-        Span<byte> batchValue = stackalloc byte[sizeof(uint)];
-        BinaryPrimitives.WriteUInt32LittleEndian(batchValue, batchId);
-        if (!ctx.Memory.TryWrite(batchOutAddress, batchValue))
-        {
-            return ctx.SetReturn(OrbisAjmErrorInvalidParameter);
-        }
-
-        Trace(
-            $"batch_start context={contextId} info=0x{infoAddress:X16} " +
-            $"priority={priority} batch={batchId} error=0x{errorAddress:X16}");
-        return ctx.SetReturn(0);
-    }
-
-    [SysAbiExport(
-        Nid = "-qLsfDAywIY",
-        ExportName = "sceAjmBatchWait",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceAjm")]
-    public static int AjmBatchWait(CpuContext ctx)
-    {
-        // Batches complete synchronously in Start; Wait is a no-op success.
-        var errorAddress = ctx[CpuRegister.Rcx];
-        ClearAjmBatchError(ctx, errorAddress);
-        Trace(
-            $"batch_wait context={unchecked((uint)ctx[CpuRegister.Rdi])} " +
-            $"batch={unchecked((uint)ctx[CpuRegister.Rsi])} " +
-            $"timeout={unchecked((uint)ctx[CpuRegister.Rdx])}");
-        return ctx.SetReturn(0);
-    }
-
-    [SysAbiExport(
-        Nid = "NVDXiUesSbA",
-        ExportName = "sceAjmBatchCancel",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceAjm")]
-    public static int AjmBatchCancel(CpuContext ctx)
-    {
-        Trace(
-            $"batch_cancel context={unchecked((uint)ctx[CpuRegister.Rdi])} " +
-            $"batch={unchecked((uint)ctx[CpuRegister.Rsi])}");
-        return ctx.SetReturn(0);
-    }
-
     internal static void ResetForTests()
     {
         Contexts.Clear();
         Interlocked.Exchange(ref _nextContextId, 0);
-        Interlocked.Exchange(ref _nextBatchId, 0);
-    }
-
-    // AjmBatchInfo: buffer, offset, size, last_good_job, last_good_job_ra (5× u64).
-    private const ulong AjmBatchInfoOffsetField = 8;
-    private const ulong AjmBatchInfoSizeField = 16;
-    private const ulong AjmBatchInfoLastGoodJobField = 24;
-    private const ulong AjmJobRunSize = 64;
-    private const ulong MaxSilentPcmBytes = 1 << 20;
-    // AjmSidebandResult (8) + AjmSidebandStream (16) + AjmSidebandMFrame (8).
-    private const int DecodeSidebandBytes = 32;
-
-    private static bool TryAppendBatchJob(CpuContext ctx, ulong infoAddress, ulong jobSize)
-    {
-        if (!TryReadUInt64(ctx, infoAddress, out var buffer) ||
-            !TryReadUInt64(ctx, infoAddress + AjmBatchInfoOffsetField, out var offset) ||
-            !TryReadUInt64(ctx, infoAddress + AjmBatchInfoSizeField, out var size))
-        {
-            return false;
-        }
-
-        if (buffer == 0 || jobSize == 0 || offset > size || size - offset < jobSize)
-        {
-            return false;
-        }
-
-        var jobAddress = buffer + offset;
-        ClearGuestMemory(ctx, jobAddress, jobSize);
-        return TryWriteUInt64(ctx, infoAddress + AjmBatchInfoLastGoodJobField, jobAddress) &&
-               TryWriteUInt64(ctx, infoAddress + AjmBatchInfoOffsetField, offset + jobSize);
-    }
-
-    // AjmBatchError: int error_code; const void* job_addr; uint32_t cmd_offset; const void* job_ra;
-    private const int AjmBatchErrorBytes = 24;
-
-    private static void ClearAjmBatchError(CpuContext ctx, ulong errorAddress)
-    {
-        if (errorAddress == 0)
-        {
-            return;
-        }
-
-        Span<byte> error = stackalloc byte[AjmBatchErrorBytes];
-        error.Clear();
-        _ = ctx.Memory.TryWrite(errorAddress, error);
-    }
-
-    private static void WriteDecodeStreamResult(
-        CpuContext ctx,
-        ulong resultAddress,
-        int inputConsumed,
-        int outputWritten,
-        ulong totalDecodedSamples,
-        uint frames)
-    {
-        if (resultAddress == 0)
-        {
-            return;
-        }
-
-        Span<byte> sideband = stackalloc byte[DecodeSidebandBytes];
-        sideband.Clear();
-        // AjmSidebandResult.result / internal_result = 0 (OK)
-        BinaryPrimitives.WriteInt32LittleEndian(sideband.Slice(8, 4), inputConsumed);
-        BinaryPrimitives.WriteInt32LittleEndian(sideband.Slice(12, 4), outputWritten);
-        BinaryPrimitives.WriteUInt64LittleEndian(sideband.Slice(16, 8), totalDecodedSamples);
-        BinaryPrimitives.WriteUInt32LittleEndian(sideband.Slice(24, 4), frames);
-        _ = ctx.Memory.TryWrite(resultAddress, sideband);
-    }
-
-    private static void ClearGuestMemory(CpuContext ctx, ulong address, ulong byteCount)
-    {
-        if (address == 0 || byteCount == 0)
-        {
-            return;
-        }
-
-        var remaining = byteCount;
-        var cursor = address;
-        Span<byte> zero = stackalloc byte[256];
-        while (remaining > 0)
-        {
-            var chunk = (int)Math.Min(remaining, (ulong)zero.Length);
-            if (!ctx.Memory.TryWrite(cursor, zero[..chunk]))
-            {
-                return;
-            }
-
-            cursor += (ulong)chunk;
-            remaining -= (ulong)chunk;
-        }
-    }
-
-    private static ulong ReadStackArg64(CpuContext ctx, int index)
-    {
-        var address = ctx[CpuRegister.Rsp] + sizeof(ulong) + ((ulong)index * sizeof(ulong));
-        return TryReadUInt64(ctx, address, out var value) ? value : 0;
-    }
-
-    private static bool TryReadUInt64(CpuContext ctx, ulong address, out ulong value)
-    {
-        Span<byte> buffer = stackalloc byte[sizeof(ulong)];
-        if (!ctx.Memory.TryRead(address, buffer))
-        {
-            value = 0;
-            return false;
-        }
-
-        value = BinaryPrimitives.ReadUInt64LittleEndian(buffer);
-        return true;
-    }
-
-    private static bool TryWriteUInt64(CpuContext ctx, ulong address, ulong value)
-    {
-        Span<byte> buffer = stackalloc byte[sizeof(ulong)];
-        BinaryPrimitives.WriteUInt64LittleEndian(buffer, value);
-        return ctx.Memory.TryWrite(address, buffer);
     }
 
     private static void Trace(string message)

src/SharpEmu.Libs/SystemService/SystemServiceExports.cs

@@ -45,25 +45,6 @@ public static class SystemServiceExports
             : ctx.SetReturn((int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT);
     }
 
-    [SysAbiExport(
-        Nid = "8Lo6Zv94aho",
-        ExportName = "sceSystemServiceDisableNoticeScreenSkipFlagAutoSet",
-        Target = Generation.Gen5,
-        LibraryName = "libSceSystemService")]
-    public static int SystemServiceDisableNoticeScreenSkipFlagAutoSet(CpuContext ctx) =>
-        ctx.SetReturn(0);
-
-    // Settings entry calls this immediately before spawning SaveModTime/Load
-    // threads. An unresolved stub returns NOT_FOUND and the title can stall in
-    // that path; accept the write and report success.
-    [SysAbiExport(
-        Nid = "Q3utJvma4Mo",
-        ExportName = "sceSystemServiceSetNoticeScreenSkipFlag",
-        Target = Generation.Gen5,
-        LibraryName = "libSceSystemService")]
-    public static int SystemServiceSetNoticeScreenSkipFlag(CpuContext ctx) =>
-        ctx.SetReturn(0);
-
     [SysAbiExport(
         Nid = "4veE0XiIugA",
         ExportName = "sceSystemServiceGetMainAppTitleId",

src/SharpEmu.Libs/Voice/VoiceQoSExports.cs

@@ -16,37 +16,4 @@ public static class VoiceQoSExports
     {
         return ctx.SetReturn(0);
     }
-
-    [SysAbiExport(
-        Nid = "Trpt2QBZHCI",
-        ExportName = "sceVoiceQoSGetStatus",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceVoiceQoS")]
-    public static int VoiceQoSGetStatus(CpuContext ctx)
-    {
-        // Returns 0 to indicate connected state (voice available)
-        return ctx.SetReturn(0);
-    }
-
-    [SysAbiExport(
-        Nid = "FuXenJLkk-c",
-        ExportName = "sceVoiceQoSTerminate",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceVoiceQoS")]
-    public static int VoiceQoSTerminate(CpuContext ctx)
-    {
-        // No-op: cleanup is handled by emulator shutdown
-        return ctx.SetReturn(0);
-    }
-
-    [SysAbiExport(
-        Nid = "+0lOiPZjnBI",
-        ExportName = "sceVoiceQoSSetMode",
-        Target = Generation.Gen4 | Generation.Gen5,
-        LibraryName = "libSceVoiceQoS")]
-    public static int VoiceQoSSetMode(CpuContext ctx)
-    {
-        // No-op: mode configuration is not emulated
-        return ctx.SetReturn(0);
-    }
 }