diff options
| author | David Spruill <[email protected]> | 2026-07-20 16:40:01 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2026-07-20 16:40:01 -0400 |
| commit | 6b4e5cc14c3a45aa5c51badb6bfe4886af30ad32 (patch) | |
| tree | 296afa9bd3722816f2390bb5e9eff27c6e75eb93 /general/SimpleMediaSource/MediaSource | |
| parent | c5fc3ca1fd0e00a7e085ef48abfeff9c0c39817e (diff) | |
| parent | 15640356a5a6eeafefff403f6d287821213635cd (diff) | |
Merge branch 'develop' into user/daspr/kmodsamplefix
Diffstat (limited to 'general/SimpleMediaSource/MediaSource')
| -rw-r--r-- | general/SimpleMediaSource/MediaSource/MediaSource.vcxproj | 9 | ||||
| -rw-r--r-- | general/SimpleMediaSource/MediaSource/SimpleMediaSource.cpp | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/general/SimpleMediaSource/MediaSource/MediaSource.vcxproj b/general/SimpleMediaSource/MediaSource/MediaSource.vcxproj index 78bbbfbb..dee4adb3 100644 --- a/general/SimpleMediaSource/MediaSource/MediaSource.vcxproj +++ b/general/SimpleMediaSource/MediaSource/MediaSource.vcxproj @@ -22,7 +22,6 @@ <VCProjectVersion>15.0</VCProjectVersion> <ProjectGuid>{43AD9BF7-E765-48FE-9826-71A8F2CB12DD}</ProjectGuid> <RootNamespace>MediaSource</RootNamespace> - <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion> <ProjectName>SimpleMediaSource</ProjectName> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> @@ -99,7 +98,7 @@ <EnablePREfast>false</EnablePREfast> <ExceptionHandling>Sync</ExceptionHandling> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <LanguageStandard>stdcpp17</LanguageStandard> + <LanguageStandard>stdcpp20</LanguageStandard> <PrecompiledHeader>Create</PrecompiledHeader> <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile> <AdditionalIncludeDirectories>..\..\..\wil\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> @@ -119,7 +118,7 @@ <EnablePREfast>false</EnablePREfast> <ExceptionHandling>Sync</ExceptionHandling> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <LanguageStandard>stdcpp17</LanguageStandard> + <LanguageStandard>stdcpp20</LanguageStandard> <PrecompiledHeader>Create</PrecompiledHeader> <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile> <AdditionalIncludeDirectories>..\..\..\wil\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> @@ -141,7 +140,7 @@ <EnablePREfast>false</EnablePREfast> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <ExceptionHandling>Sync</ExceptionHandling> - <LanguageStandard>stdcpp17</LanguageStandard> + <LanguageStandard>stdcpp20</LanguageStandard> <PrecompiledHeader>Create</PrecompiledHeader> <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile> <AdditionalIncludeDirectories>..\..\..\wil\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> @@ -165,7 +164,7 @@ <EnablePREfast>false</EnablePREfast> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <ExceptionHandling>Sync</ExceptionHandling> - <LanguageStandard>stdcpp17</LanguageStandard> + <LanguageStandard>stdcpp20</LanguageStandard> <PrecompiledHeader>Create</PrecompiledHeader> <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile> <AdditionalIncludeDirectories>..\..\..\wil\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> diff --git a/general/SimpleMediaSource/MediaSource/SimpleMediaSource.cpp b/general/SimpleMediaSource/MediaSource/SimpleMediaSource.cpp index 8ff15872..e672c9da 100644 --- a/general/SimpleMediaSource/MediaSource/SimpleMediaSource.cpp +++ b/general/SimpleMediaSource/MediaSource/SimpleMediaSource.cpp @@ -27,11 +27,11 @@ namespace winrt::WindowsSample::implementation RETURN_IF_FAILED(m_streamList[i]->Initialize(this, i, MFSampleAllocatorUsage_UsesProvidedAllocator)); RETURN_IF_FAILED(m_streamList[i]->GetStreamDescriptor(&streamDescriptorList[i])); - } + } - RETURN_IF_FAILED(MFCreatePresentationDescriptor(m_streamList.size(), streamDescriptorList.get(), &m_spPresentationDescriptor)); + RETURN_IF_FAILED(MFCreatePresentationDescriptor(static_cast<DWORD>(m_streamList.size()), streamDescriptorList.get(), &m_spPresentationDescriptor)); - m_sourceState = SourceState::Stopped; + m_sourceState = SourceState::Stopped; return S_OK; } |