x264: Upgrade to snapshot 7d0ff22 r2901

diff --git a/contrib/x264/A00-version-string.patch b/contrib/x264/A00-version-string.patch
index 2f7c9f96cf755eb7ae3d5297ec83a494f1667e66..9465c6bc94f66672e927ea2acd99095b94db1168 100644 (file)
--- a/contrib/x264/A00-version-string.patch
+++ b/contrib/x264/A00-version-string.patch
@@ -23,8 +23,8 @@ index 2b59b92..86b7198 100644
 +#undef  X264_POINTVER
 +#endif
 +#define X264_BUILD    155
-+#define X264_VERSION " r2893 b00bcaf"
-+#define X264_POINTVER "0.155.2893 b00bcaf"
++#define X264_VERSION " r2901 7d0ff22"
++#define X264_POINTVER "0.155.2901 7d0ff22"
  
  /* Application developers planning to link against a shared library version of
   * libx264 from a Microsoft Visual Studio or similar development environment

diff --git a/contrib/x264/A01-avx512-alignment.patch b/contrib/x264/A01-avx512-alignment.patch
deleted file mode 100644 (file)
index 8c744e4..0000000
--- a/contrib/x264/A01-avx512-alignment.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 9384a7389b251b59a079ccc3d1af9edd42e3d5e6 Mon Sep 17 00:00:00 2001
-From: Henrik Gramner <henrik@gramner.com>
-Date: Mon, 15 Jan 2018 21:42:59 +0100
-Subject: [PATCH] Correctly align buffers for AVX and AVX-512
-
-Fixes segfaults on Windows where the stack is only 16-byte aligned.
----
- common/common.h       | 8 ++++----
- encoder/analyse.c     | 4 ++--
- encoder/ratecontrol.c | 2 +-
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/common/common.h b/common/common.h
-index 27a56fbd..84d39ce3 100644
---- a/common/common.h
-+++ b/common/common.h
-@@ -569,16 +569,16 @@ struct x264_t
-             ALIGNED_64( pixel fdec_buf[54*FDEC_STRIDE] );
- 
-             /* i4x4 and i8x8 backup data, for skipping the encode stage when possible */
--            ALIGNED_16( pixel i4x4_fdec_buf[16*16] );
--            ALIGNED_16( pixel i8x8_fdec_buf[16*16] );
-+            ALIGNED_32( pixel i4x4_fdec_buf[16*16] );
-+            ALIGNED_32( pixel i8x8_fdec_buf[16*16] );
-             ALIGNED_64( dctcoef i8x8_dct_buf[3][64] );
-             ALIGNED_64( dctcoef i4x4_dct_buf[15][16] );
-             uint32_t i4x4_nnz_buf[4];
-             uint32_t i8x8_nnz_buf[4];
- 
-             /* Psy trellis DCT data */
--            ALIGNED_16( dctcoef fenc_dct8[4][64] );
--            ALIGNED_16( dctcoef fenc_dct4[16][16] );
-+            ALIGNED_64( dctcoef fenc_dct8[4][64] );
-+            ALIGNED_64( dctcoef fenc_dct4[16][16] );
- 
-             /* Psy RD SATD/SA8D scores cache */
-             ALIGNED_64( uint32_t fenc_satd_cache[32] );
-diff --git a/encoder/analyse.c b/encoder/analyse.c
-index ecd6dae1..3577e5bc 100644
---- a/encoder/analyse.c
-+++ b/encoder/analyse.c
-@@ -558,7 +558,7 @@ static ALWAYS_INLINE const int8_t *predict_4x4_mode_available( int force_intra,
- /* For trellis=2, we need to do this for both sizes of DCT, for trellis=1 we only need to use it on the chosen mode. */
- static void inline psy_trellis_init( x264_t *h, int do_both_dct )
- {
--    ALIGNED_16( static pixel zero[16*FDEC_STRIDE] ) = {0};
-+    ALIGNED_64( static pixel zero[16*FDEC_STRIDE] ) = {0};
- 
-     if( do_both_dct || h->mb.b_transform_8x8 )
-         h->dctf.sub16x16_dct8( h->mb.pic.fenc_dct8, h->mb.pic.p_fenc[0], zero );
-@@ -2011,7 +2011,7 @@ static void mb_analyse_inter_b16x16( x264_t *h, x264_mb_analysis_t *a )
-             }
-             else
-             {
--                ALIGNED_ARRAY_32( pixel, pixuv, [2],[16*FENC_STRIDE] );
-+                ALIGNED_ARRAY_64( pixel, pixuv, [2],[16*FENC_STRIDE] );
-                 int chromapix = h->luma2chroma_pixel[PIXEL_16x16];
-                 int v_shift = CHROMA_V_SHIFT;
- 
-diff --git a/encoder/ratecontrol.c b/encoder/ratecontrol.c
-index b09c2434..99803718 100644
---- a/encoder/ratecontrol.c
-+++ b/encoder/ratecontrol.c
-@@ -243,7 +243,7 @@ static ALWAYS_INLINE uint32_t ac_energy_plane( x264_t *h, int mb_x, int mb_y, x2
-     stride <<= b_field;
-     if( b_chroma )
-     {
--        ALIGNED_ARRAY_32( pixel, pix,[FENC_STRIDE*16] );
-+        ALIGNED_ARRAY_64( pixel, pix,[FENC_STRIDE*16] );
-         int chromapix = h->luma2chroma_pixel[PIXEL_16x16];
-         int shift = 7 - CHROMA_V_SHIFT;
- 
--- 
-2.11.0

diff --git a/contrib/x264/module.defs b/contrib/x264/module.defs
index b8a5d2d5a7855f70c97363a1b475aa2bf9f8311b..57e65fde6f37fe29befda6abc79b75fc85c1e5da 100644 (file)
--- a/contrib/x264/module.defs
+++ b/contrib/x264/module.defs
@@ -1,9 +1,9 @@
 $(eval $(call import.MODULE.defs,X264,x264,PTHREADW32))
 $(eval $(call import.CONTRIB.defs,X264))
 
-X264.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/x264-snapshot-20171225-2245.tar.bz2
-X264.FETCH.url    += https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20171225-2245.tar.bz2
-X264.FETCH.sha256  = ea39f32ccb3bd3aeaccd663c8d210117be5d9cfbe89e1a8b5f631e0f7ed74954
+X264.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/x264-snapshot-20180525-2245.tar.bz2
+X264.FETCH.url    += https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20180525-2245.tar.bz2
+X264.FETCH.sha256  = 656cb499bc6e6a120fbd1b0e5de086607023e3bfcf62a7178276cb2ec92b39c9
 
 X264.GCC.args.c_std =