dmaax/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LibMedia: Make PipelineStatus::Pending take precedence over HaveData

Browse source 
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.
This commit is contained in:
Zaggy1024 2026-06-09 17:21:34 -05:00 committed by Gregory Bertilson
parent eeeabcaef1
commit e2e2635752
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Libraries/LibMedia/PipelineStatus.h
View file

@ -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;
}