From 080cc41332f5f1cddd8ace680f74a8b374e463b7 Mon Sep 17 00:00:00 2001 From: Peihsun Yeh Date: Fri, 7 Sep 2018 14:13:20 -0700 Subject: fix bug in source not allowing to go from shutdown to start --- general/SimpleMediaSource/MediaSource/SimpleMediaSource.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'general/SimpleMediaSource/MediaSource/SimpleMediaSource.cpp') diff --git a/general/SimpleMediaSource/MediaSource/SimpleMediaSource.cpp b/general/SimpleMediaSource/MediaSource/SimpleMediaSource.cpp index 1729fbcf..162fb1d8 100644 --- a/general/SimpleMediaSource/MediaSource/SimpleMediaSource.cpp +++ b/general/SimpleMediaSource/MediaSource/SimpleMediaSource.cpp @@ -199,7 +199,7 @@ SimpleMediaSource::Start( RETURN_IF_FAILED (_CheckShutdownRequiresLock()); - if (_sourceState != SourceState::Stopped) + if (!(_sourceState != SourceState::Stopped || _sourceState != SourceState::Shutdown)) { return MF_E_INVALID_STATE_TRANSITION; } @@ -277,6 +277,8 @@ SimpleMediaSource::Stop( return MF_E_INVALID_STATE_TRANSITION; } + _sourceState = SourceState::Stopped; + RETURN_IF_FAILED (_CheckShutdownRequiresLock()); RETURN_IF_FAILED (InitPropVariantFromInt64(MFGetSystemTime(), &stopTime)); RETURN_IF_FAILED (_spPresentationDescriptor->GetStreamDescriptorCount(&count)); -- cgit v1.3.1