Skip to content

Commit

Permalink
Revert "Roll src/third_party/dav1d/libdav1d/ 940eee483..115fe773f (26…
Browse files Browse the repository at this point in the history
… commits)"

This reverts commit eba0ee5.

Reason for revert: Test failures on Linux CFI related to Dav1d tests. More details at crbug.com/1040107

Original change's description:
> Roll src/third_party/dav1d/libdav1d/ 940eee483..115fe773f (26 commits)
> 
> https://chromium.googlesource.com/external/github.com/videolan/dav1d.git/+log/940eee483a85..115fe773fe0e
> 
> $ git log 940eee483..115fe773f --date=short --no-merges --format='%ad %ae %s'
> 2020-01-07 dalecurtis Fix missing include for limits.h
> 2020-01-05 martin arm64: msac: Avoid 32 bit intermediates in symbol_adapt
> 2020-01-02 martin arm64: itx: Use sqrdmulh in the preexisting identity transform functions
> 2020-01-01 martin arm64: itx: Specialcase transforms with identity in the first pass with downshift
> 2020-01-02 martin arm64: itx: Adjust .irp in the 4x16/16x4/8x16/16x8 functions
> 2019-12-31 rsbultje Don't interleave the skip mode index finding loops
> 2020-01-01 rsbultje Prevent shift by >= 32
> 2019-12-31 rsbultje Take lossless into account when assigning loopfilter strength
> 2019-12-31 rsbultje Deal with chroma coefficients that are exactly 0x100000
> 2019-12-31 gramner x86: Fix inverse (flip)adst 8x4 clipping
> 2019-12-31 gramner Fix C inverse ADST clipping
> 2019-12-28 rsbultje av1: use chroma txtp inference over default DCT_DCT if qidx=0
> 2019-12-28 rsbultje av1: skip super-resolution upscaling if width < 16
> 2019-12-28 rsbultje av1: do C inverse transforms in int32_t precision
> 2019-12-28 mjbshaw Allow skip mode
> 2019-12-28 mjbshaw Disable warping on scaled references
> 2019-12-23 rsbultje Check skip flag before setting tx context to TX_4X4 in lossless frames
> 2019-12-18 martin Don't assume dlsym exists on linux
> 2019-12-12 gramner Linux: Add a workaround for a glibc stack size issue
> 2019-12-14 gramner x86: Disable AVX-512 by default
> 2019-12-14 gramner Fix potential race condition in dav1d_get_cpu_flags()
> 2019-12-14 gramner x86: Remove unused cpu flags
> 2019-12-14 e.m.terhoeven Add support for Ice Lake AVX-512 cpu flags
> 2019-12-13 rzumer Correct the edge buffer documentation
> 2019-12-05 ltrudeau Move lvl variable in cdef_brow to outer loop
> 2019-11-03 rsbultje Simplify shifting in generate_grain_y/uv AVX2
> 
> Created with:
>   roll-dep src/third_party/dav1d/libdav1d
> 
> Change-Id: I19174ac159addacbe3b63016ce46a30425abd4f3
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1989729
> Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
> Reviewed-by: Thomas Guilbert <tguilbert@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#729186}

TBR=dalecurtis@chromium.org,tguilbert@chromium.org

Change-Id: I815a01f90db85775d1695de8c4feb3bdb059b4b0
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1992212
Reviewed-by: sebsg <sebsg@chromium.org>
Commit-Queue: sebsg <sebsg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#729470}
  • Loading branch information
sebsg authored and Commit Bot committed Jan 8, 2020
1 parent 8912a3f commit ef8aa5b
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 16 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -775,7 +775,7 @@ deps = {
Var('chromium_git') + '/angle/angle.git' + '@' + Var('angle_revision'),

'src/third_party/dav1d/libdav1d':
Var('chromium_git') + '/external/github.com/videolan/dav1d.git' + '@' + '115fe773fe0e266a0918fbb950e1acfa5ee2b0bd',
Var('chromium_git') + '/external/github.com/videolan/dav1d.git' + '@' + '940eee483a852ec54349ef36f19713bb2b895b57',

'src/third_party/dawn':
Var('dawn_git') + '/dawn.git' + '@' + Var('dawn_revision'),
Expand Down
2 changes: 0 additions & 2 deletions third_party/dav1d/config/linux-noasm/x64/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@

#define HAVE_CLOCK_GETTIME 1

#define HAVE_DLSYM 1

#define HAVE_POSIX_MEMALIGN 1

#define HAVE_UNISTD_H 1
Expand Down
2 changes: 0 additions & 2 deletions third_party/dav1d/config/linux/arm/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@

#define HAVE_CLOCK_GETTIME 1

#define HAVE_DLSYM 1

#define HAVE_GETAUXVAL 1

#define HAVE_POSIX_MEMALIGN 1
Expand Down
2 changes: 0 additions & 2 deletions third_party/dav1d/config/linux/arm64/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@

#define HAVE_CLOCK_GETTIME 1

#define HAVE_DLSYM 1

#define HAVE_GETAUXVAL 1

#define HAVE_POSIX_MEMALIGN 1
Expand Down
2 changes: 0 additions & 2 deletions third_party/dav1d/config/linux/x64/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@

#define HAVE_CLOCK_GETTIME 1

#define HAVE_DLSYM 1

#define HAVE_POSIX_MEMALIGN 1

#define HAVE_UNISTD_H 1
Expand Down
2 changes: 0 additions & 2 deletions third_party/dav1d/config/linux/x86/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@

#define HAVE_CLOCK_GETTIME 1

#define HAVE_DLSYM 1

#define HAVE_POSIX_MEMALIGN 1

#define HAVE_UNISTD_H 1
Expand Down
4 changes: 1 addition & 3 deletions third_party/dav1d/dav1d_generated.gni
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2020 The Chromium Authors. All rights reserved.
# Copyright 2019 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down Expand Up @@ -102,8 +102,6 @@ c_sources = [
"libdav1d/src/ipred.h",
"libdav1d/src/ipred_prepare.h",
"libdav1d/src/itx.h",
"libdav1d/src/itx_1d.c",
"libdav1d/src/itx_1d.h",
"libdav1d/src/levels.h",
"libdav1d/src/lf_apply.h",
"libdav1d/src/lf_mask.c",
Expand Down
8 changes: 6 additions & 2 deletions third_party/dav1d/generate_source.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
"libdav1d/src/thread_task.h",
]

# .c files which are included by other .c files and shouldn't be listed.
DAV1D_C_FILE_INCLUDES = ["libdav1d/src/itx_1d.c"]


def WriteArray(fd, var_name, array, filter_list=[], last_entry=False):
if len(array) == 0:
Expand Down Expand Up @@ -56,8 +59,9 @@ def WriteGn(fd):

# Generate list of sources which need to be compiled multiple times with the
# correct -DBIT_DEPTH=8|10 option specified each time.
WriteArray(fd, "c_sources", glob.glob("libdav1d/src/*.[c|h]"),
DAV1D_ENTRY_POINT_SOURCES + template_sources)
WriteArray(
fd, "c_sources", glob.glob("libdav1d/src/*.[c|h]"),
DAV1D_ENTRY_POINT_SOURCES + DAV1D_C_FILE_INCLUDES + template_sources)

WriteArray(
fd, "entry_point_sources", DAV1D_ENTRY_POINT_SOURCES, last_entry=True)
Expand Down

0 comments on commit ef8aa5b

Please sign in to comment.