From e2e26357524ca64526d652db7dcf927d22c6d931 Mon Sep 17 00:00:00 2001 From: Zaggy1024 Date: Tue, 9 Jun 2026 17:21:34 -0500 Subject: [PATCH] LibMedia: Make PipelineStatus::Pending take precedence over HaveData This matches the mixer's behavior, it won't mix data once it reaches any Pending status on any input. Doing this will allow seeking to also rely on the combined status function to determine when to resolve. --- Libraries/LibMedia/PipelineStatus.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Libraries/LibMedia/PipelineStatus.h b/Libraries/LibMedia/PipelineStatus.h index 2296e00e91..9ae3835abe 100644 --- a/Libraries/LibMedia/PipelineStatus.h +++ b/Libraries/LibMedia/PipelineStatus.h @@ -63,12 +63,12 @@ constexpr PipelineStatus select_combined_pipeline_status(PipelineStatus a, Pipel return PipelineStatus::Error; if (a == PipelineStatus::Blocked || b == PipelineStatus::Blocked) return PipelineStatus::Blocked; + if (a == PipelineStatus::Pending || b == PipelineStatus::Pending) + return PipelineStatus::Pending; if (a == PipelineStatus::HaveData || b == PipelineStatus::HaveData) return PipelineStatus::HaveData; if (a == PipelineStatus::MovedPosition || b == PipelineStatus::MovedPosition) return PipelineStatus::MovedPosition; - if (a == PipelineStatus::Pending || b == PipelineStatus::Pending) - return PipelineStatus::Pending; return PipelineStatus::EndOfStream; }