[FFmpeg-devel] [PATCH 1/2] configure: Remove a redundant check for UWP mode

[FFmpeg-devel] [PATCH 1/2] configure: Remove a redundant check for UWP mode

[Martin Storsjö]

The check for UWP mode was duplicated from right above, in
d54127c41a81cf2078a3504f78e0e4232cfe11b7.

Also, instead of several lines with "enabled uwp && ...", make one
"if enabled uwp; then" block.
---
 configure | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/configure b/configure
index af0bebc1ac..69b755f274 100755
--- a/configure
+++ b/configure
@@ -7102,9 +7102,8 @@ fi
 
 check_func_headers "windows.h" CreateDIBSection "$gdigrab_indev_extralibs"
 
-# d3d11va requires linking directly to dxgi and d3d11 if not building for
-# the desktop api partition
-test_cpp <<EOF && enable uwp && d3d11va_extralibs="-ldxgi -ld3d11"
+# check if building for desktop or uwp
+test_cpp <<EOF && enable uwp
 #ifdef WINAPI_FAMILY
 #include <winapifamily.h>
 #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
@@ -7117,23 +7116,16 @@ test_cpp <<EOF && enable uwp && d3d11va_extralibs="-ldxgi -ld3d11"
 #endif
 EOF
 
-# vaapi_win32 requires linking directly to dxgi if not building for
-# the desktop api partition
-test_cpp <<EOF && enable uwp && vaapi_win32_extralibs="-ldxgi"
-#ifdef WINAPI_FAMILY
-#include <winapifamily.h>
-#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-#error desktop, not uwp
-#else
-// WINAPI_FAMILY_APP, WINAPI_FAMILY_PHONE_APP => UWP
-#endif
-#else
-#error no family set
-#endif
-EOF
+mediafoundation_extralibs="-lmfuuid -lole32 -lstrmiids"
 
-# mediafoundation requires linking directly to mfplat if building for uwp target
-enabled uwp && mediafoundation_extralibs="-lmfplat -lmfuuid -lole32 -lstrmiids" || mediafoundation_extralibs="-lmfuuid -lole32 -lstrmiids"
+if enabled uwp; then
+    # In UWP mode, we can't use LoadLibrary+GetProcAddress to conditionally
+    # try to load these APIs at runtime, like we do in regular desktop mode -
+    # therefore, we need to link directly against these APIs.
+    d3d11va_extralibs="-ldxgi -ld3d11"
+    vaapi_win32_extralibs="-ldxgi"
+    mediafoundation_extralibs="-lmfplat $mediafoundation_extralibs"
+fi
 
 enabled libdrm &&
     check_pkg_config libdrm_getfb2 libdrm "xf86drmMode.h" drmModeGetFB2
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/2] configure: Fix linking d3d12va in UWP mode

[Martin Storsjö]

---
 configure | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 69b755f274..18fe8eaa5c 100755
--- a/configure
+++ b/configure
@@ -3922,7 +3922,7 @@ swscale_suggest="libm stdatomic"
 
 avcodec_extralibs="pthreads_extralibs iconv_extralibs dxva2_extralibs lcms2_extralibs"
 avfilter_extralibs="pthreads_extralibs"
-avutil_extralibs="d3d11va_extralibs mediacodec_extralibs nanosleep_extralibs pthreads_extralibs vaapi_drm_extralibs vaapi_x11_extralibs vaapi_win32_extralibs vdpau_x11_extralibs"
+avutil_extralibs="d3d11va_extralibs d3d12va_extralibs mediacodec_extralibs nanosleep_extralibs pthreads_extralibs vaapi_drm_extralibs vaapi_x11_extralibs vaapi_win32_extralibs vdpau_x11_extralibs"
 
 # programs
 ffmpeg_deps="avcodec avfilter avformat threads"
