From e33332cdf8d4ae28dd8a0929e2503eb2348466db Mon Sep 17 00:00:00 2001 From: zortos293 <65777760+zortos293@users.noreply.github.com> Date: Thu, 15 Oct 2026 15:43:23 +0000 Subject: [PATCH] Fix silent in-game audio and paginate the library --- app/src/gfn/catalog.cpp | 206 ++++++++++++------------- app/src/stream/audio/AudioPipeline.cpp | 20 +-- scripts/test-streaming-host.sh | 2 +- tests/audio_pipeline_test.cpp | 45 +++++- tests/catalog_response_test.cpp | 23 +++ 5 files changed, 174 insertions(+), 122 deletions(-) diff --git a/app/src/gfn/catalog.cpp b/app/src/gfn/catalog.cpp index 418d7ed..d08b31d 100644 --- a/app/src/gfn/catalog.cpp +++ b/app/src/gfn/catalog.cpp @@ -6,6 +6,7 @@ #include #include +#include #include #include #include @@ -26,12 +27,11 @@ constexpr const char* kGraphQlEndpoint = "https://games.geforce.com/graphql" constexpr const char* kClientVersion = "2.0.80.173"; constexpr const char* kLcarsClientId = "ec7e38d4-03af-4b58-b131-cfb0495903ab"; constexpr const char* kDefaultLocale = "en_US"; -constexpr const char* kPanelsQueryHash = "f8e26265a5db5c20e1334a6872cf04b6e3970507697f6ae55a6ddefa5420daf0"; -constexpr const char* kLibraryWithTimeQueryHash = "039e8c0d553972975485fee56e59f2549d2fdb518e247a42ab5022056a74406f"; constexpr const char* kPlayOrigin = "https://play.geforcenow.com"; constexpr const char* kPlayReferer = "https://play.geforcenow.com/"; constexpr std::size_t kCatalogPageSize = 60; constexpr std::size_t kCatalogPageBytes = 4 * 1024 * 1024; +constexpr std::size_t kMaxLibraryPages = 50; std::vector BuildGfnLcarsHeaders( const std::string& token, @@ -251,24 +251,6 @@ void ThrowIfGraphQlFailed(json_t* root) throw std::runtime_error(message); } -std::string BuildLibraryUrl(const std::string& vpc_id, bool with_library_time) -{ - const std::string variables = - std::string("{\"vpcId\":\"") + vpc_id + "\",\"locale\":\"" + kDefaultLocale + - "\",\"panelNames\":[\"LIBRARY\"]}"; - - const std::string extensions = - std::string("{\"persistedQuery\":{\"sha256Hash\":\"") + - (with_library_time ? kLibraryWithTimeQueryHash : kPanelsQueryHash) + "\"}}"; - - std::string url = std::string(kGraphQlEndpoint) + "?"; - url += "requestType=" + UrlEncode("panels/Library"); - url += "&extensions=" + UrlEncode(extensions); - url += "&huId=" + UrlEncode(HexEncode(GenerateRandomBytes(8).data(), 8)); - url += "&variables=" + UrlEncode(variables); - return url; -} - std::string ResolveVpcId( const HttpClient& http_client, const AuthSession& session) @@ -293,66 +275,6 @@ std::string ResolveVpcId( return server_id.empty() ? std::string("GFN-PC") : server_id; } -std::vector ParseLibraryGames(JsonPtr& root) -{ - ThrowIfGraphQlFailed(root.get()); - - std::unordered_map index_by_id; - std::vector games; - - json_t* data = json_object_get(root.get(), "data"); - json_t* panels = data ? json_object_get(data, "panels") : nullptr; - if (!json_is_array(panels)) - return {}; - - size_t panel_index = 0; - json_t* panel = nullptr; - json_array_foreach(panels, panel_index, panel) - { - json_t* sections = json_object_get(panel, "sections"); - if (!json_is_array(sections)) - continue; - - size_t section_index = 0; - json_t* section = nullptr; - json_array_foreach(sections, section_index, section) - { - json_t* items = json_object_get(section, "items"); - if (!json_is_array(items)) - continue; - - size_t item_index = 0; - json_t* item = nullptr; - json_array_foreach(items, item_index, item) - { - if (GetString(item, "__typename") != "GameItem") - continue; - - json_t* app = json_object_get(item, "app"); - if (!json_is_object(app)) - continue; - - GameInfo game = ParseApp(app); - if (game.id.empty() || game.title.empty()) - continue; - - const auto existing = index_by_id.find(game.id); - if (existing == index_by_id.end()) - { - index_by_id.emplace(game.id, games.size()); - games.push_back(std::move(game)); - } - else - { - MergeGame(games[existing->second], game); - } - } - } - } - - return games; -} - PublicGame ToPublicGame(const GameInfo& source) { PublicGame game; @@ -375,10 +297,17 @@ PublicGame ToPublicGame(const GameInfo& source) return game; } -CatalogPage ParseCatalogPage(JsonPtr& root, const std::string& cursor) +struct AppsPage +{ + std::vector games; + std::optional next_cursor; + std::optional total_count; +}; + +AppsPage ParseAppsPage(JsonPtr& root, const std::string& cursor) { ThrowIfGraphQlFailed(root.get()); - CatalogPage page; + AppsPage page; json_t* data = json_object_get(root.get(), "data"); json_t* apps = data ? json_object_get(data, "apps") : nullptr; @@ -409,11 +338,22 @@ CatalogPage ParseCatalogPage(JsonPtr& root, const std::string& cursor) { GameInfo parsed = ParseApp(app); if (!parsed.id.empty() && !parsed.title.empty()) - page.games.push_back(ToPublicGame(parsed)); + page.games.push_back(std::move(parsed)); } return page; } +CatalogPage ParseCatalogPage(JsonPtr& root, const std::string& cursor) +{ + AppsPage apps = ParseAppsPage(root, cursor); + CatalogPage page; + page.next_cursor = std::move(apps.next_cursor); + page.total_count = apps.total_count; + for (const GameInfo& game : apps.games) + page.games.push_back(ToPublicGame(game)); + return page; +} + std::string BuildCatalogRequestBody( const std::string& vpc_id, const std::string& search_query, const std::string& cursor) @@ -462,6 +402,39 @@ query GetSearchFilterResults($vpcId: String!, $locale: String!, $sortString: Str return DumpJson(body.get()); } +std::string BuildLibraryRequestBody(const std::string& vpc_id, const std::string& cursor) +{ + static const char* kLibraryQuery = R"GRAPHQL( +query GetLibraryApps($vpcId: String!, $locale: String!, $sortString: String!, $fetchCount: Int!, $cursor: String!, $filters: AppFilterFields!) { + apps(vpcId: $vpcId, language: $locale, orderBy: $sortString, first: $fetchCount, after: $cursor, filters: $filters) { + numberReturned numberSupported + pageInfo { hasNextPage endCursor totalCount } + items { + id title longDescription shortDescription publisherName + images { KEY_ART GAME_BOX_ART TV_BANNER HERO_IMAGE } + variants { id appStore gfn { status library { status selected lastPlayedDate } } } + gfn { playabilityState minimumMembershipTierLabel } + } + } +})GRAPHQL"; + + JsonPtr body(json_object(), &json_decref); + JsonPtr variables(json_object(), &json_decref); + json_object_set_new(body.get(), "query", json_string(kLibraryQuery)); + json_object_set_new(variables.get(), "vpcId", json_string(vpc_id.c_str())); + json_object_set_new(variables.get(), "locale", json_string(kDefaultLocale)); + json_object_set_new( + variables.get(), "sortString", + json_string("variants.gfn.library.lastPlayedDate:DESC,computedValues.libraryAddedDate:DESC,sortName:ASC")); + json_object_set_new(variables.get(), "fetchCount", json_integer(kCatalogPageSize)); + json_object_set_new(variables.get(), "cursor", json_string(cursor.c_str())); + json_t* filters = json_pack( + "{s:{s:{s:{s:{s:s}}}}}", "variants", "gfn", "library", "status", "notEquals", "NOT_OWNED"); + json_object_set_new(variables.get(), "filters", filters); + json_object_set_new(body.get(), "variables", json_incref(variables.get())); + return DumpJson(body.get()); +} + std::vector BuildGraphQlPostHeaders(const std::string& token) { std::vector headers = BuildGraphQlHeaders(token); @@ -654,37 +627,54 @@ std::vector GfnClient::FetchLibraryGames(AuthSession& session) const std::string jwt_token = ResolveSessionJwt(session); const std::string vpc_id = ResolveVpcId(http_client_, session); - HttpResponse response = http_client_.Get( - BuildLibraryUrl(vpc_id, true), - kUserAgent, - BuildGraphQlHeaders(jwt_token)); - - if (response.status_code == 401) + std::vector games; + std::unordered_map index_by_id; + std::string cursor; + for (std::size_t page_index = 0; page_index < kMaxLibraryPages; ++page_index) { - session = RecoverSavedSession(session, true); - jwt_token = ResolveSessionJwt(session); - response = http_client_.Get( - BuildLibraryUrl(vpc_id, true), + HttpResponse response = http_client_.Post( + kGraphQlEndpoint, kUserAgent, - BuildGraphQlHeaders(jwt_token)); - } + BuildGraphQlPostHeaders(jwt_token), + BuildLibraryRequestBody(vpc_id, cursor), + {}, {.max_body_bytes = kCatalogPageBytes}); - if (response.status_code != 200) - { - response = http_client_.Get( - BuildLibraryUrl(vpc_id, false), - kUserAgent, - BuildGraphQlHeaders(jwt_token)); - } + if (response.status_code == 401) + { + session = RecoverSavedSession(session, true); + jwt_token = ResolveSessionJwt(session); + response = http_client_.Post( + kGraphQlEndpoint, + kUserAgent, + BuildGraphQlPostHeaders(jwt_token), + BuildLibraryRequestBody(vpc_id, cursor), + {}, {.max_body_bytes = kCatalogPageBytes}); + } - if (response.status_code != 200) - { - throw std::runtime_error( - "Library fetch failed with HTTP " + std::to_string(response.status_code)); + if (response.status_code != 200) + { + throw std::runtime_error( + "Library fetch failed with HTTP " + std::to_string(response.status_code)); + } + + JsonPtr root = LoadJson(response.body); + AppsPage page = ParseAppsPage(root, cursor); + for (GameInfo& game : page.games) + { + const auto existing = index_by_id.find(game.id); + if (existing != index_by_id.end()) + { + MergeGame(games[existing->second], game); + continue; + } + index_by_id.emplace(game.id, games.size()); + games.push_back(std::move(game)); + } + if (!page.next_cursor) + break; + cursor = std::move(*page.next_cursor); } - JsonPtr root = LoadJson(response.body); - std::vector games = ParseLibraryGames(root); ApplyPlayHistory(games, LoadPlayHistory()); return games; } diff --git a/app/src/stream/audio/AudioPipeline.cpp b/app/src/stream/audio/AudioPipeline.cpp index 9ed2273..2fd97e7 100644 --- a/app/src/stream/audio/AudioPipeline.cpp +++ b/app/src/stream/audio/AudioPipeline.cpp @@ -95,7 +95,7 @@ struct AudioPipeline::Impl { std::atomic output_ready {false}; std::atomic output_started {false}; size_t queued_output_buffers = 0; - uint64_t played_sample_base = 0; + uint64_t released_samples = 0; std::atomic submitted_samples {0}; std::atomic played_samples {0}; std::atomic played_samples_observed_at_us {0}; @@ -175,9 +175,7 @@ struct AudioPipeline::Impl { slot.buffer.data_offset = 0; slot.free = true; } - u64 raw_played = 0; - if (R_SUCCEEDED(audoutGetAudioOutPlayedSampleCount(&raw_played))) - played_sample_base = raw_played; + released_samples = 0; output_ready.store(true); log("INIT ok backend=audout rate=48000 channels=2 frameSamples=480 prebuffer=" + std::to_string(prime_packets) + " buffers=24 outputLimit=" + @@ -216,12 +214,8 @@ struct AudioPipeline::Impl { } void refresh_played_samples() { - u64 raw_played = 0; - if (R_FAILED(audoutGetAudioOutPlayedSampleCount(&raw_played))) - return; - const uint64_t relative = raw_played >= played_sample_base ? raw_played - played_sample_base : raw_played; std::lock_guard lock(sender_report_mutex); - played_samples.store(std::min(relative, submitted_samples.load()), + played_samples.store(std::min(released_samples, submitted_samples.load()), std::memory_order_relaxed); played_samples_observed_at_us.store(monotonic_us(), std::memory_order_release); playback_timeline.discardBefore(played_samples.load(std::memory_order_relaxed)); @@ -234,8 +228,11 @@ struct AudioPipeline::Impl { released && released_count > 0) { for (auto& slot : output_slots) { if (&slot.buffer == released) { - if (!slot.free && queued_output_buffers > 0) - --queued_output_buffers; + if (!slot.free) { + released_samples += slot.buffer.data_size / (kChannels * sizeof(int16_t)); + if (queued_output_buffers > 0) + --queued_output_buffers; + } slot.free = true; break; } @@ -679,7 +676,6 @@ bool AudioPipeline::start() { impl_->submitted_samples.store(0); impl_->played_samples.store(0); impl_->played_samples_observed_at_us.store(0); - impl_->played_sample_base = 0; { std::lock_guard lock(impl_->sender_report_mutex); impl_->playback_timeline.clear(); diff --git a/scripts/test-streaming-host.sh b/scripts/test-streaming-host.sh index d0bfb8f..97ba23e 100644 --- a/scripts/test-streaming-host.sh +++ b/scripts/test-streaming-host.sh @@ -74,7 +74,7 @@ printf 'PASS deko_renderer_quality_snapshot\n' run_cpp audio_pipeline -Itests/stream_stubs -Iextern/libpeer/src app/src/stream/audio/AudioPipeline.cpp bash tests/run_audio_video_underrun_test.sh printf 'PASS audio_video_underrun\n' -for scenario in timeline ssrc red; do +for scenario in timeline ssrc red stuck_counter; do "$out/audio_pipeline" "$scenario" printf 'PASS audio_pipeline/%s\n' "$scenario" done diff --git a/tests/audio_pipeline_test.cpp b/tests/audio_pipeline_test.cpp index 9af7e36..02169db 100644 --- a/tests/audio_pipeline_test.cpp +++ b/tests/audio_pipeline_test.cpp @@ -26,6 +26,7 @@ int starts = 0; int stops = 0; u64 played_samples = 0; bool release_output = false; +bool played_counter_stuck = false; template void await(Predicate predicate) @@ -85,7 +86,7 @@ PcmFormat audoutGetPcmFormat() { return PcmFormat_Int16; } Result audoutGetAudioOutPlayedSampleCount(u64* samples) { std::lock_guard lock(mutex); - *samples = played_samples; + *samples = played_counter_stuck ? 0 : played_samples; return 0; } Result audoutGetReleasedAudioOutBuffer(AudioOutBuffer** buffer, u32* count) @@ -263,6 +264,46 @@ static void check_red_recovery() pipeline.stop(); } +static void check_stuck_played_counter() +{ + { + std::lock_guard lock(mutex); + played_counter_stuck = true; + release_output = true; + } + AudioPipeline pipeline; + pipeline.configure(1000, 30); + assert(pipeline.start()); + constexpr uint16_t kPackets = 120; + for (uint16_t sequence = 0; sequence < kPackets; ++sequence) { + uint8_t payload[] = {0xf0, static_cast(sequence)}; + PeerAudioPacket packet {}; + packet.data = payload; + packet.size = sizeof(payload); + packet.timestamp = 480u * sequence; + packet.ssrc = 1; + packet.sequence = sequence; + packet.payload_type = 111; + pipeline.submit(packet); + if (sequence >= 8) + await([sequence] { return decoded_sequences.size() + 8 > sequence; }); + } + const auto deadline = std::chrono::steady_clock::now() + std::chrono::seconds(2); + while (pipeline.debug_info().find("Audio rx/decoded/errors: 120/120/0") == std::string::npos) { + assert(std::chrono::steady_clock::now() < deadline); + std::this_thread::sleep_for(std::chrono::milliseconds(1)); + } + { + std::lock_guard lock(mutex); + std::printf("Stuck audout played counter: %zu decoded, %zu appended\n", + decoded_sequences.size(), reclaim_queries_at_append.size()); + std::fflush(stdout); + assert(reclaim_queries_at_append.size() == kPackets); + } + assert(pipeline.debug_info().find("gaps/late/drop: 0/0/0") != std::string::npos); + pipeline.stop(); +} + int main(int argc, char** argv) { if (argc > 1) { @@ -270,6 +311,8 @@ int main(int argc, char** argv) check_output_timeline(); else if (std::string(argv[1]) == "red") check_red_recovery(); + else if (std::string(argv[1]) == "stuck_counter") + check_stuck_played_counter(); else { assert(std::string(argv[1]) == "ssrc"); check_ssrc_timeline(); diff --git a/tests/catalog_response_test.cpp b/tests/catalog_response_test.cpp index fd129c2..3669a3f 100644 --- a/tests/catalog_response_test.cpp +++ b/tests/catalog_response_test.cpp @@ -28,6 +28,29 @@ int main() assert(json_integer_value(json_object_get(variables, "fetchCount")) == 60); assert(opennow::gfn::detail::GetString(variables, "cursor") == "cursor-60"); assert(opennow::gfn::detail::GetString(variables, "searchString") == "Example"); + const auto library_request = opennow::gfn::detail::LoadJson( + opennow::BuildLibraryRequestBody("GFN-PC", "cursor-120")); + json_t* library_variables = json_object_get(library_request.get(), "variables"); + assert(json_integer_value(json_object_get(library_variables, "fetchCount")) == 60); + assert(opennow::gfn::detail::GetString(library_variables, "cursor") == "cursor-120"); + json_t* library_status = json_object_get(json_object_get(json_object_get(json_object_get( + json_object_get(library_variables, "filters"), "variants"), "gfn"), "library"), "status"); + assert(opennow::gfn::detail::GetString(library_status, "notEquals") == "NOT_OWNED"); + assert(opennow::gfn::detail::GetString(library_request.get(), "query").find("after: $cursor") != + std::string::npos); + + auto library_page = opennow::gfn::detail::LoadJson(R"({"data":{"apps":{ + "items":[{"id":"owned","title":"Owned", + "variants":[{"id":"456","appStore":"STEAM", + "gfn":{"library":{"status":"PLATFORM_SYNC","lastPlayedDate":"2026-10-01T10:00:00Z"}}}]}], + "pageInfo":{"hasNextPage":true,"endCursor":"cursor-180"}}}})"); + const auto library_result = opennow::ParseAppsPage(library_page, "cursor-120"); + assert(library_result.next_cursor == "cursor-180"); + assert(library_result.games.size() == 1); + assert(library_result.games[0].is_in_library); + assert(library_result.games[0].last_played == "2026-10-01T10:00:00Z"); + assert(library_result.games[0].launch_app_id == "456"); + Reject(R"({})"); Reject(R"({"data":{"apps":{"items":[]}}})"); Reject(R"({"data":{"apps":{"items":{},"pageInfo":{"hasNextPage":false}}}})");