Backed out changeset dc9ee09114cf (bug 1557528) for Bof perma fails. …

…CLOSED TREE

media/libdav1d/asm/moz.build

@@ -73,7 +73,6 @@ if CONFIG['CPU_ARCH'] in ('x86', 'x86_64'):
 
     EXPORTS.dav1d += [
         '../../../third_party/dav1d/src/x86/cpu.h',
-        '../../../third_party/dav1d/src/x86/msac.h',
     ]
 
     # ASM source files
@@ -87,6 +86,7 @@ if CONFIG['CPU_ARCH'] in ('x86', 'x86_64'):
             '../../../third_party/dav1d/src/x86/loopfilter.asm',
             '../../../third_party/dav1d/src/x86/looprestoration.asm',
             '../../../third_party/dav1d/src/x86/mc.asm',
+            '../../../third_party/dav1d/src/x86/msac.asm',
         ]
 
     SOURCES += [
@@ -96,7 +96,6 @@ if CONFIG['CPU_ARCH'] in ('x86', 'x86_64'):
         '../../../third_party/dav1d/src/x86/itx_ssse3.asm',
         '../../../third_party/dav1d/src/x86/looprestoration_ssse3.asm',
         '../../../third_party/dav1d/src/x86/mc_ssse3.asm',
-        '../../../third_party/dav1d/src/x86/msac.asm',
     ]
 
     # BITDEPTH
@@ -143,7 +142,6 @@ elif CONFIG['CPU_ARCH'] == 'arm' or CONFIG['CPU_ARCH'] == 'aarch64':
     ]
     EXPORTS += [
         '../../../third_party/dav1d/src/arm/cpu.h',
-        '../../../third_party/dav1d/src/arm/msac.h',
     ]
 
     # BITDEPTH c file

media/libdav1d/dav1d.rc

@@ -1,7 +1,7 @@
-#define API_VERSION_NUMBER 2,0,0,0
-#define API_VERSION_NUMBER_STR "2.0.0"
-#define PROJECT_VERSION_NUMBER 0,3,1,0
-#define PROJECT_VERSION_NUMBER_STR "0.3.1"
+#define API_VERSION_NUMBER 1,1,0,0
+#define API_VERSION_NUMBER_STR "1.1.0"
+#define PROJECT_VERSION_NUMBER 0,3,0,0
+#define PROJECT_VERSION_NUMBER_STR "0.3.0"
 
 #include <windows.h>
 
@@ -22,7 +22,7 @@ BEGIN
       VALUE "FileDescription", "dav1d " PROJECT_VERSION_NUMBER_STR " - AV1 decoder"
       VALUE "InternalName", "dav1d"
       VALUE "OriginalFilename", "libdav1d.dll"
-      VALUE "LegalCopyright", "Copyright \251 @COPYRIGHT_YEARS@ VideoLAN and dav1d Authors"
+      VALUE "LegalCopyright", "Copyright \251 2019 VideoLAN and dav1d Authors"
     END
   END
   BLOCK "VarFileInfo"

media/libdav1d/moz.yaml

@@ -20,7 +20,7 @@ origin:
 
   # Human-readable identifier for this version/release
   # Generally "version NNN", "tag SSS", "bookmark SSS"
-  release: commit 3e3855bfb9935e4a3af714a6063c977320dc1acc (2019-06-05T15:12:17.000Z).
+  release: commit a713643eadcf50c9f7fd2ea22a598127c959a723 (2019-05-09T07:52:54.000Z).
 
   # The package's license, where possible using the mnemonic from
   # https://spdx.org/licenses/

media/libdav1d/vcs_version.h

@@ -1,2 +1,2 @@
 /* auto-generated, do not edit */
-#define DAV1D_VERSION "0.3.1-40-g3e3855b"
+#define DAV1D_VERSION "0.3.0-13-ga713643"

media/libdav1d/version.h

@@ -27,8 +27,8 @@
 #ifndef DAV1D_VERSION_H
 #define DAV1D_VERSION_H
 
-#define DAV1D_API_VERSION_MAJOR 2
-#define DAV1D_API_VERSION_MINOR 0
+#define DAV1D_API_VERSION_MAJOR 1
+#define DAV1D_API_VERSION_MINOR 1
 #define DAV1D_API_VERSION_PATCH 0
 
 #endif /* DAV1D_VERSION_H */

third_party/dav1d/.gitlab-ci.yml

@@ -384,25 +384,3 @@ test-win64:
         - ninja -C build
         - cd build && time meson test -v
     dependencies: []