@@ -7123,6 +7123,7 @@ if enabled uwp; then
     # try to load these APIs at runtime, like we do in regular desktop mode -
     # therefore, we need to link directly against these APIs.
     d3d11va_extralibs="-ldxgi -ld3d11"
+    d3d12va_extralibs="-ldxgi -ld3d12"
     vaapi_win32_extralibs="-ldxgi"
     mediafoundation_extralibs="-lmfplat $mediafoundation_extralibs"
 fi
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 1/2] configure: Remove a redundant check for UWP mode

[Wu, Tong1]

>Subject: [FFmpeg-devel] [PATCH 1/2] configure: Remove a redundant check for
>UWP mode
>
>The check for UWP mode was duplicated from right above, in
>d54127c41a81cf2078a3504f78e0e4232cfe11b7.
>
>Also, instead of several lines with "enabled uwp && ...", make one
>"if enabled uwp; then" block.
>---
> configure | 30 +++++++++++-------------------
> 1 file changed, 11 insertions(+), 19 deletions(-)
>
>diff --git a/configure b/configure
>index af0bebc1ac..69b755f274 100755
>--- a/configure
>+++ b/configure
>@@ -7102,9 +7102,8 @@ fi
>
> check_func_headers "windows.h" CreateDIBSection
>"$gdigrab_indev_extralibs"
>
>-# d3d11va requires linking directly to dxgi and d3d11 if not building for
>-# the desktop api partition
>-test_cpp <<EOF && enable uwp && d3d11va_extralibs="-ldxgi -ld3d11"
>+# check if building for desktop or uwp
>+test_cpp <<EOF && enable uwp
> #ifdef WINAPI_FAMILY
> #include <winapifamily.h>
> #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
>@@ -7117,23 +7116,16 @@ test_cpp <<EOF && enable uwp &&
>d3d11va_extralibs="-ldxgi -ld3d11"
> #endif
> EOF
>
>-# vaapi_win32 requires linking directly to dxgi if not building for
>-# the desktop api partition
>-test_cpp <<EOF && enable uwp && vaapi_win32_extralibs="-ldxgi"
>-#ifdef WINAPI_FAMILY
>-#include <winapifamily.h>
>-#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
>-#error desktop, not uwp
>-#else
>-// WINAPI_FAMILY_APP, WINAPI_FAMILY_PHONE_APP => UWP
>-#endif
>-#else
>-#error no family set
>-#endif
>-EOF
>+mediafoundation_extralibs="-lmfuuid -lole32 -lstrmiids"
>
>-# mediafoundation requires linking directly to mfplat if building for uwp target
>-enabled uwp && mediafoundation_extralibs="-lmfplat -lmfuuid -lole32 -
>lstrmiids" || mediafoundation_extralibs="-lmfuuid -lole32 -lstrmiids"
>+if enabled uwp; then
>+    # In UWP mode, we can't use LoadLibrary+GetProcAddress to conditionally
>+    # try to load these APIs at runtime, like we do in regular desktop mode -
>+    # therefore, we need to link directly against these APIs.
>+    d3d11va_extralibs="-ldxgi -ld3d11"
>+    vaapi_win32_extralibs="-ldxgi"
>+    mediafoundation_extralibs="-lmfplat $mediafoundation_extralibs"
>+fi
>
> enabled libdrm &&
>     check_pkg_config libdrm_getfb2 libdrm "xf86drmMode.h"
>drmModeGetFB2
>--
>2.34.1

LGTM, thx.

>
>_______________________________________________
>ffmpeg-devel mailing list
>ffmpeg-devel@ffmpeg.org
>https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
>To unsubscribe, visit link above, or email
>ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 1/2] configure: Remove a redundant check for UWP mode

[Martin Storsjö]

On Fri, 22 Dec 2023, Wu, Tong1 wrote:

