dw/FFmpeg-Builds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update dependencies

Browse source
This commit is contained in:
BtbN 2021-08-22 23:54:38 +02:00
parent 94395ac891
commit 0960900c6b
29 changed files with 32 additions and 341 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

309
patches/mingw/0001-headers-add-AV1-support-to-dxva.h.patch
View file

@ -1,309 +0,0 @@
From 4ede80067d321e75ea082f8c7e66fb167052fde9 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Sat, 15 May 2021 15:26:42 +0200
Subject: [PATCH] headers: add AV1 support to dxva.h
Based on the DXVA AV1 specs
https://www.microsoft.com/en-us/download/details.aspx?id=101577
The structures and the associated define are available in Windows SDK
since at least 10.0.20231.0.
The GUIDs were present in previous SDKs as well.
---
mingw-w64-headers/include/dxva.h | 279 +++++++++++++++++++++++++++++++
1 file changed, 279 insertions(+)
diff --git a/mingw-w64-headers/include/dxva.h b/mingw-w64-headers/include/dxva.h
index 4f18f2e..0bd1990 100644
--- a/mingw-w64-headers/include/dxva.h
+++ b/mingw-w64-headers/include/dxva.h
@@ -563,6 +563,285 @@ typedef struct _DXVA_Status_VPx
USHORT wNumMbsAffected;
} DXVA_Status_VPx, *LPDXVA_Status_VPx;
+
+#define _DIRECTX_AV1_VA_
+
+/* AV1 decoder GUIDs */
+DEFINE_GUID(DXVA_ModeAV1_VLD_Profile0, 0xb8be4ccb, 0xcf53, 0x46ba, 0x8d, 0x59, 0xd6, 0xb8, 0xa6, 0xda, 0x5d, 0x2a);
+DEFINE_GUID(DXVA_ModeAV1_VLD_Profile1, 0x6936ff0f, 0x45b1, 0x4163, 0x9c, 0xc1, 0x64, 0x6e, 0xf6, 0x94, 0x61, 0x08);
+DEFINE_GUID(DXVA_ModeAV1_VLD_Profile2, 0x0c5f2aa1, 0xe541, 0x4089, 0xbb, 0x7b, 0x98, 0x11, 0x0a, 0x19, 0xd7, 0xc8);
+DEFINE_GUID(DXVA_ModeAV1_VLD_12bit_Profile2, 0x17127009, 0xa00f, 0x4ce1, 0x99, 0x4e, 0xbf, 0x40, 0x81, 0xf6, 0xf3, 0xf0);
+DEFINE_GUID(DXVA_ModeAV1_VLD_12bit_Profile2_420, 0x2d80bed6, 0x9cac, 0x4835, 0x9e, 0x91, 0x32, 0x7b, 0xbc, 0x4f, 0x9e, 0xe8);
+
+/* AV1 picture entry data structure */
+typedef struct _DXVA_PicEntry_AV1 {
+ UINT width;
+ UINT height;
+
+ // Global motion parameters
+ INT wmmat[6];
+ union {
+ struct {
+ UCHAR wminvalid : 1;
+ UCHAR wmtype : 2;
+ UCHAR Reserved : 5;
+ };
+ UCHAR GlobalMotionFlags;
+ };
+ UCHAR Index;
+ USHORT Reserved16Bits;
+} DXVA_PicEntry_AV1, *LPDXVA_PicEntry_AV1;
+
+/* AV1 picture parameters data structure */
+typedef struct _DXVA_PicParams_AV1 {
+ UINT width;
+ UINT height;
+
+ UINT max_width;
+ UINT max_height;
+
+ UCHAR CurrPicTextureIndex;
+ UCHAR superres_denom;
+ UCHAR bitdepth;
+ UCHAR seq_profile;
+
+ // Tiles:
+ struct {
+ UCHAR cols;
+ UCHAR rows;
+ USHORT context_update_id;
+ USHORT widths[64];
+ USHORT heights[64];
+ } tiles;
+
+ // Coding Tools
+ union {
+ struct {
+ UINT use_128x128_superblock : 1;
+ UINT intra_edge_filter : 1;
+ UINT interintra_compound : 1;
+ UINT masked_compound : 1;
+ UINT warped_motion : 1;
+ UINT dual_filter : 1;
+ UINT jnt_comp : 1;
+ UINT screen_content_tools : 1;
+ UINT integer_mv : 1;
+ UINT cdef : 1;
+ UINT restoration : 1;
+ UINT film_grain : 1;
+ UINT intrabc : 1;
+ UINT high_precision_mv : 1;
+ UINT switchable_motion_mode : 1;
+ UINT filter_intra : 1;
+ UINT disable_frame_end_update_cdf : 1;
+ UINT disable_cdf_update : 1;
+ UINT reference_mode : 1;
+ UINT skip_mode : 1;
+ UINT reduced_tx_set : 1;
+ UINT superres : 1;
+ UINT tx_mode : 2;
+ UINT use_ref_frame_mvs : 1;
+ UINT enable_ref_frame_mvs : 1;
+ UINT reference_frame_update : 1;
+ UINT Reserved : 5;
+ };
+ UINT32 CodingParamToolFlags;
+ } coding;
+
+ // Format & Picture Info flags
+ union {
+ struct {
+ UCHAR frame_type : 2;
+ UCHAR show_frame : 1;
+ UCHAR showable_frame : 1;
+ UCHAR subsampling_x : 1;
+ UCHAR subsampling_y : 1;
+ UCHAR mono_chrome : 1;
+ UCHAR Reserved : 1;
+ };
+ UCHAR FormatAndPictureInfoFlags;
+ } format;
+
+ // References
+ UCHAR primary_ref_frame;
+ UCHAR order_hint;
+ UCHAR order_hint_bits;
+
+ DXVA_PicEntry_AV1 frame_refs[7];
+ UCHAR RefFrameMapTextureIndex[8];
+
+ // Loop filter parameters
+ struct {
+ UCHAR filter_level[2];
+ UCHAR filter_level_u;
+ UCHAR filter_level_v;
+
+ UCHAR sharpness_level;
+ union {
+ struct {
+ UCHAR mode_ref_delta_enabled : 1;
+ UCHAR mode_ref_delta_update : 1;
+ UCHAR delta_lf_multi : 1;
+ UCHAR delta_lf_present : 1;
+ UCHAR Reserved : 4;
+ };
+ UCHAR ControlFlags;
+ } DUMMYUNIONNAME;
+ CHAR ref_deltas[8];
+ CHAR mode_deltas[2];
+ UCHAR delta_lf_res;
+ UCHAR frame_restoration_type[3];
+ USHORT log2_restoration_unit_size[3];
+ UINT16 Reserved16Bits;
+ } loop_filter;
+
+ // Quantization
+ struct {
+ union {
+ struct {
+ UCHAR delta_q_present : 1;
+ UCHAR delta_q_res : 2;
+ UCHAR Reserved : 5;
+ };
+ UCHAR ControlFlags;
+ } DUMMYUNIONNAME;
+
+ UCHAR base_qindex;
+ CHAR y_dc_delta_q;
+ CHAR u_dc_delta_q;
+ CHAR v_dc_delta_q;
+ CHAR u_ac_delta_q;
+ CHAR v_ac_delta_q;
+ // using_qmatrix:
+ UCHAR qm_y;
+ UCHAR qm_u;
+ UCHAR qm_v;
+ UINT16 Reserved16Bits;
+ } quantization;
+
+ // Cdef parameters
+ struct {
+ union {
+ struct {
+ UCHAR damping : 2;
+ UCHAR bits : 2;
+ UCHAR Reserved : 4;
+ };
+ UCHAR ControlFlags;
+ } DUMMYUNIONNAME;
+
+ union {
+ struct {
+ UCHAR primary : 6;
+ UCHAR secondary : 2;
+ };
+ UCHAR combined;
+ } y_strengths[8];
+
+ union {
+ struct {
+ UCHAR primary : 6;
+ UCHAR secondary : 2;
+ };
+ UCHAR combined;
+ } uv_strengths[8];
+
+ } cdef;
+
+ UCHAR interp_filter;
+
+ // Segmentation
+ struct {
+ union {
+ struct {
+ UCHAR enabled : 1;
+ UCHAR update_map : 1;
+ UCHAR update_data : 1;
+ UCHAR temporal_update : 1;
+ UCHAR Reserved : 4;
+ };
+ UCHAR ControlFlags;
+ } DUMMYUNIONNAME;
+ UCHAR Reserved24Bits[3];
+
+ union {
+ struct {
+ UCHAR alt_q : 1;
+ UCHAR alt_lf_y_v : 1;
+ UCHAR alt_lf_y_h : 1;
+ UCHAR alt_lf_u : 1;
+ UCHAR alt_lf_v : 1;
+ UCHAR ref_frame : 1;
+ UCHAR skip : 1;
+ UCHAR globalmv : 1;
+ };
+ UCHAR mask;
+ } feature_mask[8];
+
+ SHORT feature_data[8][8];
+
+ } segmentation;
+
+ struct {
+ union {
+ struct {
+ USHORT apply_grain : 1;
+ USHORT scaling_shift_minus8 : 2;
+ USHORT chroma_scaling_from_luma : 1;
+ USHORT ar_coeff_lag : 2;
+ USHORT ar_coeff_shift_minus6 : 2;
+ USHORT grain_scale_shift : 2;
+ USHORT overlap_flag : 1;
+ USHORT clip_to_restricted_range : 1;
+ USHORT matrix_coeff_is_identity : 1;
+ USHORT Reserved : 3;
+ };
+ USHORT ControlFlags;
+ } DUMMYUNIONNAME;
+
+ USHORT grain_seed;
+ UCHAR scaling_points_y[14][2];
+ UCHAR num_y_points;
+ UCHAR scaling_points_cb[10][2];
+ UCHAR num_cb_points;
+ UCHAR scaling_points_cr[10][2];
+ UCHAR num_cr_points;
+ UCHAR ar_coeffs_y[24];
+ UCHAR ar_coeffs_cb[25];
+ UCHAR ar_coeffs_cr[25];
+ UCHAR cb_mult;
+ UCHAR cb_luma_mult;
+ UCHAR cr_mult;
+ UCHAR cr_luma_mult;
+ UCHAR Reserved8Bits;
+ SHORT cb_offset;
+ SHORT cr_offset;
+ } film_grain;
+
+ UINT Reserved32Bits;
+ UINT StatusReportFeedbackNumber;
+} DXVA_PicParams_AV1, *LPDXVA_PicParams_AV1;
+
+/* AV1 tile data structure */
+typedef struct _DXVA_Tile_AV1 {
+ UINT DataOffset;
+ UINT DataSize;
+ USHORT row;
+ USHORT column;
+ USHORT Reserved16Bits;
+ UCHAR anchor_frame;
+ UCHAR Reserved8Bits;
+} DXVA_Tile_AV1, *LPDXVA_Tile_AV1;
+
+typedef struct _DXVA_Status_AV1 {
+ UINT StatusReportFeedbackNumber;
+ DXVA_PicEntry_AV1 CurrPic;
+ UCHAR bBufType;
+ UCHAR bStatus;
+ UCHAR bReserved8Bits;
+ USHORT wNumMbsAffected;
+} DXVA_Status_AV1, *LPDXVA_Status_AV1;
+
#include <poppack.h>
typedef enum _DXVA_VideoChromaSubsampling
--
2.25.1

