From 2dc689c2c8ef4cc67ad9b393aef31850eb133649 Mon Sep 17 00:00:00 2001 From: Seungha Yang Date: Thu, 28 May 2020 20:46:02 +0900 Subject: [PATCH] mediafoundation: Fix undeclared identifier error on UWP build Some symbols are not available in case of UWP Part-of: --- sys/mediafoundation/gstmfutils.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/sys/mediafoundation/gstmfutils.cpp b/sys/mediafoundation/gstmfutils.cpp index b525a03..1a00c0f 100644 --- a/sys/mediafoundation/gstmfutils.cpp +++ b/sys/mediafoundation/gstmfutils.cpp @@ -22,6 +22,8 @@ #include "config.h" #endif +#include "gstmfconfig.h" + #include "gstmfutils.h" #include @@ -447,7 +449,6 @@ gst_mf_guid_to_static_string (const GUID& guid) GST_MF_IF_EQUAL_RETURN(guid, MF_MT_INTERLACE_MODE); GST_MF_IF_EQUAL_RETURN(guid, MF_MT_TRANSFER_FUNCTION); GST_MF_IF_EQUAL_RETURN(guid, MF_MT_VIDEO_PRIMARIES); - GST_MF_IF_EQUAL_RETURN(guid, MF_MT_CUSTOM_VIDEO_PRIMARIES); GST_MF_IF_EQUAL_RETURN(guid, MF_MT_YUV_MATRIX); GST_MF_IF_EQUAL_RETURN(guid, MF_MT_VIDEO_LIGHTING); GST_MF_IF_EQUAL_RETURN(guid, MF_MT_VIDEO_NOMINAL_RANGE); @@ -461,7 +462,6 @@ gst_mf_guid_to_static_string (const GUID& guid) GST_MF_IF_EQUAL_RETURN(guid, MF_MT_DEFAULT_STRIDE); GST_MF_IF_EQUAL_RETURN(guid, MF_MT_PALETTE); GST_MF_IF_EQUAL_RETURN(guid, MF_MT_USER_DATA); - GST_MF_IF_EQUAL_RETURN(guid, MF_MT_AM_FORMAT_TYPE); GST_MF_IF_EQUAL_RETURN(guid, MF_MT_MPEG_START_TIME_CODE); GST_MF_IF_EQUAL_RETURN(guid, MF_MT_MPEG2_PROFILE); GST_MF_IF_EQUAL_RETURN(guid, MF_MT_MPEG2_LEVEL); @@ -473,13 +473,9 @@ gst_mf_guid_to_static_string (const GUID& guid) GST_MF_IF_EQUAL_RETURN(guid, MF_MT_DV_AAUX_CTRL_PACK_1); GST_MF_IF_EQUAL_RETURN(guid, MF_MT_DV_VAUX_SRC_PACK); GST_MF_IF_EQUAL_RETURN(guid, MF_MT_DV_VAUX_CTRL_PACK); - GST_MF_IF_EQUAL_RETURN(guid, MF_MT_ARBITRARY_HEADER); - GST_MF_IF_EQUAL_RETURN(guid, MF_MT_ARBITRARY_FORMAT); GST_MF_IF_EQUAL_RETURN(guid, MF_MT_IMAGE_LOSS_TOLERANT); GST_MF_IF_EQUAL_RETURN(guid, MF_MT_MPEG4_SAMPLE_DESCRIPTION); GST_MF_IF_EQUAL_RETURN(guid, MF_MT_MPEG4_CURRENT_SAMPLE_ENTRY); - GST_MF_IF_EQUAL_RETURN(guid, MF_MT_ORIGINAL_4CC); - GST_MF_IF_EQUAL_RETURN(guid, MF_MT_ORIGINAL_WAVE_FORMAT_TAG); GST_MF_IF_EQUAL_RETURN(guid, MFMediaType_Audio); GST_MF_IF_EQUAL_RETURN(guid, MFMediaType_Video); @@ -572,6 +568,15 @@ gst_mf_guid_to_static_string (const GUID& guid) /* WAVE_FORMAT_MPEG_ADTS_AAC */ GST_MF_IF_EQUAL_RETURN(guid, MFAudioFormat_ADTS); +#if !GST_MF_WINAPI_ONLY_APP + GST_MF_IF_EQUAL_RETURN(guid, MF_MT_CUSTOM_VIDEO_PRIMARIES); + GST_MF_IF_EQUAL_RETURN(guid, MF_MT_AM_FORMAT_TYPE); + GST_MF_IF_EQUAL_RETURN(guid, MF_MT_ARBITRARY_HEADER); + GST_MF_IF_EQUAL_RETURN(guid, MF_MT_ARBITRARY_FORMAT); + GST_MF_IF_EQUAL_RETURN(guid, MF_MT_ORIGINAL_4CC); + GST_MF_IF_EQUAL_RETURN(guid, MF_MT_ORIGINAL_WAVE_FORMAT_TAG); +#endif + return NULL; } -- 2.7.4