>
>> Subject: [FFmpeg-devel] [PATCH 1/2] configure: Remove a redundant check for
>> UWP mode
>>
>> The check for UWP mode was duplicated from right above, in
>> d54127c41a81cf2078a3504f78e0e4232cfe11b7.
>>
>> Also, instead of several lines with "enabled uwp && ...", make one
>> "if enabled uwp; then" block.
>> ---
>> configure | 30 +++++++++++-------------------
>> 1 file changed, 11 insertions(+), 19 deletions(-)
>>
>> diff --git a/configure b/configure
>> index af0bebc1ac..69b755f274 100755
>> --- a/configure
>> +++ b/configure
>> @@ -7102,9 +7102,8 @@ fi
>>
>> check_func_headers "windows.h" CreateDIBSection
>> "$gdigrab_indev_extralibs"
>>
>> -# d3d11va requires linking directly to dxgi and d3d11 if not building for
>> -# the desktop api partition
>> -test_cpp <<EOF && enable uwp && d3d11va_extralibs="-ldxgi -ld3d11"
>> +# check if building for desktop or uwp
>> +test_cpp <<EOF && enable uwp
>> #ifdef WINAPI_FAMILY
>> #include <winapifamily.h>
>> #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
>> @@ -7117,23 +7116,16 @@ test_cpp <<EOF && enable uwp &&
>> d3d11va_extralibs="-ldxgi -ld3d11"
>> #endif
>> EOF
>>
>> -# vaapi_win32 requires linking directly to dxgi if not building for
>> -# the desktop api partition
>> -test_cpp <<EOF && enable uwp && vaapi_win32_extralibs="-ldxgi"
>> -#ifdef WINAPI_FAMILY
>> -#include <winapifamily.h>
>> -#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
>> -#error desktop, not uwp
>> -#else
>> -// WINAPI_FAMILY_APP, WINAPI_FAMILY_PHONE_APP => UWP
>> -#endif
>> -#else
>> -#error no family set
>> -#endif
>> -EOF
>> +mediafoundation_extralibs="-lmfuuid -lole32 -lstrmiids"
>>
>> -# mediafoundation requires linking directly to mfplat if building for uwp target
>> -enabled uwp && mediafoundation_extralibs="-lmfplat -lmfuuid -lole32 -
>> lstrmiids" || mediafoundation_extralibs="-lmfuuid -lole32 -lstrmiids"
>> +if enabled uwp; then
>> +    # In UWP mode, we can't use LoadLibrary+GetProcAddress to conditionally
>> +    # try to load these APIs at runtime, like we do in regular desktop mode -
>> +    # therefore, we need to link directly against these APIs.
>> +    d3d11va_extralibs="-ldxgi -ld3d11"
>> +    vaapi_win32_extralibs="-ldxgi"
>> +    mediafoundation_extralibs="-lmfplat $mediafoundation_extralibs"
>> +fi
>>
>> enabled libdrm &&
>>     check_pkg_config libdrm_getfb2 libdrm "xf86drmMode.h"
>> drmModeGetFB2
>> --
>> 2.34.1
>
> LGTM, thx.

Does that cover patch 2/2, which fixes linking errors in the UWP 
configurations, as well?

// Martin

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 1/2] configure: Remove a redundant check for UWP mode

[Wu, Tong1]