10
scripts.d/10-mingw.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
MINGW_REPO="https://github.com/mirror/mingw-w64.git"
MINGW_COMMIT="7fb7c9f6e401e2bc4393e61a27a68ebccffa1195"
MINGW_COMMIT="6b62cf66832bd158c67662cd5566413baf35f20e"
ffbuild_enabled() {
[[ $TARGET == win* ]] || return -1
@ -25,10 +25,10 @@ ffbuild_dockerbuild() {
git-mini-clone "$MINGW_REPO" "$MINGW_COMMIT" mingw
cd mingw
for patch in /patches/*.patch; do
echo "Applying $patch"
git am < "$patch"
done
# for patch in /patches/*.patch; do
# echo "Applying $patch"
# git am < "$patch"
# done
cd mingw-w64-headers

2
scripts.d/20-libxml2.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
LIBXML2_REPO="https://gitlab.gnome.org/GNOME/libxml2.git"
LIBXML2_COMMIT="ec6e3efb06d7b15cf5a2328fabd3845acea4c815"
LIBXML2_COMMIT="dea91c97debeac7c1aaf9c19f79029809e23a353"
ffbuild_enabled() {
return 0

2
scripts.d/25-freetype.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
# https://sourceforge.net/projects/freetype/files/freetype2/
FREETYPE_SRC="https://sourceforge.net/projects/freetype/files/freetype2/2.10.4/freetype-2.10.4.tar.xz/download"
FREETYPE_SRC="https://sourceforge.net/projects/freetype/files/freetype2/2.11.0/freetype-2.11.0.tar.xz/download"
ffbuild_enabled() {
return 0

2
scripts.d/45-harfbuzz.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
HARFBUZZ_REPO="https://github.com/harfbuzz/harfbuzz.git"
HARFBUZZ_COMMIT="69310f14a6b79399041a1d9d70c246722b58829f"
HARFBUZZ_COMMIT="34e0b28faef0f4157a47cc3e2feb7360f82232fd"
ffbuild_enabled() {
return 0

2
scripts.d/45-vmaf.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
VMAF_REPO="https://github.com/Netflix/vmaf.git"
VMAF_COMMIT="0511e05320d67238cf514104566b9d3f969963b7"
VMAF_COMMIT="067c423209721d80183ef19934383028b7687915"
ffbuild_enabled() {
return 0

2
scripts.d/45-vulkan.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
LOADER_REPO="https://github.com/KhronosGroup/Vulkan-Loader.git"
LOADER_COMMIT="8daad81803f5ed9b36a172c299140dde7a8c4494"
LOADER_COMMIT="90fd66f60fa7de10c91030f8c88b2a5c7c377784"
ffbuild_enabled() {
# The various graphics systems(xcb, xlib, wayland, ...) need figured out first

2
scripts.d/45-x11/10-xcbproto.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
XCBPROTO_REPO="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
XCBPROTO_COMMIT="496e3ce329c3cc9b32af4054c30fa0f306deb007"
XCBPROTO_COMMIT="78d0652ac33b774c824eaeff82d504e4fe618176"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1

2
scripts.d/45-x11/40-libx11.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
LIBX11_REPO="https://gitlab.freedesktop.org/xorg/lib/libx11.git"
LIBX11_COMMIT="d01d23374107f6fc55511f02559cf75be7bdf448"
LIBX11_COMMIT="e92efc63acd7b377faa9e534f4bf52aaa86be2a9"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1

2
scripts.d/50-amf.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
AMF_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git"
AMF_COMMIT="6898a97d641f41fa77b66aac5f400bf4ddcc0685"
AMF_COMMIT="3ee61d73b5599dcadbf86621a9f9c2d7e9c05811"
ffbuild_enabled() {
return 0

2
scripts.d/50-aom.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
AOM_REPO="https://aomedia.googlesource.com/aom"
AOM_COMMIT="d7700191dc78cfe3675fcd6afb19fe5b72c0f310"
AOM_COMMIT="17cebe6bca7fd6d00beb4a6354f38980fc78c0e1"
ffbuild_enabled() {
return 0

2
scripts.d/50-dav1d.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
DAV1D_REPO="https://code.videolan.org/videolan/dav1d.git"
DAV1D_COMMIT="7e6fc8b040274157254218acf3e49fde2054bed3"
DAV1D_COMMIT="324778b2910dffc11ba9b0c24d1a31bdbc662d20"
ffbuild_enabled() {
return 0

2
scripts.d/50-fdk-aac.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
FDK_REPO="https://github.com/mstorsjo/fdk-aac.git"
FDK_COMMIT="801f67f671929311e0c9952c5f92d6e147c7b003"
FDK_COMMIT="7f328b93ee2aa8bb4e94613b6ed218e7525d8dc0"
ffbuild_enabled() {
[[ $VARIANT == nonfree* ]] || return -1

2
scripts.d/50-ffnvcodec.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
FFNVCODEC_REPO="https://github.com/FFmpeg/nv-codec-headers.git"
FFNVCODEC_COMMIT="9939a5b7f49420c408b7a40f26c500c7ccfb6757"
FFNVCODEC_COMMIT="b641a195edbe3ac9788e681e22c2e2fad8aacddb"
ffbuild_enabled() {
return 0

2
scripts.d/50-glslang.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
GLSLANG_REPO="https://github.com/KhronosGroup/glslang.git"
GLSLANG_COMMIT="4b7b86d568b40f4b076259dc2fc4cdd006340f34"
GLSLANG_COMMIT="a4599ef7561abed83d45bab4c7492daeceef92a5"
ffbuild_enabled() {
# Pointless without Vulkan

2
scripts.d/50-libass.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
ASS_REPO="https://github.com/libass/libass.git"
ASS_COMMIT="5733e1c28b92ebbf090bea8f25e252aa40e0b9c4"
ASS_COMMIT="a8456e673c473a081febb4c2da5ba90457574c6d"
ffbuild_enabled() {
return 0

2
scripts.d/50-libbluray.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
LIBBLURAY_REPO="https://code.videolan.org/videolan/libbluray.git"
LIBBLURAY_COMMIT="311f09286e94565e1acb2e98bb7afaa903d6be13"
LIBBLURAY_COMMIT="06d7ce99531eb643a6f165424373d1ab72178a51"
ffbuild_enabled() {
return 0

2
scripts.d/50-libvpx.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
LIBVPX_REPO="https://chromium.googlesource.com/webm/libvpx"
LIBVPX_COMMIT="69fc604636f740a57482f3898c2527d29663ee6d"
LIBVPX_COMMIT="15a75b45304248f746634b43763c496322bf8968"
ffbuild_enabled() {
return 0

2
scripts.d/50-libwebp.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
WEBP_REPO="https://chromium.googlesource.com/webm/libwebp"
WEBP_COMMIT="46d844e6cf0f5895e96be619d637e11b9077128d"
WEBP_COMMIT="29148919e06c3d84b4a73c857ff0a97bb3d37bd9"
ffbuild_enabled() {
return 0

2
scripts.d/50-mbedtls.sh
View file

@ -2,7 +2,7 @@
MBEDTLS_REPO="https://github.com/ARMmbed/mbedtls.git"
# HEAD of development_2.x
MBEDTLS_COMMIT="8de3633c658dbbdfe70b6f13149e975c2c6bf88f"
MBEDTLS_COMMIT="5c385aca19bc88d36d197cc94c799313ca793d07"
ffbuild_enabled() {
[[ $TARGET == win* ]] && return -1

2
scripts.d/50-openjpeg.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
OPENJPEG_REPO="https://github.com/uclouvain/openjpeg.git"
OPENJPEG_COMMIT="08ba6a1638242e7ddd884c6c9777a232c0ef82fd"
OPENJPEG_COMMIT="9bb0db7cfba9d5ca1417bde3b88c0bf0f7c711de"
ffbuild_enabled() {
return 0

2
scripts.d/50-rav1e.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
RAV1E_REPO="https://github.com/xiph/rav1e.git"
RAV1E_COMMIT="8c064f492985ab9f6c1a5be0fa3fc72e9b83d132"
RAV1E_COMMIT="45d6754f6389179fac085aedfa97af3b483aa896"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1

2
scripts.d/50-sdl.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash
SDL_SRC="https://libsdl.org/release/SDL2-2.0.14.tar.gz"
SDL_SRC="https://libsdl.org/release/SDL2-2.0.16.tar.gz"
ffbuild_enabled() {
return 0

2
scripts.d/50-srt.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
SRT_REPO="https://github.com/Haivision/srt.git"
SRT_COMMIT="3c1c490715a6a6025bdda85a8ef1acf64616d8e8"
SRT_COMMIT="74aff8287caf404cdcb7b33172412709a1a20821"
ffbuild_enabled() {
return 0

2
scripts.d/50-svtav1.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
SVTAV1_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
SVTAV1_COMMIT="2a5935299669dc633a5d0265bf63281b3bfc5180"
SVTAV1_COMMIT="09555148333e849ce5f04f891672a86304149e47"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1

2
scripts.d/50-uavs3d.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
UAVS3D_REPO="https://github.com/uavs3/uavs3d.git"
UAVS3D_COMMIT="73ab6f3d74bf15a6252ef486b04b2f2ca89cc17f"
UAVS3D_COMMIT="57d20183301d4197d1c938f62f8a5911e33465d7"
ffbuild_enabled() {
[[ $TARGET == win32 ]] && return -1

2
scripts.d/50-vaapi/40-libdrm.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
LIBDRM_REPO="https://gitlab.freedesktop.org/mesa/drm.git"
LIBDRM_COMMIT="9cef5dee3cd817728c83aeb3c2010c1954e4c402"
LIBDRM_COMMIT="1a4c0ec9aea13211997f982715fe5ffcf19dd067"
ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1

2
scripts.d/50-x265.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
X265_REPO="https://bitbucket.org/multicoreware/x265_git.git"
X265_COMMIT="82786fccce10379be439243b6a776dc2f5918cb4"
X265_COMMIT="0983cffc501e5279e7d9e9b2241b506cb332efcb"
ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1

2
scripts.d/50-zimg.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
ZIMG_REPO="https://github.com/sekrit-twc/zimg.git"
ZIMG_COMMIT="b8ff478eef0cc3789e3c9eb4924cb497fc37654f"
ZIMG_COMMIT="78e06999aaad201481f38bdb01a7271efb4e1b14"
ffbuild_enabled() {
return 0