From e7360493ca14ef016b4dce60aac8dedb9901839f Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Wed, 18 Nov 2026 17:46:12 -0500 Subject: [PATCH 1/2] feat(audio): add playback settings and probes --- CMakeLists.txt | 1 + README.md | 32 +- cmake/nxdk.cmake | 1 + cmake/run-child-build.cmake | 1 + cmake/sources.cmake | 1 + cmake/stage-lucide.cmake | 1 + cmake/xbox-build.cmake | 31 ++ docs/images/screenshots/04-settings.png | Bin 70088 -> 38624 bytes experiments/README.md | 50 ++- experiments/audio_playback_probe.cpp | 183 +++++++++ .../generate_surround_channel_check.py | 72 ++++ src/app/client_state.cpp | 41 +- src/app/client_state.h | 5 +- src/app/settings_storage.cpp | 18 +- src/app/settings_storage.h | 3 +- src/main.cpp | 6 + src/streaming/audio_configuration.cpp | 32 ++ src/streaming/audio_configuration.h | 47 +++ src/streaming/audio_player.cpp | 241 ++++++++++++ src/streaming/audio_player.h | 115 ++++++ src/streaming/ffmpeg_stream_backend.cpp | 359 ++---------------- src/streaming/ffmpeg_stream_backend.h | 74 +--- src/streaming/session.cpp | 4 +- src/ui/shell_screen.cpp | 3 +- src/ui/shell_view.cpp | 14 +- tests/unit/app/client_state_test.cpp | 106 ++++-- tests/unit/app/directory_picker_test.cpp | 12 +- tests/unit/app/settings_storage_test.cpp | 36 ++ tests/unit/ui/shell_view_test.cpp | 32 +- 29 files changed, 1046 insertions(+), 475 deletions(-) create mode 100644 experiments/audio_playback_probe.cpp create mode 100644 experiments/generate_surround_channel_check.py create mode 100644 src/streaming/audio_configuration.cpp create mode 100644 src/streaming/audio_configuration.h create mode 100644 src/streaming/audio_player.cpp create mode 100644 src/streaming/audio_player.h diff --git a/CMakeLists.txt b/CMakeLists.txt index ad789bd..0a851a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE BOOL "Export compile commands for IDE set(MOONLIGHT_BUILD_KIND "HOST" CACHE STRING "Internal Moonlight build mode") set_property(CACHE MOONLIGHT_BUILD_KIND PROPERTY STRINGS HOST XBOX) option(MOONLIGHT_BUILD_VIDEO_EXPERIMENTS "Build standalone GPU presentation and MPEG-2 sampling experiments" OFF) +option(MOONLIGHT_BUILD_AUDIO_EXPERIMENTS "Build the standalone Opus playback probe" OFF) option(MOONLIGHT_INPUT_DIAGNOSTICS "Display digital controller state while diagnosing stream input" OFF) if(MOONLIGHT_BUILD_KIND STREQUAL "XBOX") diff --git a/README.md b/README.md index 470749e..0f7cc5e 100644 --- a/README.md +++ b/README.md @@ -79,6 +79,18 @@ framebuffer when available and performed better in xemu. **GPU** uses NV2A color with automatic software fallback. The setting is saved as `streaming.gpu_presentation` and both paths are available in the same build. +## Stream audio + +Choose **Settings → Audio → Audio Mode** before starting or resuming a stream. **Stereo** keeps +left and right separate and is the default. **Mono** mixes the stereo stream locally and plays the +same signal through both outputs. The selection is saved as `streaming.audio_mode` with a value +of `stereo` or `mono`. + +**Play Audio on Xbox** defaults to **On**. Turn it off to skip local audio decoding and playback. +**Play Audio on PC** defaults to **Off**. Turn it on to request playback on the host during the stream. +Saved choices take precedence. To check Xbox audio without a host, use the +[standalone audio probe](experiments/README.md#audio-playback-probe). + ## Streaming controls and statistics The default stream profile is **640×480 at 60 FPS and 3 Mbps**. Saved settings take precedence. @@ -263,11 +275,12 @@ For host and Xbox builds, CMake checks whether the compiler supports Clang's `un cmake -S . -B cmake-build-release -DBUILD_DOCS=OFF -DCMAKE_BUILD_TYPE=Release ``` -Video build settings: +Optional Xbox build settings: | CMake option | Default | Purpose | | ----------------------------------- | ------- | ---------------------------------------------------------------------------------------------- | -| `MOONLIGHT_BUILD_VIDEO_EXPERIMENTS` | `OFF` | Build the standalone probes described in [Video experiments](experiments/README.md). | +| `MOONLIGHT_BUILD_VIDEO_EXPERIMENTS` | `OFF` | Build the standalone [video probes](experiments/README.md). | +| `MOONLIGHT_BUILD_AUDIO_EXPERIMENTS` | `OFF` | Build the standalone [audio playback probe](experiments/README.md#audio-playback-probe). | | `MOONLIGHT_INPUT_DIAGNOSTICS` | `OFF` | Show controller state and event counters. Select Software presentation to see the debug strip. | Pass these options when configuring. Existing build directories retain cached build options until @@ -425,19 +438,18 @@ scripts\setup-xemu.cmd --skip-support-files - [x] Game/App Selection - [x] Host Details - [x] App Details - - [ ] Pause/Hotkey overlay + - [x] Pause/Hotkey overlay - Streaming - [x] Video - https://www.xbmc4xbox.org.uk/wiki/XBMC_Features_and_Supported_Formats#Xbox_supported_video_formats_and_resolutions - [ ] Audio - - [ ] Mono - - [ ] Stereo - - [ ] 5.1 Surround - - [ ] 7.1 Surround + - [x] Mono + - [x] Stereo + - [ ] Dolby Digital 5.1 output over optical S/PDIF - Input - [x] Gamepad Input - - [ ] Keyboard Input - - [ ] Mouse Input - - [ ] Mouse Emulation via Gamepad + - [x] Keyboard Input + - [x] Mouse Input + - [x] Mouse Emulation via Gamepad - Misc. - [x] Save config and pairing states - [x] Host pairing diff --git a/cmake/nxdk.cmake b/cmake/nxdk.cmake index 210e40b..e492c29 100644 --- a/cmake/nxdk.cmake +++ b/cmake/nxdk.cmake @@ -380,6 +380,7 @@ function(moonlight_add_xbox_build) -DMOONLIGHT_TOOLCHAIN_FILE:FILEPATH=${toolchain_file} -DMOONLIGHT_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -DMOONLIGHT_BUILD_VIDEO_EXPERIMENTS:BOOL=${MOONLIGHT_BUILD_VIDEO_EXPERIMENTS} + -DMOONLIGHT_BUILD_AUDIO_EXPERIMENTS:BOOL=${MOONLIGHT_BUILD_AUDIO_EXPERIMENTS} -DMOONLIGHT_INPUT_DIAGNOSTICS:BOOL=${MOONLIGHT_INPUT_DIAGNOSTICS} -P "${driver_script}" ) diff --git a/cmake/run-child-build.cmake b/cmake/run-child-build.cmake index 73a1088..7b5871a 100644 --- a/cmake/run-child-build.cmake +++ b/cmake/run-child-build.cmake @@ -29,6 +29,7 @@ if(MOONLIGHT_COMMAND_MODE STREQUAL "configure") -B "${MOONLIGHT_BINARY_DIR}" -DMOONLIGHT_BUILD_KIND:STRING=XBOX "-DMOONLIGHT_BUILD_VIDEO_EXPERIMENTS:BOOL=${MOONLIGHT_BUILD_VIDEO_EXPERIMENTS}" + "-DMOONLIGHT_BUILD_AUDIO_EXPERIMENTS:BOOL=${MOONLIGHT_BUILD_AUDIO_EXPERIMENTS}" "-DMOONLIGHT_INPUT_DIAGNOSTICS:BOOL=${MOONLIGHT_INPUT_DIAGNOSTICS}" "-DMOONLIGHT_NXDK_DIR:PATH=${MOONLIGHT_NXDK_SOURCE_DIR}" "-DMOONLIGHT_NXDK_BUILD_DIR:PATH=${MOONLIGHT_NXDK_DIR}" diff --git a/cmake/sources.cmake b/cmake/sources.cmake index 00ded9a..89ca355 100644 --- a/cmake/sources.cmake +++ b/cmake/sources.cmake @@ -16,6 +16,7 @@ list(REMOVE_ITEM MOONLIGHT_SOURCES set(MOONLIGHT_TEST_EXCLUDED_SOURCES "${MOONLIGHT_SOURCE_ROOT}/src/input/shell_controller.cpp" "${MOONLIGHT_SOURCE_ROOT}/src/main.cpp" + "${MOONLIGHT_SOURCE_ROOT}/src/streaming/audio_player.cpp" "${MOONLIGHT_SOURCE_ROOT}/src/splash/splash_screen.cpp" "${MOONLIGHT_SOURCE_ROOT}/src/streaming/ffmpeg_stream_backend.cpp" "${MOONLIGHT_SOURCE_ROOT}/src/streaming/ffmpeg_video_frame.cpp" diff --git a/cmake/stage-lucide.cmake b/cmake/stage-lucide.cmake index 514bedc..e084979 100644 --- a/cmake/stage-lucide.cmake +++ b/cmake/stage-lucide.cmake @@ -30,6 +30,7 @@ foreach(icon IN ITEMS scroll-text settings share-2 + volume-2 ) set(_icon_source "${LUCIDE_SOURCE_DIR}/icons/${icon}.svg") if(NOT EXISTS "${_icon_source}") diff --git a/cmake/xbox-build.cmake b/cmake/xbox-build.cmake index 64d204b..35f162a 100644 --- a/cmake/xbox-build.cmake +++ b/cmake/xbox-build.cmake @@ -147,6 +147,37 @@ add_custom_target(xbe_iso ALL ) add_dependencies(xbe_iso cxbe_convert) +if(MOONLIGHT_BUILD_AUDIO_EXPERIMENTS) + add_executable(audio_playback_probe + "${CMAKE_SOURCE_DIR}/experiments/audio_playback_probe.cpp" + "${CMAKE_SOURCE_DIR}/src/logging/logger.cpp" + "${CMAKE_SOURCE_DIR}/src/streaming/audio_configuration.cpp" + "${CMAKE_SOURCE_DIR}/src/streaming/audio_player.cpp" + "${CMAKE_SOURCE_DIR}/src/_nxdk_compat/fenv_compat.cpp") + target_include_directories(audio_playback_probe PRIVATE + "${CMAKE_SOURCE_DIR}" + "${MOONLIGHT_FFMPEG_INCLUDE_DIR}") + target_compile_definitions(audio_playback_probe PRIVATE NXDK XBOX) + target_compile_options(audio_playback_probe PRIVATE -std=gnu++17) + target_link_options(audio_playback_probe PRIVATE /safeseh:no) + target_link_libraries(audio_playback_probe PRIVATE + ${MOONLIGHT_FFMPEG_LIBRARIES} + NXDK::NXDK NXDK::NXDK_CXX NXDK::SDL2 moonlight_nxdk_compat) + set(_audio_playback_probe_xbe_dir "${CMAKE_CURRENT_BINARY_DIR}/audio-playback-probe") + file(MAKE_DIRECTORY "${_audio_playback_probe_xbe_dir}") + add_custom_target(audio_playback_probe_iso ALL + COMMAND "${NXDK_DIR}/tools/cxbe/cxbe" + "-OUT:${_audio_playback_probe_xbe_dir}/default.xbe" + "-TITLE:Opus audio playback probe" + "$" + COMMAND "${NXDK_DIR}/tools/extract-xiso/build/extract-xiso" + -c "${_audio_playback_probe_xbe_dir}" "AudioPlaybackProbe.iso" + DEPENDS audio_playback_probe + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" + COMMENT "Package the standalone Opus playback probe" + VERBATIM) +endif() + if(MOONLIGHT_BUILD_VIDEO_EXPERIMENTS) add_executable(pvideo_presentation_probe "${CMAKE_SOURCE_DIR}/experiments/pvideo_presentation_probe.cpp" diff --git a/docs/images/screenshots/04-settings.png b/docs/images/screenshots/04-settings.png index 8ae02cc1eb51963c80f983fffa451e0e2696966d..52c8f56f9b26068953d35cf3763d6c3a83c9ebdd 100644 GIT binary patch literal 38624 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

3JA(F!0(XwgP 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 diff --git a/experiments/README.md b/experiments/README.md index a13c814..953731d 100644 --- a/experiments/README.md +++ b/experiments/README.md @@ -1,14 +1,14 @@ -# Video experiments +# Xbox experiments -These optional Xbox programs exercise video presentation and fractional sampling independently -of a streaming host. They use the production presenter and are disabled in the default build. +These optional Xbox programs exercise video presentation, fractional sampling and audio playback +independently of a streaming host. They share production code and are disabled in the default build. ## Build and run From the repository root, using the normal build prerequisites and toolchain: ```bash -cmake -S . -B cmake-build-experiments -DCMAKE_BUILD_TYPE=Release -DBUILD_DOCS=OFF -DMOONLIGHT_BUILD_VIDEO_EXPERIMENTS=ON +cmake -S . -B cmake-build-experiments -DCMAKE_BUILD_TYPE=Release -DBUILD_DOCS=OFF -DMOONLIGHT_BUILD_VIDEO_EXPERIMENTS=ON -DMOONLIGHT_BUILD_AUDIO_EXPERIMENTS=ON cmake --build cmake-build-experiments ``` @@ -19,6 +19,7 @@ The Xbox child build selects Unix Makefiles automatically. The generated files a | ----------------- | ---------------------------------------------------------- | -------------------------------------------------------------------- | | Presentation | `cmake-build-experiments/xbox/PvideoPresentationProbe.iso` | `cmake-build-experiments/xbox/pvideo-presentation-probe/default.xbe` | | MPEG-2 prediction | `cmake-build-experiments/xbox/Mpeg2MotionProbe.iso` | `cmake-build-experiments/xbox/mpeg2-motion-probe/default.xbe` | +| Audio playback | `cmake-build-experiments/xbox/AudioPlaybackProbe.iso` | `cmake-build-experiments/xbox/audio-playback-probe/default.xbe` | Launch an ISO with the repository's configured xemu installation, for example: @@ -27,7 +28,7 @@ Launch an ISO with the repository's configured xemu installation, for example: ``` From a Windows command prompt, use `scripts\run-xemu.cmd --iso` with the same ISO path. -The probes use GPU presentation directly. The streaming client selects its path in +The video probes use GPU presentation directly. The streaming client selects its path in **Settings → Display → Video Presentation**. ## Presentation probe @@ -50,3 +51,42 @@ This is a visual comparison of one prediction stage, not a compressed-video deco bit-exact reconstruction test. The overlay is composed during scanout and cannot be read back through the RGB framebuffer. Console testing is needed to assess image correctness and performance on hardware; emulator output alone cannot establish those properties. + +## Audio playback probe + +Launch `AudioPlaybackProbe.iso` with the same launcher. The probe runs two short tone tests through +the stream client's FFmpeg Opus decoder, mixer and SDL playback device. + +| Test | Encoded tone | Expected Xbox output | +| ------ | ------------ | -------------------- | +| Stereo | Front left | 500 Hz on the left | +| Mono | Front left | 500 Hz on both sides | + +Listen for the listed speaker in each test. **AUDIO PROBE COMPLETE** confirms every mode decoded and +queued the expected PCM byte count and the SDL queue drained. Audible output or a host audio capture +verifies the channel routing. The probe uses local Opus packets and can run with Sunshine closed. + +## 5.1 channel check + +Generate the host-side test files from the repository root with Python and FFmpeg on your path. +Pass `--ffmpeg` with the executable path if needed. + +```bash +python experiments/generate_surround_channel_check.py cmake-build-experiments/audio +``` + +The 5.1 WAV plays a one-second tone on each channel with half a second of silence between tones. +Play it through a 5.1-capable player and output to check speaker routing. + +| Time | Active channel | +| --------- | -------------- | +| 0.5–1.5 s | Front left | +| 2.0–3.0 s | Front right | +| 3.5–4.5 s | Front center | +| 5.0–6.0 s | LFE | +| 6.5–7.5 s | Surround left | +| 8.0–9.0 s | Surround right | + +The `.spdif` file carries the same sequence as IEC 61937 bursts containing Dolby Digital AC-3. +It provides test data for a future Xbox digital output backend. The xemu playback probe above +exercises the existing stereo PCM output. diff --git a/experiments/audio_playback_probe.cpp b/experiments/audio_playback_probe.cpp new file mode 100644 index 0000000..fc087cc --- /dev/null +++ b/experiments/audio_playback_probe.cpp @@ -0,0 +1,183 @@ +/** + * @file experiments/audio_playback_probe.cpp + * @brief Play isolated Opus channel tests through the production Xbox audio path. + */ + +// standard includes +#include +#include + +// lib includes +#include +#include +#include +#include + +// local includes +#include "src/logging/logger.h" +#include "src/streaming/audio_player.h" +#include "third-party/moonlight-common-c/src/Limelight.h" + +// The staged SDL library references Moonlight's USB hooks even when only audio is initialized. +/** @brief Satisfy the SDL joystick initializer's USB hook for this input-free probe. */ +extern "C" void moonlight_usb_input_initialize() {} + +/** @brief Satisfy the SDL event driver's USB hook for this input-free probe. */ +extern "C" void moonlight_usb_input_pump() {} + +namespace { + + constexpr int SAMPLE_RATE = 48000; + constexpr int PACKET_MS = 20; + constexpr int SAMPLES_PER_PACKET = SAMPLE_RATE * PACKET_MS / 1000; + constexpr int PLAYBACK_MS = 2000; + constexpr Uint32 EXPECTED_PCM_BYTES = SAMPLES_PER_PACKET * 2 * sizeof(std::int16_t); + + // Encoded with libopus in restricted-low-delay mode. The 500 Hz tone fills ten + // periods per packet, which allows a single steady-state packet to be repeated. + /** @brief 20 ms of Opus with a 500 Hz tone in the front left channel and silence elsewhere. */ + constexpr std::array STEREO_PACKET { + 0x9c, + 0xad, + 0x86, + 0x72, + 0x9f, + 0x5d, + 0xc3, + 0x85, + 0xbd, + 0x8e, + 0x96, + 0x0a, + 0xe5, + 0x21, + 0x42, + 0x41, + 0xd9, + 0x02, + 0x07, + 0xb9, + 0xc4, + 0x38, + 0xe3, + 0xcc, + 0x50, + 0xe7, + 0xad, + 0x77, + 0xd2, + 0xd6, + 0xe1, + 0xd7, + 0x85, + 0x7f, + 0xf2, + 0x66, + 0x98, + 0xf7, + 0x05, + 0xc9, + 0x7f, + 0x79, + 0x5e, + 0x41, + 0xfc, + 0xcd, + 0x01, + 0x3b, + 0x69, + 0x5d, + 0x56, + 0x66, + 0xd6, + 0x95, + 0x57, + 0xa7, + 0x76, + 0xa6, + 0x93, + 0xb5, + 0xe1, + }; + + /** + * @brief Give the audio device time to consume queued PCM. + * @param player Playback device under test. + * @param limit Maximum queued bytes before continuing. + * @return True if the queue reached the limit before the timeout. + */ + bool wait_for_queue(streaming::AudioPlayer &player, Uint32 limit) { + const Uint32 deadline = SDL_GetTicks() + 2000; + while (player.pending_bytes() > limit && !SDL_TICKS_PASSED(SDL_GetTicks(), deadline)) { + SDL_Delay(10); + } + const auto pending = player.pending_bytes(); + if (pending > limit) { + DbgPrint("AUDIO PROBE QUEUE TIMEOUT: %lu bytes remaining\n", static_cast(pending)); + return false; + } + return true; + } + + /** + * @brief Exercise the production decoder and wait for SDL to consume the queued PCM. + * @param player Reusable audio player. + * @param mode Audio mode under test. + * @param expected Description of the expected audible output. + * @return True if the decoder queued the expected amount of PCM and playback consumed it. + */ + bool play_test(streaming::AudioPlayer &player, streaming::AudioMode mode, const char *expected) { + const OPUS_MULTISTREAM_CONFIGURATION opus {SAMPLE_RATE, 2, 1, 1, SAMPLES_PER_PACKET, {0, 1}}; + + const char *label = streaming::audio_mode_label(mode); + debugPrint("%s: %s\n", label, expected); + DbgPrint("AUDIO PROBE START %s: %s\n", label, expected); + player.configure(mode, true); + if (player.initialize(AUDIO_CONFIGURATION_STEREO, &opus) != 0) { + return false; + } + player.start(); + for (int elapsed = 0; elapsed < PLAYBACK_MS; elapsed += PACKET_MS) { + // Pace the probe from the device queue so emulator clock differences cannot backlog it. + if (!wait_for_queue(player, 3 * EXPECTED_PCM_BYTES)) { + return false; + } + const auto queued = player.decode_and_queue(reinterpret_cast(STEREO_PACKET.data()), static_cast(STEREO_PACKET.size())); + if (queued != EXPECTED_PCM_BYTES) { + DbgPrint("AUDIO PROBE PACKET FAILED: queued %lu bytes\n", static_cast(queued)); + return false; + } + } + + if (!wait_for_queue(player, 0)) { + return false; + } + + // Allow the driver to play its last handoff before closing the device. + SDL_Delay(150); + player.cleanup(); + DbgPrint("AUDIO PROBE PASSED %s\n", label); + SDL_Delay(500); + return true; + } + +} // namespace + +/** @brief Run the stereo and mono playback tests and leave the result on screen. */ +int main() { + XVideoSetMode(640, 480, 32, REFRESH_DEFAULT); + logging::set_debugger_console_minimum_level(logging::LogLevel::warning); + debugPrint("OPUS AUDIO PLAYBACK PROBE\n"); + SDL_Delay(1000); + + using streaming::AudioMode; + streaming::AudioPlayer player; + const bool passed = play_test(player, AudioMode::stereo, "500 Hz on left") && play_test(player, AudioMode::mono, "500 Hz on both"); + player.cleanup(); + const char *result = passed ? "AUDIO PROBE COMPLETE" : "AUDIO PROBE FAILED"; + debugPrint("%s\n", result); + DbgPrint("%s\n", result); + for (;;) { + SDL_Delay(250); + } +} diff --git a/experiments/generate_surround_channel_check.py b/experiments/generate_surround_channel_check.py new file mode 100644 index 0000000..a521a6c --- /dev/null +++ b/experiments/generate_surround_channel_check.py @@ -0,0 +1,72 @@ +"""Generate a 5.1 channel check as PCM WAV and Dolby Digital S/PDIF bursts.""" + +import argparse +import math +import subprocess +import sys +from array import array +from pathlib import Path + +SAMPLE_RATE = 48_000 +TONE_FRAMES = SAMPLE_RATE +GAP_FRAMES = SAMPLE_RATE // 2 +FADE_FRAMES = SAMPLE_RATE // 100 +# FFmpeg's 5.1(side) order is FL, FR, FC, LFE, SL, SR. +CHANNEL_FREQUENCIES = (500, 500, 500, 80, 500, 500) + + +def channel_check_pcm() -> bytes: + """Return interleaved signed 16-bit PCM with one active channel per slot.""" + channels = len(CHANNEL_FREQUENCIES) + slot_frames = TONE_FRAMES + GAP_FRAMES + total_frames = GAP_FRAMES + slot_frames * channels + samples = array("h", [0]) * (total_frames * channels) + for channel, frequency in enumerate(CHANNEL_FREQUENCIES): + tone = array( + "h", + ( + round( + 6_500 + * math.sin(math.tau * frequency * frame / SAMPLE_RATE) + * min(frame, TONE_FRAMES - 1 - frame, FADE_FRAMES) + / FADE_FRAMES + ) + for frame in range(TONE_FRAMES) + ), + ) + first_sample = (GAP_FRAMES + channel * slot_frames) * channels + channel + end_sample = first_sample + TONE_FRAMES * channels + samples[first_sample:end_sample:channels] = tone + + if sys.byteorder == "big": + samples.byteswap() + return samples.tobytes() + + +def main() -> None: + """Write both test files to the requested output directory.""" + parser = argparse.ArgumentParser(description=__doc__) + parser.add_argument("output_directory", type=Path) + parser.add_argument("--ffmpeg", default="ffmpeg", help="FFmpeg executable to run") + args = parser.parse_args() + + args.output_directory.mkdir(parents=True, exist_ok=True) + wav = args.output_directory / "surround-channel-check.wav" + spdif = args.output_directory / "surround-channel-check.spdif" + subprocess.run( + [ + args.ffmpeg, + "-hide_banner", "-loglevel", "error", "-y", + "-f", "s16le", "-ar", str(SAMPLE_RATE), "-channel_layout", "5.1(side)", "-i", "pipe:0", + "-map", "0:a:0", "-c:a", "pcm_s16le", str(wav), + "-map", "0:a:0", "-c:a", "ac3_fixed", "-b:a", "448k", "-f", "spdif", str(spdif), + ], + input=channel_check_pcm(), + check=True, + ) + print(wav) + print(spdif) + + +if __name__ == "__main__": + main() diff --git a/src/app/client_state.cpp b/src/app/client_state.cpp index 61f01d6..7bd44f7 100644 --- a/src/app/client_state.cpp +++ b/src/app/client_state.cpp @@ -81,7 +81,7 @@ namespace { /** * @brief Map each independent settings category to its stable navigation identifier. * @param category Settings section to identify. - * @return Menu identifier for Logging, Display, Input, Storage or Reset. + * @return Stable identifier for a settings category. */ std::string settings_category_menu_id(app::SettingsCategory category) { switch (category) { @@ -89,6 +89,8 @@ namespace { return std::string(SETTINGS_CATEGORY_PREFIX) + "logging"; case app::SettingsCategory::display: return std::string(SETTINGS_CATEGORY_PREFIX) + "display"; + case app::SettingsCategory::audio: + return std::string(SETTINGS_CATEGORY_PREFIX) + "audio"; case app::SettingsCategory::input: return std::string(SETTINGS_CATEGORY_PREFIX) + "input"; case app::SettingsCategory::storage: @@ -109,6 +111,9 @@ namespace { if (itemId == settings_category_menu_id(app::SettingsCategory::display)) { return app::SettingsCategory::display; } + if (itemId == settings_category_menu_id(app::SettingsCategory::audio)) { + return app::SettingsCategory::audio; + } if (itemId == settings_category_menu_id(app::SettingsCategory::input)) { return app::SettingsCategory::input; } @@ -124,14 +129,16 @@ namespace { /** * @brief Describe the options owned by a settings category. * @param category Section whose scope should be explained. - * @return Category guidance, keeping file destinations separate from Display. + * @return Guidance for the selected settings category. */ const char *settings_category_description(app::SettingsCategory category) { switch (category) { case app::SettingsCategory::logging: return "Control the runtime log file, the in-app log viewer, and xemu debugger output verbosity."; case app::SettingsCategory::display: - return "Tune streaming video resolution, frame rate, bitrate, audio playback and performance statistics."; + return "Tune streaming video resolution, frame rate, bitrate and performance statistics."; + case app::SettingsCategory::audio: + return "Choose where stream audio plays and how the Xbox mixes it."; case app::SettingsCategory::input: return "Input options will live here when controller and navigation customization is added."; case app::SettingsCategory::storage: @@ -526,6 +533,7 @@ namespace { return { {settings_category_menu_id(app::SettingsCategory::logging), "Logging", settings_category_description(app::SettingsCategory::logging), true}, {settings_category_menu_id(app::SettingsCategory::display), "Display", settings_category_description(app::SettingsCategory::display), true}, + {settings_category_menu_id(app::SettingsCategory::audio), "Audio", settings_category_description(app::SettingsCategory::audio), true}, {settings_category_menu_id(app::SettingsCategory::input), "Input", settings_category_description(app::SettingsCategory::input), true}, {settings_category_menu_id(app::SettingsCategory::storage), "Storage", settings_category_description(app::SettingsCategory::storage), true}, {settings_category_menu_id(app::SettingsCategory::reset), "Reset", settings_category_description(app::SettingsCategory::reset), true}, @@ -560,7 +568,7 @@ namespace { } /** - * @brief Build the active settings options, including the screenshot destination picker. + * @brief Build the active settings options, including audio mode and screenshot destination. * @param state Current screen and settings values. * @return Selectable settings rows for the current category. */ @@ -602,6 +610,15 @@ namespace { "Choose how new streams display decoded video. GPU uses NV2A with automatic software fallback. Software can be faster in xemu.", true, }, + { + "toggle-show-performance-stats", + std::string("Performance Stats: ") + (state.settings.presentation.showPerformanceStats ? "On" : "Off"), + "Show performance statistics during playback and after the stream ends.", + true, + }, + }; + case app::SettingsCategory::audio: + return { { "toggle-play-audio-on-pc", std::string("Play Audio on PC: ") + (state.settings.playAudioOnPc ? "On" : "Off"), @@ -615,9 +632,9 @@ namespace { true, }, { - "toggle-show-performance-stats", - std::string("Performance Stats: ") + (state.settings.presentation.showPerformanceStats ? "On" : "Off"), - "Show performance statistics during playback and after the stream ends.", + "cycle-audio-mode", + std::string("Audio Mode: ") + streaming::audio_mode_label(state.settings.audioMode), + "Choose separate left and right channels or the same mono mix through both speakers.", true, }, }; @@ -2475,7 +2492,7 @@ namespace app { } /** - * @brief Update settings inline or open the screenshot folder picker, emitting only required side effects. + * @brief Update settings, including audio mode, or open the screenshot folder picker. * * @param state Client state containing the settings menus. * @param detailUpdate Activated detail-menu update. @@ -2550,6 +2567,14 @@ namespace app { rebuild_menu(state, "toggle-play-audio-on-xbox"); return; } + if (detailUpdate.activatedItemId == "cycle-audio-mode") { + state.settings.audioMode = streaming::next_audio_mode(state.settings.audioMode); + state.settings.dirty = true; + update->persistence.settingsChanged = true; + state.shell.statusMessage = std::string("Audio mode set to ") + streaming::audio_mode_label(state.settings.audioMode); + rebuild_menu(state, "cycle-audio-mode"); + return; + } if (detailUpdate.activatedItemId == "screenshot-directory") { state.directoryPicker = {}; state.directoryPicker.path = state.settings.controls.screenshotDirectory.empty() ? startup::default_storage_path("screenshots") : state.settings.controls.screenshotDirectory; diff --git a/src/app/client_state.h b/src/app/client_state.h index ab91668..2cb10cc 100644 --- a/src/app/client_state.h +++ b/src/app/client_state.h @@ -24,6 +24,7 @@ #include "src/input/ui_input.h" #include "src/logging/logger.h" #include "src/startup/saved_files.h" +#include "src/streaming/audio_configuration.h" #include "src/ui/menu_model.h" namespace app { @@ -91,7 +92,8 @@ namespace app { */ enum class SettingsCategory { logging, ///< Logging and diagnostics options. - display, ///< Display, stream video, audio and telemetry options. + display, ///< Display, stream video and telemetry options. + audio, ///< Playback destinations and audio mode. input, ///< Input and controller options. storage, ///< Screenshot destinations and other saved-file location options. reset, ///< Reset and cleanup actions. @@ -409,6 +411,7 @@ namespace app { VideoPresentationPreferences presentation; ///< Presentation path and statistics overlay preferences. bool playAudioOnPc = false; ///< True when the host PC should continue local audio playback during streaming. bool playAudioOnXbox = true; ///< True when the Xbox should decode and play streamed audio locally. + streaming::AudioMode audioMode = streaming::AudioMode::stereo; ///< Source channels and local playback mix. LocalStreamPreferences controls; ///< Screenshot storage and keyboard placement preferences. bool dirty = false; ///< True when persisted TOML-backed settings changed and should be saved. std::vector savedFiles; ///< Saved-file catalog shown on the reset settings page. diff --git a/src/app/settings_storage.cpp b/src/app/settings_storage.cpp index a0c8b71..b63c78d 100644 --- a/src/app/settings_storage.cpp +++ b/src/app/settings_storage.cpp @@ -326,6 +326,11 @@ namespace { append_invalid_value_warning(warnings, filePath, keyPath, ""); } + /** + * @brief Serialize the saved settings, including the selected audio mode. + * @param settings Settings snapshot to serialize. + * @return TOML text for the settings file. + */ std::string format_settings_toml(const app::AppSettings &settings) { std::string content; content += "# Moonlight Xbox OG user settings\n"; @@ -352,6 +357,7 @@ namespace { content += std::string("gpu_presentation = ") + (settings.gpuPresentation ? "true" : "false") + "\n"; content += std::string("play_audio_on_pc = ") + (settings.playAudioOnPc ? "true" : "false") + "\n"; content += std::string("play_audio_on_xbox = ") + (settings.playAudioOnXbox ? "true" : "false") + "\n"; + content += std::string("audio_mode = \"") + streaming::audio_mode_key(settings.audioMode) + "\"\n"; content += "# Show stream telemetry after streaming ends.\n"; std::ostringstream screenshotValue; screenshotValue << toml::value(settings.screenshotDirectory); @@ -392,7 +398,7 @@ namespace { } /** - * @brief Mark unknown streaming keys for cleanup on the next settings save. + * @brief Mark unknown streaming keys for cleanup, preserving recognized settings such as audio mode. * * @param streamingTable Parsed streaming settings table. * @param filePath Settings file path used in warnings. @@ -401,7 +407,7 @@ namespace { void inspect_streaming_keys(const toml::table &streamingTable, const std::string &filePath, app::LoadAppSettingsResult *result) { for (const auto &[rawKey, node] : streamingTable) { const std::string key(rawKey.str()); - if (key == "video_width" || key == "video_height" || key == "video_bpp" || key == "video_refresh" || key == "video_mode_selected" || key == "fps" || key == "bitrate_kbps" || key == "gpu_presentation" || key == "play_audio_on_pc" || key == "play_audio_on_xbox" || key == "show_performance_stats" || key == "screenshot_directory" || key == "keyboard_dock_top") { + if (key == "video_width" || key == "video_height" || key == "video_bpp" || key == "video_refresh" || key == "video_mode_selected" || key == "fps" || key == "bitrate_kbps" || key == "gpu_presentation" || key == "play_audio_on_pc" || key == "play_audio_on_xbox" || key == "audio_mode" || key == "show_performance_stats" || key == "screenshot_directory" || key == "keyboard_dock_top") { continue; } @@ -505,6 +511,14 @@ namespace app { load_boolean_setting(settingsTable["streaming"]["play_audio_on_pc"], filePath, "streaming.play_audio_on_pc", &result.settings.playAudioOnPc, &result.warnings); load_boolean_setting(settingsTable["streaming"]["gpu_presentation"], filePath, "streaming.gpu_presentation", &result.settings.gpuPresentation, &result.warnings); load_boolean_setting(settingsTable["streaming"]["play_audio_on_xbox"], filePath, "streaming.play_audio_on_xbox", &result.settings.playAudioOnXbox, &result.warnings); + if (const auto audioModeNode = settingsTable["streaming"]["audio_mode"]; audioModeNode) { + const auto key = audioModeNode.value(); + if (const auto mode = key ? streaming::parse_audio_mode(*key) : std::nullopt; mode) { + result.settings.audioMode = *mode; + } else { + append_invalid_value_warning(&result.warnings, filePath, "streaming.audio_mode", key.value_or("")); + } + } load_boolean_setting(settingsTable["streaming"]["show_performance_stats"], filePath, "streaming.show_performance_stats", &result.settings.showPerformanceStats, &result.warnings); load_boolean_setting(settingsTable["streaming"]["keyboard_dock_top"], filePath, "streaming.keyboard_dock_top", &result.settings.keyboardDockTop, &result.warnings); if (const auto node = settingsTable["streaming"]["screenshot_directory"]; node) { diff --git a/src/app/settings_storage.h b/src/app/settings_storage.h index 152bbb8..f1b11dd 100644 --- a/src/app/settings_storage.h +++ b/src/app/settings_storage.h @@ -30,6 +30,7 @@ namespace app { std::string screenshotDirectory; ///< Screenshot folder; empty selects the title-scoped screenshots directory. bool keyboardDockTop = false; ///< Dock the stream keyboard to the top instead of the bottom. bool gpuPresentation = false; ///< Opt in to NV2A presentation with software fallback. + streaming::AudioMode audioMode = streaming::AudioMode::stereo; ///< Source channels and local playback mix. }; /** @@ -58,7 +59,7 @@ namespace app { std::string default_settings_path(); /** - * @brief Load saved preferences and derive a bitrate from the stream profile when no bitrate is saved. + * @brief Load saved preferences, defaulting to stereo and deriving the bitrate when absent. * * @param filePath Settings file to read. * @return Loaded settings plus any non-fatal warnings. diff --git a/src/main.cpp b/src/main.cpp index 47f0a02..9fdf14d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -38,6 +38,11 @@ namespace { network::RuntimeNetworkStatus runtimeNetworkStatus; }; + /** + * @brief Restore saved preferences, including the requested audio mode, into the shell. + * @param state Shell state to update. + * @param settings Saved settings snapshot. + */ void apply_persisted_settings(app::ClientState &state, const app::AppSettings &settings) { state.settings.loggingLevel = settings.loggingLevel; state.settings.xemuConsoleLoggingLevel = settings.xemuConsoleLoggingLevel; @@ -50,6 +55,7 @@ namespace { state.settings.playAudioOnPc = settings.playAudioOnPc; state.settings.presentation.showPerformanceStats = settings.showPerformanceStats; state.settings.playAudioOnXbox = settings.playAudioOnXbox; + state.settings.audioMode = settings.audioMode; state.settings.controls.screenshotDirectory = settings.screenshotDirectory; state.settings.controls.keyboardDockTop = settings.keyboardDockTop; state.settings.dirty = false; diff --git a/src/streaming/audio_configuration.cpp b/src/streaming/audio_configuration.cpp new file mode 100644 index 0000000..ea06733 --- /dev/null +++ b/src/streaming/audio_configuration.cpp @@ -0,0 +1,32 @@ +/** + * @file src/streaming/audio_configuration.cpp + * @brief Implements menu labels and persistence for the supported audio modes. + */ +// class header include +#include "src/streaming/audio_configuration.h" + +namespace streaming { + + const char *audio_mode_label(AudioMode mode) { + return mode == AudioMode::mono ? "Mono" : "Stereo"; + } + + const char *audio_mode_key(AudioMode mode) { + return mode == AudioMode::mono ? "mono" : "stereo"; + } + + std::optional parse_audio_mode(std::string_view key) { + if (key == audio_mode_key(AudioMode::mono)) { + return AudioMode::mono; + } + if (key == audio_mode_key(AudioMode::stereo)) { + return AudioMode::stereo; + } + return std::nullopt; + } + + AudioMode next_audio_mode(AudioMode mode) { + return mode == AudioMode::stereo ? AudioMode::mono : AudioMode::stereo; + } + +} // namespace streaming diff --git a/src/streaming/audio_configuration.h b/src/streaming/audio_configuration.h new file mode 100644 index 0000000..b258528 --- /dev/null +++ b/src/streaming/audio_configuration.h @@ -0,0 +1,47 @@ +/** + * @file src/streaming/audio_configuration.h + * @brief Defines the supported Xbox audio modes. + */ +#pragma once + +// standard includes +#include +#include + +namespace streaming { + + /** @brief Select the mix played through the Xbox stereo device. */ + enum class AudioMode { + stereo, ///< Play the stereo stream as received. + mono, ///< Mix stereo to mono and play it through both channels. + }; + + /** + * @brief Get the display label for an audio mode. + * @param mode Audio mode. + * @return Label shown in settings. + */ + const char *audio_mode_label(AudioMode mode); + + /** + * @brief Get the stable TOML value for an audio mode. + * @param mode Audio mode. + * @return Value written to the settings file. + */ + const char *audio_mode_key(AudioMode mode); + + /** + * @brief Parse a saved audio mode. + * @param key Value read from the settings file. + * @return Matching mode, or no value for an unknown key. + */ + std::optional parse_audio_mode(std::string_view key); + + /** + * @brief Advance to the next audio mode in settings. + * @param mode Current audio mode. + * @return Next audio mode, wrapping back to stereo. + */ + AudioMode next_audio_mode(AudioMode mode); + +} // namespace streaming diff --git a/src/streaming/audio_player.cpp b/src/streaming/audio_player.cpp new file mode 100644 index 0000000..4a79459 --- /dev/null +++ b/src/streaming/audio_player.cpp @@ -0,0 +1,241 @@ +/** + * @file src/streaming/audio_player.cpp + * @brief Implements Opus decoding, mixing and queued SDL playback. + */ +// class header include +#include "src/streaming/audio_player.h" + +// standard includes +#include +#include + +// lib includes +#include "third-party/moonlight-common-c/src/Limelight.h" + +extern "C" { +#include +#include +#include +#include +#include +#include +} + +// local includes +#include "src/logging/logger.h" + +namespace { + + constexpr int OUTPUT_SAMPLE_RATE = 48000; + constexpr int OUTPUT_CHANNELS = 2; + constexpr Uint32 QUEUE_LIMIT_MS = 250; + + /** + * @brief Convert an FFmpeg error code to a log message. + * @param code Negative FFmpeg error code. + * @return Readable error message. + */ + std::string ffmpeg_error(int code) { + std::array buffer {}; + av_strerror(code, buffer.data(), buffer.size()); + return buffer.data(); + } + +} // namespace + +namespace streaming { + + AudioPlayer::~AudioPlayer() { + cleanup(); + } + + void AudioPlayer::configure(AudioMode mode, bool enabled) { + mode_ = mode; + enabled_ = enabled; + } + + bool AudioPlayer::enabled() const { + return enabled_; + } + + int AudioPlayer::initialize(int audioConfiguration, const _OPUS_MULTISTREAM_CONFIGURATION *opus) { + cleanup(); + if (!enabled_) { + return 0; + } + + if (audioConfiguration != AUDIO_CONFIGURATION_STEREO || opus == nullptr || opus->channelCount != OUTPUT_CHANNELS || opus->sampleRate != OUTPUT_SAMPLE_RATE || opus->streams != 1 || opus->coupledStreams != 1) { + logging::error("stream", "Invalid stereo Opus configuration"); + return -1; + } + + const AVCodec *decoder = avcodec_find_decoder(AV_CODEC_ID_OPUS); + if (decoder == nullptr) { + logging::error("stream", "FFmpeg did not provide an Opus decoder"); + return -1; + } + codec_ = avcodec_alloc_context3(decoder); + frame_ = av_frame_alloc(); + packet_ = av_packet_alloc(); + if (codec_ == nullptr || frame_ == nullptr || packet_ == nullptr) { + logging::error("stream", "Failed to allocate FFmpeg audio decoder resources"); + cleanup(); + return -1; + } + // OpusHead for 48 kHz stereo, mapping family 0, with no pre-skip or gain. + constexpr std::array header {'O', 'p', 'u', 's', 'H', 'e', 'a', 'd', 1, 2, 0, 0, 0x80, 0xBB, 0, 0, 0, 0, 0}; + codec_->extradata = static_cast(av_mallocz(header.size() + AV_INPUT_BUFFER_PADDING_SIZE)); + if (codec_->extradata == nullptr) { + logging::error("stream", "Failed to allocate Opus decoder extradata for FFmpeg"); + cleanup(); + return -1; + } + codec_->extradata_size = static_cast(header.size()); + std::memcpy(codec_->extradata, header.data(), header.size()); + if (const int result = avcodec_open2(codec_, decoder, nullptr); result < 0) { + logging::error("stream", "Failed to open the Opus decoder: " + ffmpeg_error(result)); + cleanup(); + return result; + } + + if ((SDL_WasInit(SDL_INIT_AUDIO) & SDL_INIT_AUDIO) == 0 && SDL_InitSubSystem(SDL_INIT_AUDIO) != 0) { + logging::error("stream", std::string("SDL_InitSubSystem(SDL_INIT_AUDIO) failed: ") + SDL_GetError()); + cleanup(); + return -1; + } + // The nxdk SDL driver plays only 48 kHz signed 16-bit stereo PCM. + SDL_AudioSpec desired {}; + desired.freq = OUTPUT_SAMPLE_RATE; + desired.format = AUDIO_S16SYS; + desired.channels = OUTPUT_CHANNELS; + desired.samples = 1024; + device_ = SDL_OpenAudioDevice(nullptr, 0, &desired, &output_, 0); + if (device_ == 0) { + logging::error("stream", std::string("SDL_OpenAudioDevice failed: ") + SDL_GetError()); + cleanup(); + return -1; + } + return 0; + } + + void AudioPlayer::start() { + if (device_ != 0) { + SDL_ClearQueuedAudio(device_); + SDL_PauseAudioDevice(device_, 0); + } + } + + void AudioPlayer::stop() { + if (device_ != 0) { + SDL_PauseAudioDevice(device_, 1); + } + } + + void AudioPlayer::cleanup() { + if (device_ != 0) { + stop(); + SDL_CloseAudioDevice(device_); + device_ = 0; + } + av_packet_free(&packet_); + av_frame_free(&frame_); + avcodec_free_context(&codec_); + swr_free(&resampler_); + output_ = {}; + pcm_.clear(); + } + + Uint32 AudioPlayer::pending_bytes() const { + return device_ == 0 ? 0 : SDL_GetQueuedAudioSize(device_); + } + + std::string AudioPlayer::describe_playback() const { + if (!enabled_) { + return "audio decode disabled"; + } + return device_ == 0 ? "audio idle" : std::to_string(pending_bytes()) + " queued audio bytes"; + } + + bool AudioPlayer::initialize_resampler() { + AVChannelLayout stereo = AV_CHANNEL_LAYOUT_STEREO; + int result = swr_alloc_set_opts2(&resampler_, &stereo, AV_SAMPLE_FMT_S16, output_.freq, &frame_->ch_layout, static_cast(frame_->format), frame_->sample_rate, 0, nullptr); + if (result >= 0 && mode_ == AudioMode::mono) { + // Play the mean of left and right on both outputs of the stereo device. + constexpr double dualMono[] {0.5, 0.5, 0.5, 0.5}; + result = swr_set_matrix(resampler_, dualMono, OUTPUT_CHANNELS); + } + if (result >= 0) { + result = swr_init(resampler_); + } + if (result < 0) { + logging::warn("stream", "Failed to initialize the streaming audio resampler: " + ffmpeg_error(result)); + swr_free(&resampler_); + return false; + } + return true; + } + + Uint32 AudioPlayer::queue_decoded_frame() { + if (resampler_ == nullptr && !initialize_resampler()) { + return 0; + } + + const int outputSamples = swr_get_out_samples(resampler_, frame_->nb_samples); + if (outputSamples <= 0) { + return 0; + } + constexpr Uint32 bytesPerFrame = OUTPUT_CHANNELS * sizeof(std::int16_t); + pcm_.resize(static_cast(outputSamples) * bytesPerFrame); + auto *output = pcm_.data(); + const int converted = swr_convert(resampler_, &output, outputSamples, const_cast(frame_->extended_data), frame_->nb_samples); + if (converted <= 0) { + if (converted < 0) { + logging::warn("stream", "Failed to convert decoded audio: " + ffmpeg_error(converted)); + } + return 0; + } + + const Uint32 bytes = static_cast(converted) * bytesPerFrame; + const Uint32 maxQueuedBytes = output_.freq * bytesPerFrame * QUEUE_LIMIT_MS / 1000U; + if (pending_bytes() + bytes > maxQueuedBytes) { + SDL_ClearQueuedAudio(device_); + } + if (SDL_QueueAudio(device_, output, bytes) < 0) { + logging::warn("stream", std::string("Failed to queue decoded audio: ") + SDL_GetError()); + return 0; + } + return bytes; + } + + Uint32 AudioPlayer::decode_and_queue(const char *data, int length) { + if (device_ == 0 || data == nullptr || length <= 0) { + return 0; + } + if (const int result = av_new_packet(packet_, length); result < 0) { + logging::warn("stream", "Failed to allocate an Opus packet: " + ffmpeg_error(result)); + return 0; + } + std::memcpy(packet_->data, data, static_cast(length)); + const int sendResult = avcodec_send_packet(codec_, packet_); + av_packet_unref(packet_); + if (sendResult < 0 && sendResult != AVERROR(EAGAIN)) { + logging::warn("stream", "Failed to submit an Opus packet: " + ffmpeg_error(sendResult)); + return 0; + } + + Uint32 queued = 0; + while (true) { + const int result = avcodec_receive_frame(codec_, frame_); + if (result == AVERROR(EAGAIN) || result == AVERROR_EOF) { + return queued; + } + if (result < 0) { + logging::warn("stream", "Failed to decode an Opus frame: " + ffmpeg_error(result)); + return queued; + } + queued += queue_decoded_frame(); + av_frame_unref(frame_); + } + } + +} // namespace streaming diff --git a/src/streaming/audio_player.h b/src/streaming/audio_player.h new file mode 100644 index 0000000..1b48896 --- /dev/null +++ b/src/streaming/audio_player.h @@ -0,0 +1,115 @@ +/** + * @file src/streaming/audio_player.h + * @brief Declares the FFmpeg Opus and SDL playback path shared by streaming and the audio probe. + */ +#pragma once + +// standard includes +#include + +// lib includes +#include + +// local includes +#include "src/streaming/aligned_media_buffer.h" +#include "src/streaming/audio_configuration.h" + +struct AVCodecContext; +struct AVFrame; +struct AVPacket; +struct SwrContext; +struct _OPUS_MULTISTREAM_CONFIGURATION; + +namespace streaming { + + /** + * @brief Decode one Moonlight audio stream and queue its local mix to SDL. + * + * The transport configures playback before starting and releases the decoder + * after joining its audio thread. + */ + class AudioPlayer { + public: + /** @brief Construct an idle player. */ + AudioPlayer() = default; + /** @brief Close the playback device and release decoder resources. */ + ~AudioPlayer(); + + AudioPlayer(const AudioPlayer &) = delete; + AudioPlayer &operator=(const AudioPlayer &) = delete; + + /** + * @brief Set playback preferences before initialization. + * @param mode How to mix the selected stream to the Xbox output. + * @param enabled Whether to decode and queue audio. + */ + void configure(AudioMode mode, bool enabled); + + /** + * @brief Check whether playback was enabled for this session. + * @return True if streaming audio should be decoded. + */ + bool enabled() const; + + /** + * @brief Prepare the decoder and open the stereo SDL device. + * @param audioConfiguration Moonlight stream layout. + * @param opus Negotiated codec parameters. + * @return Zero on success, including when playback is disabled. + */ + int initialize(int audioConfiguration, const _OPUS_MULTISTREAM_CONFIGURATION *opus); + + /** @brief Start SDL audio playback with an empty queue. */ + void start(); + + /** @brief Pause playback. */ + void stop(); + + /** @brief Release playback and codec resources, retaining the configured preferences. */ + void cleanup(); + + /** + * @brief Decode and queue a Moonlight Opus payload. + * @param data Opus payload, or null for a lost packet. + * @param length Payload size in bytes. + * @return Number of PCM bytes queued. + */ + Uint32 decode_and_queue(const char *data, int length); + + /** + * @brief Inspect the SDL queue for playback diagnostics. + * @return Pending PCM bytes, or zero if the device is closed. + */ + Uint32 pending_bytes() const; + + /** + * @brief Describe the configured audio path and its queue for session diagnostics. + * @return Text describing disabled, idle or active playback. + */ + std::string describe_playback() const; + + private: + /** + * @brief Create the SDL PCM converter for the decoder's fixed Opus format. + * @return True when ready to convert frames. + */ + bool initialize_resampler(); + + /** + * @brief Convert the current decoded frame and queue it with bounded latency. + * @return PCM bytes queued, or zero on failure. + */ + Uint32 queue_decoded_frame(); + + AudioMode mode_ = AudioMode::stereo; ///< Selected local mix. + bool enabled_ = false; ///< Whether the session plays audio. + AVCodecContext *codec_ = nullptr; ///< Open Opus decoder. + SwrContext *resampler_ = nullptr; ///< Stereo S16 format converter. + AVFrame *frame_ = nullptr; ///< Reusable decoded Opus frame. + AVPacket *packet_ = nullptr; ///< Reusable encoded Opus packet. + SDL_AudioDeviceID device_ = 0; ///< Open SDL device, or zero. + SDL_AudioSpec output_ {}; ///< SDL queue format. + AlignedMediaBuffer pcm_; ///< Aligned PCM mix buffer. + }; + +} // namespace streaming diff --git a/src/streaming/ffmpeg_stream_backend.cpp b/src/streaming/ffmpeg_stream_backend.cpp index 863323f..b9038bf 100644 --- a/src/streaming/ffmpeg_stream_backend.cpp +++ b/src/streaming/ffmpeg_stream_backend.cpp @@ -20,14 +20,10 @@ // lib includes extern "C" { #include -#include #include #include #include #include -#include -#include -#include #include } @@ -55,7 +51,6 @@ namespace { */ using MoonlightCallbackContext = void; - constexpr Uint32 STREAM_OVERLAY_AUDIO_QUEUE_LIMIT_MS = 250U; constexpr std::uint64_t STREAM_VIDEO_SUBMISSION_LOG_INTERVAL = 120; constexpr int STREAM_VIDEO_DROPPED_FRAME_STATUS = -2; constexpr std::uint64_t STREAM_VIDEO_DROP_LOG_INTERVAL = 30; @@ -184,16 +179,6 @@ namespace { }); } - /** - * @brief Return the number of bytes generated per second for the SDL audio format. - * - * @param audioSpec SDL audio format in use for playback. - * @return Number of bytes generated per second. - */ - Uint32 audio_bytes_per_second(const SDL_AudioSpec &audioSpec) { - return static_cast(audioSpec.freq) * static_cast(audioSpec.channels) * (SDL_AUDIO_BITSIZE(audioSpec.format) / 8U); - } - /** * @brief Compute a centered destination rectangle that preserves aspect ratio. * @@ -227,51 +212,6 @@ namespace { }; } - /** - * @brief Create FFmpeg Opus extradata for the stereo Moonlight stream. - * - * @param channelCount Negotiated channel count. - * @param sampleRate Negotiated sample rate. - * @param codecContext Audio codec context that will own the extradata. - * @return True when the extradata was allocated successfully. - */ - bool configure_opus_extradata(int channelCount, int sampleRate, AVCodecContext *codecContext) { - if (codecContext == nullptr || channelCount <= 0 || channelCount > 2) { - return false; - } - - std::array opusHead { - static_cast('O'), - static_cast('p'), - static_cast('u'), - static_cast('s'), - static_cast('H'), - static_cast('e'), - static_cast('a'), - static_cast('d'), - 1U, - static_cast(channelCount), - 0U, - 0U, - static_cast(sampleRate & 0xFF), - static_cast((sampleRate >> 8) & 0xFF), - static_cast((sampleRate >> 16) & 0xFF), - static_cast((sampleRate >> 24) & 0xFF), - 0U, - 0U, - 0U, - }; - - codecContext->extradata = static_cast(av_mallocz(opusHead.size() + AV_INPUT_BUFFER_PADDING_SIZE)); - if (codecContext->extradata == nullptr) { - return false; - } - - codecContext->extradata_size = static_cast(opusHead.size()); - std::memcpy(codecContext->extradata, opusHead.data(), opusHead.size()); - return true; - } - int on_video_setup(int videoFormat, int width, int height, int redrawRate, MoonlightCallbackContext *context, int drFlags) { // NOSONAR(cpp:S5008) moonlight-common-c requires a void* render context callback. auto *backend = static_cast(context); if (backend == nullptr) { @@ -301,38 +241,56 @@ namespace { } } - int on_audio_init(int audioConfiguration, const POPUS_MULTISTREAM_CONFIGURATION opusConfig, MoonlightCallbackContext *context, int arFlags) { // NOSONAR(cpp:S5008,cpp:S995) moonlight-common-c requires this callback signature. + /** + * @brief Prepare the active Opus decoder from the negotiated multistream configuration. + * @param audioConfiguration Negotiated Moonlight layout. + * @param opusConfig Negotiated Opus channels and mappings. + * @param context Stream backend supplied by Moonlight. + * @return Zero when playback can start or has been disabled. + */ + int on_audio_init(int audioConfiguration, const POPUS_MULTISTREAM_CONFIGURATION opusConfig, MoonlightCallbackContext *context, int) { // NOSONAR(cpp:S5008,cpp:S995) moonlight-common-c requires this callback signature. auto *backend = static_cast(context); if (backend == nullptr) { return -1; } - active_audio_backend() = backend; - return backend->initialize_audio_decoder(audioConfiguration, opusConfig, arFlags); + const int result = backend->audio_player().initialize(audioConfiguration, opusConfig); + if (result == 0) { + active_audio_backend() = backend; + } + return result; } + /** @brief Start the active SDL audio queue. */ void on_audio_start() { if (streaming::FfmpegStreamBackend *backend = active_audio_backend(); backend != nullptr) { - backend->start_audio_playback(); + backend->audio_player().start(); } } + /** @brief Pause the active SDL audio queue. */ void on_audio_stop() { if (streaming::FfmpegStreamBackend *backend = active_audio_backend(); backend != nullptr) { - backend->stop_audio_playback(); + backend->audio_player().stop(); } } + /** @brief Release the active audio player after the transport audio thread exits. */ void on_audio_cleanup() { if (streaming::FfmpegStreamBackend *backend = active_audio_backend(); backend != nullptr) { - backend->cleanup_audio_decoder(); + backend->audio_player().cleanup(); active_audio_backend() = nullptr; } } + /** + * @brief Decode and queue the next Moonlight Opus payload. + * @param sampleData Encoded payload, or null for a lost packet. + * @param sampleLength Payload length in bytes. + */ void on_audio_decode_and_play_sample(char *sampleData, int sampleLength) { // NOSONAR(cpp:S995) moonlight-common-c supplies mutable sample data by callback signature. if (streaming::FfmpegStreamBackend *backend = active_audio_backend(); backend != nullptr) { - backend->decode_and_play_audio_sample(sampleData, sampleLength); + backend->audio_player().decode_and_queue(sampleData, sampleLength); } } @@ -604,14 +562,14 @@ namespace streaming { audioCallbacks->cleanup = on_audio_cleanup; audioCallbacks->decodeAndPlaySample = on_audio_decode_and_play_sample; audioCallbacks->capabilities = CAPABILITY_SLOW_OPUS_DECODER; - if (!audioPlaybackEnabled_.load()) { + if (!audio_.enabled()) { audioCallbacks->capabilities |= CAPABILITY_DIRECT_SUBMIT; } } } - void FfmpegStreamBackend::set_audio_playback_enabled(bool enabled) { - audioPlaybackEnabled_.store(enabled); + AudioPlayer &FfmpegStreamBackend::audio_player() { + return audio_; } void FfmpegStreamBackend::set_gpu_presentation_enabled(bool enabled) { @@ -619,7 +577,7 @@ namespace streaming { } void FfmpegStreamBackend::shutdown() { - cleanup_audio_decoder(); + audio_.cleanup(); cleanup_video_decoder(); if (screenshot_.thread != nullptr) { SDL_WaitThread(screenshot_.thread, nullptr); @@ -700,13 +658,9 @@ namespace streaming { } std::string FfmpegStreamBackend::build_overlay_status_line() const { - std::string audioState = "audio decode disabled"; - if (audioPlaybackEnabled_.load()) { - audioState = audio_.deviceId != 0 ? std::to_string(SDL_GetQueuedAudioSize(audio_.deviceId)) + " queued audio bytes" : "audio idle"; - } return std::string("Video units: ") + std::to_string(video_.submittedDecodeUnitCount.load()) + " submitted / " + std::to_string(video_.decodedFrameCount.load()) + " decoded / " + std::to_string(video_.droppedDecodeUnitCount.load()) + " dropped | frame " + std::to_string(video_.lastDecodeFrameNumber.load()) + " queue " + std::to_string(video_.lastDecodeQueueUs.load() / 1000U) + - " ms / age " + std::to_string(video_.lastReceiveAgeUs.load() / 1000U) + " ms | " + audioState; + " ms / age " + std::to_string(video_.lastReceiveAgeUs.load() / 1000U) + " ms | " + audio_.describe_playback(); } bool FfmpegStreamBackend::render_latest_video_frame(SDL_Renderer *renderer, int screenWidth, int screenHeight, bool allowDirectFramebuffer) { @@ -1333,257 +1287,4 @@ namespace streaming { return DR_OK; } - int FfmpegStreamBackend::initialize_audio_decoder(int audioConfiguration, const OPUS_MULTISTREAM_CONFIGURATION *opusConfig, int arFlags) { - (void) arFlags; - - cleanup_audio_decoder(); - - if (!audioPlaybackEnabled_.load()) { - logging::info("stream", "Xbox audio playback is disabled; dropping streamed audio before Opus decode"); - return 0; - } - - if (opusConfig == nullptr) { - logging::error("stream", "Moonlight did not provide an Opus configuration for audio startup"); - return -1; - } - - const int channelCount = CHANNEL_COUNT_FROM_AUDIO_CONFIGURATION(audioConfiguration); - if (channelCount <= 0 || channelCount > 2) { - logging::error("stream", "The FFmpeg backend currently supports mono or stereo audio only"); - return -1; - } - - SDL_AudioSpec desiredSpec {}; - desiredSpec.freq = opusConfig->sampleRate > 0 ? opusConfig->sampleRate : 48000; - desiredSpec.format = AUDIO_S16SYS; - desiredSpec.channels = static_cast(channelCount); - desiredSpec.samples = 1024; - desiredSpec.callback = nullptr; - - if ((SDL_WasInit(SDL_INIT_AUDIO) & SDL_INIT_AUDIO) == 0 && SDL_InitSubSystem(SDL_INIT_AUDIO) != 0) { - logging::error("stream", std::string("SDL_InitSubSystem(SDL_INIT_AUDIO) failed for streaming playback: ") + SDL_GetError()); - cleanup_audio_decoder(); - return -1; - } - - audio_.deviceId = SDL_OpenAudioDevice(nullptr, 0, &desiredSpec, &audio_.obtainedSpec, 0); - if (audio_.deviceId == 0) { - logging::error("stream", std::string("SDL_OpenAudioDevice failed for streaming playback: ") + SDL_GetError()); - cleanup_audio_decoder(); - return -1; - } - - const AVCodec *codec = avcodec_find_decoder(AV_CODEC_ID_OPUS); - if (codec == nullptr) { - logging::error("stream", "FFmpeg did not provide an Opus decoder"); - cleanup_audio_decoder(); - return -1; - } - - audio_.codecContext = avcodec_alloc_context3(codec); - audio_.decodedFrame = av_frame_alloc(); - audio_.packet = av_packet_alloc(); - if (audio_.codecContext == nullptr || audio_.decodedFrame == nullptr || audio_.packet == nullptr) { - logging::error("stream", "Failed to allocate FFmpeg audio decoder resources"); - cleanup_audio_decoder(); - return -1; - } - - audio_.codecContext->sample_rate = desiredSpec.freq; - av_channel_layout_default(&audio_.codecContext->ch_layout, channelCount); - if (!configure_opus_extradata(channelCount, desiredSpec.freq, audio_.codecContext)) { - logging::error("stream", "Failed to allocate Opus decoder extradata for FFmpeg"); - cleanup_audio_decoder(); - return -1; - } - - if (const int openResult = avcodec_open2(audio_.codecContext, codec, nullptr); openResult < 0) { - logging::error("stream", std::string("avcodec_open2 failed for Opus: ") + describe_ffmpeg_error(openResult)); - cleanup_audio_decoder(); - return openResult; - } - - return 0; - } - - void FfmpegStreamBackend::start_audio_playback() { - if (audio_.deviceId != 0) { - SDL_ClearQueuedAudio(audio_.deviceId); - SDL_PauseAudioDevice(audio_.deviceId, 0); - audio_.deviceStarted.store(true); - } - } - - void FfmpegStreamBackend::stop_audio_playback() { - if (audio_.deviceId != 0) { - SDL_PauseAudioDevice(audio_.deviceId, 1); - audio_.deviceStarted.store(false); - } - } - - void FfmpegStreamBackend::cleanup_audio_decoder() { - stop_audio_playback(); - - if (audio_.deviceId != 0) { - SDL_ClearQueuedAudio(audio_.deviceId); - SDL_CloseAudioDevice(audio_.deviceId); - audio_.deviceId = 0; - } - - if (audio_.packet != nullptr) { - av_packet_free(&audio_.packet); - } - if (audio_.decodedFrame != nullptr) { - av_frame_free(&audio_.decodedFrame); - } - if (audio_.codecContext != nullptr) { - avcodec_free_context(&audio_.codecContext); - } - if (audio_.resampleContext != nullptr) { - swr_free(&audio_.resampleContext); - } - - audio_.obtainedSpec = SDL_AudioSpec {}; - audio_.outputBuffer.clear(); - audio_.resampleInputSampleRate = 0; - audio_.resampleInputSampleFormat = -1; - audio_.resampleInputChannelCount = 0; - audio_.queuedAudioBytes.store(0); - } - - bool FfmpegStreamBackend::ensure_audio_resampler() { - if (audio_.decodedFrame == nullptr) { - return false; - } - - const int inputSampleRate = audio_.decodedFrame->sample_rate; - const int inputSampleFormat = audio_.decodedFrame->format; - const int inputChannelCount = audio_.decodedFrame->ch_layout.nb_channels; - if (const bool needsReconfigure = audio_.resampleContext == nullptr || audio_.resampleInputSampleRate != inputSampleRate || audio_.resampleInputSampleFormat != inputSampleFormat || audio_.resampleInputChannelCount != inputChannelCount; !needsReconfigure) { - return true; - } - - if (audio_.resampleContext != nullptr) { - swr_free(&audio_.resampleContext); - } - - AVChannelLayout outputLayout {}; - av_channel_layout_default(&outputLayout, audio_.obtainedSpec.channels); - const int resampleConfigResult = swr_alloc_set_opts2( - &audio_.resampleContext, - &outputLayout, - AV_SAMPLE_FMT_S16, - audio_.obtainedSpec.freq, - &audio_.decodedFrame->ch_layout, - static_cast(audio_.decodedFrame->format), - audio_.decodedFrame->sample_rate, - 0, - nullptr - ); - av_channel_layout_uninit(&outputLayout); - if (resampleConfigResult < 0) { - logging::warn("stream", std::string("swr_alloc_set_opts2 failed for Opus: ") + describe_ffmpeg_error(resampleConfigResult)); - return false; - } - if (audio_.resampleContext == nullptr || swr_init(audio_.resampleContext) < 0) { - logging::warn("stream", "swr_init failed for the streaming audio resampler"); - return false; - } - - audio_.resampleInputSampleRate = inputSampleRate; - audio_.resampleInputSampleFormat = inputSampleFormat; - audio_.resampleInputChannelCount = inputChannelCount; - return true; - } - - void FfmpegStreamBackend::decode_and_play_audio_sample(const char *sampleData, int sampleLength) { - if (!audioPlaybackEnabled_.load()) { - return; - } - - if (audio_.codecContext == nullptr || audio_.packet == nullptr || audio_.decodedFrame == nullptr || audio_.deviceId == 0) { - return; - } - - if (sampleData == nullptr || sampleLength <= 0) { - return; - } - - if (const int packetResult = av_new_packet(audio_.packet, sampleLength); packetResult < 0) { - logging::warn("stream", std::string("av_new_packet failed for audio decode: ") + describe_ffmpeg_error(packetResult)); - return; - } - - std::memcpy(audio_.packet->data, sampleData, static_cast(sampleLength)); - audio_.packet->size = sampleLength; - - const int sendResult = avcodec_send_packet(audio_.codecContext, audio_.packet); - av_packet_unref(audio_.packet); - if (sendResult < 0 && sendResult != AVERROR(EAGAIN)) { - logging::warn("stream", std::string("avcodec_send_packet failed for Opus: ") + describe_ffmpeg_error(sendResult)); - return; - } - - while (true) { - const int receiveResult = avcodec_receive_frame(audio_.codecContext, audio_.decodedFrame); - if (receiveResult == AVERROR(EAGAIN) || receiveResult == AVERROR_EOF) { - break; - } - if (receiveResult < 0) { - logging::warn("stream", std::string("avcodec_receive_frame failed for Opus: ") + describe_ffmpeg_error(receiveResult)); - return; - } - - if (!ensure_audio_resampler()) { - av_frame_unref(audio_.decodedFrame); - return; - } - - const int outputSamples = av_rescale_rnd( - swr_get_delay(audio_.resampleContext, audio_.decodedFrame->sample_rate) + audio_.decodedFrame->nb_samples, - audio_.obtainedSpec.freq, - audio_.decodedFrame->sample_rate, - AV_ROUND_UP - ); - const int outputBufferSize = av_samples_get_buffer_size( - nullptr, - audio_.obtainedSpec.channels, - outputSamples, - AV_SAMPLE_FMT_S16, - 1 - ); - if (outputBufferSize <= 0) { - logging::warn("stream", "av_samples_get_buffer_size failed for decoded audio output"); - av_frame_unref(audio_.decodedFrame); - return; - } - - audio_.outputBuffer.resize(static_cast(outputBufferSize)); - std::array outputData {audio_.outputBuffer.data()}; - const int convertedSamples = swr_convert( - audio_.resampleContext, - outputData.data(), - outputSamples, - const_cast(audio_.decodedFrame->extended_data), - audio_.decodedFrame->nb_samples - ); - if (convertedSamples < 0) { - logging::warn("stream", std::string("swr_convert failed for Opus: ") + describe_ffmpeg_error(convertedSamples)); - av_frame_unref(audio_.decodedFrame); - return; - } - - const int convertedBytes = convertedSamples * audio_.obtainedSpec.channels * static_cast(sizeof(std::int16_t)); - if (const Uint32 maxQueuedBytes = (audio_bytes_per_second(audio_.obtainedSpec) * STREAM_OVERLAY_AUDIO_QUEUE_LIMIT_MS) / 1000U; SDL_GetQueuedAudioSize(audio_.deviceId) > maxQueuedBytes) { - SDL_ClearQueuedAudio(audio_.deviceId); - } - if (convertedBytes > 0 && SDL_QueueAudio(audio_.deviceId, audio_.outputBuffer.data(), static_cast(convertedBytes)) == 0) { - audio_.queuedAudioBytes.fetch_add(static_cast(convertedBytes)); - } - - av_frame_unref(audio_.decodedFrame); - } - } - } // namespace streaming diff --git a/src/streaming/ffmpeg_stream_backend.h b/src/streaming/ffmpeg_stream_backend.h index 3e5af60..f6087a5 100644 --- a/src/streaming/ffmpeg_stream_backend.h +++ b/src/streaming/ffmpeg_stream_backend.h @@ -20,6 +20,7 @@ // local includes #include "src/app/screenshot_library.h" #include "src/streaming/aligned_media_buffer.h" +#include "src/streaming/audio_player.h" #include "src/streaming/ffmpeg_video_frame.h" #include "src/streaming/pvideo_presenter.h" #include "src/streaming/stats_overlay.h" @@ -27,7 +28,6 @@ struct AVCodecContext; struct AVFrame; struct AVPacket; -struct SwrContext; struct SwsContext; namespace streaming { @@ -41,8 +41,8 @@ namespace streaming { * @brief Owns the FFmpeg decode and SDL presentation state for one stream. * * The backend exposes Moonlight-compatible callback tables for video and audio, - * decodes negotiated video and Opus stereo audio with FFmpeg, presents the most - * recent decoded frame through SDL, and queues decoded PCM samples to SDL audio. + * presents the latest decoded video frame and delegates Opus decode and playback + * to the audio player. */ class FfmpegStreamBackend { public: @@ -68,11 +68,10 @@ namespace streaming { void initialize_callbacks(DECODER_RENDERER_CALLBACKS *videoCallbacks, AUDIO_RENDERER_CALLBACKS *audioCallbacks) const; /** - * @brief Configure whether streamed audio should be decoded and played locally. - * - * @param enabled True to decode and play Opus audio on the Xbox. + * @brief Get the stream's Opus decoder and playback device. + * @return Audio player owned by this backend. */ - void set_audio_playback_enabled(bool enabled); + AudioPlayer &audio_player(); /** * @brief Select the preferred presentation path before starting the session. @@ -257,46 +256,6 @@ namespace streaming { */ void cleanup_video_decoder(); - /** - * @brief Initialize the FFmpeg Opus decoder and SDL playback device. - * - * @param audioConfiguration Negotiated Moonlight audio configuration. - * @param opusConfig Negotiated Opus multistream parameters. - * @param arFlags Moonlight audio renderer flags. - * @return Zero on success. - */ - int initialize_audio_decoder(int audioConfiguration, const OPUS_MULTISTREAM_CONFIGURATION *opusConfig, int arFlags); - - /** - * @brief Start SDL audio playback. - */ - void start_audio_playback(); - - /** - * @brief Stop SDL audio playback. - */ - void stop_audio_playback(); - - /** - * @brief Clean up all FFmpeg audio decode resources. - */ - void cleanup_audio_decoder(); - - /** - * @brief Ensure the audio resampler matches the current decoded frame. - * - * @return True when the resampler is ready for audio conversion. - */ - bool ensure_audio_resampler(); - - /** - * @brief Decode and queue one Moonlight Opus audio payload. - * - * @param sampleData Encoded Opus payload. - * @param sampleLength Encoded payload size in bytes. - */ - void decode_and_play_audio_sample(const char *sampleData, int sampleLength); - private: /** * @brief Present a frame while the public wrapper records submission time. @@ -464,26 +423,8 @@ namespace streaming { std::atomic lastDecodeFrameNumber = 0; }; - /** - * @brief Hold FFmpeg and SDL state used by the audio path. - */ - struct AudioState { - AVCodecContext *codecContext = nullptr; - SwrContext *resampleContext = nullptr; - AVFrame *decodedFrame = nullptr; - AVPacket *packet = nullptr; - SDL_AudioDeviceID deviceId = 0; - SDL_AudioSpec obtainedSpec {}; - AlignedMediaBuffer outputBuffer; ///< Aligned resampler output. - int resampleInputSampleRate = 0; - int resampleInputSampleFormat = -1; - int resampleInputChannelCount = 0; - std::atomic deviceStarted = false; - std::atomic queuedAudioBytes = 0; - }; - VideoState video_ {}; - AudioState audio_ {}; + AudioPlayer audio_; ///< Session Opus decoder and SDL playback device. ScreenshotTask screenshot_ {}; ///< Single capture slot, bounded to one additional YUV frame. PvideoPresenter presenter_; ///< Main-thread GPU presentation resources. VideoOverlay statisticsOverlay_; ///< Shared cached panel for all presentation paths. @@ -495,7 +436,6 @@ namespace streaming { VideoAccelerationReport acceleration_; ///< Session diagnostics survive decoder cleanup. bool gpuPresentationEnabled_ = false; ///< Session opt-in applied before decoder setup. bool overlayFailed_ = false; ///< Avoid repeating a known failing hardware path this session. - std::atomic audioPlaybackEnabled_ = false; }; } // namespace streaming diff --git a/src/streaming/session.cpp b/src/streaming/session.cpp index 14f713e..67be362 100644 --- a/src/streaming/session.cpp +++ b/src/streaming/session.cpp @@ -1566,9 +1566,9 @@ namespace streaming { "stream", std::string("Requested stream configuration | resolution=") + std::to_string(startContext.streamConfiguration.width) + "x" + std::to_string(startContext.streamConfiguration.height) + " | fps=" + std::to_string(startContext.streamConfiguration.fps) + " | bitrate=" + std::to_string(startContext.streamConfiguration.bitrate) + " kbps" + " | packetSize=" + std::to_string(startContext.streamConfiguration.packetSize) + " | networkProfile=" + describe_streaming_remotely_mode(startContext.streamConfiguration.streamingRemotely) + " | clientRefreshX100=" + std::to_string(startContext.streamConfiguration.clientRefreshRateX100) ); - resources.mediaBackend.set_audio_playback_enabled(settings.playAudioOnXbox); + resources.mediaBackend.audio_player().configure(settings.audioMode, settings.playAudioOnXbox); resources.mediaBackend.set_gpu_presentation_enabled(settings.presentation.gpuPresentation); - logging::info("stream", std::string("Xbox audio playback ") + (settings.playAudioOnXbox ? "enabled" : "disabled for lower decode latency")); + logging::info("stream", std::string("Xbox audio mode: ") + (settings.playAudioOnXbox ? audio_mode_label(settings.audioMode) : "Disabled")); logging::debug( "stream", std::string("Stream connection metadata | active=") + printable_log_value(startContext.serverInformation.address == nullptr ? std::string_view {} : std::string_view {startContext.serverInformation.address}) + diff --git a/src/ui/shell_screen.cpp b/src/ui/shell_screen.cpp index 14496ae..d66a678 100644 --- a/src/ui/shell_screen.cpp +++ b/src/ui/shell_screen.cpp @@ -2493,7 +2493,7 @@ namespace { } /** - * @brief Snapshot persisted shell and stream preferences, including screenshot storage and OSK placement. + * @brief Snapshot persisted shell and stream preferences, including playback mode. * @param state Current client state. * @return Settings snapshot ready for TOML serialization. */ @@ -2512,6 +2512,7 @@ namespace { state.settings.controls.screenshotDirectory, state.settings.controls.keyboardDockTop, state.settings.presentation.gpuPresentation, + state.settings.audioMode, }; } diff --git a/src/ui/shell_view.cpp b/src/ui/shell_view.cpp index 0c903a6..3204339 100644 --- a/src/ui/shell_view.cpp +++ b/src/ui/shell_view.cpp @@ -206,7 +206,7 @@ namespace { } /** - * @brief Name the selected settings section without conflating Display and Storage. + * @brief Name the selected settings section. * @param category Active settings category. * @return User-facing category name. */ @@ -216,6 +216,8 @@ namespace { return "Logging"; case app::SettingsCategory::display: return "Display"; + case app::SettingsCategory::audio: + return "Audio"; case app::SettingsCategory::input: return "Input"; case app::SettingsCategory::storage: @@ -384,7 +386,12 @@ namespace { return lines; } if (state.settings.selectedCategory == app::SettingsCategory::display) { - lines.emplace_back("Choose stream video, audio and performance statistics options."); + lines.emplace_back("Choose stream video and performance statistics options."); + return lines; + } + + if (state.settings.selectedCategory == app::SettingsCategory::audio) { + lines.emplace_back("Choose where stream audio plays and select stereo or mono for the Xbox."); return lines; } @@ -428,6 +435,9 @@ namespace { if (id == "settings-category:display") { return "icons\\monitor.svg"; } + if (id == "settings-category:audio") { + return "icons\\volume-2.svg"; + } if (id == "settings-category:input") { return "icons\\gamepad-2.svg"; } diff --git a/tests/unit/app/client_state_test.cpp b/tests/unit/app/client_state_test.cpp index 8105c4f..f5b5ab7 100644 --- a/tests/unit/app/client_state_test.cpp +++ b/tests/unit/app/client_state_test.cpp @@ -833,6 +833,7 @@ namespace { EXPECT_TRUE(state.hosts.active.appListStatusMessage.empty()); } + /** @brief Select a saved file in Reset and confirm the deletion request. */ TEST(ClientStateTest, SettingsCanRequestDeletionOfSavedFilesFromTheResetCategory) { app::ClientState state = app::create_initial_state(); app::handle_command(state, input::UiCommand::move_left); @@ -843,10 +844,7 @@ namespace { app::replace_saved_files(state, { {R"(E:\UDATA\12345678\moonlight.log)", "moonlight.log", 128U}, }); - app::handle_command(state, input::UiCommand::move_down); - app::handle_command(state, input::UiCommand::move_down); - app::handle_command(state, input::UiCommand::move_down); - app::handle_command(state, input::UiCommand::move_down); + app::handle_command(state, input::UiCommand::move_up); app::handle_command(state, input::UiCommand::activate); ASSERT_EQ(state.settings.selectedCategory, app::SettingsCategory::reset); ASSERT_EQ(state.settings.focusArea, app::SettingsFocusArea::options); @@ -863,6 +861,7 @@ namespace { EXPECT_EQ(update.persistence.savedFileDeletePath, "E:\\UDATA\\12345678\\moonlight.log"); } + /** @brief Confirm a factory reset through the Reset category. */ TEST(ClientStateTest, SettingsFactoryResetUsesAConfirmationDialog) { app::ClientState state = app::create_initial_state(); app::handle_command(state, input::UiCommand::move_left); @@ -870,10 +869,7 @@ namespace { app::handle_command(state, input::UiCommand::activate); ASSERT_EQ(state.shell.activeScreen, app::ScreenId::settings); - app::handle_command(state, input::UiCommand::move_down); - app::handle_command(state, input::UiCommand::move_down); - app::handle_command(state, input::UiCommand::move_down); - app::handle_command(state, input::UiCommand::move_down); + app::handle_command(state, input::UiCommand::move_up); app::handle_command(state, input::UiCommand::activate); ASSERT_EQ(state.settings.selectedCategory, app::SettingsCategory::reset); ASSERT_EQ(state.settings.focusArea, app::SettingsFocusArea::options); @@ -1471,18 +1467,20 @@ namespace { } /** - * @brief Other display controls leave a manually selected bitrate unchanged. + * @brief Display keeps the statistics toggle and the manually selected bitrate. */ TEST(ClientStateTest, DisplaySettingsPreserveManualBitrateWhenOtherOptionsChange) { app::ClientState state = app::create_initial_state(); state.settings.streamBitrateKbps = 1500; ASSERT_NO_FATAL_FAILURE(open_display_settings_options(state)); - constexpr std::array controls {"toggle-play-audio-on-pc", "toggle-play-audio-on-xbox", "toggle-show-performance-stats"}; - for (const char *control : controls) { - ASSERT_TRUE(state.detailMenu.select_item_by_id(control)); - app::handle_command(state, input::UiCommand::activate); - EXPECT_EQ(state.settings.streamBitrateKbps, 1500); - } + EXPECT_FALSE(state.detailMenu.select_item_by_id("toggle-play-audio-on-pc")); + EXPECT_FALSE(state.detailMenu.select_item_by_id("toggle-play-audio-on-xbox")); + EXPECT_FALSE(state.detailMenu.select_item_by_id("cycle-audio-mode")); + ASSERT_TRUE(state.detailMenu.select_item_by_id("toggle-show-performance-stats")); + EXPECT_TRUE(app::handle_command(state, input::UiCommand::activate).persistence.settingsChanged); + EXPECT_TRUE(state.settings.presentation.showPerformanceStats); + EXPECT_EQ(state.settings.streamBitrateKbps, 1500); + EXPECT_EQ(state.detailMenu.selected_item()->label, "Performance Stats: On"); } /** @brief Switch from the software default to GPU and back while preserving bitrate and statistics. */ @@ -1509,44 +1507,80 @@ namespace { EXPECT_EQ(state.detailMenu.selected_item()->label, "Video Presentation: Software"); } - /** @brief Toggle audio and statistics independently while retaining the selected presentation path. */ - TEST(ClientStateTest, DisplaySettingsCanToggleXboxAudioAndPerformanceStats) { + /** + * @brief Navigate to Audio next to Display and focus its options. + * @param state Client state starting on the hosts screen. + */ + void open_audio_settings_options(app::ClientState &state) { + app::handle_command(state, input::UiCommand::move_left); + app::handle_command(state, input::UiCommand::move_left); + app::handle_command(state, input::UiCommand::activate); + ASSERT_EQ(state.shell.activeScreen, app::ScreenId::settings); + + app::handle_command(state, input::UiCommand::move_down); + app::handle_command(state, input::UiCommand::move_down); + EXPECT_EQ(app::handle_command(state, input::UiCommand::activate).navigation.activatedItemId, "settings-category:audio"); + ASSERT_EQ(state.settings.selectedCategory, app::SettingsCategory::audio); + ASSERT_EQ(state.settings.focusArea, app::SettingsFocusArea::options); + } + + /** @brief Cycle every audio mode and persist the selection without leaving the row. */ + TEST(ClientStateTest, AudioSettingsCycleModesAndRetainFocus) { + using streaming::AudioMode; + auto state = app::create_initial_state(); + ASSERT_NO_FATAL_FAILURE(open_audio_settings_options(state)); + ASSERT_TRUE(state.detailMenu.select_item_by_id("cycle-audio-mode")); + ASSERT_EQ(state.detailMenu.selected_item()->label, "Audio Mode: Stereo"); + + constexpr std::array modes {AudioMode::mono, AudioMode::stereo}; + constexpr std::array labels {"Audio Mode: Mono", "Audio Mode: Stereo"}; + for (std::size_t i = 0; i < modes.size(); ++i) { + state.settings.dirty = false; + EXPECT_TRUE(app::handle_command(state, input::UiCommand::activate).persistence.settingsChanged); + EXPECT_TRUE(state.settings.dirty); + EXPECT_TRUE(state.settings.playAudioOnXbox); + EXPECT_EQ(state.settings.audioMode, modes[i]); + ASSERT_NE(state.detailMenu.selected_item(), nullptr); + EXPECT_EQ(state.detailMenu.selected_item()->id, "cycle-audio-mode"); + EXPECT_EQ(state.detailMenu.selected_item()->label, labels[i]); + } + } + + /** @brief Show and independently toggle the default PC and Xbox playback choices. */ + TEST(ClientStateTest, AudioSettingsDefaultPcOffAndXboxOn) { app::ClientState state = app::create_initial_state(); - ASSERT_TRUE(state.settings.playAudioOnXbox); - ASSERT_FALSE(state.settings.presentation.showPerformanceStats); - state.settings.presentation.gpuPresentation = true; + state.settings.streamBitrateKbps = 1500; + ASSERT_NO_FATAL_FAILURE(open_audio_settings_options(state)); + ASSERT_EQ(state.detailMenu.items().size(), 3U); - ASSERT_NO_FATAL_FAILURE(open_display_settings_options(state)); + ASSERT_NE(state.detailMenu.selected_item(), nullptr); + EXPECT_EQ(state.detailMenu.selected_item()->id, "toggle-play-audio-on-pc"); + EXPECT_EQ(state.detailMenu.selected_item()->label, "Play Audio on PC: Off"); + EXPECT_TRUE(app::handle_command(state, input::UiCommand::activate).persistence.settingsChanged); + EXPECT_TRUE(state.settings.playAudioOnPc); + EXPECT_TRUE(state.settings.playAudioOnXbox); + EXPECT_EQ(state.detailMenu.selected_item()->label, "Play Audio on PC: On"); ASSERT_TRUE(state.detailMenu.select_item_by_id("toggle-play-audio-on-xbox")); - app::AppUpdate update = app::handle_command(state, input::UiCommand::activate); + EXPECT_EQ(state.detailMenu.selected_item()->label, "Play Audio on Xbox: On"); + const auto update = app::handle_command(state, input::UiCommand::activate); EXPECT_EQ(update.navigation.activatedItemId, "toggle-play-audio-on-xbox"); EXPECT_TRUE(update.persistence.settingsChanged); + EXPECT_TRUE(state.settings.playAudioOnPc); EXPECT_FALSE(state.settings.playAudioOnXbox); + EXPECT_EQ(state.settings.streamBitrateKbps, 1500); EXPECT_EQ(state.shell.statusMessage, "Play audio on Xbox disabled"); ASSERT_NE(state.detailMenu.selected_item(), nullptr); EXPECT_EQ(state.detailMenu.selected_item()->label, "Play Audio on Xbox: Off"); - - ASSERT_TRUE(state.detailMenu.select_item_by_id("toggle-show-performance-stats")); - update = app::handle_command(state, input::UiCommand::activate); - EXPECT_EQ(update.navigation.activatedItemId, "toggle-show-performance-stats"); - EXPECT_TRUE(update.persistence.settingsChanged); - EXPECT_TRUE(state.settings.presentation.showPerformanceStats); - EXPECT_TRUE(state.settings.presentation.gpuPresentation); - EXPECT_EQ(state.shell.statusMessage, "Performance stats enabled"); - ASSERT_NE(state.detailMenu.selected_item(), nullptr); - EXPECT_EQ(state.detailMenu.selected_item()->label, "Performance Stats: On"); } + /** @brief Cancel the Reset confirmation without requesting any persistent changes. */ TEST(ClientStateTest, ConfirmationModalCanBeCancelledWithoutRequestingPersistenceChanges) { app::ClientState state = app::create_initial_state(); app::handle_command(state, input::UiCommand::move_left); app::handle_command(state, input::UiCommand::move_left); app::handle_command(state, input::UiCommand::activate); - app::handle_command(state, input::UiCommand::move_down); - app::handle_command(state, input::UiCommand::move_down); - app::handle_command(state, input::UiCommand::move_down); - app::handle_command(state, input::UiCommand::move_down); + app::handle_command(state, input::UiCommand::move_up); app::handle_command(state, input::UiCommand::activate); ASSERT_EQ(state.settings.selectedCategory, app::SettingsCategory::reset); diff --git a/tests/unit/app/directory_picker_test.cpp b/tests/unit/app/directory_picker_test.cpp index 2b8915b..5f256b2 100644 --- a/tests/unit/app/directory_picker_test.cpp +++ b/tests/unit/app/directory_picker_test.cpp @@ -31,6 +31,7 @@ namespace { app::handle_command(state, input::UiCommand::move_down); app::handle_command(state, input::UiCommand::move_down); app::handle_command(state, input::UiCommand::move_down); + app::handle_command(state, input::UiCommand::move_down); app::handle_command(state, input::UiCommand::activate); state.detailMenu.select_item_by_id("screenshot-directory"); EXPECT_EQ(state.detailMenu.selected_item()->id, "screenshot-directory"); @@ -61,7 +62,7 @@ TEST(DirectoryPickerTest, StagesConfiguredAndDefaultLocationsUntilAccepted) { auto state = open_picker(configured); EXPECT_EQ(state.settings.selectedCategory, app::SettingsCategory::storage); EXPECT_EQ(state.menu.items()[1].label, "Display"); - EXPECT_EQ(state.menu.items()[3].label, "Storage"); + EXPECT_EQ(state.menu.items()[4].label, "Storage"); EXPECT_EQ(state.directoryPicker.path, configured.empty() ? startup::default_storage_path("screenshots") : configured); auto view = ui::build_shell_view_model(state, {}); EXPECT_EQ(view.modal.title, "Screenshot Folder"); @@ -240,13 +241,13 @@ TEST(DirectoryPickerTest, BuildsScrollableFoldersAndControllerOrKeyboardNameEntr } /** - * @brief Storage owns screenshot destinations while Display retains its original stream and presentation options. + * @brief Storage owns screenshot destinations independently of the expanded settings list. */ TEST(DirectoryPickerTest, KeepsStorageSeparateFromTheExistingDisplayCategory) { auto state = open_picker("F:\\Screenshots"); - ASSERT_EQ(state.menu.items().size(), 5); - EXPECT_EQ(state.menu.items()[3].id, "settings-category:storage"); - EXPECT_EQ(state.menu.items()[4].id, "settings-category:reset"); + ASSERT_EQ(state.menu.items().size(), 6U); + EXPECT_EQ(state.menu.items()[4].id, "settings-category:storage"); + EXPECT_EQ(state.menu.items()[5].id, "settings-category:reset"); app::handle_command(state, input::UiCommand::back); ASSERT_EQ(state.detailMenu.items().size(), 1); EXPECT_EQ(state.detailMenu.selected_item()->id, "screenshot-directory"); @@ -255,6 +256,7 @@ TEST(DirectoryPickerTest, KeepsStorageSeparateFromTheExistingDisplayCategory) { app::handle_command(state, input::UiCommand::back); app::handle_command(state, input::UiCommand::move_up); app::handle_command(state, input::UiCommand::move_up); + app::handle_command(state, input::UiCommand::move_up); app::handle_command(state, input::UiCommand::activate); EXPECT_EQ(state.settings.selectedCategory, app::SettingsCategory::display); EXPECT_EQ(state.detailMenu.selected_item()->id, "cycle-stream-video-mode"); diff --git a/tests/unit/app/settings_storage_test.cpp b/tests/unit/app/settings_storage_test.cpp index 8db2074..c424722 100644 --- a/tests/unit/app/settings_storage_test.cpp +++ b/tests/unit/app/settings_storage_test.cpp @@ -136,6 +136,42 @@ namespace { EXPECT_EQ(app::load_app_settings(settingsPath).settings.streamBitrateKbps, 10000); } + /** @brief Apply audio defaults to older files and preserve explicit mode and playback choices. */ + TEST_F(SettingsStorageTest, SavesAndLoadsAudioModes) { + using streaming::AudioMode; + write_text_file(settingsPath, "[streaming]\nfps = 30\n"); + const auto oldSettings = app::load_app_settings(settingsPath); + EXPECT_EQ(oldSettings.settings.audioMode, AudioMode::stereo); + EXPECT_FALSE(oldSettings.settings.playAudioOnPc); + EXPECT_TRUE(oldSettings.settings.playAudioOnXbox); + EXPECT_TRUE(oldSettings.warnings.empty()); + + for (const auto mode : {AudioMode::stereo, AudioMode::mono}) { + app::AppSettings settings; + settings.audioMode = mode; + settings.playAudioOnPc = true; + settings.playAudioOnXbox = false; + ASSERT_TRUE(app::save_app_settings(settings, settingsPath).success); + const auto reloaded = app::load_app_settings(settingsPath); + EXPECT_EQ(reloaded.settings.audioMode, mode); + EXPECT_TRUE(reloaded.settings.playAudioOnPc); + EXPECT_FALSE(reloaded.settings.playAudioOnXbox); + EXPECT_TRUE(reloaded.warnings.empty()); + EXPECT_FALSE(reloaded.cleanupRequired); + } + } + + /** @brief Warn about unknown or mistyped audio modes and use the stereo default. */ + TEST_F(SettingsStorageTest, InvalidAudioModesFallBackToStereo) { + for (const auto *value : {"'5.1'", "6"}) { + write_text_file(settingsPath, std::string("[streaming]\naudio_mode = ") + value + "\n"); + const auto invalid = app::load_app_settings(settingsPath); + EXPECT_EQ(invalid.settings.audioMode, streaming::AudioMode::stereo); + ASSERT_EQ(invalid.warnings.size(), 1U); + EXPECT_NE(invalid.warnings.front().find("streaming.audio_mode"), std::string::npos); + } + } + /** @brief Missing settings leave the default stream profile and produce no warnings. */ TEST_F(SettingsStorageTest, MissingFilesReturnDefaultsWithoutWarnings) { const app::LoadAppSettingsResult loadResult = app::load_app_settings(settingsPath); diff --git a/tests/unit/ui/shell_view_test.cpp b/tests/unit/ui/shell_view_test.cpp index e6ec2de..1302f44 100644 --- a/tests/unit/ui/shell_view_test.cpp +++ b/tests/unit/ui/shell_view_test.cpp @@ -151,7 +151,7 @@ namespace { } /** - * @brief All five settings categories, including separate Display and Storage sections, have packaged icons. + * @brief The Audio entry and the other settings categories have packaged icons. */ TEST(ShellViewTest, DecoratesSettingsCategoriesWithIcons) { app::ClientState state = app::create_initial_state(); @@ -159,13 +159,33 @@ namespace { app::handle_command(state, input::UiCommand::move_left); app::handle_command(state, input::UiCommand::activate); const auto view = ui::build_shell_view_model(state, {}); - ASSERT_EQ(view.content.menuRows.size(), 5U); + ASSERT_EQ(view.content.menuRows.size(), 6U); EXPECT_EQ(view.content.menuRows[0].iconAssetPath, "icons\\scroll-text.svg"); EXPECT_EQ(view.content.menuRows[1].iconAssetPath, "icons\\monitor.svg"); - EXPECT_EQ(view.content.menuRows[2].iconAssetPath, "icons\\gamepad-2.svg"); - EXPECT_EQ(view.content.menuRows[3].label, "Storage"); - EXPECT_EQ(view.content.menuRows[3].iconAssetPath, "icons\\save.svg"); - EXPECT_EQ(view.content.menuRows[4].iconAssetPath, "icons\\rotate-ccw.svg"); + EXPECT_EQ(view.content.menuRows[2].label, "Audio"); + EXPECT_EQ(view.content.menuRows[2].iconAssetPath, "icons\\volume-2.svg"); + EXPECT_EQ(view.content.menuRows[3].iconAssetPath, "icons\\gamepad-2.svg"); + EXPECT_EQ(view.content.menuRows[4].label, "Storage"); + EXPECT_EQ(view.content.menuRows[4].iconAssetPath, "icons\\save.svg"); + EXPECT_EQ(view.content.menuRows[5].iconAssetPath, "icons\\rotate-ccw.svg"); + } + + /** @brief Show playback help and the three Audio controls when the category is selected. */ + TEST(ShellViewTest, ShowsAudioDetailsOnTheSettingsScreen) { + auto state = app::create_initial_state(); + app::handle_command(state, input::UiCommand::move_left); + app::handle_command(state, input::UiCommand::move_left); + app::handle_command(state, input::UiCommand::activate); + app::handle_command(state, input::UiCommand::move_down); + app::handle_command(state, input::UiCommand::move_down); + + const auto view = ui::build_shell_view_model(state, {}); + ASSERT_FALSE(view.content.bodyLines.empty()); + EXPECT_EQ(view.content.bodyLines.front(), "Category: Audio"); + ASSERT_EQ(view.content.detailMenuRows.size(), 3U); + EXPECT_EQ(view.content.detailMenuRows[0].label, "Play Audio on PC: Off"); + EXPECT_EQ(view.content.detailMenuRows[1].label, "Play Audio on Xbox: On"); + EXPECT_EQ(view.content.detailMenuRows[2].label, "Audio Mode: Stereo"); } /** From 42584980ff3402f0b9bdfdc930b5583ee0e8fe8d Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Wed, 18 Nov 2026 18:45:56 -0500 Subject: [PATCH 2/2] fix(audio): address Sonar findings --- experiments/README.md | 3 +- experiments/audio_playback_probe.cpp | 13 ++-- .../generate_surround_channel_check.py | 31 +++++--- .../test_generate_surround_channel_check.py | 71 +++++++++++++++++++ src/app/client_state.cpp | 20 +++--- src/app/client_state.h | 11 ++- src/main.cpp | 6 +- src/streaming/audio_player.cpp | 11 ++- src/streaming/audio_player.h | 4 +- src/streaming/session.cpp | 6 +- src/ui/shell_screen.cpp | 6 +- src/ui/shell_view.cpp | 52 ++++++-------- tests/unit/app/client_state_test.cpp | 12 ++-- 13 files changed, 161 insertions(+), 85 deletions(-) create mode 100644 experiments/test_generate_surround_channel_check.py diff --git a/experiments/README.md b/experiments/README.md index 953731d..281853e 100644 --- a/experiments/README.md +++ b/experiments/README.md @@ -69,7 +69,8 @@ verifies the channel routing. The probe uses local Opus packets and can run with ## 5.1 channel check Generate the host-side test files from the repository root with Python and FFmpeg on your path. -Pass `--ffmpeg` with the executable path if needed. +Choose an output directory under the current directory. Use a fresh directory for each run to +preserve any existing test files. ```bash python experiments/generate_surround_channel_check.py cmake-build-experiments/audio diff --git a/experiments/audio_playback_probe.cpp b/experiments/audio_playback_probe.cpp index fc087cc..86abf7d 100644 --- a/experiments/audio_playback_probe.cpp +++ b/experiments/audio_playback_probe.cpp @@ -20,10 +20,14 @@ // The staged SDL library references Moonlight's USB hooks even when only audio is initialized. /** @brief Satisfy the SDL joystick initializer's USB hook for this input-free probe. */ -extern "C" void moonlight_usb_input_initialize() {} +extern "C" void moonlight_usb_input_initialize() { + // This probe initializes no input devices. +} /** @brief Satisfy the SDL event driver's USB hook for this input-free probe. */ -extern "C" void moonlight_usb_input_pump() {} +extern "C" void moonlight_usb_input_pump() { + // This probe has no input events to pump. +} namespace { @@ -106,13 +110,12 @@ namespace { * @param limit Maximum queued bytes before continuing. * @return True if the queue reached the limit before the timeout. */ - bool wait_for_queue(streaming::AudioPlayer &player, Uint32 limit) { + bool wait_for_queue(const streaming::AudioPlayer &player, Uint32 limit) { const Uint32 deadline = SDL_GetTicks() + 2000; while (player.pending_bytes() > limit && !SDL_TICKS_PASSED(SDL_GetTicks(), deadline)) { SDL_Delay(10); } - const auto pending = player.pending_bytes(); - if (pending > limit) { + if (const auto pending = player.pending_bytes(); pending > limit) { DbgPrint("AUDIO PROBE QUEUE TIMEOUT: %lu bytes remaining\n", static_cast(pending)); return false; } diff --git a/experiments/generate_surround_channel_check.py b/experiments/generate_surround_channel_check.py index a521a6c..eca8579 100644 --- a/experiments/generate_surround_channel_check.py +++ b/experiments/generate_surround_channel_check.py @@ -13,6 +13,8 @@ FADE_FRAMES = SAMPLE_RATE // 100 # FFmpeg's 5.1(side) order is FL, FR, FC, LFE, SL, SR. CHANNEL_FREQUENCIES = (500, 500, 500, 80, 500, 500) +WAV_NAME = "surround-channel-check.wav" +SPDIF_NAME = "surround-channel-check.spdif" def channel_check_pcm() -> bytes: @@ -44,23 +46,32 @@ def channel_check_pcm() -> bytes: def main() -> None: - """Write both test files to the requested output directory.""" + """Write both test files under the current directory using FFmpeg on PATH.""" parser = argparse.ArgumentParser(description=__doc__) - parser.add_argument("output_directory", type=Path) - parser.add_argument("--ffmpeg", default="ffmpeg", help="FFmpeg executable to run") + parser.add_argument("output_directory", type=Path, help="Output directory within the current directory") args = parser.parse_args() - args.output_directory.mkdir(parents=True, exist_ok=True) - wav = args.output_directory / "surround-channel-check.wav" - spdif = args.output_directory / "surround-channel-check.spdif" + base_directory = Path.cwd().resolve() + output_directory = args.output_directory.resolve() + if not output_directory.is_relative_to(base_directory): + parser.error("output directory must be within the current directory") + + output_directory.mkdir(parents=True, exist_ok=True) + wav = output_directory / WAV_NAME + spdif = output_directory / SPDIF_NAME + for output in (wav, spdif): + if output.exists() or output.is_symlink(): + parser.error(f"output already exists: {output}") + subprocess.run( [ - args.ffmpeg, - "-hide_banner", "-loglevel", "error", "-y", + "ffmpeg", + "-hide_banner", "-loglevel", "error", "-nostdin", "-n", "-f", "s16le", "-ar", str(SAMPLE_RATE), "-channel_layout", "5.1(side)", "-i", "pipe:0", - "-map", "0:a:0", "-c:a", "pcm_s16le", str(wav), - "-map", "0:a:0", "-c:a", "ac3_fixed", "-b:a", "448k", "-f", "spdif", str(spdif), + "-map", "0:a:0", "-c:a", "pcm_s16le", WAV_NAME, + "-map", "0:a:0", "-c:a", "ac3_fixed", "-b:a", "448k", "-f", "spdif", SPDIF_NAME, ], + cwd=output_directory, input=channel_check_pcm(), check=True, ) diff --git a/experiments/test_generate_surround_channel_check.py b/experiments/test_generate_surround_channel_check.py new file mode 100644 index 0000000..d076ccb --- /dev/null +++ b/experiments/test_generate_surround_channel_check.py @@ -0,0 +1,71 @@ +"""Regression tests for the surround fixture generator's command and output paths.""" + +import io +import subprocess +import sys +import tempfile +import unittest +from contextlib import chdir, redirect_stderr, redirect_stdout +from pathlib import Path +from unittest.mock import patch + +import generate_surround_channel_check as generator + + +class GenerateSurroundChannelCheckTest(unittest.TestCase): + """Check that the generator launches FFmpeg only with safe output paths.""" + + def test_runs_ffmpeg_with_fixed_names_inside_requested_directory(self): + """Pass the generated PCM to FFmpeg without passing CLI paths as arguments.""" + with tempfile.TemporaryDirectory() as temp, chdir(temp): + output = Path.cwd() / "fixtures with spaces" + with ( + patch.object(sys, "argv", ["generate_surround_channel_check.py", str(output)]), + patch.object(generator, "channel_check_pcm", return_value=b"pcm"), + patch.object(subprocess, "run") as run, + redirect_stdout(io.StringIO()), + ): + generator.main() + + self.assertTrue(output.is_dir()) + run.assert_called_once() + command = run.call_args.args[0] + self.assertEqual(command[0], "ffmpeg") + self.assertIn(generator.WAV_NAME, command) + self.assertIn(generator.SPDIF_NAME, command) + self.assertNotIn(str(output), command) + self.assertEqual(run.call_args.kwargs, {"cwd": output.resolve(), "input": b"pcm", "check": True}) + + def test_rejects_paths_outside_current_directory(self): + """Check that a parent traversal and an absolute sibling path both fail.""" + with tempfile.TemporaryDirectory() as temp: + parent = Path(temp) + working = parent / "working" + working.mkdir() + for output in ("../outside", str(parent / "outside")): + with self.subTest(output=output), chdir(working): + self.assert_cli_rejected(output, "output directory must be within the current directory") + self.assertFalse((parent / "outside").exists()) + + def test_rejects_existing_output(self): + """An existing surround fixture is preserved and FFmpeg never starts.""" + with tempfile.TemporaryDirectory() as temp, chdir(temp): + existing = Path(generator.SPDIF_NAME) + existing.write_bytes(b"keep") + self.assert_cli_rejected(".", "output already exists") + self.assertEqual(existing.read_bytes(), b"keep") + self.assertFalse(Path(generator.WAV_NAME).exists()) + + def assert_cli_rejected(self, output, message): + """Assert a path is rejected before starting any subprocess.""" + with ( + patch.object(sys, "argv", ["generate_surround_channel_check.py", output]), + patch.object(subprocess, "run") as run, + redirect_stderr(io.StringIO()) as stderr, + self.assertRaises(SystemExit) as exit_context, + ): + generator.main() + + self.assertEqual(exit_context.exception.code, 2) + self.assertIn(message, stderr.getvalue()) + run.assert_not_called() diff --git a/src/app/client_state.cpp b/src/app/client_state.cpp index 7bd44f7..1f0e7db 100644 --- a/src/app/client_state.cpp +++ b/src/app/client_state.cpp @@ -621,19 +621,19 @@ namespace { return { { "toggle-play-audio-on-pc", - std::string("Play Audio on PC: ") + (state.settings.playAudioOnPc ? "On" : "Off"), + std::string("Play Audio on PC: ") + (state.settings.audio.playOnPc ? "On" : "Off"), "Toggle whether the host PC should continue local audio playback while also streaming audio to this Xbox client.", true, }, { "toggle-play-audio-on-xbox", - std::string("Play Audio on Xbox: ") + (state.settings.playAudioOnXbox ? "On" : "Off"), + std::string("Play Audio on Xbox: ") + (state.settings.audio.playOnXbox ? "On" : "Off"), "Toggle local audio playback on the Xbox. Disable this to skip Opus decode work when video latency matters more than sound.", true, }, { "cycle-audio-mode", - std::string("Audio Mode: ") + streaming::audio_mode_label(state.settings.audioMode), + std::string("Audio Mode: ") + streaming::audio_mode_label(state.settings.audio.mode), "Choose separate left and right channels or the same mono mix through both speakers.", true, }, @@ -1913,8 +1913,6 @@ namespace app { state.settings.logViewerPlacement = LogViewerPlacement::full; state.settings.loggingLevel = logging::LogLevel::none; state.settings.xemuConsoleLoggingLevel = logging::LogLevel::none; - state.settings.playAudioOnPc = false; - state.settings.playAudioOnXbox = true; state.settings.controls.screenshotDirectory.clear(); state.settings.controls.keyboardDockTop = false; state.settings.dirty = false; @@ -2552,26 +2550,26 @@ namespace app { return; } if (detailUpdate.activatedItemId == "toggle-play-audio-on-pc") { - state.settings.playAudioOnPc = !state.settings.playAudioOnPc; + state.settings.audio.playOnPc = !state.settings.audio.playOnPc; state.settings.dirty = true; update->persistence.settingsChanged = true; - state.shell.statusMessage = std::string("Play audio on PC ") + (state.settings.playAudioOnPc ? "enabled" : "disabled"); + state.shell.statusMessage = std::string("Play audio on PC ") + (state.settings.audio.playOnPc ? "enabled" : "disabled"); rebuild_menu(state, "toggle-play-audio-on-pc"); return; } if (detailUpdate.activatedItemId == "toggle-play-audio-on-xbox") { - state.settings.playAudioOnXbox = !state.settings.playAudioOnXbox; + state.settings.audio.playOnXbox = !state.settings.audio.playOnXbox; state.settings.dirty = true; update->persistence.settingsChanged = true; - state.shell.statusMessage = std::string("Play audio on Xbox ") + (state.settings.playAudioOnXbox ? "enabled" : "disabled"); + state.shell.statusMessage = std::string("Play audio on Xbox ") + (state.settings.audio.playOnXbox ? "enabled" : "disabled"); rebuild_menu(state, "toggle-play-audio-on-xbox"); return; } if (detailUpdate.activatedItemId == "cycle-audio-mode") { - state.settings.audioMode = streaming::next_audio_mode(state.settings.audioMode); + state.settings.audio.mode = streaming::next_audio_mode(state.settings.audio.mode); state.settings.dirty = true; update->persistence.settingsChanged = true; - state.shell.statusMessage = std::string("Audio mode set to ") + streaming::audio_mode_label(state.settings.audioMode); + state.shell.statusMessage = std::string("Audio mode set to ") + streaming::audio_mode_label(state.settings.audio.mode); rebuild_menu(state, "cycle-audio-mode"); return; } diff --git a/src/app/client_state.h b/src/app/client_state.h index 2cb10cc..b0931ee 100644 --- a/src/app/client_state.h +++ b/src/app/client_state.h @@ -391,6 +391,13 @@ namespace app { bool showPerformanceStats = false; ///< Display live performance telemetry and include it in the stream summary. }; + /** @brief Preferences for host and Xbox audio playback during streaming. */ + struct AudioPlaybackPreferences { + bool playOnPc = false; ///< Keep audio playing on the host PC. + bool playOnXbox = true; ///< Decode and play streaming audio on the Xbox. + streaming::AudioMode mode = streaming::AudioMode::stereo; ///< Mix used for Xbox playback. + }; + /** * @brief State owned by the settings, log viewer, and saved-file workflows. */ @@ -409,9 +416,7 @@ namespace app { int streamFramerate = DEFAULT_STREAM_FRAMERATE; ///< Preferred stream frame rate in frames per second. int streamBitrateKbps = DEFAULT_STREAM_BITRATE_KBPS; ///< Preferred stream bitrate in kilobits per second. VideoPresentationPreferences presentation; ///< Presentation path and statistics overlay preferences. - bool playAudioOnPc = false; ///< True when the host PC should continue local audio playback during streaming. - bool playAudioOnXbox = true; ///< True when the Xbox should decode and play streamed audio locally. - streaming::AudioMode audioMode = streaming::AudioMode::stereo; ///< Source channels and local playback mix. + AudioPlaybackPreferences audio; ///< Host and Xbox playback preferences. LocalStreamPreferences controls; ///< Screenshot storage and keyboard placement preferences. bool dirty = false; ///< True when persisted TOML-backed settings changed and should be saved. std::vector savedFiles; ///< Saved-file catalog shown on the reset settings page. diff --git a/src/main.cpp b/src/main.cpp index 9fdf14d..335bc23 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -52,10 +52,10 @@ namespace { state.settings.streamFramerate = settings.streamFramerate; state.settings.streamBitrateKbps = settings.streamBitrateKbps; state.settings.presentation.gpuPresentation = settings.gpuPresentation; - state.settings.playAudioOnPc = settings.playAudioOnPc; + state.settings.audio.playOnPc = settings.playAudioOnPc; state.settings.presentation.showPerformanceStats = settings.showPerformanceStats; - state.settings.playAudioOnXbox = settings.playAudioOnXbox; - state.settings.audioMode = settings.audioMode; + state.settings.audio.playOnXbox = settings.playAudioOnXbox; + state.settings.audio.mode = settings.audioMode; state.settings.controls.screenshotDirectory = settings.screenshotDirectory; state.settings.controls.keyboardDockTop = settings.keyboardDockTop; state.settings.dirty = false; diff --git a/src/streaming/audio_player.cpp b/src/streaming/audio_player.cpp index 4a79459..b6cf271 100644 --- a/src/streaming/audio_player.cpp +++ b/src/streaming/audio_player.cpp @@ -118,14 +118,14 @@ namespace streaming { return 0; } - void AudioPlayer::start() { + void AudioPlayer::start() const { if (device_ != 0) { SDL_ClearQueuedAudio(device_); SDL_PauseAudioDevice(device_, 0); } } - void AudioPlayer::stop() { + void AudioPlayer::stop() const { if (device_ != 0) { SDL_PauseAudioDevice(device_, 1); } @@ -161,8 +161,8 @@ namespace streaming { int result = swr_alloc_set_opts2(&resampler_, &stereo, AV_SAMPLE_FMT_S16, output_.freq, &frame_->ch_layout, static_cast(frame_->format), frame_->sample_rate, 0, nullptr); if (result >= 0 && mode_ == AudioMode::mono) { // Play the mean of left and right on both outputs of the stereo device. - constexpr double dualMono[] {0.5, 0.5, 0.5, 0.5}; - result = swr_set_matrix(resampler_, dualMono, OUTPUT_CHANNELS); + constexpr std::array dualMono {0.5, 0.5, 0.5, 0.5}; + result = swr_set_matrix(resampler_, dualMono.data(), OUTPUT_CHANNELS); } if (result >= 0) { result = swr_init(resampler_); @@ -196,8 +196,7 @@ namespace streaming { } const Uint32 bytes = static_cast(converted) * bytesPerFrame; - const Uint32 maxQueuedBytes = output_.freq * bytesPerFrame * QUEUE_LIMIT_MS / 1000U; - if (pending_bytes() + bytes > maxQueuedBytes) { + if (const Uint32 maxQueuedBytes = output_.freq * bytesPerFrame * QUEUE_LIMIT_MS / 1000U; pending_bytes() + bytes > maxQueuedBytes) { SDL_ClearQueuedAudio(device_); } if (SDL_QueueAudio(device_, output, bytes) < 0) { diff --git a/src/streaming/audio_player.h b/src/streaming/audio_player.h index 1b48896..04e3543 100644 --- a/src/streaming/audio_player.h +++ b/src/streaming/audio_player.h @@ -60,10 +60,10 @@ namespace streaming { int initialize(int audioConfiguration, const _OPUS_MULTISTREAM_CONFIGURATION *opus); /** @brief Start SDL audio playback with an empty queue. */ - void start(); + void start() const; /** @brief Pause playback. */ - void stop(); + void stop() const; /** @brief Release playback and codec resources, retaining the configured preferences. */ void cleanup(); diff --git a/src/streaming/session.cpp b/src/streaming/session.cpp index 67be362..e28058a 100644 --- a/src/streaming/session.cpp +++ b/src/streaming/session.cpp @@ -1535,7 +1535,7 @@ namespace streaming { launchConfiguration.height = select_stream_height(streamParameters.videoMode); launchConfiguration.fps = streamParameters.fps; launchConfiguration.audioConfiguration = AUDIO_CONFIGURATION_STEREO; - launchConfiguration.playAudioOnPc = settings.playAudioOnPc; + launchConfiguration.playAudioOnPc = settings.audio.playOnPc; launchConfiguration.clientRefreshRateX100 = select_client_refresh_rate_x100(activeStreamVideoMode); launchConfiguration.remoteInputAesKeyHex = hex_encode(remoteInputKey.data(), remoteInputKey.size()); launchConfiguration.remoteInputAesIvHex = hex_encode(remoteInputIv.data(), remoteInputIv.size()); @@ -1566,9 +1566,9 @@ namespace streaming { "stream", std::string("Requested stream configuration | resolution=") + std::to_string(startContext.streamConfiguration.width) + "x" + std::to_string(startContext.streamConfiguration.height) + " | fps=" + std::to_string(startContext.streamConfiguration.fps) + " | bitrate=" + std::to_string(startContext.streamConfiguration.bitrate) + " kbps" + " | packetSize=" + std::to_string(startContext.streamConfiguration.packetSize) + " | networkProfile=" + describe_streaming_remotely_mode(startContext.streamConfiguration.streamingRemotely) + " | clientRefreshX100=" + std::to_string(startContext.streamConfiguration.clientRefreshRateX100) ); - resources.mediaBackend.audio_player().configure(settings.audioMode, settings.playAudioOnXbox); + resources.mediaBackend.audio_player().configure(settings.audio.mode, settings.audio.playOnXbox); resources.mediaBackend.set_gpu_presentation_enabled(settings.presentation.gpuPresentation); - logging::info("stream", std::string("Xbox audio mode: ") + (settings.playAudioOnXbox ? audio_mode_label(settings.audioMode) : "Disabled")); + logging::info("stream", std::string("Xbox audio mode: ") + (settings.audio.playOnXbox ? audio_mode_label(settings.audio.mode) : "Disabled")); logging::debug( "stream", std::string("Stream connection metadata | active=") + printable_log_value(startContext.serverInformation.address == nullptr ? std::string_view {} : std::string_view {startContext.serverInformation.address}) + diff --git a/src/ui/shell_screen.cpp b/src/ui/shell_screen.cpp index d66a678..1768553 100644 --- a/src/ui/shell_screen.cpp +++ b/src/ui/shell_screen.cpp @@ -2506,13 +2506,13 @@ namespace { state.settings.preferredVideoModeSet, state.settings.streamFramerate, state.settings.streamBitrateKbps, - state.settings.playAudioOnPc, + state.settings.audio.playOnPc, state.settings.presentation.showPerformanceStats, - state.settings.playAudioOnXbox, + state.settings.audio.playOnXbox, state.settings.controls.screenshotDirectory, state.settings.controls.keyboardDockTop, state.settings.presentation.gpuPresentation, - state.settings.audioMode, + state.settings.audio.mode, }; } diff --git a/src/ui/shell_view.cpp b/src/ui/shell_view.cpp index 3204339..8b60ee0 100644 --- a/src/ui/shell_view.cpp +++ b/src/ui/shell_view.cpp @@ -7,6 +7,8 @@ // standard includes #include +#include +#include #include #include #include @@ -429,38 +431,24 @@ namespace { * @return Packaged Lucide SVG path, or an empty path for undecorated actions. */ std::string menu_icon(const std::string &id) { - if (id == "settings-category:logging") { - return "icons\\scroll-text.svg"; - } - if (id == "settings-category:display") { - return "icons\\monitor.svg"; - } - if (id == "settings-category:audio") { - return "icons\\volume-2.svg"; - } - if (id == "settings-category:input") { - return "icons\\gamepad-2.svg"; - } - if (id == "settings-category:storage") { - return "icons\\save.svg"; - } - if (id == "settings-category:reset") { - return "icons\\rotate-ccw.svg"; - } - if (id == "edit-address") { - return "icons\\network.svg"; - } - if (id == "edit-port") { - return "icons\\hash.svg"; - } - if (id == "test-connection") { - return "icons\\activity.svg"; - } - if (id == "start-pairing") { - return "icons\\key-round.svg"; - } - if (id == "save-host") { - return "icons\\save.svg"; + using IconEntry = std::pair; + static constexpr std::array icons { + IconEntry {"settings-category:logging", "icons\\scroll-text.svg"}, + IconEntry {"settings-category:display", "icons\\monitor.svg"}, + IconEntry {"settings-category:audio", "icons\\volume-2.svg"}, + IconEntry {"settings-category:input", "icons\\gamepad-2.svg"}, + IconEntry {"settings-category:storage", "icons\\save.svg"}, + IconEntry {"settings-category:reset", "icons\\rotate-ccw.svg"}, + IconEntry {"edit-address", "icons\\network.svg"}, + IconEntry {"edit-port", "icons\\hash.svg"}, + IconEntry {"test-connection", "icons\\activity.svg"}, + IconEntry {"start-pairing", "icons\\key-round.svg"}, + IconEntry {"save-host", "icons\\save.svg"}, + }; + for (const auto &[action, path] : icons) { + if (id == action) { + return path; + } } return {}; } diff --git a/tests/unit/app/client_state_test.cpp b/tests/unit/app/client_state_test.cpp index f5b5ab7..5fe5f2c 100644 --- a/tests/unit/app/client_state_test.cpp +++ b/tests/unit/app/client_state_test.cpp @@ -1538,8 +1538,8 @@ namespace { state.settings.dirty = false; EXPECT_TRUE(app::handle_command(state, input::UiCommand::activate).persistence.settingsChanged); EXPECT_TRUE(state.settings.dirty); - EXPECT_TRUE(state.settings.playAudioOnXbox); - EXPECT_EQ(state.settings.audioMode, modes[i]); + EXPECT_TRUE(state.settings.audio.playOnXbox); + EXPECT_EQ(state.settings.audio.mode, modes[i]); ASSERT_NE(state.detailMenu.selected_item(), nullptr); EXPECT_EQ(state.detailMenu.selected_item()->id, "cycle-audio-mode"); EXPECT_EQ(state.detailMenu.selected_item()->label, labels[i]); @@ -1557,8 +1557,8 @@ namespace { EXPECT_EQ(state.detailMenu.selected_item()->id, "toggle-play-audio-on-pc"); EXPECT_EQ(state.detailMenu.selected_item()->label, "Play Audio on PC: Off"); EXPECT_TRUE(app::handle_command(state, input::UiCommand::activate).persistence.settingsChanged); - EXPECT_TRUE(state.settings.playAudioOnPc); - EXPECT_TRUE(state.settings.playAudioOnXbox); + EXPECT_TRUE(state.settings.audio.playOnPc); + EXPECT_TRUE(state.settings.audio.playOnXbox); EXPECT_EQ(state.detailMenu.selected_item()->label, "Play Audio on PC: On"); ASSERT_TRUE(state.detailMenu.select_item_by_id("toggle-play-audio-on-xbox")); @@ -1566,8 +1566,8 @@ namespace { const auto update = app::handle_command(state, input::UiCommand::activate); EXPECT_EQ(update.navigation.activatedItemId, "toggle-play-audio-on-xbox"); EXPECT_TRUE(update.persistence.settingsChanged); - EXPECT_TRUE(state.settings.playAudioOnPc); - EXPECT_FALSE(state.settings.playAudioOnXbox); + EXPECT_TRUE(state.settings.audio.playOnPc); + EXPECT_FALSE(state.settings.audio.playOnXbox); EXPECT_EQ(state.settings.streamBitrateKbps, 1500); EXPECT_EQ(state.shell.statusMessage, "Play audio on Xbox disabled"); ASSERT_NE(state.detailMenu.selected_item(), nullptr);