-
-test-debian-aarch64:
-    image: registry.videolan.org:5000/dav1d-debian-unstable-aarch64:20181122182457
-    stage: test
-    tags:
-        - aarch64
-        - debian
-    cache:
-        key: testdata.git-20190215
-        paths:
-            - cache/dav1d-test-data.git/
-    script:
-        - test -d cache || mkdir cache
-        - test -d cache/dav1d-test-data.git && GIT_DIR=cache/dav1d-test-data.git git fetch --refmap=refs/heads/master:refs/heads/master origin master
-        - test -d cache/dav1d-test-data.git || git clone --bare https://code.videolan.org/videolan/dav1d-test-data.git cache/dav1d-test-data.git
-        - git clone cache/dav1d-test-data.git tests/dav1d-test-data
-        - meson build --buildtype release
-                      -Dtestdata_tests=true
-                      -Dlogging=false
-        - ninja -C build
-        - cd build && time meson test -v
-    dependencies: []

third_party/dav1d/NEWS

@@ -1,22 +1,3 @@
-Changes for 0.4.0 'Cheetah':
-----------------------------
-
- - Fix playback with unknown OBUs
- - Add an option to limit the maximum frame size
- - SSE2 and ARM64 optimizations for MSAC
- - Improve speed on 32bits systems
- - Optimization in obmc blend
-
-
-Changes for 0.3.1 'Sailfish':
-------------------------------
-
- - Fix a buffer overflow in frame-threading mode on SSSE3 CPUs
- - Reduce binary size, notably on Windows
- - SSSE3 optimizations for ipred_filter
- - ARM optimizations for MSAC
-
-
 Changes for 0.3.0 'Sailfish':
 ------------------------------
 

third_party/dav1d/README.md

@@ -1,5 +1,3 @@
-![dav1d logo](dav1d_logo.png)
-
 # dav1d
 
 **dav1d** is a new **AV1** cross-platform **d**ecoder, open-source, and focused on speed and correctness.

third_party/dav1d/THANKS.md

@@ -16,13 +16,4 @@ The Alliance for Open Media (AOM) for funding this project.
 
 And all the dav1d Authors (git shortlog -sn), including:
 
-Janne Grunau, Ronald S. Bultje, Martin Storsjö, Henrik Gramner, James Almer,
-Marvin Scholz, Luc Trudeau, Jean-Baptiste Kempf, Victorien Le Couviour--Tuffet,
-David Michael Barr, Hugo Beauzée-Luyssen, Steve Lhomme, Nathan E. Egge,
-Francois Cartegnie, Konstantin Pavlov, Liwei Wang, Xuefeng Jiang,
-Derek Buitenhuis, Raphaël Zumer, Niklas Haas, Michael Bradshaw, Kyle Siefring,
-Raphael Zumer, Boyuan Xiao, Thierry Foucu, Matthias Dressel, Thomas Daede,
-Rupert Swarbrick, Jan Beich, Dale Curtis, SmilingWolf, Tristan Laurent,
-Vittorio Giovara, Rostislav Pehlivanov, Shiz, skal, Steinar Midtskogen,
-Luca Barbato, Justin Bull, Jean-Yves Avenard, Timo Gurr, Fred Barbier,
-Anisse Astier, Pablo Stebler, Nicolas Frattaroli, Mark Shuttleworth.
+Janne Grunau, Ronald S. Bultje, Martin Storsjö, James Almer, Henrik Gramner, Marvin Scholz, Luc Trudeau, David Michael Barr, Jean-Baptiste Kempf, Hugo Beauzée-Luyssen, Steve Lhomme, Francois Cartegnie, Konstantin Pavlov, Nathan E. Egge, Victorien Le Couviour--Tuffet, Derek Buitenhuis, Liwei Wang, Raphaël Zumer, Michael Bradshaw, Niklas Haas, Xuefeng Jiang, Boyuan Xiao, Kyle Siefring, Matthias Dressel, Rupert Swarbrick, Thierry Foucu, Thomas Daede, Jan Beich, SmilingWolf, Tristan Laurent, Vittorio Giovara, Anisse Astier, Dale Curtis, Fred Barbier, Jean-Yves Avenard, Luca Barbato, Mark Shuttleworth, Nicolas Frattaroli, Rostislav Pehlivanov, Shiz, Steinar Midtskogen, Timo Gurr and skal.

third_party/dav1d/include/common/attributes.h

@@ -34,12 +34,10 @@
 
 #ifdef __GNUC__
 #define ATTR_ALIAS __attribute__((may_alias))