>From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of
>Martin Storsjö
>Sent: Friday, December 22, 2023 4:41 PM
>To: FFmpeg development discussions and patches <ffmpeg-
>devel@ffmpeg.org>
>Subject: Re: [FFmpeg-devel] [PATCH 1/2] configure: Remove a redundant check
>for UWP mode
>
>On Fri, 22 Dec 2023, Wu, Tong1 wrote:
>
>>
>>> Subject: [FFmpeg-devel] [PATCH 1/2] configure: Remove a redundant check
>for
>>> UWP mode
>>>
>>> The check for UWP mode was duplicated from right above, in
>>> d54127c41a81cf2078a3504f78e0e4232cfe11b7.
>>>
>>> Also, instead of several lines with "enabled uwp && ...", make one
>>> "if enabled uwp; then" block.
>>> ---
>>> configure | 30 +++++++++++-------------------
>>> 1 file changed, 11 insertions(+), 19 deletions(-)
>>>
>>> diff --git a/configure b/configure
>>> index af0bebc1ac..69b755f274 100755
>>> --- a/configure
>>> +++ b/configure
>>> @@ -7102,9 +7102,8 @@ fi
>>>
>>> check_func_headers "windows.h" CreateDIBSection
>>> "$gdigrab_indev_extralibs"
>>>
>>> -# d3d11va requires linking directly to dxgi and d3d11 if not building for
>>> -# the desktop api partition
>>> -test_cpp <<EOF && enable uwp && d3d11va_extralibs="-ldxgi -ld3d11"
>>> +# check if building for desktop or uwp
>>> +test_cpp <<EOF && enable uwp
>>> #ifdef WINAPI_FAMILY
>>> #include <winapifamily.h>
>>> #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
>>> @@ -7117,23 +7116,16 @@ test_cpp <<EOF && enable uwp &&
>>> d3d11va_extralibs="-ldxgi -ld3d11"
>>> #endif
>>> EOF
>>>
>>> -# vaapi_win32 requires linking directly to dxgi if not building for
>>> -# the desktop api partition
>>> -test_cpp <<EOF && enable uwp && vaapi_win32_extralibs="-ldxgi"
>>> -#ifdef WINAPI_FAMILY
>>> -#include <winapifamily.h>
>>> -#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
>>> -#error desktop, not uwp
>>> -#else
>>> -// WINAPI_FAMILY_APP, WINAPI_FAMILY_PHONE_APP => UWP
>>> -#endif
>>> -#else
>>> -#error no family set
>>> -#endif
>>> -EOF
>>> +mediafoundation_extralibs="-lmfuuid -lole32 -lstrmiids"
>>>
>>> -# mediafoundation requires linking directly to mfplat if building for uwp
>target
>>> -enabled uwp && mediafoundation_extralibs="-lmfplat -lmfuuid -lole32 -
>>> lstrmiids" || mediafoundation_extralibs="-lmfuuid -lole32 -lstrmiids"
>>> +if enabled uwp; then
>>> +    # In UWP mode, we can't use LoadLibrary+GetProcAddress to
>conditionally
>>> +    # try to load these APIs at runtime, like we do in regular desktop mode -
>>> +    # therefore, we need to link directly against these APIs.
>>> +    d3d11va_extralibs="-ldxgi -ld3d11"
>>> +    vaapi_win32_extralibs="-ldxgi"
>>> +    mediafoundation_extralibs="-lmfplat $mediafoundation_extralibs"
>>> +fi
>>>
>>> enabled libdrm &&
>>>     check_pkg_config libdrm_getfb2 libdrm "xf86drmMode.h"
>>> drmModeGetFB2
>>> --
>>> 2.34.1
>>
>> LGTM, thx.
>
>Does that cover patch 2/2, which fixes linking errors in the UWP
>configurations, as well?
>
>// Martin

From the code it looks good to me but I don't have the UWP test environment to try out.

>
>_______________________________________________
>ffmpeg-devel mailing list
>ffmpeg-devel@ffmpeg.org
>https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
>To unsubscribe, visit link above, or email
>ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 1/2] configure: Remove a redundant check for UWP mode

[Martin Storsjö]

On Fri, 22 Dec 2023, Wu, Tong1 wrote:

>> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of
>> Martin Storsjö
>> Sent: Friday, December 22, 2023 4:41 PM
>> To: FFmpeg development discussions and patches <ffmpeg-
>> devel@ffmpeg.org>
>> Subject: Re: [FFmpeg-devel] [PATCH 1/2] configure: Remove a redundant check
>> for UWP mode
>>
>> On Fri, 22 Dec 2023, Wu, Tong1 wrote:
>>
>>>
>>>> Subject: [FFmpeg-devel] [PATCH 1/2] configure: Remove a redundant check
>> for
>>>> UWP mode
>>>>
>>>> The check for UWP mode was duplicated from right above, in
>>>> d54127c41a81cf2078a3504f78e0e4232cfe11b7.
>>>>
>>>> Also, instead of several lines with "enabled uwp && ...", make one
>>>> "if enabled uwp; then" block.
>>>> ---
>>>> configure | 30 +++++++++++-------------------
>>>> 1 file changed, 11 insertions(+), 19 deletions(-)
>>>>
>>>> diff --git a/configure b/configure
>>>> index af0bebc1ac..69b755f274 100755
>>>> --- a/configure
>>>> +++ b/configure
>>>> @@ -7102,9 +7102,8 @@ fi
>>>>
>>>> check_func_headers "windows.h" CreateDIBSection
>>>> "$gdigrab_indev_extralibs"
>>>>
>>>> -# d3d11va requires linking directly to dxgi and d3d11 if not building for
>>>> -# the desktop api partition
>>>> -test_cpp <<EOF && enable uwp && d3d11va_extralibs="-ldxgi -ld3d11"
>>>> +# check if building for desktop or uwp
>>>> +test_cpp <<EOF && enable uwp
>>>> #ifdef WINAPI_FAMILY
>>>> #include <winapifamily.h>
>>>> #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
>>>> @@ -7117,23 +7116,16 @@ test_cpp <<EOF && enable uwp &&
>>>> d3d11va_extralibs="-ldxgi -ld3d11"
>>>> #endif
>>>> EOF
>>>>
>>>> -# vaapi_win32 requires linking directly to dxgi if not building for
>>>> -# the desktop api partition
>>>> -test_cpp <<EOF && enable uwp && vaapi_win32_extralibs="-ldxgi"
>>>> -#ifdef WINAPI_FAMILY
>>>> -#include <winapifamily.h>
>>>> -#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
>>>> -#error desktop, not uwp
>>>> -#else
>>>> -// WINAPI_FAMILY_APP, WINAPI_FAMILY_PHONE_APP => UWP
>>>> -#endif
>>>> -#else
>>>> -#error no family set
>>>> -#endif
>>>> -EOF
>>>> +mediafoundation_extralibs="-lmfuuid -lole32 -lstrmiids"
>>>>
>>>> -# mediafoundation requires linking directly to mfplat if building for uwp
>> target
>>>> -enabled uwp && mediafoundation_extralibs="-lmfplat -lmfuuid -lole32 -
>>>> lstrmiids" || mediafoundation_extralibs="-lmfuuid -lole32 -lstrmiids"
>>>> +if enabled uwp; then
>>>> +    # In UWP mode, we can't use LoadLibrary+GetProcAddress to
>> conditionally
>>>> +    # try to load these APIs at runtime, like we do in regular desktop mode -
>>>> +    # therefore, we need to link directly against these APIs.
>>>> +    d3d11va_extralibs="-ldxgi -ld3d11"
>>>> +    vaapi_win32_extralibs="-ldxgi"
>>>> +    mediafoundation_extralibs="-lmfplat $mediafoundation_extralibs"
>>>> +fi
>>>>
>>>> enabled libdrm &&
>>>>     check_pkg_config libdrm_getfb2 libdrm "xf86drmMode.h"
>>>> drmModeGetFB2
>>>> --
>>>> 2.34.1
>>>
>>> LGTM, thx.
>>
>> Does that cover patch 2/2, which fixes linking errors in the UWP
>> configurations, as well?
>>
>> // Martin
>
> From the code it looks good to me but I don't have the UWP test 
> environment to try out.

Well it fixes linking at least, so that's better than failing to link, so 
I'll go ahead and push it to unbreak those builds.

// Martin
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".