summaryrefslogtreecommitdiff
path: root/avstream/avscamera/mft0/MFT0Impl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'avstream/avscamera/mft0/MFT0Impl.cpp')
-rw-r--r--avstream/avscamera/mft0/MFT0Impl.cpp17
1 files changed, 10 insertions, 7 deletions
diff --git a/avstream/avscamera/mft0/MFT0Impl.cpp b/avstream/avscamera/mft0/MFT0Impl.cpp
index 90caedd6..e2c07ce3 100644
--- a/avstream/avscamera/mft0/MFT0Impl.cpp
+++ b/avstream/avscamera/mft0/MFT0Impl.cpp
@@ -1184,8 +1184,8 @@ STDMETHODIMP CSocMft0::GetMediaType(
//
STDMETHODIMP CSocMft0::IsMediaTypeSupported(
_In_ UINT uiStreamId,
- _In_ IMFMediaType *pIMFMediaType,
- _Outptr_result_maybenull_ IMFMediaType **ppIMFMediaTypeFull
+ _In_opt_ IMFMediaType *pIMFMediaType,
+ _Outptr_opt_result_maybenull_ IMFMediaType **ppIMFMediaTypeFull
)
{
HRESULT hr = S_OK;
@@ -1549,12 +1549,15 @@ HRESULT CSocMft0::ParseMetadata_PreviewAggregation(
PCAMERA_METADATA_PREVIEWAGGREGATION pFixedStruct =
(PCAMERA_METADATA_PREVIEWAGGREGATION)pItem;
- hr = pMetaDataAttributes->SetUINT32(
- MF_CAPTURE_METADATA_FOCUSSTATE,
- pFixedStruct->Data.FocusState);
- if(FAILED(hr))
+ if (pFixedStruct->Data.FocusState.Set)
{
- return hr;
+ hr = pMetaDataAttributes->SetUINT32(
+ MF_CAPTURE_METADATA_FOCUSSTATE,
+ pFixedStruct->Data.FocusState.Value);
+ if (FAILED(hr))
+ {
+ return hr;
+ }
}
if(pFixedStruct->Data.ExposureTime.Set)