-#define ATTR_FORMAT_PRINTF(fmt, attr) __attribute__((__format__(__printf__, fmt, attr)))
-#define COLD __attribute__((cold))
+#define ATTR_FORMAT_PRINTF(fmt, attr) __attribute__((__format__(__printf__, fmt, attr)));
 #else
 #define ATTR_ALIAS
 #define ATTR_FORMAT_PRINTF(fmt, attr)
-#define COLD
 #endif
 
 #if ARCH_X86_64

third_party/dav1d/include/dav1d/dav1d.h

@@ -64,8 +64,6 @@ typedef struct Dav1dSettings {
     int apply_grain;
     int operating_point; ///< select an operating point for scalable AV1 bitstreams (0 - 31)
     int all_layers; ///< output all spatial layers of a scalable AV1 biststream
-    unsigned frame_size_limit; ///< maximum frame size, in pixels (0 = unlimited)
-    uint8_t reserved[32]; ///< reserved for future use
     Dav1dPicAllocator allocator;
     Dav1dLogger logger;
 } Dav1dSettings;

third_party/dav1d/meson.build

@@ -23,14 +23,14 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 project('dav1d', ['c'],
-    version: '0.3.1',
+    version: '0.3.0',
     default_options: ['c_std=c99',
                       'warning_level=2',
                       'buildtype=release',
                       'b_ndebug=if-release'],
     meson_version: '>= 0.47.0')
 
-dav1d_soname_version       = '2.0.0'
+dav1d_soname_version   = '1.1.0'
 dav1d_api_version_array    = dav1d_soname_version.split('.')
 dav1d_api_version_major    = dav1d_api_version_array[0]
 dav1d_api_version_minor    = dav1d_api_version_array[1]
@@ -81,8 +81,6 @@ cdata.set10('CONFIG_LOG', get_option('logging'))
 # Arguments in test_args will be used even on feature tests
 test_args = []
 
-optional_arguments = []
-
 # Define _POSIX_C_SOURCE to POSIX.1–2001 (IEEE Std 1003.1-2001)
 test_args  += '-D_POSIX_C_SOURCE=200112L'
 add_project_arguments('-D_POSIX_C_SOURCE=200112L', language: 'c')
@@ -98,12 +96,10 @@ if host_machine.system() == 'windows'
         cdata.set('fseeko', '_fseeki64')
         cdata.set('ftello', '_ftelli64')
     endif
+endif
 
-    if (host_machine.cpu_family() == 'x86_64' and cc.get_id() == 'gcc')
-        optional_arguments += '-mcmodel=small'
-    endif
-
-    # On Windows, we use a compatibility layer to emulate pthread
+# On Windows, we use a compatibility layer to emulate pthread
+if host_machine.system() == 'windows'
     thread_dependency = []
     thread_compat_dep = declare_dependency(sources : files('src/win32/thread.c'))
 else
@@ -180,23 +176,16 @@ endif
 # Compiler flags that should be set
 # But when the compiler does not supports them
 # it is not an error and silently tolerated
