diff --git a/SMP/config.asm b/SMP/config.asm index b1f983928bdad3129001d80e740292cc4885d024..33c072ac47634fe223d97ab0400001560b1210da 100644 --- a/SMP/config.asm +++ b/SMP/config.asm @@ -1,5 +1,5 @@ -;****** Automatically generated by SMP project_generate - do not modify! */ -;****** +;******* Automatically generated configuration values +;* ;* Permission is hereby granted, free of charge, to any person obtaining a copy ;* of this software and associated documentation files (the "Software"), to deal ;* in the Software without restriction, including without limitation the rights @@ -1814,8 +1814,8 @@ %define CONFIG_VC1_VDPAU_HWACCEL 0 %define CONFIG_VC1_MMAL_HWACCEL 0 %define CONFIG_VC1_QSV_HWACCEL 1 -%define CONFIG_VP9_D3D11VA_HWACCEL 0 -%define CONFIG_VP9_DXVA2_HWACCEL 0 +%define CONFIG_VP9_D3D11VA_HWACCEL 1 +%define CONFIG_VP9_DXVA2_HWACCEL 1 %define CONFIG_WMV3_D3D11VA_HWACCEL 1 %define CONFIG_WMV3_DXVA2_HWACCEL 1 %define CONFIG_WMV3_VAAPI_HWACCEL 0 diff --git a/SMP/config.h b/SMP/config.h index 49e17ed4c28792b696a38c3ff82ebdfd2fd58383..648e7f9999a3ec72f070f2d2af3f0d63fa1be183 100644 --- a/SMP/config.h +++ b/SMP/config.h @@ -1,5 +1,5 @@ -/* Automatically generated by SMP project_generate - do not modify! */ -/* +/** Automatically generated configuration values + * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal * in the Software without restriction, including without limitation the rights @@ -1864,8 +1864,18 @@ #define CONFIG_VC1_VDPAU_HWACCEL 0 #define CONFIG_VC1_MMAL_HWACCEL 0 #define CONFIG_VC1_QSV_HWACCEL 1 -#define CONFIG_VP9_D3D11VA_HWACCEL 0 -#define CONFIG_VP9_DXVA2_HWACCEL 0 +#include +#if defined(NTDDI_WIN10_TH2) +# define CONFIG_VP9_D3D11VA_HWACCEL 1 +#else +# define CONFIG_VP9_D3D11VA_HWACCEL 0 +#endif +#include +#if defined(NTDDI_WIN10_TH2) +# define CONFIG_VP9_DXVA2_HWACCEL 1 +#else +# define CONFIG_VP9_DXVA2_HWACCEL 0 +#endif #define CONFIG_WMV3_D3D11VA_HWACCEL 1 #define CONFIG_WMV3_DXVA2_HWACCEL 1 #define CONFIG_WMV3_VAAPI_HWACCEL 0 diff --git a/SMP/libavcodec.vcxproj b/SMP/libavcodec.vcxproj index 32b560221104636562f64663278a7ac4a730a40b..55051271435d65bfe4763e85d5b9998530a7ecc4 100644 --- a/SMP/libavcodec.vcxproj +++ b/SMP/libavcodec.vcxproj @@ -288,8 +288,6 @@ $(IntDir)\libavcodec_rv34dsp.obj - - @@ -1036,6 +1034,9 @@ + + + diff --git a/SMP/libavcodec.vcxproj.filters b/SMP/libavcodec.vcxproj.filters index edc13552e07411570f328349bc4717f3cfe456d1..ac17a3ffc86e6d0ad16defdaca5fccd0242459f2 100644 --- a/SMP/libavcodec.vcxproj.filters +++ b/SMP/libavcodec.vcxproj.filters @@ -582,12 +582,6 @@ Source Files\libavcodec - - Source Files\libavcodec - - - Source Files\libavcodec - Source Files\libavcodec @@ -2658,6 +2652,15 @@ Source Files\libavcodec\x86 + + Source Files\libavcodec + + + Source Files\libavcodec + + + Source Files\libavcodec + diff --git a/SMP/libavcodec/dxva2_vp9_wrap.c b/SMP/libavcodec/dxva2_vp9_wrap.c new file mode 100644 index 0000000000000000000000000000000000000000..117b33838dee666708f489df689e59b4ca5cd8d0 --- /dev/null +++ b/SMP/libavcodec/dxva2_vp9_wrap.c @@ -0,0 +1,25 @@ +/** dxva2_vp9.c file wrapper for libavcodec + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "config.h" +#if CONFIG_VP9_D3D11VA_HWACCEL || CONFIG_VP9_DXVA2_HWACCEL +# include "../../libavcodec/dxva2_vp9.c" +#endif \ No newline at end of file diff --git a/SMP/libavcodec/log2_tab_wrap.c b/SMP/libavcodec/log2_tab_wrap.c new file mode 100644 index 0000000000000000000000000000000000000000..fffd7e4585a6156a28c806bf858140b3e129ece7 --- /dev/null +++ b/SMP/libavcodec/log2_tab_wrap.c @@ -0,0 +1,25 @@ +/** log2_tab.c file wrapper for libavcodec + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "config.h" +#if CONFIG_SHARED +# include "../../libavcodec/log2_tab.c" +#endif \ No newline at end of file diff --git a/SMP/libavcodec/reverse_wrap.c b/SMP/libavcodec/reverse_wrap.c new file mode 100644 index 0000000000000000000000000000000000000000..888425beee248e52de5862439959742478a784d9 --- /dev/null +++ b/SMP/libavcodec/reverse_wrap.c @@ -0,0 +1,25 @@ +/** reverse.c file wrapper for libavcodec + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "config.h" +#if CONFIG_SHARED +# include "../../libavcodec/reverse.c" +#endif \ No newline at end of file diff --git a/SMP/libavfilter.vcxproj b/SMP/libavfilter.vcxproj index adaa597cf841b8fd5518359c994a443cc82b84da..544434489cb60d7b6109e037b570252b18b01821 100644 --- a/SMP/libavfilter.vcxproj +++ b/SMP/libavfilter.vcxproj @@ -334,7 +334,6 @@ - $(IntDir)\libavfilter_x86_vf_eq.obj @@ -361,6 +360,7 @@ + diff --git a/SMP/libavfilter.vcxproj.filters b/SMP/libavfilter.vcxproj.filters index d45f1cfdd5fe548e517de502abaeeb4a830831d2..21ca767a3c1fed860a01c3d3f763aacf0693e74b 100644 --- a/SMP/libavfilter.vcxproj.filters +++ b/SMP/libavfilter.vcxproj.filters @@ -726,9 +726,6 @@ Source Files\libavfilter - - Source Files\libavfilter - Source Files\libavfilter\x86 @@ -789,6 +786,9 @@ Source Files\libavfilter\x86 + + Source Files\libavfilter + diff --git a/SMP/libavfilter/log2_tab_wrap.c b/SMP/libavfilter/log2_tab_wrap.c new file mode 100644 index 0000000000000000000000000000000000000000..cec1fc5fefb1191b37fb3cd75204295d86c348e5 --- /dev/null +++ b/SMP/libavfilter/log2_tab_wrap.c @@ -0,0 +1,25 @@ +/** log2_tab.c file wrapper for libavfilter + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "config.h" +#if CONFIG_SHARED +# include "../../libavfilter/log2_tab.c" +#endif \ No newline at end of file diff --git a/SMP/libavformat.vcxproj b/SMP/libavformat.vcxproj index ed7dbdd29ef54a255c6681b99a6a09f3a9c8933a..4f7b6b2e0bd55a2c5e8c81837b64537aced19d1a 100644 --- a/SMP/libavformat.vcxproj +++ b/SMP/libavformat.vcxproj @@ -117,8 +117,6 @@ - - @@ -490,6 +488,8 @@ + + diff --git a/SMP/libavformat.vcxproj.filters b/SMP/libavformat.vcxproj.filters index 2b93efc3d6b87090d6e26c3ce6af80c9fbf86556..efff06b9cb4739cce4bfea0f4a50fe4ca4deeeb7 100644 --- a/SMP/libavformat.vcxproj.filters +++ b/SMP/libavformat.vcxproj.filters @@ -172,12 +172,6 @@ Source Files\libavformat - - Source Files\libavformat - - - Source Files\libavformat - Source Files\libavformat @@ -1291,6 +1285,12 @@ Source Files\libavformat + + Source Files\libavformat + + + Source Files\libavformat + diff --git a/SMP/libavformat/golomb_tab_wrap.c b/SMP/libavformat/golomb_tab_wrap.c new file mode 100644 index 0000000000000000000000000000000000000000..2affb56c5c75097c57bf1692c44372b8e4bec2d1 --- /dev/null +++ b/SMP/libavformat/golomb_tab_wrap.c @@ -0,0 +1,25 @@ +/** golomb_tab.c file wrapper for libavformat + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "config.h" +#if CONFIG_SHARED +# include "../../libavformat/golomb_tab.c" +#endif \ No newline at end of file diff --git a/SMP/libavformat/log2_tab_wrap.c b/SMP/libavformat/log2_tab_wrap.c new file mode 100644 index 0000000000000000000000000000000000000000..df7296feab1c6e46eb84be6a137ca43552915876 --- /dev/null +++ b/SMP/libavformat/log2_tab_wrap.c @@ -0,0 +1,25 @@ +/** log2_tab.c file wrapper for libavformat + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "config.h" +#if CONFIG_SHARED +# include "../../libavformat/log2_tab.c" +#endif \ No newline at end of file diff --git a/SMP/libavutil/avconfig.h b/SMP/libavutil/avconfig.h index 1a5d8ac224df27737e4d0a3de7ab8c71872b5bc3..a8cb644da2713e395f85550a5394eeaefb047075 100644 --- a/SMP/libavutil/avconfig.h +++ b/SMP/libavutil/avconfig.h @@ -1,5 +1,5 @@ -/* Automatically generated by SMP project_generate - do not modify! */ -/* +/** Automatically generated configuration values + * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal * in the Software without restriction, including without limitation the rights diff --git a/SMP/libavutil/ffversion.h b/SMP/libavutil/ffversion.h index 966d0b7c9061d6dce5af2463916c46b44a49edfa..df747344a18782b092016019be5c2a2370530016 100644 --- a/SMP/libavutil/ffversion.h +++ b/SMP/libavutil/ffversion.h @@ -1,5 +1,5 @@ -/* Automatically generated by SMP project_generate - do not modify! */ -/* +/** Automatically generated configuration values + * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal * in the Software without restriction, including without limitation the rights diff --git a/SMP/libswresample.vcxproj b/SMP/libswresample.vcxproj index c05fcd8e4dba298c7291cdfcb1a2a7efdb2d6255..b6653f08ba450791b7db9da027462a523b27d7b2 100644 --- a/SMP/libswresample.vcxproj +++ b/SMP/libswresample.vcxproj @@ -87,10 +87,10 @@ - + diff --git a/SMP/libswresample.vcxproj.filters b/SMP/libswresample.vcxproj.filters index 3ade50b85be6d121eaf4df76003d703e13c79438..b0a33eb7861507ec8449dca56b3cde0ee5b57c63 100644 --- a/SMP/libswresample.vcxproj.filters +++ b/SMP/libswresample.vcxproj.filters @@ -69,9 +69,6 @@ Source Files\libswresample - - Source Files\libswresample - Source Files\libswresample\x86 @@ -81,6 +78,9 @@ Source Files\libswresample\x86 + + Source Files\libswresample + diff --git a/SMP/libswresample/log2_tab_wrap.c b/SMP/libswresample/log2_tab_wrap.c new file mode 100644 index 0000000000000000000000000000000000000000..bfe1b4fd1d3eb7ddc1947a86376181bf57806d3b --- /dev/null +++ b/SMP/libswresample/log2_tab_wrap.c @@ -0,0 +1,25 @@ +/** log2_tab.c file wrapper for libswresample + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "config.h" +#if CONFIG_SHARED +# include "../../libswresample/log2_tab.c" +#endif \ No newline at end of file diff --git a/SMP/libswscale.vcxproj b/SMP/libswscale.vcxproj index 5accd49f0b336c22a0d085efa2c35978c2c5d2b2..991ff9b51bd83d9d5439fbeba2877f045bad12a4 100644 --- a/SMP/libswscale.vcxproj +++ b/SMP/libswscale.vcxproj @@ -92,7 +92,6 @@ - $(IntDir)\libswscale_x86_rgb2rgb.obj @@ -103,6 +102,7 @@ $(IntDir)\libswscale_x86_yuv2rgb.obj + diff --git a/SMP/libswscale.vcxproj.filters b/SMP/libswscale.vcxproj.filters index f96b59fdaf04ee3e726ded197c5a92766955a3c0..a104cfa7bbbbab310ba76a7c5a0011e447894ebe 100644 --- a/SMP/libswscale.vcxproj.filters +++ b/SMP/libswscale.vcxproj.filters @@ -84,9 +84,6 @@ Source Files\libswscale - - Source Files\libswscale - Source Files\libswscale\x86 @@ -99,6 +96,9 @@ Source Files\libswscale\x86 + + Source Files\libswscale + diff --git a/SMP/libswscale/log2_tab_wrap.c b/SMP/libswscale/log2_tab_wrap.c new file mode 100644 index 0000000000000000000000000000000000000000..854d99ac4e5349dc6c8b2706674ca58907baeae3 --- /dev/null +++ b/SMP/libswscale/log2_tab_wrap.c @@ -0,0 +1,25 @@ +/** log2_tab.c file wrapper for libswscale + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "config.h" +#if CONFIG_SHARED +# include "../../libswscale/log2_tab.c" +#endif \ No newline at end of file