-if cc.get_id() != 'msvc'
-    optional_arguments += [
-      '-Wundef',
-      '-Werror=vla',
-      '-Wno-maybe-uninitialized',
-      '-Wno-missing-field-initializers',
-      '-Wno-unused-parameter',
-      '-Werror=missing-prototypes',
-      '-Wshorten-64-to-32',
-    ]
-    if host_machine.cpu_family() == 'x86'
-        optional_arguments += [
-          '-msse2',
-          '-mfpmath=sse',
-        ]
-    endif
-else
+optional_arguments = [
+  '-Wundef',
+  '-Werror=vla',
+  '-Wno-maybe-uninitialized',
+  '-Wno-missing-field-initializers',
+  '-Wno-unused-parameter',
+  '-Werror=missing-prototypes',
+  '-Wshorten-64-to-32',
+]
+if cc.get_id() == 'msvc'
     optional_arguments += [
       '-wd4028', # parameter different from declaration
       '-wd4996'  # use of POSIX functions
@@ -339,11 +328,6 @@ if is_asm_enabled and host_machine.cpu_family().startswith('x86')
     # check NASM version
     if nasm.found()
         nasm_r = run_command(nasm, '-v')
-
-        if nasm_r.returncode() != 0
-            error('failed running nasm to obtain its version')
-        endif
-
         out = nasm_r.stdout().strip().split()
         if out[1].to_lower() == 'version'
             if out[2].version_compare('<2.13.02')

third_party/dav1d/meson_options.txt

@@ -36,10 +36,6 @@ option('fuzzing_engine',
     value: 'none',
     description: 'Select the fuzzing engine')
 
-option('fuzzer_ldflags',
-    type: 'string',
-    description: 'Extra LDFLAGS used during linking of fuzzing binaries')
-
 option('stack_alignment',
     type: 'integer',
     value: 0)

third_party/dav1d/src/arm/32/mc.S

@@ -1112,7 +1112,7 @@ L(\type\()_8tap_v_tbl):
         vmovl_u8        q3,  d6,  q4,  d8,  q8,  d16, q9, d18
         mul_mla_8_2     q12, q13, q12, q13, q14, q15, q1,  q2,  q3,  q4,  q8,  q9
         shift_store_4   \type, \d_strd, q12, d24, d25, q13, d26, d27
-        bgt             48b
+        b               48b
 0:
         vpop            {q4}
         pop             {r4-r11,pc}
@@ -1145,7 +1145,7 @@ L(\type\()_8tap_v_tbl):
 0:
         pop             {r4-r11,pc}
 
-880:    // 8x6, 8x8, 8x16, 8x32 v
+880:    // 8x8, 8x16, 8x32 v
 1680:   // 16x8, 16x16, ...
 320:    // 32x8, 32x16, ...
 640:
@@ -1178,17 +1178,12 @@ L(\type\()_8tap_v_tbl):
         mul_mla_8_1     q3,  q4,  q3,  q4,  q8,  q9,  q10, q11, q12, q13, q14
         shift_store_8   \type, \d_strd, q3,  d6,  q4,  d8
         ble             9f
-        subs            \h,  \h,  #2
-        load_reg        \sr2, \src, \s_strd, d30, d2
-        vmovl_u8        q15, d30, q1,  d2
+        subs            \h,  \h,  #4
+        load_reg        \sr2, \src, \s_strd, d30, d2,  d4,  d6
+        vmovl_u8        q15, d30, q1,  d2,  q2,  d4,  q3,  d6
         mul_mla_8_1     q8,  q9,  q8,  q9,  q10, q11, q12, q13, q14, q15, q1
-        shift_store_8   \type, \d_strd, q8,  d16, q9,  d18
-        ble             9f
-        subs            \h,  \h,  #2
-        load_reg        \sr2, \src, \s_strd, d4,  d6
-        vmovl_u8        q2,  d4,  q3,  d6
         mul_mla_8_1     q10, q11, q10, q11, q12, q13, q14, q15, q1,  q2,  q3
-        shift_store_8   \type, \d_strd, q10, d20, q11, d22
+        shift_store_8   \type, \d_strd, q8,  d16, q9,  d18, q10, d20, q11, d22
         ble             9f
         subs            \h,  \h,  #4
         load_reg        \sr2, \src, \s_strd, d8,  d16, d18, d20

third_party/dav1d/src/arm/64/mc.S

@@ -1119,7 +1119,7 @@ L(\type\()_8tap_v):
         uxtl_b          v18, v19, v20, v21
         mul_mla_8_2     v1,  v2,  v24, v25, v26, v27, v16, v17, v18, v19, v20, v21
         shift_store_4   \type, \d_strd, v1, v2
-        b.gt            48b
+        b               48b
 0:
         ret
 
@@ -1151,7 +1151,7 @@ L(\type\()_8tap_v):
 0:
         ret
 
-880:    // 8x6, 8x8, 8x16, 8x32 v
+880:    // 8x8, 8x16, 8x32 v
 1680:   // 16x8, 16x16, ...
 320:    // 32x8, 32x16, ...
 640:
@@ -1183,17 +1183,12 @@ L(\type\()_8tap_v):
         mul_mla_8_1     v3,  v4,  v18, v19, v20, v21, v22, v23, v24, v25, v26
         shift_store_8   \type, \d_strd, v3, v4
         b.le            9f
-        subs            \h,  \h,  #2
-        load_8b         \sr2, \src, \s_strd, v27, v16
-        uxtl_b          v27, v16
+        subs            \h,  \h,  #4
+        load_8b         \sr2, \src, \s_strd, v27, v16, v17, v18
+        uxtl_b          v27, v16, v17, v18
         mul_mla_8_1     v1,  v2,  v20, v21, v22, v23, v24, v25, v26, v27, v16
-        shift_store_8   \type, \d_strd, v1, v2
-        b.le            9f
-        subs            \h,  \h,  #2
-        load_8b         \sr2, \src, \s_strd, v17, v18
-        uxtl_b          v17, v18
         mul_mla_8_1     v3,  v4,  v22, v23, v24, v25, v26, v27, v16, v17, v18
-        shift_store_8   \type, \d_strd, v3, v4
+        shift_store_8   \type, \d_strd, v1, v2, v3, v4
         b.le            9f
         subs            \h,  \h,  #4
         load_8b         \sr2, \src, \s_strd, v19, v20, v21, v22