From ebbe00bdfe17208ede04f0b5885f116ccc599cc1 Mon Sep 17 00:00:00 2001 From: Alistair Delva Date: Wed, 11 Nov 2026 16:21:04 -0800 Subject: [PATCH] Upgrade libwebrtc to M157 and update dependencies Upgrade @libwebrtc from M126 (branch-heads/6478) to M157 (branch-heads/8103, commit 95554e4a0c5c343fdc989387d9d0ce18e2a2294b) and upgrade its dependencies: - @libsrtp2: v2.8.1 (6ff02afa8d2dc3f2e8896af391d137c1c66ff6fa) - @dav1d: 1.5.4 - @libvpx: v1.17.0 (6df3ec34557879fff673706f4a1d9fbd0f3a6f0e) - @libyuv: 209763ad77fed3df2d57503d3ef40761e9473649 - @libwebm: libwebm-1.0.0.32 (f2a982d748b80586ae53b89a2e6ebbc305848b8c) - @sframe: 6a37f061f4eda0c6594c91ecf99b5ff498c8c124 - BCR modules: abseil-cpp 20260107.1, boringssl 0.20261020.0, bazel_skylib 1.9.2, gazelle 0.54.0 Update cuttlefish/host/frontend/webrtc for WebRTC M157 API changes (unified webrtc:: namespace, Environment-based video codec factory creation, RTP timestamp accessors, CreateAudioDeviceModule, EncodedImageCallback::OnFrameDropped, CreateVideoTrack parameter order, and non-deprecated CreatePeerConnectionFactory). Assisted-by: Jetski:Gemini --- base/cvd/.bazelrc | 1 + .../build_external.MODULE.bazel | 1 + .../build_external/dav1d/BUILD.dav1d.bazel | 2 +- .../build_external/dav1d/dav1d.MODULE.bazel | 23 +- .../libsrtp2/BUILD.libsrtp2.bazel | 25 +- .../libsrtp2/crypto/include/config.h | 4 +- .../libsrtp2/libsrtp2.MODULE.bazel | 3 +- .../build_external/libvpx/BUILD.libvpx.bazel | 4 + .../libvpx/PATCH.libvpx_config.patch | 3286 ++++++++++++++--- .../build_external/libvpx/libvpx.MODULE.bazel | 2 +- .../libwebm/libwebm.MODULE.bazel | 2 +- base/cvd/build_external/libwebrtc/BUILD.bazel | 26 + .../libwebrtc/BUILD.libwebrtc.bazel | 888 ++--- .../libwebrtc/PATCH.dav1d_include.patch | 9 - .../libwebrtc/PATCH.third_party_libyuv.patch | 414 ++- .../PATCH.vp9_frame_buffer_pool.patch | 12 + .../libwebrtc/libwebrtc.MODULE.bazel | 4 +- .../dav1d/libdav1d/include/dav1d/common.h | 1 + .../dav1d/libdav1d/include/dav1d/data.h | 1 + .../dav1d/libdav1d/include/dav1d/dav1d.h | 1 + .../dav1d/libdav1d/include/dav1d/headers.h | 1 + .../dav1d/libdav1d/include/dav1d/picture.h | 1 + .../libvpx/source/libvpx/vpx/vp8.h | 1 + .../libvpx/source/libvpx/vpx/vp8cx.h | 1 + .../libvpx/source/libvpx/vpx/vp8dx.h | 1 + .../libvpx/source/libvpx/vpx/vpx_codec.h | 1 + .../libvpx/source/libvpx/vpx/vpx_decoder.h | 1 + .../libvpx/source/libvpx/vpx/vpx_encoder.h | 1 + .../source/libvpx/vpx/vpx_ext_ratectrl.h | 1 + .../source/libvpx/vpx/vpx_frame_buffer.h | 1 + .../libvpx/source/libvpx/vpx/vpx_image.h | 1 + .../libvpx/source/libvpx/vpx/vpx_integer.h | 1 + .../libvpx/source/libvpx/vpx/vpx_tpl.h | 1 + .../opus/src/include/opus_defines.h | 1 + .../third_party/opus/src/include/opus_types.h | 1 + .../sframe/src/include/sframe/result.h | 1 + .../sframe/src/include/sframe/sframe.h | 1 + .../build_external/libyuv/BUILD.libyuv.bazel | 4 + .../build_external/libyuv/libyuv.MODULE.bazel | 2 +- base/cvd/build_external/sframe/BUILD.bazel | 17 + .../build_external/sframe/BUILD.sframe.bazel | 40 + .../build_external/sframe/include/namespace.h | 4 + .../build_external/sframe/sframe.MODULE.bazel | 8 + .../frontend/webrtc/libcommon/abgr_buffer.cpp | 4 +- .../frontend/webrtc/libcommon/abgr_buffer.h | 2 +- .../libcommon/av1_nvenc_encoder_provider.cpp | 1 + .../libcommon/builtin_decoder_provider.cpp | 4 +- .../libcommon/builtin_encoder_provider.cpp | 4 +- .../libcommon/composite_decoder_factory.cpp | 11 +- .../libcommon/composite_encoder_factory.cpp | 9 +- .../libcommon/connection_controller.cpp | 25 +- .../webrtc/libcommon/connection_controller.h | 31 +- .../webrtc/libcommon/decoder_provider.h | 2 + .../webrtc/libcommon/encoder_provider.h | 2 + .../webrtc/libcommon/nvenc_video_encoder.cpp | 4 +- .../libcommon/peer_connection_utils.cpp | 33 +- .../webrtc/libcommon/peer_connection_utils.h | 18 +- .../libcommon/vp8only_encoder_factory.cpp | 6 +- .../libcommon/vp8only_encoder_factory.h | 3 +- .../libdevice/audio_track_source_impl.cpp | 4 +- .../libdevice/audio_track_source_impl.h | 7 +- .../webrtc/libdevice/camera_streamer.h | 4 +- .../webrtc/libdevice/client_handler.cpp | 26 +- .../webrtc/libdevice/client_handler.h | 28 +- .../webrtc/libdevice/data_channels.cpp | 12 +- .../frontend/webrtc/libdevice/data_channels.h | 2 +- .../webrtc/libdevice/local_recorder.cpp | 19 +- .../webrtc/libdevice/recording_manager.cpp | 2 +- .../frontend/webrtc/libdevice/streamer.cpp | 56 +- .../libdevice/video_track_source_impl.cpp | 7 +- .../libdevice/video_track_source_impl.h | 15 +- .../cuttlefish/host/frontend/webrtc/main.cpp | 2 +- 72 files changed, 3727 insertions(+), 1417 deletions(-) delete mode 100644 base/cvd/build_external/libwebrtc/PATCH.dav1d_include.patch create mode 100644 base/cvd/build_external/libwebrtc/PATCH.vp9_frame_buffer_pool.patch create mode 100644 base/cvd/build_external/libwebrtc/third_party/dav1d/libdav1d/include/dav1d/common.h create mode 100644 base/cvd/build_external/libwebrtc/third_party/dav1d/libdav1d/include/dav1d/data.h create mode 100644 base/cvd/build_external/libwebrtc/third_party/dav1d/libdav1d/include/dav1d/dav1d.h create mode 100644 base/cvd/build_external/libwebrtc/third_party/dav1d/libdav1d/include/dav1d/headers.h create mode 100644 base/cvd/build_external/libwebrtc/third_party/dav1d/libdav1d/include/dav1d/picture.h create mode 100644 base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vp8.h create mode 100644 base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vp8cx.h create mode 100644 base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vp8dx.h create mode 100644 base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_codec.h create mode 100644 base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_decoder.h create mode 100644 base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_encoder.h create mode 100644 base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_ext_ratectrl.h create mode 100644 base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_frame_buffer.h create mode 100644 base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_image.h create mode 100644 base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_integer.h create mode 100644 base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_tpl.h create mode 100644 base/cvd/build_external/libwebrtc/third_party/opus/src/include/opus_defines.h create mode 100644 base/cvd/build_external/libwebrtc/third_party/opus/src/include/opus_types.h create mode 100644 base/cvd/build_external/libwebrtc/third_party/sframe/src/include/sframe/result.h create mode 100644 base/cvd/build_external/libwebrtc/third_party/sframe/src/include/sframe/sframe.h create mode 100644 base/cvd/build_external/sframe/BUILD.bazel create mode 100644 base/cvd/build_external/sframe/BUILD.sframe.bazel create mode 100644 base/cvd/build_external/sframe/include/namespace.h create mode 100644 base/cvd/build_external/sframe/sframe.MODULE.bazel diff --git a/base/cvd/.bazelrc b/base/cvd/.bazelrc index 47def446fb9..02c04065c5d 100644 --- a/base/cvd/.bazelrc +++ b/base/cvd/.bazelrc @@ -16,6 +16,7 @@ build --per_file_copt=cuttlefish/host/frontend/webrtc/libcommon/connection_contr build --per_file_copt=cuttlefish/host/frontend/webrtc/libcommon/utils\.cpp$@-Wno-thread-safety-reference-return build --per_file_copt=cuttlefish/host/frontend/webrtc/libcommon/utils\.h$@-Wno-thread-safety-reference-return build --per_file_copt=cuttlefish/host/frontend/webrtc/libdevice/data_channels\.cpp$@-Wno-thread-safety-reference-return +build --per_file_copt=cuttlefish/host/frontend/webrtc/.*\.(cpp|h)$@-Wno-nullability-completeness # files with warnings that come from generated files either directly or indirectly through their includes build --per_file_copt=.*/cuttlefish/host/commands/casimir_control_server/casimir_control\.grpc\.pb\.cc$@-Wno-deprecated-declarations build --per_file_copt=.*/cuttlefish/host/commands/casimir_control_server/casimir_control\.grpc\.pb\.h$@-Wno-deprecated-declarations diff --git a/base/cvd/build_external/build_external.MODULE.bazel b/base/cvd/build_external/build_external.MODULE.bazel index 0795d46ebd6..4fe7a1959d5 100644 --- a/base/cvd/build_external/build_external.MODULE.bazel +++ b/base/cvd/build_external/build_external.MODULE.bazel @@ -61,6 +61,7 @@ include("//build_external/rules_m4:rules_m4.MODULE.bazel") include("//build_external/rules_rust:rules_rust.MODULE.bazel") include("//build_external/sandboxed_api:sandboxed_api.MODULE.bazel") include("//build_external/selinux:selinux.MODULE.bazel") +include("//build_external/sframe:sframe.MODULE.bazel") include("//build_external/spirv_headers:spirv_headers.MODULE.bazel") include("//build_external/spirv_tools:spirv_tools.MODULE.bazel") include("//build_external/swiftshader:swiftshader.MODULE.bazel") diff --git a/base/cvd/build_external/dav1d/BUILD.dav1d.bazel b/base/cvd/build_external/dav1d/BUILD.dav1d.bazel index ebac5a5f50c..4660286c083 100644 --- a/base/cvd/build_external/dav1d/BUILD.dav1d.bazel +++ b/base/cvd/build_external/dav1d/BUILD.dav1d.bazel @@ -2,7 +2,7 @@ load("@rules_cc//cc:cc_library.bzl", "cc_library") package(default_visibility = ["//visibility:public"]) -# dav1d 1.5.3 AV1 decoder (BSD-2-Clause). Pure C, no ASM, 8-bit only. +# dav1d 1.5.4 AV1 decoder (BSD-2-Clause). Pure C, no ASM, 8-bit only. # # Internal headers (include/common/, include/compat/) are moved into # src/ by patch_cmds in dav1d.MODULE.bazel to avoid leaking -isystem diff --git a/base/cvd/build_external/dav1d/dav1d.MODULE.bazel b/base/cvd/build_external/dav1d/dav1d.MODULE.bazel index 8d73d927730..46b825cc2f4 100644 --- a/base/cvd/build_external/dav1d/dav1d.MODULE.bazel +++ b/base/cvd/build_external/dav1d/dav1d.MODULE.bazel @@ -6,6 +6,13 @@ http_archive = use_repo_rule( http_archive( name = "dav1d", build_file = "@//build_external/dav1d:BUILD.dav1d.bazel", + strip_prefix = "dav1d-1.5.4", + urls = [ + "https://mirrors.ocf.berkeley.edu/videolan-ftp/dav1d/1.5.4/dav1d-1.5.4.tar.xz", + "https://ftp.osuosl.org/pub/videolan/dav1d/1.5.4/dav1d-1.5.4.tar.xz", + "https://downloads.videolan.org/pub/videolan/dav1d/1.5.4/dav1d-1.5.4.tar.xz", + ], + sha256 = "686616b7c69eb88d44459391ab25cac13b6647a3b288835c5784e71c1514a5c5", patch_cmds = [ # Generate config.h with a dav1d-specific name to avoid # shadowing other libraries' config.h (e.g., libsrtp2) via @@ -39,7 +46,7 @@ ENDOFFILE""", """cat > dav1d_vcs_version.h << 'ENDOFFILE' #ifndef DAV1D_VCS_VERSION_H_ #define DAV1D_VCS_VERSION_H_ -#define DAV1D_VERSION "1.5.3" +#define DAV1D_VERSION "1.5.4" #endif ENDOFFILE""", # Generate version.h in the public headers directory @@ -60,17 +67,11 @@ ENDOFFILE""", # Patch #include "common/..." to #include "src/common/..." # in all source and header files under src/ (including the # just-moved src/common/ headers themselves). - "find src -name '*.c' -o -name '*.h' | xargs sed -i 's|#include \"common/|#include \"src/common/|g'", + "find src -name '*.c' -o -name '*.h' | xargs sed -i.bak 's|#include \"common/|#include \"src/common/|g'", # Rename config.h and vcs_version.h includes to the # dav1d-prefixed names to match the generated files above. - "find src -name '*.c' -o -name '*.h' | xargs sed -i 's|#include \"config.h\"|#include \"dav1d_config.h\"|g'", - "find src -name '*.c' -o -name '*.h' | xargs sed -i 's|#include \"vcs_version.h\"|#include \"dav1d_vcs_version.h\"|g'", - ], - sha256 = "732010aa5ef461fa93355ed2c6c5fedb48ddc4b74e697eaabe8907eaeb943011", - strip_prefix = "dav1d-1.5.3", - urls = [ - "https://mirrors.ocf.berkeley.edu/videolan-ftp/dav1d/1.5.3/dav1d-1.5.3.tar.xz", - "https://ftp.osuosl.org/pub/videolan/dav1d/1.5.3/dav1d-1.5.3.tar.xz", - "https://downloads.videolan.org/pub/videolan/dav1d/1.5.3/dav1d-1.5.3.tar.xz", + "find src -name '*.c' -o -name '*.h' | xargs sed -i.bak 's|#include \"config.h\"|#include \"dav1d_config.h\"|g'", + "find src -name '*.c' -o -name '*.h' | xargs sed -i.bak 's|#include \"vcs_version.h\"|#include \"dav1d_vcs_version.h\"|g'", + "find src -name '*.bak' -delete", ], ) diff --git a/base/cvd/build_external/libsrtp2/BUILD.libsrtp2.bazel b/base/cvd/build_external/libsrtp2/BUILD.libsrtp2.bazel index 5c05381c27f..418538050c6 100644 --- a/base/cvd/build_external/libsrtp2/BUILD.libsrtp2.bazel +++ b/base/cvd/build_external/libsrtp2/BUILD.libsrtp2.bazel @@ -9,27 +9,27 @@ package( cc_library( name = "libsrtp2", srcs = [ - "crypto/cipher/aes.c", - "crypto/cipher/aes_icm.c", + "crypto/cipher/aes_gcm_ossl.c", + "crypto/cipher/aes_icm_ossl.c", "crypto/cipher/cipher.c", + "crypto/cipher/cipher_test_cases.c", "crypto/cipher/null_cipher.c", "crypto/hash/auth.c", - "crypto/hash/hmac.c", + "crypto/hash/auth_test_cases.c", + "crypto/hash/hmac_ossl.c", "crypto/hash/null_auth.c", - "crypto/hash/sha1.c", "crypto/kernel/alloc.c", "crypto/kernel/crypto_kernel.c", "crypto/kernel/err.c", "crypto/kernel/key.c", "crypto/math/datatypes.c", - "crypto/math/stat.c", "crypto/replay/rdb.c", "crypto/replay/rdbx.c", - "crypto/replay/ut_sim.c", - "srtp/ekt.c", "srtp/srtp.c", ], hdrs = [ + "crypto/cipher/cipher_test_cases.h", + "crypto/hash/auth_test_cases.h", "crypto/include/aes.h", "crypto/include/aes_gcm.h", "crypto/include/aes_icm.h", @@ -43,23 +43,21 @@ cc_library( "crypto/include/crypto_types.h", "crypto/include/datatypes.h", "crypto/include/err.h", - "crypto/include/hmac.h", "crypto/include/integers.h", "crypto/include/key.h", "crypto/include/null_auth.h", "crypto/include/null_cipher.h", "crypto/include/rdb.h", "crypto/include/rdbx.h", - "crypto/include/sha1.h", - "crypto/include/stat.h", - "include/ekt.h", - "include/getopt_s.h", "include/srtp.h", "include/srtp_priv.h", - "include/ut_sim.h", + "include/stream_list_priv.h", ], defines = [ + "GCM", "HAVE_CONFIG_H", + "LIBSRTP_HAVE_CRYPTEX", + "OPENSSL", ], includes = [ "crypto/include", @@ -67,5 +65,6 @@ cc_library( ], deps = [ "@//build_external/libsrtp2:libsrtp2_config", + "@boringssl//:crypto", ], ) diff --git a/base/cvd/build_external/libsrtp2/crypto/include/config.h b/base/cvd/build_external/libsrtp2/crypto/include/config.h index 722c9059018..03735b43b54 100644 --- a/base/cvd/build_external/libsrtp2/crypto/include/config.h +++ b/base/cvd/build_external/libsrtp2/crypto/include/config.h @@ -152,7 +152,7 @@ #define PACKAGE_NAME "libsrtp2" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libsrtp2 2.4.0-pre" +#define PACKAGE_STRING "libsrtp2 2.8.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libsrtp2" @@ -161,7 +161,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.4.0-pre" +#define PACKAGE_VERSION "2.8.1" /* The size of `unsigned long', as computed by sizeof. */ #define SIZEOF_UNSIGNED_LONG 8 diff --git a/base/cvd/build_external/libsrtp2/libsrtp2.MODULE.bazel b/base/cvd/build_external/libsrtp2/libsrtp2.MODULE.bazel index 906b6a5143b..ae3acbbc4b3 100644 --- a/base/cvd/build_external/libsrtp2/libsrtp2.MODULE.bazel +++ b/base/cvd/build_external/libsrtp2/libsrtp2.MODULE.bazel @@ -3,7 +3,6 @@ git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "g git_repository( name = "libsrtp2", build_file = "@//build_external/libsrtp2:BUILD.libsrtp2.bazel", - # This is quite old, but it's what libwebrtc depends on - commit = "860492290f7d1f25e2bd45da6471bfd4cd4d7add", + commit = "6ff02afa8d2dc3f2e8896af391d137c1c66ff6fa", remote = "https://github.com/cisco/libsrtp", ) diff --git a/base/cvd/build_external/libvpx/BUILD.libvpx.bazel b/base/cvd/build_external/libvpx/BUILD.libvpx.bazel index 45fb5628098..de19a85ece0 100644 --- a/base/cvd/build_external/libvpx/BUILD.libvpx.bazel +++ b/base/cvd/build_external/libvpx/BUILD.libvpx.bazel @@ -163,6 +163,7 @@ libvpx_arm64_neon_dotprod_c_srcs = [ "vpx_dsp/arm/sad4d_neon_dotprod.c", "vpx_dsp/arm/sad_neon_dotprod.c", "vpx_dsp/arm/sse_neon_dotprod.c", + "vpx_dsp/arm/subpel_variance_neon_dotprod.c", "vpx_dsp/arm/variance_neon_dotprod.c", "vpx_dsp/arm/vpx_convolve8_neon_dotprod.c", ] @@ -292,6 +293,7 @@ libvpx_x86_64_avx2_c_srcs = [ "vpx_dsp/x86/avg_intrin_avx2.c", "vpx_dsp/x86/avg_pred_avx2.c", "vpx_dsp/x86/highbd_convolve_avx2.c", + "vpx_dsp/x86/highbd_intrapred_intrin_avx2.c", "vpx_dsp/x86/highbd_quantize_intrin_avx2.c", "vpx_dsp/x86/highbd_sad4d_avx2.c", "vpx_dsp/x86/highbd_sad_avx2.c", @@ -307,7 +309,9 @@ libvpx_x86_64_avx2_c_srcs = [ ] libvpx_x86_64_avx512_c_srcs = [ + "vpx_dsp/x86/highbd_intrapred_intrin_avx512.c", "vpx_dsp/x86/sad4d_avx512.c", + "vpx_dsp/x86/sad_avx512.c", ] libvpx_x86_64_c_srcs = libvpx_generic_c_srcs + [ diff --git a/base/cvd/build_external/libvpx/PATCH.libvpx_config.patch b/base/cvd/build_external/libvpx/PATCH.libvpx_config.patch index c35ace3addc..bfff1b20f3c 100644 --- a/base/cvd/build_external/libvpx/PATCH.libvpx_config.patch +++ b/base/cvd/build_external/libvpx/PATCH.libvpx_config.patch @@ -1,5 +1,1214 @@ +diff --git a/examples/decode_to_md5.c b/examples/decode_to_md5.c +index 51959f3..2c32c3b 100644 +--- a/examples/decode_to_md5.c ++++ b/examples/decode_to_md5.c +@@ -39,7 +39,7 @@ + #include "../md5_utils.h" + #include "../tools_common.h" + #include "../video_reader.h" +-#include "./vpx_config.h" ++#include "vpx_config.h" + + static void get_image_md5(const vpx_image_t *img, unsigned char digest[16]) { + int plane, y; +diff --git a/examples/decode_with_drops.c b/examples/decode_with_drops.c +index 03c79a4..b2b6024 100644 +--- a/examples/decode_with_drops.c ++++ b/examples/decode_with_drops.c +@@ -61,7 +61,7 @@ + + #include "../tools_common.h" + #include "../video_reader.h" +-#include "./vpx_config.h" ++#include "vpx_config.h" + + static const char *exec_name; + +diff --git a/examples/postproc.c b/examples/postproc.c +index b53c15e..7740921 100644 +--- a/examples/postproc.c ++++ b/examples/postproc.c +@@ -48,7 +48,7 @@ + + #include "../tools_common.h" + #include "../video_reader.h" +-#include "./vpx_config.h" ++#include "vpx_config.h" + + static const char *exec_name; + +diff --git a/examples/simple_decoder.c b/examples/simple_decoder.c +index d089e82..92c9e85 100644 +--- a/examples/simple_decoder.c ++++ b/examples/simple_decoder.c +@@ -83,7 +83,7 @@ + + #include "../tools_common.h" + #include "../video_reader.h" +-#include "./vpx_config.h" ++#include "vpx_config.h" + + static const char *exec_name; + +diff --git a/examples/svc_encodeframe.c b/examples/svc_encodeframe.c +index 54843f0..9eac1e9 100644 +--- a/examples/svc_encodeframe.c ++++ b/examples/svc_encodeframe.c +@@ -22,8 +22,8 @@ + #include + #define VPX_DISABLE_CTRL_TYPECHECKS 1 + #include "../tools_common.h" +-#include "./vpx_config.h" +-#include "./svc_context.h" ++#include "vpx_config.h" ++#include "svc_context.h" + #include "vpx/vp8cx.h" + #include "vpx/vpx_encoder.h" + #include "vpx_mem/vpx_mem.h" +diff --git a/examples/vp8_multi_resolution_encoder.c b/examples/vp8_multi_resolution_encoder.c +index 60161da..42db113 100644 +--- a/examples/vp8_multi_resolution_encoder.c ++++ b/examples/vp8_multi_resolution_encoder.c +@@ -20,7 +20,7 @@ + * in this test. + */ + +-#include "./vpx_config.h" ++#include "vpx_config.h" + + #include + #include +diff --git a/examples/vp9_spatial_svc_encoder.c b/examples/vp9_spatial_svc_encoder.c +index 16e6aba..29782e1 100644 +--- a/examples/vp9_spatial_svc_encoder.c ++++ b/examples/vp9_spatial_svc_encoder.c +@@ -29,12 +29,12 @@ + + #include "../vpx_ports/bitops.h" + #include "../vpx_ports/vpx_timer.h" +-#include "./svc_context.h" ++#include "svc_context.h" + #include "vpx/vp8cx.h" + #include "vpx/vpx_decoder.h" + #include "vpx/vpx_encoder.h" + #include "../vpxstats.h" +-#include "./y4minput.h" ++#include "y4minput.h" + + #define OUTPUT_FRAME_STATS 0 + #define OUTPUT_RC_STATS 1 +diff --git a/examples/vp9cx_set_ref.c b/examples/vp9cx_set_ref.c +index 6e12d66..bbd9720 100644 +--- a/examples/vp9cx_set_ref.c ++++ b/examples/vp9cx_set_ref.c +@@ -55,8 +55,8 @@ + #include "vpx/vpx_encoder.h" + #include "vp9/common/vp9_common.h" + +-#include "./tools_common.h" +-#include "./video_writer.h" ++#include "tools_common.h" ++#include "video_writer.h" + + static const char *exec_name; + +diff --git a/examples/vpx_temporal_svc_encoder.c b/examples/vpx_temporal_svc_encoder.c +index 3848b24..8735733 100644 +--- a/examples/vpx_temporal_svc_encoder.c ++++ b/examples/vpx_temporal_svc_encoder.c +@@ -18,8 +18,8 @@ + #include + #include + +-#include "./vpx_config.h" +-#include "./y4minput.h" ++#include "vpx_config.h" ++#include "y4minput.h" + #include "../vpx_ports/vpx_timer.h" + #include "vpx/vp8cx.h" + #include "vpx/vpx_encoder.h" +diff --git a/ivfdec.c b/ivfdec.c +index 3e179bc..1d108f0 100644 +--- a/ivfdec.c ++++ b/ivfdec.c +@@ -14,7 +14,7 @@ + + #include "vpx_ports/mem_ops.h" + +-#include "./ivfdec.h" ++#include "ivfdec.h" + + static const char *IVF_SIGNATURE = "DKIF"; + +diff --git a/ivfdec.h b/ivfdec.h +index 847cd79..275d02a 100644 +--- a/ivfdec.h ++++ b/ivfdec.h +@@ -10,7 +10,7 @@ + #ifndef VPX_IVFDEC_H_ + #define VPX_IVFDEC_H_ + +-#include "./tools_common.h" ++#include "tools_common.h" + + #ifdef __cplusplus + extern "C" { +diff --git a/ivfenc.c b/ivfenc.c +index 2e8e042..a9c2917 100644 +--- a/ivfenc.c ++++ b/ivfenc.c +@@ -8,7 +8,7 @@ + * be found in the AUTHORS file in the root of the source tree. + */ + +-#include "./ivfenc.h" ++#include "ivfenc.h" + + #include "vpx/vpx_encoder.h" + #include "vpx_ports/mem_ops.h" +diff --git a/ivfenc.h b/ivfenc.h +index 27b6910..97322b6 100644 +--- a/ivfenc.h ++++ b/ivfenc.h +@@ -10,7 +10,7 @@ + #ifndef VPX_IVFENC_H_ + #define VPX_IVFENC_H_ + +-#include "./tools_common.h" ++#include "tools_common.h" + + #include "vpx/vpx_encoder.h" + +diff --git a/rate_hist.c b/rate_hist.c +index 6a056ca..d59e9a0 100644 +--- a/rate_hist.c ++++ b/rate_hist.c +@@ -15,7 +15,7 @@ + #include + #include + +-#include "./rate_hist.h" ++#include "rate_hist.h" + + #define RATE_BINS 100 + #define HIST_BAR_MAX 40 +diff --git a/test/add_noise_test.cc b/test/add_noise_test.cc +index d26efbc..383ce95 100644 +--- a/test/add_noise_test.cc ++++ b/test/add_noise_test.cc +@@ -14,7 +14,7 @@ + #include "test/clear_system_state.h" + #include "test/register_state_check.h" + #include "test/util.h" +-#include "./vpx_dsp_rtcd.h" ++#include "vpx_dsp_rtcd.h" + #include "vpx/vpx_integer.h" + #include "vpx_config.h" + #include "vpx_dsp/postproc.h" +diff --git a/test/avg_test.cc b/test/avg_test.cc +index bbc8ba0..b2b21fc 100644 +--- a/test/avg_test.cc ++++ b/test/avg_test.cc +@@ -15,9 +15,9 @@ + + #include "gtest/gtest.h" + +-#include "./vp9_rtcd.h" +-#include "./vpx_config.h" +-#include "./vpx_dsp_rtcd.h" ++#include "vp9_rtcd.h" ++#include "vpx_config.h" ++#include "vpx_dsp_rtcd.h" + + #include "test/acm_random.h" + #include "test/clear_system_state.h" +diff --git a/test/blockiness_test.cc b/test/blockiness_test.cc +index 6e8301b..052a37c 100644 +--- a/test/blockiness_test.cc ++++ b/test/blockiness_test.cc +@@ -15,9 +15,9 @@ + + #include "gtest/gtest.h" + +-#include "./vpx_config.h" ++#include "vpx_config.h" + #if CONFIG_VP9_ENCODER +-#include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" + #endif + + #include "test/acm_random.h" +diff --git a/test/byte_alignment_test.cc b/test/byte_alignment_test.cc +index ba6fffc..86d968e 100644 +--- a/test/byte_alignment_test.cc ++++ b/test/byte_alignment_test.cc +@@ -10,7 +10,7 @@ + + #include + +-#include "./vpx_config.h" ++#include "vpx_config.h" + #include "test/codec_factory.h" + #include "test/decode_test_driver.h" + #include "test/md5_helper.h" +diff --git a/test/clear_system_state.h b/test/clear_system_state.h +index ba3c0b3..aa3e7ec 100644 +--- a/test/clear_system_state.h ++++ b/test/clear_system_state.h +@@ -10,7 +10,7 @@ + #ifndef VPX_TEST_CLEAR_SYSTEM_STATE_H_ + #define VPX_TEST_CLEAR_SYSTEM_STATE_H_ + +-#include "./vpx_config.h" ++#include "vpx_config.h" + #include "vpx_ports/system_state.h" + + namespace libvpx_test { +diff --git a/test/codec_factory.h b/test/codec_factory.h +index 179ccdf..4d77500 100644 +--- a/test/codec_factory.h ++++ b/test/codec_factory.h +@@ -12,7 +12,7 @@ + + #include + +-#include "./vpx_config.h" ++#include "vpx_config.h" + #include "vpx/vpx_decoder.h" + #include "vpx/vpx_encoder.h" + #if CONFIG_VP8_ENCODER || CONFIG_VP9_ENCODER +diff --git a/test/comp_avg_pred_test.cc b/test/comp_avg_pred_test.cc +index de9842a..19bbf0a 100644 +--- a/test/comp_avg_pred_test.cc ++++ b/test/comp_avg_pred_test.cc +@@ -10,7 +10,7 @@ + + #include "gtest/gtest.h" + +-#include "./vpx_dsp_rtcd.h" ++#include "vpx_dsp_rtcd.h" + + #include "test/acm_random.h" + #include "test/buffer.h" +diff --git a/test/consistency_test.cc b/test/consistency_test.cc +index 3e73bec..5ebf582 100644 +--- a/test/consistency_test.cc ++++ b/test/consistency_test.cc +@@ -15,9 +15,9 @@ + + #include "gtest/gtest.h" + +-#include "./vpx_config.h" ++#include "vpx_config.h" + #if CONFIG_VP9_ENCODER +-#include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" + #endif + + #include "test/acm_random.h" +diff --git a/test/convolve_test.cc b/test/convolve_test.cc +index 90bdcbc..63a3d93 100644 +--- a/test/convolve_test.cc ++++ b/test/convolve_test.cc +@@ -13,9 +13,9 @@ + + #include "gtest/gtest.h" + +-#include "./vp9_rtcd.h" +-#include "./vpx_config.h" +-#include "./vpx_dsp_rtcd.h" ++#include "vp9_rtcd.h" ++#include "vpx_config.h" ++#include "vpx_dsp_rtcd.h" + #include "test/acm_random.h" + #include "test/clear_system_state.h" + #include "test/register_state_check.h" +diff --git a/test/dct16x16_test.cc b/test/dct16x16_test.cc +index a3382ab..d8ab4cb 100644 +--- a/test/dct16x16_test.cc ++++ b/test/dct16x16_test.cc +@@ -15,8 +15,8 @@ + + #include "gtest/gtest.h" + +-#include "./vp9_rtcd.h" +-#include "./vpx_dsp_rtcd.h" ++#include "vp9_rtcd.h" ++#include "vpx_dsp_rtcd.h" + #include "test/acm_random.h" + #include "test/clear_system_state.h" + #include "test/register_state_check.h" +diff --git a/test/dct32x32_test.cc b/test/dct32x32_test.cc +index 7744748..68a7877 100644 +--- a/test/dct32x32_test.cc ++++ b/test/dct32x32_test.cc +@@ -15,9 +15,9 @@ + + #include "gtest/gtest.h" + +-#include "./vp9_rtcd.h" +-#include "./vpx_config.h" +-#include "./vpx_dsp_rtcd.h" ++#include "vp9_rtcd.h" ++#include "vpx_config.h" ++#include "vpx_dsp_rtcd.h" + #include "test/acm_random.h" + #include "test/bench.h" + #include "test/clear_system_state.h" +diff --git a/test/dct_partial_test.cc b/test/dct_partial_test.cc +index dc4921a..85dc947 100644 +--- a/test/dct_partial_test.cc ++++ b/test/dct_partial_test.cc +@@ -16,7 +16,7 @@ + + #include "gtest/gtest.h" + +-#include "./vpx_dsp_rtcd.h" ++#include "vpx_dsp_rtcd.h" + #include "test/acm_random.h" + #include "test/buffer.h" + #include "test/clear_system_state.h" +diff --git a/test/dct_test.cc b/test/dct_test.cc +index 7c58167..3383591 100644 +--- a/test/dct_test.cc ++++ b/test/dct_test.cc +@@ -15,8 +15,8 @@ + + #include "gtest/gtest.h" + +-#include "./vp9_rtcd.h" +-#include "./vpx_dsp_rtcd.h" ++#include "vp9_rtcd.h" ++#include "vpx_dsp_rtcd.h" + #include "test/acm_random.h" + #include "test/buffer.h" + #include "test/clear_system_state.h" +diff --git a/test/decode_api_test.cc b/test/decode_api_test.cc +index e33c463..a88a814 100644 +--- a/test/decode_api_test.cc ++++ b/test/decode_api_test.cc +@@ -13,7 +13,7 @@ + + #include "gtest/gtest.h" + +-#include "./vpx_config.h" ++#include "vpx_config.h" + #include "test/ivf_video_source.h" + #include "test/video_source.h" + #if CONFIG_VP8_ENCODER || CONFIG_VP9_ENCODER +diff --git a/test/decode_perf_test.cc b/test/decode_perf_test.cc +index 69c30a9..71ad355 100644 +--- a/test/decode_perf_test.cc ++++ b/test/decode_perf_test.cc +@@ -21,7 +21,7 @@ + #include "test/webm_video_source.h" + #include "vpx/vpx_codec.h" + #include "vpx_ports/vpx_timer.h" +-#include "./ivfenc.h" ++#include "ivfenc.h" + + using std::make_tuple; + +diff --git a/test/decode_test_driver.h b/test/decode_test_driver.h +index 81f5001..ff874d3 100644 +--- a/test/decode_test_driver.h ++++ b/test/decode_test_driver.h +@@ -12,7 +12,7 @@ + #define VPX_TEST_DECODE_TEST_DRIVER_H_ + #include + #include "gtest/gtest.h" +-#include "./vpx_config.h" ++#include "vpx_config.h" + #include "vpx/vpx_decoder.h" + + namespace libvpx_test { +diff --git a/test/encode_api_test.cc b/test/encode_api_test.cc +index 249db35..75c8fb1 100644 +--- a/test/encode_api_test.cc ++++ b/test/encode_api_test.cc +@@ -26,7 +26,7 @@ + #include "test/y4m_video_source.h" + #include "test/yuv_video_source.h" + +-#include "./vpx_config.h" ++#include "vpx_config.h" + #include "vpx/vp8cx.h" + #include "vpx/vpx_codec.h" + #include "vpx/vpx_encoder.h" +diff --git a/test/encode_test_driver.cc b/test/encode_test_driver.cc +index 770f410..89ff1ae 100644 +--- a/test/encode_test_driver.cc ++++ b/test/encode_test_driver.cc +@@ -13,7 +13,7 @@ + + #include "gtest/gtest.h" + +-#include "./vpx_config.h" ++#include "vpx_config.h" + #include "test/codec_factory.h" + #include "test/decode_test_driver.h" + #include "test/encode_test_driver.h" +diff --git a/test/encode_test_driver.h b/test/encode_test_driver.h +index c9a7c15..3edc6de 100644 +--- a/test/encode_test_driver.h ++++ b/test/encode_test_driver.h +@@ -15,7 +15,7 @@ + + #include "gtest/gtest.h" + +-#include "./vpx_config.h" ++#include "vpx_config.h" + #if CONFIG_VP8_ENCODER || CONFIG_VP9_ENCODER + #include "vpx/vp8cx.h" + #endif +diff --git a/test/external_frame_buffer_test.cc b/test/external_frame_buffer_test.cc +index 7b9a836..9445051 100644 +--- a/test/external_frame_buffer_test.cc ++++ b/test/external_frame_buffer_test.cc +@@ -11,7 +11,7 @@ + #include + #include + +-#include "./vpx_config.h" ++#include "vpx_config.h" + #include "test/codec_factory.h" + #include "test/decode_test_driver.h" + #include "test/ivf_video_source.h" +diff --git a/test/fdct8x8_test.cc b/test/fdct8x8_test.cc +index 4c2cbf4..187c9ae 100644 +--- a/test/fdct8x8_test.cc ++++ b/test/fdct8x8_test.cc +@@ -15,8 +15,8 @@ + + #include "gtest/gtest.h" + +-#include "./vp9_rtcd.h" +-#include "./vpx_dsp_rtcd.h" ++#include "vp9_rtcd.h" ++#include "vpx_dsp_rtcd.h" + #include "test/acm_random.h" + #include "test/clear_system_state.h" + #include "test/register_state_check.h" +diff --git a/test/hadamard_test.cc b/test/hadamard_test.cc +index 5b94da5..8064c3f 100644 +--- a/test/hadamard_test.cc ++++ b/test/hadamard_test.cc +@@ -12,7 +12,7 @@ + + #include "gtest/gtest.h" + +-#include "./vpx_dsp_rtcd.h" ++#include "vpx_dsp_rtcd.h" + #include "vpx_ports/vpx_timer.h" + + #include "test/acm_random.h" +diff --git a/test/idct8x8_test.cc b/test/idct8x8_test.cc +index 28ab257..d3a1b44 100644 +--- a/test/idct8x8_test.cc ++++ b/test/idct8x8_test.cc +@@ -14,7 +14,7 @@ + + #include "gtest/gtest.h" + +-#include "./vpx_dsp_rtcd.h" ++#include "vpx_dsp_rtcd.h" + #include "test/acm_random.h" + #include "vpx/vpx_integer.h" + +diff --git a/test/idct_test.cc b/test/idct_test.cc +index 4c7c4db..c8bac09 100644 +--- a/test/idct_test.cc ++++ b/test/idct_test.cc +@@ -8,8 +8,8 @@ + * be found in the AUTHORS file in the root of the source tree. + */ + +-#include "./vpx_config.h" +-#include "./vp8_rtcd.h" ++#include "vpx_config.h" ++#include "vp8_rtcd.h" + + #include "gtest/gtest.h" + +diff --git a/test/init_vpx_test.cc b/test/init_vpx_test.cc +index 4caf3a0..bdcf5d5 100644 +--- a/test/init_vpx_test.cc ++++ b/test/init_vpx_test.cc +@@ -10,7 +10,7 @@ + + #include "test/init_vpx_test.h" + +-#include "./vpx_config.h" ++#include "vpx_config.h" + + #if !CONFIG_SHARED + #include +diff --git a/test/invalid_file_test.cc b/test/invalid_file_test.cc +index 0b895ed..b443b95 100644 +--- a/test/invalid_file_test.cc ++++ b/test/invalid_file_test.cc +@@ -14,7 +14,7 @@ + #include + #include + #include "gtest/gtest.h" +-#include "./vpx_config.h" ++#include "vpx_config.h" + #include "test/codec_factory.h" + #include "test/decode_test_driver.h" + #include "test/ivf_video_source.h" +diff --git a/test/keyframe_test.cc b/test/keyframe_test.cc +index c49ea91..d31f9cc 100644 +--- a/test/keyframe_test.cc ++++ b/test/keyframe_test.cc +@@ -15,7 +15,7 @@ + #include "test/encode_test_driver.h" + #include "test/i420_video_source.h" + #include "test/util.h" +-#include "./vpx_config.h" ++#include "vpx_config.h" + #include "vpx/vp8cx.h" + #include "vpx/vpx_codec.h" + #include "vpx/vpx_encoder.h" +diff --git a/test/lpf_test.cc b/test/lpf_test.cc +index b1688f7..6f18c29 100644 +--- a/test/lpf_test.cc ++++ b/test/lpf_test.cc +@@ -15,8 +15,8 @@ + + #include "gtest/gtest.h" + +-#include "./vpx_config.h" +-#include "./vpx_dsp_rtcd.h" ++#include "vpx_config.h" ++#include "vpx_dsp_rtcd.h" + #include "test/acm_random.h" + #include "test/clear_system_state.h" + #include "test/register_state_check.h" +diff --git a/test/md5_helper.h b/test/md5_helper.h +index 9095d96..0cf5dac 100644 +--- a/test/md5_helper.h ++++ b/test/md5_helper.h +@@ -11,7 +11,7 @@ + #ifndef VPX_TEST_MD5_HELPER_H_ + #define VPX_TEST_MD5_HELPER_H_ + +-#include "./md5_utils.h" ++#include "md5_utils.h" + #include "vpx/vpx_decoder.h" + + namespace libvpx_test { +diff --git a/test/minmax_test.cc b/test/minmax_test.cc +index 8c758ab..b6c23a9 100644 +--- a/test/minmax_test.cc ++++ b/test/minmax_test.cc +@@ -14,7 +14,7 @@ + #include "gtest/gtest.h" + + #include "vpx_config.h" +-#include "./vpx_dsp_rtcd.h" ++#include "vpx_dsp_rtcd.h" + #include "vpx/vpx_integer.h" + #include "vpx_mem/vpx_mem.h" + +diff --git a/test/non_greedy_mv_test.cc b/test/non_greedy_mv_test.cc +index 6b5dcc6..82b4f78 100644 +--- a/test/non_greedy_mv_test.cc ++++ b/test/non_greedy_mv_test.cc +@@ -11,7 +11,7 @@ + #include + #include "gtest/gtest.h" + #include "vp9/encoder/vp9_non_greedy_mv.h" +-#include "./vpx_dsp_rtcd.h" ++#include "vpx_dsp_rtcd.h" + + namespace { + +diff --git a/test/partial_idct_test.cc b/test/partial_idct_test.cc +index da391b1..6a34c60 100644 +--- a/test/partial_idct_test.cc ++++ b/test/partial_idct_test.cc +@@ -16,8 +16,8 @@ + + #include "gtest/gtest.h" + +-#include "./vp9_rtcd.h" +-#include "./vpx_dsp_rtcd.h" ++#include "vp9_rtcd.h" ++#include "vpx_dsp_rtcd.h" + #include "test/acm_random.h" + #include "test/clear_system_state.h" + #include "test/register_state_check.h" +diff --git a/test/pp_filter_test.cc b/test/pp_filter_test.cc +index 5978da2..cca72a9 100644 +--- a/test/pp_filter_test.cc ++++ b/test/pp_filter_test.cc +@@ -12,8 +12,8 @@ + + #include + +-#include "./vpx_config.h" +-#include "./vpx_dsp_rtcd.h" ++#include "vpx_config.h" ++#include "vpx_dsp_rtcd.h" + #include "gtest/gtest.h" + #include "test/acm_random.h" + #include "test/bench.h" +diff --git a/test/predict_test.cc b/test/predict_test.cc +index 3be63a4..e6deba2 100644 +--- a/test/predict_test.cc ++++ b/test/predict_test.cc +@@ -15,8 +15,8 @@ + + #include "gtest/gtest.h" + +-#include "./vp8_rtcd.h" +-#include "./vpx_config.h" ++#include "vp8_rtcd.h" ++#include "vpx_config.h" + #include "test/acm_random.h" + #include "test/bench.h" + #include "test/clear_system_state.h" +diff --git a/test/quantize_test.cc b/test/quantize_test.cc +index 8185dd6..b032b79 100644 +--- a/test/quantize_test.cc ++++ b/test/quantize_test.cc +@@ -13,8 +13,8 @@ + + #include "gtest/gtest.h" + +-#include "./vp8_rtcd.h" +-#include "./vpx_config.h" ++#include "vp8_rtcd.h" ++#include "vpx_config.h" + #include "test/acm_random.h" + #include "test/bench.h" + #include "test/clear_system_state.h" +diff --git a/test/register_state_check.h b/test/register_state_check.h +index 96795f6..63fa964 100644 +--- a/test/register_state_check.h ++++ b/test/register_state_check.h +@@ -12,7 +12,7 @@ + #define VPX_TEST_REGISTER_STATE_CHECK_H_ + + #include "gtest/gtest.h" +-#include "./vpx_config.h" ++#include "vpx_config.h" + #include "vpx/vpx_integer.h" + + // ASM_REGISTER_STATE_CHECK(asm_function) +diff --git a/test/sad_test.cc b/test/sad_test.cc +index 2e2e10e..20f8370 100644 +--- a/test/sad_test.cc ++++ b/test/sad_test.cc +@@ -14,8 +14,8 @@ + + #include "gtest/gtest.h" + +-#include "./vpx_config.h" +-#include "./vpx_dsp_rtcd.h" ++#include "vpx_config.h" ++#include "vpx_dsp_rtcd.h" + #include "test/acm_random.h" + #include "test/bench.h" + #include "test/clear_system_state.h" +diff --git a/test/sum_squares_test.cc b/test/sum_squares_test.cc +index 50f0c53..30e4eb6 100644 +--- a/test/sum_squares_test.cc ++++ b/test/sum_squares_test.cc +@@ -16,8 +16,8 @@ + + #include "gtest/gtest.h" + +-#include "./vpx_config.h" +-#include "./vpx_dsp_rtcd.h" ++#include "vpx_config.h" ++#include "vpx_dsp_rtcd.h" + #include "test/acm_random.h" + #include "test/clear_system_state.h" + #include "test/register_state_check.h" +diff --git a/test/svc_datarate_test.cc b/test/svc_datarate_test.cc +index 7e0f952..2ea7741 100644 +--- a/test/svc_datarate_test.cc ++++ b/test/svc_datarate_test.cc +@@ -7,7 +7,7 @@ + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ +-#include "./vpx_config.h" ++#include "vpx_config.h" + #include "gtest/gtest.h" + #include "test/codec_factory.h" + #include "test/encode_test_driver.h" +diff --git a/test/svc_end_to_end_test.cc b/test/svc_end_to_end_test.cc +index 3bd6b13..eabb8e2 100644 +--- a/test/svc_end_to_end_test.cc ++++ b/test/svc_end_to_end_test.cc +@@ -7,7 +7,7 @@ + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ +-#include "./vpx_config.h" ++#include "vpx_config.h" + #include "gtest/gtest.h" + #include "test/codec_factory.h" + #include "test/encode_test_driver.h" +diff --git a/test/svc_test.h b/test/svc_test.h +index de39412..348b1d8 100644 +--- a/test/svc_test.h ++++ b/test/svc_test.h +@@ -11,7 +11,7 @@ + #ifndef VPX_TEST_SVC_TEST_H_ + #define VPX_TEST_SVC_TEST_H_ + +-#include "./vpx_config.h" ++#include "vpx_config.h" + #include "gtest/gtest.h" + #include "test/codec_factory.h" + #include "test/encode_test_driver.h" +diff --git a/test/test_intra_pred_speed.cc b/test/test_intra_pred_speed.cc +index 3b2db87..b6c4885 100644 +--- a/test/test_intra_pred_speed.cc ++++ b/test/test_intra_pred_speed.cc +@@ -14,8 +14,8 @@ + + #include "gtest/gtest.h" + +-#include "./vpx_config.h" +-#include "./vpx_dsp_rtcd.h" ++#include "vpx_config.h" ++#include "vpx_dsp_rtcd.h" + #include "test/acm_random.h" + #include "test/clear_system_state.h" + #include "test/init_vpx_test.h" +diff --git a/test/test_vector_test.cc b/test/test_vector_test.cc +index 259db92..8c036da 100644 +--- a/test/test_vector_test.cc ++++ b/test/test_vector_test.cc +@@ -17,7 +17,7 @@ + + #include "gtest/gtest.h" + #include "../tools_common.h" +-#include "./vpx_config.h" ++#include "vpx_config.h" + #include "test/codec_factory.h" + #include "test/decode_test_driver.h" + #include "test/ivf_video_source.h" +diff --git a/test/test_vectors.h b/test/test_vectors.h +index 0a4be0f..598f1f8 100644 +--- a/test/test_vectors.h ++++ b/test/test_vectors.h +@@ -11,7 +11,7 @@ + #ifndef VPX_TEST_TEST_VECTORS_H_ + #define VPX_TEST_TEST_VECTORS_H_ + +-#include "./vpx_config.h" ++#include "vpx_config.h" + + namespace libvpx_test { + +diff --git a/test/user_priv_test.cc b/test/user_priv_test.cc +index 0f45b08..5f9683b 100644 +--- a/test/user_priv_test.cc ++++ b/test/user_priv_test.cc +@@ -12,7 +12,7 @@ + #include + #include + #include "gtest/gtest.h" +-#include "./vpx_config.h" ++#include "vpx_config.h" + #include "test/acm_random.h" + #include "test/codec_factory.h" + #include "test/decode_test_driver.h" +diff --git a/test/variance_test.cc b/test/variance_test.cc +index 14b4262..d502fad 100644 +--- a/test/variance_test.cc ++++ b/test/variance_test.cc +@@ -13,8 +13,8 @@ + + #include "gtest/gtest.h" + +-#include "./vpx_config.h" +-#include "./vpx_dsp_rtcd.h" ++#include "vpx_config.h" ++#include "vpx_dsp_rtcd.h" + #include "test/acm_random.h" + #include "test/clear_system_state.h" + #include "test/register_state_check.h" +diff --git a/test/vp8_datarate_test.cc b/test/vp8_datarate_test.cc +index 63fc724..1f478ff 100644 +--- a/test/vp8_datarate_test.cc ++++ b/test/vp8_datarate_test.cc +@@ -7,7 +7,7 @@ + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ +-#include "./vpx_config.h" ++#include "vpx_config.h" + #include "gtest/gtest.h" + #include "test/codec_factory.h" + #include "test/encode_test_driver.h" +diff --git a/test/vp8_fdct4x4_test.cc b/test/vp8_fdct4x4_test.cc +index 1fdbd82..e03de66 100644 +--- a/test/vp8_fdct4x4_test.cc ++++ b/test/vp8_fdct4x4_test.cc +@@ -17,8 +17,8 @@ + + #include "gtest/gtest.h" + +-#include "./vpx_config.h" +-#include "./vp8_rtcd.h" ++#include "vpx_config.h" ++#include "vp8_rtcd.h" + #include "test/acm_random.h" + #include "vpx/vpx_integer.h" + #include "vpx_ports/mem.h" +diff --git a/test/vp8_ratectrl_rtc_test.cc b/test/vp8_ratectrl_rtc_test.cc +index 74a8cde..c6716d4 100644 +--- a/test/vp8_ratectrl_rtc_test.cc ++++ b/test/vp8_ratectrl_rtc_test.cc +@@ -11,7 +11,7 @@ + #include // NOLINT + #include + +-#include "./vpx_config.h" ++#include "vpx_config.h" + #include "gtest/gtest.h" + #include "test/codec_factory.h" + #include "test/encode_test_driver.h" +diff --git a/test/vp9_block_error_test.cc b/test/vp9_block_error_test.cc +index e46da37..e75affd 100644 +--- a/test/vp9_block_error_test.cc ++++ b/test/vp9_block_error_test.cc +@@ -15,8 +15,8 @@ + + #include "gtest/gtest.h" + +-#include "./vpx_config.h" +-#include "./vp9_rtcd.h" ++#include "vpx_config.h" ++#include "vp9_rtcd.h" + #include "test/acm_random.h" + #include "test/clear_system_state.h" + #include "test/register_state_check.h" +diff --git a/test/vp9_datarate_test.cc b/test/vp9_datarate_test.cc +index 2c90d75..5319712 100644 +--- a/test/vp9_datarate_test.cc ++++ b/test/vp9_datarate_test.cc +@@ -7,7 +7,7 @@ + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ +-#include "./vpx_config.h" ++#include "vpx_config.h" + #include "gtest/gtest.h" + #include "test/acm_random.h" + #include "test/codec_factory.h" +diff --git a/test/vp9_ext_ratectrl_test.cc b/test/vp9_ext_ratectrl_test.cc +index dcedf71..8573c27 100644 +--- a/test/vp9_ext_ratectrl_test.cc ++++ b/test/vp9_ext_ratectrl_test.cc +@@ -12,7 +12,7 @@ + #include + #include + +-#include "./vpx_config.h" ++#include "vpx_config.h" + + #include "gtest/gtest.h" + #include "test/codec_factory.h" +diff --git a/test/vp9_intrapred_test.cc b/test/vp9_intrapred_test.cc +index cf57da9..3f57e96 100644 +--- a/test/vp9_intrapred_test.cc ++++ b/test/vp9_intrapred_test.cc +@@ -12,8 +12,8 @@ + + #include "gtest/gtest.h" + +-#include "./vpx_config.h" +-#include "./vpx_dsp_rtcd.h" ++#include "vpx_config.h" ++#include "vpx_dsp_rtcd.h" + #include "test/acm_random.h" + #include "test/clear_system_state.h" + #include "test/register_state_check.h" +diff --git a/test/vp9_lossless_test.cc b/test/vp9_lossless_test.cc +index 48839a7..eb65681 100644 +--- a/test/vp9_lossless_test.cc ++++ b/test/vp9_lossless_test.cc +@@ -10,7 +10,7 @@ + + #include "gtest/gtest.h" + +-#include "./vpx_config.h" ++#include "vpx_config.h" + #include "test/codec_factory.h" + #include "test/encode_test_driver.h" + #include "test/i420_video_source.h" +diff --git a/test/vp9_quantize_test.cc b/test/vp9_quantize_test.cc +index 0c49598..e29128f 100644 +--- a/test/vp9_quantize_test.cc ++++ b/test/vp9_quantize_test.cc +@@ -16,9 +16,9 @@ + + #include "gtest/gtest.h" + +-#include "./vp9_rtcd.h" +-#include "./vpx_config.h" +-#include "./vpx_dsp_rtcd.h" ++#include "vp9_rtcd.h" ++#include "vpx_config.h" ++#include "vpx_dsp_rtcd.h" + #include "test/acm_random.h" + #include "test/bench.h" + #include "test/buffer.h" +diff --git a/test/vp9_ratectrl_rtc_test.cc b/test/vp9_ratectrl_rtc_test.cc +index aa15b3c..b7a5f79 100644 +--- a/test/vp9_ratectrl_rtc_test.cc ++++ b/test/vp9_ratectrl_rtc_test.cc +@@ -13,7 +13,7 @@ + #include // NOLINT + #include + +-#include "./vpx_config.h" ++#include "vpx_config.h" + #include "gtest/gtest.h" + #include "test/codec_factory.h" + #include "test/encode_test_driver.h" +diff --git a/test/vp9_scale_test.cc b/test/vp9_scale_test.cc +index 53b38d2..bb425a1 100644 +--- a/test/vp9_scale_test.cc ++++ b/test/vp9_scale_test.cc +@@ -14,9 +14,9 @@ + + #include "gtest/gtest.h" + +-#include "./vp9_rtcd.h" +-#include "./vpx_config.h" +-#include "./vpx_scale_rtcd.h" ++#include "vp9_rtcd.h" ++#include "vpx_config.h" ++#include "vpx_scale_rtcd.h" + #include "test/clear_system_state.h" + #include "test/register_state_check.h" + #include "test/vpx_scale_test.h" +diff --git a/test/vp9_subtract_test.cc b/test/vp9_subtract_test.cc +index cea7163..3796d6d 100644 +--- a/test/vp9_subtract_test.cc ++++ b/test/vp9_subtract_test.cc +@@ -12,9 +12,9 @@ + + #include "gtest/gtest.h" + +-#include "./vp9_rtcd.h" +-#include "./vpx_config.h" +-#include "./vpx_dsp_rtcd.h" ++#include "vp9_rtcd.h" ++#include "vpx_config.h" ++#include "vpx_dsp_rtcd.h" + #include "test/acm_random.h" + #include "test/bench.h" + #include "test/clear_system_state.h" +diff --git a/test/vp9_thread_test.cc b/test/vp9_thread_test.cc +index 387bb40..a3a541f 100644 +--- a/test/vp9_thread_test.cc ++++ b/test/vp9_thread_test.cc +@@ -11,7 +11,7 @@ + #include + + #include "gtest/gtest.h" +-#include "./vpx_config.h" ++#include "vpx_config.h" + #include "test/codec_factory.h" + #include "test/decode_test_driver.h" + #include "test/md5_helper.h" +diff --git a/test/vpx_scale_test.cc b/test/vpx_scale_test.cc +index a5307ac..8f6aa9b 100644 +--- a/test/vpx_scale_test.cc ++++ b/test/vpx_scale_test.cc +@@ -10,8 +10,8 @@ + + #include "gtest/gtest.h" + +-#include "./vpx_config.h" +-#include "./vpx_scale_rtcd.h" ++#include "vpx_config.h" ++#include "vpx_scale_rtcd.h" + #include "test/clear_system_state.h" + #include "test/register_state_check.h" + #include "test/vpx_scale_test.h" +diff --git a/test/vpx_scale_test.h b/test/vpx_scale_test.h +index 89d62fc..1a573d4 100644 +--- a/test/vpx_scale_test.h ++++ b/test/vpx_scale_test.h +@@ -13,8 +13,8 @@ + + #include "gtest/gtest.h" + +-#include "./vpx_config.h" +-#include "./vpx_scale_rtcd.h" ++#include "vpx_config.h" ++#include "vpx_scale_rtcd.h" + #include "test/acm_random.h" + #include "test/clear_system_state.h" + #include "test/register_state_check.h" +diff --git a/test/y4m_test.cc b/test/y4m_test.cc +index 3865880..85e2ed3 100644 +--- a/test/y4m_test.cc ++++ b/test/y4m_test.cc +@@ -12,8 +12,8 @@ + + #include "gtest/gtest.h" + +-#include "./vpx_config.h" +-#include "./y4menc.h" ++#include "vpx_config.h" ++#include "y4menc.h" + #include "test/md5_helper.h" + #include "test/util.h" + #include "test/y4m_video_source.h" +diff --git a/test/y4m_video_source.h b/test/y4m_video_source.h +index e43e37d..8f94212 100644 +--- a/test/y4m_video_source.h ++++ b/test/y4m_video_source.h +@@ -14,7 +14,7 @@ + #include + + #include "test/video_source.h" +-#include "./y4minput.h" ++#include "y4minput.h" + + namespace libvpx_test { + +diff --git a/test/yuv_temporal_filter_test.cc b/test/yuv_temporal_filter_test.cc +index e3a9ae9..8a47735 100644 +--- a/test/yuv_temporal_filter_test.cc ++++ b/test/yuv_temporal_filter_test.cc +@@ -10,7 +10,7 @@ + + #include "gtest/gtest.h" + +-#include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" + #include "test/acm_random.h" + #include "test/buffer.h" + #include "test/register_state_check.h" +diff --git a/tools/tiny_ssim.c b/tools/tiny_ssim.c +index c07a9d2..18f7bfd 100644 +--- a/tools/tiny_ssim.c ++++ b/tools/tiny_ssim.c +@@ -16,7 +16,7 @@ + #include + #include "vpx/vpx_codec.h" + #include "vpx/vpx_integer.h" +-#include "./y4minput.h" ++#include "y4minput.h" + #include "vpx_dsp/ssim.h" + #include "vpx_ports/mem.h" + +diff --git a/tools_common.c b/tools_common.c +index f1a8cbc..46df8a0 100644 +--- a/tools_common.c ++++ b/tools_common.c +@@ -14,7 +14,7 @@ + #include + #include + +-#include "./tools_common.h" ++#include "tools_common.h" + + #if CONFIG_VP8_ENCODER || CONFIG_VP9_ENCODER + #include "vpx/vp8cx.h" +diff --git a/tools_common.h b/tools_common.h +index 81453cc..0781bec 100644 +--- a/tools_common.h ++++ b/tools_common.h +@@ -12,13 +12,13 @@ + + #include + +-#include "./vpx_config.h" ++#include "vpx_config.h" + #include "vpx/vpx_codec.h" + #include "vpx/vpx_image.h" + #include "vpx/vpx_integer.h" + + #if CONFIG_ENCODERS +-#include "./y4minput.h" ++#include "y4minput.h" + #endif + + #if defined(_MSC_VER) +diff --git a/video_common.h b/video_common.h +index 77eb9fa..41985f5 100644 +--- a/video_common.h ++++ b/video_common.h +@@ -11,7 +11,7 @@ + #ifndef VPX_VIDEO_COMMON_H_ + #define VPX_VIDEO_COMMON_H_ + +-#include "./tools_common.h" ++#include "tools_common.h" + + typedef struct { + uint32_t codec_fourcc; +diff --git a/video_reader.c b/video_reader.c +index 217e8b9..43a9b23 100644 +--- a/video_reader.c ++++ b/video_reader.c +@@ -11,8 +11,8 @@ + #include + #include + +-#include "./ivfdec.h" +-#include "./video_reader.h" ++#include "ivfdec.h" ++#include "video_reader.h" + + #include "vpx_ports/mem_ops.h" + +diff --git a/video_reader.h b/video_reader.h +index 1f5c808..64ec683 100644 +--- a/video_reader.h ++++ b/video_reader.h +@@ -11,7 +11,7 @@ + #ifndef VPX_VIDEO_READER_H_ + #define VPX_VIDEO_READER_H_ + +-#include "./video_common.h" ++#include "video_common.h" + + // The following code is work in progress. It is going to support transparent + // reading of input files. Right now only IVF format is supported for +diff --git a/video_writer.c b/video_writer.c +index 83a5b49..2f3fbb1 100644 +--- a/video_writer.c ++++ b/video_writer.c +@@ -10,8 +10,8 @@ + + #include + +-#include "./ivfenc.h" +-#include "./video_writer.h" ++#include "ivfenc.h" ++#include "video_writer.h" + #include "vpx/vpx_encoder.h" + + struct VpxVideoWriterStruct { +diff --git a/video_writer.h b/video_writer.h +index b4d242b..2288b11 100644 +--- a/video_writer.h ++++ b/video_writer.h +@@ -11,7 +11,7 @@ + #ifndef VPX_VIDEO_WRITER_H_ + #define VPX_VIDEO_WRITER_H_ + +-#include "./video_common.h" ++#include "video_common.h" + + typedef enum { kContainerIVF } VpxContainer; + diff --git a/vp8/common/arm/loopfilter_arm.c b/vp8/common/arm/loopfilter_arm.c -index 48a197204..a638caf8d 100644 +index 48a1972..a638caf 100644 --- a/vp8/common/arm/loopfilter_arm.c +++ b/vp8/common/arm/loopfilter_arm.c @@ -8,8 +8,8 @@ @@ -14,7 +1223,7 @@ index 48a197204..a638caf8d 100644 #include "vp8/common/loopfilter.h" #include "vp8/common/onyxc_int.h" diff --git a/vp8/common/arm/neon/bilinearpredict_neon.c b/vp8/common/arm/neon/bilinearpredict_neon.c -index 590956dde..900387f43 100644 +index 590956d..900387f 100644 --- a/vp8/common/arm/neon/bilinearpredict_neon.c +++ b/vp8/common/arm/neon/bilinearpredict_neon.c @@ -11,8 +11,8 @@ @@ -29,7 +1238,7 @@ index 590956dde..900387f43 100644 static const uint8_t bifilter4_coeff[8][2] = { { 128, 0 }, { 112, 16 }, diff --git a/vp8/common/arm/neon/copymem_neon.c b/vp8/common/arm/neon/copymem_neon.c -index c89b47d62..6dfd1576e 100644 +index c89b47d..6dfd157 100644 --- a/vp8/common/arm/neon/copymem_neon.c +++ b/vp8/common/arm/neon/copymem_neon.c @@ -10,7 +10,7 @@ @@ -42,7 +1251,7 @@ index c89b47d62..6dfd1576e 100644 void vp8_copy_mem8x4_neon(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride) { diff --git a/vp8/common/arm/neon/dc_only_idct_add_neon.c b/vp8/common/arm/neon/dc_only_idct_add_neon.c -index d12c3a839..f829278c1 100644 +index d12c3a8..f829278 100644 --- a/vp8/common/arm/neon/dc_only_idct_add_neon.c +++ b/vp8/common/arm/neon/dc_only_idct_add_neon.c @@ -10,7 +10,7 @@ @@ -55,7 +1264,7 @@ index d12c3a839..f829278c1 100644 void vp8_dc_only_idct_add_neon(int16_t input_dc, unsigned char *pred_ptr, int pred_stride, unsigned char *dst_ptr, diff --git a/vp8/common/arm/neon/dequant_idct_neon.c b/vp8/common/arm/neon/dequant_idct_neon.c -index 5445f2965..2f93cc8d3 100644 +index 5445f29..2f93cc8 100644 --- a/vp8/common/arm/neon/dequant_idct_neon.c +++ b/vp8/common/arm/neon/dequant_idct_neon.c @@ -10,7 +10,7 @@ @@ -68,7 +1277,7 @@ index 5445f2965..2f93cc8d3 100644 static const int16_t cospi8sqrt2minus1 = 20091; // 35468 exceeds INT16_MAX and gets converted to a negative number. Because of diff --git a/vp8/common/arm/neon/dequantizeb_neon.c b/vp8/common/arm/neon/dequantizeb_neon.c -index 791aaea2a..9399817b0 100644 +index 791aaea..9399817 100644 --- a/vp8/common/arm/neon/dequantizeb_neon.c +++ b/vp8/common/arm/neon/dequantizeb_neon.c @@ -10,7 +10,7 @@ @@ -81,7 +1290,7 @@ index 791aaea2a..9399817b0 100644 void vp8_dequantize_b_neon(BLOCKD *d, short *DQC) { diff --git a/vp8/common/arm/neon/idct_blk_neon.c b/vp8/common/arm/neon/idct_blk_neon.c -index 5c26ce67a..2eb17750c 100644 +index 5c26ce6..2eb1775 100644 --- a/vp8/common/arm/neon/idct_blk_neon.c +++ b/vp8/common/arm/neon/idct_blk_neon.c @@ -10,7 +10,7 @@ @@ -94,7 +1303,7 @@ index 5c26ce67a..2eb17750c 100644 static void idct_dequant_0_2x_neon(int16_t *q, int16_t dq, unsigned char *dst, int stride) { diff --git a/vp8/common/arm/neon/iwalsh_neon.c b/vp8/common/arm/neon/iwalsh_neon.c -index 91600bfc0..1e882b50f 100644 +index 91600bf..1e882b5 100644 --- a/vp8/common/arm/neon/iwalsh_neon.c +++ b/vp8/common/arm/neon/iwalsh_neon.c @@ -10,7 +10,7 @@ @@ -107,7 +1316,7 @@ index 91600bfc0..1e882b50f 100644 void vp8_short_inv_walsh4x4_neon(int16_t *input, int16_t *mb_dqcoeff) { int16x8_t q0s16, q1s16, q2s16, q3s16; diff --git a/vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.c b/vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.c -index df983b23a..1c4310fdb 100644 +index df983b2..1c4310f 100644 --- a/vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.c +++ b/vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.c @@ -10,8 +10,8 @@ @@ -122,7 +1331,7 @@ index df983b23a..1c4310fdb 100644 static INLINE void vp8_loop_filter_simple_horizontal_edge_neon( unsigned char *s, int p, const unsigned char *blimit) { diff --git a/vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.c b/vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.c -index fbc83ae29..f42c8c42f 100644 +index fbc83ae..f42c8c4 100644 --- a/vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.c +++ b/vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.c @@ -10,8 +10,8 @@ @@ -137,7 +1346,7 @@ index fbc83ae29..f42c8c42f 100644 #ifdef VPX_INCOMPATIBLE_GCC diff --git a/vp8/common/arm/neon/mbloopfilter_neon.c b/vp8/common/arm/neon/mbloopfilter_neon.c -index fafaf2d45..3b7085285 100644 +index fafaf2d..3b70852 100644 --- a/vp8/common/arm/neon/mbloopfilter_neon.c +++ b/vp8/common/arm/neon/mbloopfilter_neon.c @@ -10,7 +10,7 @@ @@ -150,7 +1359,7 @@ index fafaf2d45..3b7085285 100644 static INLINE void vp8_mbloop_filter_neon(uint8x16_t qblimit, // mblimit diff --git a/vp8/common/arm/neon/shortidct4x4llm_neon.c b/vp8/common/arm/neon/shortidct4x4llm_neon.c -index 2724ca236..b293617b3 100644 +index 2724ca2..b293617 100644 --- a/vp8/common/arm/neon/shortidct4x4llm_neon.c +++ b/vp8/common/arm/neon/shortidct4x4llm_neon.c @@ -10,7 +10,7 @@ @@ -163,7 +1372,7 @@ index 2724ca236..b293617b3 100644 static const int16_t cospi8sqrt2minus1 = 20091; // 35468 exceeds INT16_MAX and gets converted to a negative number. Because of diff --git a/vp8/common/arm/neon/sixtappredict_neon.c b/vp8/common/arm/neon/sixtappredict_neon.c -index a54e81084..fb279bd22 100644 +index a54e810..fb279bd 100644 --- a/vp8/common/arm/neon/sixtappredict_neon.c +++ b/vp8/common/arm/neon/sixtappredict_neon.c @@ -10,8 +10,8 @@ @@ -178,7 +1387,7 @@ index a54e81084..fb279bd22 100644 #include "vpx_ports/mem.h" diff --git a/vp8/common/arm/neon/vp8_loopfilter_neon.c b/vp8/common/arm/neon/vp8_loopfilter_neon.c -index ebc004a04..1f39e20c8 100644 +index ebc004a..1f39e20 100644 --- a/vp8/common/arm/neon/vp8_loopfilter_neon.c +++ b/vp8/common/arm/neon/vp8_loopfilter_neon.c @@ -10,7 +10,7 @@ @@ -191,7 +1400,7 @@ index ebc004a04..1f39e20c8 100644 #include "vpx_ports/arm.h" diff --git a/vp8/common/filter.c b/vp8/common/filter.c -index 267498335..e599d192c 100644 +index 2674983..e599d19 100644 --- a/vp8/common/filter.c +++ b/vp8/common/filter.c @@ -9,7 +9,7 @@ @@ -204,7 +1413,7 @@ index 267498335..e599d192c 100644 DECLARE_ALIGNED(16, const short, vp8_bilinear_filters[8][2]) = { diff --git a/vp8/common/findnearmv.h b/vp8/common/findnearmv.h -index d7db9544a..05c61e735 100644 +index d7db954..05c61e7 100644 --- a/vp8/common/findnearmv.h +++ b/vp8/common/findnearmv.h @@ -11,7 +11,7 @@ @@ -217,7 +1426,7 @@ index d7db9544a..05c61e735 100644 #include "blockd.h" #include "modecont.h" diff --git a/vp8/common/idctllm.c b/vp8/common/idctllm.c -index 2f5adc0b4..b882a272f 100644 +index 2f5adc0..b882a27 100644 --- a/vp8/common/idctllm.c +++ b/vp8/common/idctllm.c @@ -8,7 +8,7 @@ @@ -230,7 +1439,7 @@ index 2f5adc0b4..b882a272f 100644 /**************************************************************************** * Notes: diff --git a/vp8/common/invtrans.h b/vp8/common/invtrans.h -index aed7bb060..c892cc606 100644 +index aed7bb0..c892cc6 100644 --- a/vp8/common/invtrans.h +++ b/vp8/common/invtrans.h @@ -11,7 +11,7 @@ @@ -243,7 +1452,7 @@ index aed7bb060..c892cc606 100644 #include "blockd.h" #include "onyxc_int.h" diff --git a/vp8/common/loongarch/idct_lsx.c b/vp8/common/loongarch/idct_lsx.c -index eee871eec..c60b7dc0b 100644 +index eee871e..c60b7dc 100644 --- a/vp8/common/loongarch/idct_lsx.c +++ b/vp8/common/loongarch/idct_lsx.c @@ -8,7 +8,7 @@ @@ -256,7 +1465,7 @@ index eee871eec..c60b7dc0b 100644 #include "vpx_util/loongson_intrinsics.h" diff --git a/vp8/common/loongarch/loopfilter_filters_lsx.c b/vp8/common/loongarch/loopfilter_filters_lsx.c -index 79c3ea6db..363c45e66 100644 +index 79c3ea6..363c45e 100644 --- a/vp8/common/loongarch/loopfilter_filters_lsx.c +++ b/vp8/common/loongarch/loopfilter_filters_lsx.c @@ -9,7 +9,7 @@ @@ -269,7 +1478,7 @@ index 79c3ea6db..363c45e66 100644 #include "vpx_util/loongson_intrinsics.h" diff --git a/vp8/common/loongarch/sixtap_filter_lsx.c b/vp8/common/loongarch/sixtap_filter_lsx.c -index 986763341..84ff70c00 100644 +index 2a6ec7f..498221e 100644 --- a/vp8/common/loongarch/sixtap_filter_lsx.c +++ b/vp8/common/loongarch/sixtap_filter_lsx.c @@ -9,7 +9,7 @@ @@ -282,7 +1491,7 @@ index 986763341..84ff70c00 100644 #include "vpx_ports/mem.h" #include "vpx_util/loongson_intrinsics.h" diff --git a/vp8/common/mfqe.c b/vp8/common/mfqe.c -index 1fe7363f1..5463e1122 100644 +index 3d801e7..2459bf1 100644 --- a/vp8/common/mfqe.c +++ b/vp8/common/mfqe.c @@ -16,8 +16,8 @@ @@ -297,7 +1506,7 @@ index 1fe7363f1..5463e1122 100644 #include "vp8/common/postproc.h" #include "vpx_dsp/variance.h" diff --git a/vp8/common/mips/mmi/copymem_mmi.c b/vp8/common/mips/mmi/copymem_mmi.c -index 86a32aa9e..261be2299 100644 +index 86a32aa..261be22 100644 --- a/vp8/common/mips/mmi/copymem_mmi.c +++ b/vp8/common/mips/mmi/copymem_mmi.c @@ -8,7 +8,7 @@ @@ -310,7 +1519,7 @@ index 86a32aa9e..261be2299 100644 #define COPY_MEM_16X2 \ diff --git a/vp8/common/mips/mmi/dequantize_mmi.c b/vp8/common/mips/mmi/dequantize_mmi.c -index b9330a666..2d210238f 100644 +index b9330a6..2d21023 100644 --- a/vp8/common/mips/mmi/dequantize_mmi.c +++ b/vp8/common/mips/mmi/dequantize_mmi.c @@ -8,7 +8,7 @@ @@ -323,7 +1532,7 @@ index b9330a666..2d210238f 100644 #include "vpx_mem/vpx_mem.h" #include "vpx_ports/asmdefs_mmi.h" diff --git a/vp8/common/mips/mmi/idct_blk_mmi.c b/vp8/common/mips/mmi/idct_blk_mmi.c -index 4fd6854c5..4ac92328e 100644 +index 4fd6854..4ac9232 100644 --- a/vp8/common/mips/mmi/idct_blk_mmi.c +++ b/vp8/common/mips/mmi/idct_blk_mmi.c @@ -8,7 +8,7 @@ @@ -336,7 +1545,7 @@ index 4fd6854c5..4ac92328e 100644 void vp8_dequant_idct_add_y_block_mmi(int16_t *q, int16_t *dq, uint8_t *dst, diff --git a/vp8/common/mips/mmi/idctllm_mmi.c b/vp8/common/mips/mmi/idctllm_mmi.c -index a35689dd3..86a026b55 100644 +index a35689d..86a026b 100644 --- a/vp8/common/mips/mmi/idctllm_mmi.c +++ b/vp8/common/mips/mmi/idctllm_mmi.c @@ -8,7 +8,7 @@ @@ -349,7 +1558,7 @@ index a35689dd3..86a026b55 100644 #include "vpx_ports/asmdefs_mmi.h" diff --git a/vp8/common/mips/mmi/loopfilter_filters_mmi.c b/vp8/common/mips/mmi/loopfilter_filters_mmi.c -index a07a7e3b4..0d8de26ce 100644 +index a07a7e3..0d8de26 100644 --- a/vp8/common/mips/mmi/loopfilter_filters_mmi.c +++ b/vp8/common/mips/mmi/loopfilter_filters_mmi.c @@ -8,7 +8,7 @@ @@ -362,7 +1571,7 @@ index a07a7e3b4..0d8de26ce 100644 #include "vp8/common/onyxc_int.h" #include "vpx_ports/asmdefs_mmi.h" diff --git a/vp8/common/mips/msa/bilinear_filter_msa.c b/vp8/common/mips/msa/bilinear_filter_msa.c -index c7fb1ed33..5c4a4fe00 100644 +index c7fb1ed..5c4a4fe 100644 --- a/vp8/common/mips/msa/bilinear_filter_msa.c +++ b/vp8/common/mips/msa/bilinear_filter_msa.c @@ -8,7 +8,7 @@ @@ -375,7 +1584,7 @@ index c7fb1ed33..5c4a4fe00 100644 #include "vp8/common/filter.h" #include "vp8/common/mips/msa/vp8_macros_msa.h" diff --git a/vp8/common/mips/msa/copymem_msa.c b/vp8/common/mips/msa/copymem_msa.c -index 357c99b8b..a9c90638d 100644 +index 357c99b..a9c9063 100644 --- a/vp8/common/mips/msa/copymem_msa.c +++ b/vp8/common/mips/msa/copymem_msa.c @@ -8,7 +8,7 @@ @@ -388,7 +1597,7 @@ index 357c99b8b..a9c90638d 100644 static void copy_8x4_msa(uint8_t *src, int32_t src_stride, uint8_t *dst, diff --git a/vp8/common/mips/msa/idct_msa.c b/vp8/common/mips/msa/idct_msa.c -index efad0c29f..059150108 100644 +index efad0c2..0591501 100644 --- a/vp8/common/mips/msa/idct_msa.c +++ b/vp8/common/mips/msa/idct_msa.c @@ -8,7 +8,7 @@ @@ -401,7 +1610,7 @@ index efad0c29f..059150108 100644 #include "vp8/common/mips/msa/vp8_macros_msa.h" diff --git a/vp8/common/mips/msa/loopfilter_filters_msa.c b/vp8/common/mips/msa/loopfilter_filters_msa.c -index 98a4fc09a..58fb1fda1 100644 +index 98a4fc0..58fb1fd 100644 --- a/vp8/common/mips/msa/loopfilter_filters_msa.c +++ b/vp8/common/mips/msa/loopfilter_filters_msa.c @@ -8,7 +8,7 @@ @@ -414,7 +1623,7 @@ index 98a4fc09a..58fb1fda1 100644 #include "vp8/common/mips/msa/vp8_macros_msa.h" diff --git a/vp8/common/mips/msa/mfqe_msa.c b/vp8/common/mips/msa/mfqe_msa.c -index 9aac95b2f..0c79cf550 100644 +index 9aac95b..0c79cf5 100644 --- a/vp8/common/mips/msa/mfqe_msa.c +++ b/vp8/common/mips/msa/mfqe_msa.c @@ -8,7 +8,7 @@ @@ -427,7 +1636,7 @@ index 9aac95b2f..0c79cf550 100644 #include "vp8/common/mips/msa/vp8_macros_msa.h" diff --git a/vp8/common/mips/msa/sixtap_filter_msa.c b/vp8/common/mips/msa/sixtap_filter_msa.c -index 3a1bb7cd5..5019fbe9a 100644 +index 3a1bb7c..5019fbe 100644 --- a/vp8/common/mips/msa/sixtap_filter_msa.c +++ b/vp8/common/mips/msa/sixtap_filter_msa.c @@ -8,7 +8,7 @@ @@ -440,7 +1649,7 @@ index 3a1bb7cd5..5019fbe9a 100644 #include "vp8/common/filter.h" #include "vp8/common/mips/msa/vp8_macros_msa.h" diff --git a/vp8/common/mips/msa/vp8_macros_msa.h b/vp8/common/mips/msa/vp8_macros_msa.h -index cc85b9a1f..0434e7a1d 100644 +index 79f96ce..2b0fbbd 100644 --- a/vp8/common/mips/msa/vp8_macros_msa.h +++ b/vp8/common/mips/msa/vp8_macros_msa.h @@ -13,7 +13,7 @@ @@ -453,7 +1662,7 @@ index cc85b9a1f..0434e7a1d 100644 #define LD_B(RTYPE, psrc) *((const RTYPE *)(psrc)) diff --git a/vp8/common/reconintra.c b/vp8/common/reconintra.c -index 8e2094da8..bb6541c12 100644 +index 8e2094d..bb6541c 100644 --- a/vp8/common/reconintra.c +++ b/vp8/common/reconintra.c @@ -8,9 +8,9 @@ @@ -470,7 +1679,7 @@ index 8e2094da8..bb6541c12 100644 #include "vpx_ports/vpx_once.h" #include "blockd.h" diff --git a/vp8/common/reconintra4x4.c b/vp8/common/reconintra4x4.c -index be936df5e..f414002b7 100644 +index be936df..f414002 100644 --- a/vp8/common/reconintra4x4.c +++ b/vp8/common/reconintra4x4.c @@ -11,7 +11,7 @@ @@ -483,7 +1692,7 @@ index be936df5e..f414002b7 100644 #include "blockd.h" #include "reconintra4x4.h" diff --git a/vp8/common/rtcd.c b/vp8/common/rtcd.c -index 102b7ccd5..b1b3bcd46 100644 +index 102b7cc..b1b3bcd 100644 --- a/vp8/common/rtcd.c +++ b/vp8/common/rtcd.c @@ -7,9 +7,9 @@ @@ -499,7 +1708,7 @@ index 102b7ccd5..b1b3bcd46 100644 void vp8_rtcd(void) { once(setup_rtcd_internal); } diff --git a/vp8/common/setupintrarecon.h b/vp8/common/setupintrarecon.h -index 903a536ae..b9c8e6431 100644 +index 903a536..b9c8e64 100644 --- a/vp8/common/setupintrarecon.h +++ b/vp8/common/setupintrarecon.h @@ -11,7 +11,7 @@ @@ -512,7 +1721,7 @@ index 903a536ae..b9c8e6431 100644 #ifdef __cplusplus diff --git a/vp8/common/threading.h b/vp8/common/threading.h -index 0de75cfde..99e011e12 100644 +index 0de75cf..99e011e 100644 --- a/vp8/common/threading.h +++ b/vp8/common/threading.h @@ -11,7 +11,7 @@ @@ -525,7 +1734,7 @@ index 0de75cfde..99e011e12 100644 #ifdef __cplusplus extern "C" { diff --git a/vp8/common/x86/bilinear_filter_sse2.c b/vp8/common/x86/bilinear_filter_sse2.c -index ff6cbbd68..4c4ec61d2 100644 +index ff6cbbd..4c4ec61 100644 --- a/vp8/common/x86/bilinear_filter_sse2.c +++ b/vp8/common/x86/bilinear_filter_sse2.c @@ -11,8 +11,8 @@ @@ -540,7 +1749,7 @@ index ff6cbbd68..4c4ec61d2 100644 #include "vpx_dsp/x86/mem_sse2.h" #include "vpx_ports/mem.h" diff --git a/vp8/decoder/dboolhuff.h b/vp8/decoder/dboolhuff.h -index 673b2fbd5..001cf4b28 100644 +index 673b2fb..001cf4b 100644 --- a/vp8/decoder/dboolhuff.h +++ b/vp8/decoder/dboolhuff.h @@ -14,7 +14,7 @@ @@ -552,21 +1761,36 @@ index 673b2fbd5..001cf4b28 100644 #include "vpx_ports/compiler_attributes.h" #include "vpx_ports/mem.h" #include "vpx/vp8dx.h" +diff --git a/vp8/decoder/decodeframe.c b/vp8/decoder/decodeframe.c +index bb3b415..6cb506c 100644 +--- a/vp8/decoder/decodeframe.c ++++ b/vp8/decoder/decodeframe.c +@@ -10,7 +10,7 @@ + + #include "vpx_config.h" + #include "vp8_rtcd.h" +-#include "./vpx_scale_rtcd.h" ++#include "vpx_scale_rtcd.h" + #include "onyxd_int.h" + #include "vp8/common/header.h" + #include "vp8/common/reconintra4x4.h" diff --git a/vp8/decoder/onyxd_if.c b/vp8/decoder/onyxd_if.c -index 88f2de024..089a44c92 100644 +index 88f2de0..e6e7696 100644 --- a/vp8/decoder/onyxd_if.c +++ b/vp8/decoder/onyxd_if.c -@@ -26,7 +26,7 @@ +@@ -26,8 +26,8 @@ #include "vp8/common/quant_common.h" #include "vp8/common/reconintra.h" -#include "./vpx_dsp_rtcd.h" +-#include "./vpx_scale_rtcd.h" +#include "vpx_dsp_rtcd.h" - #include "./vpx_scale_rtcd.h" ++#include "vpx_scale_rtcd.h" #include "vpx_scale/vpx_scale.h" #include "vp8/common/systemdependent.h" + #include "vpx_ports/system_state.h" diff --git a/vp8/decoder/treereader.h b/vp8/decoder/treereader.h -index 4bf938a74..8a4c122e1 100644 +index 4bf938a..8a4c122 100644 --- a/vp8/decoder/treereader.h +++ b/vp8/decoder/treereader.h @@ -11,7 +11,7 @@ @@ -579,7 +1803,7 @@ index 4bf938a74..8a4c122e1 100644 #include "dboolhuff.h" diff --git a/vp8/encoder/arm/neon/denoising_neon.c b/vp8/encoder/arm/neon/denoising_neon.c -index 67267b8f3..710e655f5 100644 +index 67267b8..710e655 100644 --- a/vp8/encoder/arm/neon/denoising_neon.c +++ b/vp8/encoder/arm/neon/denoising_neon.c @@ -12,7 +12,7 @@ @@ -592,7 +1816,7 @@ index 67267b8f3..710e655f5 100644 /* * The filter function was modified to reduce the computational complexity. diff --git a/vp8/encoder/arm/neon/fastquantizeb_neon.c b/vp8/encoder/arm/neon/fastquantizeb_neon.c -index 950c94334..f94f4efc3 100644 +index 950c943..f94f4ef 100644 --- a/vp8/encoder/arm/neon/fastquantizeb_neon.c +++ b/vp8/encoder/arm/neon/fastquantizeb_neon.c @@ -10,7 +10,7 @@ @@ -605,7 +1829,7 @@ index 950c94334..f94f4efc3 100644 static const uint16_t inv_zig_zag[16] = { 1, 2, 6, 7, 3, 5, 8, 13, diff --git a/vp8/encoder/arm/neon/shortfdct_neon.c b/vp8/encoder/arm/neon/shortfdct_neon.c -index 99dff6b52..6347afdde 100644 +index 99dff6b..6347afd 100644 --- a/vp8/encoder/arm/neon/shortfdct_neon.c +++ b/vp8/encoder/arm/neon/shortfdct_neon.c @@ -10,7 +10,7 @@ @@ -618,7 +1842,7 @@ index 99dff6b52..6347afdde 100644 void vp8_short_fdct4x4_neon(int16_t *input, int16_t *output, int pitch) { int16x4_t d0s16, d1s16, d2s16, d3s16, d4s16, d5s16, d6s16, d7s16; diff --git a/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c b/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c -index 02056f2f9..a5e26dcf7 100644 +index 02056f2..a5e26dc 100644 --- a/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c +++ b/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c @@ -10,11 +10,11 @@ @@ -636,7 +1860,7 @@ index 02056f2f9..a5e26dcf7 100644 vp8_short_walsh4x4_c(input, output, pitch); } diff --git a/vp8/encoder/copy_c.c b/vp8/encoder/copy_c.c -index 474612524..b9e9d464c 100644 +index 4746125..b9e9d46 100644 --- a/vp8/encoder/copy_c.c +++ b/vp8/encoder/copy_c.c @@ -10,7 +10,7 @@ @@ -649,7 +1873,7 @@ index 474612524..b9e9d464c 100644 /* Copy 2 macroblocks to a buffer */ diff --git a/vp8/encoder/dct.c b/vp8/encoder/dct.c -index 7d214eafb..82fbbeb4b 100644 +index 7d214ea..82fbbeb 100644 --- a/vp8/encoder/dct.c +++ b/vp8/encoder/dct.c @@ -10,7 +10,7 @@ @@ -662,7 +1886,7 @@ index 7d214eafb..82fbbeb4b 100644 void vp8_short_fdct4x4_c(short *input, short *output, int pitch) { int i; diff --git a/vp8/encoder/encodeintra.c b/vp8/encoder/encodeintra.c -index 7d448c0ea..13cb156e9 100644 +index 7d448c0..13cb156 100644 --- a/vp8/encoder/encodeintra.c +++ b/vp8/encoder/encodeintra.c @@ -10,7 +10,7 @@ @@ -675,7 +1899,7 @@ index 7d448c0ea..13cb156e9 100644 #include "vp8/common/reconintra.h" #include "vp8/common/reconintra4x4.h" diff --git a/vp8/encoder/encodemb.c b/vp8/encoder/encodemb.c -index 3fd8d5fab..e89f55a89 100644 +index 052d09b..704b8a0 100644 --- a/vp8/encoder/encodemb.c +++ b/vp8/encoder/encodemb.c @@ -8,7 +8,7 @@ @@ -688,20 +1912,22 @@ index 3fd8d5fab..e89f55a89 100644 #include "vpx_config.h" #include "vp8_rtcd.h" diff --git a/vp8/encoder/firstpass.c b/vp8/encoder/firstpass.c -index 8a3861e6a..f0f47d669 100644 +index 097dc0e..7204230 100644 --- a/vp8/encoder/firstpass.c +++ b/vp8/encoder/firstpass.c -@@ -13,7 +13,7 @@ +@@ -13,8 +13,8 @@ #include #include -#include "./vpx_dsp_rtcd.h" +-#include "./vpx_scale_rtcd.h" +#include "vpx_dsp_rtcd.h" - #include "./vpx_scale_rtcd.h" ++#include "vpx_scale_rtcd.h" #include "block.h" #include "onyx_int.h" + #include "vpx_dsp/variance.h" diff --git a/vp8/encoder/loongarch/dct_lsx.c b/vp8/encoder/loongarch/dct_lsx.c -index a08d4d3f6..bf5670d0c 100644 +index a08d4d3..bf5670d 100644 --- a/vp8/encoder/loongarch/dct_lsx.c +++ b/vp8/encoder/loongarch/dct_lsx.c @@ -9,7 +9,7 @@ @@ -714,7 +1940,7 @@ index a08d4d3f6..bf5670d0c 100644 #define LSX_TRANSPOSE4x4_H(_in0, _in1, _in2, _in3, _out0, _out1, _out2, _out3) \ diff --git a/vp8/encoder/loongarch/encodeopt_lsx.c b/vp8/encoder/loongarch/encodeopt_lsx.c -index 4ad4caba6..b82275efa 100644 +index 4ad4cab..b82275e 100644 --- a/vp8/encoder/loongarch/encodeopt_lsx.c +++ b/vp8/encoder/loongarch/encodeopt_lsx.c @@ -8,7 +8,7 @@ @@ -727,7 +1953,7 @@ index 4ad4caba6..b82275efa 100644 #include "vp8/encoder/block.h" diff --git a/vp8/encoder/loongarch/vp8_quantize_lsx.c b/vp8/encoder/loongarch/vp8_quantize_lsx.c -index 75889192a..6bcab5b22 100644 +index 7588919..6bcab5b 100644 --- a/vp8/encoder/loongarch/vp8_quantize_lsx.c +++ b/vp8/encoder/loongarch/vp8_quantize_lsx.c @@ -9,7 +9,7 @@ @@ -740,7 +1966,7 @@ index 75889192a..6bcab5b22 100644 #include "vp8/encoder/block.h" diff --git a/vp8/encoder/mcomp.c b/vp8/encoder/mcomp.c -index 3ec85a170..9af175b0a 100644 +index 6861ada..07e63ee 100644 --- a/vp8/encoder/mcomp.c +++ b/vp8/encoder/mcomp.c @@ -8,8 +8,8 @@ @@ -755,7 +1981,7 @@ index 3ec85a170..9af175b0a 100644 #include "mcomp.h" #include "vpx_mem/vpx_mem.h" diff --git a/vp8/encoder/mips/mmi/dct_mmi.c b/vp8/encoder/mips/mmi/dct_mmi.c -index 0fd25fcda..043dabf08 100644 +index 0fd25fc..043dabf 100644 --- a/vp8/encoder/mips/mmi/dct_mmi.c +++ b/vp8/encoder/mips/mmi/dct_mmi.c @@ -8,7 +8,7 @@ @@ -768,7 +1994,7 @@ index 0fd25fcda..043dabf08 100644 #include "vpx_ports/asmdefs_mmi.h" diff --git a/vp8/encoder/mips/msa/dct_msa.c b/vp8/encoder/mips/msa/dct_msa.c -index 308466755..d41184670 100644 +index 3084667..d411846 100644 --- a/vp8/encoder/mips/msa/dct_msa.c +++ b/vp8/encoder/mips/msa/dct_msa.c @@ -8,7 +8,7 @@ @@ -781,7 +2007,7 @@ index 308466755..d41184670 100644 #define TRANSPOSE4x4_H(in0, in1, in2, in3, out0, out1, out2, out3) \ diff --git a/vp8/encoder/mips/msa/denoising_msa.c b/vp8/encoder/mips/msa/denoising_msa.c -index f8b653a9a..2d3193e45 100644 +index f8b653a..2d3193e 100644 --- a/vp8/encoder/mips/msa/denoising_msa.c +++ b/vp8/encoder/mips/msa/denoising_msa.c @@ -9,7 +9,7 @@ @@ -794,7 +2020,7 @@ index f8b653a9a..2d3193e45 100644 #include "vp8/encoder/denoising.h" diff --git a/vp8/encoder/mips/msa/encodeopt_msa.c b/vp8/encoder/mips/msa/encodeopt_msa.c -index 2bcddb623..5ab6e2858 100644 +index 2bcddb6..5ab6e28 100644 --- a/vp8/encoder/mips/msa/encodeopt_msa.c +++ b/vp8/encoder/mips/msa/encodeopt_msa.c @@ -8,7 +8,7 @@ @@ -807,7 +2033,7 @@ index 2bcddb623..5ab6e2858 100644 #include "vp8/encoder/block.h" diff --git a/vp8/encoder/mips/msa/quantize_msa.c b/vp8/encoder/mips/msa/quantize_msa.c -index 9f5fbd39c..4e475cb33 100644 +index 9f5fbd3..4e475cb 100644 --- a/vp8/encoder/mips/msa/quantize_msa.c +++ b/vp8/encoder/mips/msa/quantize_msa.c @@ -8,7 +8,7 @@ @@ -820,7 +2046,7 @@ index 9f5fbd39c..4e475cb33 100644 #include "vp8/encoder/block.h" diff --git a/vp8/encoder/mips/msa/temporal_filter_msa.c b/vp8/encoder/mips/msa/temporal_filter_msa.c -index fb83f07bd..4fcc278dc 100644 +index fb83f07..4fcc278 100644 --- a/vp8/encoder/mips/msa/temporal_filter_msa.c +++ b/vp8/encoder/mips/msa/temporal_filter_msa.c @@ -8,7 +8,7 @@ @@ -833,22 +2059,24 @@ index fb83f07bd..4fcc278dc 100644 static void temporal_filter_apply_16size_msa( diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c -index 17726fad2..b2438743c 100644 +index e3a4286..5f3c66c 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c -@@ -10,8 +10,8 @@ +@@ -9,9 +9,9 @@ + */ #include "vpx_config.h" - #include "./vpx_scale_rtcd.h" --#include "./vpx_dsp_rtcd.h" -#include "./vp8_rtcd.h" -+#include "vpx_dsp_rtcd.h" +-#include "./vpx_dsp_rtcd.h" +-#include "./vpx_scale_rtcd.h" +#include "vp8_rtcd.h" - #include "bitstream.h" - #include "vp8/common/onyxc_int.h" ++#include "vpx_dsp_rtcd.h" ++#include "vpx_scale_rtcd.h" + + #include "vp8/common/alloccommon.h" #include "vp8/common/blockd.h" diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c -index ca6c18f48..3842d6487 100644 +index ca6c18f..3842d64 100644 --- a/vp8/encoder/pickinter.c +++ b/vp8/encoder/pickinter.c @@ -11,7 +11,7 @@ @@ -861,20 +2089,22 @@ index ca6c18f48..3842d6487 100644 #include "modecosts.h" #include "encodeintra.h" diff --git a/vp8/encoder/picklpf.c b/vp8/encoder/picklpf.c -index 498738fd6..cc6ea1ed9 100644 +index 498738f..7895a65 100644 --- a/vp8/encoder/picklpf.c +++ b/vp8/encoder/picklpf.c -@@ -8,7 +8,7 @@ +@@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "./vpx_dsp_rtcd.h" +-#include "./vpx_scale_rtcd.h" +#include "vpx_dsp_rtcd.h" - #include "./vpx_scale_rtcd.h" ++#include "vpx_scale_rtcd.h" #include "vp8/common/onyxc_int.h" #include "onyx_int.h" + #include "vp8/encoder/picklpf.h" diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c -index 671cccd11..ed7f09419 100644 +index ad3866c..09f33e7 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -15,7 +15,7 @@ @@ -887,7 +2117,7 @@ index 671cccd11..ed7f09419 100644 #include "tokenize.h" #include "treewriter.h" diff --git a/vp8/encoder/rdopt.h b/vp8/encoder/rdopt.h -index cc3db8197..00d3c48f8 100644 +index cc3db81..00d3c48 100644 --- a/vp8/encoder/rdopt.h +++ b/vp8/encoder/rdopt.h @@ -11,7 +11,7 @@ @@ -900,7 +2130,7 @@ index cc3db8197..00d3c48f8 100644 #ifdef __cplusplus extern "C" { diff --git a/vp8/encoder/treewriter.h b/vp8/encoder/treewriter.h -index 4e9ed6af1..00997a034 100644 +index 4e9ed6a..00997a0 100644 --- a/vp8/encoder/treewriter.h +++ b/vp8/encoder/treewriter.h @@ -16,7 +16,7 @@ @@ -913,7 +2143,7 @@ index 4e9ed6af1..00997a034 100644 #include "boolhuff.h" /* for now */ diff --git a/vp8/encoder/vp8_quantize.c b/vp8/encoder/vp8_quantize.c -index 8b9b22bab..74d28b2e2 100644 +index 8b9b22b..74d28b2 100644 --- a/vp8/encoder/vp8_quantize.c +++ b/vp8/encoder/vp8_quantize.c @@ -10,7 +10,7 @@ @@ -926,7 +2156,7 @@ index 8b9b22bab..74d28b2e2 100644 #include "vpx_mem/vpx_mem.h" diff --git a/vp8/encoder/x86/quantize_sse4.c b/vp8/encoder/x86/quantize_sse4.c -index 4c2d24cc2..f4c14b8a7 100644 +index 4c2d24c..f4c14b8 100644 --- a/vp8/encoder/x86/quantize_sse4.c +++ b/vp8/encoder/x86/quantize_sse4.c @@ -10,7 +10,7 @@ @@ -939,7 +2169,7 @@ index 4c2d24cc2..f4c14b8a7 100644 #include "vpx_ports/bitops.h" /* get_lsb */ #include "vpx_ports/compiler_attributes.h" diff --git a/vp8/encoder/x86/vp8_quantize_ssse3.c b/vp8/encoder/x86/vp8_quantize_ssse3.c -index f6df146f0..69bb610b1 100644 +index f6df146..69bb610 100644 --- a/vp8/encoder/x86/vp8_quantize_ssse3.c +++ b/vp8/encoder/x86/vp8_quantize_ssse3.c @@ -10,7 +10,7 @@ @@ -952,39 +2182,43 @@ index f6df146f0..69bb610b1 100644 #include "vpx_ports/bitops.h" /* get_msb */ diff --git a/vp8/vp8_cx_iface.c b/vp8/vp8_cx_iface.c -index 38456d2b9..27c6ac1c0 100644 +index 314f733..1b23a8e 100644 --- a/vp8/vp8_cx_iface.c +++ b/vp8/vp8_cx_iface.c -@@ -13,9 +13,9 @@ +@@ -14,10 +14,10 @@ #include #include -#include "./vpx_config.h" -#include "./vp8_rtcd.h" -#include "./vpx_dsp_rtcd.h" +-#include "./vpx_scale_rtcd.h" +#include "vpx_config.h" +#include "vp8_rtcd.h" +#include "vpx_dsp_rtcd.h" - #include "./vpx_scale_rtcd.h" ++#include "vpx_scale_rtcd.h" #include "vpx/vpx_encoder.h" #include "vpx/internal/vpx_codec_internal.h" + #include "vpx_version.h" diff --git a/vp8/vp8_dx_iface.c b/vp8/vp8_dx_iface.c -index fa7d7be40..ff9f3ea2d 100644 +index e6f9a36..92fa1d7 100644 --- a/vp8/vp8_dx_iface.c +++ b/vp8/vp8_dx_iface.c -@@ -11,8 +11,8 @@ +@@ -11,9 +11,9 @@ #include #include #include -#include "./vp8_rtcd.h" -#include "./vpx_dsp_rtcd.h" +-#include "./vpx_scale_rtcd.h" +#include "vp8_rtcd.h" +#include "vpx_dsp_rtcd.h" - #include "./vpx_scale_rtcd.h" ++#include "vpx_scale_rtcd.h" #include "vpx/vpx_decoder.h" #include "vpx/vp8dx.h" + #include "vpx/internal/vpx_codec_internal.h" diff --git a/vp9/common/arm/neon/vp9_highbd_iht16x16_add_neon.c b/vp9/common/arm/neon/vp9_highbd_iht16x16_add_neon.c -index b43d7fa4f..335bdba09 100644 +index b43d7fa..335bdba 100644 --- a/vp9/common/arm/neon/vp9_highbd_iht16x16_add_neon.c +++ b/vp9/common/arm/neon/vp9_highbd_iht16x16_add_neon.c @@ -10,7 +10,7 @@ @@ -997,20 +2231,22 @@ index b43d7fa4f..335bdba09 100644 #include "vp9/common/arm/neon/vp9_iht_neon.h" #include "vpx_dsp/arm/highbd_idct_neon.h" diff --git a/vp9/common/arm/neon/vp9_highbd_iht4x4_add_neon.c b/vp9/common/arm/neon/vp9_highbd_iht4x4_add_neon.c -index 52c4f1937..c5bd84359 100644 +index 52c4f19..2cf8e90 100644 --- a/vp9/common/arm/neon/vp9_highbd_iht4x4_add_neon.c +++ b/vp9/common/arm/neon/vp9_highbd_iht4x4_add_neon.c -@@ -12,7 +12,7 @@ +@@ -11,8 +11,8 @@ + #include #include - #include "./vp9_rtcd.h" +-#include "./vp9_rtcd.h" -#include "./vpx_config.h" ++#include "vp9_rtcd.h" +#include "vpx_config.h" #include "vp9/common/vp9_common.h" #include "vp9/common/arm/neon/vp9_iht_neon.h" #include "vpx_dsp/arm/highbd_idct_neon.h" diff --git a/vp9/common/arm/neon/vp9_highbd_iht8x8_add_neon.c b/vp9/common/arm/neon/vp9_highbd_iht8x8_add_neon.c -index 2232c6841..1d224d0d8 100644 +index 2232c68..1d224d0 100644 --- a/vp9/common/arm/neon/vp9_highbd_iht8x8_add_neon.c +++ b/vp9/common/arm/neon/vp9_highbd_iht8x8_add_neon.c @@ -10,7 +10,7 @@ @@ -1023,98 +2259,177 @@ index 2232c6841..1d224d0d8 100644 #include "vp9/common/arm/neon/vp9_iht_neon.h" #include "vpx_dsp/arm/highbd_idct_neon.h" diff --git a/vp9/common/arm/neon/vp9_iht16x16_add_neon.c b/vp9/common/arm/neon/vp9_iht16x16_add_neon.c -index db72ff116..f52620ff7 100644 +index db72ff1..cb686a9 100644 --- a/vp9/common/arm/neon/vp9_iht16x16_add_neon.c +++ b/vp9/common/arm/neon/vp9_iht16x16_add_neon.c -@@ -12,7 +12,7 @@ +@@ -11,8 +11,8 @@ + #include #include - #include "./vp9_rtcd.h" +-#include "./vp9_rtcd.h" -#include "./vpx_config.h" ++#include "vp9_rtcd.h" +#include "vpx_config.h" #include "vp9/common/vp9_common.h" #include "vp9/common/arm/neon/vp9_iht_neon.h" #include "vpx_dsp/arm/idct_neon.h" diff --git a/vp9/common/arm/neon/vp9_iht4x4_add_neon.c b/vp9/common/arm/neon/vp9_iht4x4_add_neon.c -index 4f0a90f21..599ea299f 100644 +index 4f0a90f..c9a56b4 100644 --- a/vp9/common/arm/neon/vp9_iht4x4_add_neon.c +++ b/vp9/common/arm/neon/vp9_iht4x4_add_neon.c -@@ -12,7 +12,7 @@ +@@ -11,8 +11,8 @@ + #include #include - #include "./vp9_rtcd.h" +-#include "./vp9_rtcd.h" -#include "./vpx_config.h" ++#include "vp9_rtcd.h" +#include "vpx_config.h" #include "vp9/common/vp9_common.h" #include "vp9/common/arm/neon/vp9_iht_neon.h" #include "vpx_dsp/arm/idct_neon.h" diff --git a/vp9/common/arm/neon/vp9_iht8x8_add_neon.c b/vp9/common/arm/neon/vp9_iht8x8_add_neon.c -index 46ee632e0..fa81b2498 100644 +index 46ee632..7306a4d 100644 --- a/vp9/common/arm/neon/vp9_iht8x8_add_neon.c +++ b/vp9/common/arm/neon/vp9_iht8x8_add_neon.c -@@ -12,7 +12,7 @@ +@@ -11,8 +11,8 @@ + #include #include - #include "./vp9_rtcd.h" +-#include "./vp9_rtcd.h" -#include "./vpx_config.h" ++#include "vp9_rtcd.h" +#include "vpx_config.h" #include "vp9/common/vp9_common.h" #include "vp9/common/arm/neon/vp9_iht_neon.h" #include "vpx_dsp/arm/idct_neon.h" diff --git a/vp9/common/arm/neon/vp9_iht_neon.h b/vp9/common/arm/neon/vp9_iht_neon.h -index c64822e27..7d7b93116 100644 +index c64822e..3430118 100644 --- a/vp9/common/arm/neon/vp9_iht_neon.h +++ b/vp9/common/arm/neon/vp9_iht_neon.h -@@ -14,7 +14,7 @@ +@@ -13,8 +13,8 @@ + #include - #include "./vp9_rtcd.h" +-#include "./vp9_rtcd.h" -#include "./vpx_config.h" ++#include "vp9_rtcd.h" +#include "vpx_config.h" #include "vp9/common/vp9_common.h" #include "vpx_dsp/arm/idct_neon.h" #include "vpx_dsp/arm/mem_neon.h" diff --git a/vp9/common/mips/dspr2/vp9_itrans16_dspr2.c b/vp9/common/mips/dspr2/vp9_itrans16_dspr2.c -index e68d01e9f..8a7c47d97 100644 +index e68d01e..272ac1d 100644 --- a/vp9/common/mips/dspr2/vp9_itrans16_dspr2.c +++ b/vp9/common/mips/dspr2/vp9_itrans16_dspr2.c -@@ -11,7 +11,7 @@ +@@ -11,8 +11,8 @@ #include #include -#include "./vpx_config.h" +-#include "./vp9_rtcd.h" +#include "vpx_config.h" - #include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" #include "vp9/common/vp9_common.h" #include "vp9/common/vp9_blockd.h" + #include "vp9/common/vp9_idct.h" diff --git a/vp9/common/mips/dspr2/vp9_itrans4_dspr2.c b/vp9/common/mips/dspr2/vp9_itrans4_dspr2.c -index f6b29265e..2fad93758 100644 +index f6b2926..1f4fefc 100644 --- a/vp9/common/mips/dspr2/vp9_itrans4_dspr2.c +++ b/vp9/common/mips/dspr2/vp9_itrans4_dspr2.c -@@ -11,7 +11,7 @@ +@@ -11,8 +11,8 @@ #include #include -#include "./vpx_config.h" +-#include "./vp9_rtcd.h" +#include "vpx_config.h" - #include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" #include "vp9/common/vp9_common.h" #include "vp9/common/vp9_blockd.h" + #include "vp9/common/vp9_idct.h" diff --git a/vp9/common/mips/dspr2/vp9_itrans8_dspr2.c b/vp9/common/mips/dspr2/vp9_itrans8_dspr2.c -index b945e307e..0209d438c 100644 +index b945e30..0f79f9e 100644 --- a/vp9/common/mips/dspr2/vp9_itrans8_dspr2.c +++ b/vp9/common/mips/dspr2/vp9_itrans8_dspr2.c -@@ -11,7 +11,7 @@ +@@ -11,8 +11,8 @@ #include #include -#include "./vpx_config.h" +-#include "./vp9_rtcd.h" +#include "vpx_config.h" - #include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" #include "vp9/common/vp9_common.h" #include "vp9/common/vp9_blockd.h" + #include "vpx_dsp/mips/inv_txfm_dspr2.h" +diff --git a/vp9/common/mips/msa/vp9_idct16x16_msa.c b/vp9/common/mips/msa/vp9_idct16x16_msa.c +index c031322..5d3c824 100644 +--- a/vp9/common/mips/msa/vp9_idct16x16_msa.c ++++ b/vp9/common/mips/msa/vp9_idct16x16_msa.c +@@ -10,7 +10,7 @@ + + #include + +-#include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" + #include "vp9/common/vp9_enums.h" + #include "vpx_dsp/mips/inv_txfm_msa.h" + +diff --git a/vp9/common/mips/msa/vp9_idct4x4_msa.c b/vp9/common/mips/msa/vp9_idct4x4_msa.c +index aaccd5c..7fde55a 100644 +--- a/vp9/common/mips/msa/vp9_idct4x4_msa.c ++++ b/vp9/common/mips/msa/vp9_idct4x4_msa.c +@@ -10,7 +10,7 @@ + + #include + +-#include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" + #include "vp9/common/vp9_enums.h" + #include "vpx_dsp/mips/inv_txfm_msa.h" + +diff --git a/vp9/common/mips/msa/vp9_idct8x8_msa.c b/vp9/common/mips/msa/vp9_idct8x8_msa.c +index 76d15ff..1f0a713 100644 +--- a/vp9/common/mips/msa/vp9_idct8x8_msa.c ++++ b/vp9/common/mips/msa/vp9_idct8x8_msa.c +@@ -10,7 +10,7 @@ + + #include + +-#include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" + #include "vp9/common/vp9_enums.h" + #include "vpx_dsp/mips/inv_txfm_msa.h" + +diff --git a/vp9/common/mips/msa/vp9_mfqe_msa.c b/vp9/common/mips/msa/vp9_mfqe_msa.c +index 2c38409..da951f4 100644 +--- a/vp9/common/mips/msa/vp9_mfqe_msa.c ++++ b/vp9/common/mips/msa/vp9_mfqe_msa.c +@@ -8,7 +8,7 @@ + * be found in the AUTHORS file in the root of the source tree. + */ + +-#include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" + #include "vp9/common/vp9_onyxc_int.h" + #include "vpx_dsp/mips/macros_msa.h" + +diff --git a/vp9/common/ppc/vp9_idct_vsx.c b/vp9/common/ppc/vp9_idct_vsx.c +index e861596..42e253c 100644 +--- a/vp9/common/ppc/vp9_idct_vsx.c ++++ b/vp9/common/ppc/vp9_idct_vsx.c +@@ -10,7 +10,7 @@ + + #include + +-#include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" + #include "vpx_dsp/vpx_dsp_common.h" + #include "vpx_dsp/ppc/inv_txfm_vsx.h" + #include "vpx_dsp/ppc/bitdepth_conversion_vsx.h" diff --git a/vp9/common/vp9_alloccommon.c b/vp9/common/vp9_alloccommon.c -index 9e73e40ea..ebebceb6b 100644 +index 93a8407..a3bed89 100644 --- a/vp9/common/vp9_alloccommon.c +++ b/vp9/common/vp9_alloccommon.c @@ -8,7 +8,7 @@ @@ -1127,7 +2442,7 @@ index 9e73e40ea..ebebceb6b 100644 #include "vp9/common/vp9_alloccommon.h" diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h -index aa13d8a0d..5e7d43b25 100644 +index 514d6b7..ddce130 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -11,7 +11,7 @@ @@ -1140,7 +2455,7 @@ index aa13d8a0d..5e7d43b25 100644 #include "vpx_dsp/vpx_dsp_common.h" #include "vpx_ports/mem.h" diff --git a/vp9/common/vp9_common.h b/vp9/common/vp9_common.h -index d63bad93d..4e61354bb 100644 +index 8856be2..7b83e59 100644 --- a/vp9/common/vp9_common.h +++ b/vp9/common/vp9_common.h @@ -15,7 +15,7 @@ @@ -1153,7 +2468,7 @@ index d63bad93d..4e61354bb 100644 #include "vpx_mem/vpx_mem.h" #include "vpx/vpx_integer.h" diff --git a/vp9/common/vp9_entropymv.h b/vp9/common/vp9_entropymv.h -index ee9d37973..0fe8acc9b 100644 +index ee9d379..0fe8acc 100644 --- a/vp9/common/vp9_entropymv.h +++ b/vp9/common/vp9_entropymv.h @@ -11,7 +11,7 @@ @@ -1166,7 +2481,7 @@ index ee9d37973..0fe8acc9b 100644 #include "vpx_dsp/prob.h" diff --git a/vp9/common/vp9_enums.h b/vp9/common/vp9_enums.h -index b33a3a297..cde6bb805 100644 +index b33a3a2..cde6bb8 100644 --- a/vp9/common/vp9_enums.h +++ b/vp9/common/vp9_enums.h @@ -11,7 +11,7 @@ @@ -1179,7 +2494,7 @@ index b33a3a297..cde6bb805 100644 #ifdef __cplusplus diff --git a/vp9/common/vp9_filter.h b/vp9/common/vp9_filter.h -index 0382c88e7..afd54aeed 100644 +index 0382c88..afd54ae 100644 --- a/vp9/common/vp9_filter.h +++ b/vp9/common/vp9_filter.h @@ -11,7 +11,7 @@ @@ -1192,20 +2507,22 @@ index 0382c88e7..afd54aeed 100644 #include "vpx_dsp/vpx_filter.h" #include "vpx_ports/mem.h" diff --git a/vp9/common/vp9_idct.c b/vp9/common/vp9_idct.c -index 71be0f310..3afbab10c 100644 +index 71be0f3..0e65141 100644 --- a/vp9/common/vp9_idct.c +++ b/vp9/common/vp9_idct.c -@@ -11,7 +11,7 @@ +@@ -10,8 +10,8 @@ + #include - #include "./vp9_rtcd.h" +-#include "./vp9_rtcd.h" -#include "./vpx_dsp_rtcd.h" ++#include "vp9_rtcd.h" +#include "vpx_dsp_rtcd.h" #include "vp9/common/vp9_blockd.h" #include "vp9/common/vp9_idct.h" #include "vpx_dsp/inv_txfm.h" diff --git a/vp9/common/vp9_idct.h b/vp9/common/vp9_idct.h -index 94eeaf599..e20726865 100644 +index 94eeaf5..e207268 100644 --- a/vp9/common/vp9_idct.h +++ b/vp9/common/vp9_idct.h @@ -13,7 +13,7 @@ @@ -1218,7 +2535,7 @@ index 94eeaf599..e20726865 100644 #include "vp9/common/vp9_enums.h" #include "vpx_dsp/inv_txfm.h" diff --git a/vp9/common/vp9_loopfilter.c b/vp9/common/vp9_loopfilter.c -index 1a9d45ae7..328508442 100644 +index 1a9d45a..3285084 100644 --- a/vp9/common/vp9_loopfilter.c +++ b/vp9/common/vp9_loopfilter.c @@ -8,8 +8,8 @@ @@ -1233,7 +2550,7 @@ index 1a9d45ae7..328508442 100644 #include "vp9/common/vp9_onyxc_int.h" #include "vp9/common/vp9_reconinter.h" diff --git a/vp9/common/vp9_loopfilter.h b/vp9/common/vp9_loopfilter.h -index 39648a72c..6f190aeb5 100644 +index 39648a7..6f190ae 100644 --- a/vp9/common/vp9_loopfilter.h +++ b/vp9/common/vp9_loopfilter.h @@ -12,7 +12,7 @@ @@ -1246,64 +2563,76 @@ index 39648a72c..6f190aeb5 100644 #include "vp9/common/vp9_blockd.h" #include "vp9/common/vp9_seg_common.h" diff --git a/vp9/common/vp9_mfqe.c b/vp9/common/vp9_mfqe.c -index cf60fa40f..58a2ab7ef 100644 +index 1947f3b..03dc277 100644 --- a/vp9/common/vp9_mfqe.c +++ b/vp9/common/vp9_mfqe.c -@@ -8,9 +8,9 @@ +@@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "./vpx_config.h" -+#include "vpx_config.h" - #include "./vp9_rtcd.h" +-#include "./vp9_rtcd.h" -#include "./vpx_dsp_rtcd.h" +-#include "./vpx_scale_rtcd.h" ++#include "vpx_config.h" ++#include "vp9_rtcd.h" +#include "vpx_dsp_rtcd.h" - #include "./vpx_scale_rtcd.h" ++#include "vpx_scale_rtcd.h" #include "vp9/common/vp9_onyxc_int.h" + #include "vp9/common/vp9_postproc.h" diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h -index 4c8fcf698..e47ffb40d 100644 +index 4c8fcf6..edc245d 100644 --- a/vp9/common/vp9_onyxc_int.h +++ b/vp9/common/vp9_onyxc_int.h -@@ -11,7 +11,7 @@ +@@ -11,9 +11,9 @@ #ifndef VPX_VP9_COMMON_VP9_ONYXC_INT_H_ #define VPX_VP9_COMMON_VP9_ONYXC_INT_H_ -#include "./vpx_config.h" +#include "vpx_config.h" #include "vpx/internal/vpx_codec_internal.h" - #include "./vp9_rtcd.h" +-#include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" #include "vp9/common/vp9_alloccommon.h" + #include "vp9/common/vp9_loopfilter.h" + #include "vp9/common/vp9_entropymv.h" diff --git a/vp9/common/vp9_postproc.c b/vp9/common/vp9_postproc.c -index 96519f005..3fa735b02 100644 +index 5fa92c8..9c52585 100644 --- a/vp9/common/vp9_postproc.c +++ b/vp9/common/vp9_postproc.c -@@ -12,8 +12,8 @@ +@@ -12,10 +12,10 @@ #include #include -#include "./vpx_dsp_rtcd.h" -#include "./vpx_config.h" +-#include "./vpx_scale_rtcd.h" +-#include "./vp9_rtcd.h" +#include "vpx_dsp_rtcd.h" +#include "vpx_config.h" - #include "./vpx_scale_rtcd.h" - #include "./vp9_rtcd.h" ++#include "vpx_scale_rtcd.h" ++#include "vp9_rtcd.h" + #include "vpx_dsp/vpx_dsp_common.h" + #include "vpx_dsp/postproc.h" diff --git a/vp9/common/vp9_reconinter.c b/vp9/common/vp9_reconinter.c -index 0a60b853d..0827f1b9d 100644 +index 0a60b85..af41895 100644 --- a/vp9/common/vp9_reconinter.c +++ b/vp9/common/vp9_reconinter.c -@@ -11,7 +11,7 @@ +@@ -10,8 +10,8 @@ + #include - #include "./vpx_scale_rtcd.h" +-#include "./vpx_scale_rtcd.h" -#include "./vpx_config.h" ++#include "vpx_scale_rtcd.h" +#include "vpx_config.h" #include "vp9/common/vp9_blockd.h" #include "vp9/common/vp9_reconinter.h" diff --git a/vp9/common/vp9_reconintra.c b/vp9/common/vp9_reconintra.c -index 3e5ed616d..62b05853a 100644 +index 3e5ed61..62b0585 100644 --- a/vp9/common/vp9_reconintra.c +++ b/vp9/common/vp9_reconintra.c @@ -8,8 +8,8 @@ @@ -1318,20 +2647,23 @@ index 3e5ed616d..62b05853a 100644 #if CONFIG_VP9_HIGHBITDEPTH #include "vpx_dsp/vpx_dsp_common.h" diff --git a/vp9/common/vp9_rtcd.c b/vp9/common/vp9_rtcd.c -index 1a93b97e5..f1e024344 100644 +index 1a93b97..b1e3202 100644 --- a/vp9/common/vp9_rtcd.c +++ b/vp9/common/vp9_rtcd.c -@@ -7,7 +7,7 @@ +@@ -7,9 +7,9 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "./vpx_config.h" +#include "vpx_config.h" #define RTCD_C - #include "./vp9_rtcd.h" +-#include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" #include "vpx_ports/vpx_once.h" + + void vp9_rtcd(void) { once(setup_rtcd_internal); } diff --git a/vp9/common/vp9_scale.c b/vp9/common/vp9_scale.c -index 8aedd6622..104a92763 100644 +index 8aedd66..104a927 100644 --- a/vp9/common/vp9_scale.c +++ b/vp9/common/vp9_scale.c @@ -8,7 +8,7 @@ @@ -1344,7 +2676,7 @@ index 8aedd6622..104a92763 100644 #include "vp9/common/vp9_scale.h" #include "vpx_dsp/vpx_filter.h" diff --git a/vp9/common/vp9_thread_common.c b/vp9/common/vp9_thread_common.c -index 24adbcbff..0a7ddb052 100644 +index 24adbcb..0a7ddb0 100644 --- a/vp9/common/vp9_thread_common.c +++ b/vp9/common/vp9_thread_common.c @@ -10,7 +10,7 @@ @@ -1357,7 +2689,7 @@ index 24adbcbff..0a7ddb052 100644 #include "vpx_mem/vpx_mem.h" #include "vpx_util/vpx_pthread.h" diff --git a/vp9/common/vp9_thread_common.h b/vp9/common/vp9_thread_common.h -index 96c705d0d..4a9519fae 100644 +index 96c705d..4a9519f 100644 --- a/vp9/common/vp9_thread_common.h +++ b/vp9/common/vp9_thread_common.h @@ -10,7 +10,7 @@ @@ -1369,34 +2701,94 @@ index 96c705d0d..4a9519fae 100644 #include "vp9/common/vp9_loopfilter.h" #include "vpx_util/vpx_pthread.h" #include "vpx_util/vpx_thread.h" +diff --git a/vp9/common/x86/vp9_highbd_iht16x16_add_sse4.c b/vp9/common/x86/vp9_highbd_iht16x16_add_sse4.c +index 57b79a7..b7ba871 100644 +--- a/vp9/common/x86/vp9_highbd_iht16x16_add_sse4.c ++++ b/vp9/common/x86/vp9_highbd_iht16x16_add_sse4.c +@@ -8,7 +8,7 @@ + * be found in the AUTHORS file in the root of the source tree. + */ + +-#include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" + #include "vp9/common/vp9_idct.h" + #include "vpx_dsp/x86/highbd_inv_txfm_sse4.h" + #include "vpx_dsp/x86/inv_txfm_sse2.h" +diff --git a/vp9/common/x86/vp9_highbd_iht4x4_add_sse4.c b/vp9/common/x86/vp9_highbd_iht4x4_add_sse4.c +index af15853..dcd0af2 100644 +--- a/vp9/common/x86/vp9_highbd_iht4x4_add_sse4.c ++++ b/vp9/common/x86/vp9_highbd_iht4x4_add_sse4.c +@@ -8,7 +8,7 @@ + * be found in the AUTHORS file in the root of the source tree. + */ + +-#include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" + #include "vp9/common/vp9_idct.h" + #include "vpx_dsp/x86/highbd_inv_txfm_sse4.h" + #include "vpx_dsp/x86/inv_txfm_sse2.h" +diff --git a/vp9/common/x86/vp9_highbd_iht8x8_add_sse4.c b/vp9/common/x86/vp9_highbd_iht8x8_add_sse4.c +index 7d949b6..6d6d438 100644 +--- a/vp9/common/x86/vp9_highbd_iht8x8_add_sse4.c ++++ b/vp9/common/x86/vp9_highbd_iht8x8_add_sse4.c +@@ -8,7 +8,7 @@ + * be found in the AUTHORS file in the root of the source tree. + */ + +-#include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" + #include "vp9/common/vp9_idct.h" + #include "vpx_dsp/x86/highbd_inv_txfm_sse4.h" + #include "vpx_dsp/x86/inv_txfm_sse2.h" +diff --git a/vp9/common/x86/vp9_idct_intrin_sse2.c b/vp9/common/x86/vp9_idct_intrin_sse2.c +index ad69371..95f5119 100644 +--- a/vp9/common/x86/vp9_idct_intrin_sse2.c ++++ b/vp9/common/x86/vp9_idct_intrin_sse2.c +@@ -8,7 +8,7 @@ + * be found in the AUTHORS file in the root of the source tree. + */ + +-#include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" + #include "vpx_dsp/x86/inv_txfm_sse2.h" + + void vp9_iht4x4_16_add_sse2(const tran_low_t *input, uint8_t *dest, int stride, diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c -index 45ef99adf..2ed9afb7b 100644 +index 9008e54..9162f8d 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c -@@ -12,7 +12,7 @@ +@@ -11,9 +11,9 @@ + #include #include // qsort() - #include "./vp9_rtcd.h" +-#include "./vp9_rtcd.h" -#include "./vpx_dsp_rtcd.h" +-#include "./vpx_scale_rtcd.h" ++#include "vp9_rtcd.h" +#include "vpx_dsp_rtcd.h" - #include "./vpx_scale_rtcd.h" ++#include "vpx_scale_rtcd.h" #include "vpx_dsp/bitreader_buffer.h" + #include "vpx_dsp/bitreader.h" diff --git a/vp9/decoder/vp9_decoder.c b/vp9/decoder/vp9_decoder.c -index 5c77df500..c10280213 100644 +index 1554361..583d870 100644 --- a/vp9/decoder/vp9_decoder.c +++ b/vp9/decoder/vp9_decoder.c -@@ -13,7 +13,7 @@ +@@ -12,9 +12,9 @@ + #include #include - #include "./vp9_rtcd.h" +-#include "./vp9_rtcd.h" -#include "./vpx_dsp_rtcd.h" +-#include "./vpx_scale_rtcd.h" ++#include "vp9_rtcd.h" +#include "vpx_dsp_rtcd.h" - #include "./vpx_scale_rtcd.h" ++#include "vpx_scale_rtcd.h" - #include "vpx_mem/vpx_mem.h" + #include "vpx/internal/vpx_codec_internal.h" + #include "vpx/vpx_codec.h" diff --git a/vp9/decoder/vp9_decoder.h b/vp9/decoder/vp9_decoder.h -index b3ee4eab5..00bf00bd2 100644 +index b3ee4ea..fdb976f 100644 --- a/vp9/decoder/vp9_decoder.h +++ b/vp9/decoder/vp9_decoder.h @@ -11,7 +11,7 @@ @@ -1408,8 +2800,17 @@ index b3ee4eab5..00bf00bd2 100644 #include "vpx/vpx_codec.h" #include "vpx_dsp/bitreader.h" +@@ -22,7 +22,7 @@ + #include "vp9/common/vp9_thread_common.h" + #include "vp9/common/vp9_onyxc_int.h" + #include "vp9/common/vp9_ppflags.h" +-#include "./vp9_job_queue.h" ++#include "vp9_job_queue.h" + + #ifdef __cplusplus + extern "C" { diff --git a/vp9/encoder/arm/neon/vp9_dct_neon.c b/vp9/encoder/arm/neon/vp9_dct_neon.c -index 997b5477e..89238df19 100644 +index 997b547..5fe0c40 100644 --- a/vp9/encoder/arm/neon/vp9_dct_neon.c +++ b/vp9/encoder/arm/neon/vp9_dct_neon.c @@ -10,9 +10,9 @@ @@ -1417,54 +2818,117 @@ index 997b5477e..89238df19 100644 #include -#include "./vpx_config.h" -+#include "vpx_config.h" - #include "./vp9_rtcd.h" +-#include "./vp9_rtcd.h" -#include "./vpx_dsp_rtcd.h" ++#include "vpx_config.h" ++#include "vp9_rtcd.h" +#include "vpx_dsp_rtcd.h" #include "vpx_dsp/txfm_common.h" #include "vpx_dsp/arm/mem_neon.h" diff --git a/vp9/encoder/arm/neon/vp9_denoiser_neon.c b/vp9/encoder/arm/neon/vp9_denoiser_neon.c -index d631cd437..b5bda7ca5 100644 +index d631cd4..83bdea5 100644 --- a/vp9/encoder/arm/neon/vp9_denoiser_neon.c +++ b/vp9/encoder/arm/neon/vp9_denoiser_neon.c -@@ -10,7 +10,7 @@ +@@ -10,8 +10,8 @@ #include -#include "./vpx_config.h" +-#include "./vp9_rtcd.h" +#include "vpx_config.h" - #include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" #include "vpx/vpx_integer.h" + #include "vp9/common/vp9_reconinter.h" +diff --git a/vp9/encoder/arm/neon/vp9_error_neon.c b/vp9/encoder/arm/neon/vp9_error_neon.c +index 0cf0bf2..51d8816 100644 +--- a/vp9/encoder/arm/neon/vp9_error_neon.c ++++ b/vp9/encoder/arm/neon/vp9_error_neon.c +@@ -11,7 +11,7 @@ + #include + #include + +-#include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" + #include "vpx_dsp/arm/mem_neon.h" + #include "vpx_dsp/arm/sum_neon.h" + +diff --git a/vp9/encoder/arm/neon/vp9_error_sve.c b/vp9/encoder/arm/neon/vp9_error_sve.c +index 78e7361..8001491 100644 +--- a/vp9/encoder/arm/neon/vp9_error_sve.c ++++ b/vp9/encoder/arm/neon/vp9_error_sve.c +@@ -11,7 +11,7 @@ + #include + #include + +-#include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" + #include "vpx_dsp/arm/mem_neon.h" + #include "vpx_dsp/arm/sum_neon.h" + #include "vpx_dsp/arm/vpx_neon_sve_bridge.h" diff --git a/vp9/encoder/arm/neon/vp9_frame_scale_neon.c b/vp9/encoder/arm/neon/vp9_frame_scale_neon.c -index bc8dd4a34..ff09ea53e 100644 +index bc8dd4a..dacf06e 100644 --- a/vp9/encoder/arm/neon/vp9_frame_scale_neon.c +++ b/vp9/encoder/arm/neon/vp9_frame_scale_neon.c -@@ -11,7 +11,7 @@ +@@ -10,9 +10,9 @@ + #include - #include "./vp9_rtcd.h" +-#include "./vp9_rtcd.h" -#include "./vpx_dsp_rtcd.h" +-#include "./vpx_scale_rtcd.h" ++#include "vp9_rtcd.h" +#include "vpx_dsp_rtcd.h" - #include "./vpx_scale_rtcd.h" ++#include "vpx_scale_rtcd.h" #include "vp9/common/vp9_blockd.h" #include "vpx_dsp/arm/mem_neon.h" + #include "vpx_dsp/arm/transpose_neon.h" +diff --git a/vp9/encoder/arm/neon/vp9_highbd_error_neon.c b/vp9/encoder/arm/neon/vp9_highbd_error_neon.c +index d9b1834..26a5f5d 100644 +--- a/vp9/encoder/arm/neon/vp9_highbd_error_neon.c ++++ b/vp9/encoder/arm/neon/vp9_highbd_error_neon.c +@@ -11,7 +11,7 @@ + #include + #include + +-#include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" + #include "vpx_dsp/arm/mem_neon.h" + #include "vpx_dsp/arm/sum_neon.h" + diff --git a/vp9/encoder/arm/neon/vp9_highbd_temporal_filter_neon.c b/vp9/encoder/arm/neon/vp9_highbd_temporal_filter_neon.c -index c3aef3c86..40d503899 100644 +index f990a74..0517465 100644 --- a/vp9/encoder/arm/neon/vp9_highbd_temporal_filter_neon.c +++ b/vp9/encoder/arm/neon/vp9_highbd_temporal_filter_neon.c -@@ -12,7 +12,7 @@ +@@ -11,8 +11,8 @@ + #include #include - #include "./vp9_rtcd.h" +-#include "./vp9_rtcd.h" -#include "./vpx_config.h" ++#include "vp9_rtcd.h" +#include "vpx_config.h" #include "vpx/vpx_integer.h" - #include "vp9/encoder/vp9_encoder.h" - #include "vp9/encoder/vp9_temporal_filter.h" + #include "vpx_dsp/arm/mem_neon.h" + #include "vpx_dsp/arm/transpose_neon.h" +diff --git a/vp9/encoder/arm/neon/vp9_highbd_temporal_filter_sve2.c b/vp9/encoder/arm/neon/vp9_highbd_temporal_filter_sve2.c +index 73660eb..2cbaefc 100644 +--- a/vp9/encoder/arm/neon/vp9_highbd_temporal_filter_sve2.c ++++ b/vp9/encoder/arm/neon/vp9_highbd_temporal_filter_sve2.c +@@ -13,8 +13,8 @@ + #include + #include + +-#include "./vp9_rtcd.h" +-#include "./vpx_config.h" ++#include "vp9_rtcd.h" ++#include "vpx_config.h" + #include "vpx/vpx_integer.h" + #include "vpx_dsp/arm/mem_neon.h" + #include "vpx_dsp/arm/transpose_neon.h" diff --git a/vp9/encoder/arm/neon/vp9_quantize_neon.c b/vp9/encoder/arm/neon/vp9_quantize_neon.c -index 96d061436..264d5f382 100644 +index 96d0614..264d5f3 100644 --- a/vp9/encoder/arm/neon/vp9_quantize_neon.c +++ b/vp9/encoder/arm/neon/vp9_quantize_neon.c @@ -13,7 +13,7 @@ @@ -1477,61 +2941,139 @@ index 96d061436..264d5f382 100644 #include "vp9/common/vp9_quant_common.h" diff --git a/vp9/encoder/arm/neon/vp9_temporal_filter_neon.c b/vp9/encoder/arm/neon/vp9_temporal_filter_neon.c -index a651a15d9..ca5ecc872 100644 +index b6cce39..c3e98ae 100644 --- a/vp9/encoder/arm/neon/vp9_temporal_filter_neon.c +++ b/vp9/encoder/arm/neon/vp9_temporal_filter_neon.c -@@ -12,7 +12,7 @@ +@@ -11,8 +11,8 @@ + #include #include - #include "./vp9_rtcd.h" +-#include "./vp9_rtcd.h" -#include "./vpx_config.h" ++#include "vp9_rtcd.h" +#include "vpx_config.h" #include "vpx/vpx_integer.h" - #include "vp9/encoder/vp9_encoder.h" - #include "vp9/encoder/vp9_temporal_filter.h" + #include "vpx_dsp/arm/mem_neon.h" + #include "vpx_dsp/arm/transpose_neon.h" +diff --git a/vp9/encoder/arm/neon/vp9_temporal_filter_neon_dotprod.c b/vp9/encoder/arm/neon/vp9_temporal_filter_neon_dotprod.c +index 1fa2d87..54e02cf 100644 +--- a/vp9/encoder/arm/neon/vp9_temporal_filter_neon_dotprod.c ++++ b/vp9/encoder/arm/neon/vp9_temporal_filter_neon_dotprod.c +@@ -11,8 +11,8 @@ + #include + #include + +-#include "./vp9_rtcd.h" +-#include "./vpx_config.h" ++#include "vp9_rtcd.h" ++#include "vpx_config.h" + #include "vpx/vpx_integer.h" + #include "vpx_dsp/arm/mem_neon.h" + #include "vpx_dsp/arm/transpose_neon.h" +diff --git a/vp9/encoder/arm/neon/vp9_temporal_filter_neon_i8mm.c b/vp9/encoder/arm/neon/vp9_temporal_filter_neon_i8mm.c +index 3803873..dc57b8d 100644 +--- a/vp9/encoder/arm/neon/vp9_temporal_filter_neon_i8mm.c ++++ b/vp9/encoder/arm/neon/vp9_temporal_filter_neon_i8mm.c +@@ -11,8 +11,8 @@ + #include + #include + +-#include "./vp9_rtcd.h" +-#include "./vpx_config.h" ++#include "vp9_rtcd.h" ++#include "vpx_config.h" + #include "vpx/vpx_integer.h" + #include "vpx_dsp/arm/mem_neon.h" + #include "vpx_dsp/arm/transpose_neon.h" diff --git a/vp9/encoder/mips/msa/vp9_error_msa.c b/vp9/encoder/mips/msa/vp9_error_msa.c -index 61786d8f6..32ee52ecc 100644 +index 61786d8..e0df8bc 100644 --- a/vp9/encoder/mips/msa/vp9_error_msa.c +++ b/vp9/encoder/mips/msa/vp9_error_msa.c -@@ -8,7 +8,7 @@ +@@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "./vpx_config.h" +-#include "./vp9_rtcd.h" +#include "vpx_config.h" - #include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" #include "vpx_dsp/mips/macros_msa.h" + #define BLOCK_ERROR_BLOCKSIZE_MSA(BSize) \ +diff --git a/vp9/encoder/mips/msa/vp9_fdct16x16_msa.c b/vp9/encoder/mips/msa/vp9_fdct16x16_msa.c +index efbbe83..b20604e 100644 +--- a/vp9/encoder/mips/msa/vp9_fdct16x16_msa.c ++++ b/vp9/encoder/mips/msa/vp9_fdct16x16_msa.c +@@ -10,7 +10,7 @@ + + #include + +-#include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" + #include "vp9/common/vp9_enums.h" + #include "vp9/encoder/mips/msa/vp9_fdct_msa.h" + #include "vpx_dsp/mips/fwd_txfm_msa.h" +diff --git a/vp9/encoder/mips/msa/vp9_fdct4x4_msa.c b/vp9/encoder/mips/msa/vp9_fdct4x4_msa.c +index 9c5cc12..fb24f65 100644 +--- a/vp9/encoder/mips/msa/vp9_fdct4x4_msa.c ++++ b/vp9/encoder/mips/msa/vp9_fdct4x4_msa.c +@@ -10,7 +10,7 @@ + + #include + +-#include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" + #include "vp9/common/vp9_enums.h" + #include "vp9/encoder/mips/msa/vp9_fdct_msa.h" + +diff --git a/vp9/encoder/mips/msa/vp9_fdct8x8_msa.c b/vp9/encoder/mips/msa/vp9_fdct8x8_msa.c +index 26d81aa..6835bb9 100644 +--- a/vp9/encoder/mips/msa/vp9_fdct8x8_msa.c ++++ b/vp9/encoder/mips/msa/vp9_fdct8x8_msa.c +@@ -10,7 +10,7 @@ + + #include + +-#include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" + #include "vp9/common/vp9_enums.h" + #include "vp9/encoder/mips/msa/vp9_fdct_msa.h" + diff --git a/vp9/encoder/ppc/vp9_quantize_vsx.c b/vp9/encoder/ppc/vp9_quantize_vsx.c -index 4d3155847..d16c3a023 100644 +index 4d31558..f10807d 100644 --- a/vp9/encoder/ppc/vp9_quantize_vsx.c +++ b/vp9/encoder/ppc/vp9_quantize_vsx.c -@@ -8,7 +8,7 @@ +@@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "./vpx_config.h" +#include "vpx_config.h" - #include "./vp9_rtcd.h" +-#include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" #include "vpx_dsp/ppc/types_vsx.h" + + // Multiply the packed 16-bit integers in a and b, producing intermediate 32-bit diff --git a/vp9/encoder/vp9_dct.c b/vp9/encoder/vp9_dct.c -index 2f42c6afc..328da03ef 100644 +index 2f42c6a..d45d625 100644 --- a/vp9/encoder/vp9_dct.c +++ b/vp9/encoder/vp9_dct.c -@@ -12,8 +12,8 @@ +@@ -11,9 +11,9 @@ + #include #include - #include "./vp9_rtcd.h" +-#include "./vp9_rtcd.h" -#include "./vpx_config.h" -#include "./vpx_dsp_rtcd.h" ++#include "vp9_rtcd.h" +#include "vpx_config.h" +#include "vpx_dsp_rtcd.h" #include "vp9/common/vp9_blockd.h" #include "vp9/common/vp9_idct.h" diff --git a/vp9/encoder/vp9_denoiser.c b/vp9/encoder/vp9_denoiser.c -index e5dffa90a..370b1d676 100644 +index e5dffa9..370b1d6 100644 --- a/vp9/encoder/vp9_denoiser.c +++ b/vp9/encoder/vp9_denoiser.c @@ -12,7 +12,7 @@ @@ -1544,37 +3086,41 @@ index e5dffa90a..370b1d676 100644 #include "vpx_scale/yv12config.h" #include "vpx/vpx_integer.h" diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c -index 937f22e83..499d2806e 100644 +index 0a038a0..113a459 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c -@@ -14,8 +14,8 @@ +@@ -13,9 +13,9 @@ + #include #include - #include "./vp9_rtcd.h" +-#include "./vp9_rtcd.h" -#include "./vpx_dsp_rtcd.h" -#include "./vpx_config.h" ++#include "vp9_rtcd.h" +#include "vpx_dsp_rtcd.h" +#include "vpx_config.h" #include "vpx_dsp/vpx_dsp_common.h" #include "vpx_ports/mem.h" diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c -index eded9f5c4..bd391802a 100644 +index 1572244..4cfc770 100644 --- a/vp9/encoder/vp9_encodemb.c +++ b/vp9/encoder/vp9_encodemb.c -@@ -9,8 +9,8 @@ - */ +@@ -10,9 +10,9 @@ + + #include - #include "./vp9_rtcd.h" +-#include "./vp9_rtcd.h" -#include "./vpx_config.h" -#include "./vpx_dsp_rtcd.h" ++#include "vp9_rtcd.h" +#include "vpx_config.h" +#include "vpx_dsp_rtcd.h" #include "vpx_dsp/quantize.h" #include "vpx_mem/vpx_mem.h" diff --git a/vp9/encoder/vp9_encodemb.h b/vp9/encoder/vp9_encodemb.h -index 1391446be..ffa27278a 100644 +index 1391446..ffa2727 100644 --- a/vp9/encoder/vp9_encodemb.h +++ b/vp9/encoder/vp9_encodemb.h @@ -11,7 +11,7 @@ @@ -1587,22 +3133,26 @@ index 1391446be..ffa27278a 100644 #ifdef __cplusplus diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c -index 59179faa0..4543a3f4d 100644 +index 5a7e949..f554899 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c -@@ -16,8 +16,8 @@ +@@ -15,10 +15,10 @@ + #include #include - #include "./vp9_rtcd.h" +-#include "./vp9_rtcd.h" -#include "./vpx_config.h" -#include "./vpx_dsp_rtcd.h" +-#include "./vpx_scale_rtcd.h" ++#include "vp9_rtcd.h" +#include "vpx_config.h" +#include "vpx_dsp_rtcd.h" - #include "./vpx_scale_rtcd.h" ++#include "vpx_scale_rtcd.h" #include "vpx/vpx_codec.h" #include "vpx/vpx_ext_ratectrl.h" + #include "vpx_dsp/psnr.h" diff --git a/vp9/encoder/vp9_encoder.h b/vp9/encoder/vp9_encoder.h -index 8afea3ad5..100baffa8 100644 +index 9f32400..0bb9eb0 100644 --- a/vp9/encoder/vp9_encoder.h +++ b/vp9/encoder/vp9_encoder.h @@ -13,8 +13,8 @@ @@ -1617,35 +3167,41 @@ index 8afea3ad5..100baffa8 100644 #include "vpx/vpx_ext_ratectrl.h" #include "vpx/vp8cx.h" diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c -index a41eca927..8443099e0 100644 +index e5918a9..2c3623b 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c -@@ -13,7 +13,7 @@ +@@ -13,8 +13,8 @@ #include #include -#include "./vpx_dsp_rtcd.h" +-#include "./vpx_scale_rtcd.h" +#include "vpx_dsp_rtcd.h" - #include "./vpx_scale_rtcd.h" ++#include "vpx_scale_rtcd.h" #include "vpx_dsp/vpx_dsp_common.h" + #include "vpx_mem/vpx_mem.h" diff --git a/vp9/encoder/vp9_frame_scale.c b/vp9/encoder/vp9_frame_scale.c -index c74d52324..6fe0989cc 100644 +index c74d523..45b1397 100644 --- a/vp9/encoder/vp9_frame_scale.c +++ b/vp9/encoder/vp9_frame_scale.c -@@ -9,8 +9,8 @@ +@@ -8,10 +8,10 @@ + * be found in the AUTHORS file in the root of the source tree. */ - #include "./vp9_rtcd.h" +-#include "./vp9_rtcd.h" -#include "./vpx_config.h" -#include "./vpx_dsp_rtcd.h" +-#include "./vpx_scale_rtcd.h" ++#include "vp9_rtcd.h" +#include "vpx_config.h" +#include "vpx_dsp_rtcd.h" - #include "./vpx_scale_rtcd.h" ++#include "vpx_scale_rtcd.h" #include "vp9/common/vp9_blockd.h" #include "vp9/encoder/vp9_encoder.h" + #include "vpx/vpx_codec.h" diff --git a/vp9/encoder/vp9_lookahead.c b/vp9/encoder/vp9_lookahead.c -index b6be4f88a..5b2ba55d5 100644 +index ba4fe3d..def45ca 100644 --- a/vp9/encoder/vp9_lookahead.c +++ b/vp9/encoder/vp9_lookahead.c @@ -11,7 +11,7 @@ @@ -1658,20 +3214,22 @@ index b6be4f88a..5b2ba55d5 100644 #include "vp9/common/vp9_common.h" diff --git a/vp9/encoder/vp9_mbgraph.c b/vp9/encoder/vp9_mbgraph.c -index 2f20a8fe6..82f2b96b1 100644 +index 2f20a8f..c5c497e 100644 --- a/vp9/encoder/vp9_mbgraph.c +++ b/vp9/encoder/vp9_mbgraph.c -@@ -11,7 +11,7 @@ +@@ -10,8 +10,8 @@ + #include - #include "./vp9_rtcd.h" +-#include "./vp9_rtcd.h" -#include "./vpx_dsp_rtcd.h" ++#include "vp9_rtcd.h" +#include "vpx_dsp_rtcd.h" #include "vpx_dsp/vpx_dsp_common.h" #include "vpx_mem/vpx_mem.h" diff --git a/vp9/encoder/vp9_mcomp.c b/vp9/encoder/vp9_mcomp.c -index cbe1c4029..d76990ea8 100644 +index 5576fab..7f41f21 100644 --- a/vp9/encoder/vp9_mcomp.c +++ b/vp9/encoder/vp9_mcomp.c @@ -13,8 +13,8 @@ @@ -1686,7 +3244,7 @@ index cbe1c4029..d76990ea8 100644 #include "vpx_dsp/vpx_dsp_common.h" #include "vpx_mem/vpx_mem.h" diff --git a/vp9/encoder/vp9_noise_estimate.c b/vp9/encoder/vp9_noise_estimate.c -index 4ee6e51ba..d580db0f5 100644 +index 4ee6e51..d580db0 100644 --- a/vp9/encoder/vp9_noise_estimate.c +++ b/vp9/encoder/vp9_noise_estimate.c @@ -12,7 +12,7 @@ @@ -1698,21 +3256,36 @@ index 4ee6e51ba..d580db0f5 100644 #include "vpx_dsp/vpx_dsp_common.h" #include "vpx_scale/yv12config.h" #include "vpx/vpx_integer.h" +diff --git a/vp9/encoder/vp9_picklpf.c b/vp9/encoder/vp9_picklpf.c +index 3a620df..79bb1f0 100644 +--- a/vp9/encoder/vp9_picklpf.c ++++ b/vp9/encoder/vp9_picklpf.c +@@ -11,7 +11,7 @@ + #include + #include + +-#include "./vpx_scale_rtcd.h" ++#include "vpx_scale_rtcd.h" + #include "vpx_dsp/psnr.h" + #include "vpx_mem/vpx_mem.h" + #include "vpx_ports/mem.h" diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c -index d561b5062..328fb6c9f 100644 +index 93b2089..caee426 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c -@@ -14,7 +14,7 @@ +@@ -14,8 +14,8 @@ #include + #include - #include "./vp9_rtcd.h" +-#include "./vp9_rtcd.h" -#include "./vpx_dsp_rtcd.h" ++#include "vp9_rtcd.h" +#include "vpx_dsp_rtcd.h" #include "vpx/vpx_codec.h" #include "vpx_dsp/vpx_dsp_common.h" diff --git a/vp9/encoder/vp9_quantize.c b/vp9/encoder/vp9_quantize.c -index d37e020b0..397209c4e 100644 +index 31b148e..3a4afbd 100644 --- a/vp9/encoder/vp9_quantize.c +++ b/vp9/encoder/vp9_quantize.c @@ -10,7 +10,7 @@ @@ -1725,7 +3298,7 @@ index d37e020b0..397209c4e 100644 #include "vpx_ports/bitops.h" #include "vpx_ports/mem.h" diff --git a/vp9/encoder/vp9_quantize.h b/vp9/encoder/vp9_quantize.h -index f626f0656..d1ec14a64 100644 +index bca2e05..0ea6039 100644 --- a/vp9/encoder/vp9_quantize.h +++ b/vp9/encoder/vp9_quantize.h @@ -11,7 +11,7 @@ @@ -1738,7 +3311,7 @@ index f626f0656..d1ec14a64 100644 #ifdef __cplusplus diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c -index e95bcc83e..5f0f0c2e8 100644 +index 958f36e..c86f9a8 100644 --- a/vp9/encoder/vp9_ratectrl.c +++ b/vp9/encoder/vp9_ratectrl.c @@ -16,7 +16,7 @@ @@ -1750,21 +3323,36 @@ index e95bcc83e..5f0f0c2e8 100644 #include "vpx_dsp/vpx_dsp_common.h" #include "vpx_mem/vpx_mem.h" #include "vpx_ports/mem.h" +diff --git a/vp9/encoder/vp9_rd.c b/vp9/encoder/vp9_rd.c +index 95c9597..75c217d 100644 +--- a/vp9/encoder/vp9_rd.c ++++ b/vp9/encoder/vp9_rd.c +@@ -12,7 +12,7 @@ + #include + #include + +-#include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" + + #include "vpx_dsp/vpx_dsp_common.h" + #include "vpx_mem/vpx_mem.h" diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c -index 260aa0a54..342ead195 100644 +index 9ad769e..3efdf10 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c -@@ -12,7 +12,7 @@ +@@ -11,8 +11,8 @@ + #include #include - #include "./vp9_rtcd.h" +-#include "./vp9_rtcd.h" -#include "./vpx_dsp_rtcd.h" ++#include "vp9_rtcd.h" +#include "vpx_dsp_rtcd.h" #include "vpx_dsp/vpx_dsp_common.h" #include "vpx_mem/vpx_mem.h" diff --git a/vp9/encoder/vp9_resize.c b/vp9/encoder/vp9_resize.c -index 352d8f127..44c9246e0 100644 +index 352d8f1..44c9246 100644 --- a/vp9/encoder/vp9_resize.c +++ b/vp9/encoder/vp9_resize.c @@ -15,7 +15,7 @@ @@ -1777,7 +3365,7 @@ index 352d8f127..44c9246e0 100644 #include "vpx_dsp/vpx_dsp_common.h" #endif // CONFIG_VP9_HIGHBITDEPTH diff --git a/vp9/encoder/vp9_temporal_filter_constants.h b/vp9/encoder/vp9_temporal_filter_constants.h -index 8776dfc06..de1663c17 100644 +index 8776dfc..de1663c 100644 --- a/vp9/encoder/vp9_temporal_filter_constants.h +++ b/vp9/encoder/vp9_temporal_filter_constants.h @@ -10,7 +10,7 @@ @@ -1790,7 +3378,7 @@ index 8776dfc06..de1663c17 100644 // Division using multiplication and shifting. The C implementation does: // modifier *= 3; diff --git a/vp9/encoder/vp9_tpl_model.c b/vp9/encoder/vp9_tpl_model.c -index c40d71e3b..800f55721 100644 +index f65c98f..4b77c63 100644 --- a/vp9/encoder/vp9_tpl_model.c +++ b/vp9/encoder/vp9_tpl_model.c @@ -10,7 +10,7 @@ @@ -1802,99 +3390,378 @@ index c40d71e3b..800f55721 100644 #if CONFIG_NON_GREEDY_MV #include "vp9/common/vp9_mvref_common.h" #endif +diff --git a/vp9/encoder/x86/highbd_temporal_filter_avx2.c b/vp9/encoder/x86/highbd_temporal_filter_avx2.c +index 418edd6..c664457 100644 +--- a/vp9/encoder/x86/highbd_temporal_filter_avx2.c ++++ b/vp9/encoder/x86/highbd_temporal_filter_avx2.c +@@ -11,8 +11,8 @@ + #include + #include + +-#include "./vp9_rtcd.h" +-#include "./vpx_dsp_rtcd.h" ++#include "vp9_rtcd.h" ++#include "vpx_dsp_rtcd.h" + #include "vp9/encoder/vp9_temporal_filter.h" + + static INLINE void highbd_shuffle_12tap_filter_avx2(const int16_t *filter, diff --git a/vp9/encoder/x86/highbd_temporal_filter_sse4.c b/vp9/encoder/x86/highbd_temporal_filter_sse4.c -index 97f182c66..15666adf6 100644 +index 97f182c..db48311 100644 --- a/vp9/encoder/x86/highbd_temporal_filter_sse4.c +++ b/vp9/encoder/x86/highbd_temporal_filter_sse4.c -@@ -12,7 +12,7 @@ +@@ -11,8 +11,8 @@ + #include #include - #include "./vp9_rtcd.h" +-#include "./vp9_rtcd.h" -#include "./vpx_config.h" ++#include "vp9_rtcd.h" +#include "vpx_config.h" #include "vpx/vpx_integer.h" #include "vp9/encoder/vp9_encoder.h" #include "vp9/encoder/vp9_temporal_filter.h" +diff --git a/vp9/encoder/x86/highbd_temporal_filter_ssse3.c b/vp9/encoder/x86/highbd_temporal_filter_ssse3.c +index 4540dca..99f1e08 100644 +--- a/vp9/encoder/x86/highbd_temporal_filter_ssse3.c ++++ b/vp9/encoder/x86/highbd_temporal_filter_ssse3.c +@@ -11,8 +11,8 @@ + #include + #include // SSSE3 + +-#include "./vp9_rtcd.h" +-#include "./vpx_dsp_rtcd.h" ++#include "vp9_rtcd.h" ++#include "vpx_dsp_rtcd.h" + #include "vp9/encoder/vp9_temporal_filter.h" + + static INLINE void highbd_shuffle_12tap_filter_ssse3(const int16_t *filter, +diff --git a/vp9/encoder/x86/temporal_filter_avx2.c b/vp9/encoder/x86/temporal_filter_avx2.c +index 9d94ff8..ff042d3 100644 +--- a/vp9/encoder/x86/temporal_filter_avx2.c ++++ b/vp9/encoder/x86/temporal_filter_avx2.c +@@ -11,7 +11,7 @@ + #include + #include + +-#include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" + #include "vp9/encoder/vp9_temporal_filter.h" + + DECLARE_ALIGNED(32, static const uint8_t, diff --git a/vp9/encoder/x86/temporal_filter_sse4.c b/vp9/encoder/x86/temporal_filter_sse4.c -index 7571bfcca..c902a7246 100644 +index 7571bfc..16f8d8e 100644 --- a/vp9/encoder/x86/temporal_filter_sse4.c +++ b/vp9/encoder/x86/temporal_filter_sse4.c -@@ -12,7 +12,7 @@ +@@ -11,8 +11,8 @@ + #include #include - #include "./vp9_rtcd.h" +-#include "./vp9_rtcd.h" -#include "./vpx_config.h" ++#include "vp9_rtcd.h" +#include "vpx_config.h" #include "vpx/vpx_integer.h" #include "vp9/encoder/vp9_encoder.h" #include "vp9/encoder/vp9_temporal_filter.h" +diff --git a/vp9/encoder/x86/temporal_filter_ssse3.c b/vp9/encoder/x86/temporal_filter_ssse3.c +index abf0ae1..d2af52d 100644 +--- a/vp9/encoder/x86/temporal_filter_ssse3.c ++++ b/vp9/encoder/x86/temporal_filter_ssse3.c +@@ -11,8 +11,8 @@ + #include + #include // SSSE3 + +-#include "./vp9_rtcd.h" +-#include "./vpx_dsp_rtcd.h" ++#include "vp9_rtcd.h" ++#include "vpx_dsp_rtcd.h" + #include "vp9/encoder/vp9_temporal_filter.h" + + DECLARE_ALIGNED(16, static const uint8_t, diff --git a/vp9/encoder/x86/vp9_dct_intrin_sse2.c b/vp9/encoder/x86/vp9_dct_intrin_sse2.c -index e9943447f..74e9bded5 100644 +index e994344..133c577 100644 --- a/vp9/encoder/x86/vp9_dct_intrin_sse2.c +++ b/vp9/encoder/x86/vp9_dct_intrin_sse2.c -@@ -12,7 +12,7 @@ +@@ -11,8 +11,8 @@ + #include #include // SSE2 - #include "./vp9_rtcd.h" +-#include "./vp9_rtcd.h" -#include "./vpx_dsp_rtcd.h" ++#include "vp9_rtcd.h" +#include "vpx_dsp_rtcd.h" #include "vpx_dsp/txfm_common.h" #include "vpx_dsp/x86/bitdepth_conversion_sse2.h" #include "vpx_dsp/x86/fwd_txfm_sse2.h" diff --git a/vp9/encoder/x86/vp9_denoiser_sse2.c b/vp9/encoder/x86/vp9_denoiser_sse2.c -index 5930bf491..34eb6bf99 100644 +index 5930bf4..95bc805 100644 --- a/vp9/encoder/x86/vp9_denoiser_sse2.c +++ b/vp9/encoder/x86/vp9_denoiser_sse2.c -@@ -10,7 +10,7 @@ +@@ -10,8 +10,8 @@ #include -#include "./vpx_config.h" +-#include "./vp9_rtcd.h" +#include "vpx_config.h" - #include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" + + #include "vpx/vpx_integer.h" + #include "vp9/common/vp9_reconinter.h" +diff --git a/vp9/encoder/x86/vp9_error_avx2.c b/vp9/encoder/x86/vp9_error_avx2.c +index 99fef31..26e832c 100644 +--- a/vp9/encoder/x86/vp9_error_avx2.c ++++ b/vp9/encoder/x86/vp9_error_avx2.c +@@ -11,7 +11,7 @@ + #include + #include +-#include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" #include "vpx/vpx_integer.h" + #include "vpx_dsp/vpx_dsp_common.h" + #include "vpx_dsp/x86/bitdepth_conversion_avx2.h" diff --git a/vp9/encoder/x86/vp9_frame_scale_ssse3.c b/vp9/encoder/x86/vp9_frame_scale_ssse3.c -index 628dc4fea..4043ce275 100644 +index 628dc4f..4bf3c0b 100644 --- a/vp9/encoder/x86/vp9_frame_scale_ssse3.c +++ b/vp9/encoder/x86/vp9_frame_scale_ssse3.c -@@ -11,7 +11,7 @@ +@@ -10,9 +10,9 @@ + #include // SSSE3 - #include "./vp9_rtcd.h" +-#include "./vp9_rtcd.h" -#include "./vpx_dsp_rtcd.h" +-#include "./vpx_scale_rtcd.h" ++#include "vp9_rtcd.h" +#include "vpx_dsp_rtcd.h" - #include "./vpx_scale_rtcd.h" ++#include "vpx_scale_rtcd.h" #include "vpx_dsp/x86/convolve_ssse3.h" #include "vpx_dsp/x86/mem_sse2.h" + #include "vpx_dsp/x86/transpose_sse2.h" +diff --git a/vp9/encoder/x86/vp9_highbd_block_error_intrin_sse2.c b/vp9/encoder/x86/vp9_highbd_block_error_intrin_sse2.c +index d7aafe7..2e91d6a 100644 +--- a/vp9/encoder/x86/vp9_highbd_block_error_intrin_sse2.c ++++ b/vp9/encoder/x86/vp9_highbd_block_error_intrin_sse2.c +@@ -11,7 +11,7 @@ + #include + #include + +-#include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" + #include "vp9/common/vp9_common.h" + + int64_t vp9_highbd_block_error_sse2(const tran_low_t *coeff, +diff --git a/vp9/encoder/x86/vp9_quantize_avx2.c b/vp9/encoder/x86/vp9_quantize_avx2.c +index bf44b08..4582e78 100644 +--- a/vp9/encoder/x86/vp9_quantize_avx2.c ++++ b/vp9/encoder/x86/vp9_quantize_avx2.c +@@ -11,7 +11,7 @@ + #include + #include // AVX2 + +-#include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" + #include "vpx/vpx_integer.h" + #include "vpx_dsp/vpx_dsp_common.h" + #include "vpx_dsp/x86/bitdepth_conversion_avx2.h" +diff --git a/vp9/encoder/x86/vp9_quantize_sse2.c b/vp9/encoder/x86/vp9_quantize_sse2.c +index 2481eb3..af3b65f 100644 +--- a/vp9/encoder/x86/vp9_quantize_sse2.c ++++ b/vp9/encoder/x86/vp9_quantize_sse2.c +@@ -12,7 +12,7 @@ + #include + #include + +-#include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" + #include "vpx/vpx_integer.h" + #include "vpx_dsp/vpx_dsp_common.h" + #include "vpx_dsp/x86/bitdepth_conversion_sse2.h" +diff --git a/vp9/encoder/x86/vp9_quantize_ssse3.c b/vp9/encoder/x86/vp9_quantize_ssse3.c +index 98decae..a47f89b 100644 +--- a/vp9/encoder/x86/vp9_quantize_ssse3.c ++++ b/vp9/encoder/x86/vp9_quantize_ssse3.c +@@ -11,7 +11,7 @@ + #include + #include + +-#include "./vp9_rtcd.h" ++#include "vp9_rtcd.h" + #include "vpx/vpx_integer.h" + #include "vpx_dsp/vpx_dsp_common.h" + #include "vpx_dsp/x86/bitdepth_conversion_sse2.h" diff --git a/vp9/vp9_cx_iface.c b/vp9/vp9_cx_iface.c -index 55a2d0b7c..f1f0afc4f 100644 +index 8413df8..f740df6 100644 --- a/vp9/vp9_cx_iface.c +++ b/vp9/vp9_cx_iface.c -@@ -13,7 +13,7 @@ +@@ -16,7 +16,7 @@ #include #include -#include "./vpx_config.h" +#include "vpx_config.h" #include "vpx/vpx_encoder.h" + #include "vpx/vpx_image.h" #include "vpx/vpx_ext_ratectrl.h" - #include "vpx_dsp/psnr.h" +@@ -27,7 +27,7 @@ + #include "vpx_scale/yv12config.h" + #include "vpx_util/vpx_timestamp.h" + #include "vpx/internal/vpx_codec_internal.h" +-#include "./vpx_version.h" ++#include "vpx_version.h" + #include "vp9/encoder/vp9_encoder.h" + #include "vp9/encoder/vp9_ethread.h" + #include "vpx/vp8cx.h" diff --git a/vp9/vp9_dx_iface.c b/vp9/vp9_dx_iface.c -index 7567910b9..b1fbf420b 100644 +index bd892d2..9709382 100644 --- a/vp9/vp9_dx_iface.c +++ b/vp9/vp9_dx_iface.c -@@ -11,7 +11,7 @@ +@@ -11,8 +11,8 @@ #include #include -#include "./vpx_config.h" +-#include "./vpx_version.h" +#include "vpx_config.h" - #include "./vpx_version.h" ++#include "vpx_version.h" #include "vpx/internal/vpx_codec_internal.h" + #include "vpx/vp8dx.h" +diff --git a/vpx/vp8.h b/vpx/vp8.h +index f30dafe..f439247 100644 +--- a/vpx/vp8.h ++++ b/vpx/vp8.h +@@ -30,8 +30,8 @@ + #ifndef VPX_VPX_VP8_H_ + #define VPX_VPX_VP8_H_ + +-#include "./vpx_codec.h" +-#include "./vpx_image.h" ++#include "vpx_codec.h" ++#include "vpx_image.h" + + #ifdef __cplusplus + extern "C" { +diff --git a/vpx/vp8cx.h b/vpx/vp8cx.h +index d04095b..57e79db 100644 +--- a/vpx/vp8cx.h ++++ b/vpx/vp8cx.h +@@ -15,9 +15,9 @@ + * + * @{ + */ +-#include "./vp8.h" +-#include "./vpx_encoder.h" +-#include "./vpx_ext_ratectrl.h" ++#include "vp8.h" ++#include "vpx_encoder.h" ++#include "vpx_ext_ratectrl.h" + + /*!\file + * \brief Provides definitions for using VP8 or VP9 encoder algorithm within the +diff --git a/vpx/vp8dx.h b/vpx/vp8dx.h +index 8c13649..52d2a8b 100644 +--- a/vpx/vp8dx.h ++++ b/vpx/vp8dx.h +@@ -25,7 +25,7 @@ extern "C" { + #endif + + /* Include controls common to both the encoder and decoder */ +-#include "./vp8.h" ++#include "vp8.h" + + /*!\name Algorithm interface for VP8 + * +diff --git a/vpx/vpx_codec.h b/vpx/vpx_codec.h +index 6028897..7f56d47 100644 +--- a/vpx/vpx_codec.h ++++ b/vpx/vpx_codec.h +@@ -45,8 +45,8 @@ + extern "C" { + #endif + +-#include "./vpx_image.h" +-#include "./vpx_integer.h" ++#include "vpx_image.h" ++#include "vpx_integer.h" + + /*!\brief Decorator indicating a function is deprecated */ + #ifndef VPX_DEPRECATED +diff --git a/vpx/vpx_decoder.h b/vpx/vpx_decoder.h +index 911ffaa..e03a813 100644 +--- a/vpx/vpx_decoder.h ++++ b/vpx/vpx_decoder.h +@@ -29,8 +29,8 @@ + extern "C" { + #endif + +-#include "./vpx_codec.h" // IWYU pragma: export +-#include "./vpx_frame_buffer.h" ++#include "vpx_codec.h" // IWYU pragma: export ++#include "vpx_frame_buffer.h" + + /*!\brief Current ABI version number + * +diff --git a/vpx/vpx_encoder.h b/vpx/vpx_encoder.h +index 2671fb3..00591e0 100644 +--- a/vpx/vpx_encoder.h ++++ b/vpx/vpx_encoder.h +@@ -29,8 +29,8 @@ + extern "C" { + #endif + +-#include "./vpx_codec.h" // IWYU pragma: export +-#include "./vpx_ext_ratectrl.h" ++#include "vpx_codec.h" // IWYU pragma: export ++#include "vpx_ext_ratectrl.h" + + /*! Temporal Scalability: Maximum length of the sequence defining frame + * layer membership +diff --git a/vpx/vpx_ext_ratectrl.h b/vpx/vpx_ext_ratectrl.h +index 1c502f8..aa1c06e 100644 +--- a/vpx/vpx_ext_ratectrl.h ++++ b/vpx/vpx_ext_ratectrl.h +@@ -19,8 +19,8 @@ + extern "C" { + #endif + +-#include "./vpx_integer.h" +-#include "./vpx_tpl.h" ++#include "vpx_integer.h" ++#include "vpx_tpl.h" + + /*!\brief Current ABI version number + * +diff --git a/vpx/vpx_frame_buffer.h b/vpx/vpx_frame_buffer.h +index fc83200..215d5f0 100644 +--- a/vpx/vpx_frame_buffer.h ++++ b/vpx/vpx_frame_buffer.h +@@ -19,7 +19,7 @@ + extern "C" { + #endif + +-#include "./vpx_integer.h" ++#include "vpx_integer.h" + + /*!\brief The maximum number of work buffers used by libvpx. + * Support maximum 4 threads to decode video in parallel. +diff --git a/vpx/vpx_tpl.h b/vpx/vpx_tpl.h +index ecee5d1..b12e844 100644 +--- a/vpx/vpx_tpl.h ++++ b/vpx/vpx_tpl.h +@@ -15,8 +15,8 @@ + #ifndef VPX_VPX_VPX_TPL_H_ + #define VPX_VPX_VPX_TPL_H_ + +-#include "./vpx_integer.h" +-#include "./vpx_codec.h" ++#include "vpx_integer.h" ++#include "vpx_codec.h" + + #ifdef __cplusplus + extern "C" { diff --git a/vpx_dsp/add_noise.c b/vpx_dsp/add_noise.c -index 6839e9792..1a3bc712d 100644 +index 6839e97..1a3bc71 100644 --- a/vpx_dsp/add_noise.c +++ b/vpx_dsp/add_noise.c @@ -11,8 +11,8 @@ @@ -1909,7 +3776,7 @@ index 6839e9792..1a3bc712d 100644 #include "vpx/vpx_integer.h" #include "vpx_dsp/postproc.h" diff --git a/vpx_dsp/arm/avg_neon.c b/vpx_dsp/arm/avg_neon.c -index 1b17a326b..411384771 100644 +index 1b17a32..4113847 100644 --- a/vpx_dsp/arm/avg_neon.c +++ b/vpx_dsp/arm/avg_neon.c @@ -11,8 +11,8 @@ @@ -1924,7 +3791,7 @@ index 1b17a326b..411384771 100644 #include "vpx/vpx_integer.h" #include "vpx_dsp/arm/idct_neon.h" diff --git a/vpx_dsp/arm/avg_pred_neon.c b/vpx_dsp/arm/avg_pred_neon.c -index 5afdece0a..e0fb5aa9c 100644 +index 5afdece..e0fb5aa 100644 --- a/vpx_dsp/arm/avg_pred_neon.c +++ b/vpx_dsp/arm/avg_pred_neon.c @@ -11,7 +11,7 @@ @@ -1937,7 +3804,7 @@ index 5afdece0a..e0fb5aa9c 100644 void vpx_comp_avg_pred_neon(uint8_t *comp, const uint8_t *pred, int width, diff --git a/vpx_dsp/arm/deblock_neon.c b/vpx_dsp/arm/deblock_neon.c -index 7efce3273..e71193373 100644 +index 7efce32..e711933 100644 --- a/vpx_dsp/arm/deblock_neon.c +++ b/vpx_dsp/arm/deblock_neon.c @@ -11,7 +11,7 @@ @@ -1950,7 +3817,7 @@ index 7efce3273..e71193373 100644 #include "vpx_dsp/arm/transpose_neon.h" diff --git a/vpx_dsp/arm/fdct16x16_neon.c b/vpx_dsp/arm/fdct16x16_neon.c -index fde71ff30..3c7274574 100644 +index fde71ff..3c72745 100644 --- a/vpx_dsp/arm/fdct16x16_neon.c +++ b/vpx_dsp/arm/fdct16x16_neon.c @@ -10,8 +10,8 @@ @@ -1965,7 +3832,7 @@ index fde71ff30..3c7274574 100644 #include "vpx_dsp/arm/mem_neon.h" #include "vpx_dsp/arm/transpose_neon.h" diff --git a/vpx_dsp/arm/fdct32x32_neon.c b/vpx_dsp/arm/fdct32x32_neon.c -index a91730ce8..4224416ef 100644 +index a91730c..4224416 100644 --- a/vpx_dsp/arm/fdct32x32_neon.c +++ b/vpx_dsp/arm/fdct32x32_neon.c @@ -10,8 +10,8 @@ @@ -1980,7 +3847,7 @@ index a91730ce8..4224416ef 100644 #include "vpx_dsp/arm/mem_neon.h" #include "vpx_dsp/arm/transpose_neon.h" diff --git a/vpx_dsp/arm/fdct32x32_neon.h b/vpx_dsp/arm/fdct32x32_neon.h -index 3b9e64c6d..2bb6ec82e 100644 +index 3b9e64c..2bb6ec8 100644 --- a/vpx_dsp/arm/fdct32x32_neon.h +++ b/vpx_dsp/arm/fdct32x32_neon.h @@ -13,8 +13,8 @@ @@ -1995,7 +3862,7 @@ index 3b9e64c6d..2bb6ec82e 100644 #include "vpx_dsp/arm/mem_neon.h" #include "vpx_dsp/arm/transpose_neon.h" diff --git a/vpx_dsp/arm/fdct4x4_neon.c b/vpx_dsp/arm/fdct4x4_neon.c -index 4bc968ecb..153804b40 100644 +index 4bc968e..153804b 100644 --- a/vpx_dsp/arm/fdct4x4_neon.c +++ b/vpx_dsp/arm/fdct4x4_neon.c @@ -10,8 +10,8 @@ @@ -2010,7 +3877,7 @@ index 4bc968ecb..153804b40 100644 #include "vpx_dsp/vpx_dsp_common.h" #include "vpx_dsp/arm/idct_neon.h" diff --git a/vpx_dsp/arm/fdct8x8_neon.c b/vpx_dsp/arm/fdct8x8_neon.c -index 75ee6f223..2f8273640 100644 +index 75ee6f2..2f82736 100644 --- a/vpx_dsp/arm/fdct8x8_neon.c +++ b/vpx_dsp/arm/fdct8x8_neon.c @@ -10,8 +10,8 @@ @@ -2025,7 +3892,7 @@ index 75ee6f223..2f8273640 100644 #include "vpx_dsp/vpx_dsp_common.h" #include "vpx_dsp/arm/idct_neon.h" diff --git a/vpx_dsp/arm/fdct_partial_neon.c b/vpx_dsp/arm/fdct_partial_neon.c -index df0da543c..e3e713a08 100644 +index ee9e599..1b4ef9a 100644 --- a/vpx_dsp/arm/fdct_partial_neon.c +++ b/vpx_dsp/arm/fdct_partial_neon.c @@ -10,8 +10,8 @@ @@ -2040,7 +3907,7 @@ index df0da543c..e3e713a08 100644 #include "vpx_dsp/arm/sum_neon.h" diff --git a/vpx_dsp/arm/hadamard_neon.c b/vpx_dsp/arm/hadamard_neon.c -index f5a044be4..1ac2b6398 100644 +index f5a044b..1ac2b63 100644 --- a/vpx_dsp/arm/hadamard_neon.c +++ b/vpx_dsp/arm/hadamard_neon.c @@ -10,7 +10,7 @@ @@ -2053,7 +3920,7 @@ index f5a044be4..1ac2b6398 100644 #include "vpx_dsp/arm/idct_neon.h" #include "vpx_dsp/arm/mem_neon.h" diff --git a/vpx_dsp/arm/highbd_avg_neon.c b/vpx_dsp/arm/highbd_avg_neon.c -index 4265596c8..d397fe140 100644 +index 4265596..d397fe1 100644 --- a/vpx_dsp/arm/highbd_avg_neon.c +++ b/vpx_dsp/arm/highbd_avg_neon.c @@ -10,8 +10,8 @@ @@ -2068,7 +3935,7 @@ index 4265596c8..d397fe140 100644 #include "vpx_dsp/arm/mem_neon.h" #include "vpx_dsp/arm/sum_neon.h" diff --git a/vpx_dsp/arm/highbd_avg_pred_neon.c b/vpx_dsp/arm/highbd_avg_pred_neon.c -index 3063acbb3..24ba569e4 100644 +index 3063acb..24ba569 100644 --- a/vpx_dsp/arm/highbd_avg_pred_neon.c +++ b/vpx_dsp/arm/highbd_avg_pred_neon.c @@ -11,8 +11,8 @@ @@ -2083,7 +3950,7 @@ index 3063acbb3..24ba569e4 100644 void vpx_highbd_comp_avg_pred_neon(uint16_t *comp_pred, const uint16_t *pred, int width, int height, const uint16_t *ref, diff --git a/vpx_dsp/arm/highbd_hadamard_neon.c b/vpx_dsp/arm/highbd_hadamard_neon.c -index 7be88f6bc..8ee2fc657 100644 +index 7be88f6..8ee2fc6 100644 --- a/vpx_dsp/arm/highbd_hadamard_neon.c +++ b/vpx_dsp/arm/highbd_hadamard_neon.c @@ -10,8 +10,8 @@ @@ -2098,7 +3965,7 @@ index 7be88f6bc..8ee2fc657 100644 #include "vpx_dsp/arm/mem_neon.h" #include "vpx_dsp/arm/transpose_neon.h" diff --git a/vpx_dsp/arm/highbd_idct16x16_add_neon.c b/vpx_dsp/arm/highbd_idct16x16_add_neon.c -index 654ab42ca..4e551928e 100644 +index 654ab42..4e55192 100644 --- a/vpx_dsp/arm/highbd_idct16x16_add_neon.c +++ b/vpx_dsp/arm/highbd_idct16x16_add_neon.c @@ -10,7 +10,7 @@ @@ -2111,7 +3978,7 @@ index 654ab42ca..4e551928e 100644 #include "vpx_dsp/arm/idct_neon.h" #include "vpx_dsp/inv_txfm.h" diff --git a/vpx_dsp/arm/highbd_idct32x32_1024_add_neon.c b/vpx_dsp/arm/highbd_idct32x32_1024_add_neon.c -index 5b36f7336..1db398bed 100644 +index 5b36f73..1db398b 100644 --- a/vpx_dsp/arm/highbd_idct32x32_1024_add_neon.c +++ b/vpx_dsp/arm/highbd_idct32x32_1024_add_neon.c @@ -10,8 +10,8 @@ @@ -2126,7 +3993,7 @@ index 5b36f7336..1db398bed 100644 #include "vpx_dsp/arm/transpose_neon.h" #include "vpx_dsp/txfm_common.h" diff --git a/vpx_dsp/arm/highbd_idct32x32_135_add_neon.c b/vpx_dsp/arm/highbd_idct32x32_135_add_neon.c -index 6750c1a42..46b0e4ff2 100644 +index 6750c1a..46b0e4f 100644 --- a/vpx_dsp/arm/highbd_idct32x32_135_add_neon.c +++ b/vpx_dsp/arm/highbd_idct32x32_135_add_neon.c @@ -10,8 +10,8 @@ @@ -2141,7 +4008,7 @@ index 6750c1a42..46b0e4ff2 100644 #include "vpx_dsp/arm/idct_neon.h" #include "vpx_dsp/arm/transpose_neon.h" diff --git a/vpx_dsp/arm/highbd_idct32x32_34_add_neon.c b/vpx_dsp/arm/highbd_idct32x32_34_add_neon.c -index f05932cec..9303bdafc 100644 +index f05932c..9303bda 100644 --- a/vpx_dsp/arm/highbd_idct32x32_34_add_neon.c +++ b/vpx_dsp/arm/highbd_idct32x32_34_add_neon.c @@ -10,8 +10,8 @@ @@ -2156,7 +4023,7 @@ index f05932cec..9303bdafc 100644 #include "vpx_dsp/arm/idct_neon.h" #include "vpx_dsp/arm/transpose_neon.h" diff --git a/vpx_dsp/arm/highbd_idct32x32_add_neon.c b/vpx_dsp/arm/highbd_idct32x32_add_neon.c -index c1354c0c1..96be01745 100644 +index c1354c0..96be017 100644 --- a/vpx_dsp/arm/highbd_idct32x32_add_neon.c +++ b/vpx_dsp/arm/highbd_idct32x32_add_neon.c @@ -10,7 +10,7 @@ @@ -2169,7 +4036,7 @@ index c1354c0c1..96be01745 100644 #include "vpx_dsp/inv_txfm.h" diff --git a/vpx_dsp/arm/highbd_idct4x4_add_neon.c b/vpx_dsp/arm/highbd_idct4x4_add_neon.c -index 7be1dad1d..8a43b5874 100644 +index 7be1dad..8a43b58 100644 --- a/vpx_dsp/arm/highbd_idct4x4_add_neon.c +++ b/vpx_dsp/arm/highbd_idct4x4_add_neon.c @@ -10,7 +10,7 @@ @@ -2182,7 +4049,7 @@ index 7be1dad1d..8a43b5874 100644 #include "vpx_dsp/arm/idct_neon.h" #include "vpx_dsp/inv_txfm.h" diff --git a/vpx_dsp/arm/highbd_idct8x8_add_neon.c b/vpx_dsp/arm/highbd_idct8x8_add_neon.c -index bed3227ca..970781ec9 100644 +index bed3227..970781e 100644 --- a/vpx_dsp/arm/highbd_idct8x8_add_neon.c +++ b/vpx_dsp/arm/highbd_idct8x8_add_neon.c @@ -10,7 +10,7 @@ @@ -2195,7 +4062,7 @@ index bed3227ca..970781ec9 100644 #include "vpx_dsp/arm/idct_neon.h" #include "vpx_dsp/arm/transpose_neon.h" diff --git a/vpx_dsp/arm/highbd_idct_neon.h b/vpx_dsp/arm/highbd_idct_neon.h -index 518ef4336..98f47d37f 100644 +index 518ef43..98f47d3 100644 --- a/vpx_dsp/arm/highbd_idct_neon.h +++ b/vpx_dsp/arm/highbd_idct_neon.h @@ -13,7 +13,7 @@ @@ -2208,7 +4075,7 @@ index 518ef4336..98f47d37f 100644 #include "vpx_dsp/inv_txfm.h" diff --git a/vpx_dsp/arm/highbd_intrapred_neon.c b/vpx_dsp/arm/highbd_intrapred_neon.c -index 235cb5b99..2dbe43d2e 100644 +index 235cb5b..2dbe43d 100644 --- a/vpx_dsp/arm/highbd_intrapred_neon.c +++ b/vpx_dsp/arm/highbd_intrapred_neon.c @@ -10,8 +10,8 @@ @@ -2223,7 +4090,7 @@ index 235cb5b99..2dbe43d2e 100644 #include "vpx/vpx_integer.h" diff --git a/vpx_dsp/arm/highbd_loopfilter_neon.c b/vpx_dsp/arm/highbd_loopfilter_neon.c -index 8d6e8acc4..d86eb5e2e 100644 +index 8d6e8ac..d86eb5e 100644 --- a/vpx_dsp/arm/highbd_loopfilter_neon.c +++ b/vpx_dsp/arm/highbd_loopfilter_neon.c @@ -9,8 +9,8 @@ @@ -2238,7 +4105,7 @@ index 8d6e8acc4..d86eb5e2e 100644 static INLINE void load_thresh(const uint8_t *blimit, const uint8_t *limit, diff --git a/vpx_dsp/arm/highbd_quantize_neon.c b/vpx_dsp/arm/highbd_quantize_neon.c -index c2ad34a69..d0d85c26e 100644 +index c2ad34a..d0d85c2 100644 --- a/vpx_dsp/arm/highbd_quantize_neon.c +++ b/vpx_dsp/arm/highbd_quantize_neon.c @@ -10,8 +10,8 @@ @@ -2253,12 +4120,12 @@ index c2ad34a69..d0d85c26e 100644 #include "vp9/common/vp9_scan.h" #include "vp9/encoder/vp9_block.h" diff --git a/vpx_dsp/arm/highbd_sad4d_neon.c b/vpx_dsp/arm/highbd_sad4d_neon.c -index a6684b053..f5c8233b3 100644 +index 6e64618..62947f3 100644 --- a/vpx_dsp/arm/highbd_sad4d_neon.c +++ b/vpx_dsp/arm/highbd_sad4d_neon.c -@@ -10,8 +10,8 @@ - +@@ -11,8 +11,8 @@ #include + #include -#include "./vpx_config.h" -#include "./vpx_dsp_rtcd.h" @@ -2268,12 +4135,12 @@ index a6684b053..f5c8233b3 100644 #include "vpx/vpx_integer.h" #include "vpx_dsp/arm/mem_neon.h" diff --git a/vpx_dsp/arm/highbd_sad_neon.c b/vpx_dsp/arm/highbd_sad_neon.c -index b99bac66c..696aac1ef 100644 +index af36431..d919f74 100644 --- a/vpx_dsp/arm/highbd_sad_neon.c +++ b/vpx_dsp/arm/highbd_sad_neon.c -@@ -10,8 +10,8 @@ - +@@ -11,8 +11,8 @@ #include + #include -#include "./vpx_config.h" -#include "./vpx_dsp_rtcd.h" @@ -2283,7 +4150,7 @@ index b99bac66c..696aac1ef 100644 #include "vpx/vpx_integer.h" #include "vpx_dsp/arm/mem_neon.h" diff --git a/vpx_dsp/arm/highbd_sse_neon.c b/vpx_dsp/arm/highbd_sse_neon.c -index 91dfebf90..88da83895 100644 +index 91dfebf..88da838 100644 --- a/vpx_dsp/arm/highbd_sse_neon.c +++ b/vpx_dsp/arm/highbd_sse_neon.c @@ -11,7 +11,7 @@ @@ -2296,7 +4163,7 @@ index 91dfebf90..88da83895 100644 static INLINE void highbd_sse_8x1_init_neon(const uint16_t *src, diff --git a/vpx_dsp/arm/highbd_subpel_variance_neon.c b/vpx_dsp/arm/highbd_subpel_variance_neon.c -index f8b94620d..b75e014ce 100644 +index f8b9462..b75e014 100644 --- a/vpx_dsp/arm/highbd_subpel_variance_neon.c +++ b/vpx_dsp/arm/highbd_subpel_variance_neon.c @@ -11,8 +11,8 @@ @@ -2311,7 +4178,7 @@ index f8b94620d..b75e014ce 100644 #include "vpx/vpx_integer.h" #include "vpx_dsp/arm/mem_neon.h" diff --git a/vpx_dsp/arm/highbd_variance_neon.c b/vpx_dsp/arm/highbd_variance_neon.c -index 309ae7fd3..3b3aec231 100644 +index 309ae7f..3b3aec2 100644 --- a/vpx_dsp/arm/highbd_variance_neon.c +++ b/vpx_dsp/arm/highbd_variance_neon.c @@ -10,8 +10,8 @@ @@ -2326,7 +4193,7 @@ index 309ae7fd3..3b3aec231 100644 #include "vpx/vpx_integer.h" #include "vpx_dsp/arm/mem_neon.h" diff --git a/vpx_dsp/arm/highbd_variance_neon_dotprod.c b/vpx_dsp/arm/highbd_variance_neon_dotprod.c -index 1a8872017..14a3356cc 100644 +index 1a88720..14a3356 100644 --- a/vpx_dsp/arm/highbd_variance_neon_dotprod.c +++ b/vpx_dsp/arm/highbd_variance_neon_dotprod.c @@ -10,8 +10,8 @@ @@ -2341,7 +4208,7 @@ index 1a8872017..14a3356cc 100644 #include "vpx/vpx_integer.h" #include "vpx_dsp/arm/mem_neon.h" diff --git a/vpx_dsp/arm/highbd_variance_sve.c b/vpx_dsp/arm/highbd_variance_sve.c -index cebe06b09..2a8eb746a 100644 +index cebe06b..2a8eb74 100644 --- a/vpx_dsp/arm/highbd_variance_sve.c +++ b/vpx_dsp/arm/highbd_variance_sve.c @@ -10,8 +10,8 @@ @@ -2356,7 +4223,7 @@ index cebe06b09..2a8eb746a 100644 #include "vpx_dsp/arm/mem_neon.h" #include "vpx_dsp/arm/sum_neon.h" diff --git a/vpx_dsp/arm/highbd_vpx_convolve8_neon.c b/vpx_dsp/arm/highbd_vpx_convolve8_neon.c -index cc6307f92..02bb62bba 100644 +index cc6307f..02bb62b 100644 --- a/vpx_dsp/arm/highbd_vpx_convolve8_neon.c +++ b/vpx_dsp/arm/highbd_vpx_convolve8_neon.c @@ -11,8 +11,8 @@ @@ -2371,7 +4238,7 @@ index cc6307f92..02bb62bba 100644 #include "vpx_dsp/arm/highbd_convolve8_neon.h" #include "vpx_dsp/arm/mem_neon.h" diff --git a/vpx_dsp/arm/highbd_vpx_convolve8_sve.c b/vpx_dsp/arm/highbd_vpx_convolve8_sve.c -index f909e06a1..431a4ed01 100644 +index f909e06..431a4ed 100644 --- a/vpx_dsp/arm/highbd_vpx_convolve8_sve.c +++ b/vpx_dsp/arm/highbd_vpx_convolve8_sve.c @@ -11,8 +11,8 @@ @@ -2386,7 +4253,7 @@ index f909e06a1..431a4ed01 100644 #include "vpx/vpx_integer.h" #include "vpx_dsp/arm/highbd_convolve8_sve.h" diff --git a/vpx_dsp/arm/highbd_vpx_convolve8_sve2.c b/vpx_dsp/arm/highbd_vpx_convolve8_sve2.c -index bf0ee9606..af95043e9 100644 +index 8408f98..bcce100 100644 --- a/vpx_dsp/arm/highbd_vpx_convolve8_sve2.c +++ b/vpx_dsp/arm/highbd_vpx_convolve8_sve2.c @@ -11,8 +11,8 @@ @@ -2401,7 +4268,7 @@ index bf0ee9606..af95043e9 100644 #include "vpx/vpx_integer.h" #include "vpx_dsp/arm/highbd_convolve8_neon.h" diff --git a/vpx_dsp/arm/highbd_vpx_convolve_avg_neon.c b/vpx_dsp/arm/highbd_vpx_convolve_avg_neon.c -index 765a054f8..131ecc15e 100644 +index 765a054..131ecc1 100644 --- a/vpx_dsp/arm/highbd_vpx_convolve_avg_neon.c +++ b/vpx_dsp/arm/highbd_vpx_convolve_avg_neon.c @@ -10,7 +10,7 @@ @@ -2414,7 +4281,7 @@ index 765a054f8..131ecc15e 100644 void vpx_highbd_convolve_avg_neon(const uint16_t *src, ptrdiff_t src_stride, diff --git a/vpx_dsp/arm/highbd_vpx_convolve_copy_neon.c b/vpx_dsp/arm/highbd_vpx_convolve_copy_neon.c -index 775108208..38a4a166a 100644 +index 7751082..38a4a16 100644 --- a/vpx_dsp/arm/highbd_vpx_convolve_copy_neon.c +++ b/vpx_dsp/arm/highbd_vpx_convolve_copy_neon.c @@ -10,7 +10,7 @@ @@ -2427,7 +4294,7 @@ index 775108208..38a4a166a 100644 void vpx_highbd_convolve_copy_neon(const uint16_t *src, ptrdiff_t src_stride, diff --git a/vpx_dsp/arm/idct16x16_1_add_neon.c b/vpx_dsp/arm/idct16x16_1_add_neon.c -index bf5192a68..b797a34c2 100644 +index bf5192a..b797a34 100644 --- a/vpx_dsp/arm/idct16x16_1_add_neon.c +++ b/vpx_dsp/arm/idct16x16_1_add_neon.c @@ -10,7 +10,7 @@ @@ -2440,7 +4307,7 @@ index bf5192a68..b797a34c2 100644 #include "vpx_dsp/inv_txfm.h" diff --git a/vpx_dsp/arm/idct16x16_add_neon.c b/vpx_dsp/arm/idct16x16_add_neon.c -index fc7f4a774..978df95a2 100644 +index fc7f4a7..978df95 100644 --- a/vpx_dsp/arm/idct16x16_add_neon.c +++ b/vpx_dsp/arm/idct16x16_add_neon.c @@ -10,7 +10,7 @@ @@ -2453,7 +4320,7 @@ index fc7f4a774..978df95a2 100644 #include "vpx_dsp/arm/mem_neon.h" #include "vpx_dsp/txfm_common.h" diff --git a/vpx_dsp/arm/idct32x32_135_add_neon.c b/vpx_dsp/arm/idct32x32_135_add_neon.c -index 057731ad9..0fd0b2418 100644 +index 057731a..0fd0b24 100644 --- a/vpx_dsp/arm/idct32x32_135_add_neon.c +++ b/vpx_dsp/arm/idct32x32_135_add_neon.c @@ -10,8 +10,8 @@ @@ -2468,7 +4335,7 @@ index 057731ad9..0fd0b2418 100644 #include "vpx_dsp/arm/mem_neon.h" #include "vpx_dsp/arm/transpose_neon.h" diff --git a/vpx_dsp/arm/idct32x32_1_add_neon.c b/vpx_dsp/arm/idct32x32_1_add_neon.c -index 8920b9336..5bfeddbf7 100644 +index 8920b93..5bfeddb 100644 --- a/vpx_dsp/arm/idct32x32_1_add_neon.c +++ b/vpx_dsp/arm/idct32x32_1_add_neon.c @@ -10,7 +10,7 @@ @@ -2481,7 +4348,7 @@ index 8920b9336..5bfeddbf7 100644 #include "vpx_dsp/inv_txfm.h" diff --git a/vpx_dsp/arm/idct32x32_34_add_neon.c b/vpx_dsp/arm/idct32x32_34_add_neon.c -index f570547e4..d2304ed86 100644 +index f570547..d2304ed 100644 --- a/vpx_dsp/arm/idct32x32_34_add_neon.c +++ b/vpx_dsp/arm/idct32x32_34_add_neon.c @@ -10,8 +10,8 @@ @@ -2496,7 +4363,7 @@ index f570547e4..d2304ed86 100644 #include "vpx_dsp/arm/mem_neon.h" #include "vpx_dsp/arm/transpose_neon.h" diff --git a/vpx_dsp/arm/idct32x32_add_neon.c b/vpx_dsp/arm/idct32x32_add_neon.c -index 9f4589ea9..f495f4cfc 100644 +index 9f4589e..f495f4c 100644 --- a/vpx_dsp/arm/idct32x32_add_neon.c +++ b/vpx_dsp/arm/idct32x32_add_neon.c @@ -10,8 +10,8 @@ @@ -2511,7 +4378,7 @@ index 9f4589ea9..f495f4cfc 100644 #include "vpx_dsp/arm/mem_neon.h" #include "vpx_dsp/arm/transpose_neon.h" diff --git a/vpx_dsp/arm/idct4x4_1_add_neon.c b/vpx_dsp/arm/idct4x4_1_add_neon.c -index a14b89543..036ce73d1 100644 +index a14b895..036ce73 100644 --- a/vpx_dsp/arm/idct4x4_1_add_neon.c +++ b/vpx_dsp/arm/idct4x4_1_add_neon.c @@ -11,7 +11,7 @@ @@ -2524,7 +4391,7 @@ index a14b89543..036ce73d1 100644 #include "vpx_dsp/inv_txfm.h" diff --git a/vpx_dsp/arm/idct4x4_add_neon.c b/vpx_dsp/arm/idct4x4_add_neon.c -index 8192ee4cf..10dce33a1 100644 +index 8192ee4..10dce33 100644 --- a/vpx_dsp/arm/idct4x4_add_neon.c +++ b/vpx_dsp/arm/idct4x4_add_neon.c @@ -11,7 +11,7 @@ @@ -2537,7 +4404,7 @@ index 8192ee4cf..10dce33a1 100644 #include "vpx_dsp/arm/mem_neon.h" #include "vpx_dsp/txfm_common.h" diff --git a/vpx_dsp/arm/idct8x8_1_add_neon.c b/vpx_dsp/arm/idct8x8_1_add_neon.c -index ce9b45958..ea1bf0fa9 100644 +index ce9b459..ea1bf0f 100644 --- a/vpx_dsp/arm/idct8x8_1_add_neon.c +++ b/vpx_dsp/arm/idct8x8_1_add_neon.c @@ -10,7 +10,7 @@ @@ -2550,7 +4417,7 @@ index ce9b45958..ea1bf0fa9 100644 static INLINE uint8x8_t create_dcd(const int16_t dc) { diff --git a/vpx_dsp/arm/idct8x8_add_neon.c b/vpx_dsp/arm/idct8x8_add_neon.c -index 7471387e4..8e080fcf3 100644 +index 7471387..8e080fc 100644 --- a/vpx_dsp/arm/idct8x8_add_neon.c +++ b/vpx_dsp/arm/idct8x8_add_neon.c @@ -10,8 +10,8 @@ @@ -2565,7 +4432,7 @@ index 7471387e4..8e080fcf3 100644 #include "vpx_dsp/arm/mem_neon.h" #include "vpx_dsp/arm/transpose_neon.h" diff --git a/vpx_dsp/arm/idct_neon.h b/vpx_dsp/arm/idct_neon.h -index c02311326..40bd532d5 100644 +index c023113..40bd532 100644 --- a/vpx_dsp/arm/idct_neon.h +++ b/vpx_dsp/arm/idct_neon.h @@ -13,7 +13,7 @@ @@ -2578,7 +4445,7 @@ index c02311326..40bd532d5 100644 #include "vpx_dsp/txfm_common.h" #include "vpx_dsp/vpx_dsp_common.h" diff --git a/vpx_dsp/arm/intrapred_neon.c b/vpx_dsp/arm/intrapred_neon.c -index 4f909e493..b661ff5da 100644 +index 4f909e4..b661ff5 100644 --- a/vpx_dsp/arm/intrapred_neon.c +++ b/vpx_dsp/arm/intrapred_neon.c @@ -10,8 +10,8 @@ @@ -2593,7 +4460,7 @@ index 4f909e493..b661ff5da 100644 #include "sum_neon.h" #include "vpx/vpx_integer.h" diff --git a/vpx_dsp/arm/loopfilter_neon.c b/vpx_dsp/arm/loopfilter_neon.c -index 579096d78..eef0470ac 100644 +index 579096d..eef0470 100644 --- a/vpx_dsp/arm/loopfilter_neon.c +++ b/vpx_dsp/arm/loopfilter_neon.c @@ -9,8 +9,8 @@ @@ -2608,7 +4475,7 @@ index 579096d78..eef0470ac 100644 // For all the static inline functions, the functions ending with '_8' process diff --git a/vpx_dsp/arm/mem_neon.h b/vpx_dsp/arm/mem_neon.h -index 268c4bd96..a1510c4ff 100644 +index a0ef2c8..72cdad2 100644 --- a/vpx_dsp/arm/mem_neon.h +++ b/vpx_dsp/arm/mem_neon.h @@ -15,7 +15,7 @@ @@ -2621,7 +4488,7 @@ index 268c4bd96..a1510c4ff 100644 #include "vpx_dsp/vpx_dsp_common.h" diff --git a/vpx_dsp/arm/quantize_neon.c b/vpx_dsp/arm/quantize_neon.c -index e2351fa2c..b7ce5098f 100644 +index e2351fa..b7ce509 100644 --- a/vpx_dsp/arm/quantize_neon.c +++ b/vpx_dsp/arm/quantize_neon.c @@ -11,8 +11,8 @@ @@ -2636,7 +4503,7 @@ index e2351fa2c..b7ce5098f 100644 #include "vp9/common/vp9_scan.h" #include "vp9/encoder/vp9_block.h" diff --git a/vpx_dsp/arm/sad4d_neon.c b/vpx_dsp/arm/sad4d_neon.c -index 713eec7a9..cdaf473a3 100644 +index 713eec7..cdaf473 100644 --- a/vpx_dsp/arm/sad4d_neon.c +++ b/vpx_dsp/arm/sad4d_neon.c @@ -11,8 +11,8 @@ @@ -2651,7 +4518,7 @@ index 713eec7a9..cdaf473a3 100644 #include "vpx_dsp/arm/mem_neon.h" #include "vpx_dsp/arm/sum_neon.h" diff --git a/vpx_dsp/arm/sad4d_neon_dotprod.c b/vpx_dsp/arm/sad4d_neon_dotprod.c -index 933fc48b8..d90d84384 100644 +index 933fc48..d90d843 100644 --- a/vpx_dsp/arm/sad4d_neon_dotprod.c +++ b/vpx_dsp/arm/sad4d_neon_dotprod.c @@ -11,8 +11,8 @@ @@ -2666,7 +4533,7 @@ index 933fc48b8..d90d84384 100644 #include "vpx_dsp/arm/mem_neon.h" #include "vpx_dsp/arm/sum_neon.h" diff --git a/vpx_dsp/arm/sad_neon.c b/vpx_dsp/arm/sad_neon.c -index 4dd87ddc0..934f947b3 100644 +index d7013bd..1a285f5 100644 --- a/vpx_dsp/arm/sad_neon.c +++ b/vpx_dsp/arm/sad_neon.c @@ -10,8 +10,8 @@ @@ -2681,7 +4548,7 @@ index 4dd87ddc0..934f947b3 100644 #include "vpx/vpx_integer.h" #include "vpx_dsp/arm/mem_neon.h" diff --git a/vpx_dsp/arm/sad_neon_dotprod.c b/vpx_dsp/arm/sad_neon_dotprod.c -index fbc0b8d75..f0b2507a6 100644 +index 567d6f8..df61e98 100644 --- a/vpx_dsp/arm/sad_neon_dotprod.c +++ b/vpx_dsp/arm/sad_neon_dotprod.c @@ -10,8 +10,8 @@ @@ -2696,7 +4563,7 @@ index fbc0b8d75..f0b2507a6 100644 #include "vpx/vpx_integer.h" #include "vpx_dsp/arm/mem_neon.h" diff --git a/vpx_dsp/arm/sse_neon.c b/vpx_dsp/arm/sse_neon.c -index 2dd57e596..0fbcbec86 100644 +index 2dd57e5..0fbcbec 100644 --- a/vpx_dsp/arm/sse_neon.c +++ b/vpx_dsp/arm/sse_neon.c @@ -11,8 +11,8 @@ @@ -2711,7 +4578,7 @@ index 2dd57e596..0fbcbec86 100644 #include "vpx_dsp/arm/sum_neon.h" diff --git a/vpx_dsp/arm/sse_neon_dotprod.c b/vpx_dsp/arm/sse_neon_dotprod.c -index 877777391..10cb786f6 100644 +index 8777773..10cb786 100644 --- a/vpx_dsp/arm/sse_neon_dotprod.c +++ b/vpx_dsp/arm/sse_neon_dotprod.c @@ -10,7 +10,7 @@ @@ -2724,7 +4591,7 @@ index 877777391..10cb786f6 100644 #include "vpx_dsp/arm/sum_neon.h" diff --git a/vpx_dsp/arm/subpel_variance_neon.c b/vpx_dsp/arm/subpel_variance_neon.c -index d92f1615d..bbc2675a3 100644 +index 61ce5a8..12c12f3 100644 --- a/vpx_dsp/arm/subpel_variance_neon.c +++ b/vpx_dsp/arm/subpel_variance_neon.c @@ -9,8 +9,8 @@ @@ -2738,8 +4605,21 @@ index d92f1615d..bbc2675a3 100644 #include "vpx/vpx_integer.h" +diff --git a/vpx_dsp/arm/subpel_variance_neon_dotprod.c b/vpx_dsp/arm/subpel_variance_neon_dotprod.c +index 02d4216..1b56657 100644 +--- a/vpx_dsp/arm/subpel_variance_neon_dotprod.c ++++ b/vpx_dsp/arm/subpel_variance_neon_dotprod.c +@@ -10,7 +10,7 @@ + + #include + #include +-#include "./vpx_dsp_rtcd.h" ++#include "vpx_dsp_rtcd.h" + + #include "vpx_dsp/arm/subpel_variance_neon.h" + diff --git a/vpx_dsp/arm/subtract_neon.c b/vpx_dsp/arm/subtract_neon.c -index 2c008e48a..cb6e14b39 100644 +index 2c008e4..cb6e14b 100644 --- a/vpx_dsp/arm/subtract_neon.c +++ b/vpx_dsp/arm/subtract_neon.c @@ -11,8 +11,8 @@ @@ -2754,7 +4634,7 @@ index 2c008e48a..cb6e14b39 100644 #include "vpx_dsp/arm/mem_neon.h" diff --git a/vpx_dsp/arm/sum_neon.h b/vpx_dsp/arm/sum_neon.h -index 11821dc10..feb31c7c8 100644 +index 11821dc..feb31c7 100644 --- a/vpx_dsp/arm/sum_neon.h +++ b/vpx_dsp/arm/sum_neon.h @@ -13,7 +13,7 @@ @@ -2767,7 +4647,7 @@ index 11821dc10..feb31c7c8 100644 static INLINE uint16_t horizontal_add_uint8x4(const uint8x8_t a) { diff --git a/vpx_dsp/arm/sum_squares_neon.c b/vpx_dsp/arm/sum_squares_neon.c -index 074afe325..4a80eef35 100644 +index 074afe3..4a80eef 100644 --- a/vpx_dsp/arm/sum_squares_neon.c +++ b/vpx_dsp/arm/sum_squares_neon.c @@ -11,7 +11,7 @@ @@ -2780,7 +4660,7 @@ index 074afe325..4a80eef35 100644 uint64_t vpx_sum_squares_2d_i16_neon(const int16_t *src, int stride, int size) { diff --git a/vpx_dsp/arm/sum_squares_sve.c b/vpx_dsp/arm/sum_squares_sve.c -index a18cbbd73..1106d02c7 100644 +index a18cbbd..1106d02 100644 --- a/vpx_dsp/arm/sum_squares_sve.c +++ b/vpx_dsp/arm/sum_squares_sve.c @@ -11,7 +11,7 @@ @@ -2793,7 +4673,7 @@ index a18cbbd73..1106d02c7 100644 #include "vpx_dsp/arm/sum_neon.h" #include "vpx_dsp/arm/vpx_neon_sve_bridge.h" diff --git a/vpx_dsp/arm/transpose_neon.h b/vpx_dsp/arm/transpose_neon.h -index c989a6721..0c2cfea9d 100644 +index b6b46fc..d43186d 100644 --- a/vpx_dsp/arm/transpose_neon.h +++ b/vpx_dsp/arm/transpose_neon.h @@ -13,7 +13,7 @@ @@ -2806,7 +4686,7 @@ index c989a6721..0c2cfea9d 100644 // Transpose 64 bit elements as follows: // a0: 00 01 02 03 04 05 06 07 diff --git a/vpx_dsp/arm/variance_neon.c b/vpx_dsp/arm/variance_neon.c -index efb2c1d8d..93aef1dd7 100644 +index efb2c1d..93aef1d 100644 --- a/vpx_dsp/arm/variance_neon.c +++ b/vpx_dsp/arm/variance_neon.c @@ -11,8 +11,8 @@ @@ -2821,7 +4701,7 @@ index efb2c1d8d..93aef1dd7 100644 #include "vpx/vpx_integer.h" #include "vpx_dsp/arm/mem_neon.h" diff --git a/vpx_dsp/arm/variance_neon_dotprod.c b/vpx_dsp/arm/variance_neon_dotprod.c -index ab843e9fc..4f6930a01 100644 +index d5c34fd..b75fee5 100644 --- a/vpx_dsp/arm/variance_neon_dotprod.c +++ b/vpx_dsp/arm/variance_neon_dotprod.c @@ -11,8 +11,8 @@ @@ -2836,7 +4716,7 @@ index ab843e9fc..4f6930a01 100644 #include "vpx/vpx_integer.h" #include "vpx_dsp/arm/mem_neon.h" diff --git a/vpx_dsp/arm/vpx_convolve8_neon.c b/vpx_dsp/arm/vpx_convolve8_neon.c -index 037ea1142..004a1113d 100644 +index 037ea11..004a111 100644 --- a/vpx_dsp/arm/vpx_convolve8_neon.c +++ b/vpx_dsp/arm/vpx_convolve8_neon.c @@ -11,8 +11,8 @@ @@ -2851,7 +4731,7 @@ index 037ea1142..004a1113d 100644 #include "vpx_dsp/arm/mem_neon.h" #include "vpx_dsp/arm/transpose_neon.h" diff --git a/vpx_dsp/arm/vpx_convolve8_neon.h b/vpx_dsp/arm/vpx_convolve8_neon.h -index 10cc761cc..930138293 100644 +index 10cc761..9301382 100644 --- a/vpx_dsp/arm/vpx_convolve8_neon.h +++ b/vpx_dsp/arm/vpx_convolve8_neon.h @@ -13,8 +13,8 @@ @@ -2866,7 +4746,7 @@ index 10cc761cc..930138293 100644 static INLINE int16x4_t convolve8_4(const int16x4_t s0, const int16x4_t s1, diff --git a/vpx_dsp/arm/vpx_convolve8_neon_asm.c b/vpx_dsp/arm/vpx_convolve8_neon_asm.c -index c4177c538..e749a138d 100644 +index c4177c5..e749a13 100644 --- a/vpx_dsp/arm/vpx_convolve8_neon_asm.c +++ b/vpx_dsp/arm/vpx_convolve8_neon_asm.c @@ -8,7 +8,7 @@ @@ -2879,7 +4759,7 @@ index c4177c538..e749a138d 100644 #include "vpx_dsp/arm/vpx_convolve8_neon_asm.h" diff --git a/vpx_dsp/arm/vpx_convolve8_neon_dotprod.c b/vpx_dsp/arm/vpx_convolve8_neon_dotprod.c -index b05a49d3f..2eac48257 100644 +index b919843..ba884c3 100644 --- a/vpx_dsp/arm/vpx_convolve8_neon_dotprod.c +++ b/vpx_dsp/arm/vpx_convolve8_neon_dotprod.c @@ -11,8 +11,8 @@ @@ -2894,7 +4774,7 @@ index b05a49d3f..2eac48257 100644 #include "vpx_dsp/arm/mem_neon.h" #include "vpx_dsp/arm/transpose_neon.h" diff --git a/vpx_dsp/arm/vpx_convolve8_neon_i8mm.c b/vpx_dsp/arm/vpx_convolve8_neon_i8mm.c -index e58200413..85726796b 100644 +index b9d88bc..828b339 100644 --- a/vpx_dsp/arm/vpx_convolve8_neon_i8mm.c +++ b/vpx_dsp/arm/vpx_convolve8_neon_i8mm.c @@ -11,8 +11,8 @@ @@ -2909,7 +4789,7 @@ index e58200413..85726796b 100644 #include "vpx_dsp/arm/mem_neon.h" #include "vpx_dsp/arm/transpose_neon.h" diff --git a/vpx_dsp/arm/vpx_convolve_avg_neon.c b/vpx_dsp/arm/vpx_convolve_avg_neon.c -index 8e3ee599f..44470ad7a 100644 +index 8e3ee59..44470ad 100644 --- a/vpx_dsp/arm/vpx_convolve_avg_neon.c +++ b/vpx_dsp/arm/vpx_convolve_avg_neon.c @@ -10,7 +10,7 @@ @@ -2922,7 +4802,7 @@ index 8e3ee599f..44470ad7a 100644 void vpx_convolve_avg_neon(const uint8_t *src, ptrdiff_t src_stride, diff --git a/vpx_dsp/arm/vpx_convolve_copy_neon.c b/vpx_dsp/arm/vpx_convolve_copy_neon.c -index bea7c9843..ce894baf7 100644 +index bea7c98..ce894ba 100644 --- a/vpx_dsp/arm/vpx_convolve_copy_neon.c +++ b/vpx_dsp/arm/vpx_convolve_copy_neon.c @@ -11,7 +11,7 @@ @@ -2935,7 +4815,7 @@ index bea7c9843..ce894baf7 100644 void vpx_convolve_copy_neon(const uint8_t *src, ptrdiff_t src_stride, diff --git a/vpx_dsp/arm/vpx_convolve_neon.c b/vpx_dsp/arm/vpx_convolve_neon.c -index de5fa2947..d2c0eeece 100644 +index de5fa29..d2c0eee 100644 --- a/vpx_dsp/arm/vpx_convolve_neon.c +++ b/vpx_dsp/arm/vpx_convolve_neon.c @@ -10,7 +10,7 @@ @@ -2948,7 +4828,7 @@ index de5fa2947..d2c0eeece 100644 #include "vpx_dsp/vpx_filter.h" #include "vpx_ports/mem.h" diff --git a/vpx_dsp/arm/vpx_scaled_convolve8_neon.c b/vpx_dsp/arm/vpx_scaled_convolve8_neon.c -index f40b6a907..891710107 100644 +index f40b6a9..8917101 100644 --- a/vpx_dsp/arm/vpx_scaled_convolve8_neon.c +++ b/vpx_dsp/arm/vpx_scaled_convolve8_neon.c @@ -12,8 +12,8 @@ @@ -2963,7 +4843,7 @@ index f40b6a907..891710107 100644 #include "vpx_dsp/arm/mem_neon.h" #include "vpx_dsp/arm/transpose_neon.h" diff --git a/vpx_dsp/avg.c b/vpx_dsp/avg.c -index a8dcab7da..3789dd1d1 100644 +index a8dcab7..3789dd1 100644 --- a/vpx_dsp/avg.c +++ b/vpx_dsp/avg.c @@ -11,7 +11,7 @@ @@ -2976,7 +4856,7 @@ index a8dcab7da..3789dd1d1 100644 unsigned int vpx_avg_8x8_c(const uint8_t *s, int p) { diff --git a/vpx_dsp/bitreader.c b/vpx_dsp/bitreader.c -index 90cbbba53..d9f7eeb51 100644 +index 90cbbba..d9f7eeb 100644 --- a/vpx_dsp/bitreader.c +++ b/vpx_dsp/bitreader.c @@ -9,7 +9,7 @@ @@ -2989,7 +4869,7 @@ index 90cbbba53..d9f7eeb51 100644 #include "vpx_dsp/bitreader.h" #include "vpx_dsp/prob.h" diff --git a/vpx_dsp/bitreader.h b/vpx_dsp/bitreader.h -index a5927ea2a..c08678b26 100644 +index a5927ea..c08678b 100644 --- a/vpx_dsp/bitreader.h +++ b/vpx_dsp/bitreader.h @@ -15,7 +15,7 @@ @@ -3002,33 +4882,50 @@ index a5927ea2a..c08678b26 100644 #include "vpx/vp8dx.h" #include "vpx/vpx_integer.h" diff --git a/vpx_dsp/bitreader_buffer.c b/vpx_dsp/bitreader_buffer.c -index f59f1f7cb..5ed7a18fd 100644 +index f59f1f7..aba2b78 100644 --- a/vpx_dsp/bitreader_buffer.c +++ b/vpx_dsp/bitreader_buffer.c -@@ -7,7 +7,7 @@ +@@ -7,8 +7,8 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "./vpx_config.h" +-#include "./bitreader_buffer.h" +#include "vpx_config.h" - #include "./bitreader_buffer.h" ++#include "bitreader_buffer.h" size_t vpx_rb_bytes_read(struct vpx_read_bit_buffer *rb) { + return (rb->bit_offset + 7) >> 3; +diff --git a/vpx_dsp/bitwriter.c b/vpx_dsp/bitwriter.c +index d3ef9bd..081c124 100644 +--- a/vpx_dsp/bitwriter.c ++++ b/vpx_dsp/bitwriter.c +@@ -11,7 +11,7 @@ + #include + #include + +-#include "./bitwriter.h" ++#include "bitwriter.h" + + #if CONFIG_BITSTREAM_DEBUG + #include "vpx_util/vpx_debug_util.h" diff --git a/vpx_dsp/bitwriter_buffer.c b/vpx_dsp/bitwriter_buffer.c -index b3a2490f2..9105a8901 100644 +index b3a2490..aa9fc29 100644 --- a/vpx_dsp/bitwriter_buffer.c +++ b/vpx_dsp/bitwriter_buffer.c -@@ -12,7 +12,7 @@ +@@ -12,8 +12,8 @@ #include #include -#include "./vpx_config.h" +-#include "./bitwriter_buffer.h" +#include "vpx_config.h" - #include "./bitwriter_buffer.h" ++#include "bitwriter_buffer.h" void vpx_wb_init(struct vpx_write_bit_buffer *wb, uint8_t *bit_buffer, + size_t size) { diff --git a/vpx_dsp/deblock.c b/vpx_dsp/deblock.c -index 455b73bbc..e856497c7 100644 +index 455b73b..e856497 100644 --- a/vpx_dsp/deblock.c +++ b/vpx_dsp/deblock.c @@ -9,7 +9,7 @@ @@ -3041,7 +4938,7 @@ index 455b73bbc..e856497c7 100644 const int16_t vpx_rv[] = { diff --git a/vpx_dsp/fastssim.c b/vpx_dsp/fastssim.c -index 4d32a02a5..3fb5eac74 100644 +index 4d32a02..3fb5eac 100644 --- a/vpx_dsp/fastssim.c +++ b/vpx_dsp/fastssim.c @@ -14,8 +14,8 @@ @@ -3056,7 +4953,7 @@ index 4d32a02a5..3fb5eac74 100644 #include "vpx_ports/system_state.h" diff --git a/vpx_dsp/fwd_txfm.c b/vpx_dsp/fwd_txfm.c -index ef66de024..6d044930b 100644 +index ef66de0..6d04493 100644 --- a/vpx_dsp/fwd_txfm.c +++ b/vpx_dsp/fwd_txfm.c @@ -9,7 +9,7 @@ @@ -3069,7 +4966,7 @@ index ef66de024..6d044930b 100644 void vpx_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride) { diff --git a/vpx_dsp/intrapred.c b/vpx_dsp/intrapred.c -index 400e632e9..aa27daefc 100644 +index 4b37dee..5c557fa 100644 --- a/vpx_dsp/intrapred.c +++ b/vpx_dsp/intrapred.c @@ -8,8 +8,8 @@ @@ -3084,7 +4981,7 @@ index 400e632e9..aa27daefc 100644 #include "vpx_dsp/vpx_dsp_common.h" #include "vpx_mem/vpx_mem.h" diff --git a/vpx_dsp/inv_txfm.c b/vpx_dsp/inv_txfm.c -index 97655b3a9..a32d89418 100644 +index 97655b3..a32d894 100644 --- a/vpx_dsp/inv_txfm.c +++ b/vpx_dsp/inv_txfm.c @@ -12,7 +12,7 @@ @@ -3097,7 +4994,7 @@ index 97655b3a9..a32d89418 100644 void vpx_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride) { diff --git a/vpx_dsp/inv_txfm.h b/vpx_dsp/inv_txfm.h -index 6eedbeac3..c2f6232b2 100644 +index 6eedbea..c2f6232 100644 --- a/vpx_dsp/inv_txfm.h +++ b/vpx_dsp/inv_txfm.h @@ -13,7 +13,7 @@ @@ -3110,7 +5007,7 @@ index 6eedbeac3..c2f6232b2 100644 #include "vpx_ports/mem.h" diff --git a/vpx_dsp/loongarch/avg_lsx.c b/vpx_dsp/loongarch/avg_lsx.c -index 750c9de29..045d1ec51 100644 +index 750c9de..045d1ec 100644 --- a/vpx_dsp/loongarch/avg_lsx.c +++ b/vpx_dsp/loongarch/avg_lsx.c @@ -10,7 +10,7 @@ @@ -3123,7 +5020,7 @@ index 750c9de29..045d1ec51 100644 void vpx_hadamard_8x8_lsx(const int16_t *src, ptrdiff_t src_stride, diff --git a/vpx_dsp/loongarch/avg_pred_lsx.c b/vpx_dsp/loongarch/avg_pred_lsx.c -index 482626080..a609dbbc7 100644 +index 4826260..a609dbb 100644 --- a/vpx_dsp/loongarch/avg_pred_lsx.c +++ b/vpx_dsp/loongarch/avg_pred_lsx.c @@ -9,7 +9,7 @@ @@ -3136,7 +5033,7 @@ index 482626080..a609dbbc7 100644 #include "vpx_util/loongson_intrinsics.h" diff --git a/vpx_dsp/loongarch/bitdepth_conversion_lsx.h b/vpx_dsp/loongarch/bitdepth_conversion_lsx.h -index b0db1e99c..a37bf6e0b 100644 +index b0db1e9..a37bf6e 100644 --- a/vpx_dsp/loongarch/bitdepth_conversion_lsx.h +++ b/vpx_dsp/loongarch/bitdepth_conversion_lsx.h @@ -11,7 +11,7 @@ @@ -3149,7 +5046,7 @@ index b0db1e99c..a37bf6e0b 100644 #include "vpx_dsp/vpx_dsp_common.h" #include "vpx_util/loongson_intrinsics.h" diff --git a/vpx_dsp/loongarch/fwd_dct32x32_lsx.c b/vpx_dsp/loongarch/fwd_dct32x32_lsx.c -index 9bb387721..ab73b3a1a 100644 +index 9bb3877..ab73b3a 100644 --- a/vpx_dsp/loongarch/fwd_dct32x32_lsx.c +++ b/vpx_dsp/loongarch/fwd_dct32x32_lsx.c @@ -8,7 +8,7 @@ @@ -3162,7 +5059,7 @@ index 9bb387721..ab73b3a1a 100644 #include "vpx_dsp/fwd_txfm.h" diff --git a/vpx_dsp/loongarch/fwd_txfm_lsx.c b/vpx_dsp/loongarch/fwd_txfm_lsx.c -index 508532b9d..1a1bd29b0 100644 +index 508532b..1a1bd29 100644 --- a/vpx_dsp/loongarch/fwd_txfm_lsx.c +++ b/vpx_dsp/loongarch/fwd_txfm_lsx.c @@ -8,7 +8,7 @@ @@ -3175,7 +5072,7 @@ index 508532b9d..1a1bd29b0 100644 #define LSX_TRANSPOSE4x4_H(_in0, _in1, _in2, _in3, _out0, _out1, _out2, _out3) \ diff --git a/vpx_dsp/loongarch/idct32x32_lsx.c b/vpx_dsp/loongarch/idct32x32_lsx.c -index ec07f57d9..6dde08c0a 100644 +index ec07f57..6dde08c 100644 --- a/vpx_dsp/loongarch/idct32x32_lsx.c +++ b/vpx_dsp/loongarch/idct32x32_lsx.c @@ -8,7 +8,7 @@ @@ -3188,7 +5085,7 @@ index ec07f57d9..6dde08c0a 100644 #define UNPCK_UB_SH(_in, _out0, _out1) \ diff --git a/vpx_dsp/loongarch/intrapred_lsx.c b/vpx_dsp/loongarch/intrapred_lsx.c -index f99021179..15cb36c2e 100644 +index f990211..15cb36c 100644 --- a/vpx_dsp/loongarch/intrapred_lsx.c +++ b/vpx_dsp/loongarch/intrapred_lsx.c @@ -9,7 +9,7 @@ @@ -3201,7 +5098,7 @@ index f99021179..15cb36c2e 100644 static inline void intra_predict_dc_8x8_lsx(const uint8_t *src_top, diff --git a/vpx_dsp/loongarch/loopfilter_16_lsx.c b/vpx_dsp/loongarch/loopfilter_16_lsx.c -index 0503df996..1de7387fc 100644 +index 0503df9..1de7387 100644 --- a/vpx_dsp/loongarch/loopfilter_16_lsx.c +++ b/vpx_dsp/loongarch/loopfilter_16_lsx.c @@ -9,7 +9,7 @@ @@ -3214,7 +5111,7 @@ index 0503df996..1de7387fc 100644 #include "vpx_ports/mem.h" diff --git a/vpx_dsp/loongarch/loopfilter_4_lsx.c b/vpx_dsp/loongarch/loopfilter_4_lsx.c -index 9300b5c5a..e2c84f813 100644 +index 9300b5c..e2c84f8 100644 --- a/vpx_dsp/loongarch/loopfilter_4_lsx.c +++ b/vpx_dsp/loongarch/loopfilter_4_lsx.c @@ -8,7 +8,7 @@ @@ -3227,7 +5124,7 @@ index 9300b5c5a..e2c84f813 100644 void vpx_lpf_horizontal_4_lsx(uint8_t *src, int32_t pitch, diff --git a/vpx_dsp/loongarch/loopfilter_8_lsx.c b/vpx_dsp/loongarch/loopfilter_8_lsx.c -index 00219ba71..4189e6094 100644 +index 00219ba..4189e60 100644 --- a/vpx_dsp/loongarch/loopfilter_8_lsx.c +++ b/vpx_dsp/loongarch/loopfilter_8_lsx.c @@ -8,7 +8,7 @@ @@ -3240,7 +5137,7 @@ index 00219ba71..4189e6094 100644 void vpx_lpf_horizontal_8_lsx(uint8_t *dst, int32_t stride, diff --git a/vpx_dsp/loongarch/quantize_lsx.c b/vpx_dsp/loongarch/quantize_lsx.c -index 9bb1691e2..770404b18 100644 +index 1299e75..95670aa 100644 --- a/vpx_dsp/loongarch/quantize_lsx.c +++ b/vpx_dsp/loongarch/quantize_lsx.c @@ -8,8 +8,8 @@ @@ -3255,7 +5152,7 @@ index 9bb1691e2..770404b18 100644 #include "vp9/common/vp9_scan.h" #include "vp9/encoder/vp9_block.h" diff --git a/vpx_dsp/loongarch/sad_lsx.c b/vpx_dsp/loongarch/sad_lsx.c -index b6fbedb0d..cdde99668 100644 +index b6fbedb..cdde996 100644 --- a/vpx_dsp/loongarch/sad_lsx.c +++ b/vpx_dsp/loongarch/sad_lsx.c @@ -8,8 +8,8 @@ @@ -3270,7 +5167,7 @@ index b6fbedb0d..cdde99668 100644 static INLINE __m128i sad_ub2_uh(__m128i in0, __m128i in1, __m128i ref0, diff --git a/vpx_dsp/loongarch/sub_pixel_variance_lsx.c b/vpx_dsp/loongarch/sub_pixel_variance_lsx.c -index 700793531..3b9659c8f 100644 +index 7007935..3b9659c 100644 --- a/vpx_dsp/loongarch/sub_pixel_variance_lsx.c +++ b/vpx_dsp/loongarch/sub_pixel_variance_lsx.c @@ -8,7 +8,7 @@ @@ -3283,7 +5180,7 @@ index 700793531..3b9659c8f 100644 #include "vpx_dsp/loongarch/variance_lsx.h" #include "vpx_dsp/variance.h" diff --git a/vpx_dsp/loongarch/subtract_lsx.c b/vpx_dsp/loongarch/subtract_lsx.c -index 943a5c5a9..49af3ac7d 100644 +index 943a5c5..49af3ac 100644 --- a/vpx_dsp/loongarch/subtract_lsx.c +++ b/vpx_dsp/loongarch/subtract_lsx.c @@ -8,7 +8,7 @@ @@ -3296,7 +5193,7 @@ index 943a5c5a9..49af3ac7d 100644 static void sub_blk_4x4_lsx(const uint8_t *src_ptr, int32_t src_stride, diff --git a/vpx_dsp/loongarch/variance_lsx.c b/vpx_dsp/loongarch/variance_lsx.c -index 8fad342c7..9904fecf3 100644 +index 8fad342..9904fec 100644 --- a/vpx_dsp/loongarch/variance_lsx.c +++ b/vpx_dsp/loongarch/variance_lsx.c @@ -8,7 +8,7 @@ @@ -3309,7 +5206,7 @@ index 8fad342c7..9904fecf3 100644 #define VARIANCE_WxH(sse, diff, shift) \ diff --git a/vpx_dsp/loongarch/vpx_convolve8_avg_horiz_lsx.c b/vpx_dsp/loongarch/vpx_convolve8_avg_horiz_lsx.c -index 1c5922881..a754a4fa8 100644 +index 1c59228..a754a4f 100644 --- a/vpx_dsp/loongarch/vpx_convolve8_avg_horiz_lsx.c +++ b/vpx_dsp/loongarch/vpx_convolve8_avg_horiz_lsx.c @@ -9,7 +9,7 @@ @@ -3322,7 +5219,7 @@ index 1c5922881..a754a4fa8 100644 static const uint8_t mc_filt_mask_arr[16 * 3] = { diff --git a/vpx_dsp/loongarch/vpx_convolve8_avg_lsx.c b/vpx_dsp/loongarch/vpx_convolve8_avg_lsx.c -index d1abf622a..0f8de623f 100644 +index d1abf62..0f8de62 100644 --- a/vpx_dsp/loongarch/vpx_convolve8_avg_lsx.c +++ b/vpx_dsp/loongarch/vpx_convolve8_avg_lsx.c @@ -9,7 +9,7 @@ @@ -3335,7 +5232,7 @@ index d1abf622a..0f8de623f 100644 static const uint8_t mc_filt_mask_arr[16 * 3] = { diff --git a/vpx_dsp/loongarch/vpx_convolve8_avg_vert_lsx.c b/vpx_dsp/loongarch/vpx_convolve8_avg_vert_lsx.c -index 5c6413df4..98e284201 100644 +index 5c6413d..98e2842 100644 --- a/vpx_dsp/loongarch/vpx_convolve8_avg_vert_lsx.c +++ b/vpx_dsp/loongarch/vpx_convolve8_avg_vert_lsx.c @@ -9,7 +9,7 @@ @@ -3348,7 +5245,7 @@ index 5c6413df4..98e284201 100644 static void common_vt_8t_and_aver_dst_4w_lsx(const uint8_t *src, diff --git a/vpx_dsp/loongarch/vpx_convolve8_horiz_lsx.c b/vpx_dsp/loongarch/vpx_convolve8_horiz_lsx.c -index 2c6459a97..92ba9a242 100644 +index 2c6459a..92ba9a2 100644 --- a/vpx_dsp/loongarch/vpx_convolve8_horiz_lsx.c +++ b/vpx_dsp/loongarch/vpx_convolve8_horiz_lsx.c @@ -9,7 +9,7 @@ @@ -3361,7 +5258,7 @@ index 2c6459a97..92ba9a242 100644 static const uint8_t mc_filt_mask_arr[16 * 3] = { diff --git a/vpx_dsp/loongarch/vpx_convolve8_lsx.c b/vpx_dsp/loongarch/vpx_convolve8_lsx.c -index 9f5cd6cfe..5cd5294ca 100644 +index 9f5cd6c..5cd5294 100644 --- a/vpx_dsp/loongarch/vpx_convolve8_lsx.c +++ b/vpx_dsp/loongarch/vpx_convolve8_lsx.c @@ -9,7 +9,7 @@ @@ -3374,7 +5271,7 @@ index 9f5cd6cfe..5cd5294ca 100644 static const uint8_t mc_filt_mask_arr[16 * 3] = { diff --git a/vpx_dsp/loongarch/vpx_convolve8_vert_lsx.c b/vpx_dsp/loongarch/vpx_convolve8_vert_lsx.c -index 6022e43c8..5e27d774b 100644 +index 6022e43..5e27d77 100644 --- a/vpx_dsp/loongarch/vpx_convolve8_vert_lsx.c +++ b/vpx_dsp/loongarch/vpx_convolve8_vert_lsx.c @@ -9,7 +9,7 @@ @@ -3387,7 +5284,7 @@ index 6022e43c8..5e27d774b 100644 static void common_vt_8t_4w_lsx(const uint8_t *src, int32_t src_stride, diff --git a/vpx_dsp/loongarch/vpx_convolve_avg_lsx.c b/vpx_dsp/loongarch/vpx_convolve_avg_lsx.c -index 1dad29eee..38bac1474 100644 +index 1dad29e..38bac14 100644 --- a/vpx_dsp/loongarch/vpx_convolve_avg_lsx.c +++ b/vpx_dsp/loongarch/vpx_convolve_avg_lsx.c @@ -8,7 +8,7 @@ @@ -3400,7 +5297,7 @@ index 1dad29eee..38bac1474 100644 static void avg_width4_lsx(const uint8_t *src, int32_t src_stride, uint8_t *dst, diff --git a/vpx_dsp/loongarch/vpx_convolve_copy_lsx.c b/vpx_dsp/loongarch/vpx_convolve_copy_lsx.c -index 53dc7097e..8b44f0db0 100644 +index 53dc709..8b44f0d 100644 --- a/vpx_dsp/loongarch/vpx_convolve_copy_lsx.c +++ b/vpx_dsp/loongarch/vpx_convolve_copy_lsx.c @@ -9,7 +9,7 @@ @@ -3413,7 +5310,7 @@ index 53dc7097e..8b44f0db0 100644 static void copy_width8_lsx(const uint8_t *src, int32_t src_stride, diff --git a/vpx_dsp/loongarch/vpx_convolve_lsx.h b/vpx_dsp/loongarch/vpx_convolve_lsx.h -index d886b0019..ef0463726 100644 +index d886b00..ef04637 100644 --- a/vpx_dsp/loongarch/vpx_convolve_lsx.h +++ b/vpx_dsp/loongarch/vpx_convolve_lsx.h @@ -11,7 +11,7 @@ @@ -3426,7 +5323,7 @@ index d886b0019..ef0463726 100644 #include "vpx_util/loongson_intrinsics.h" diff --git a/vpx_dsp/loopfilter.c b/vpx_dsp/loopfilter.c -index d6504aab1..7e74024b7 100644 +index d6504aa..7e74024 100644 --- a/vpx_dsp/loopfilter.c +++ b/vpx_dsp/loopfilter.c @@ -10,8 +10,8 @@ @@ -3441,7 +5338,7 @@ index d6504aab1..7e74024b7 100644 #include "vpx_ports/mem.h" diff --git a/vpx_dsp/mips/add_noise_msa.c b/vpx_dsp/mips/add_noise_msa.c -index 97541411e..93d43118a 100644 +index 9754141..93d4311 100644 --- a/vpx_dsp/mips/add_noise_msa.c +++ b/vpx_dsp/mips/add_noise_msa.c @@ -10,7 +10,7 @@ @@ -3454,7 +5351,7 @@ index 97541411e..93d43118a 100644 void vpx_plane_add_noise_msa(uint8_t *start_ptr, const int8_t *noise, diff --git a/vpx_dsp/mips/avg_msa.c b/vpx_dsp/mips/avg_msa.c -index 3fd18dec5..d74e4b156 100644 +index 3fd18de..d74e4b1 100644 --- a/vpx_dsp/mips/avg_msa.c +++ b/vpx_dsp/mips/avg_msa.c @@ -9,8 +9,8 @@ @@ -3469,7 +5366,7 @@ index 3fd18dec5..d74e4b156 100644 uint32_t vpx_avg_8x8_msa(const uint8_t *src, int32_t src_stride) { diff --git a/vpx_dsp/mips/common_dspr2.h b/vpx_dsp/mips/common_dspr2.h -index 87a5bbab5..eda797bc3 100644 +index 87a5bba..eda797b 100644 --- a/vpx_dsp/mips/common_dspr2.h +++ b/vpx_dsp/mips/common_dspr2.h @@ -12,7 +12,7 @@ @@ -3482,7 +5379,7 @@ index 87a5bbab5..eda797bc3 100644 #ifdef __cplusplus diff --git a/vpx_dsp/mips/convolve2_avg_dspr2.c b/vpx_dsp/mips/convolve2_avg_dspr2.c -index 18e7d5375..144bb3e39 100644 +index 18e7d53..144bb3e 100644 --- a/vpx_dsp/mips/convolve2_avg_dspr2.c +++ b/vpx_dsp/mips/convolve2_avg_dspr2.c @@ -11,7 +11,7 @@ @@ -3495,7 +5392,7 @@ index 18e7d5375..144bb3e39 100644 #include "vpx_dsp/vpx_convolve.h" #include "vpx_dsp/vpx_dsp_common.h" diff --git a/vpx_dsp/mips/convolve2_avg_horiz_dspr2.c b/vpx_dsp/mips/convolve2_avg_horiz_dspr2.c -index 7dcb662d7..325199788 100644 +index 7dcb662..3251997 100644 --- a/vpx_dsp/mips/convolve2_avg_horiz_dspr2.c +++ b/vpx_dsp/mips/convolve2_avg_horiz_dspr2.c @@ -11,7 +11,7 @@ @@ -3508,7 +5405,7 @@ index 7dcb662d7..325199788 100644 #include "vpx_dsp/vpx_convolve.h" #include "vpx_dsp/vpx_dsp_common.h" diff --git a/vpx_dsp/mips/convolve2_dspr2.c b/vpx_dsp/mips/convolve2_dspr2.c -index e355ba3a0..8d2ea61ce 100644 +index e355ba3..8d2ea61 100644 --- a/vpx_dsp/mips/convolve2_dspr2.c +++ b/vpx_dsp/mips/convolve2_dspr2.c @@ -11,7 +11,7 @@ @@ -3521,7 +5418,7 @@ index e355ba3a0..8d2ea61ce 100644 #include "vpx_dsp/vpx_dsp_common.h" #include "vpx_dsp/vpx_filter.h" diff --git a/vpx_dsp/mips/convolve2_horiz_dspr2.c b/vpx_dsp/mips/convolve2_horiz_dspr2.c -index 9e65a8f50..940012993 100644 +index 9e65a8f..9400129 100644 --- a/vpx_dsp/mips/convolve2_horiz_dspr2.c +++ b/vpx_dsp/mips/convolve2_horiz_dspr2.c @@ -11,7 +11,7 @@ @@ -3534,7 +5431,7 @@ index 9e65a8f50..940012993 100644 #include "vpx_dsp/vpx_convolve.h" #include "vpx_dsp/vpx_dsp_common.h" diff --git a/vpx_dsp/mips/convolve2_vert_dspr2.c b/vpx_dsp/mips/convolve2_vert_dspr2.c -index a3e967b40..8ac4c83f4 100644 +index a3e967b..8ac4c83 100644 --- a/vpx_dsp/mips/convolve2_vert_dspr2.c +++ b/vpx_dsp/mips/convolve2_vert_dspr2.c @@ -11,7 +11,7 @@ @@ -3547,7 +5444,7 @@ index a3e967b40..8ac4c83f4 100644 #include "vpx_dsp/vpx_convolve.h" #include "vpx_dsp/vpx_dsp_common.h" diff --git a/vpx_dsp/mips/convolve8_avg_dspr2.c b/vpx_dsp/mips/convolve8_avg_dspr2.c -index cc458c861..147b1e376 100644 +index cc458c8..147b1e3 100644 --- a/vpx_dsp/mips/convolve8_avg_dspr2.c +++ b/vpx_dsp/mips/convolve8_avg_dspr2.c @@ -11,7 +11,7 @@ @@ -3560,7 +5457,7 @@ index cc458c861..147b1e376 100644 #include "vpx_dsp/vpx_convolve.h" #include "vpx_dsp/vpx_dsp_common.h" diff --git a/vpx_dsp/mips/convolve8_avg_horiz_dspr2.c b/vpx_dsp/mips/convolve8_avg_horiz_dspr2.c -index 7a9aa49d8..b72ad769e 100644 +index 7a9aa49..b72ad76 100644 --- a/vpx_dsp/mips/convolve8_avg_horiz_dspr2.c +++ b/vpx_dsp/mips/convolve8_avg_horiz_dspr2.c @@ -11,7 +11,7 @@ @@ -3573,7 +5470,7 @@ index 7a9aa49d8..b72ad769e 100644 #include "vpx_dsp/vpx_convolve.h" #include "vpx_dsp/vpx_dsp_common.h" diff --git a/vpx_dsp/mips/convolve8_dspr2.c b/vpx_dsp/mips/convolve8_dspr2.c -index 1e7052f6c..753311a99 100644 +index 1e7052f..753311a 100644 --- a/vpx_dsp/mips/convolve8_dspr2.c +++ b/vpx_dsp/mips/convolve8_dspr2.c @@ -11,7 +11,7 @@ @@ -3586,7 +5483,7 @@ index 1e7052f6c..753311a99 100644 #include "vpx_dsp/vpx_dsp_common.h" #include "vpx_dsp/vpx_filter.h" diff --git a/vpx_dsp/mips/convolve8_horiz_dspr2.c b/vpx_dsp/mips/convolve8_horiz_dspr2.c -index 09d6f36e5..c7e485a8b 100644 +index 09d6f36..c7e485a 100644 --- a/vpx_dsp/mips/convolve8_horiz_dspr2.c +++ b/vpx_dsp/mips/convolve8_horiz_dspr2.c @@ -11,7 +11,7 @@ @@ -3599,7 +5496,7 @@ index 09d6f36e5..c7e485a8b 100644 #include "vpx_dsp/vpx_dsp_common.h" #include "vpx_dsp/vpx_filter.h" diff --git a/vpx_dsp/mips/convolve8_vert_dspr2.c b/vpx_dsp/mips/convolve8_vert_dspr2.c -index fd977b533..5ff0279d7 100644 +index fd977b5..5ff0279 100644 --- a/vpx_dsp/mips/convolve8_vert_dspr2.c +++ b/vpx_dsp/mips/convolve8_vert_dspr2.c @@ -11,7 +11,7 @@ @@ -3612,7 +5509,7 @@ index fd977b533..5ff0279d7 100644 #include "vpx_dsp/vpx_dsp_common.h" #include "vpx_dsp/vpx_filter.h" diff --git a/vpx_dsp/mips/convolve_common_dspr2.h b/vpx_dsp/mips/convolve_common_dspr2.h -index 14b65bc65..c25c8a48d 100644 +index 14b65bc..c25c8a4 100644 --- a/vpx_dsp/mips/convolve_common_dspr2.h +++ b/vpx_dsp/mips/convolve_common_dspr2.h @@ -13,7 +13,7 @@ @@ -3625,7 +5522,7 @@ index 14b65bc65..c25c8a48d 100644 #include "vpx_dsp/mips/common_dspr2.h" diff --git a/vpx_dsp/mips/deblock_msa.c b/vpx_dsp/mips/deblock_msa.c -index 4e93ff594..7ee64acbb 100644 +index 4e93ff5..7ee64ac 100644 --- a/vpx_dsp/mips/deblock_msa.c +++ b/vpx_dsp/mips/deblock_msa.c @@ -10,7 +10,7 @@ @@ -3638,7 +5535,7 @@ index 4e93ff594..7ee64acbb 100644 extern const int16_t vpx_rv[]; diff --git a/vpx_dsp/mips/fwd_dct32x32_msa.c b/vpx_dsp/mips/fwd_dct32x32_msa.c -index 36583e2d2..6e7334fe1 100644 +index 36583e2..6e7334f 100644 --- a/vpx_dsp/mips/fwd_dct32x32_msa.c +++ b/vpx_dsp/mips/fwd_dct32x32_msa.c @@ -8,7 +8,7 @@ @@ -3651,7 +5548,7 @@ index 36583e2d2..6e7334fe1 100644 static void fdct8x32_1d_column_load_butterfly(const int16_t *input, diff --git a/vpx_dsp/mips/fwd_txfm_msa.c b/vpx_dsp/mips/fwd_txfm_msa.c -index 5a6dfcef2..dd35e497b 100644 +index 5a6dfce..dd35e49 100644 --- a/vpx_dsp/mips/fwd_txfm_msa.c +++ b/vpx_dsp/mips/fwd_txfm_msa.c @@ -8,7 +8,7 @@ @@ -3664,7 +5561,7 @@ index 5a6dfcef2..dd35e497b 100644 void vpx_fdct8x8_1_msa(const int16_t *input, tran_low_t *out, int32_t stride) { diff --git a/vpx_dsp/mips/idct16x16_msa.c b/vpx_dsp/mips/idct16x16_msa.c -index 7ca61a28e..5562d6e06 100644 +index 7ca61a2..5562d6e 100644 --- a/vpx_dsp/mips/idct16x16_msa.c +++ b/vpx_dsp/mips/idct16x16_msa.c @@ -8,7 +8,7 @@ @@ -3677,7 +5574,7 @@ index 7ca61a28e..5562d6e06 100644 void vpx_idct16_1d_rows_msa(const int16_t *input, int16_t *output) { diff --git a/vpx_dsp/mips/idct32x32_msa.c b/vpx_dsp/mips/idct32x32_msa.c -index 053948183..bea9cb1d3 100644 +index 0539481..bea9cb1 100644 --- a/vpx_dsp/mips/idct32x32_msa.c +++ b/vpx_dsp/mips/idct32x32_msa.c @@ -8,7 +8,7 @@ @@ -3690,7 +5587,7 @@ index 053948183..bea9cb1d3 100644 static void idct32x8_row_transpose_store(const int16_t *input, diff --git a/vpx_dsp/mips/idct4x4_msa.c b/vpx_dsp/mips/idct4x4_msa.c -index 56ffec3cb..22499ddd2 100644 +index 56ffec3..22499dd 100644 --- a/vpx_dsp/mips/idct4x4_msa.c +++ b/vpx_dsp/mips/idct4x4_msa.c @@ -8,7 +8,7 @@ @@ -3703,7 +5600,7 @@ index 56ffec3cb..22499ddd2 100644 void vpx_iwht4x4_16_add_msa(const int16_t *input, uint8_t *dst, diff --git a/vpx_dsp/mips/idct8x8_msa.c b/vpx_dsp/mips/idct8x8_msa.c -index a383ff206..97818e98e 100644 +index a383ff2..97818e9 100644 --- a/vpx_dsp/mips/idct8x8_msa.c +++ b/vpx_dsp/mips/idct8x8_msa.c @@ -8,7 +8,7 @@ @@ -3716,7 +5613,7 @@ index a383ff206..97818e98e 100644 void vpx_idct8x8_64_add_msa(const int16_t *input, uint8_t *dst, diff --git a/vpx_dsp/mips/intrapred_msa.c b/vpx_dsp/mips/intrapred_msa.c -index b5ee94303..aa5de8686 100644 +index b5ee943..aa5de86 100644 --- a/vpx_dsp/mips/intrapred_msa.c +++ b/vpx_dsp/mips/intrapred_msa.c @@ -8,7 +8,7 @@ @@ -3729,7 +5626,7 @@ index b5ee94303..aa5de8686 100644 #define IPRED_SUBS_UH2_UH(in0, in1, out0, out1) \ diff --git a/vpx_dsp/mips/inv_txfm_dspr2.h b/vpx_dsp/mips/inv_txfm_dspr2.h -index cbea22f20..e023c7b62 100644 +index cbea22f..e023c7b 100644 --- a/vpx_dsp/mips/inv_txfm_dspr2.h +++ b/vpx_dsp/mips/inv_txfm_dspr2.h @@ -13,7 +13,7 @@ @@ -3742,7 +5639,7 @@ index cbea22f20..e023c7b62 100644 #include "vpx_dsp/inv_txfm.h" #include "vpx_dsp/mips/common_dspr2.h" diff --git a/vpx_dsp/mips/itrans16_dspr2.c b/vpx_dsp/mips/itrans16_dspr2.c -index 44ba65c7a..01f67c561 100644 +index 44ba65c..01f67c5 100644 --- a/vpx_dsp/mips/itrans16_dspr2.c +++ b/vpx_dsp/mips/itrans16_dspr2.c @@ -8,8 +8,8 @@ @@ -3757,7 +5654,7 @@ index 44ba65c7a..01f67c561 100644 #include "vpx_dsp/txfm_common.h" diff --git a/vpx_dsp/mips/itrans32_cols_dspr2.c b/vpx_dsp/mips/itrans32_cols_dspr2.c -index 3f043b48b..a936b1072 100644 +index 3f043b4..a936b10 100644 --- a/vpx_dsp/mips/itrans32_cols_dspr2.c +++ b/vpx_dsp/mips/itrans32_cols_dspr2.c @@ -8,7 +8,7 @@ @@ -3770,7 +5667,7 @@ index 3f043b48b..a936b1072 100644 #include "vpx_dsp/txfm_common.h" diff --git a/vpx_dsp/mips/itrans32_dspr2.c b/vpx_dsp/mips/itrans32_dspr2.c -index 3c0468c00..30cda8fab 100644 +index 3c0468c..30cda8f 100644 --- a/vpx_dsp/mips/itrans32_dspr2.c +++ b/vpx_dsp/mips/itrans32_dspr2.c @@ -11,7 +11,7 @@ @@ -3783,7 +5680,7 @@ index 3c0468c00..30cda8fab 100644 #include "vpx_dsp/txfm_common.h" diff --git a/vpx_dsp/mips/itrans4_dspr2.c b/vpx_dsp/mips/itrans4_dspr2.c -index e214b538d..0f4f1908c 100644 +index e214b53..0f4f190 100644 --- a/vpx_dsp/mips/itrans4_dspr2.c +++ b/vpx_dsp/mips/itrans4_dspr2.c @@ -8,8 +8,8 @@ @@ -3798,7 +5695,7 @@ index e214b538d..0f4f1908c 100644 #include "vpx_dsp/txfm_common.h" diff --git a/vpx_dsp/mips/itrans8_dspr2.c b/vpx_dsp/mips/itrans8_dspr2.c -index d4d246965..d4dd277b7 100644 +index d4d2469..d4dd277 100644 --- a/vpx_dsp/mips/itrans8_dspr2.c +++ b/vpx_dsp/mips/itrans8_dspr2.c @@ -8,8 +8,8 @@ @@ -3813,7 +5710,7 @@ index d4d246965..d4dd277b7 100644 #include "vpx_dsp/txfm_common.h" diff --git a/vpx_dsp/mips/loopfilter_16_msa.c b/vpx_dsp/mips/loopfilter_16_msa.c -index b1731f234..b2621e7d9 100644 +index b1731f2..b2621e7 100644 --- a/vpx_dsp/mips/loopfilter_16_msa.c +++ b/vpx_dsp/mips/loopfilter_16_msa.c @@ -8,7 +8,7 @@ @@ -3826,7 +5723,7 @@ index b1731f234..b2621e7d9 100644 #include "vpx_ports/mem.h" diff --git a/vpx_dsp/mips/loopfilter_4_msa.c b/vpx_dsp/mips/loopfilter_4_msa.c -index 0eff2b6ca..89d225e1a 100644 +index 0eff2b6..89d225e 100644 --- a/vpx_dsp/mips/loopfilter_4_msa.c +++ b/vpx_dsp/mips/loopfilter_4_msa.c @@ -8,7 +8,7 @@ @@ -3839,7 +5736,7 @@ index 0eff2b6ca..89d225e1a 100644 void vpx_lpf_horizontal_4_msa(uint8_t *src, int32_t pitch, diff --git a/vpx_dsp/mips/loopfilter_8_msa.c b/vpx_dsp/mips/loopfilter_8_msa.c -index 703fcce8a..9961ca053 100644 +index 703fcce..9961ca0 100644 --- a/vpx_dsp/mips/loopfilter_8_msa.c +++ b/vpx_dsp/mips/loopfilter_8_msa.c @@ -8,7 +8,7 @@ @@ -3852,7 +5749,7 @@ index 703fcce8a..9961ca053 100644 void vpx_lpf_horizontal_8_msa(uint8_t *src, int32_t pitch, diff --git a/vpx_dsp/mips/loopfilter_filters_dspr2.c b/vpx_dsp/mips/loopfilter_filters_dspr2.c -index f1743679a..6d9656947 100644 +index f174367..6d96569 100644 --- a/vpx_dsp/mips/loopfilter_filters_dspr2.c +++ b/vpx_dsp/mips/loopfilter_filters_dspr2.c @@ -10,7 +10,7 @@ @@ -3865,7 +5762,7 @@ index f1743679a..6d9656947 100644 #include "vpx_dsp/mips/common_dspr2.h" #include "vpx_dsp/mips/loopfilter_filters_dspr2.h" diff --git a/vpx_dsp/mips/loopfilter_filters_dspr2.h b/vpx_dsp/mips/loopfilter_filters_dspr2.h -index ec339be86..0b0f46c17 100644 +index ec339be..0b0f46c 100644 --- a/vpx_dsp/mips/loopfilter_filters_dspr2.h +++ b/vpx_dsp/mips/loopfilter_filters_dspr2.h @@ -13,7 +13,7 @@ @@ -3878,7 +5775,7 @@ index ec339be86..0b0f46c17 100644 #include "vpx_mem/vpx_mem.h" #include "vpx_ports/mem.h" diff --git a/vpx_dsp/mips/loopfilter_macros_dspr2.h b/vpx_dsp/mips/loopfilter_macros_dspr2.h -index 9af0b4236..03bcbea07 100644 +index 9af0b42..03bcbea 100644 --- a/vpx_dsp/mips/loopfilter_macros_dspr2.h +++ b/vpx_dsp/mips/loopfilter_macros_dspr2.h @@ -13,7 +13,7 @@ @@ -3891,7 +5788,7 @@ index 9af0b4236..03bcbea07 100644 #include "vpx_mem/vpx_mem.h" diff --git a/vpx_dsp/mips/loopfilter_masks_dspr2.h b/vpx_dsp/mips/loopfilter_masks_dspr2.h -index 24c492bea..8d9ac35e5 100644 +index 24c492b..8d9ac35 100644 --- a/vpx_dsp/mips/loopfilter_masks_dspr2.h +++ b/vpx_dsp/mips/loopfilter_masks_dspr2.h @@ -13,7 +13,7 @@ @@ -3904,7 +5801,7 @@ index 24c492bea..8d9ac35e5 100644 #include "vpx_mem/vpx_mem.h" diff --git a/vpx_dsp/mips/loopfilter_mb_dspr2.c b/vpx_dsp/mips/loopfilter_mb_dspr2.c -index e42479257..50eb3f5a1 100644 +index e424792..50eb3f5 100644 --- a/vpx_dsp/mips/loopfilter_mb_dspr2.c +++ b/vpx_dsp/mips/loopfilter_mb_dspr2.c @@ -10,7 +10,7 @@ @@ -3917,7 +5814,7 @@ index e42479257..50eb3f5a1 100644 #include "vpx_dsp/mips/common_dspr2.h" #include "vpx_dsp/mips/loopfilter_filters_dspr2.h" diff --git a/vpx_dsp/mips/loopfilter_mb_horiz_dspr2.c b/vpx_dsp/mips/loopfilter_mb_horiz_dspr2.c -index 9c1f5143f..cc85cbf07 100644 +index 9c1f514..cc85cbf 100644 --- a/vpx_dsp/mips/loopfilter_mb_horiz_dspr2.c +++ b/vpx_dsp/mips/loopfilter_mb_horiz_dspr2.c @@ -10,7 +10,7 @@ @@ -3930,7 +5827,7 @@ index 9c1f5143f..cc85cbf07 100644 #include "vpx_dsp/mips/common_dspr2.h" #include "vpx_dsp/mips/loopfilter_filters_dspr2.h" diff --git a/vpx_dsp/mips/loopfilter_mb_vert_dspr2.c b/vpx_dsp/mips/loopfilter_mb_vert_dspr2.c -index 96e8d8858..c78cc64c7 100644 +index 96e8d88..c78cc64 100644 --- a/vpx_dsp/mips/loopfilter_mb_vert_dspr2.c +++ b/vpx_dsp/mips/loopfilter_mb_vert_dspr2.c @@ -10,7 +10,7 @@ @@ -3943,7 +5840,7 @@ index 96e8d8858..c78cc64c7 100644 #include "vpx_dsp/mips/common_dspr2.h" #include "vpx_dsp/mips/loopfilter_filters_dspr2.h" diff --git a/vpx_dsp/mips/macros_msa.h b/vpx_dsp/mips/macros_msa.h -index 53462b59f..ba0e43d70 100644 +index da79b40..3a8ebe4 100644 --- a/vpx_dsp/mips/macros_msa.h +++ b/vpx_dsp/mips/macros_msa.h @@ -13,7 +13,7 @@ @@ -3956,7 +5853,7 @@ index 53462b59f..ba0e43d70 100644 #define LD_V(RTYPE, psrc) *((const RTYPE *)(psrc)) diff --git a/vpx_dsp/mips/sad_mmi.c b/vpx_dsp/mips/sad_mmi.c -index 7f5882bca..74d52655a 100644 +index 7a7c927..172aef5 100644 --- a/vpx_dsp/mips/sad_mmi.c +++ b/vpx_dsp/mips/sad_mmi.c @@ -8,7 +8,7 @@ @@ -3969,7 +5866,7 @@ index 7f5882bca..74d52655a 100644 #include "vpx/vpx_integer.h" #include "vpx_ports/mem.h" diff --git a/vpx_dsp/mips/sad_msa.c b/vpx_dsp/mips/sad_msa.c -index b0f8ff1fd..59c0143e4 100644 +index ec23c54..592e759 100644 --- a/vpx_dsp/mips/sad_msa.c +++ b/vpx_dsp/mips/sad_msa.c @@ -8,7 +8,7 @@ @@ -3982,7 +5879,7 @@ index b0f8ff1fd..59c0143e4 100644 #define SAD_INSVE_W4(RTYPE, in0, in1, in2, in3, out) \ diff --git a/vpx_dsp/mips/sub_pixel_variance_msa.c b/vpx_dsp/mips/sub_pixel_variance_msa.c -index 572fcabfc..fee14b406 100644 +index 572fcab..fee14b4 100644 --- a/vpx_dsp/mips/sub_pixel_variance_msa.c +++ b/vpx_dsp/mips/sub_pixel_variance_msa.c @@ -8,7 +8,7 @@ @@ -3995,7 +5892,7 @@ index 572fcabfc..fee14b406 100644 #include "vpx_dsp/mips/macros_msa.h" #include "vpx_dsp/variance.h" diff --git a/vpx_dsp/mips/subtract_mmi.c b/vpx_dsp/mips/subtract_mmi.c -index 8bd7e6977..1d8b979c1 100644 +index 8bd7e69..1d8b979 100644 --- a/vpx_dsp/mips/subtract_mmi.c +++ b/vpx_dsp/mips/subtract_mmi.c @@ -8,7 +8,7 @@ @@ -4008,7 +5905,7 @@ index 8bd7e6977..1d8b979c1 100644 #include "vpx_ports/mem.h" #include "vpx_ports/asmdefs_mmi.h" diff --git a/vpx_dsp/mips/subtract_msa.c b/vpx_dsp/mips/subtract_msa.c -index 391a7ebf6..5009c222d 100644 +index 391a7eb..5009c22 100644 --- a/vpx_dsp/mips/subtract_msa.c +++ b/vpx_dsp/mips/subtract_msa.c @@ -8,7 +8,7 @@ @@ -4021,20 +5918,22 @@ index 391a7ebf6..5009c222d 100644 static void sub_blk_4x4_msa(const uint8_t *src_ptr, int32_t src_stride, diff --git a/vpx_dsp/mips/sum_squares_msa.c b/vpx_dsp/mips/sum_squares_msa.c -index d4563dc41..e2ed516d9 100644 +index d4563dc..f496536 100644 --- a/vpx_dsp/mips/sum_squares_msa.c +++ b/vpx_dsp/mips/sum_squares_msa.c -@@ -8,7 +8,7 @@ +@@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "./vpx_dsp_rtcd.h" +-#include "./macros_msa.h" +#include "vpx_dsp_rtcd.h" - #include "./macros_msa.h" ++#include "macros_msa.h" uint64_t vpx_sum_squares_2d_i16_msa(const int16_t *src, int src_stride, + int size) { diff --git a/vpx_dsp/mips/variance_mmi.c b/vpx_dsp/mips/variance_mmi.c -index c2adcfa01..c29bd3efc 100644 +index 6428bc7..ad7b827 100644 --- a/vpx_dsp/mips/variance_mmi.c +++ b/vpx_dsp/mips/variance_mmi.c @@ -8,7 +8,7 @@ @@ -4047,7 +5946,7 @@ index c2adcfa01..c29bd3efc 100644 #include "vpx_ports/mem.h" #include "vpx/vpx_integer.h" diff --git a/vpx_dsp/mips/variance_msa.c b/vpx_dsp/mips/variance_msa.c -index 444b086a6..d9a7e2302 100644 +index 444b086..d9a7e23 100644 --- a/vpx_dsp/mips/variance_msa.c +++ b/vpx_dsp/mips/variance_msa.c @@ -8,7 +8,7 @@ @@ -4060,7 +5959,7 @@ index 444b086a6..d9a7e2302 100644 #define CALC_MSE_B(src, ref, var) \ diff --git a/vpx_dsp/mips/vpx_convolve8_avg_horiz_msa.c b/vpx_dsp/mips/vpx_convolve8_avg_horiz_msa.c -index 5b5a1cbc3..613cc7610 100644 +index 5b5a1cb..613cc76 100644 --- a/vpx_dsp/mips/vpx_convolve8_avg_horiz_msa.c +++ b/vpx_dsp/mips/vpx_convolve8_avg_horiz_msa.c @@ -9,7 +9,7 @@ @@ -4073,7 +5972,7 @@ index 5b5a1cbc3..613cc7610 100644 static void common_hz_8t_and_aver_dst_4x4_msa(const uint8_t *src, diff --git a/vpx_dsp/mips/vpx_convolve8_avg_msa.c b/vpx_dsp/mips/vpx_convolve8_avg_msa.c -index ba816192a..26df2faef 100644 +index ba81619..26df2fa 100644 --- a/vpx_dsp/mips/vpx_convolve8_avg_msa.c +++ b/vpx_dsp/mips/vpx_convolve8_avg_msa.c @@ -9,7 +9,7 @@ @@ -4086,7 +5985,7 @@ index ba816192a..26df2faef 100644 static void common_hv_8ht_8vt_and_aver_dst_4w_msa( diff --git a/vpx_dsp/mips/vpx_convolve8_avg_vert_msa.c b/vpx_dsp/mips/vpx_convolve8_avg_vert_msa.c -index e6a790dfc..d00cec552 100644 +index e6a790d..d00cec5 100644 --- a/vpx_dsp/mips/vpx_convolve8_avg_vert_msa.c +++ b/vpx_dsp/mips/vpx_convolve8_avg_vert_msa.c @@ -9,7 +9,7 @@ @@ -4099,7 +5998,7 @@ index e6a790dfc..d00cec552 100644 static void common_vt_8t_and_aver_dst_4w_msa(const uint8_t *src, diff --git a/vpx_dsp/mips/vpx_convolve8_horiz_msa.c b/vpx_dsp/mips/vpx_convolve8_horiz_msa.c -index 792c0f709..2be8b08fe 100644 +index 792c0f7..2be8b08 100644 --- a/vpx_dsp/mips/vpx_convolve8_horiz_msa.c +++ b/vpx_dsp/mips/vpx_convolve8_horiz_msa.c @@ -9,7 +9,7 @@ @@ -4112,7 +6011,7 @@ index 792c0f709..2be8b08fe 100644 static void common_hz_8t_4x4_msa(const uint8_t *src, int32_t src_stride, diff --git a/vpx_dsp/mips/vpx_convolve8_mmi.c b/vpx_dsp/mips/vpx_convolve8_mmi.c -index cb7bca558..7fb45520b 100644 +index cb7bca5..7fb4552 100644 --- a/vpx_dsp/mips/vpx_convolve8_mmi.c +++ b/vpx_dsp/mips/vpx_convolve8_mmi.c @@ -11,8 +11,8 @@ @@ -4127,7 +6026,7 @@ index cb7bca558..7fb45520b 100644 #include "vpx_dsp/vpx_dsp_common.h" #include "vpx_dsp/vpx_filter.h" diff --git a/vpx_dsp/mips/vpx_convolve8_msa.c b/vpx_dsp/mips/vpx_convolve8_msa.c -index c94216758..6505b5381 100644 +index c942167..6505b53 100644 --- a/vpx_dsp/mips/vpx_convolve8_msa.c +++ b/vpx_dsp/mips/vpx_convolve8_msa.c @@ -9,7 +9,7 @@ @@ -4140,7 +6039,7 @@ index c94216758..6505b5381 100644 const uint8_t mc_filt_mask_arr[16 * 3] = { diff --git a/vpx_dsp/mips/vpx_convolve8_vert_msa.c b/vpx_dsp/mips/vpx_convolve8_vert_msa.c -index 195228689..84d11cb05 100644 +index 1952286..84d11cb 100644 --- a/vpx_dsp/mips/vpx_convolve8_vert_msa.c +++ b/vpx_dsp/mips/vpx_convolve8_vert_msa.c @@ -9,7 +9,7 @@ @@ -4153,7 +6052,7 @@ index 195228689..84d11cb05 100644 static void common_vt_8t_4w_msa(const uint8_t *src, int32_t src_stride, diff --git a/vpx_dsp/mips/vpx_convolve_avg_msa.c b/vpx_dsp/mips/vpx_convolve_avg_msa.c -index ce649935d..d291ccef0 100644 +index ce64993..d291cce 100644 --- a/vpx_dsp/mips/vpx_convolve_avg_msa.c +++ b/vpx_dsp/mips/vpx_convolve_avg_msa.c @@ -8,7 +8,7 @@ @@ -4166,7 +6065,7 @@ index ce649935d..d291ccef0 100644 static void avg_width4_msa(const uint8_t *src, int32_t src_stride, uint8_t *dst, diff --git a/vpx_dsp/mips/vpx_convolve_copy_msa.c b/vpx_dsp/mips/vpx_convolve_copy_msa.c -index c2ab33a2f..10026929d 100644 +index c2ab33a..1002692 100644 --- a/vpx_dsp/mips/vpx_convolve_copy_msa.c +++ b/vpx_dsp/mips/vpx_convolve_copy_msa.c @@ -9,7 +9,7 @@ @@ -4179,7 +6078,7 @@ index c2ab33a2f..10026929d 100644 static void copy_width8_msa(const uint8_t *src, int32_t src_stride, diff --git a/vpx_dsp/ppc/bitdepth_conversion_vsx.h b/vpx_dsp/ppc/bitdepth_conversion_vsx.h -index 7ac873f9f..fac2bf68d 100644 +index 7ac873f..fac2bf6 100644 --- a/vpx_dsp/ppc/bitdepth_conversion_vsx.h +++ b/vpx_dsp/ppc/bitdepth_conversion_vsx.h @@ -11,7 +11,7 @@ @@ -4192,7 +6091,7 @@ index 7ac873f9f..fac2bf68d 100644 #include "vpx_dsp/vpx_dsp_common.h" #include "vpx_dsp/ppc/types_vsx.h" diff --git a/vpx_dsp/ppc/deblock_vsx.c b/vpx_dsp/ppc/deblock_vsx.c -index 212991169..78cff7dbf 100644 +index 2129911..78cff7d 100644 --- a/vpx_dsp/ppc/deblock_vsx.c +++ b/vpx_dsp/ppc/deblock_vsx.c @@ -10,7 +10,7 @@ @@ -4205,7 +6104,7 @@ index 212991169..78cff7dbf 100644 extern const int16_t vpx_rv[]; diff --git a/vpx_dsp/ppc/fdct32x32_vsx.c b/vpx_dsp/ppc/fdct32x32_vsx.c -index 328b0e313..134255500 100644 +index 328b0e3..1342555 100644 --- a/vpx_dsp/ppc/fdct32x32_vsx.c +++ b/vpx_dsp/ppc/fdct32x32_vsx.c @@ -8,8 +8,8 @@ @@ -4220,7 +6119,7 @@ index 328b0e313..134255500 100644 #include "vpx_dsp/ppc/transpose_vsx.h" #include "vpx_dsp/ppc/txfm_common_vsx.h" diff --git a/vpx_dsp/ppc/hadamard_vsx.c b/vpx_dsp/ppc/hadamard_vsx.c -index e279b3047..381ffc284 100644 +index e279b30..381ffc2 100644 --- a/vpx_dsp/ppc/hadamard_vsx.c +++ b/vpx_dsp/ppc/hadamard_vsx.c @@ -8,7 +8,7 @@ @@ -4233,7 +6132,7 @@ index e279b3047..381ffc284 100644 #include "vpx_dsp/ppc/transpose_vsx.h" #include "vpx_dsp/ppc/bitdepth_conversion_vsx.h" diff --git a/vpx_dsp/ppc/intrapred_vsx.c b/vpx_dsp/ppc/intrapred_vsx.c -index a4c8322ff..b9730e4ab 100644 +index a4c8322..b9730e4 100644 --- a/vpx_dsp/ppc/intrapred_vsx.c +++ b/vpx_dsp/ppc/intrapred_vsx.c @@ -8,7 +8,7 @@ @@ -4246,7 +6145,7 @@ index a4c8322ff..b9730e4ab 100644 void vpx_v_predictor_16x16_vsx(uint8_t *dst, ptrdiff_t stride, diff --git a/vpx_dsp/ppc/inv_txfm_vsx.c b/vpx_dsp/ppc/inv_txfm_vsx.c -index e99412eca..a6050412b 100644 +index 8c4e603..91e236b 100644 --- a/vpx_dsp/ppc/inv_txfm_vsx.c +++ b/vpx_dsp/ppc/inv_txfm_vsx.c @@ -16,7 +16,7 @@ @@ -4259,7 +6158,7 @@ index e99412eca..a6050412b 100644 static const int16x8_t cospi1_v = { 16364, 16364, 16364, 16364, diff --git a/vpx_dsp/ppc/quantize_vsx.c b/vpx_dsp/ppc/quantize_vsx.c -index ab71f6e23..887167535 100644 +index ab71f6e..8871675 100644 --- a/vpx_dsp/ppc/quantize_vsx.c +++ b/vpx_dsp/ppc/quantize_vsx.c @@ -10,7 +10,7 @@ @@ -4272,7 +6171,7 @@ index ab71f6e23..887167535 100644 // Negate 16-bit integers in a when the corresponding signed 16-bit diff --git a/vpx_dsp/ppc/sad_vsx.c b/vpx_dsp/ppc/sad_vsx.c -index a08ae1241..b190d6a03 100644 +index a08ae12..b190d6a 100644 --- a/vpx_dsp/ppc/sad_vsx.c +++ b/vpx_dsp/ppc/sad_vsx.c @@ -10,7 +10,7 @@ @@ -4285,7 +6184,7 @@ index a08ae1241..b190d6a03 100644 #include "vpx_dsp/ppc/types_vsx.h" diff --git a/vpx_dsp/ppc/subtract_vsx.c b/vpx_dsp/ppc/subtract_vsx.c -index 76ad302da..ab769ad1c 100644 +index 76ad302..ab769ad 100644 --- a/vpx_dsp/ppc/subtract_vsx.c +++ b/vpx_dsp/ppc/subtract_vsx.c @@ -10,8 +10,8 @@ @@ -4300,7 +6199,7 @@ index 76ad302da..ab769ad1c 100644 #include "vpx_dsp/ppc/types_vsx.h" diff --git a/vpx_dsp/ppc/transpose_vsx.h b/vpx_dsp/ppc/transpose_vsx.h -index 4883b734a..bf63b14d4 100644 +index 4883b73..bf63b14 100644 --- a/vpx_dsp/ppc/transpose_vsx.h +++ b/vpx_dsp/ppc/transpose_vsx.h @@ -11,7 +11,7 @@ @@ -4313,7 +6212,7 @@ index 4883b734a..bf63b14d4 100644 static INLINE void vpx_transpose_s16_8x8(int16x8_t v[8]) { diff --git a/vpx_dsp/ppc/variance_vsx.c b/vpx_dsp/ppc/variance_vsx.c -index 6c6bc9a30..30a393747 100644 +index 6c6bc9a..30a3937 100644 --- a/vpx_dsp/ppc/variance_vsx.c +++ b/vpx_dsp/ppc/variance_vsx.c @@ -10,8 +10,8 @@ @@ -4328,7 +6227,7 @@ index 6c6bc9a30..30a393747 100644 uint32_t vpx_get4x4sse_cs_vsx(const uint8_t *src_ptr, int src_stride, diff --git a/vpx_dsp/ppc/vpx_convolve_vsx.c b/vpx_dsp/ppc/vpx_convolve_vsx.c -index 2dc66055c..62f2e8a2e 100644 +index 2dc6605..62f2e8a 100644 --- a/vpx_dsp/ppc/vpx_convolve_vsx.c +++ b/vpx_dsp/ppc/vpx_convolve_vsx.c @@ -10,7 +10,7 @@ @@ -4340,21 +6239,36 @@ index 2dc66055c..62f2e8a2e 100644 #include "vpx/vpx_integer.h" #include "vpx_dsp/ppc/types_vsx.h" #include "vpx_dsp/vpx_filter.h" +diff --git a/vpx_dsp/prob.c b/vpx_dsp/prob.c +index 819e950..546e1cf 100644 +--- a/vpx_dsp/prob.c ++++ b/vpx_dsp/prob.c +@@ -8,7 +8,7 @@ + * be found in the AUTHORS file in the root of the source tree. + */ + +-#include "./prob.h" ++#include "prob.h" + + const uint8_t vpx_norm[256] = { + 0, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, diff --git a/vpx_dsp/prob.h b/vpx_dsp/prob.h -index 7a71c0041..978583b58 100644 +index a1c7de1..4290bd8 100644 --- a/vpx_dsp/prob.h +++ b/vpx_dsp/prob.h -@@ -13,7 +13,7 @@ +@@ -13,8 +13,8 @@ #include -#include "./vpx_config.h" +-#include "./vpx_dsp_common.h" +#include "vpx_config.h" - #include "./vpx_dsp_common.h" ++#include "vpx_dsp_common.h" #include "vpx_ports/mem.h" + diff --git a/vpx_dsp/psnr.c b/vpx_dsp/psnr.c -index 4ee4130a2..e53318b45 100644 +index af1e638..8e10bae 100644 --- a/vpx_dsp/psnr.c +++ b/vpx_dsp/psnr.c @@ -10,7 +10,7 @@ @@ -4367,7 +6281,7 @@ index 4ee4130a2..e53318b45 100644 #include "vpx_scale/yv12config.h" diff --git a/vpx_dsp/psnrhvs.c b/vpx_dsp/psnrhvs.c -index d7ec1a429..a60150d89 100644 +index d7ec1a4..a60150d 100644 --- a/vpx_dsp/psnrhvs.c +++ b/vpx_dsp/psnrhvs.c @@ -15,8 +15,8 @@ @@ -4382,7 +6296,7 @@ index d7ec1a429..a60150d89 100644 #include "vpx_ports/system_state.h" #include "vpx_dsp/psnr.h" diff --git a/vpx_dsp/quantize.c b/vpx_dsp/quantize.c -index fac9136f8..a81e93c3e 100644 +index fac9136..a81e93c 100644 --- a/vpx_dsp/quantize.c +++ b/vpx_dsp/quantize.c @@ -10,7 +10,7 @@ @@ -4395,7 +6309,7 @@ index fac9136f8..a81e93c3e 100644 #include "vpx_dsp/vpx_dsp_common.h" #include "vpx_mem/vpx_mem.h" diff --git a/vpx_dsp/quantize.h b/vpx_dsp/quantize.h -index 8e138445e..f1b719ab3 100644 +index 8e13844..f1b719a 100644 --- a/vpx_dsp/quantize.h +++ b/vpx_dsp/quantize.h @@ -11,7 +11,7 @@ @@ -4408,7 +6322,7 @@ index 8e138445e..f1b719ab3 100644 #ifdef __cplusplus diff --git a/vpx_dsp/sad.c b/vpx_dsp/sad.c -index 2a4c81d58..a0b9801bc 100644 +index ae36050..eb80034 100644 --- a/vpx_dsp/sad.c +++ b/vpx_dsp/sad.c @@ -10,8 +10,8 @@ @@ -4423,7 +6337,7 @@ index 2a4c81d58..a0b9801bc 100644 #include "vpx/vpx_integer.h" #include "vpx_ports/mem.h" diff --git a/vpx_dsp/sse.c b/vpx_dsp/sse.c -index c9d751859..6f094b28b 100644 +index c9d7518..6f094b2 100644 --- a/vpx_dsp/sse.c +++ b/vpx_dsp/sse.c @@ -15,8 +15,8 @@ @@ -4438,7 +6352,7 @@ index c9d751859..6f094b28b 100644 #include "vpx/vpx_integer.h" #include "vpx_ports/mem.h" diff --git a/vpx_dsp/ssim.c b/vpx_dsp/ssim.c -index 4a31f3d22..9a7c0311d 100644 +index 4a31f3d..9a7c031 100644 --- a/vpx_dsp/ssim.c +++ b/vpx_dsp/ssim.c @@ -10,7 +10,7 @@ @@ -4451,7 +6365,7 @@ index 4a31f3d22..9a7c0311d 100644 #include "vpx_ports/mem.h" #include "vpx_ports/system_state.h" diff --git a/vpx_dsp/ssim.h b/vpx_dsp/ssim.h -index c382237fc..98e5619d9 100644 +index 8ee1581..4036da7 100644 --- a/vpx_dsp/ssim.h +++ b/vpx_dsp/ssim.h @@ -17,7 +17,7 @@ @@ -4464,7 +6378,7 @@ index c382237fc..98e5619d9 100644 // metrics used for calculating ssim, ssim2, dssim, and ssimc diff --git a/vpx_dsp/subtract.c b/vpx_dsp/subtract.c -index 45c819e67..66f7543e7 100644 +index 45c819e..66f7543 100644 --- a/vpx_dsp/subtract.c +++ b/vpx_dsp/subtract.c @@ -10,8 +10,8 @@ @@ -4479,7 +6393,7 @@ index 45c819e67..66f7543e7 100644 #include "vpx/vpx_integer.h" #include "vpx_ports/mem.h" diff --git a/vpx_dsp/sum_squares.c b/vpx_dsp/sum_squares.c -index b80cd588e..07f61091f 100644 +index b80cd58..07f6109 100644 --- a/vpx_dsp/sum_squares.c +++ b/vpx_dsp/sum_squares.c @@ -8,7 +8,7 @@ @@ -4492,22 +6406,22 @@ index b80cd588e..07f61091f 100644 uint64_t vpx_sum_squares_2d_i16_c(const int16_t *src, int stride, int size) { int r, c; diff --git a/vpx_dsp/variance.c b/vpx_dsp/variance.c -index 1c476542f..10f16d4b7 100644 +index d997633..3a3946e 100644 --- a/vpx_dsp/variance.c +++ b/vpx_dsp/variance.c -@@ -8,8 +8,8 @@ - * be found in the AUTHORS file in the root of the source tree. - */ +@@ -11,8 +11,8 @@ + #include + #include -#include "./vpx_config.h" -#include "./vpx_dsp_rtcd.h" +#include "vpx_config.h" +#include "vpx_dsp_rtcd.h" + #include "vpx_ports/compiler_attributes.h" #include "vpx_ports/mem.h" - #include "vpx/vpx_integer.h" diff --git a/vpx_dsp/variance.h b/vpx_dsp/variance.h -index ccdb2f90b..cd390563d 100644 +index ccdb2f9..cd39056 100644 --- a/vpx_dsp/variance.h +++ b/vpx_dsp/variance.h @@ -11,7 +11,7 @@ @@ -4520,7 +6434,7 @@ index ccdb2f90b..cd390563d 100644 #include "vpx/vpx_integer.h" diff --git a/vpx_dsp/vpx_convolve.c b/vpx_dsp/vpx_convolve.c -index e55a963f9..f252482bf 100644 +index e55a963..f252482 100644 --- a/vpx_dsp/vpx_convolve.c +++ b/vpx_dsp/vpx_convolve.c @@ -11,8 +11,8 @@ @@ -4535,7 +6449,7 @@ index e55a963f9..f252482bf 100644 #include "vpx_dsp/vpx_convolve.h" #include "vpx_dsp/vpx_dsp_common.h" diff --git a/vpx_dsp/vpx_convolve.h b/vpx_dsp/vpx_convolve.h -index d5793e17a..27f97f833 100644 +index d5793e1..27f97f8 100644 --- a/vpx_dsp/vpx_convolve.h +++ b/vpx_dsp/vpx_convolve.h @@ -10,7 +10,7 @@ @@ -4548,7 +6462,7 @@ index d5793e17a..27f97f833 100644 #ifdef __cplusplus diff --git a/vpx_dsp/vpx_dsp_common.h b/vpx_dsp/vpx_dsp_common.h -index 528f33f94..12ac92e15 100644 +index 9d26682..fe1a107 100644 --- a/vpx_dsp/vpx_dsp_common.h +++ b/vpx_dsp/vpx_dsp_common.h @@ -13,7 +13,7 @@ @@ -4561,7 +6475,7 @@ index 528f33f94..12ac92e15 100644 #include "vpx_ports/mem.h" diff --git a/vpx_dsp/vpx_dsp_rtcd.c b/vpx_dsp/vpx_dsp_rtcd.c -index 2b8c656af..574bc4888 100644 +index 2b8c656..574bc48 100644 --- a/vpx_dsp/vpx_dsp_rtcd.c +++ b/vpx_dsp/vpx_dsp_rtcd.c @@ -7,9 +7,9 @@ @@ -4577,7 +6491,7 @@ index 2b8c656af..574bc4888 100644 void vpx_dsp_rtcd(void) { once(setup_rtcd_internal); } diff --git a/vpx_dsp/x86/avg_intrin_avx2.c b/vpx_dsp/x86/avg_intrin_avx2.c -index 61e4e73c5..3f4e19a15 100644 +index 61e4e73..3f4e19a 100644 --- a/vpx_dsp/x86/avg_intrin_avx2.c +++ b/vpx_dsp/x86/avg_intrin_avx2.c @@ -10,7 +10,7 @@ @@ -4590,7 +6504,7 @@ index 61e4e73c5..3f4e19a15 100644 #include "vpx_dsp/x86/bitdepth_conversion_avx2.h" #include "vpx_ports/mem.h" diff --git a/vpx_dsp/x86/avg_intrin_sse2.c b/vpx_dsp/x86/avg_intrin_sse2.c -index 4447dfab7..a808395d9 100644 +index 4447dfa..a808395 100644 --- a/vpx_dsp/x86/avg_intrin_sse2.c +++ b/vpx_dsp/x86/avg_intrin_sse2.c @@ -10,7 +10,7 @@ @@ -4603,7 +6517,7 @@ index 4447dfab7..a808395d9 100644 #include "vpx_dsp/x86/bitdepth_conversion_sse2.h" #include "vpx_ports/mem.h" diff --git a/vpx_dsp/x86/avg_pred_avx2.c b/vpx_dsp/x86/avg_pred_avx2.c -index f4357998c..6379761a6 100644 +index f435799..6379761 100644 --- a/vpx_dsp/x86/avg_pred_avx2.c +++ b/vpx_dsp/x86/avg_pred_avx2.c @@ -11,7 +11,7 @@ @@ -4616,7 +6530,7 @@ index f4357998c..6379761a6 100644 void vpx_comp_avg_pred_avx2(uint8_t *comp_pred, const uint8_t *pred, int width, int height, const uint8_t *ref, int ref_stride) { diff --git a/vpx_dsp/x86/avg_pred_sse2.c b/vpx_dsp/x86/avg_pred_sse2.c -index c6e70f744..02ffb9923 100644 +index c6e70f7..02ffb99 100644 --- a/vpx_dsp/x86/avg_pred_sse2.c +++ b/vpx_dsp/x86/avg_pred_sse2.c @@ -11,7 +11,7 @@ @@ -4629,7 +6543,7 @@ index c6e70f744..02ffb9923 100644 #include "vpx_dsp/x86/mem_sse2.h" diff --git a/vpx_dsp/x86/bitdepth_conversion_avx2.h b/vpx_dsp/x86/bitdepth_conversion_avx2.h -index c02b47a3e..3e727eccd 100644 +index c02b47a..3e727ec 100644 --- a/vpx_dsp/x86/bitdepth_conversion_avx2.h +++ b/vpx_dsp/x86/bitdepth_conversion_avx2.h @@ -12,7 +12,7 @@ @@ -4642,7 +6556,7 @@ index c02b47a3e..3e727eccd 100644 #include "vpx_dsp/vpx_dsp_common.h" diff --git a/vpx_dsp/x86/bitdepth_conversion_sse2.h b/vpx_dsp/x86/bitdepth_conversion_sse2.h -index 74dde656b..ce1846746 100644 +index 74dde65..ce18467 100644 --- a/vpx_dsp/x86/bitdepth_conversion_sse2.h +++ b/vpx_dsp/x86/bitdepth_conversion_sse2.h @@ -12,7 +12,7 @@ @@ -4655,7 +6569,7 @@ index 74dde656b..ce1846746 100644 #include "vpx_dsp/vpx_dsp_common.h" diff --git a/vpx_dsp/x86/convolve.h b/vpx_dsp/x86/convolve.h -index c33960055..ce49e662b 100644 +index c339600..ce49e66 100644 --- a/vpx_dsp/x86/convolve.h +++ b/vpx_dsp/x86/convolve.h @@ -12,7 +12,7 @@ @@ -4668,7 +6582,7 @@ index c33960055..ce49e662b 100644 #include "vpx_ports/compiler_attributes.h" diff --git a/vpx_dsp/x86/convolve_avx2.h b/vpx_dsp/x86/convolve_avx2.h -index ebee964b1..779a6d76c 100644 +index ebee964..779a6d7 100644 --- a/vpx_dsp/x86/convolve_avx2.h +++ b/vpx_dsp/x86/convolve_avx2.h @@ -13,7 +13,7 @@ @@ -4681,7 +6595,7 @@ index ebee964b1..779a6d76c 100644 #if defined(__clang__) #if (__clang_major__ > 0 && __clang_major__ < 3) || \ diff --git a/vpx_dsp/x86/convolve_sse2.h b/vpx_dsp/x86/convolve_sse2.h -index 844354639..3a3ae5498 100644 +index 8443546..3a3ae54 100644 --- a/vpx_dsp/x86/convolve_sse2.h +++ b/vpx_dsp/x86/convolve_sse2.h @@ -13,7 +13,7 @@ @@ -4694,7 +6608,7 @@ index 844354639..3a3ae5498 100644 // Interprets the input register as 16-bit words 7 6 5 4 3 2 1 0, then returns // values at index 2 and 3 to return 3 2 3 2 3 2 3 2 as 16-bit words diff --git a/vpx_dsp/x86/convolve_ssse3.h b/vpx_dsp/x86/convolve_ssse3.h -index 8a4b16513..543cafe2a 100644 +index 8a4b165..543cafe 100644 --- a/vpx_dsp/x86/convolve_ssse3.h +++ b/vpx_dsp/x86/convolve_ssse3.h @@ -14,7 +14,7 @@ @@ -4707,7 +6621,7 @@ index 8a4b16513..543cafe2a 100644 static INLINE void shuffle_filter_ssse3(const int16_t *const filter, __m128i *const f) { diff --git a/vpx_dsp/x86/fwd_dct32x32_impl_avx2.h b/vpx_dsp/x86/fwd_dct32x32_impl_avx2.h -index f3a802029..7cccee04d 100644 +index f3a8020..7cccee0 100644 --- a/vpx_dsp/x86/fwd_dct32x32_impl_avx2.h +++ b/vpx_dsp/x86/fwd_dct32x32_impl_avx2.h @@ -10,7 +10,7 @@ @@ -4720,7 +6634,7 @@ index f3a802029..7cccee04d 100644 #define pair256_set_epi16(a, b) \ diff --git a/vpx_dsp/x86/fwd_txfm_avx2.c b/vpx_dsp/x86/fwd_txfm_avx2.c -index 1eb6f4116..f43b4cff6 100644 +index 1eb6f41..f43b4cf 100644 --- a/vpx_dsp/x86/fwd_txfm_avx2.c +++ b/vpx_dsp/x86/fwd_txfm_avx2.c @@ -9,8 +9,8 @@ @@ -4735,7 +6649,7 @@ index 1eb6f4116..f43b4cff6 100644 #include "vpx_dsp/txfm_common.h" #define ADD256_EPI16 _mm256_add_epi16 diff --git a/vpx_dsp/x86/fwd_txfm_impl_sse2.h b/vpx_dsp/x86/fwd_txfm_impl_sse2.h -index d546f02a1..34bd17a42 100644 +index d546f02..34bd17a 100644 --- a/vpx_dsp/x86/fwd_txfm_impl_sse2.h +++ b/vpx_dsp/x86/fwd_txfm_impl_sse2.h @@ -10,7 +10,7 @@ @@ -4748,7 +6662,7 @@ index d546f02a1..34bd17a42 100644 #include "vpx_dsp/x86/fwd_txfm_sse2.h" #include "vpx_dsp/x86/txfm_common_sse2.h" diff --git a/vpx_dsp/x86/fwd_txfm_sse2.c b/vpx_dsp/x86/fwd_txfm_sse2.c -index e14b99197..445826b9a 100644 +index e14b991..445826b 100644 --- a/vpx_dsp/x86/fwd_txfm_sse2.c +++ b/vpx_dsp/x86/fwd_txfm_sse2.c @@ -10,8 +10,8 @@ @@ -4763,7 +6677,7 @@ index e14b99197..445826b9a 100644 #include "vpx_dsp/x86/fwd_txfm_sse2.h" diff --git a/vpx_dsp/x86/highbd_convolve_avx2.c b/vpx_dsp/x86/highbd_convolve_avx2.c -index 01a52ec8b..c47c06235 100644 +index 80cb0a2..ac32ddf 100644 --- a/vpx_dsp/x86/highbd_convolve_avx2.c +++ b/vpx_dsp/x86/highbd_convolve_avx2.c @@ -9,7 +9,7 @@ @@ -4776,7 +6690,7 @@ index 01a52ec8b..c47c06235 100644 #include "vpx_dsp/x86/convolve_avx2.h" diff --git a/vpx_dsp/x86/highbd_idct16x16_add_sse2.c b/vpx_dsp/x86/highbd_idct16x16_add_sse2.c -index f4f7235d1..5c39915d8 100644 +index f4f7235..5c39915 100644 --- a/vpx_dsp/x86/highbd_idct16x16_add_sse2.c +++ b/vpx_dsp/x86/highbd_idct16x16_add_sse2.c @@ -10,7 +10,7 @@ @@ -4789,7 +6703,7 @@ index f4f7235d1..5c39915d8 100644 #include "vpx_dsp/x86/inv_txfm_sse2.h" #include "vpx_dsp/x86/transpose_sse2.h" diff --git a/vpx_dsp/x86/highbd_idct16x16_add_sse4.c b/vpx_dsp/x86/highbd_idct16x16_add_sse4.c -index 7898ee12c..b1caa5da2 100644 +index 7898ee1..b1caa5d 100644 --- a/vpx_dsp/x86/highbd_idct16x16_add_sse4.c +++ b/vpx_dsp/x86/highbd_idct16x16_add_sse4.c @@ -10,7 +10,7 @@ @@ -4802,7 +6716,7 @@ index 7898ee12c..b1caa5da2 100644 #include "vpx_dsp/x86/highbd_inv_txfm_sse4.h" #include "vpx_dsp/x86/inv_txfm_sse2.h" diff --git a/vpx_dsp/x86/highbd_idct32x32_add_sse2.c b/vpx_dsp/x86/highbd_idct32x32_add_sse2.c -index c710e8995..083147cbf 100644 +index c710e89..083147c 100644 --- a/vpx_dsp/x86/highbd_idct32x32_add_sse2.c +++ b/vpx_dsp/x86/highbd_idct32x32_add_sse2.c @@ -8,7 +8,7 @@ @@ -4815,7 +6729,7 @@ index c710e8995..083147cbf 100644 #include "vpx_dsp/x86/inv_txfm_sse2.h" #include "vpx_dsp/x86/transpose_sse2.h" diff --git a/vpx_dsp/x86/highbd_idct32x32_add_sse4.c b/vpx_dsp/x86/highbd_idct32x32_add_sse4.c -index 2d0a53ac0..efcec48f7 100644 +index 2d0a53a..efcec48 100644 --- a/vpx_dsp/x86/highbd_idct32x32_add_sse4.c +++ b/vpx_dsp/x86/highbd_idct32x32_add_sse4.c @@ -10,7 +10,7 @@ @@ -4828,7 +6742,7 @@ index 2d0a53ac0..efcec48f7 100644 #include "vpx_dsp/x86/highbd_inv_txfm_sse4.h" #include "vpx_dsp/x86/inv_txfm_sse2.h" diff --git a/vpx_dsp/x86/highbd_idct4x4_add_sse2.c b/vpx_dsp/x86/highbd_idct4x4_add_sse2.c -index b9c8884f9..a208675f2 100644 +index b9c8884..a208675 100644 --- a/vpx_dsp/x86/highbd_idct4x4_add_sse2.c +++ b/vpx_dsp/x86/highbd_idct4x4_add_sse2.c @@ -10,7 +10,7 @@ @@ -4841,7 +6755,7 @@ index b9c8884f9..a208675f2 100644 #include "vpx_dsp/x86/inv_txfm_sse2.h" #include "vpx_dsp/x86/transpose_sse2.h" diff --git a/vpx_dsp/x86/highbd_idct4x4_add_sse4.c b/vpx_dsp/x86/highbd_idct4x4_add_sse4.c -index fe74d272a..d2b5cbf0a 100644 +index fe74d27..d2b5cbf 100644 --- a/vpx_dsp/x86/highbd_idct4x4_add_sse4.c +++ b/vpx_dsp/x86/highbd_idct4x4_add_sse4.c @@ -10,7 +10,7 @@ @@ -4854,7 +6768,7 @@ index fe74d272a..d2b5cbf0a 100644 #include "vpx_dsp/x86/highbd_inv_txfm_sse4.h" #include "vpx_dsp/x86/inv_txfm_sse2.h" diff --git a/vpx_dsp/x86/highbd_idct8x8_add_sse2.c b/vpx_dsp/x86/highbd_idct8x8_add_sse2.c -index bb7a510e1..bd643fc3c 100644 +index bb7a510..bd643fc 100644 --- a/vpx_dsp/x86/highbd_idct8x8_add_sse2.c +++ b/vpx_dsp/x86/highbd_idct8x8_add_sse2.c @@ -10,7 +10,7 @@ @@ -4867,7 +6781,7 @@ index bb7a510e1..bd643fc3c 100644 #include "vpx_dsp/x86/inv_txfm_sse2.h" #include "vpx_dsp/x86/transpose_sse2.h" diff --git a/vpx_dsp/x86/highbd_idct8x8_add_sse4.c b/vpx_dsp/x86/highbd_idct8x8_add_sse4.c -index 8b2e3d241..348fb7489 100644 +index 8b2e3d2..348fb74 100644 --- a/vpx_dsp/x86/highbd_idct8x8_add_sse4.c +++ b/vpx_dsp/x86/highbd_idct8x8_add_sse4.c @@ -10,7 +10,7 @@ @@ -4879,8 +6793,38 @@ index 8b2e3d241..348fb7489 100644 #include "vpx_dsp/x86/highbd_inv_txfm_sse2.h" #include "vpx_dsp/x86/highbd_inv_txfm_sse4.h" #include "vpx_dsp/x86/inv_txfm_sse2.h" +diff --git a/vpx_dsp/x86/highbd_intrapred_intrin_avx2.c b/vpx_dsp/x86/highbd_intrapred_intrin_avx2.c +index dd63c6f..d135930 100644 +--- a/vpx_dsp/x86/highbd_intrapred_intrin_avx2.c ++++ b/vpx_dsp/x86/highbd_intrapred_intrin_avx2.c +@@ -10,8 +10,8 @@ + + #include + +-#include "./vpx_config.h" +-#include "./vpx_dsp_rtcd.h" ++#include "vpx_config.h" ++#include "vpx_dsp_rtcd.h" + #include "vpx/vpx_integer.h" + + static INLINE __m256i avg3_epu16_avx2(const __m256i *x, const __m256i *y, +diff --git a/vpx_dsp/x86/highbd_intrapred_intrin_avx512.c b/vpx_dsp/x86/highbd_intrapred_intrin_avx512.c +index d2a4494..03d7047 100644 +--- a/vpx_dsp/x86/highbd_intrapred_intrin_avx512.c ++++ b/vpx_dsp/x86/highbd_intrapred_intrin_avx512.c +@@ -10,8 +10,8 @@ + + #include + +-#include "./vpx_config.h" +-#include "./vpx_dsp_rtcd.h" ++#include "vpx_config.h" ++#include "vpx_dsp_rtcd.h" + #include "vpx/vpx_integer.h" + + DECLARE_ALIGNED(64, static const uint16_t, diff --git a/vpx_dsp/x86/highbd_intrapred_intrin_sse2.c b/vpx_dsp/x86/highbd_intrapred_intrin_sse2.c -index 43634aea3..db758e216 100644 +index 43634ae..db758e2 100644 --- a/vpx_dsp/x86/highbd_intrapred_intrin_sse2.c +++ b/vpx_dsp/x86/highbd_intrapred_intrin_sse2.c @@ -10,8 +10,8 @@ @@ -4895,7 +6839,7 @@ index 43634aea3..db758e216 100644 // ----------------------------------------------------------------------------- diff --git a/vpx_dsp/x86/highbd_intrapred_intrin_ssse3.c b/vpx_dsp/x86/highbd_intrapred_intrin_ssse3.c -index d673fac49..a916a39a5 100644 +index d673fac..a916a39 100644 --- a/vpx_dsp/x86/highbd_intrapred_intrin_ssse3.c +++ b/vpx_dsp/x86/highbd_intrapred_intrin_ssse3.c @@ -10,8 +10,8 @@ @@ -4910,7 +6854,7 @@ index d673fac49..a916a39a5 100644 // ----------------------------------------------------------------------------- diff --git a/vpx_dsp/x86/highbd_inv_txfm_sse2.h b/vpx_dsp/x86/highbd_inv_txfm_sse2.h -index 1d07391b0..96386c2df 100644 +index 1d07391..96386c2 100644 --- a/vpx_dsp/x86/highbd_inv_txfm_sse2.h +++ b/vpx_dsp/x86/highbd_inv_txfm_sse2.h @@ -13,7 +13,7 @@ @@ -4923,7 +6867,7 @@ index 1d07391b0..96386c2df 100644 #include "vpx_dsp/inv_txfm.h" #include "vpx_dsp/x86/transpose_sse2.h" diff --git a/vpx_dsp/x86/highbd_inv_txfm_sse4.h b/vpx_dsp/x86/highbd_inv_txfm_sse4.h -index f446bb13f..90b7f5677 100644 +index f446bb1..90b7f56 100644 --- a/vpx_dsp/x86/highbd_inv_txfm_sse4.h +++ b/vpx_dsp/x86/highbd_inv_txfm_sse4.h @@ -13,7 +13,7 @@ @@ -4936,7 +6880,7 @@ index f446bb13f..90b7f5677 100644 static INLINE __m128i multiplication_round_shift_sse4_1( diff --git a/vpx_dsp/x86/highbd_loopfilter_sse2.c b/vpx_dsp/x86/highbd_loopfilter_sse2.c -index 9f45623de..b3f3f40da 100644 +index 9f45623..b3f3f40 100644 --- a/vpx_dsp/x86/highbd_loopfilter_sse2.c +++ b/vpx_dsp/x86/highbd_loopfilter_sse2.c @@ -10,7 +10,7 @@ @@ -4949,7 +6893,7 @@ index 9f45623de..b3f3f40da 100644 static INLINE __m128i signed_char_clamp_bd_sse2(__m128i value, int bd) { diff --git a/vpx_dsp/x86/highbd_quantize_intrin_avx2.c b/vpx_dsp/x86/highbd_quantize_intrin_avx2.c -index 35ca55404..492860e87 100644 +index 35ca554..492860e 100644 --- a/vpx_dsp/x86/highbd_quantize_intrin_avx2.c +++ b/vpx_dsp/x86/highbd_quantize_intrin_avx2.c @@ -10,7 +10,7 @@ @@ -4962,7 +6906,7 @@ index 35ca55404..492860e87 100644 #include "vp9/encoder/vp9_block.h" diff --git a/vpx_dsp/x86/highbd_quantize_intrin_sse2.c b/vpx_dsp/x86/highbd_quantize_intrin_sse2.c -index adae60756..3b810a70d 100644 +index adae607..3b810a7 100644 --- a/vpx_dsp/x86/highbd_quantize_intrin_sse2.c +++ b/vpx_dsp/x86/highbd_quantize_intrin_sse2.c @@ -11,7 +11,7 @@ @@ -4975,7 +6919,7 @@ index adae60756..3b810a70d 100644 #include "vpx_mem/vpx_mem.h" #include "vpx_ports/mem.h" diff --git a/vpx_dsp/x86/highbd_sad4d_avx2.c b/vpx_dsp/x86/highbd_sad4d_avx2.c -index e483fdce7..6bce2927a 100644 +index e483fdc..6bce292 100644 --- a/vpx_dsp/x86/highbd_sad4d_avx2.c +++ b/vpx_dsp/x86/highbd_sad4d_avx2.c @@ -8,7 +8,7 @@ @@ -4988,7 +6932,7 @@ index e483fdce7..6bce2927a 100644 static VPX_FORCE_INLINE void calc_final_4(const __m256i *const sums /*[4]*/, diff --git a/vpx_dsp/x86/highbd_sad_avx2.c b/vpx_dsp/x86/highbd_sad_avx2.c -index 78f8eb8bf..0c4642036 100644 +index 78f8eb8..0c46420 100644 --- a/vpx_dsp/x86/highbd_sad_avx2.c +++ b/vpx_dsp/x86/highbd_sad_avx2.c @@ -8,7 +8,7 @@ @@ -5001,7 +6945,7 @@ index 78f8eb8bf..0c4642036 100644 static VPX_FORCE_INLINE unsigned int calc_final(const __m256i sums_32) { diff --git a/vpx_dsp/x86/highbd_variance_sse2.c b/vpx_dsp/x86/highbd_variance_sse2.c -index 381e0ad19..4f509c48d 100644 +index 3062bf8..9ebde5d 100644 --- a/vpx_dsp/x86/highbd_variance_sse2.c +++ b/vpx_dsp/x86/highbd_variance_sse2.c @@ -9,8 +9,8 @@ @@ -5014,9 +6958,9 @@ index 381e0ad19..4f509c48d 100644 +#include "vpx_dsp_rtcd.h" #include "vpx_ports/mem.h" - typedef uint32_t (*high_variance_fn_t)(const uint16_t *src, int src_stride, + #if HAVE_X86_ASM diff --git a/vpx_dsp/x86/inv_txfm_avx2.c b/vpx_dsp/x86/inv_txfm_avx2.c -index 752435d24..d89590cfb 100644 +index 752435d..d89590c 100644 --- a/vpx_dsp/x86/inv_txfm_avx2.c +++ b/vpx_dsp/x86/inv_txfm_avx2.c @@ -10,7 +10,7 @@ @@ -5029,7 +6973,7 @@ index 752435d24..d89590cfb 100644 #define PAIR256_SET_EPI16(a, b) \ diff --git a/vpx_dsp/x86/inv_txfm_sse2.c b/vpx_dsp/x86/inv_txfm_sse2.c -index f42b3df84..2f3c3c6c2 100644 +index f42b3df..2f3c3c6 100644 --- a/vpx_dsp/x86/inv_txfm_sse2.c +++ b/vpx_dsp/x86/inv_txfm_sse2.c @@ -10,7 +10,7 @@ @@ -5042,7 +6986,7 @@ index f42b3df84..2f3c3c6c2 100644 #include "vpx_dsp/x86/transpose_sse2.h" #include "vpx_dsp/x86/txfm_common_sse2.h" diff --git a/vpx_dsp/x86/inv_txfm_sse2.h b/vpx_dsp/x86/inv_txfm_sse2.h -index b4bbd186d..35c4ebcf0 100644 +index b4bbd18..35c4ebc 100644 --- a/vpx_dsp/x86/inv_txfm_sse2.h +++ b/vpx_dsp/x86/inv_txfm_sse2.h @@ -13,7 +13,7 @@ @@ -5055,7 +6999,7 @@ index b4bbd186d..35c4ebcf0 100644 #include "vpx_dsp/inv_txfm.h" #include "vpx_dsp/x86/transpose_sse2.h" diff --git a/vpx_dsp/x86/inv_txfm_ssse3.c b/vpx_dsp/x86/inv_txfm_ssse3.c -index 6e99469b6..234e55194 100644 +index 6e99469..234e551 100644 --- a/vpx_dsp/x86/inv_txfm_ssse3.c +++ b/vpx_dsp/x86/inv_txfm_ssse3.c @@ -10,7 +10,7 @@ @@ -5068,7 +7012,7 @@ index 6e99469b6..234e55194 100644 #include "vpx_dsp/x86/inv_txfm_ssse3.h" #include "vpx_dsp/x86/transpose_sse2.h" diff --git a/vpx_dsp/x86/inv_txfm_ssse3.h b/vpx_dsp/x86/inv_txfm_ssse3.h -index e9f0f6903..9285661b8 100644 +index e9f0f69..9285661 100644 --- a/vpx_dsp/x86/inv_txfm_ssse3.h +++ b/vpx_dsp/x86/inv_txfm_ssse3.h @@ -13,7 +13,7 @@ @@ -5081,7 +7025,7 @@ index e9f0f6903..9285661b8 100644 #include "vpx_dsp/x86/transpose_sse2.h" #include "vpx_dsp/x86/txfm_common_sse2.h" diff --git a/vpx_dsp/x86/loopfilter_avx2.c b/vpx_dsp/x86/loopfilter_avx2.c -index a58fb6553..f131a5a1d 100644 +index a58fb65..f131a5a 100644 --- a/vpx_dsp/x86/loopfilter_avx2.c +++ b/vpx_dsp/x86/loopfilter_avx2.c @@ -10,7 +10,7 @@ @@ -5094,7 +7038,7 @@ index a58fb6553..f131a5a1d 100644 void vpx_lpf_horizontal_16_avx2(unsigned char *s, int pitch, diff --git a/vpx_dsp/x86/loopfilter_sse2.c b/vpx_dsp/x86/loopfilter_sse2.c -index 6ea34cdd1..e6b80275b 100644 +index 6ea34cd..e6b8027 100644 --- a/vpx_dsp/x86/loopfilter_sse2.c +++ b/vpx_dsp/x86/loopfilter_sse2.c @@ -10,7 +10,7 @@ @@ -5107,7 +7051,7 @@ index 6ea34cdd1..e6b80275b 100644 #include "vpx_ports/emmintrin_compat.h" #include "vpx_dsp/x86/mem_sse2.h" diff --git a/vpx_dsp/x86/mem_sse2.h b/vpx_dsp/x86/mem_sse2.h -index 031f361a4..5343f4e38 100644 +index 031f361..5343f4e 100644 --- a/vpx_dsp/x86/mem_sse2.h +++ b/vpx_dsp/x86/mem_sse2.h @@ -14,7 +14,7 @@ @@ -5120,7 +7064,7 @@ index 031f361a4..5343f4e38 100644 static INLINE void storeu_int32(void *dst, int32_t v) { memcpy(dst, &v, sizeof(v)); diff --git a/vpx_dsp/x86/post_proc_sse2.c b/vpx_dsp/x86/post_proc_sse2.c -index 119fa7cd1..929f26535 100644 +index 119fa7c..929f265 100644 --- a/vpx_dsp/x86/post_proc_sse2.c +++ b/vpx_dsp/x86/post_proc_sse2.c @@ -13,7 +13,7 @@ @@ -5133,7 +7077,7 @@ index 119fa7cd1..929f26535 100644 #include "vpx_dsp/x86/mem_sse2.h" diff --git a/vpx_dsp/x86/quantize_avx.c b/vpx_dsp/x86/quantize_avx.c -index 5ff5abc11..ca16c4bcf 100644 +index 5ff5abc..ca16c4b 100644 --- a/vpx_dsp/x86/quantize_avx.c +++ b/vpx_dsp/x86/quantize_avx.c @@ -14,7 +14,7 @@ @@ -5146,7 +7090,7 @@ index 5ff5abc11..ca16c4bcf 100644 #include "vpx_dsp/x86/bitdepth_conversion_sse2.h" #include "vpx_dsp/x86/quantize_sse2.h" diff --git a/vpx_dsp/x86/quantize_avx2.c b/vpx_dsp/x86/quantize_avx2.c -index d4872f6bc..8fd6affd8 100644 +index d4872f6..8fd6aff 100644 --- a/vpx_dsp/x86/quantize_avx2.c +++ b/vpx_dsp/x86/quantize_avx2.c @@ -11,7 +11,7 @@ @@ -5159,7 +7103,7 @@ index d4872f6bc..8fd6affd8 100644 #include "vp9/common/vp9_scan.h" #include "vp9/encoder/vp9_block.h" diff --git a/vpx_dsp/x86/quantize_sse2.c b/vpx_dsp/x86/quantize_sse2.c -index 64838eaa7..3adb01b01 100644 +index 64838ea..3adb01b 100644 --- a/vpx_dsp/x86/quantize_sse2.c +++ b/vpx_dsp/x86/quantize_sse2.c @@ -12,7 +12,7 @@ @@ -5172,7 +7116,7 @@ index 64838eaa7..3adb01b01 100644 #include "vpx_dsp/x86/bitdepth_conversion_sse2.h" #include "vpx_dsp/x86/quantize_sse2.h" diff --git a/vpx_dsp/x86/quantize_sse2.h b/vpx_dsp/x86/quantize_sse2.h -index 82c755a0c..afc1b1bab 100644 +index 82c755a..afc1b1b 100644 --- a/vpx_dsp/x86/quantize_sse2.h +++ b/vpx_dsp/x86/quantize_sse2.h @@ -13,7 +13,7 @@ @@ -5185,7 +7129,7 @@ index 82c755a0c..afc1b1bab 100644 #include "vp9/encoder/vp9_block.h" diff --git a/vpx_dsp/x86/quantize_ssse3.c b/vpx_dsp/x86/quantize_ssse3.c -index 2c6d851a1..d8b781d2d 100644 +index 2c6d851..d8b781d 100644 --- a/vpx_dsp/x86/quantize_ssse3.c +++ b/vpx_dsp/x86/quantize_ssse3.c @@ -11,7 +11,7 @@ @@ -5198,7 +7142,7 @@ index 2c6d851a1..d8b781d2d 100644 #include "vpx_dsp/x86/bitdepth_conversion_sse2.h" #include "vpx_dsp/x86/quantize_sse2.h" diff --git a/vpx_dsp/x86/quantize_ssse3.h b/vpx_dsp/x86/quantize_ssse3.h -index e8d2a0577..72bfcca2a 100644 +index e8d2a05..72bfcca 100644 --- a/vpx_dsp/x86/quantize_ssse3.h +++ b/vpx_dsp/x86/quantize_ssse3.h @@ -13,7 +13,7 @@ @@ -5211,7 +7155,7 @@ index e8d2a0577..72bfcca2a 100644 #include "vpx_dsp/x86/quantize_sse2.h" diff --git a/vpx_dsp/x86/sad4d_avx2.c b/vpx_dsp/x86/sad4d_avx2.c -index cf7111983..8bfe9423a 100644 +index cf71119..8bfe942 100644 --- a/vpx_dsp/x86/sad4d_avx2.c +++ b/vpx_dsp/x86/sad4d_avx2.c @@ -8,7 +8,7 @@ @@ -5224,7 +7168,7 @@ index cf7111983..8bfe9423a 100644 // Note with sums[4] some versions of Visual Studio may fail due to parameter diff --git a/vpx_dsp/x86/sad4d_avx512.c b/vpx_dsp/x86/sad4d_avx512.c -index cfd23fedd..8ba59864d 100644 +index cc36cae..f416005 100644 --- a/vpx_dsp/x86/sad4d_avx512.c +++ b/vpx_dsp/x86/sad4d_avx512.c @@ -8,7 +8,7 @@ @@ -5235,9 +7179,9 @@ index cfd23fedd..8ba59864d 100644 +#include "vpx_dsp_rtcd.h" #include "vpx/vpx_integer.h" - void vpx_sad64x64x4d_avx512(const uint8_t *src_ptr, int src_stride, + static INLINE void sad64xhx4d_avx512(const uint8_t *src_ptr, int src_stride, diff --git a/vpx_dsp/x86/sad_avx2.c b/vpx_dsp/x86/sad_avx2.c -index e00494d76..63e7e523b 100644 +index 70b851f..7b88caa 100644 --- a/vpx_dsp/x86/sad_avx2.c +++ b/vpx_dsp/x86/sad_avx2.c @@ -8,7 +8,7 @@ @@ -5249,8 +7193,21 @@ index e00494d76..63e7e523b 100644 #include "vpx_ports/mem.h" static INLINE unsigned int sad64xh_avx2(const uint8_t *src_ptr, int src_stride, +diff --git a/vpx_dsp/x86/sad_avx512.c b/vpx_dsp/x86/sad_avx512.c +index 18c7955..fab5343 100644 +--- a/vpx_dsp/x86/sad_avx512.c ++++ b/vpx_dsp/x86/sad_avx512.c +@@ -8,7 +8,7 @@ + * be found in the AUTHORS file in the root of the source tree. + */ + #include +-#include "./vpx_dsp_rtcd.h" ++#include "vpx_dsp_rtcd.h" + #include "vpx_ports/mem.h" + + static INLINE unsigned int sad64xh_avx512(const uint8_t *src_ptr, diff --git a/vpx_dsp/x86/sse_avx2.c b/vpx_dsp/x86/sse_avx2.c -index dfe45b611..4b3e2384c 100644 +index dfe45b6..4b3e238 100644 --- a/vpx_dsp/x86/sse_avx2.c +++ b/vpx_dsp/x86/sse_avx2.c @@ -12,8 +12,8 @@ @@ -5265,7 +7222,7 @@ index dfe45b611..4b3e2384c 100644 #include "vpx_ports/mem.h" #include "vpx_dsp/x86/mem_sse2.h" diff --git a/vpx_dsp/x86/sse_sse4.c b/vpx_dsp/x86/sse_sse4.c -index 4a7585c57..c194777b5 100644 +index 4a7585c..c194777 100644 --- a/vpx_dsp/x86/sse_sse4.c +++ b/vpx_dsp/x86/sse_sse4.c @@ -11,8 +11,8 @@ @@ -5280,7 +7237,7 @@ index 4a7585c57..c194777b5 100644 #include "vpx_ports/mem.h" #include "vpx/vpx_integer.h" diff --git a/vpx_dsp/x86/subtract_avx2.c b/vpx_dsp/x86/subtract_avx2.c -index 4849581ed..87027941f 100644 +index ff690dc..68896fa 100644 --- a/vpx_dsp/x86/subtract_avx2.c +++ b/vpx_dsp/x86/subtract_avx2.c @@ -11,7 +11,7 @@ @@ -5293,7 +7250,7 @@ index 4849581ed..87027941f 100644 static VPX_FORCE_INLINE void subtract32_avx2(int16_t *diff_ptr, diff --git a/vpx_dsp/x86/sum_squares_sse2.c b/vpx_dsp/x86/sum_squares_sse2.c -index df6514b2c..85c6aa631 100644 +index df6514b..85c6aa6 100644 --- a/vpx_dsp/x86/sum_squares_sse2.c +++ b/vpx_dsp/x86/sum_squares_sse2.c @@ -11,7 +11,7 @@ @@ -5306,7 +7263,7 @@ index df6514b2c..85c6aa631 100644 uint64_t vpx_sum_squares_2d_i16_sse2(const int16_t *src, int stride, int size) { diff --git a/vpx_dsp/x86/transpose_sse2.h b/vpx_dsp/x86/transpose_sse2.h -index b4f1190d7..1f412ce81 100644 +index b4f1190..1f412ce 100644 --- a/vpx_dsp/x86/transpose_sse2.h +++ b/vpx_dsp/x86/transpose_sse2.h @@ -13,7 +13,7 @@ @@ -5319,7 +7276,7 @@ index b4f1190d7..1f412ce81 100644 static INLINE __m128i transpose_8bit_4x4(const __m128i *const in) { // Unpack 8 bit elements. Goes from: diff --git a/vpx_dsp/x86/variance_avx2.c b/vpx_dsp/x86/variance_avx2.c -index 8305b9f20..20e3e544a 100644 +index 8305b9f..20e3e54 100644 --- a/vpx_dsp/x86/variance_avx2.c +++ b/vpx_dsp/x86/variance_avx2.c @@ -10,7 +10,7 @@ @@ -5332,7 +7289,7 @@ index 8305b9f20..20e3e544a 100644 /* clang-format off */ DECLARE_ALIGNED(32, static const uint8_t, bilinear_filters_avx2[512]) = { diff --git a/vpx_dsp/x86/variance_sse2.c b/vpx_dsp/x86/variance_sse2.c -index d6eb12da1..06d3f3273 100644 +index 8a7052a..397fcfb 100644 --- a/vpx_dsp/x86/variance_sse2.c +++ b/vpx_dsp/x86/variance_sse2.c @@ -11,8 +11,8 @@ @@ -5347,7 +7304,7 @@ index d6eb12da1..06d3f3273 100644 #include "vpx_dsp/x86/mem_sse2.h" diff --git a/vpx_dsp/x86/vpx_subpixel_4t_intrin_sse2.c b/vpx_dsp/x86/vpx_subpixel_4t_intrin_sse2.c -index 21a35ae3c..4c84e7ffd 100644 +index 21a35ae..4c84e7f 100644 --- a/vpx_dsp/x86/vpx_subpixel_4t_intrin_sse2.c +++ b/vpx_dsp/x86/vpx_subpixel_4t_intrin_sse2.c @@ -10,7 +10,7 @@ @@ -5360,7 +7317,7 @@ index 21a35ae3c..4c84e7ffd 100644 #include "vpx_dsp/x86/convolve.h" #include "vpx_dsp/x86/convolve_sse2.h" diff --git a/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c b/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c -index 526c28382..86830269e 100644 +index 526c283..8683026 100644 --- a/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c +++ b/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c @@ -11,7 +11,7 @@ @@ -5373,7 +7330,7 @@ index 526c28382..86830269e 100644 #include "vpx_dsp/x86/convolve_avx2.h" #include "vpx_dsp/x86/convolve_sse2.h" diff --git a/vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c b/vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c -index 4ea2752d3..75bcaacfb 100644 +index 4ea2752..75bcaac 100644 --- a/vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c +++ b/vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c @@ -12,8 +12,8 @@ @@ -5388,7 +7345,7 @@ index 4ea2752d3..75bcaacfb 100644 #include "vpx_dsp/x86/convolve.h" #include "vpx_dsp/x86/convolve_sse2.h" diff --git a/vpx_mem/include/vpx_mem_intrnl.h b/vpx_mem/include/vpx_mem_intrnl.h -index 563113024..703c9c1a1 100644 +index fb75d0c..8343247 100644 --- a/vpx_mem/include/vpx_mem_intrnl.h +++ b/vpx_mem/include/vpx_mem_intrnl.h @@ -10,7 +10,7 @@ @@ -5401,7 +7358,7 @@ index 563113024..703c9c1a1 100644 #define ADDRESS_STORAGE_SIZE sizeof(size_t) diff --git a/vpx_ports/aarch32_cpudetect.c b/vpx_ports/aarch32_cpudetect.c -index 20f688e17..a31d3a99c 100644 +index 20f688e..a31d3a9 100644 --- a/vpx_ports/aarch32_cpudetect.c +++ b/vpx_ports/aarch32_cpudetect.c @@ -9,7 +9,7 @@ @@ -5414,7 +7371,7 @@ index 20f688e17..a31d3a99c 100644 #if !CONFIG_RUNTIME_CPU_DETECT diff --git a/vpx_ports/aarch64_cpudetect.c b/vpx_ports/aarch64_cpudetect.c -index df8e1e244..5bdbb6ed8 100644 +index df8e1e2..5bdbb6e 100644 --- a/vpx_ports/aarch64_cpudetect.c +++ b/vpx_ports/aarch64_cpudetect.c @@ -8,7 +8,7 @@ @@ -5427,7 +7384,7 @@ index df8e1e244..5bdbb6ed8 100644 #include "vpx_ports/arm_cpudetect.h" diff --git a/vpx_ports/asmdefs_mmi.h b/vpx_ports/asmdefs_mmi.h -index 400a51cc3..03ce39550 100644 +index 400a51c..03ce395 100644 --- a/vpx_ports/asmdefs_mmi.h +++ b/vpx_ports/asmdefs_mmi.h @@ -11,7 +11,7 @@ @@ -5440,7 +7397,7 @@ index 400a51cc3..03ce39550 100644 #if HAVE_MMI diff --git a/vpx_ports/loongarch_cpudetect.c b/vpx_ports/loongarch_cpudetect.c -index 7b4322d35..1b007e4cf 100644 +index 7b4322d..1b007e4 100644 --- a/vpx_ports/loongarch_cpudetect.c +++ b/vpx_ports/loongarch_cpudetect.c @@ -10,7 +10,7 @@ @@ -5453,7 +7410,7 @@ index 7b4322d35..1b007e4cf 100644 #define LOONGARCH_CFG2 0x02 diff --git a/vpx_ports/mips_cpudetect.c b/vpx_ports/mips_cpudetect.c -index e0eca2d48..50dd1084c 100644 +index e0eca2d..50dd108 100644 --- a/vpx_ports/mips_cpudetect.c +++ b/vpx_ports/mips_cpudetect.c @@ -9,7 +9,7 @@ @@ -5466,7 +7423,7 @@ index e0eca2d48..50dd1084c 100644 #if CONFIG_RUNTIME_CPU_DETECT diff --git a/vpx_ports/ppc.h b/vpx_ports/ppc.h -index a11f4e873..d9f5fd7fa 100644 +index a11f4e8..d9f5fd7 100644 --- a/vpx_ports/ppc.h +++ b/vpx_ports/ppc.h @@ -12,7 +12,7 @@ @@ -5479,7 +7436,7 @@ index a11f4e873..d9f5fd7fa 100644 #ifdef __cplusplus extern "C" { diff --git a/vpx_ports/ppc_cpudetect.c b/vpx_ports/ppc_cpudetect.c -index 374a0271c..cc2953c04 100644 +index 374a027..cc2953c 100644 --- a/vpx_ports/ppc_cpudetect.c +++ b/vpx_ports/ppc_cpudetect.c @@ -14,7 +14,7 @@ @@ -5492,7 +7449,7 @@ index 374a0271c..cc2953c04 100644 #if CONFIG_RUNTIME_CPU_DETECT diff --git a/vpx_ports/system_state.h b/vpx_ports/system_state.h -index 32ebd0ed8..181818ab3 100644 +index 32ebd0e..181818a 100644 --- a/vpx_ports/system_state.h +++ b/vpx_ports/system_state.h @@ -11,7 +11,7 @@ @@ -5505,7 +7462,7 @@ index 32ebd0ed8..181818ab3 100644 #ifdef __cplusplus extern "C" { diff --git a/vpx_ports/vpx_timer.h b/vpx_ports/vpx_timer.h -index 4934d5296..5aa75c3b5 100644 +index 55e7891..2b5805f 100644 --- a/vpx_ports/vpx_timer.h +++ b/vpx_ports/vpx_timer.h @@ -11,7 +11,7 @@ @@ -5517,21 +7474,49 @@ index 4934d5296..5aa75c3b5 100644 #include "vpx/vpx_integer.h" +diff --git a/vpx_scale/generic/gen_scalers.c b/vpx_scale/generic/gen_scalers.c +index d8db4b3..3bc4701 100644 +--- a/vpx_scale/generic/gen_scalers.c ++++ b/vpx_scale/generic/gen_scalers.c +@@ -8,7 +8,7 @@ + * be found in the AUTHORS file in the root of the source tree. + */ + +-#include "./vpx_scale_rtcd.h" ++#include "vpx_scale_rtcd.h" + #include "vpx_scale/vpx_scale.h" + #include "vpx_mem/vpx_mem.h" + /**************************************************************************** +diff --git a/vpx_scale/generic/vpx_scale.c b/vpx_scale/generic/vpx_scale.c +index 36d6d36..aac0ca2 100644 +--- a/vpx_scale/generic/vpx_scale.c ++++ b/vpx_scale/generic/vpx_scale.c +@@ -21,7 +21,7 @@ + ****************************************************************************/ + #include + +-#include "./vpx_scale_rtcd.h" ++#include "vpx_scale_rtcd.h" + #include "vpx_mem/vpx_mem.h" + #include "vpx_scale/vpx_scale.h" + #include "vpx_scale/yv12config.h" diff --git a/vpx_scale/generic/yv12extend.c b/vpx_scale/generic/yv12extend.c -index e23180650..9fb299996 100644 +index e231806..c74c357 100644 --- a/vpx_scale/generic/yv12extend.c +++ b/vpx_scale/generic/yv12extend.c -@@ -9,7 +9,7 @@ +@@ -9,8 +9,8 @@ */ #include -#include "./vpx_config.h" +-#include "./vpx_scale_rtcd.h" +#include "vpx_config.h" - #include "./vpx_scale_rtcd.h" ++#include "vpx_scale_rtcd.h" #include "vpx/vpx_integer.h" #include "vpx_mem/vpx_mem.h" + #include "vpx_ports/mem.h" diff --git a/vpx_scale/mips/dspr2/yv12extend_dspr2.c b/vpx_scale/mips/dspr2/yv12extend_dspr2.c -index d3d1b07f4..4efac6555 100644 +index d3d1b07..4efac65 100644 --- a/vpx_scale/mips/dspr2/yv12extend_dspr2.c +++ b/vpx_scale/mips/dspr2/yv12extend_dspr2.c @@ -10,7 +10,7 @@ @@ -5544,20 +7529,23 @@ index d3d1b07f4..4efac6555 100644 #include "vpx_mem/vpx_mem.h" #include "vpx_scale/vpx_scale.h" diff --git a/vpx_scale/vpx_scale_rtcd.c b/vpx_scale/vpx_scale_rtcd.c -index 706b0770c..e45a43541 100644 +index 706b077..7602c63 100644 --- a/vpx_scale/vpx_scale_rtcd.c +++ b/vpx_scale/vpx_scale_rtcd.c -@@ -7,7 +7,7 @@ +@@ -7,9 +7,9 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "./vpx_config.h" +#include "vpx_config.h" #define RTCD_C - #include "./vpx_scale_rtcd.h" +-#include "./vpx_scale_rtcd.h" ++#include "vpx_scale_rtcd.h" #include "vpx_ports/vpx_once.h" + + void vpx_scale_rtcd(void) { once(setup_rtcd_internal); } diff --git a/vpx_scale/yv12config.h b/vpx_scale/yv12config.h -index 2cf18217f..900920ced 100644 +index 2cf1821..900920c 100644 --- a/vpx_scale/yv12config.h +++ b/vpx_scale/yv12config.h @@ -15,7 +15,7 @@ @@ -5570,7 +7558,7 @@ index 2cf18217f..900920ced 100644 #include "vpx/vpx_frame_buffer.h" #include "vpx/vpx_integer.h" diff --git a/vpx_util/endian_inl.h b/vpx_util/endian_inl.h -index 1b6ef56c6..df844d9f3 100644 +index 1b6ef56..df844d9 100644 --- a/vpx_util/endian_inl.h +++ b/vpx_util/endian_inl.h @@ -13,7 +13,7 @@ @@ -5583,7 +7571,7 @@ index 1b6ef56c6..df844d9f3 100644 #if defined(__GNUC__) diff --git a/vpx_util/vpx_atomics.h b/vpx_util/vpx_atomics.h -index 23ad56685..f4baff485 100644 +index 13c1fc1..a383e0c 100644 --- a/vpx_util/vpx_atomics.h +++ b/vpx_util/vpx_atomics.h @@ -11,7 +11,7 @@ @@ -5596,7 +7584,7 @@ index 23ad56685..f4baff485 100644 #ifdef __cplusplus extern "C" { diff --git a/vpx_util/vpx_debug_util.h b/vpx_util/vpx_debug_util.h -index df1a1aab2..8e9fd9b00 100644 +index df1a1aa..8e9fd9b 100644 --- a/vpx_util/vpx_debug_util.h +++ b/vpx_util/vpx_debug_util.h @@ -11,7 +11,7 @@ @@ -5609,7 +7597,7 @@ index df1a1aab2..8e9fd9b00 100644 #include "vpx_dsp/prob.h" diff --git a/vpx_util/vpx_pthread.h b/vpx_util/vpx_pthread.h -index cdd18d0f3..3d08cfe50 100644 +index 8bb94df..3ffdb42 100644 --- a/vpx_util/vpx_pthread.h +++ b/vpx_util/vpx_pthread.h @@ -12,7 +12,7 @@ @@ -5622,15 +7610,213 @@ index cdd18d0f3..3d08cfe50 100644 #if CONFIG_MULTITHREAD diff --git a/vpx_util/vpx_thread.c b/vpx_util/vpx_thread.c -index 0d0e2f576..83c91ae99 100644 +index fe703c2..1db907b 100644 --- a/vpx_util/vpx_thread.c +++ b/vpx_util/vpx_thread.c -@@ -20,7 +20,7 @@ +@@ -20,8 +20,8 @@ #include #include // for memset() -#include "./vpx_config.h" +-#include "./vpx_thread.h" +#include "vpx_config.h" - #include "./vpx_thread.h" ++#include "vpx_thread.h" #include "vpx_mem/vpx_mem.h" #include "vpx_util/vpx_pthread.h" + +diff --git a/vpxdec.c b/vpxdec.c +index 4128498..a3a40ad 100644 +--- a/vpxdec.c ++++ b/vpxdec.c +@@ -15,14 +15,14 @@ + #include + #include + +-#include "./vpx_config.h" ++#include "vpx_config.h" + + #if CONFIG_LIBYUV + #include "third_party/libyuv/include/libyuv/scale.h" + #endif + +-#include "./args.h" +-#include "./ivfdec.h" ++#include "args.h" ++#include "ivfdec.h" + + #include "vpx/vpx_decoder.h" + #include "vpx_ports/mem_ops.h" +@@ -32,13 +32,13 @@ + #include "vpx/vp8dx.h" + #endif + +-#include "./md5_utils.h" ++#include "md5_utils.h" + +-#include "./tools_common.h" ++#include "tools_common.h" + #if CONFIG_WEBM_IO +-#include "./webmdec.h" ++#include "webmdec.h" + #endif +-#include "./y4menc.h" ++#include "y4menc.h" + + static const char *exec_name; + +diff --git a/vpxenc.c b/vpxenc.c +index ee0a999..7739f04 100644 +--- a/vpxenc.c ++++ b/vpxenc.c +@@ -8,8 +8,8 @@ + * be found in the AUTHORS file in the root of the source tree. + */ + +-#include "./vpxenc.h" +-#include "./vpx_config.h" ++#include "vpxenc.h" ++#include "vpx_config.h" + + #include + #include +@@ -28,9 +28,9 @@ + #include "vpx/vpx_decoder.h" + #endif + +-#include "./args.h" +-#include "./ivfenc.h" +-#include "./tools_common.h" ++#include "args.h" ++#include "ivfenc.h" ++#include "tools_common.h" + + #if CONFIG_VP8_ENCODER || CONFIG_VP9_ENCODER + #include "vpx/vp8cx.h" +@@ -42,13 +42,13 @@ + #include "vpx/vpx_integer.h" + #include "vpx_ports/mem_ops.h" + #include "vpx_ports/vpx_timer.h" +-#include "./rate_hist.h" +-#include "./vpxstats.h" +-#include "./warnings.h" ++#include "rate_hist.h" ++#include "vpxstats.h" ++#include "warnings.h" + #if CONFIG_WEBM_IO +-#include "./webmenc.h" ++#include "webmenc.h" + #endif +-#include "./y4minput.h" ++#include "y4minput.h" + + static size_t wrap_fwrite(const void *ptr, size_t size, size_t nmemb, + FILE *stream) { +diff --git a/vpxstats.c b/vpxstats.c +index c0dd14e..a3609c1 100644 +--- a/vpxstats.c ++++ b/vpxstats.c +@@ -8,13 +8,13 @@ + * be found in the AUTHORS file in the root of the source tree. + */ + +-#include "./vpxstats.h" ++#include "vpxstats.h" + + #include + #include + #include + +-#include "./tools_common.h" ++#include "tools_common.h" + + int stats_open_file(stats_io_t *stats, const char *fpf, int pass) { + int res; +diff --git a/warnings.c b/warnings.c +index 3e6e702..2f928e1 100644 +--- a/warnings.c ++++ b/warnings.c +@@ -8,7 +8,7 @@ + * be found in the AUTHORS file in the root of the source tree. + */ + +-#include "./warnings.h" ++#include "warnings.h" + + #include + #include +@@ -17,8 +17,8 @@ + + #include "vpx/vpx_encoder.h" + +-#include "./tools_common.h" +-#include "./vpxenc.h" ++#include "tools_common.h" ++#include "vpxenc.h" + + static const char quantizer_warning_string[] = + "Bad quantizer values. Quantizer values should not be equal, and should " +diff --git a/webmdec.cc b/webmdec.cc +index 0576bb4..1ac4d80 100644 +--- a/webmdec.cc ++++ b/webmdec.cc +@@ -8,7 +8,7 @@ + * be found in the AUTHORS file in the root of the source tree. + */ + +-#include "./webmdec.h" ++#include "webmdec.h" + + #include + #include +diff --git a/webmdec.h b/webmdec.h +index 6ae7ee1..33ae74a 100644 +--- a/webmdec.h ++++ b/webmdec.h +@@ -10,7 +10,7 @@ + #ifndef VPX_WEBMDEC_H_ + #define VPX_WEBMDEC_H_ + +-#include "./tools_common.h" ++#include "tools_common.h" + + #ifdef __cplusplus + extern "C" { +diff --git a/webmenc.cc b/webmenc.cc +index c718ab5..d953b08 100644 +--- a/webmenc.cc ++++ b/webmenc.cc +@@ -7,7 +7,7 @@ + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ +-#include "./webmenc.h" ++#include "webmenc.h" + + #include + +diff --git a/y4menc.c b/y4menc.c +index 3940249..e7284ff 100644 +--- a/y4menc.c ++++ b/y4menc.c +@@ -10,7 +10,7 @@ + + #include + #include +-#include "./y4menc.h" ++#include "y4menc.h" + + int y4m_write_file_header(char *buf, size_t len, int width, int height, + const struct VpxRational *framerate, +diff --git a/y4menc.h b/y4menc.h +index 9a367e3..8c2f1ab 100644 +--- a/y4menc.h ++++ b/y4menc.h +@@ -11,7 +11,7 @@ + #ifndef VPX_Y4MENC_H_ + #define VPX_Y4MENC_H_ + +-#include "./tools_common.h" ++#include "tools_common.h" + + #include "vpx/vpx_decoder.h" + diff --git a/base/cvd/build_external/libvpx/libvpx.MODULE.bazel b/base/cvd/build_external/libvpx/libvpx.MODULE.bazel index d3865825336..d2fff0bcdc1 100644 --- a/base/cvd/build_external/libvpx/libvpx.MODULE.bazel +++ b/base/cvd/build_external/libvpx/libvpx.MODULE.bazel @@ -3,7 +3,7 @@ git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "g git_repository( name = "libvpx", build_file = "@//build_external/libvpx:BUILD.libvpx.bazel", - commit = "39e8b9dcd4696d9ac3ebd4722e012488382f1adb", # v1.15.1 + commit = "6df3ec34557879fff673706f4a1d9fbd0f3a6f0e", # v1.17.0 patch_args = ["-p1"], # Generate this file with `find . -type f | xargs sed -i -e 's|#include "./|#include "|' && git diff` on the libvpx source patches = ["@//build_external/libvpx:PATCH.libvpx_config.patch"], diff --git a/base/cvd/build_external/libwebm/libwebm.MODULE.bazel b/base/cvd/build_external/libwebm/libwebm.MODULE.bazel index 663c7c75e81..94c0ab2a8d0 100644 --- a/base/cvd/build_external/libwebm/libwebm.MODULE.bazel +++ b/base/cvd/build_external/libwebm/libwebm.MODULE.bazel @@ -3,6 +3,6 @@ git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "g git_repository( name = "libwebm", build_file = "@//build_external/libwebm:BUILD.libwebm.bazel", - commit = "6745fd29e0245fc584b0bb9f65018ea2366fe7fb", # libwebm-1.0.0.31 + commit = "f2a982d748b80586ae53b89a2e6ebbc305848b8c", # libwebm-1.0.0.32 remote = "https://github.com/webmproject/libwebm", ) diff --git a/base/cvd/build_external/libwebrtc/BUILD.bazel b/base/cvd/build_external/libwebrtc/BUILD.bazel index d66eecee2ed..db3ec0676ee 100644 --- a/base/cvd/build_external/libwebrtc/BUILD.bazel +++ b/base/cvd/build_external/libwebrtc/BUILD.bazel @@ -26,6 +26,11 @@ cc_library( ], hdrs = [ "third_party/crc32c/src/include/crc32c/crc32c.h", + "third_party/dav1d/libdav1d/include/dav1d/common.h", + "third_party/dav1d/libdav1d/include/dav1d/data.h", + "third_party/dav1d/libdav1d/include/dav1d/dav1d.h", + "third_party/dav1d/libdav1d/include/dav1d/headers.h", + "third_party/dav1d/libdav1d/include/dav1d/picture.h", "third_party/libaom/source/libaom/aom/aom_codec.h", "third_party/libaom/source/libaom/aom/aom_decoder.h", "third_party/libaom/source/libaom/aom/aom_encoder.h", @@ -36,11 +41,29 @@ cc_library( "third_party/libsrtp/crypto/include/crypto_types.h", "third_party/libsrtp/include/srtp.h", "third_party/libsrtp/include/srtp_priv.h", + "third_party/libvpx/source/libvpx/vpx/vp8.h", + "third_party/libvpx/source/libvpx/vpx/vp8cx.h", + "third_party/libvpx/source/libvpx/vpx/vp8dx.h", + "third_party/libvpx/source/libvpx/vpx/vpx_codec.h", + "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h", + "third_party/libvpx/source/libvpx/vpx/vpx_encoder.h", + "third_party/libvpx/source/libvpx/vpx/vpx_ext_ratectrl.h", + "third_party/libvpx/source/libvpx/vpx/vpx_frame_buffer.h", + "third_party/libvpx/source/libvpx/vpx/vpx_image.h", + "third_party/libvpx/source/libvpx/vpx/vpx_integer.h", + "third_party/libvpx/source/libvpx/vpx/vpx_tpl.h", "third_party/opus/src/include/opus.h", + "third_party/opus/src/include/opus_defines.h", "third_party/opus/src/include/opus_multistream.h", + "third_party/opus/src/include/opus_types.h", "third_party/pffft/src/pffft.h", "third_party/rnnoise/src/rnn_activations.h", "third_party/rnnoise/src/rnn_vad_weights.h", + "third_party/sframe/src/include/sframe/result.h", + "third_party/sframe/src/include/sframe/sframe.h", + ], + copts = [ + "-std=c++20", ], includes = ["."], linkopts = [ @@ -48,9 +71,12 @@ cc_library( ], deps = [ "@crc32c", + "@dav1d//:dav1d_api", "@libevent//:event", "@libpffft", "@libsrtp2", + "@libvpx", "@libyuv", + "@sframe", ], ) diff --git a/base/cvd/build_external/libwebrtc/BUILD.libwebrtc.bazel b/base/cvd/build_external/libwebrtc/BUILD.libwebrtc.bazel index 65e55d30991..9e949ae5a08 100644 --- a/base/cvd/build_external/libwebrtc/BUILD.libwebrtc.bazel +++ b/base/cvd/build_external/libwebrtc/BUILD.libwebrtc.bazel @@ -11,7 +11,11 @@ cc_library( srcs = [ "api/adaptation/resource.cc", "api/audio/audio_frame.cc", + "api/audio/audio_processing.cc", + "api/audio/audio_processing_statistics.cc", + "api/audio/builtin_audio_processing_builder.cc", "api/audio/channel_layout.cc", + "api/audio/create_audio_device_module.cc", "api/audio/echo_canceller3_config.cc", "api/audio/echo_canceller3_factory.cc", "api/audio_codecs/L16/audio_decoder_L16.cc", @@ -26,23 +30,28 @@ cc_library( "api/audio_codecs/g711/audio_encoder_g711.cc", "api/audio_codecs/g722/audio_decoder_g722.cc", "api/audio_codecs/g722/audio_encoder_g722.cc", - "api/audio_codecs/ilbc/audio_decoder_ilbc.cc", - "api/audio_codecs/ilbc/audio_encoder_ilbc.cc", "api/audio_codecs/opus/audio_decoder_multi_channel_opus.cc", "api/audio_codecs/opus/audio_decoder_opus.cc", "api/audio_codecs/opus/audio_encoder_multi_channel_opus.cc", "api/audio_codecs/opus/audio_encoder_multi_channel_opus_config.cc", "api/audio_codecs/opus/audio_encoder_opus.cc", "api/audio_codecs/opus/audio_encoder_opus_config.cc", + "api/audio_codecs/opus_audio_decoder_factory.cc", "api/audio_options.cc", "api/call/transport.cc", "api/candidate.cc", + "api/create_modular_peer_connection_factory.cc", "api/create_peerconnection_factory.cc", "api/crypto/crypto_options.cc", "api/data_channel_interface.cc", "api/dtls_transport_interface.cc", + "api/enable_media.cc", + "api/environment/deprecated_global_field_trials.cc", + "api/environment/environment_factory.cc", + "api/environment/force_test_environment.cc", "api/field_trials.cc", "api/field_trials_registry.cc", + "api/frame_transformer_interface.cc", "api/ice_transport_factory.cc", "api/jsep.cc", "api/jsep_ice_candidate.cc", @@ -50,12 +59,13 @@ cc_library( "api/media_stream_interface.cc", "api/media_types.cc", "api/neteq/default_neteq_controller_factory.cc", + "api/neteq/default_neteq_factory.cc", "api/neteq/neteq.cc", "api/neteq/tick_timer.cc", "api/numerics/samples_stats_counter.cc", "api/peer_connection_interface.cc", + "api/priority.cc", "api/rtc_error.cc", - "api/rtc_event_log/rtc_event.cc", "api/rtc_event_log/rtc_event_log.cc", "api/rtc_event_log/rtc_event_log_factory.cc", "api/rtc_event_log_output_file.cc", @@ -66,13 +76,17 @@ cc_library( "api/rtp_sender_interface.cc", "api/rtp_transceiver_interface.cc", "api/sctp_transport_interface.cc", - "api/task_queue/default_task_queue_factory_libevent.cc", + "api/stats/attribute.cc", + "api/stats/rtc_stats.cc", + "api/stats/rtc_stats_report.cc", + "api/stats/rtcstats_objects.cc", + "api/task_queue/default_task_queue_factory_stdlib.cc", "api/task_queue/pending_task_safety_flag.cc", "api/task_queue/task_queue_base.cc", "api/transport/bitrate_settings.cc", - "api/transport/field_trial_based_config.cc", "api/transport/goog_cc_factory.cc", "api/transport/network_types.cc", + "api/transport/rtp/corruption_detection_message.cc", "api/transport/rtp/dependency_descriptor.cc", "api/transport/stun.cc", "api/units/data_rate.cc", @@ -82,19 +96,28 @@ cc_library( "api/units/timestamp.cc", "api/video/builtin_video_bitrate_allocator_factory.cc", "api/video/color_space.cc", + "api/video/corruption_detection/corruption_detection_settings_generator.cc", + "api/video/corruption_detection/frame_instrumentation_data.cc", + "api/video/corruption_detection/frame_instrumentation_data_reader.cc", + "api/video/corruption_detection/frame_instrumentation_evaluation.cc", + "api/video/corruption_detection/frame_instrumentation_generator_factory.cc", "api/video/encoded_frame.cc", "api/video/encoded_image.cc", "api/video/frame_buffer.cc", "api/video/hdr_metadata.cc", "api/video/i010_buffer.cc", "api/video/i210_buffer.cc", + "api/video/i410_buffer.cc", "api/video/i420_buffer.cc", "api/video/i422_buffer.cc", "api/video/i444_buffer.cc", "api/video/nv12_buffer.cc", "api/video/video_adaptation_counters.cc", + "api/video/video_adapter.cc", "api/video/video_bitrate_allocation.cc", "api/video/video_bitrate_allocator.cc", + "api/video/video_broadcaster.cc", + "api/video/video_common.cc", "api/video/video_content_type.cc", "api/video/video_frame.cc", "api/video/video_frame_buffer.cc", @@ -104,21 +127,24 @@ cc_library( "api/video_codecs/av1_profile.cc", "api/video_codecs/builtin_video_decoder_factory.cc", "api/video_codecs/builtin_video_encoder_factory.cc", + "api/video_codecs/encoder_speed_controller.cc", "api/video_codecs/h264_profile_level_id.cc", "api/video_codecs/scalability_mode.cc", + "api/video_codecs/scalability_mode_helper.cc", "api/video_codecs/sdp_video_format.cc", "api/video_codecs/simulcast_stream.cc", - "api/video_codecs/spatial_layer.cc", "api/video_codecs/video_codec.cc", "api/video_codecs/video_decoder.cc", + "api/video_codecs/video_decoder_factory.cc", "api/video_codecs/video_decoder_software_fallback_wrapper.cc", "api/video_codecs/video_encoder.cc", + "api/video_codecs/video_encoder_factory.cc", "api/video_codecs/video_encoder_software_fallback_wrapper.cc", "api/video_codecs/vp8_frame_config.cc", "api/video_codecs/vp8_temporal_layers.cc", "api/video_codecs/vp8_temporal_layers_factory.cc", "api/video_codecs/vp9_profile.cc", - "api/wrapping_async_dns_resolver.cc", + "api/webrtc_sdp.cc", "audio/audio_level.cc", "audio/audio_receive_stream.cc", "audio/audio_send_stream.cc", @@ -128,6 +154,7 @@ cc_library( "audio/channel_receive_frame_transformer_delegate.cc", "audio/channel_send.cc", "audio/channel_send_frame_transformer_delegate.cc", + "audio/nack_tracker.cc", "audio/remix_resample.cc", "audio/utility/audio_frame_operations.cc", "audio/utility/channel_mixer.cc", @@ -148,13 +175,10 @@ cc_library( "call/bitrate_allocator.cc", "call/call.cc", "call/call_config.cc", - "call/call_factory.cc", - "call/degraded_call.cc", "call/fake_network_pipe.cc", - "call/fake_network_pipe.h", "call/flexfec_receive_stream.cc", "call/flexfec_receive_stream_impl.cc", - "call/receive_time_calculator.cc", + "call/payload_type_picker.cc", "call/rtp_bitrate_configurator.cc", "call/rtp_config.cc", "call/rtp_demuxer.cc", @@ -163,7 +187,6 @@ cc_library( "call/rtp_transport_controller_send.cc", "call/rtp_video_sender.cc", "call/rtx_receive_stream.cc", - "call/simulated_network.cc", "call/syncable.cc", "call/version.cc", "call/video_receive_stream.cc", @@ -181,8 +204,7 @@ cc_library( "common_audio/resampler/sinc_resampler.cc", "common_audio/ring_buffer.c", "common_audio/signal_processing/auto_corr_to_refl_coef.c", - "common_audio/signal_processing/auto_correlation.c", - "common_audio/signal_processing/complex_fft.c", + "common_audio/signal_processing/auto_correlation.cc", "common_audio/signal_processing/copy_set_operations.c", "common_audio/signal_processing/cross_correlation.c", "common_audio/signal_processing/division_operations.c", @@ -193,12 +215,10 @@ cc_library( "common_audio/signal_processing/filter_ma_fast_q12.c", "common_audio/signal_processing/get_hanning_window.c", "common_audio/signal_processing/get_scaling_square.c", - "common_audio/signal_processing/ilbc_specific_functions.c", "common_audio/signal_processing/levinson_durbin.c", "common_audio/signal_processing/lpc_to_refl_coef.c", "common_audio/signal_processing/min_max_operations.c", "common_audio/signal_processing/randomization_functions.c", - "common_audio/signal_processing/real_fft.c", "common_audio/signal_processing/refl_coef_to_lpc.c", "common_audio/signal_processing/resample.c", "common_audio/signal_processing/resample_48khz.c", @@ -209,7 +229,7 @@ cc_library( "common_audio/signal_processing/spl_inl.c", "common_audio/signal_processing/spl_sqrt.c", "common_audio/signal_processing/splitting_filter.c", - "common_audio/signal_processing/sqrt_of_one_minus_x_squared.c", + "common_audio/signal_processing/vector_operations.c", "common_audio/signal_processing/vector_scaling_operations.c", "common_audio/smoothing_filter.cc", "common_audio/third_party/ooura/fft_size_128/ooura_fft.cc", @@ -237,7 +257,6 @@ cc_library( "common_video/video_frame_buffer_pool.cc", "logging/rtc_event_log/encoder/bit_writer.cc", "logging/rtc_event_log/encoder/blob_encoding.cc", - "logging/rtc_event_log/encoder/delta_encoding.cc", "logging/rtc_event_log/encoder/rtc_event_log_encoder_common.cc", "logging/rtc_event_log/encoder/var_int.cc", "logging/rtc_event_log/events/fixed_length_encoding_parameters_v3.cc", @@ -246,17 +265,17 @@ cc_library( "logging/rtc_event_log/events/rtc_event_audio_playout.cc", "logging/rtc_event_log/events/rtc_event_audio_receive_stream_config.cc", "logging/rtc_event_log/events/rtc_event_audio_send_stream_config.cc", - "logging/rtc_event_log/events/rtc_event_begin_log.cc", "logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.cc", "logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.cc", + "logging/rtc_event_log/events/rtc_event_bwe_update_scream.cc", "logging/rtc_event_log/events/rtc_event_dtls_transport_state.cc", "logging/rtc_event_log/events/rtc_event_dtls_writable_state.cc", - "logging/rtc_event_log/events/rtc_event_end_log.cc", "logging/rtc_event_log/events/rtc_event_field_encoding.cc", "logging/rtc_event_log/events/rtc_event_field_encoding_parser.cc", "logging/rtc_event_log/events/rtc_event_field_extraction.cc", "logging/rtc_event_log/events/rtc_event_ice_candidate_pair.cc", "logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.cc", + "logging/rtc_event_log/events/rtc_event_neteq_set_minimum_delay.cc", "logging/rtc_event_log/events/rtc_event_probe_cluster_created.cc", "logging/rtc_event_log/events/rtc_event_probe_result_failure.cc", "logging/rtc_event_log/events/rtc_event_probe_result_success.cc", @@ -269,9 +288,10 @@ cc_library( "logging/rtc_event_log/events/rtc_event_video_send_stream_config.cc", "logging/rtc_event_log/ice_logger.cc", "logging/rtc_event_log/rtc_stream_config.cc", - "media/base/adapted_video_track_source.cc", "media/base/codec.cc", - "media/base/media_channel.cc", + "media/base/codec_comparators.cc", + "media/base/codec_list.cc", + "media/base/media_channel_impl.cc", "media/base/media_constants.cc", "media/base/media_engine.cc", "media/base/rid_description.cc", @@ -279,25 +299,17 @@ cc_library( "media/base/sdp_video_format_utils.cc", "media/base/stream_params.cc", "media/base/turn_utils.cc", - "media/base/video_adapter.cc", - "media/base/video_broadcaster.cc", - "media/base/video_common.cc", - "media/base/video_source_base.cc", "media/engine/adm_helpers.cc", - "media/engine/encoder_simulcast_proxy.cc", + "media/engine/fake_video_codec_factory.cc", "media/engine/internal_decoder_factory.cc", "media/engine/internal_encoder_factory.cc", - "media/engine/multiplex_codec_factory.cc", - "media/engine/payload_type_mapper.cc", "media/engine/simulcast_encoder_adapter.cc", - "media/engine/unhandled_packets_buffer.cc", "media/engine/webrtc_media_engine.cc", "media/engine/webrtc_video_engine.cc", "media/engine/webrtc_voice_engine.cc", "media/sctp/dcsctp_transport.cc", "media/sctp/sctp_transport_factory.cc", "modules/async_audio_processing/async_audio_processing.cc", - "modules/audio_coding/acm2/acm_receiver.cc", "modules/audio_coding/acm2/acm_remixing.cc", "modules/audio_coding/acm2/acm_resampler.cc", "modules/audio_coding/acm2/audio_coding_module.cc", @@ -322,77 +334,6 @@ cc_library( "modules/audio_coding/codecs/g722/audio_decoder_g722.cc", "modules/audio_coding/codecs/g722/audio_encoder_g722.cc", "modules/audio_coding/codecs/g722/g722_interface.c", - "modules/audio_coding/codecs/ilbc/abs_quant.c", - "modules/audio_coding/codecs/ilbc/abs_quant_loop.c", - "modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.cc", - "modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc", - "modules/audio_coding/codecs/ilbc/augmented_cb_corr.c", - "modules/audio_coding/codecs/ilbc/bw_expand.c", - "modules/audio_coding/codecs/ilbc/cb_construct.c", - "modules/audio_coding/codecs/ilbc/cb_mem_energy.c", - "modules/audio_coding/codecs/ilbc/cb_mem_energy_augmentation.c", - "modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.c", - "modules/audio_coding/codecs/ilbc/cb_search.c", - "modules/audio_coding/codecs/ilbc/cb_search_core.c", - "modules/audio_coding/codecs/ilbc/cb_update_best_index.c", - "modules/audio_coding/codecs/ilbc/chebyshev.c", - "modules/audio_coding/codecs/ilbc/comp_corr.c", - "modules/audio_coding/codecs/ilbc/constants.c", - "modules/audio_coding/codecs/ilbc/create_augmented_vec.c", - "modules/audio_coding/codecs/ilbc/decode.c", - "modules/audio_coding/codecs/ilbc/decode_residual.c", - "modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.c", - "modules/audio_coding/codecs/ilbc/do_plc.c", - "modules/audio_coding/codecs/ilbc/encode.c", - "modules/audio_coding/codecs/ilbc/energy_inverse.c", - "modules/audio_coding/codecs/ilbc/enh_upsample.c", - "modules/audio_coding/codecs/ilbc/enhancer.c", - "modules/audio_coding/codecs/ilbc/enhancer_interface.c", - "modules/audio_coding/codecs/ilbc/filtered_cb_vecs.c", - "modules/audio_coding/codecs/ilbc/frame_classify.c", - "modules/audio_coding/codecs/ilbc/gain_dequant.c", - "modules/audio_coding/codecs/ilbc/gain_quant.c", - "modules/audio_coding/codecs/ilbc/get_cd_vec.c", - "modules/audio_coding/codecs/ilbc/get_lsp_poly.c", - "modules/audio_coding/codecs/ilbc/get_sync_seq.c", - "modules/audio_coding/codecs/ilbc/hp_input.c", - "modules/audio_coding/codecs/ilbc/hp_output.c", - "modules/audio_coding/codecs/ilbc/ilbc.c", - "modules/audio_coding/codecs/ilbc/index_conv_dec.c", - "modules/audio_coding/codecs/ilbc/index_conv_enc.c", - "modules/audio_coding/codecs/ilbc/init_decode.c", - "modules/audio_coding/codecs/ilbc/init_encode.c", - "modules/audio_coding/codecs/ilbc/interpolate.c", - "modules/audio_coding/codecs/ilbc/interpolate_samples.c", - "modules/audio_coding/codecs/ilbc/lpc_encode.c", - "modules/audio_coding/codecs/ilbc/lsf_check.c", - "modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.c", - "modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.c", - "modules/audio_coding/codecs/ilbc/lsf_to_lsp.c", - "modules/audio_coding/codecs/ilbc/lsf_to_poly.c", - "modules/audio_coding/codecs/ilbc/lsp_to_lsf.c", - "modules/audio_coding/codecs/ilbc/my_corr.c", - "modules/audio_coding/codecs/ilbc/nearest_neighbor.c", - "modules/audio_coding/codecs/ilbc/pack_bits.c", - "modules/audio_coding/codecs/ilbc/poly_to_lsf.c", - "modules/audio_coding/codecs/ilbc/poly_to_lsp.c", - "modules/audio_coding/codecs/ilbc/refiner.c", - "modules/audio_coding/codecs/ilbc/simple_interpolate_lsf.c", - "modules/audio_coding/codecs/ilbc/simple_lpc_analysis.c", - "modules/audio_coding/codecs/ilbc/simple_lsf_dequant.c", - "modules/audio_coding/codecs/ilbc/simple_lsf_quant.c", - "modules/audio_coding/codecs/ilbc/smooth.c", - "modules/audio_coding/codecs/ilbc/smooth_out_data.c", - "modules/audio_coding/codecs/ilbc/sort_sq.c", - "modules/audio_coding/codecs/ilbc/split_vq.c", - "modules/audio_coding/codecs/ilbc/state_construct.c", - "modules/audio_coding/codecs/ilbc/state_search.c", - "modules/audio_coding/codecs/ilbc/swap_bytes.c", - "modules/audio_coding/codecs/ilbc/unpack_bits.c", - "modules/audio_coding/codecs/ilbc/vq3.c", - "modules/audio_coding/codecs/ilbc/vq4.c", - "modules/audio_coding/codecs/ilbc/window32_w32.c", - "modules/audio_coding/codecs/ilbc/xcorr_coef.c", "modules/audio_coding/codecs/isac/main/source/filter_functions.c", "modules/audio_coding/codecs/isac/main/source/isac_vad.c", "modules/audio_coding/codecs/isac/main/source/pitch_estimator.c", @@ -418,7 +359,7 @@ cc_library( "modules/audio_coding/neteq/cross_correlation.cc", "modules/audio_coding/neteq/decision_logic.cc", "modules/audio_coding/neteq/decoder_database.cc", - "modules/audio_coding/neteq/default_neteq_factory.cc", + "modules/audio_coding/neteq/delay_constraints.cc", "modules/audio_coding/neteq/delay_manager.cc", "modules/audio_coding/neteq/dsp_helper.cc", "modules/audio_coding/neteq/dtmf_buffer.cc", @@ -427,13 +368,11 @@ cc_library( "modules/audio_coding/neteq/expand_uma_logger.cc", "modules/audio_coding/neteq/histogram.cc", "modules/audio_coding/neteq/merge.cc", - "modules/audio_coding/neteq/nack_tracker.cc", "modules/audio_coding/neteq/neteq_impl.cc", "modules/audio_coding/neteq/normal.cc", "modules/audio_coding/neteq/packet.cc", "modules/audio_coding/neteq/packet_arrival_history.cc", "modules/audio_coding/neteq/packet_buffer.cc", - "modules/audio_coding/neteq/post_decode_vad.cc", "modules/audio_coding/neteq/preemptive_expand.cc", "modules/audio_coding/neteq/random_vector.cc", "modules/audio_coding/neteq/red_payload_splitter.cc", @@ -452,6 +391,7 @@ cc_library( "modules/audio_device/dummy/file_audio_device_factory.cc", "modules/audio_device/fine_audio_buffer.cc", "modules/audio_device/include/test_audio_device.cc", + "modules/audio_device/test_audio_device_impl.cc", "modules/audio_mixer/audio_frame_manipulator.cc", "modules/audio_mixer/audio_mixer_impl.cc", "modules/audio_mixer/default_output_rate_calculator.cc", @@ -489,7 +429,7 @@ cc_library( "modules/audio_processing/aec3/fullband_erle_estimator.cc", "modules/audio_processing/aec3/matched_filter.cc", "modules/audio_processing/aec3/matched_filter_lag_aggregator.cc", - "modules/audio_processing/aec3/moving_average.cc", + "modules/audio_processing/aec3/moving_average_spectrum.cc", "modules/audio_processing/aec3/multi_channel_content_detector.cc", "modules/audio_processing/aec3/refined_filter_update_gain.cc", "modules/audio_processing/aec3/render_buffer.cc", @@ -514,16 +454,12 @@ cc_library( "modules/audio_processing/aec3/suppression_gain.cc", "modules/audio_processing/aec3/transparent_mode.cc", "modules/audio_processing/aec_dump/null_aec_dump_factory.cc", - "modules/audio_processing/aecm/aecm_core.cc", - "modules/audio_processing/aecm/aecm_core_c.cc", - "modules/audio_processing/aecm/echo_control_mobile.cc", "modules/audio_processing/agc/agc.cc", "modules/audio_processing/agc/agc_manager_direct.cc", "modules/audio_processing/agc/legacy/analog_agc.cc", "modules/audio_processing/agc/legacy/digital_agc.cc", "modules/audio_processing/agc/loudness_histogram.cc", "modules/audio_processing/agc/utility.cc", - "modules/audio_processing/agc2/adaptive_digital_gain_applier.cc", "modules/audio_processing/agc2/adaptive_digital_gain_controller.cc", "modules/audio_processing/agc2/biquad_filter.cc", "modules/audio_processing/agc2/clipping_predictor.cc", @@ -549,21 +485,26 @@ cc_library( "modules/audio_processing/agc2/saturation_protector.cc", "modules/audio_processing/agc2/saturation_protector_buffer.cc", "modules/audio_processing/agc2/speech_level_estimator.cc", + "modules/audio_processing/agc2/speech_level_estimator_experimental_impl.cc", + "modules/audio_processing/agc2/speech_level_estimator_impl.cc", "modules/audio_processing/agc2/speech_probability_buffer.cc", "modules/audio_processing/agc2/vad_wrapper.cc", "modules/audio_processing/audio_buffer.cc", - "modules/audio_processing/audio_processing_builder_impl.cc", "modules/audio_processing/audio_processing_impl.cc", "modules/audio_processing/capture_levels_adjuster/audio_samples_scaler.cc", "modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster.cc", - "modules/audio_processing/echo_control_mobile_impl.cc", + "modules/audio_processing/capture_mixer/audio_content_analyzer.cc", + "modules/audio_processing/capture_mixer/capture_mixer.cc", + "modules/audio_processing/capture_mixer/channel_content_remixer.cc", + "modules/audio_processing/capture_mixer/dc_levels_estimator.cc", + "modules/audio_processing/capture_mixer/energy_estimator.cc", + "modules/audio_processing/capture_mixer/remixing_logic.cc", + "modules/audio_processing/capture_mixer/saturation_estimator.cc", "modules/audio_processing/gain_control_impl.cc", "modules/audio_processing/gain_controller2.cc", "modules/audio_processing/high_pass_filter.cc", "modules/audio_processing/include/aec_dump.cc", "modules/audio_processing/include/audio_frame_proxies.cc", - "modules/audio_processing/include/audio_processing.cc", - "modules/audio_processing/include/audio_processing_statistics.cc", "modules/audio_processing/logging/apm_data_dumper.cc", "modules/audio_processing/ns/fast_math.cc", "modules/audio_processing/ns/histograms.cc", @@ -578,19 +519,11 @@ cc_library( "modules/audio_processing/ns/speech_probability_estimator.cc", "modules/audio_processing/ns/suppression_params.cc", "modules/audio_processing/ns/wiener_filter.cc", - "modules/audio_processing/optionally_built_submodule_creators.cc", + "modules/audio_processing/post_filter.cc", "modules/audio_processing/rms_level.cc", "modules/audio_processing/splitting_filter.cc", "modules/audio_processing/three_band_filter_bank.cc", - "modules/audio_processing/transient/moving_moments.cc", - "modules/audio_processing/transient/transient_detector.cc", - "modules/audio_processing/transient/transient_suppressor_impl.cc", - "modules/audio_processing/transient/voice_probability_delay_unit.cc", - "modules/audio_processing/transient/wpd_node.cc", - "modules/audio_processing/transient/wpd_tree.cc", "modules/audio_processing/utility/cascaded_biquad_filter.cc", - "modules/audio_processing/utility/delay_estimator.cc", - "modules/audio_processing/utility/delay_estimator_wrapper.cc", "modules/audio_processing/utility/pffft_wrapper.cc", "modules/audio_processing/vad/gmm.cc", "modules/audio_processing/vad/pitch_based_vad.cc", @@ -600,6 +533,7 @@ cc_library( "modules/audio_processing/vad/vad_audio_proc.cc", "modules/audio_processing/vad/vad_circular_buffer.cc", "modules/audio_processing/vad/voice_activity_detector.cc", + "modules/congestion_controller/ect1_policy.cc", "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.cc", "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_interface.cc", "modules/congestion_controller/goog_cc/alr_detector.cc", @@ -609,7 +543,6 @@ cc_library( "modules/congestion_controller/goog_cc/goog_cc_network_control.cc", "modules/congestion_controller/goog_cc/inter_arrival_delta.cc", "modules/congestion_controller/goog_cc/link_capacity_estimator.cc", - "modules/congestion_controller/goog_cc/loss_based_bandwidth_estimation.cc", "modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc", "modules/congestion_controller/goog_cc/probe_bitrate_estimator.cc", "modules/congestion_controller/goog_cc/probe_controller.cc", @@ -621,6 +554,12 @@ cc_library( "modules/congestion_controller/rtp/control_handler.cc", "modules/congestion_controller/rtp/transport_feedback_adapter.cc", "modules/congestion_controller/rtp/transport_feedback_demuxer.cc", + "modules/congestion_controller/scream/delay_based_congestion_control.cc", + "modules/congestion_controller/scream/loss_estimator.cc", + "modules/congestion_controller/scream/scream_feedback.cc", + "modules/congestion_controller/scream/scream_network_controller.cc", + "modules/congestion_controller/scream/scream_v2.cc", + "modules/congestion_controller/scream/scream_v2_parameters.cc", "modules/pacing/bitrate_prober.cc", "modules/pacing/interval_budget.cc", "modules/pacing/pacing_controller.cc", @@ -629,29 +568,35 @@ cc_library( "modules/pacing/task_queue_paced_sender.cc", "modules/remote_bitrate_estimator/aimd_rate_control.cc", "modules/remote_bitrate_estimator/bwe_defines.cc", + "modules/remote_bitrate_estimator/congestion_control_feedback_generator.cc", + "modules/remote_bitrate_estimator/congestion_control_feedback_tracker.cc", "modules/remote_bitrate_estimator/inter_arrival.cc", "modules/remote_bitrate_estimator/overuse_detector.cc", "modules/remote_bitrate_estimator/overuse_estimator.cc", "modules/remote_bitrate_estimator/packet_arrival_map.cc", "modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc", "modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc", - "modules/remote_bitrate_estimator/remote_estimator_proxy.cc", - "modules/remote_bitrate_estimator/test/bwe_test_logging.cc", + "modules/remote_bitrate_estimator/transport_sequence_number_feedback_generator.cc", "modules/rtp_rtcp/include/report_block_data.cc", "modules/rtp_rtcp/include/rtp_rtcp_defines.cc", "modules/rtp_rtcp/source/absolute_capture_time_interpolator.cc", "modules/rtp_rtcp/source/absolute_capture_time_sender.cc", "modules/rtp_rtcp/source/active_decode_targets_helper.cc", "modules/rtp_rtcp/source/capture_clock_offset_updater.cc", + "modules/rtp_rtcp/source/corruption_detection_extension.cc", "modules/rtp_rtcp/source/create_video_rtp_depacketizer.cc", "modules/rtp_rtcp/source/dtmf_queue.cc", "modules/rtp_rtcp/source/fec_private_tables_bursty.cc", "modules/rtp_rtcp/source/fec_private_tables_random.cc", + "modules/rtp_rtcp/source/flexfec_03_header_reader_writer.cc", "modules/rtp_rtcp/source/flexfec_header_reader_writer.cc", "modules/rtp_rtcp/source/flexfec_receiver.cc", "modules/rtp_rtcp/source/flexfec_sender.cc", "modules/rtp_rtcp/source/forward_error_correction.cc", "modules/rtp_rtcp/source/forward_error_correction_internal.cc", + "modules/rtp_rtcp/source/frame_object.cc", + "modules/rtp_rtcp/source/leb128.cc", + "modules/rtp_rtcp/source/ntp_time_util.cc", "modules/rtp_rtcp/source/packet_loss_stats.cc", "modules/rtp_rtcp/source/packet_sequencer.cc", "modules/rtp_rtcp/source/receive_statistics_impl.cc", @@ -662,6 +607,7 @@ cc_library( "modules/rtp_rtcp/source/rtcp_packet/bye.cc", "modules/rtp_rtcp/source/rtcp_packet/common_header.cc", "modules/rtp_rtcp/source/rtcp_packet/compound_packet.cc", + "modules/rtp_rtcp/source/rtcp_packet/congestion_control_feedback.cc", "modules/rtp_rtcp/source/rtcp_packet/dlrr.cc", "modules/rtp_rtcp/source/rtcp_packet/extended_reports.cc", "modules/rtp_rtcp/source/rtcp_packet/fir.cc", @@ -685,6 +631,7 @@ cc_library( "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.cc", "modules/rtp_rtcp/source/rtcp_receiver.cc", "modules/rtp_rtcp/source/rtcp_sender.cc", + "modules/rtp_rtcp/source/rtp_depacketizer_sframe.cc", "modules/rtp_rtcp/source/rtp_dependency_descriptor_extension.cc", "modules/rtp_rtcp/source/rtp_dependency_descriptor_reader.cc", "modules/rtp_rtcp/source/rtp_dependency_descriptor_writer.cc", @@ -704,6 +651,7 @@ cc_library( "modules/rtp_rtcp/source/rtp_packet_received.cc", "modules/rtp_rtcp/source/rtp_packet_to_send.cc", "modules/rtp_rtcp/source/rtp_packetizer_av1.cc", + "modules/rtp_rtcp/source/rtp_packetizer_sframe.cc", "modules/rtp_rtcp/source/rtp_rtcp_impl2.cc", "modules/rtp_rtcp/source/rtp_sender.cc", "modules/rtp_rtcp/source/rtp_sender_audio.cc", @@ -714,8 +662,8 @@ cc_library( "modules/rtp_rtcp/source/rtp_util.cc", "modules/rtp_rtcp/source/rtp_video_header.cc", "modules/rtp_rtcp/source/rtp_video_layers_allocation_extension.cc", + "modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate.cc", "modules/rtp_rtcp/source/source_tracker.cc", - "modules/rtp_rtcp/source/time_util.cc", "modules/rtp_rtcp/source/tmmbr_help.cc", "modules/rtp_rtcp/source/ulpfec_generator.cc", "modules/rtp_rtcp/source/ulpfec_header_reader_writer.cc", @@ -727,11 +675,14 @@ cc_library( "modules/rtp_rtcp/source/video_rtp_depacketizer_raw.cc", "modules/rtp_rtcp/source/video_rtp_depacketizer_vp8.cc", "modules/rtp_rtcp/source/video_rtp_depacketizer_vp9.cc", + "modules/sframe/sframe_context_factory.cc", + "modules/sframe/sframe_decrypt_error_reporter.cc", + "modules/sframe/sframe_decryptor.cc", + "modules/sframe/sframe_encryptor.cc", "modules/third_party/fft/fft.c", "modules/third_party/g711/g711.c", "modules/third_party/g722/g722_decode.c", "modules/third_party/g722/g722_encode.c", - "modules/utility/maybe_worker_thread.cc", "modules/video_capture/device_info_impl.cc", "modules/video_capture/linux/device_info_linux.cc", "modules/video_capture/linux/device_info_v4l2.cc", @@ -739,6 +690,7 @@ cc_library( "modules/video_capture/linux/video_capture_v4l2.cc", "modules/video_capture/video_capture_factory.cc", "modules/video_capture/video_capture_impl.cc", + "modules/video_capture/video_capture_options.cc", "modules/video_coding/chain_diff_calculator.cc", "modules/video_coding/codecs/av1/av1_svc_config.cc", "modules/video_coding/codecs/av1/dav1d_decoder.cc", @@ -747,10 +699,6 @@ cc_library( "modules/video_coding/codecs/h264/h264_decoder_impl.cc", "modules/video_coding/codecs/h264/h264_encoder_impl.cc", "modules/video_coding/codecs/interface/libvpx_interface.cc", - "modules/video_coding/codecs/multiplex/augmented_video_frame_buffer.cc", - "modules/video_coding/codecs/multiplex/multiplex_decoder_adapter.cc", - "modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.cc", - "modules/video_coding/codecs/multiplex/multiplex_encoder_adapter.cc", "modules/video_coding/codecs/vp8/default_temporal_layers.cc", "modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc", "modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc", @@ -767,12 +715,13 @@ cc_library( "modules/video_coding/fec_controller_default.cc", "modules/video_coding/frame_dependencies_calculator.cc", "modules/video_coding/frame_helpers.cc", - "modules/video_coding/frame_object.cc", "modules/video_coding/generic_decoder.cc", "modules/video_coding/h264_sprop_parameter_sets.cc", "modules/video_coding/h264_sps_pps_tracker.cc", + "modules/video_coding/h26x_packet_buffer.cc", "modules/video_coding/histogram.cc", "modules/video_coding/include/video_codec_interface.cc", + "modules/video_coding/include/video_error_codes_utils.cc", "modules/video_coding/loss_notification_controller.cc", "modules/video_coding/media_opt_util.cc", "modules/video_coding/nack_requester.cc", @@ -790,22 +739,22 @@ cc_library( "modules/video_coding/svc/scalability_structure_l2t2_key_shift.cc", "modules/video_coding/svc/scalability_structure_simulcast.cc", "modules/video_coding/svc/scalable_video_controller_no_layering.cc", + "modules/video_coding/svc/simulcast_to_svc_converter.cc", "modules/video_coding/svc/svc_rate_allocator.cc", - "modules/video_coding/timing/codec_timer.cc", - "modules/video_coding/timing/frame_delay_variation_kalman_filter.cc", - "modules/video_coding/timing/inter_frame_delay.cc", - "modules/video_coding/timing/jitter_estimator.cc", - "modules/video_coding/timing/rtt_filter.cc", - "modules/video_coding/timing/timestamp_extrapolator.cc", + "modules/video_coding/timing/decode_time_percentile_filter.cc", "modules/video_coding/timing/timing.cc", "modules/video_coding/utility/bandwidth_quality_scaler.cc", + "modules/video_coding/utility/cbr_layer_rate_tracker.cc", "modules/video_coding/utility/decoded_frames_history.cc", + "modules/video_coding/utility/encoder_speed_controller_impl.cc", "modules/video_coding/utility/frame_dropper.cc", + "modules/video_coding/utility/frame_sampler.cc", "modules/video_coding/utility/framerate_controller_deprecated.cc", "modules/video_coding/utility/ivf_file_reader.cc", "modules/video_coding/utility/ivf_file_writer.cc", "modules/video_coding/utility/qp_parser.cc", "modules/video_coding/utility/quality_scaler.cc", + "modules/video_coding/utility/reference_buffer_tracker.cc", "modules/video_coding/utility/simulcast_rate_allocator.cc", "modules/video_coding/utility/simulcast_utility.cc", "modules/video_coding/utility/vp8_header_parser.cc", @@ -858,6 +807,7 @@ cc_library( "net/dcsctp/packet/parameter/ssn_tsn_reset_request_parameter.cc", "net/dcsctp/packet/parameter/state_cookie_parameter.cc", "net/dcsctp/packet/parameter/supported_extensions_parameter.cc", + "net/dcsctp/packet/parameter/zero_checksum_acceptable_chunk_parameter.cc", "net/dcsctp/packet/sctp_packet.cc", "net/dcsctp/packet/tlv_trait.cc", "net/dcsctp/public/dcsctp_handover_state.cc", @@ -889,8 +839,6 @@ cc_library( "p2p/base/connection.cc", "p2p/base/connection_info.cc", "p2p/base/default_ice_transport_factory.cc", - "p2p/base/dtls_transport.cc", - "p2p/base/dtls_transport_internal.cc", "p2p/base/ice_controller_interface.cc", "p2p/base/ice_credentials_iterator.cc", "p2p/base/ice_switch_reason.cc", @@ -901,8 +849,7 @@ cc_library( "p2p/base/port.cc", "p2p/base/port_allocator.cc", "p2p/base/port_interface.cc", - "p2p/base/pseudo_tcp.cc", - "p2p/base/regathering_controller.cc", + "p2p/base/stun_dictionary.cc", "p2p/base/stun_port.cc", "p2p/base/stun_request.cc", "p2p/base/tcp_port.cc", @@ -912,27 +859,31 @@ cc_library( "p2p/base/wrapping_active_ice_controller.cc", "p2p/client/basic_port_allocator.cc", "p2p/client/turn_port_factory.cc", - "p2p/stunprober/stun_prober.cc", + "p2p/dtls/dtls_stun_piggyback_controller.cc", + "p2p/dtls/dtls_transport.cc", + "p2p/dtls/dtls_transport_internal.cc", + "p2p/dtls/dtls_utils.cc", "pc/audio_rtp_receiver.cc", "pc/audio_track.cc", "pc/channel.cc", + "pc/codec_vendor.cc", "pc/connection_context.cc", "pc/data_channel_controller.cc", "pc/data_channel_utils.cc", "pc/dtls_srtp_transport.cc", "pc/dtls_transport.cc", "pc/dtmf_sender.cc", - "pc/external_hmac.cc", + "pc/encoded_audio_frame_injector.cc", + "pc/encoded_video_frame_injector.cc", "pc/ice_server_parsing.cc", "pc/ice_transport.cc", "pc/jitter_buffer_delay.cc", - "pc/jsep_ice_candidate.cc", - "pc/jsep_session_description.cc", "pc/jsep_transport.cc", "pc/jsep_transport_collection.cc", "pc/jsep_transport_controller.cc", "pc/legacy_stats_collector.cc", "pc/local_audio_source.cc", + "pc/media_options.cc", "pc/media_protocol_names.cc", "pc/media_session.cc", "pc/media_stream.cc", @@ -940,7 +891,6 @@ cc_library( "pc/peer_connection.cc", "pc/peer_connection_factory.cc", "pc/peer_connection_message_handler.cc", - "pc/proxy.cc", "pc/remote_audio_source.cc", "pc/rtc_stats_collector.cc", "pc/rtc_stats_traversal.cc", @@ -952,35 +902,38 @@ cc_library( "pc/rtp_transceiver.cc", "pc/rtp_transmission_manager.cc", "pc/rtp_transport.cc", + "pc/scoped_operations_batcher.cc", "pc/sctp_data_channel.cc", "pc/sctp_transport.cc", "pc/sctp_utils.cc", + "pc/sdp_munging_detector.cc", "pc/sdp_offer_answer.cc", - "pc/sdp_serializer.cc", + "pc/sdp_payload_type_suggester.cc", "pc/sdp_utils.cc", "pc/session_description.cc", "pc/simulcast_description.cc", - "pc/srtp_filter.cc", + "pc/simulcast_sdp_serializer.cc", "pc/srtp_session.cc", "pc/srtp_transport.cc", "pc/track_media_info_map.cc", "pc/transceiver_list.cc", "pc/transport_stats.cc", + "pc/typed_codec_vendor.cc", "pc/usage_pattern.cc", "pc/video_rtp_receiver.cc", "pc/video_rtp_track_source.cc", "pc/video_track.cc", "pc/video_track_source.cc", "pc/video_track_source_proxy.cc", - "pc/webrtc_sdp.cc", "pc/webrtc_session_description_factory.cc", + "rtc_base/async_dns_resolver.cc", "rtc_base/async_packet_socket.cc", - "rtc_base/async_resolver.cc", - "rtc_base/async_resolver_interface.cc", "rtc_base/async_socket.cc", "rtc_base/async_tcp_socket.cc", "rtc_base/async_udp_socket.cc", + "rtc_base/base64.cc", "rtc_base/bit_buffer.cc", + "rtc_base/bitrate_tracker.cc", "rtc_base/bitstream_reader.cc", "rtc_base/boringssl_certificate.cc", "rtc_base/boringssl_identity.cc", @@ -988,36 +941,35 @@ cc_library( "rtc_base/byte_buffer.cc", "rtc_base/callback_list.cc", "rtc_base/checks.cc", + "rtc_base/clock_aligner.cc", "rtc_base/containers/flat_tree.cc", "rtc_base/copy_on_write_buffer.cc", + "rtc_base/cpu_info.cc", "rtc_base/crc32.cc", - "rtc_base/crypt_string.cc", + "rtc_base/crypto_random.cc", "rtc_base/data_rate_limiter.cc", + "rtc_base/denormal_disabler.cc", "rtc_base/deprecated/recursive_critical_section.cc", "rtc_base/event.cc", "rtc_base/event_tracer.cc", "rtc_base/experiments/alr_experiment.cc", "rtc_base/experiments/balanced_degradation_settings.cc", - "rtc_base/experiments/bandwidth_quality_scaler_settings.cc", - "rtc_base/experiments/cpu_speed_experiment.cc", + "rtc_base/experiments/corruption_detection_frame_selector_settings.cc", "rtc_base/experiments/encoder_info_settings.cc", + "rtc_base/experiments/encoder_speed_experiment.cc", "rtc_base/experiments/field_trial_list.cc", "rtc_base/experiments/field_trial_parser.cc", "rtc_base/experiments/field_trial_units.cc", "rtc_base/experiments/keyframe_interval_settings.cc", "rtc_base/experiments/min_video_bitrate_experiment.cc", "rtc_base/experiments/normalize_simulcast_size_experiment.cc", - "rtc_base/experiments/quality_rampup_experiment.cc", "rtc_base/experiments/quality_scaler_settings.cc", "rtc_base/experiments/quality_scaling_experiment.cc", "rtc_base/experiments/rate_control_settings.cc", - "rtc_base/experiments/rtt_mult_experiment.cc", - "rtc_base/experiments/stable_target_rate_experiment.cc", + "rtc_base/experiments/retransmit_flushed_packets_settings.cc", "rtc_base/experiments/struct_parameters_parser.cc", "rtc_base/file_rotating_stream.cc", - "rtc_base/gtest_prod_util.h", - "rtc_base/helpers.cc", - "rtc_base/http_common.cc", + "rtc_base/frequency_tracker.cc", "rtc_base/ifaddrs_converter.cc", "rtc_base/internal/default_socket_server.cc", "rtc_base/ip_address.cc", @@ -1028,6 +980,7 @@ cc_library( "rtc_base/net_helper.cc", "rtc_base/net_helpers.cc", "rtc_base/network.cc", + "rtc_base/network/received_packet.cc", "rtc_base/network/sent_packet.cc", "rtc_base/network_constants.cc", "rtc_base/network_monitor.cc", @@ -1049,14 +1002,15 @@ cc_library( "rtc_base/physical_socket_server.cc", "rtc_base/platform_thread.cc", "rtc_base/platform_thread_types.cc", - "rtc_base/proxy_info.cc", "rtc_base/race_checker.cc", "rtc_base/random.cc", "rtc_base/rate_limiter.cc", "rtc_base/rate_statistics.cc", "rtc_base/rate_tracker.cc", + "rtc_base/ref_counter.cc", "rtc_base/rtc_certificate.cc", "rtc_base/rtc_certificate_generator.cc", + "rtc_base/rtp_to_ntp_estimator.cc", "rtc_base/socket.cc", "rtc_base/socket_adapters.cc", "rtc_base/socket_address.cc", @@ -1070,44 +1024,37 @@ cc_library( "rtc_base/string_encode.cc", "rtc_base/string_to_number.cc", "rtc_base/string_utils.cc", - "rtc_base/strings/audio_format_to_string.cc", "rtc_base/strings/string_builder.cc", "rtc_base/strings/string_format.cc", "rtc_base/synchronization/sequence_checker_internal.cc", "rtc_base/synchronization/yield.cc", "rtc_base/synchronization/yield_policy.cc", "rtc_base/system/file_wrapper.cc", + "rtc_base/system/system_time.cc", "rtc_base/system_time.cc", - "rtc_base/task_queue.cc", - "rtc_base/task_queue_libevent.cc", + "rtc_base/task_queue_stdlib.cc", "rtc_base/task_utils/repeating_task.cc", - "rtc_base/third_party/base64/base64.cc", - "rtc_base/third_party/sigslot/sigslot.cc", + "rtc_base/text2pcap.cc", "rtc_base/thread.cc", "rtc_base/time_utils.cc", "rtc_base/timestamp_aligner.cc", + "rtc_base/trace_categories.cc", "rtc_base/unique_id_generator.cc", "rtc_base/weak_ptr.cc", "rtc_base/zero_memory.cc", - "stats/rtc_stats.cc", - "stats/rtc_stats_report.cc", - "stats/rtcstats_objects.cc", "system_wrappers/source/clock.cc", - "system_wrappers/source/cpu_features.cc", - "system_wrappers/source/cpu_features_linux.cc", - "system_wrappers/source/cpu_info.cc", - "system_wrappers/source/denormal_disabler.cc", - "system_wrappers/source/field_trial.cc", "system_wrappers/source/metrics.cc", - "system_wrappers/source/rtp_to_ntp_estimator.cc", - "system_wrappers/source/sleep.cc", + "test/configurable_frame_size_encoder.cc", + "test/fake_decoder.cc", + "test/fake_encoder.cc", + "test/fake_vp8_decoder.cc", + "test/fake_vp8_encoder.cc", "video/adaptation/balanced_constraint.cc", "video/adaptation/bandwidth_quality_scaler_resource.cc", "video/adaptation/bitrate_constraint.cc", "video/adaptation/encode_usage_resource.cc", "video/adaptation/overuse_frame_detector.cc", "video/adaptation/pixel_limit_resource.cc", - "video/adaptation/quality_rampup_experiment_helper.cc", "video/adaptation/quality_scaler_resource.cc", "video/adaptation/video_stream_encoder_resource.cc", "video/adaptation/video_stream_encoder_resource_manager.cc", @@ -1117,6 +1064,14 @@ cc_library( "video/config/encoder_stream_factory.cc", "video/config/simulcast.cc", "video/config/video_encoder_config.cc", + "video/corruption_detection/corruption_classifier.cc", + "video/corruption_detection/frame_instrumentation_generator_impl.cc", + "video/corruption_detection/frame_selector.cc", + "video/corruption_detection/generic_mapping_functions.cc", + "video/corruption_detection/halton_frame_sampler.cc", + "video/corruption_detection/halton_sequence.cc", + "video/corruption_detection/utils.cc", + "video/corruption_detection/video_frame_sampler.cc", "video/decode_synchronizer.cc", "video/encoder_bitrate_adjuster.cc", "video/encoder_overshoot_detector.cc", @@ -1124,27 +1079,35 @@ cc_library( "video/frame_cadence_adapter.cc", "video/frame_decode_timing.cc", "video/frame_dumping_decoder.cc", + "video/frame_dumping_encoder.cc", "video/frame_encode_metadata_writer.cc", + "video/null_video_decoder.cc", + "video/quality_convergence_controller.cc", + "video/quality_convergence_monitor.cc", "video/quality_limitation_reason_tracker.cc", - "video/quality_threshold.cc", - "video/receive_statistics_proxy2.cc", + "video/rate_utilization_tracker.cc", + "video/receive_statistics_proxy.cc", "video/render/incoming_video_stream.cc", "video/render/video_render_frames.cc", "video/report_block_stats.cc", "video/rtp_streams_synchronizer2.cc", "video/rtp_video_stream_receiver2.cc", - "video/rtp_video_stream_receiver_frame_transformer_delegate.cc", "video/send_delay_stats.cc", "video/send_statistics_proxy.cc", "video/stats_counter.cc", "video/stream_synchronization.cc", "video/task_queue_frame_decode_scheduler.cc", + "video/timing/default_video_jitter_timing.cc", + "video/timing/frame_delay_variation_kalman_filter.cc", + "video/timing/inter_frame_delay_variation_calculator.cc", + "video/timing/jitter_estimator.cc", + "video/timing/rtt_filter.cc", + "video/timing/timestamp_extrapolator.cc", "video/transport_adapter.cc", "video/unique_timestamp_counter.cc", "video/video_quality_observer2.cc", "video/video_receive_stream2.cc", "video/video_receive_stream_timeout_tracker.cc", - "video/video_send_stream.cc", "video/video_send_stream_impl.cc", "video/video_source_sink_controller.cc", "video/video_stream_buffer_controller.cc", @@ -1154,35 +1117,31 @@ cc_library( "@platforms//cpu:arm": [ "common_audio/fir_filter_neon.cc", "common_audio/resampler/sinc_resampler_neon.cc", - "common_audio/signal_processing/complex_bit_reverse_arm.S", "common_audio/signal_processing/cross_correlation_neon.c", "common_audio/signal_processing/downsample_fast_neon.c", "common_audio/signal_processing/filter_ar_fast_q12_armv7.S", "common_audio/signal_processing/min_max_operations_neon.c", "common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc", "common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_arm.S", - "modules/audio_processing/aecm/aecm_core_neon.cc", ], "@platforms//cpu:arm64": [ "common_audio/fir_filter_neon.cc", "common_audio/resampler/sinc_resampler_neon.cc", - "common_audio/signal_processing/complex_bit_reverse.c", "common_audio/signal_processing/cross_correlation_neon.c", "common_audio/signal_processing/downsample_fast_neon.c", "common_audio/signal_processing/filter_ar_fast_q12.c", "common_audio/signal_processing/min_max_operations_neon.c", "common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc", "common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c", - "modules/audio_processing/aecm/aecm_core_neon.cc", ], "@platforms//cpu:x86_32": [ "common_audio/fir_filter_avx2.cc", "common_audio/fir_filter_sse.cc", "common_audio/resampler/sinc_resampler_avx2.cc", "common_audio/resampler/sinc_resampler_sse.cc", - "common_audio/signal_processing/complex_bit_reverse.c", "common_audio/signal_processing/filter_ar_fast_q12.c", "common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc", + "common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c", "modules/audio_processing/aec3/adaptive_fir_filter_avx2.cc", "modules/audio_processing/aec3/adaptive_fir_filter_erl_avx2.cc", "modules/audio_processing/aec3/fft_data_avx2.cc", @@ -1195,7 +1154,6 @@ cc_library( "common_audio/fir_filter_sse.cc", "common_audio/resampler/sinc_resampler_avx2.cc", "common_audio/resampler/sinc_resampler_sse.cc", - "common_audio/signal_processing/complex_bit_reverse.c", "common_audio/signal_processing/filter_ar_fast_q12.c", "common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc", "common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c", @@ -1207,7 +1165,6 @@ cc_library( "modules/audio_processing/agc2/rnn_vad/vector_math_avx2.cc", ], "@platforms//cpu:riscv64": [ - "common_audio/signal_processing/complex_bit_reverse.c", "common_audio/signal_processing/filter_ar_fast_q12.c", "common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c", ], @@ -1217,16 +1174,22 @@ cc_library( "api/adaptation/resource.h", "api/array_view.h", "api/async_dns_resolver.h", - "api/async_resolver_factory.h", + "api/audio/audio_device.h", + "api/audio/audio_device_defines.h", "api/audio/audio_frame.h", "api/audio/audio_frame_processor.h", "api/audio/audio_mixer.h", + "api/audio/audio_processing.h", + "api/audio/audio_processing_statistics.h", + "api/audio/audio_view.h", + "api/audio/builtin_audio_processing_builder.h", "api/audio/channel_layout.h", + "api/audio/create_audio_device_module.h", "api/audio/echo_canceller3_config.h", - "api/audio/echo_canceller3_config_json.h", "api/audio/echo_canceller3_factory.h", "api/audio/echo_control.h", "api/audio/echo_detector_creator.h", + "api/audio/neural_residual_echo_estimator.h", "api/audio_codecs/L16/audio_decoder_L16.h", "api/audio_codecs/L16/audio_encoder_L16.h", "api/audio_codecs/audio_codec_pair_id.h", @@ -1244,12 +1207,10 @@ cc_library( "api/audio_codecs/g722/audio_decoder_g722.h", "api/audio_codecs/g722/audio_encoder_g722.h", "api/audio_codecs/g722/audio_encoder_g722_config.h", - "api/audio_codecs/ilbc/audio_decoder_ilbc.h", - "api/audio_codecs/ilbc/audio_encoder_ilbc.h", - "api/audio_codecs/ilbc/audio_encoder_ilbc_config.h", "api/audio_codecs/opus/audio_decoder_multi_channel_opus.h", "api/audio_codecs/opus/audio_decoder_multi_channel_opus_config.h", "api/audio_codecs/opus/audio_decoder_opus.h", + "api/audio_codecs/opus/audio_decoder_opus_config.h", "api/audio_codecs/opus/audio_encoder_multi_channel_opus.h", "api/audio_codecs/opus/audio_encoder_multi_channel_opus_config.h", "api/audio_codecs/opus/audio_encoder_opus.h", @@ -1259,17 +1220,24 @@ cc_library( "api/audio_options.h", "api/call/audio_sink.h", "api/call/bitrate_allocation.h", - "api/call/call_factory_interface.h", "api/call/transport.h", "api/candidate.h", + "api/create_modular_peer_connection_factory.h", "api/create_peerconnection_factory.h", "api/crypto/crypto_options.h", "api/crypto/frame_decryptor_interface.h", "api/crypto/frame_encryptor_interface.h", - "api/crypto_params.h", + "api/data_channel_event_observer_interface.h", "api/data_channel_interface.h", "api/dtls_transport_interface.h", "api/dtmf_sender_interface.h", + "api/enable_media.h", + "api/encoded_audio_frame_injector_interface.h", + "api/encoded_video_frame_injector_interface.h", + "api/environment/deprecated_global_field_trials.h", + "api/environment/environment.h", + "api/environment/environment_factory.h", + "api/environment/force_test_environment.h", "api/fec_controller.h", "api/fec_controller_override.h", "api/field_trials.h", @@ -1282,8 +1250,9 @@ cc_library( "api/ice_transport_interface.h", "api/jsep.h", "api/jsep_ice_candidate.h", - "api/jsep_session_description.h", "api/legacy_stats_types.h", + "api/local_network_access_permission.h", + "api/location.h", "api/make_ref_counted.h", "api/media_stream_interface.h", "api/media_stream_track.h", @@ -1291,6 +1260,9 @@ cc_library( "api/metronome/metronome.h", "api/neteq/custom_neteq_factory.h", "api/neteq/default_neteq_controller_factory.h", + "api/neteq/default_neteq_factory.h", + "api/neteq/delay_manager_factory.h", + "api/neteq/delay_manager_interface.h", "api/neteq/neteq.h", "api/neteq/neteq_controller.h", "api/neteq/neteq_controller_factory.h", @@ -1300,8 +1272,11 @@ cc_library( "api/notifier.h", "api/numerics/samples_stats_counter.h", "api/packet_socket_factory.h", + "api/payload_type.h", "api/peer_connection_interface.h", + "api/peer_connection_tracer_interface.h", "api/priority.h", + "api/ref_count.h", "api/ref_counted_base.h", "api/rtc_error.h", "api/rtc_event_log/rtc_event.h", @@ -1310,19 +1285,26 @@ cc_library( "api/rtc_event_log/rtc_event_log_factory_interface.h", "api/rtc_event_log_output.h", "api/rtc_event_log_output_file.h", + "api/rtp_header_extension_id.h", "api/rtp_headers.h", "api/rtp_packet_info.h", "api/rtp_packet_infos.h", + "api/rtp_packet_sender.h", "api/rtp_parameters.h", "api/rtp_receiver_interface.h", "api/rtp_sender_interface.h", "api/rtp_transceiver_direction.h", "api/rtp_transceiver_interface.h", + "api/rtp_transport_factory.h", "api/scoped_refptr.h", "api/sctp_transport_interface.h", "api/sequence_checker.h", "api/set_local_description_observer_interface.h", "api/set_remote_description_observer_interface.h", + "api/sframe/sframe_decryptor_interface.h", + "api/sframe/sframe_encryptor_interface.h", + "api/sframe/sframe_types.h", + "api/stats/attribute.h", "api/stats/rtc_stats.h", "api/stats/rtc_stats_collector_callback.h", "api/stats/rtc_stats_report.h", @@ -1332,13 +1314,16 @@ cc_library( "api/task_queue/task_queue_base.h", "api/task_queue/task_queue_factory.h", "api/test/simulated_network.h", + "api/transport/bandwidth_estimation_settings.h", + "api/transport/bandwidth_usage.h", "api/transport/bitrate_settings.h", "api/transport/data_channel_transport_interface.h", + "api/transport/ecn_marking.h", "api/transport/enums.h", - "api/transport/field_trial_based_config.h", "api/transport/goog_cc_factory.h", "api/transport/network_control.h", "api/transport/network_types.h", + "api/transport/rtp/corruption_detection_message.h", "api/transport/rtp/dependency_descriptor.h", "api/transport/rtp/rtp_source.h", "api/transport/sctp_transport_factory_interface.h", @@ -1352,12 +1337,20 @@ cc_library( "api/units/timestamp.h", "api/video/builtin_video_bitrate_allocator_factory.h", "api/video/color_space.h", + "api/video/corruption_detection/corruption_detection_filter_settings.h", + "api/video/corruption_detection/corruption_detection_settings_generator.h", + "api/video/corruption_detection/frame_instrumentation_data.h", + "api/video/corruption_detection/frame_instrumentation_data_reader.h", + "api/video/corruption_detection/frame_instrumentation_evaluation.h", + "api/video/corruption_detection/frame_instrumentation_generator.h", + "api/video/corruption_detection/frame_instrumentation_generator_factory.h", "api/video/encoded_frame.h", "api/video/encoded_image.h", "api/video/frame_buffer.h", "api/video/hdr_metadata.h", "api/video/i010_buffer.h", "api/video/i210_buffer.h", + "api/video/i410_buffer.h", "api/video/i420_buffer.h", "api/video/i422_buffer.h", "api/video/i444_buffer.h", @@ -1366,13 +1359,18 @@ cc_library( "api/video/render_resolution.h", "api/video/resolution.h", "api/video/rtp_video_frame_assembler.h", + "api/video/timing/video_jitter_timing_factory.h", + "api/video/timing/video_jitter_timing_interface.h", "api/video/video_adaptation_counters.h", "api/video/video_adaptation_reason.h", + "api/video/video_adapter.h", "api/video/video_bitrate_allocation.h", "api/video/video_bitrate_allocator.h", "api/video/video_bitrate_allocator_factory.h", + "api/video/video_broadcaster.h", "api/video/video_codec_constants.h", "api/video/video_codec_type.h", + "api/video/video_common.h", "api/video/video_content_type.h", "api/video/video_frame.h", "api/video/video_frame_buffer.h", @@ -1382,14 +1380,13 @@ cc_library( "api/video/video_rotation.h", "api/video/video_sink_interface.h", "api/video/video_source_interface.h", - "api/video/video_stream_decoder.h", - "api/video/video_stream_decoder_create.h", "api/video/video_stream_encoder_settings.h", "api/video/video_timing.h", "api/video_codecs/av1_profile.h", "api/video_codecs/bitstream_parser.h", "api/video_codecs/builtin_video_decoder_factory.h", "api/video_codecs/builtin_video_encoder_factory.h", + "api/video_codecs/encoder_speed_controller.h", "api/video_codecs/h264_profile_level_id.h", "api/video_codecs/scalability_mode.h", "api/video_codecs/scalability_mode_helper.h", @@ -1412,6 +1409,7 @@ cc_library( "api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter.h", "api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter.h", "api/video_codecs/video_encoder_factory_template_open_h264_adapter.h", + "api/video_codecs/video_encoder_interface.h", "api/video_codecs/video_encoder_software_fallback_wrapper.h", "api/video_codecs/vp8_frame_buffer_controller.h", "api/video_codecs/vp8_frame_config.h", @@ -1428,8 +1426,7 @@ cc_library( "api/voip/voip_network.h", "api/voip/voip_statistics.h", "api/voip/voip_volume_control.h", - "api/webrtc_key_value_config.h", - "api/wrapping_async_dns_resolver.h", + "api/webrtc_sdp.h", "audio/audio_level.h", "audio/audio_receive_stream.h", "audio/audio_send_stream.h", @@ -1441,6 +1438,7 @@ cc_library( "audio/channel_send_frame_transformer_delegate.h", "audio/conversion.h", "audio/mock_voe_channel_proxy.h", + "audio/nack_tracker.h", "audio/remix_resample.h", "audio/utility/audio_frame_operations.h", "audio/utility/channel_mixer.h", @@ -1466,13 +1464,13 @@ cc_library( "call/bitrate_allocator.h", "call/call.h", "call/call_config.h", - "call/call_factory.h", - "call/degraded_call.h", + "call/fake_network_pipe.h", "call/flexfec_receive_stream.h", "call/flexfec_receive_stream_impl.h", "call/packet_receiver.h", + "call/payload_type.h", + "call/payload_type_picker.h", "call/receive_stream.h", - "call/receive_time_calculator.h", "call/rtp_bitrate_configurator.h", "call/rtp_config.h", "call/rtp_demuxer.h", @@ -1482,12 +1480,11 @@ cc_library( "call/rtp_stream_receiver_controller_interface.h", "call/rtp_transport_config.h", "call/rtp_transport_controller_send.h", - "call/rtp_transport_controller_send_factory.h", - "call/rtp_transport_controller_send_factory_interface.h", "call/rtp_transport_controller_send_interface.h", "call/rtp_video_sender.h", "call/rtp_video_sender_interface.h", "call/rtx_receive_stream.h", + "call/sframe_options.h", "call/simulated_network.h", "call/simulated_packet_receiver.h", "call/syncable.h", @@ -1497,10 +1494,8 @@ cc_library( "common_audio/audio_converter.h", "common_audio/channel_buffer.h", "common_audio/fir_filter.h", - "common_audio/fir_filter_avx2.h", "common_audio/fir_filter_c.h", "common_audio/fir_filter_factory.h", - "common_audio/fir_filter_sse.h", "common_audio/include/audio_util.h", "common_audio/mocks/mock_smoothing_filter.h", "common_audio/real_fourier.h", @@ -1511,9 +1506,7 @@ cc_library( "common_audio/resampler/sinc_resampler.h", "common_audio/resampler/sinusoidal_linear_chirp_source.h", "common_audio/ring_buffer.h", - "common_audio/signal_processing/complex_fft_tables.h", "common_audio/signal_processing/dot_product_with_scale.h", - "common_audio/signal_processing/include/real_fft.h", "common_audio/signal_processing/include/signal_processing_library.h", "common_audio/signal_processing/include/spl_inl.h", "common_audio/signal_processing/include/spl_inl_mips.h", @@ -1543,6 +1536,7 @@ cc_library( "common_video/h264/sps_parser.h", "common_video/h264/sps_vui_rewriter.h", "common_video/include/bitrate_adjuster.h", + "common_video/include/corruption_score_calculator.h", "common_video/include/quality_limitation_reason.h", "common_video/include/video_frame_buffer.h", "common_video/include/video_frame_buffer_pool.h", @@ -1552,7 +1546,6 @@ cc_library( "logging/rtc_event_log/encoder/delta_encoding.h", "logging/rtc_event_log/encoder/rtc_event_log_encoder.h", "logging/rtc_event_log/encoder/rtc_event_log_encoder_common.h", - "logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.h", "logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.h", "logging/rtc_event_log/encoder/rtc_event_log_encoder_v3.h", "logging/rtc_event_log/encoder/var_int.h", @@ -1566,6 +1559,7 @@ cc_library( "logging/rtc_event_log/events/rtc_event_begin_log.h", "logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h", "logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h", + "logging/rtc_event_log/events/rtc_event_bwe_update_scream.h", "logging/rtc_event_log/events/rtc_event_definition.h", "logging/rtc_event_log/events/rtc_event_dtls_transport_state.h", "logging/rtc_event_log/events/rtc_event_dtls_writable_state.h", @@ -1574,11 +1568,10 @@ cc_library( "logging/rtc_event_log/events/rtc_event_field_encoding_parser.h", "logging/rtc_event_log/events/rtc_event_field_extraction.h", "logging/rtc_event_log/events/rtc_event_frame_decoded.h", - "logging/rtc_event_log/events/rtc_event_generic_ack_received.h", - "logging/rtc_event_log/events/rtc_event_generic_packet_received.h", - "logging/rtc_event_log/events/rtc_event_generic_packet_sent.h", "logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h", "logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h", + "logging/rtc_event_log/events/rtc_event_log_parse_status.h", + "logging/rtc_event_log/events/rtc_event_neteq_set_minimum_delay.h", "logging/rtc_event_log/events/rtc_event_probe_cluster_created.h", "logging/rtc_event_log/events/rtc_event_probe_result_failure.h", "logging/rtc_event_log/events/rtc_event_probe_result_success.h", @@ -1591,18 +1584,17 @@ cc_library( "logging/rtc_event_log/events/rtc_event_video_receive_stream_config.h", "logging/rtc_event_log/events/rtc_event_video_send_stream_config.h", "logging/rtc_event_log/ice_logger.h", - "logging/rtc_event_log/logged_events.h", "logging/rtc_event_log/mock/mock_rtc_event_log.h", - "logging/rtc_event_log/output/rtc_event_log_output_file.h", "logging/rtc_event_log/rtc_event_log_impl.h", "logging/rtc_event_log/rtc_event_log_parser.h", "logging/rtc_event_log/rtc_event_processor.h", "logging/rtc_event_log/rtc_stream_config.h", - "media/base/adapted_video_track_source.h", "media/base/audio_source.h", "media/base/codec.h", - "media/base/delayable.h", + "media/base/codec_comparators.h", + "media/base/codec_list.h", "media/base/media_channel.h", + "media/base/media_channel_impl.h", "media/base/media_config.h", "media/base/media_constants.h", "media/base/media_engine.h", @@ -1611,28 +1603,18 @@ cc_library( "media/base/sdp_video_format_utils.h", "media/base/stream_params.h", "media/base/turn_utils.h", - "media/base/video_adapter.h", - "media/base/video_broadcaster.h", - "media/base/video_common.h", - "media/base/video_source_base.h", "media/engine/adm_helpers.h", - "media/engine/encoder_simulcast_proxy.h", + "media/engine/fake_video_codec_factory.h", "media/engine/internal_decoder_factory.h", "media/engine/internal_encoder_factory.h", - "media/engine/multiplex_codec_factory.h", - "media/engine/null_webrtc_video_engine.h", - "media/engine/payload_type_mapper.h", "media/engine/simulcast_encoder_adapter.h", - "media/engine/unhandled_packets_buffer.h", "media/engine/webrtc_media_engine.h", - "media/engine/webrtc_media_engine_defaults.h", "media/engine/webrtc_video_engine.h", "media/engine/webrtc_voice_engine.h", "media/sctp/dcsctp_transport.h", "media/sctp/sctp_transport_factory.h", "media/sctp/sctp_transport_internal.h", "modules/async_audio_processing/async_audio_processing.h", - "modules/audio_coding/acm2/acm_receiver.h", "modules/audio_coding/acm2/acm_remixing.h", "modules/audio_coding/acm2/acm_resampler.h", "modules/audio_coding/acm2/call_statistics.h", @@ -1664,78 +1646,6 @@ cc_library( "modules/audio_coding/codecs/g722/audio_decoder_g722.h", "modules/audio_coding/codecs/g722/audio_encoder_g722.h", "modules/audio_coding/codecs/g722/g722_interface.h", - "modules/audio_coding/codecs/ilbc/abs_quant.h", - "modules/audio_coding/codecs/ilbc/abs_quant_loop.h", - "modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h", - "modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h", - "modules/audio_coding/codecs/ilbc/augmented_cb_corr.h", - "modules/audio_coding/codecs/ilbc/bw_expand.h", - "modules/audio_coding/codecs/ilbc/cb_construct.h", - "modules/audio_coding/codecs/ilbc/cb_mem_energy.h", - "modules/audio_coding/codecs/ilbc/cb_mem_energy_augmentation.h", - "modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.h", - "modules/audio_coding/codecs/ilbc/cb_search.h", - "modules/audio_coding/codecs/ilbc/cb_search_core.h", - "modules/audio_coding/codecs/ilbc/cb_update_best_index.h", - "modules/audio_coding/codecs/ilbc/chebyshev.h", - "modules/audio_coding/codecs/ilbc/comp_corr.h", - "modules/audio_coding/codecs/ilbc/constants.h", - "modules/audio_coding/codecs/ilbc/create_augmented_vec.h", - "modules/audio_coding/codecs/ilbc/decode.h", - "modules/audio_coding/codecs/ilbc/decode_residual.h", - "modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.h", - "modules/audio_coding/codecs/ilbc/defines.h", - "modules/audio_coding/codecs/ilbc/do_plc.h", - "modules/audio_coding/codecs/ilbc/encode.h", - "modules/audio_coding/codecs/ilbc/energy_inverse.h", - "modules/audio_coding/codecs/ilbc/enh_upsample.h", - "modules/audio_coding/codecs/ilbc/enhancer.h", - "modules/audio_coding/codecs/ilbc/enhancer_interface.h", - "modules/audio_coding/codecs/ilbc/filtered_cb_vecs.h", - "modules/audio_coding/codecs/ilbc/frame_classify.h", - "modules/audio_coding/codecs/ilbc/gain_dequant.h", - "modules/audio_coding/codecs/ilbc/gain_quant.h", - "modules/audio_coding/codecs/ilbc/get_cd_vec.h", - "modules/audio_coding/codecs/ilbc/get_lsp_poly.h", - "modules/audio_coding/codecs/ilbc/get_sync_seq.h", - "modules/audio_coding/codecs/ilbc/hp_input.h", - "modules/audio_coding/codecs/ilbc/hp_output.h", - "modules/audio_coding/codecs/ilbc/ilbc.h", - "modules/audio_coding/codecs/ilbc/index_conv_dec.h", - "modules/audio_coding/codecs/ilbc/index_conv_enc.h", - "modules/audio_coding/codecs/ilbc/init_decode.h", - "modules/audio_coding/codecs/ilbc/init_encode.h", - "modules/audio_coding/codecs/ilbc/interpolate.h", - "modules/audio_coding/codecs/ilbc/interpolate_samples.h", - "modules/audio_coding/codecs/ilbc/lpc_encode.h", - "modules/audio_coding/codecs/ilbc/lsf_check.h", - "modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.h", - "modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.h", - "modules/audio_coding/codecs/ilbc/lsf_to_lsp.h", - "modules/audio_coding/codecs/ilbc/lsf_to_poly.h", - "modules/audio_coding/codecs/ilbc/lsp_to_lsf.h", - "modules/audio_coding/codecs/ilbc/my_corr.h", - "modules/audio_coding/codecs/ilbc/nearest_neighbor.h", - "modules/audio_coding/codecs/ilbc/pack_bits.h", - "modules/audio_coding/codecs/ilbc/poly_to_lsf.h", - "modules/audio_coding/codecs/ilbc/poly_to_lsp.h", - "modules/audio_coding/codecs/ilbc/refiner.h", - "modules/audio_coding/codecs/ilbc/simple_interpolate_lsf.h", - "modules/audio_coding/codecs/ilbc/simple_lpc_analysis.h", - "modules/audio_coding/codecs/ilbc/simple_lsf_dequant.h", - "modules/audio_coding/codecs/ilbc/simple_lsf_quant.h", - "modules/audio_coding/codecs/ilbc/smooth.h", - "modules/audio_coding/codecs/ilbc/smooth_out_data.h", - "modules/audio_coding/codecs/ilbc/sort_sq.h", - "modules/audio_coding/codecs/ilbc/split_vq.h", - "modules/audio_coding/codecs/ilbc/state_construct.h", - "modules/audio_coding/codecs/ilbc/state_search.h", - "modules/audio_coding/codecs/ilbc/swap_bytes.h", - "modules/audio_coding/codecs/ilbc/unpack_bits.h", - "modules/audio_coding/codecs/ilbc/vq3.h", - "modules/audio_coding/codecs/ilbc/vq4.h", - "modules/audio_coding/codecs/ilbc/window32_w32.h", - "modules/audio_coding/codecs/ilbc/xcorr_coef.h", "modules/audio_coding/codecs/isac/bandwidth_info.h", "modules/audio_coding/codecs/isac/main/source/filter_functions.h", "modules/audio_coding/codecs/isac/main/source/isac_vad.h", @@ -1768,7 +1678,7 @@ cc_library( "modules/audio_coding/neteq/cross_correlation.h", "modules/audio_coding/neteq/decision_logic.h", "modules/audio_coding/neteq/decoder_database.h", - "modules/audio_coding/neteq/default_neteq_factory.h", + "modules/audio_coding/neteq/delay_constraints.h", "modules/audio_coding/neteq/delay_manager.h", "modules/audio_coding/neteq/dsp_helper.h", "modules/audio_coding/neteq/dtmf_buffer.h", @@ -1788,13 +1698,11 @@ cc_library( "modules/audio_coding/neteq/mock/mock_packet_buffer.h", "modules/audio_coding/neteq/mock/mock_red_payload_splitter.h", "modules/audio_coding/neteq/mock/mock_statistics_calculator.h", - "modules/audio_coding/neteq/nack_tracker.h", "modules/audio_coding/neteq/neteq_impl.h", "modules/audio_coding/neteq/normal.h", "modules/audio_coding/neteq/packet.h", "modules/audio_coding/neteq/packet_arrival_history.h", "modules/audio_coding/neteq/packet_buffer.h", - "modules/audio_coding/neteq/post_decode_vad.h", "modules/audio_coding/neteq/preemptive_expand.h", "modules/audio_coding/neteq/random_vector.h", "modules/audio_coding/neteq/red_payload_splitter.h", @@ -1813,34 +1721,17 @@ cc_library( "modules/audio_coding/neteq/tools/neteq_delay_analyzer.h", "modules/audio_coding/neteq/tools/neteq_event_log_input.h", "modules/audio_coding/neteq/tools/neteq_input.h", - "modules/audio_coding/neteq/tools/neteq_packet_source_input.h", "modules/audio_coding/neteq/tools/neteq_replacement_input.h", "modules/audio_coding/neteq/tools/neteq_stats_getter.h", "modules/audio_coding/neteq/tools/neteq_stats_plotter.h", "modules/audio_coding/neteq/tools/output_audio_file.h", "modules/audio_coding/neteq/tools/output_wav_file.h", - "modules/audio_coding/neteq/tools/packet.h", "modules/audio_coding/neteq/tools/packet_source.h", "modules/audio_coding/neteq/tools/resample_input_audio_file.h", - "modules/audio_coding/neteq/tools/rtc_event_log_source.h", "modules/audio_coding/neteq/tools/rtp_file_source.h", "modules/audio_coding/neteq/tools/rtp_generator.h", "modules/audio_coding/neteq/underrun_optimizer.h", - "modules/audio_device/android/aaudio_player.h", - "modules/audio_device/android/aaudio_recorder.h", - "modules/audio_device/android/aaudio_wrapper.h", - "modules/audio_device/android/audio_common.h", - "modules/audio_device/android/audio_device_template.h", - "modules/audio_device/android/audio_manager.h", - "modules/audio_device/android/audio_record_jni.h", - "modules/audio_device/android/audio_track_jni.h", - "modules/audio_device/android/build_info.h", - "modules/audio_device/android/ensure_initialized.h", - "modules/audio_device/android/opensles_common.h", - "modules/audio_device/android/opensles_player.h", - "modules/audio_device/android/opensles_recorder.h", "modules/audio_device/audio_device_buffer.h", - "modules/audio_device/audio_device_config.h", "modules/audio_device/audio_device_generic.h", "modules/audio_device/audio_device_impl.h", "modules/audio_device/audio_device_name.h", @@ -1853,6 +1744,7 @@ cc_library( "modules/audio_device/include/audio_device_default.h", "modules/audio_device/include/audio_device_defines.h", "modules/audio_device/include/audio_device_factory.h", + "modules/audio_device/include/fake_audio_device.h", "modules/audio_device/include/mock_audio_device.h", "modules/audio_device/include/mock_audio_transport.h", "modules/audio_device/include/test_audio_device.h", @@ -1866,6 +1758,7 @@ cc_library( "modules/audio_device/mac/audio_device_mac.h", "modules/audio_device/mac/audio_mixer_manager_mac.h", "modules/audio_device/mock_audio_device_buffer.h", + "modules/audio_device/test_audio_device_impl.h", "modules/audio_mixer/audio_frame_manipulator.h", "modules/audio_mixer/audio_mixer_impl.h", "modules/audio_mixer/default_output_rate_calculator.h", @@ -1913,7 +1806,7 @@ cc_library( "modules/audio_processing/aec3/mock/mock_echo_remover.h", "modules/audio_processing/aec3/mock/mock_render_delay_buffer.h", "modules/audio_processing/aec3/mock/mock_render_delay_controller.h", - "modules/audio_processing/aec3/moving_average.h", + "modules/audio_processing/aec3/moving_average_spectrum.h", "modules/audio_processing/aec3/multi_channel_content_detector.h", "modules/audio_processing/aec3/nearend_detector.h", "modules/audio_processing/aec3/refined_filter_update_gain.h", @@ -1943,9 +1836,6 @@ cc_library( "modules/audio_processing/aec_dump/aec_dump_impl.h", "modules/audio_processing/aec_dump/capture_stream_info.h", "modules/audio_processing/aec_dump/mock_aec_dump.h", - "modules/audio_processing/aecm/aecm_core.h", - "modules/audio_processing/aecm/aecm_defines.h", - "modules/audio_processing/aecm/echo_control_mobile.h", "modules/audio_processing/agc/agc.h", "modules/audio_processing/agc/agc_manager_direct.h", "modules/audio_processing/agc/gain_control.h", @@ -1955,7 +1845,6 @@ cc_library( "modules/audio_processing/agc/loudness_histogram.h", "modules/audio_processing/agc/mock_agc.h", "modules/audio_processing/agc/utility.h", - "modules/audio_processing/agc2/adaptive_digital_gain_applier.h", "modules/audio_processing/agc2/adaptive_digital_gain_controller.h", "modules/audio_processing/agc2/agc2_common.h", "modules/audio_processing/agc2/agc2_testing_common.h", @@ -1991,6 +1880,8 @@ cc_library( "modules/audio_processing/agc2/saturation_protector.h", "modules/audio_processing/agc2/saturation_protector_buffer.h", "modules/audio_processing/agc2/speech_level_estimator.h", + "modules/audio_processing/agc2/speech_level_estimator_experimental_impl.h", + "modules/audio_processing/agc2/speech_level_estimator_impl.h", "modules/audio_processing/agc2/speech_probability_buffer.h", "modules/audio_processing/agc2/vad_wrapper.h", "modules/audio_processing/agc2/vector_float_frame.h", @@ -1998,7 +1889,13 @@ cc_library( "modules/audio_processing/audio_processing_impl.h", "modules/audio_processing/capture_levels_adjuster/audio_samples_scaler.h", "modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster.h", - "modules/audio_processing/echo_control_mobile_impl.h", + "modules/audio_processing/capture_mixer/audio_content_analyzer.h", + "modules/audio_processing/capture_mixer/capture_mixer.h", + "modules/audio_processing/capture_mixer/channel_content_remixer.h", + "modules/audio_processing/capture_mixer/dc_levels_estimator.h", + "modules/audio_processing/capture_mixer/energy_estimator.h", + "modules/audio_processing/capture_mixer/remixing_logic.h", + "modules/audio_processing/capture_mixer/saturation_estimator.h", "modules/audio_processing/echo_detector/circular_buffer.h", "modules/audio_processing/echo_detector/mean_variance_estimator.h", "modules/audio_processing/echo_detector/moving_max.h", @@ -2028,28 +1925,13 @@ cc_library( "modules/audio_processing/ns/speech_probability_estimator.h", "modules/audio_processing/ns/suppression_params.h", "modules/audio_processing/ns/wiener_filter.h", - "modules/audio_processing/optionally_built_submodule_creators.h", + "modules/audio_processing/post_filter.h", "modules/audio_processing/render_queue_item_verifier.h", "modules/audio_processing/residual_echo_detector.h", "modules/audio_processing/rms_level.h", "modules/audio_processing/splitting_filter.h", "modules/audio_processing/three_band_filter_bank.h", - "modules/audio_processing/transient/common.h", - "modules/audio_processing/transient/daubechies_8_wavelet_coeffs.h", - "modules/audio_processing/transient/dyadic_decimator.h", - "modules/audio_processing/transient/file_utils.h", - "modules/audio_processing/transient/moving_moments.h", - "modules/audio_processing/transient/transient_detector.h", - "modules/audio_processing/transient/transient_suppressor.h", - "modules/audio_processing/transient/transient_suppressor_impl.h", - "modules/audio_processing/transient/voice_probability_delay_unit.h", - "modules/audio_processing/transient/windows_private.h", - "modules/audio_processing/transient/wpd_node.h", - "modules/audio_processing/transient/wpd_tree.h", "modules/audio_processing/utility/cascaded_biquad_filter.h", - "modules/audio_processing/utility/delay_estimator.h", - "modules/audio_processing/utility/delay_estimator_internal.h", - "modules/audio_processing/utility/delay_estimator_wrapper.h", "modules/audio_processing/utility/pffft_wrapper.h", "modules/audio_processing/vad/common.h", "modules/audio_processing/vad/gmm.h", @@ -2063,6 +1945,7 @@ cc_library( "modules/audio_processing/vad/vad_circular_buffer.h", "modules/audio_processing/vad/voice_activity_detector.h", "modules/audio_processing/vad/voice_gmm_tables.h", + "modules/congestion_controller/ect1_policy.h", "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h", "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_interface.h", "modules/congestion_controller/goog_cc/alr_detector.h", @@ -2073,7 +1956,6 @@ cc_library( "modules/congestion_controller/goog_cc/goog_cc_network_control.h", "modules/congestion_controller/goog_cc/inter_arrival_delta.h", "modules/congestion_controller/goog_cc/link_capacity_estimator.h", - "modules/congestion_controller/goog_cc/loss_based_bandwidth_estimation.h", "modules/congestion_controller/goog_cc/loss_based_bwe_v2.h", "modules/congestion_controller/goog_cc/probe_bitrate_estimator.h", "modules/congestion_controller/goog_cc/probe_controller.h", @@ -2088,9 +1970,16 @@ cc_library( "modules/congestion_controller/pcc/rtt_tracker.h", "modules/congestion_controller/pcc/utility_function.h", "modules/congestion_controller/remb_throttler.h", + "modules/congestion_controller/rtp/congestion_controller_feedback_stats.h", "modules/congestion_controller/rtp/control_handler.h", "modules/congestion_controller/rtp/transport_feedback_adapter.h", "modules/congestion_controller/rtp/transport_feedback_demuxer.h", + "modules/congestion_controller/scream/delay_based_congestion_control.h", + "modules/congestion_controller/scream/loss_estimator.h", + "modules/congestion_controller/scream/scream_feedback.h", + "modules/congestion_controller/scream/scream_network_controller.h", + "modules/congestion_controller/scream/scream_v2.h", + "modules/congestion_controller/scream/scream_v2_parameters.h", "modules/desktop_capture/blank_detector_desktop_capturer_wrapper.h", "modules/desktop_capture/cropped_desktop_frame.h", "modules/desktop_capture/cropping_window_capturer.h", @@ -2175,6 +2064,8 @@ cc_library( "modules/portal/xdg_desktop_portal_utils.h", "modules/portal/xdg_session_details.h", "modules/remote_bitrate_estimator/aimd_rate_control.h", + "modules/remote_bitrate_estimator/congestion_control_feedback_generator.h", + "modules/remote_bitrate_estimator/congestion_control_feedback_tracker.h", "modules/remote_bitrate_estimator/include/bwe_defines.h", "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h", "modules/remote_bitrate_estimator/inter_arrival.h", @@ -2183,22 +2074,20 @@ cc_library( "modules/remote_bitrate_estimator/packet_arrival_map.h", "modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h", "modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h", - "modules/remote_bitrate_estimator/remote_estimator_proxy.h", - "modules/remote_bitrate_estimator/test/bwe_test_logging.h", + "modules/remote_bitrate_estimator/rtp_transport_feedback_generator.h", "modules/remote_bitrate_estimator/tools/bwe_rtp.h", + "modules/remote_bitrate_estimator/transport_sequence_number_feedback_generator.h", "modules/rtp_rtcp/include/flexfec_receiver.h", "modules/rtp_rtcp/include/flexfec_sender.h", "modules/rtp_rtcp/include/receive_statistics.h", + "modules/rtp_rtcp/include/recovered_packet_receiver.h", "modules/rtp_rtcp/include/remote_ntp_time_estimator.h", "modules/rtp_rtcp/include/report_block_data.h", "modules/rtp_rtcp/include/rtcp_statistics.h", "modules/rtp_rtcp/include/rtp_cvo.h", "modules/rtp_rtcp/include/rtp_header_extension_map.h", - "modules/rtp_rtcp/include/rtp_packet_sender.h", - "modules/rtp_rtcp/include/rtp_rtcp.h", "modules/rtp_rtcp/include/rtp_rtcp_defines.h", "modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h", - "modules/rtp_rtcp/mocks/mock_rtcp_bandwidth_observer.h", "modules/rtp_rtcp/mocks/mock_rtcp_rtt_stats.h", "modules/rtp_rtcp/mocks/mock_rtp_rtcp.h", "modules/rtp_rtcp/source/absolute_capture_time_interpolator.h", @@ -2206,14 +2095,18 @@ cc_library( "modules/rtp_rtcp/source/active_decode_targets_helper.h", "modules/rtp_rtcp/source/byte_io.h", "modules/rtp_rtcp/source/capture_clock_offset_updater.h", + "modules/rtp_rtcp/source/corruption_detection_extension.h", "modules/rtp_rtcp/source/create_video_rtp_depacketizer.h", - "modules/rtp_rtcp/source/deprecated/deprecated_rtp_sender_egress.h", "modules/rtp_rtcp/source/dtmf_queue.h", "modules/rtp_rtcp/source/fec_private_tables_bursty.h", "modules/rtp_rtcp/source/fec_private_tables_random.h", + "modules/rtp_rtcp/source/flexfec_03_header_reader_writer.h", "modules/rtp_rtcp/source/flexfec_header_reader_writer.h", "modules/rtp_rtcp/source/forward_error_correction.h", "modules/rtp_rtcp/source/forward_error_correction_internal.h", + "modules/rtp_rtcp/source/frame_object.h", + "modules/rtp_rtcp/source/leb128.h", + "modules/rtp_rtcp/source/ntp_time_util.h", "modules/rtp_rtcp/source/packet_loss_stats.h", "modules/rtp_rtcp/source/packet_sequencer.h", "modules/rtp_rtcp/source/receive_statistics_impl.h", @@ -2223,6 +2116,7 @@ cc_library( "modules/rtp_rtcp/source/rtcp_packet/bye.h", "modules/rtp_rtcp/source/rtcp_packet/common_header.h", "modules/rtp_rtcp/source/rtcp_packet/compound_packet.h", + "modules/rtp_rtcp/source/rtcp_packet/congestion_control_feedback.h", "modules/rtp_rtcp/source/rtcp_packet/dlrr.h", "modules/rtp_rtcp/source/rtcp_packet/extended_reports.h", "modules/rtp_rtcp/source/rtcp_packet/fir.h", @@ -2249,6 +2143,7 @@ cc_library( "modules/rtp_rtcp/source/rtcp_transceiver.h", "modules/rtp_rtcp/source/rtcp_transceiver_config.h", "modules/rtp_rtcp/source/rtcp_transceiver_impl.h", + "modules/rtp_rtcp/source/rtp_depacketizer_sframe.h", "modules/rtp_rtcp/source/rtp_dependency_descriptor_extension.h", "modules/rtp_rtcp/source/rtp_dependency_descriptor_reader.h", "modules/rtp_rtcp/source/rtp_dependency_descriptor_writer.h", @@ -2267,8 +2162,8 @@ cc_library( "modules/rtp_rtcp/source/rtp_packet_received.h", "modules/rtp_rtcp/source/rtp_packet_to_send.h", "modules/rtp_rtcp/source/rtp_packetizer_av1.h", + "modules/rtp_rtcp/source/rtp_packetizer_sframe.h", "modules/rtp_rtcp/source/rtp_rtcp_config.h", - "modules/rtp_rtcp/source/rtp_rtcp_impl.h", "modules/rtp_rtcp/source/rtp_rtcp_impl2.h", "modules/rtp_rtcp/source/rtp_rtcp_interface.h", "modules/rtp_rtcp/source/rtp_sender.h", @@ -2280,8 +2175,10 @@ cc_library( "modules/rtp_rtcp/source/rtp_util.h", "modules/rtp_rtcp/source/rtp_video_header.h", "modules/rtp_rtcp/source/rtp_video_layers_allocation_extension.h", + "modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate.h", + "modules/rtp_rtcp/source/sframe_descriptor.h", + "modules/rtp_rtcp/source/sframe_rtp_packet_received.h", "modules/rtp_rtcp/source/source_tracker.h", - "modules/rtp_rtcp/source/time_util.h", "modules/rtp_rtcp/source/tmmbr_help.h", "modules/rtp_rtcp/source/ulpfec_generator.h", "modules/rtp_rtcp/source/ulpfec_header_reader_writer.h", @@ -2294,22 +2191,28 @@ cc_library( "modules/rtp_rtcp/source/video_rtp_depacketizer_raw.h", "modules/rtp_rtcp/source/video_rtp_depacketizer_vp8.h", "modules/rtp_rtcp/source/video_rtp_depacketizer_vp9.h", + "modules/sframe/sframe_context_factory.h", + "modules/sframe/sframe_decrypt_error_reporter.h", + "modules/sframe/sframe_decryptor.h", + "modules/sframe/sframe_encryption_config.h", + "modules/sframe/sframe_encryptor.h", + "modules/sframe/sframe_media_decryptor_interface.h", + "modules/sframe/sframe_media_encryptor_interface.h", "modules/third_party/fft/fft.h", "modules/third_party/g711/g711.h", "modules/third_party/g722/g722_enc_dec.h", - "modules/third_party/portaudio/pa_memorybarrier.h", - "modules/third_party/portaudio/pa_ringbuffer.h", "modules/utility/include/helpers_android.h", "modules/utility/include/jvm_android.h", - "modules/utility/maybe_worker_thread.h", "modules/video_capture/device_info_impl.h", "modules/video_capture/linux/device_info_v4l2.h", "modules/video_capture/linux/video_capture_v4l2.h", + "modules/video_capture/raw_video_sink_interface.h", "modules/video_capture/video_capture.h", "modules/video_capture/video_capture_config.h", "modules/video_capture/video_capture_defines.h", "modules/video_capture/video_capture_factory.h", "modules/video_capture/video_capture_impl.h", + "modules/video_capture/video_capture_options.h", "modules/video_capture/windows/device_info_ds.h", "modules/video_capture/windows/help_functions_ds.h", "modules/video_capture/windows/sink_filter_ds.h", @@ -2326,10 +2229,6 @@ cc_library( "modules/video_coding/codecs/interface/common_constants.h", "modules/video_coding/codecs/interface/libvpx_interface.h", "modules/video_coding/codecs/interface/mock_libvpx_interface.h", - "modules/video_coding/codecs/multiplex/include/augmented_video_frame_buffer.h", - "modules/video_coding/codecs/multiplex/include/multiplex_decoder_adapter.h", - "modules/video_coding/codecs/multiplex/include/multiplex_encoder_adapter.h", - "modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.h", "modules/video_coding/codecs/vp8/default_temporal_layers.h", "modules/video_coding/codecs/vp8/include/temporal_layers_checker.h", "modules/video_coding/codecs/vp8/include/vp8.h", @@ -2337,7 +2236,6 @@ cc_library( "modules/video_coding/codecs/vp8/libvpx_vp8_decoder.h", "modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h", "modules/video_coding/codecs/vp8/screenshare_layers.h", - "modules/video_coding/codecs/vp8/temporal_layers.h", "modules/video_coding/codecs/vp8/vp8_scalability.h", "modules/video_coding/codecs/vp9/include/vp9.h", "modules/video_coding/codecs/vp9/include/vp9_globals.h", @@ -2346,42 +2244,32 @@ cc_library( "modules/video_coding/codecs/vp9/svc_config.h", "modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h", "modules/video_coding/decoder_database.h", - "modules/video_coding/decoding_state.h", "modules/video_coding/encoded_frame.h", - "modules/video_coding/event_wrapper.h", "modules/video_coding/fec_controller_default.h", "modules/video_coding/fec_rate_table.h", - "modules/video_coding/frame_buffer.h", - "modules/video_coding/frame_buffer2.h", "modules/video_coding/frame_dependencies_calculator.h", "modules/video_coding/frame_helpers.h", - "modules/video_coding/frame_object.h", "modules/video_coding/generic_decoder.h", - "modules/video_coding/h264_packet_buffer.h", "modules/video_coding/h264_sprop_parameter_sets.h", "modules/video_coding/h264_sps_pps_tracker.h", + "modules/video_coding/h26x_packet_buffer.h", "modules/video_coding/histogram.h", "modules/video_coding/include/video_codec_initializer.h", "modules/video_coding/include/video_codec_interface.h", - "modules/video_coding/include/video_coding.h", "modules/video_coding/include/video_coding_defines.h", "modules/video_coding/include/video_error_codes.h", + "modules/video_coding/include/video_error_codes_utils.h", "modules/video_coding/internal_defines.h", - "modules/video_coding/jitter_buffer.h", - "modules/video_coding/jitter_buffer_common.h", "modules/video_coding/loss_notification_controller.h", "modules/video_coding/media_opt_util.h", "modules/video_coding/nack_requester.h", - "modules/video_coding/packet.h", "modules/video_coding/packet_buffer.h", - "modules/video_coding/receiver.h", "modules/video_coding/rtp_frame_id_only_ref_finder.h", "modules/video_coding/rtp_frame_reference_finder.h", "modules/video_coding/rtp_generic_ref_finder.h", "modules/video_coding/rtp_seq_num_only_ref_finder.h", "modules/video_coding/rtp_vp8_ref_finder.h", "modules/video_coding/rtp_vp9_ref_finder.h", - "modules/video_coding/session_info.h", "modules/video_coding/svc/create_scalability_structure.h", "modules/video_coding/svc/scalability_mode_util.h", "modules/video_coding/svc/scalability_structure_full_svc.h", @@ -2390,23 +2278,23 @@ cc_library( "modules/video_coding/svc/scalability_structure_simulcast.h", "modules/video_coding/svc/scalable_video_controller.h", "modules/video_coding/svc/scalable_video_controller_no_layering.h", + "modules/video_coding/svc/simulcast_to_svc_converter.h", "modules/video_coding/svc/svc_rate_allocator.h", - "modules/video_coding/timing/codec_timer.h", - "modules/video_coding/timing/frame_delay_variation_kalman_filter.h", - "modules/video_coding/timing/inter_frame_delay.h", - "modules/video_coding/timing/jitter_estimator.h", - "modules/video_coding/timing/rtt_filter.h", - "modules/video_coding/timing/timestamp_extrapolator.h", + "modules/video_coding/timing/decode_time_percentile_filter.h", "modules/video_coding/timing/timing.h", "modules/video_coding/utility/bandwidth_quality_scaler.h", + "modules/video_coding/utility/cbr_layer_rate_tracker.h", "modules/video_coding/utility/decoded_frames_history.h", + "modules/video_coding/utility/encoder_speed_controller_impl.h", "modules/video_coding/utility/frame_dropper.h", + "modules/video_coding/utility/frame_sampler.h", "modules/video_coding/utility/framerate_controller_deprecated.h", "modules/video_coding/utility/ivf_defines.h", "modules/video_coding/utility/ivf_file_reader.h", "modules/video_coding/utility/ivf_file_writer.h", "modules/video_coding/utility/qp_parser.h", "modules/video_coding/utility/quality_scaler.h", + "modules/video_coding/utility/reference_buffer_tracker.h", "modules/video_coding/utility/simulcast_rate_allocator.h", "modules/video_coding/utility/simulcast_test_fixture_impl.h", "modules/video_coding/utility/simulcast_utility.h", @@ -2414,13 +2302,11 @@ cc_library( "modules/video_coding/utility/vp8_header_parser.h", "modules/video_coding/utility/vp9_constants.h", "modules/video_coding/utility/vp9_uncompressed_header_parser.h", - "modules/video_coding/video_coding_impl.h", "modules/video_coding/video_receiver2.h", "net/dcsctp/common/handover_testing.h", "net/dcsctp/common/internal_types.h", "net/dcsctp/common/math.h", "net/dcsctp/common/sequence_numbers.h", - "net/dcsctp/common/str_join.h", "net/dcsctp/fuzzers/dcsctp_fuzzers.h", "net/dcsctp/packet/bounded_byte_reader.h", "net/dcsctp/packet/bounded_byte_writer.h", @@ -2472,6 +2358,7 @@ cc_library( "net/dcsctp/packet/parameter/ssn_tsn_reset_request_parameter.h", "net/dcsctp/packet/parameter/state_cookie_parameter.h", "net/dcsctp/packet/parameter/supported_extensions_parameter.h", + "net/dcsctp/packet/parameter/zero_checksum_acceptable_chunk_parameter.h", "net/dcsctp/packet/sctp_packet.h", "net/dcsctp/packet/tlv_trait.h", "net/dcsctp/public/dcsctp_handover_state.h", @@ -2501,6 +2388,7 @@ cc_library( "net/dcsctp/socket/state_cookie.h", "net/dcsctp/socket/stream_reset_handler.h", "net/dcsctp/socket/transmission_control_block.h", + "net/dcsctp/timer/fake_timeout.h", "net/dcsctp/timer/task_queue_timeout.h", "net/dcsctp/timer/timer.h", "net/dcsctp/tx/mock_send_queue.h", @@ -2522,7 +2410,6 @@ cc_library( "p2p/base/connection_info.h", "p2p/base/default_ice_transport_factory.h", "p2p/base/dtls_transport.h", - "p2p/base/dtls_transport_factory.h", "p2p/base/dtls_transport_internal.h", "p2p/base/ice_agent_interface.h", "p2p/base/ice_controller_factory_interface.h", @@ -2530,9 +2417,6 @@ cc_library( "p2p/base/ice_credentials_iterator.h", "p2p/base/ice_switch_reason.h", "p2p/base/ice_transport_internal.h", - "p2p/base/mock_active_ice_controller.h", - "p2p/base/mock_async_resolver.h", - "p2p/base/mock_dns_resolving_packet_socket_factory.h", "p2p/base/mock_ice_agent.h", "p2p/base/mock_ice_controller.h", "p2p/base/mock_ice_transport.h", @@ -2543,34 +2427,38 @@ cc_library( "p2p/base/port.h", "p2p/base/port_allocator.h", "p2p/base/port_interface.h", - "p2p/base/pseudo_tcp.h", - "p2p/base/regathering_controller.h", + "p2p/base/stun_dictionary.h", "p2p/base/stun_port.h", "p2p/base/stun_request.h", - "p2p/base/stun_server.h", "p2p/base/tcp_port.h", "p2p/base/transport_description.h", "p2p/base/transport_description_factory.h", "p2p/base/transport_info.h", "p2p/base/turn_port.h", - "p2p/base/turn_server.h", - "p2p/base/udp_port.h", "p2p/base/wrapping_active_ice_controller.h", "p2p/client/basic_port_allocator.h", "p2p/client/relay_port_factory_interface.h", "p2p/client/turn_port_factory.h", - "p2p/stunprober/stun_prober.h", + "p2p/dtls/dtls_stun_piggyback_callbacks.h", + "p2p/dtls/dtls_stun_piggyback_controller.h", + "p2p/dtls/dtls_transport.h", + "p2p/dtls/dtls_transport_factory.h", + "p2p/dtls/dtls_transport_internal.h", + "p2p/dtls/dtls_utils.h", "pc/audio_rtp_receiver.h", "pc/audio_track.h", "pc/channel.h", "pc/channel_interface.h", + "pc/codec_configuration.h", + "pc/codec_vendor.h", "pc/connection_context.h", "pc/data_channel_controller.h", "pc/data_channel_utils.h", "pc/dtls_srtp_transport.h", "pc/dtls_transport.h", "pc/dtmf_sender.h", - "pc/external_hmac.h", + "pc/encoded_audio_frame_injector.h", + "pc/encoded_video_frame_injector.h", "pc/ice_server_parsing.h", "pc/ice_transport.h", "pc/jitter_buffer_delay.h", @@ -2580,6 +2468,8 @@ cc_library( "pc/legacy_stats_collector.h", "pc/legacy_stats_collector_interface.h", "pc/local_audio_source.h", + "pc/media_factory.h", + "pc/media_options.h", "pc/media_protocol_names.h", "pc/media_session.h", "pc/media_stream.h", @@ -2592,7 +2482,6 @@ cc_library( "pc/peer_connection_internal.h", "pc/peer_connection_message_handler.h", "pc/peer_connection_proxy.h", - "pc/peer_connection_sdp_methods.h", "pc/peer_connection_wrapper.h", "pc/proxy.h", "pc/remote_audio_source.h", @@ -2609,24 +2498,26 @@ cc_library( "pc/rtp_transmission_manager.h", "pc/rtp_transport.h", "pc/rtp_transport_internal.h", + "pc/scoped_operations_batcher.h", "pc/sctp_data_channel.h", "pc/sctp_transport.h", "pc/sctp_utils.h", + "pc/sdp_munging_detector.h", "pc/sdp_offer_answer.h", - "pc/sdp_serializer.h", + "pc/sdp_payload_type_suggester.h", "pc/sdp_state_provider.h", "pc/sdp_utils.h", "pc/session_description.h", "pc/simulcast_description.h", - "pc/srtp_filter.h", + "pc/simulcast_sdp_serializer.h", "pc/srtp_session.h", "pc/srtp_transport.h", "pc/stream_collection.h", "pc/track_media_info_map.h", "pc/transceiver_list.h", "pc/transport_stats.h", + "pc/typed_codec_vendor.h", "pc/usage_pattern.h", - "pc/used_ids.h", "pc/video_rtp_receiver.h", "pc/video_rtp_track_source.h", "pc/video_track.h", @@ -2634,14 +2525,14 @@ cc_library( "pc/video_track_source_proxy.h", "pc/webrtc_sdp.h", "pc/webrtc_session_description_factory.h", - "rtc_base/arraysize.h", + "rtc_base/async_dns_resolver.h", "rtc_base/async_packet_socket.h", - "rtc_base/async_resolver.h", - "rtc_base/async_resolver_interface.h", "rtc_base/async_socket.h", "rtc_base/async_tcp_socket.h", "rtc_base/async_udp_socket.h", + "rtc_base/base64.h", "rtc_base/bit_buffer.h", + "rtc_base/bitrate_tracker.h", "rtc_base/bitstream_reader.h", "rtc_base/boringssl_certificate.h", "rtc_base/boringssl_identity.h", @@ -2652,46 +2543,46 @@ cc_library( "rtc_base/byte_buffer.h", "rtc_base/byte_order.h", "rtc_base/callback_list.h", + "rtc_base/callback_list_with_locks.h", "rtc_base/checks.h", + "rtc_base/clock_aligner.h", "rtc_base/compile_assert_c.h", "rtc_base/containers/flat_map.h", "rtc_base/containers/flat_set.h", "rtc_base/containers/flat_tree.h", - "rtc_base/containers/identity.h", "rtc_base/containers/invoke.h", "rtc_base/containers/move_only_int.h", "rtc_base/copy_on_write_buffer.h", + "rtc_base/cpu_info.h", "rtc_base/cpu_time.h", "rtc_base/crc32.h", - "rtc_base/crypt_string.h", + "rtc_base/crypto_random.h", "rtc_base/data_rate_limiter.h", + "rtc_base/denormal_disabler.h", "rtc_base/deprecated/recursive_critical_section.h", "rtc_base/dscp.h", "rtc_base/event.h", "rtc_base/event_tracer.h", "rtc_base/experiments/alr_experiment.h", "rtc_base/experiments/balanced_degradation_settings.h", - "rtc_base/experiments/bandwidth_quality_scaler_settings.h", - "rtc_base/experiments/cpu_speed_experiment.h", + "rtc_base/experiments/corruption_detection_frame_selector_settings.h", "rtc_base/experiments/encoder_info_settings.h", + "rtc_base/experiments/encoder_speed_experiment.h", "rtc_base/experiments/field_trial_list.h", "rtc_base/experiments/field_trial_parser.h", "rtc_base/experiments/field_trial_units.h", "rtc_base/experiments/keyframe_interval_settings.h", "rtc_base/experiments/min_video_bitrate_experiment.h", "rtc_base/experiments/normalize_simulcast_size_experiment.h", - "rtc_base/experiments/quality_rampup_experiment.h", "rtc_base/experiments/quality_scaler_settings.h", "rtc_base/experiments/quality_scaling_experiment.h", "rtc_base/experiments/rate_control_settings.h", - "rtc_base/experiments/rtt_mult_experiment.h", - "rtc_base/experiments/stable_target_rate_experiment.h", + "rtc_base/experiments/retransmit_flushed_packets_settings.h", "rtc_base/experiments/struct_parameters_parser.h", "rtc_base/file_rotating_stream.h", "rtc_base/firewall_socket_server.h", - "rtc_base/gunit.h", - "rtc_base/helpers.h", - "rtc_base/http_common.h", + "rtc_base/frequency_tracker.h", + "rtc_base/gtest_prod_util.h", "rtc_base/ifaddrs_android.h", "rtc_base/ifaddrs_converter.h", "rtc_base/ignore_wundef.h", @@ -2706,12 +2597,10 @@ cc_library( "rtc_base/memory_stream.h", "rtc_base/memory_usage.h", "rtc_base/message_digest.h", - "rtc_base/nat_server.h", - "rtc_base/nat_socket_factory.h", - "rtc_base/nat_types.h", "rtc_base/net_helper.h", "rtc_base/net_helpers.h", "rtc_base/network.h", + "rtc_base/network/received_packet.h", "rtc_base/network/sent_packet.h", "rtc_base/network_constants.h", "rtc_base/network_monitor.h", @@ -2729,6 +2618,7 @@ cc_library( "rtc_base/numerics/moving_max_counter.h", "rtc_base/numerics/moving_percentile_filter.h", "rtc_base/numerics/percentile_filter.h", + "rtc_base/numerics/rational.h", "rtc_base/numerics/running_statistics.h", "rtc_base/numerics/safe_compare.h", "rtc_base/numerics/safe_conversions.h", @@ -2736,7 +2626,9 @@ cc_library( "rtc_base/numerics/safe_minmax.h", "rtc_base/numerics/sample_counter.h", "rtc_base/numerics/sample_stats.h", + "rtc_base/numerics/sequence_number_unwrapper.h", "rtc_base/numerics/sequence_number_util.h", + "rtc_base/numerics/windowed_min_filter.h", "rtc_base/one_time_event.h", "rtc_base/openssl.h", "rtc_base/openssl_adapter.h", @@ -2752,7 +2644,6 @@ cc_library( "rtc_base/platform_thread.h", "rtc_base/platform_thread_types.h", "rtc_base/protobuf_utils.h", - "rtc_base/proxy_info.h", "rtc_base/proxy_server.h", "rtc_base/race_checker.h", "rtc_base/random.h", @@ -2765,6 +2656,7 @@ cc_library( "rtc_base/rolling_accumulator.h", "rtc_base/rtc_certificate.h", "rtc_base/rtc_certificate_generator.h", + "rtc_base/rtp_to_ntp_estimator.h", "rtc_base/sanitizer.h", "rtc_base/server_socket_adapters.h", "rtc_base/socket.h", @@ -2773,7 +2665,7 @@ cc_library( "rtc_base/socket_address_pair.h", "rtc_base/socket_factory.h", "rtc_base/socket_server.h", - "rtc_base/socket_stream.h", + "rtc_base/span_helpers.h", "rtc_base/ssl_adapter.h", "rtc_base/ssl_certificate.h", "rtc_base/ssl_fingerprint.h", @@ -2784,8 +2676,8 @@ cc_library( "rtc_base/string_encode.h", "rtc_base/string_to_number.h", "rtc_base/string_utils.h", - "rtc_base/strings/audio_format_to_string.h", "rtc_base/strings/json.h", + "rtc_base/strings/str_join.h", "rtc_base/strings/string_builder.h", "rtc_base/strings/string_format.h", "rtc_base/strong_alias.h", @@ -2807,23 +2699,23 @@ cc_library( "rtc_base/system/inline.h", "rtc_base/system/no_cfi_icall.h", "rtc_base/system/no_unique_address.h", + "rtc_base/system/plan_b_only.h", "rtc_base/system/rtc_export.h", "rtc_base/system/rtc_export_template.h", + "rtc_base/system/system_time.h", "rtc_base/system/unused.h", "rtc_base/system/warn_current_thread_is_deadlocked.h", "rtc_base/system_time.h", - "rtc_base/task_queue.h", "rtc_base/task_queue_gcd.h", - "rtc_base/task_queue_libevent.h", "rtc_base/task_queue_stdlib.h", "rtc_base/task_queue_win.h", "rtc_base/task_utils/repeating_task.h", - "rtc_base/third_party/base64/base64.h", - "rtc_base/third_party/sigslot/sigslot.h", + "rtc_base/text2pcap.h", "rtc_base/thread.h", "rtc_base/thread_annotations.h", "rtc_base/time_utils.h", "rtc_base/timestamp_aligner.h", + "rtc_base/trace_categories.h", "rtc_base/trace_event.h", "rtc_base/type_traits.h", "rtc_base/unique_id_generator.h", @@ -2838,7 +2730,6 @@ cc_library( "rtc_base/win/windows_version.h", "rtc_base/win32.h", "rtc_base/win32_socket_init.h", - "rtc_base/win32_window.h", "rtc_base/zero_memory.h", "rtc_tools/data_channel_benchmark/grpc_signaling.h", "rtc_tools/data_channel_benchmark/peer_connection_client.h", @@ -2857,9 +2748,6 @@ cc_library( "rtc_tools/rtc_event_log_visualizer/conversational_speech_en.h", "rtc_tools/rtc_event_log_visualizer/log_simulation.h", "rtc_tools/rtc_event_log_visualizer/plot_base.h", - "rtc_tools/rtc_event_log_visualizer/plot_protobuf.h", - "rtc_tools/rtc_event_log_visualizer/plot_python.h", - "rtc_tools/rtp_generator/rtp_generator.h", "rtc_tools/video_file_reader.h", "rtc_tools/video_file_writer.h", "sdk/android/native_api/audio_device_module/audio_device_android.h", @@ -2867,7 +2755,6 @@ cc_library( "sdk/android/native_api/codecs/wrapper.h", "sdk/android/native_api/jni/class_loader.h", "sdk/android/native_api/jni/java_types.h", - "sdk/android/native_api/jni/jni_int_wrapper.h", "sdk/android/native_api/jni/jvm.h", "sdk/android/native_api/jni/scoped_java_ref.h", "sdk/android/native_api/network_monitor/network_monitor.h", @@ -2888,14 +2775,12 @@ cc_library( "sdk/android/src/jni/audio_device/opensles_player.h", "sdk/android/src/jni/audio_device/opensles_recorder.h", "sdk/android/src/jni/encoded_image.h", - "sdk/android/src/jni/jni_generator_helper.h", "sdk/android/src/jni/jni_helpers.h", "sdk/android/src/jni/jvm.h", "sdk/android/src/jni/logging/log_sink.h", "sdk/android/src/jni/native_capturer_observer.h", "sdk/android/src/jni/pc/add_ice_candidate_observer.h", "sdk/android/src/jni/pc/android_network_monitor.h", - "sdk/android/src/jni/pc/audio.h", "sdk/android/src/jni/pc/crypto_options.h", "sdk/android/src/jni/pc/data_channel.h", "sdk/android/src/jni/pc/ice_candidate.h", @@ -2941,85 +2826,85 @@ cc_library( "sdk/objc/Framework/Native/api/video_frame_buffer.h", "sdk/objc/Framework/Native/src/objc_video_decoder_factory.h", "sdk/objc/Framework/Native/src/objc_video_encoder_factory.h", - "sdk/objc/api/RTCVideoRendererAdapter.h", "sdk/objc/api/RTCVideoRendererAdapter+Private.h", + "sdk/objc/api/RTCVideoRendererAdapter.h", "sdk/objc/api/logging/RTCCallbackLogger.h", - "sdk/objc/api/peerconnection/RTCAudioSource.h", "sdk/objc/api/peerconnection/RTCAudioSource+Private.h", - "sdk/objc/api/peerconnection/RTCAudioTrack.h", + "sdk/objc/api/peerconnection/RTCAudioSource.h", "sdk/objc/api/peerconnection/RTCAudioTrack+Private.h", + "sdk/objc/api/peerconnection/RTCAudioTrack.h", "sdk/objc/api/peerconnection/RTCCertificate.h", - "sdk/objc/api/peerconnection/RTCConfiguration.h", "sdk/objc/api/peerconnection/RTCConfiguration+Native.h", "sdk/objc/api/peerconnection/RTCConfiguration+Private.h", + "sdk/objc/api/peerconnection/RTCConfiguration.h", "sdk/objc/api/peerconnection/RTCCryptoOptions.h", - "sdk/objc/api/peerconnection/RTCDataChannel.h", "sdk/objc/api/peerconnection/RTCDataChannel+Private.h", - "sdk/objc/api/peerconnection/RTCDataChannelConfiguration.h", + "sdk/objc/api/peerconnection/RTCDataChannel.h", "sdk/objc/api/peerconnection/RTCDataChannelConfiguration+Private.h", - "sdk/objc/api/peerconnection/RTCDtmfSender.h", + "sdk/objc/api/peerconnection/RTCDataChannelConfiguration.h", "sdk/objc/api/peerconnection/RTCDtmfSender+Private.h", + "sdk/objc/api/peerconnection/RTCDtmfSender.h", "sdk/objc/api/peerconnection/RTCEncodedImage+Private.h", "sdk/objc/api/peerconnection/RTCFieldTrials.h", "sdk/objc/api/peerconnection/RTCFileLogger.h", - "sdk/objc/api/peerconnection/RTCIceCandidate.h", "sdk/objc/api/peerconnection/RTCIceCandidate+Private.h", - "sdk/objc/api/peerconnection/RTCIceCandidateErrorEvent.h", + "sdk/objc/api/peerconnection/RTCIceCandidate.h", "sdk/objc/api/peerconnection/RTCIceCandidateErrorEvent+Private.h", - "sdk/objc/api/peerconnection/RTCIceServer.h", + "sdk/objc/api/peerconnection/RTCIceCandidateErrorEvent.h", "sdk/objc/api/peerconnection/RTCIceServer+Private.h", - "sdk/objc/api/peerconnection/RTCLegacyStatsReport.h", + "sdk/objc/api/peerconnection/RTCIceServer.h", "sdk/objc/api/peerconnection/RTCLegacyStatsReport+Private.h", - "sdk/objc/api/peerconnection/RTCMediaConstraints.h", + "sdk/objc/api/peerconnection/RTCLegacyStatsReport.h", "sdk/objc/api/peerconnection/RTCMediaConstraints+Private.h", - "sdk/objc/api/peerconnection/RTCMediaSource.h", + "sdk/objc/api/peerconnection/RTCMediaConstraints.h", "sdk/objc/api/peerconnection/RTCMediaSource+Private.h", - "sdk/objc/api/peerconnection/RTCMediaStream.h", + "sdk/objc/api/peerconnection/RTCMediaSource.h", "sdk/objc/api/peerconnection/RTCMediaStream+Private.h", - "sdk/objc/api/peerconnection/RTCMediaStreamTrack.h", + "sdk/objc/api/peerconnection/RTCMediaStream.h", "sdk/objc/api/peerconnection/RTCMediaStreamTrack+Private.h", + "sdk/objc/api/peerconnection/RTCMediaStreamTrack.h", "sdk/objc/api/peerconnection/RTCMetrics.h", - "sdk/objc/api/peerconnection/RTCMetricsSampleInfo.h", "sdk/objc/api/peerconnection/RTCMetricsSampleInfo+Private.h", - "sdk/objc/api/peerconnection/RTCPeerConnection.h", + "sdk/objc/api/peerconnection/RTCMetricsSampleInfo.h", "sdk/objc/api/peerconnection/RTCPeerConnection+Private.h", - "sdk/objc/api/peerconnection/RTCPeerConnectionFactory.h", + "sdk/objc/api/peerconnection/RTCPeerConnection.h", "sdk/objc/api/peerconnection/RTCPeerConnectionFactory+Native.h", "sdk/objc/api/peerconnection/RTCPeerConnectionFactory+Private.h", - "sdk/objc/api/peerconnection/RTCPeerConnectionFactoryBuilder.h", + "sdk/objc/api/peerconnection/RTCPeerConnectionFactory.h", "sdk/objc/api/peerconnection/RTCPeerConnectionFactoryBuilder+DefaultComponents.h", - "sdk/objc/api/peerconnection/RTCPeerConnectionFactoryOptions.h", + "sdk/objc/api/peerconnection/RTCPeerConnectionFactoryBuilder.h", "sdk/objc/api/peerconnection/RTCPeerConnectionFactoryOptions+Private.h", - "sdk/objc/api/peerconnection/RTCRtcpParameters.h", + "sdk/objc/api/peerconnection/RTCPeerConnectionFactoryOptions.h", "sdk/objc/api/peerconnection/RTCRtcpParameters+Private.h", - "sdk/objc/api/peerconnection/RTCRtpCodecParameters.h", + "sdk/objc/api/peerconnection/RTCRtcpParameters.h", "sdk/objc/api/peerconnection/RTCRtpCodecParameters+Private.h", - "sdk/objc/api/peerconnection/RTCRtpEncodingParameters.h", + "sdk/objc/api/peerconnection/RTCRtpCodecParameters.h", "sdk/objc/api/peerconnection/RTCRtpEncodingParameters+Private.h", - "sdk/objc/api/peerconnection/RTCRtpHeaderExtension.h", + "sdk/objc/api/peerconnection/RTCRtpEncodingParameters.h", "sdk/objc/api/peerconnection/RTCRtpHeaderExtension+Private.h", - "sdk/objc/api/peerconnection/RTCRtpParameters.h", + "sdk/objc/api/peerconnection/RTCRtpHeaderExtension.h", "sdk/objc/api/peerconnection/RTCRtpParameters+Private.h", - "sdk/objc/api/peerconnection/RTCRtpReceiver.h", + "sdk/objc/api/peerconnection/RTCRtpParameters.h", "sdk/objc/api/peerconnection/RTCRtpReceiver+Native.h", "sdk/objc/api/peerconnection/RTCRtpReceiver+Private.h", - "sdk/objc/api/peerconnection/RTCRtpSender.h", + "sdk/objc/api/peerconnection/RTCRtpReceiver.h", "sdk/objc/api/peerconnection/RTCRtpSender+Native.h", "sdk/objc/api/peerconnection/RTCRtpSender+Private.h", - "sdk/objc/api/peerconnection/RTCRtpTransceiver.h", + "sdk/objc/api/peerconnection/RTCRtpSender.h", "sdk/objc/api/peerconnection/RTCRtpTransceiver+Private.h", + "sdk/objc/api/peerconnection/RTCRtpTransceiver.h", "sdk/objc/api/peerconnection/RTCSSLAdapter.h", - "sdk/objc/api/peerconnection/RTCSessionDescription.h", "sdk/objc/api/peerconnection/RTCSessionDescription+Private.h", - "sdk/objc/api/peerconnection/RTCStatisticsReport.h", + "sdk/objc/api/peerconnection/RTCSessionDescription.h", "sdk/objc/api/peerconnection/RTCStatisticsReport+Private.h", + "sdk/objc/api/peerconnection/RTCStatisticsReport.h", "sdk/objc/api/peerconnection/RTCTracing.h", "sdk/objc/api/peerconnection/RTCVideoCodecInfo+Private.h", "sdk/objc/api/peerconnection/RTCVideoEncoderSettings+Private.h", - "sdk/objc/api/peerconnection/RTCVideoSource.h", "sdk/objc/api/peerconnection/RTCVideoSource+Private.h", - "sdk/objc/api/peerconnection/RTCVideoTrack.h", + "sdk/objc/api/peerconnection/RTCVideoSource.h", "sdk/objc/api/peerconnection/RTCVideoTrack+Private.h", + "sdk/objc/api/peerconnection/RTCVideoTrack.h", "sdk/objc/api/video_codec/RTCVideoCodecConstants.h", "sdk/objc/api/video_codec/RTCVideoDecoderAV1.h", "sdk/objc/api/video_codec/RTCVideoDecoderVP8.h", @@ -3027,10 +2912,8 @@ cc_library( "sdk/objc/api/video_codec/RTCVideoEncoderAV1.h", "sdk/objc/api/video_codec/RTCVideoEncoderVP8.h", "sdk/objc/api/video_codec/RTCVideoEncoderVP9.h", - "sdk/objc/api/video_codec/RTCWrappedNativeVideoDecoder.h", - "sdk/objc/api/video_codec/RTCWrappedNativeVideoEncoder.h", - "sdk/objc/api/video_frame_buffer/RTCNativeI420Buffer.h", "sdk/objc/api/video_frame_buffer/RTCNativeI420Buffer+Private.h", + "sdk/objc/api/video_frame_buffer/RTCNativeI420Buffer.h", "sdk/objc/api/video_frame_buffer/RTCNativeMutableI420Buffer.h", "sdk/objc/base/RTCCodecSpecificInfo.h", "sdk/objc/base/RTCEncodedImage.h", @@ -3053,32 +2936,31 @@ cc_library( "sdk/objc/base/RTCVideoRenderer.h", "sdk/objc/base/RTCYUVPlanarBuffer.h", "sdk/objc/components/audio/RTCAudioDevice.h", - "sdk/objc/components/audio/RTCAudioSession.h", "sdk/objc/components/audio/RTCAudioSession+Private.h", + "sdk/objc/components/audio/RTCAudioSession.h", "sdk/objc/components/audio/RTCAudioSessionConfiguration.h", "sdk/objc/components/audio/RTCNativeAudioSessionDelegateAdapter.h", "sdk/objc/components/capturer/RTCCameraVideoCapturer.h", "sdk/objc/components/capturer/RTCFileVideoCapturer.h", - "sdk/objc/components/network/RTCNetworkMonitor.h", "sdk/objc/components/network/RTCNetworkMonitor+Private.h", + "sdk/objc/components/network/RTCNetworkMonitor.h", "sdk/objc/components/renderer/metal/RTCMTLI420Renderer.h", "sdk/objc/components/renderer/metal/RTCMTLNSVideoView.h", "sdk/objc/components/renderer/metal/RTCMTLNV12Renderer.h", "sdk/objc/components/renderer/metal/RTCMTLRGBRenderer.h", - "sdk/objc/components/renderer/metal/RTCMTLRenderer.h", "sdk/objc/components/renderer/metal/RTCMTLRenderer+Private.h", + "sdk/objc/components/renderer/metal/RTCMTLRenderer.h", "sdk/objc/components/renderer/metal/RTCMTLVideoView.h", "sdk/objc/components/renderer/opengl/RTCDefaultShader.h", "sdk/objc/components/renderer/opengl/RTCDisplayLinkTimer.h", "sdk/objc/components/renderer/opengl/RTCEAGLVideoView.h", "sdk/objc/components/renderer/opengl/RTCI420TextureCache.h", - "sdk/objc/components/renderer/opengl/RTCNSGLVideoView.h", "sdk/objc/components/renderer/opengl/RTCNV12TextureCache.h", "sdk/objc/components/renderer/opengl/RTCOpenGLDefines.h", "sdk/objc/components/renderer/opengl/RTCShader.h", "sdk/objc/components/renderer/opengl/RTCVideoViewShading.h", - "sdk/objc/components/video_codec/RTCCodecSpecificInfoH264.h", "sdk/objc/components/video_codec/RTCCodecSpecificInfoH264+Private.h", + "sdk/objc/components/video_codec/RTCCodecSpecificInfoH264.h", "sdk/objc/components/video_codec/RTCDefaultVideoDecoderFactory.h", "sdk/objc/components/video_codec/RTCDefaultVideoEncoderFactory.h", "sdk/objc/components/video_codec/RTCH264ProfileLevelId.h", @@ -3093,8 +2975,8 @@ cc_library( "sdk/objc/helpers/AVCaptureSession+DevicePosition.h", "sdk/objc/helpers/NSString+StdString.h", "sdk/objc/helpers/RTCCameraPreviewView.h", - "sdk/objc/helpers/RTCDispatcher.h", "sdk/objc/helpers/RTCDispatcher+Private.h", + "sdk/objc/helpers/RTCDispatcher.h", "sdk/objc/helpers/UIDevice+RTCDevice.h", "sdk/objc/helpers/scoped_cftyperef.h", "sdk/objc/native/api/audio_device_module.h", @@ -3123,21 +3005,19 @@ cc_library( "sdk/objc/native/src/objc_video_renderer.h", "sdk/objc/native/src/objc_video_track_source.h", "system_wrappers/include/clock.h", - "system_wrappers/include/cpu_features_wrapper.h", - "system_wrappers/include/cpu_info.h", - "system_wrappers/include/denormal_disabler.h", - "system_wrappers/include/field_trial.h", "system_wrappers/include/metrics.h", "system_wrappers/include/ntp_time.h", - "system_wrappers/include/rtp_to_ntp_estimator.h", - "system_wrappers/include/sleep.h", + "test/configurable_frame_size_encoder.h", + "test/fake_decoder.h", + "test/fake_encoder.h", + "test/fake_vp8_decoder.h", + "test/fake_vp8_encoder.h", "video/adaptation/balanced_constraint.h", "video/adaptation/bandwidth_quality_scaler_resource.h", "video/adaptation/bitrate_constraint.h", "video/adaptation/encode_usage_resource.h", "video/adaptation/overuse_frame_detector.h", "video/adaptation/pixel_limit_resource.h", - "video/adaptation/quality_rampup_experiment_helper.h", "video/adaptation/quality_scaler_resource.h", "video/adaptation/video_stream_encoder_resource.h", "video/adaptation/video_stream_encoder_resource_manager.h", @@ -3147,6 +3027,14 @@ cc_library( "video/config/encoder_stream_factory.h", "video/config/simulcast.h", "video/config/video_encoder_config.h", + "video/corruption_detection/corruption_classifier.h", + "video/corruption_detection/frame_instrumentation_generator_impl.h", + "video/corruption_detection/frame_selector.h", + "video/corruption_detection/generic_mapping_functions.h", + "video/corruption_detection/halton_frame_sampler.h", + "video/corruption_detection/halton_sequence.h", + "video/corruption_detection/utils.h", + "video/corruption_detection/video_frame_sampler.h", "video/decode_synchronizer.h", "video/encoder_bitrate_adjuster.h", "video/encoder_overshoot_detector.h", @@ -3155,21 +3043,30 @@ cc_library( "video/frame_decode_scheduler.h", "video/frame_decode_timing.h", "video/frame_dumping_decoder.h", + "video/frame_dumping_encoder.h", "video/frame_encode_metadata_writer.h", + "video/null_video_decoder.h", + "video/quality_convergence_controller.h", + "video/quality_convergence_monitor.h", "video/quality_limitation_reason_tracker.h", - "video/quality_threshold.h", - "video/receive_statistics_proxy2.h", + "video/rate_utilization_tracker.h", + "video/receive_statistics_proxy.h", "video/render/incoming_video_stream.h", "video/render/video_render_frames.h", "video/report_block_stats.h", "video/rtp_streams_synchronizer2.h", "video/rtp_video_stream_receiver2.h", - "video/rtp_video_stream_receiver_frame_transformer_delegate.h", "video/send_delay_stats.h", "video/send_statistics_proxy.h", "video/stats_counter.h", "video/stream_synchronization.h", "video/task_queue_frame_decode_scheduler.h", + "video/timing/default_video_jitter_timing.h", + "video/timing/frame_delay_variation_kalman_filter.h", + "video/timing/inter_frame_delay_variation_calculator.h", + "video/timing/jitter_estimator.h", + "video/timing/rtt_filter.h", + "video/timing/timestamp_extrapolator.h", "video/transport_adapter.h", "video/unique_timestamp_counter.h", "video/video_analyzer.h", @@ -3177,12 +3074,10 @@ cc_library( "video/video_quality_observer2.h", "video/video_receive_stream2.h", "video/video_receive_stream_timeout_tracker.h", - "video/video_send_stream.h", "video/video_send_stream_impl.h", "video/video_source_sink_controller.h", "video/video_stream_buffer_controller.h", "video/video_stream_decoder2.h", - "video/video_stream_decoder_impl.h", "video/video_stream_encoder.h", "video/video_stream_encoder_interface.h", "video/video_stream_encoder_observer.h", @@ -3197,9 +3092,13 @@ cc_library( "common_audio/third_party/ooura/fft_size_128/ooura_fft_tables_neon_sse2.h", ], "@platforms//cpu:x86_32": [ + "common_audio/fir_filter_avx2.h", + "common_audio/fir_filter_sse.h", "common_audio/third_party/ooura/fft_size_128/ooura_fft_tables_neon_sse2.h", ], "@platforms//cpu:x86_64": [ + "common_audio/fir_filter_avx2.h", + "common_audio/fir_filter_sse.h", "common_audio/third_party/ooura/fft_size_128/ooura_fft_tables_neon_sse2.h", ], "//conditions:default": [], @@ -3225,6 +3124,7 @@ cc_library( "-Wno-c++11-narrowing-const-reference", "-Wno-thread-safety-reference-return", "-Wno-format", + "-Wno-nullability-completeness", ] + select({ "@platforms//cpu:arm": [ "-mfpu=neon", @@ -3247,6 +3147,9 @@ cc_library( ], "//conditions:default": [], }), + cxxopts = [ + "-std=c++20", + ], defines = [ "_XOPEN_SOURCE", "HAVE_STRONG_GETAUXVAL=1", @@ -3288,6 +3191,9 @@ cc_library( "WEBRTC_OPUS_VARIABLE_COMPLEXITY=0", "USE_X11=1", "RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY", + "WEBRTC_WITHOUT_RUST", + "WEBRTC_DEPRECATE_PLAN_B", + "WEBRTC_ENCODER_PSNR_STATS", ] + select({ "@platforms//cpu:arm": [ "HAVE_MM_PREFETCH=0", @@ -3320,15 +3226,35 @@ cc_library( deps = [ "@//build_external/libwebrtc:third_party", "@//build_external/libwebrtc:webrtc_config", + "@abseil-cpp//absl/algorithm", + "@abseil-cpp//absl/algorithm:container", + "@abseil-cpp//absl/base:core_headers", + "@abseil-cpp//absl/base:no_destructor", + "@abseil-cpp//absl/base:nullability", + "@abseil-cpp//absl/cleanup", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/container:flat_hash_set", + "@abseil-cpp//absl/container:inlined_vector", + "@abseil-cpp//absl/crc:crc32c", + "@abseil-cpp//absl/functional:any_invocable", "@abseil-cpp//absl/functional:bind_front", + "@abseil-cpp//absl/memory", + "@abseil-cpp//absl/meta:type_traits", + "@abseil-cpp//absl/numeric:bits", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/strings:str_format", + "@abseil-cpp//absl/strings:string_view", + "@abseil-cpp//absl/types:span", "@boringssl//:crypto", "@boringssl//:ssl", "@crc32c", + "@dav1d", "@libevent//:event", "@libpffft", - "@dav1d", + "@libsrtp2", "@libvpx", "@libyuv", "@protobuf", + "@sframe", ], ) diff --git a/base/cvd/build_external/libwebrtc/PATCH.dav1d_include.patch b/base/cvd/build_external/libwebrtc/PATCH.dav1d_include.patch deleted file mode 100644 index 2907cb44d35..00000000000 --- a/base/cvd/build_external/libwebrtc/PATCH.dav1d_include.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git modules/video_coding/codecs/av1/dav1d_decoder.cc modules/video_coding/codecs/av1/dav1d_decoder.cc ---- modules/video_coding/codecs/av1/dav1d_decoder.cc -+++ modules/video_coding/codecs/av1/dav1d_decoder.cc -@@ -30,4 +30,4 @@ - #include "modules/video_coding/include/video_error_codes.h" - #include "rtc_base/logging.h" --#include "third_party/dav1d/libdav1d/include/dav1d/dav1d.h" -+#include - #include "libyuv/convert.h" diff --git a/base/cvd/build_external/libwebrtc/PATCH.third_party_libyuv.patch b/base/cvd/build_external/libwebrtc/PATCH.third_party_libyuv.patch index 91636b1ea2d..9c9c740d6f7 100644 --- a/base/cvd/build_external/libwebrtc/PATCH.third_party_libyuv.patch +++ b/base/cvd/build_external/libwebrtc/PATCH.third_party_libyuv.patch @@ -1,173 +1,237 @@ diff --git api/video/i010_buffer.cc api/video/i010_buffer.cc -index 32507febed..24887602b9 100644 +index 59da7fb..5486682 100644 --- api/video/i010_buffer.cc +++ api/video/i010_buffer.cc -@@ -14,8 +14,8 @@ - #include "api/make_ref_counted.h" - #include "api/video/i420_buffer.h" +@@ -20,10 +20,10 @@ #include "rtc_base/checks.h" + #include "rtc_base/memory/aligned_malloc.h" + #include "rtc_base/numerics/safe_conversions.h" -#include "third_party/libyuv/include/libyuv/convert.h" +-#include "third_party/libyuv/include/libyuv/convert_from.h" +-#include "third_party/libyuv/include/libyuv/rotate.h" -#include "third_party/libyuv/include/libyuv/scale.h" +#include "libyuv/convert.h" ++#include "libyuv/convert_from.h" ++#include "libyuv/rotate.h" +#include "libyuv/scale.h" // Aligning pointer to 64 bytes for improved performance, e.g. use SIMD. static const int kBufferAlignment = 64; diff --git api/video/i210_buffer.cc api/video/i210_buffer.cc -index d3cd68d366..39abcc3cd2 100644 +index 1f7919e..13d7b19 100644 --- api/video/i210_buffer.cc +++ api/video/i210_buffer.cc -@@ -15,8 +15,8 @@ - #include "api/video/i420_buffer.h" - #include "api/video/i422_buffer.h" +@@ -21,10 +21,10 @@ #include "rtc_base/checks.h" + #include "rtc_base/memory/aligned_malloc.h" + #include "rtc_base/numerics/safe_conversions.h" -#include "third_party/libyuv/include/libyuv/convert.h" +-#include "third_party/libyuv/include/libyuv/planar_functions.h" +-#include "third_party/libyuv/include/libyuv/rotate.h" -#include "third_party/libyuv/include/libyuv/scale.h" +#include "libyuv/convert.h" ++#include "libyuv/planar_functions.h" ++#include "libyuv/rotate.h" ++#include "libyuv/scale.h" + + // Aligning pointer to 64 bytes for improved performance, e.g. use SIMD. + static const int kBufferAlignment = 64; +diff --git api/video/i410_buffer.cc api/video/i410_buffer.cc +index a09a5a5..5bc6687 100644 +--- api/video/i410_buffer.cc ++++ api/video/i410_buffer.cc +@@ -22,10 +22,10 @@ + #include "rtc_base/checks.h" + #include "rtc_base/memory/aligned_malloc.h" + #include "rtc_base/numerics/safe_conversions.h" +-#include "third_party/libyuv/include/libyuv/convert.h" +-#include "third_party/libyuv/include/libyuv/planar_functions.h" +-#include "third_party/libyuv/include/libyuv/rotate.h" +-#include "third_party/libyuv/include/libyuv/scale.h" ++#include "libyuv/convert.h" ++#include "libyuv/planar_functions.h" ++#include "libyuv/rotate.h" +#include "libyuv/scale.h" // Aligning pointer to 64 bytes for improved performance, e.g. use SIMD. static const int kBufferAlignment = 64; diff --git api/video/i420_buffer.cc api/video/i420_buffer.cc -index bf7fc06ee9..d245fa361e 100644 +index e9320ce..b4b36c2 100644 --- api/video/i420_buffer.cc +++ api/video/i420_buffer.cc -@@ -16,9 +16,9 @@ - - #include "api/make_ref_counted.h" +@@ -21,10 +21,10 @@ #include "rtc_base/checks.h" + #include "rtc_base/memory/aligned_malloc.h" + #include "rtc_base/numerics/safe_conversions.h" -#include "third_party/libyuv/include/libyuv/convert.h" -#include "third_party/libyuv/include/libyuv/planar_functions.h" +-#include "third_party/libyuv/include/libyuv/rotate.h" -#include "third_party/libyuv/include/libyuv/scale.h" +#include "libyuv/convert.h" +#include "libyuv/planar_functions.h" ++#include "libyuv/rotate.h" +#include "libyuv/scale.h" // Aligning pointer to 64 bytes for improved performance, e.g. use SIMD. static const int kBufferAlignment = 64; diff --git api/video/i422_buffer.cc api/video/i422_buffer.cc -index c7fc50e272..b5eb3f452c 100644 +index fb6dd34..0ba7925 100644 --- api/video/i422_buffer.cc +++ api/video/i422_buffer.cc -@@ -17,9 +17,9 @@ - #include "api/make_ref_counted.h" - #include "api/video/i420_buffer.h" +@@ -22,11 +22,11 @@ #include "rtc_base/checks.h" + #include "rtc_base/memory/aligned_malloc.h" + #include "rtc_base/numerics/safe_conversions.h" -#include "third_party/libyuv/include/libyuv/convert.h" +-#include "third_party/libyuv/include/libyuv/convert_from.h" -#include "third_party/libyuv/include/libyuv/planar_functions.h" +-#include "third_party/libyuv/include/libyuv/rotate.h" -#include "third_party/libyuv/include/libyuv/scale.h" +#include "libyuv/convert.h" ++#include "libyuv/convert_from.h" +#include "libyuv/planar_functions.h" ++#include "libyuv/rotate.h" +#include "libyuv/scale.h" // Aligning pointer to 64 bytes for improved performance, e.g. use SIMD. static const int kBufferAlignment = 64; diff --git api/video/i444_buffer.cc api/video/i444_buffer.cc -index 98e892308f..28d380a218 100644 +index 452777e..9022f9a 100644 --- api/video/i444_buffer.cc +++ api/video/i444_buffer.cc -@@ -17,9 +17,9 @@ - #include "api/make_ref_counted.h" - #include "api/video/i420_buffer.h" +@@ -22,10 +22,10 @@ #include "rtc_base/checks.h" + #include "rtc_base/memory/aligned_malloc.h" + #include "rtc_base/numerics/safe_conversions.h" -#include "third_party/libyuv/include/libyuv/convert.h" -#include "third_party/libyuv/include/libyuv/planar_functions.h" +-#include "third_party/libyuv/include/libyuv/rotate.h" -#include "third_party/libyuv/include/libyuv/scale.h" +#include "libyuv/convert.h" +#include "libyuv/planar_functions.h" ++#include "libyuv/rotate.h" +#include "libyuv/scale.h" // Aligning pointer to 64 bytes for improved performance, e.g. use SIMD. static const int kBufferAlignment = 64; diff --git api/video/nv12_buffer.cc api/video/nv12_buffer.cc -index ca9dcd8677..45f81f2788 100644 +index 270dbde..fa0e95f 100644 --- api/video/nv12_buffer.cc +++ api/video/nv12_buffer.cc -@@ -13,8 +13,8 @@ - #include "api/make_ref_counted.h" - #include "api/video/i420_buffer.h" +@@ -21,9 +21,9 @@ #include "rtc_base/checks.h" + #include "rtc_base/memory/aligned_malloc.h" + #include "rtc_base/numerics/safe_conversions.h" -#include "third_party/libyuv/include/libyuv/convert.h" +-#include "third_party/libyuv/include/libyuv/convert_from.h" -#include "third_party/libyuv/include/libyuv/scale.h" +#include "libyuv/convert.h" ++#include "libyuv/convert_from.h" +#include "libyuv/scale.h" namespace webrtc { +diff --git api/video_codecs/test/video_encoder_functional_unittest.cc api/video_codecs/test/video_encoder_functional_unittest.cc +index 33f9332..95bf907 100644 +--- api/video_codecs/test/video_encoder_functional_unittest.cc ++++ api/video_codecs/test/video_encoder_functional_unittest.cc +@@ -58,8 +58,8 @@ + #include "test/gmock.h" + #include "test/gtest.h" + #include "test/testsupport/frame_reader.h" +-#include "third_party/libyuv/include/libyuv/convert.h" +-#include "third_party/libyuv/include/libyuv/planar_functions.h" ++#include "libyuv/convert.h" ++#include "libyuv/planar_functions.h" + + // This file contains functional unit tests that any compliant implementation of + // `VideoEncoderInterface` MUST pass. They validate that the encoder follows the diff --git common_video/libyuv/libyuv_unittest.cc common_video/libyuv/libyuv_unittest.cc -index f9c82f6284..7cb298d629 100644 +index 448ace8..6038097 100644 --- common_video/libyuv/libyuv_unittest.cc +++ common_video/libyuv/libyuv_unittest.cc -@@ -8,7 +8,7 @@ - * be found in the AUTHORS file in the root of the source tree. - */ +@@ -33,8 +33,8 @@ + #include "test/gmock.h" + #include "test/gtest.h" + #include "test/testsupport/file_utils.h" +-#include "third_party/libyuv/include/libyuv/convert.h" +-#include "third_party/libyuv/include/libyuv/rotate.h" ++#include "libyuv/convert.h" ++#include "libyuv/rotate.h" --#include "third_party/libyuv/include/libyuv.h" -+#include "libyuv.h" + namespace webrtc { - #include - #include diff --git common_video/libyuv/webrtc_libyuv.cc common_video/libyuv/webrtc_libyuv.cc -index 14e2d22612..1f374f267d 100644 +index 056f561..499b0a3 100644 --- common_video/libyuv/webrtc_libyuv.cc +++ common_video/libyuv/webrtc_libyuv.cc -@@ -15,7 +15,7 @@ - #include "api/video/i420_buffer.h" +@@ -21,13 +21,13 @@ + #include "api/video/video_frame_buffer.h" #include "common_video/include/video_frame_buffer.h" #include "rtc_base/checks.h" --#include "third_party/libyuv/include/libyuv.h" -+#include "libyuv.h" +-#include "third_party/libyuv/include/libyuv/compare.h" +-#include "third_party/libyuv/include/libyuv/convert.h" +-#include "third_party/libyuv/include/libyuv/convert_from.h" +-#include "third_party/libyuv/include/libyuv/planar_functions.h" +-#include "third_party/libyuv/include/libyuv/rotate.h" +-#include "third_party/libyuv/include/libyuv/scale.h" +-#include "third_party/libyuv/include/libyuv/video_common.h" ++#include "libyuv/compare.h" ++#include "libyuv/convert.h" ++#include "libyuv/convert_from.h" ++#include "libyuv/planar_functions.h" ++#include "libyuv/rotate.h" ++#include "libyuv/scale.h" ++#include "libyuv/video_common.h" namespace webrtc { diff --git common_video/video_frame_buffer.cc common_video/video_frame_buffer.cc -index d57330c652..e3f2687f51 100644 +index 168f809..cfd145e 100644 --- common_video/video_frame_buffer.cc +++ common_video/video_frame_buffer.cc -@@ -12,7 +12,7 @@ - #include "api/make_ref_counted.h" - #include "api/video/i420_buffer.h" +@@ -19,7 +19,7 @@ + #include "api/video/video_frame_buffer.h" #include "rtc_base/checks.h" + #include "rtc_base/ref_counted_object.h" -#include "third_party/libyuv/include/libyuv/convert.h" +#include "libyuv/convert.h" namespace webrtc { diff --git examples/peerconnection/client/linux/main_wnd.cc examples/peerconnection/client/linux/main_wnd.cc -index 2be75d8f8d..226b3afdf0 100644 +index a3e4b76..f73dbea 100644 --- examples/peerconnection/client/linux/main_wnd.cc +++ examples/peerconnection/client/linux/main_wnd.cc -@@ -32,8 +32,8 @@ - #include "api/video/video_source_interface.h" +@@ -36,7 +36,7 @@ + #include "examples/peerconnection/client/peer_connection_client.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" --#include "third_party/libyuv/include/libyuv/convert.h" -#include "third_party/libyuv/include/libyuv/convert_from.h" -+#include "libyuv/convert.h" +#include "libyuv/convert_from.h" namespace { diff --git examples/peerconnection/client/main_wnd.cc examples/peerconnection/client/main_wnd.cc -index afafa621b3..d598e17465 100644 +index a9d00d3..e1a152f 100644 --- examples/peerconnection/client/main_wnd.cc +++ examples/peerconnection/client/main_wnd.cc -@@ -17,7 +17,7 @@ - #include "rtc_base/arraysize.h" +@@ -28,7 +28,7 @@ + #include "api/video/video_source_interface.h" + #include "examples/peerconnection/client/peer_connection_client.h" #include "rtc_base/checks.h" - #include "rtc_base/logging.h" -#include "third_party/libyuv/include/libyuv/convert_argb.h" +#include "libyuv/convert_argb.h" ATOM MainWnd::wnd_class_ = 0; const wchar_t MainWnd::kClassName[] = L"WebRTC_MainWnd"; diff --git modules/desktop_capture/desktop_frame.cc modules/desktop_capture/desktop_frame.cc -index d6f574588c..379c650676 100644 +index 14f99fb..553b4f9 100644 --- modules/desktop_capture/desktop_frame.cc +++ modules/desktop_capture/desktop_frame.cc -@@ -19,7 +19,7 @@ - #include "modules/desktop_capture/desktop_capture_types.h" +@@ -23,7 +23,7 @@ #include "modules/desktop_capture/desktop_geometry.h" + #include "modules/desktop_capture/shared_memory.h" #include "rtc_base/checks.h" -#include "third_party/libyuv/include/libyuv/planar_functions.h" +#include "libyuv/planar_functions.h" @@ -175,69 +239,67 @@ index d6f574588c..379c650676 100644 namespace webrtc { diff --git modules/desktop_capture/desktop_frame_rotation.cc modules/desktop_capture/desktop_frame_rotation.cc -index f2745cf70b..f0fdc0e0e2 100644 +index a7ea388..26fdf6f 100644 --- modules/desktop_capture/desktop_frame_rotation.cc +++ modules/desktop_capture/desktop_frame_rotation.cc -@@ -11,7 +11,7 @@ - #include "modules/desktop_capture/desktop_frame_rotation.h" - +@@ -13,8 +13,8 @@ + #include "modules/desktop_capture/desktop_frame.h" + #include "modules/desktop_capture/desktop_geometry.h" #include "rtc_base/checks.h" +-#include "third_party/libyuv/include/libyuv/rotate.h" -#include "third_party/libyuv/include/libyuv/rotate_argb.h" ++#include "libyuv/rotate.h" +#include "libyuv/rotate_argb.h" namespace webrtc { diff --git modules/video_capture/video_capture_impl.cc modules/video_capture/video_capture_impl.cc -index 234c2e131e..23f404ff5c 100644 +index 39bc56d..7dd17b3 100644 --- modules/video_capture/video_capture_impl.cc +++ modules/video_capture/video_capture_impl.cc -@@ -20,7 +20,7 @@ - #include "rtc_base/logging.h" +@@ -31,7 +31,7 @@ #include "rtc_base/time_utils.h" #include "rtc_base/trace_event.h" --#include "third_party/libyuv/include/libyuv.h" -+#include "libyuv.h" + #include "system_wrappers/include/clock.h" +-#include "third_party/libyuv/include/libyuv/rotate.h" ++#include "libyuv/rotate.h" namespace webrtc { namespace videocapturemodule { -diff --git modules/video_coding/codecs/av1/dav1d_decoder.cc modules/video_coding/codecs/av1/dav1d_decoder.cc -index a2cd6d868c..12e8d4d5f4 100644 ---- modules/video_coding/codecs/av1/dav1d_decoder.cc -+++ modules/video_coding/codecs/av1/dav1d_decoder.cc -@@ -19,8 +19,8 @@ - #include "modules/video_coding/include/video_error_codes.h" - #include "rtc_base/logging.h" - #include "third_party/dav1d/libdav1d/include/dav1d/dav1d.h" --#include "third_party/libyuv/include/libyuv/convert.h" +diff --git modules/video_coding/codecs/av1/libaom_av1_encoder_v2_unittest.cc modules/video_coding/codecs/av1/libaom_av1_encoder_v2_unittest.cc +index b15082c..9a67e92 100644 +--- modules/video_coding/codecs/av1/libaom_av1_encoder_v2_unittest.cc ++++ modules/video_coding/codecs/av1/libaom_av1_encoder_v2_unittest.cc +@@ -33,7 +33,7 @@ + #include "third_party/libgav1/src/src/gav1/status_code.h" + #include "third_party/libgav1/src/src/obu_parser.h" + #include "third_party/libgav1/src/src/utils/types.h" -#include "third_party/libyuv/include/libyuv/planar_functions.h" -+#include "libyuv/convert.h" +#include "libyuv/planar_functions.h" - namespace webrtc { - namespace { + // This file contains tests that are specific only for libaom encoder. Most + // tests should be done in the generic `video_encoder_functional_unittest.cc` diff --git modules/video_coding/codecs/h264/h264_encoder_impl.cc modules/video_coding/codecs/h264/h264_encoder_impl.cc -index 3d9d6290a7..e6e5e7ed56 100644 +index 979c33f..0377bb0 100644 --- modules/video_coding/codecs/h264/h264_encoder_impl.cc +++ modules/video_coding/codecs/h264/h264_encoder_impl.cc -@@ -29,8 +29,8 @@ +@@ -55,7 +55,7 @@ + #include "rtc_base/checks.h" #include "rtc_base/logging.h" - #include "rtc_base/time_utils.h" #include "system_wrappers/include/metrics.h" --#include "third_party/libyuv/include/libyuv/convert.h" -#include "third_party/libyuv/include/libyuv/scale.h" -+#include "libyuv/convert.h" +#include "libyuv/scale.h" #include "third_party/openh264/src/codec/api/wels/codec_api.h" #include "third_party/openh264/src/codec/api/wels/codec_app_def.h" #include "third_party/openh264/src/codec/api/wels/codec_def.h" diff --git modules/video_coding/codecs/test/videoprocessor.cc modules/video_coding/codecs/test/videoprocessor.cc -index bf3c72ace4..a7eeba03a5 100644 +index 08f2e44..43427b8 100644 --- modules/video_coding/codecs/test/videoprocessor.cc +++ modules/video_coding/codecs/test/videoprocessor.cc -@@ -34,8 +34,8 @@ - #include "rtc_base/checks.h" - #include "rtc_base/time_utils.h" +@@ -52,8 +52,8 @@ #include "test/gtest.h" + #include "test/testsupport/frame_reader.h" + #include "test/testsupport/frame_writer.h" -#include "third_party/libyuv/include/libyuv/compare.h" -#include "third_party/libyuv/include/libyuv/scale.h" +#include "libyuv/compare.h" @@ -246,65 +308,26 @@ index bf3c72ace4..a7eeba03a5 100644 namespace webrtc { namespace test { diff --git modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc -index 1ac71899ee..2d15592d84 100644 +index f9d0cb0..5fbfad9 100644 --- modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc +++ modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc -@@ -30,7 +30,7 @@ - #include "rtc_base/time_utils.h" - #include "system_wrappers/include/field_trial.h" - #include "system_wrappers/include/metrics.h" +@@ -38,7 +38,7 @@ + #include "third_party/libvpx/source/libvpx/vpx/vp8dx.h" + #include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h" + #include "third_party/libvpx/source/libvpx/vpx/vpx_image.h" -#include "third_party/libyuv/include/libyuv/convert.h" +#include "libyuv/convert.h" - #include "vpx/vp8.h" - #include "vpx/vp8dx.h" - #include "vpx/vpx_decoder.h" -diff --git modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc -index 49ccf2dade..51aa7b1de5 100644 ---- modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc -+++ modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc -@@ -40,7 +40,7 @@ - #include "rtc_base/logging.h" - #include "rtc_base/trace_event.h" - #include "system_wrappers/include/field_trial.h" --#include "third_party/libyuv/include/libyuv/scale.h" -+#include "libyuv/scale.h" - #include "vpx/vp8cx.h" namespace webrtc { -diff --git modules/video_coding/codecs/vp9/libvpx_vp9_decoder.cc modules/video_coding/codecs/vp9/libvpx_vp9_decoder.cc -index 997139df06..e2acbdb84a 100644 ---- modules/video_coding/codecs/vp9/libvpx_vp9_decoder.cc -+++ modules/video_coding/codecs/vp9/libvpx_vp9_decoder.cc -@@ -23,7 +23,7 @@ - #include "modules/video_coding/utility/vp9_uncompressed_header_parser.h" - #include "rtc_base/checks.h" - #include "rtc_base/logging.h" --#include "third_party/libyuv/include/libyuv/convert.h" -+#include "libyuv/convert.h" - #include "vpx/vp8dx.h" - #include "vpx/vpx_decoder.h" - -diff --git modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc -index 4c27f4ce22..2ffd77da3a 100644 ---- modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc -+++ modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc -@@ -40,7 +40,7 @@ - #include "rtc_base/strings/string_builder.h" - #include "rtc_base/time_utils.h" - #include "rtc_base/trace_event.h" --#include "third_party/libyuv/include/libyuv/convert.h" -+#include "libyuv/convert.h" - #include "vpx/vp8cx.h" - #include "vpx/vpx_encoder.h" - + namespace { diff --git rtc_tools/frame_analyzer/video_color_aligner.cc rtc_tools/frame_analyzer/video_color_aligner.cc -index 5983e47f69..6dc05fd2cb 100644 +index f63a190..2051460 100644 --- rtc_tools/frame_analyzer/video_color_aligner.cc +++ rtc_tools/frame_analyzer/video_color_aligner.cc -@@ -22,8 +22,8 @@ - #include "api/video/i420_buffer.h" +@@ -25,8 +25,8 @@ #include "rtc_base/checks.h" #include "rtc_tools/frame_analyzer/linear_least_squares.h" + #include "rtc_tools/video_file_reader.h" -#include "third_party/libyuv/include/libyuv/planar_functions.h" -#include "third_party/libyuv/include/libyuv/scale.h" +#include "libyuv/planar_functions.h" @@ -313,94 +336,83 @@ index 5983e47f69..6dc05fd2cb 100644 namespace webrtc { namespace test { diff --git rtc_tools/frame_analyzer/video_geometry_aligner.cc rtc_tools/frame_analyzer/video_geometry_aligner.cc -index efb033317a..316ca688c6 100644 +index c626536..4238226 100644 --- rtc_tools/frame_analyzer/video_geometry_aligner.cc +++ rtc_tools/frame_analyzer/video_geometry_aligner.cc -@@ -16,7 +16,7 @@ - #include "api/video/i420_buffer.h" +@@ -21,7 +21,7 @@ #include "rtc_base/checks.h" #include "rtc_tools/frame_analyzer/video_quality_analysis.h" + #include "rtc_tools/video_file_reader.h" -#include "third_party/libyuv/include/libyuv/scale.h" +#include "libyuv/scale.h" namespace webrtc { namespace test { diff --git rtc_tools/frame_analyzer/video_quality_analysis.cc rtc_tools/frame_analyzer/video_quality_analysis.cc -index 1832438b75..77ee992f90 100644 +index 86ea2ac..422be87 100644 --- rtc_tools/frame_analyzer/video_quality_analysis.cc +++ rtc_tools/frame_analyzer/video_quality_analysis.cc -@@ -18,7 +18,7 @@ - #include "api/test/metrics/metric.h" +@@ -23,7 +23,7 @@ + #include "api/video/video_frame_buffer.h" #include "rtc_base/checks.h" - #include "rtc_base/logging.h" + #include "rtc_tools/video_file_reader.h" -#include "third_party/libyuv/include/libyuv/compare.h" +#include "libyuv/compare.h" namespace webrtc { namespace test { diff --git sdk/android/src/jni/java_i420_buffer.cc sdk/android/src/jni/java_i420_buffer.cc -index 95dcd66bb5..843899df37 100644 +index 1d4b4b4..33762dd 100644 --- sdk/android/src/jni/java_i420_buffer.cc +++ sdk/android/src/jni/java_i420_buffer.cc -@@ -9,7 +9,7 @@ - */ - +@@ -15,7 +15,7 @@ + #include "rtc_base/checks.h" #include "sdk/android/generated_video_jni/JavaI420Buffer_jni.h" + #include "third_party/jni_zero/jni_zero.h" -#include "third_party/libyuv/include/libyuv/scale.h" +#include "libyuv/scale.h" namespace webrtc { namespace jni { diff --git sdk/android/src/jni/nv12_buffer.cc sdk/android/src/jni/nv12_buffer.cc -index d0e7972446..270f303cae 100644 +index 9b3adb7..aa7eedf 100644 --- sdk/android/src/jni/nv12_buffer.cc +++ sdk/android/src/jni/nv12_buffer.cc -@@ -11,8 +11,8 @@ - #include - #include - --#include "third_party/libyuv/include/libyuv/convert.h" --#include "third_party/libyuv/include/libyuv/scale.h" -+#include "libyuv/convert.h" -+#include "libyuv/scale.h" +@@ -15,8 +15,8 @@ - #include "rtc_base/checks.h" #include "sdk/android/generated_video_jni/NV12Buffer_jni.h" -diff --git sdk/android/src/jni/nv21_buffer.cc sdk/android/src/jni/nv21_buffer.cc -index 10e3316f33..61dc7e0e58 100644 ---- sdk/android/src/jni/nv21_buffer.cc -+++ sdk/android/src/jni/nv21_buffer.cc -@@ -11,8 +11,8 @@ - #include - #include - --#include "third_party/libyuv/include/libyuv/convert.h" + #include "third_party/jni_zero/jni_zero.h" +-#include "third_party/libyuv/include/libyuv/planar_functions.h" -#include "third_party/libyuv/include/libyuv/scale.h" -+#include "libyuv/convert.h" ++#include "libyuv/planar_functions.h" +#include "libyuv/scale.h" - #include "common_video/libyuv/include/webrtc_libyuv.h" - #include "rtc_base/checks.h" + namespace webrtc { + namespace jni { diff --git sdk/android/src/jni/yuv_helper.cc sdk/android/src/jni/yuv_helper.cc -index e812bc9527..a15f5b3e3b 100644 +index 4df3c76..55cdce3 100644 --- sdk/android/src/jni/yuv_helper.cc +++ sdk/android/src/jni/yuv_helper.cc -@@ -12,8 +12,8 @@ +@@ -14,10 +14,10 @@ #include "sdk/android/generated_video_jni/YuvHelper_jni.h" - #include "sdk/android/src/jni/jni_helpers.h" + #include "third_party/jni_zero/jni_zero.h" -#include "third_party/libyuv/include/libyuv/convert.h" +-#include "third_party/libyuv/include/libyuv/convert_from.h" -#include "third_party/libyuv/include/libyuv/planar_functions.h" +-#include "third_party/libyuv/include/libyuv/rotate.h" +#include "libyuv/convert.h" ++#include "libyuv/convert_from.h" +#include "libyuv/planar_functions.h" ++#include "libyuv/rotate.h" namespace webrtc { namespace jni { diff --git sdk/objc/api/video_frame_buffer/RTCNativeI420Buffer.mm sdk/objc/api/video_frame_buffer/RTCNativeI420Buffer.mm -index 7aafd98f43..4da407b421 100644 +index 4682bf8..2ed358e 100644 --- sdk/objc/api/video_frame_buffer/RTCNativeI420Buffer.mm +++ sdk/objc/api/video_frame_buffer/RTCNativeI420Buffer.mm -@@ -14,7 +14,7 @@ +@@ -17,7 +17,7 @@ #if !defined(NDEBUG) && defined(WEBRTC_IOS) #import @@ -410,20 +422,20 @@ index 7aafd98f43..4da407b421 100644 @implementation RTC_OBJC_TYPE (RTCI420Buffer) diff --git sdk/objc/components/video_codec/RTCVideoEncoderH264.mm sdk/objc/components/video_codec/RTCVideoEncoderH264.mm -index 7dbbfaf019..f24b89a721 100644 +index 0fe7f05..06f192c 100644 --- sdk/objc/components/video_codec/RTCVideoEncoderH264.mm +++ sdk/objc/components/video_codec/RTCVideoEncoderH264.mm -@@ -36,7 +36,7 @@ - #include "rtc_base/logging.h" +@@ -38,7 +38,7 @@ #include "rtc_base/time_utils.h" #include "sdk/objc/components/video_codec/nalu_rewriter.h" + #include "system_wrappers/include/clock.h" -#include "third_party/libyuv/include/libyuv/convert_from.h" +#include "libyuv/convert_from.h" @interface RTC_OBJC_TYPE (RTCVideoEncoderH264) () diff --git sdk/objc/components/video_frame_buffer/RTCCVPixelBuffer.mm sdk/objc/components/video_frame_buffer/RTCCVPixelBuffer.mm -index 1a9b672d1a..ee83376154 100644 +index a254e01..545f2b6 100644 --- sdk/objc/components/video_frame_buffer/RTCCVPixelBuffer.mm +++ sdk/objc/components/video_frame_buffer/RTCCVPixelBuffer.mm @@ -15,7 +15,7 @@ @@ -436,7 +448,7 @@ index 1a9b672d1a..ee83376154 100644 #if !defined(NDEBUG) && defined(WEBRTC_IOS) #import diff --git sdk/objc/unittests/RTCCVPixelBuffer_xctest.mm sdk/objc/unittests/RTCCVPixelBuffer_xctest.mm -index cf759c5243..19bb35df49 100644 +index 498019a..0af514b 100644 --- sdk/objc/unittests/RTCCVPixelBuffer_xctest.mm +++ sdk/objc/unittests/RTCCVPixelBuffer_xctest.mm @@ -19,7 +19,7 @@ @@ -449,7 +461,7 @@ index cf759c5243..19bb35df49 100644 namespace { diff --git sdk/objc/unittests/frame_buffer_helpers.mm sdk/objc/unittests/frame_buffer_helpers.mm -index 98b86c54c0..2bbd1ff4be 100644 +index 2f9506d..d4f1769 100644 --- sdk/objc/unittests/frame_buffer_helpers.mm +++ sdk/objc/unittests/frame_buffer_helpers.mm @@ -10,7 +10,7 @@ @@ -461,3 +473,55 @@ index 98b86c54c0..2bbd1ff4be 100644 void DrawGradientInRGBPixelBuffer(CVPixelBufferRef pixelBuffer) { CVPixelBufferLockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly); +diff --git test/testsupport/switching_frame_reader_unittest.cc test/testsupport/switching_frame_reader_unittest.cc +index d6bf6d9..a53c41a 100644 +--- test/testsupport/switching_frame_reader_unittest.cc ++++ test/testsupport/switching_frame_reader_unittest.cc +@@ -26,7 +26,7 @@ + #include "test/testsupport/file_utils.h" + #include "test/testsupport/frame_reader.h" + #include "test/testsupport/frame_writer.h" +-#include "third_party/libyuv/include/libyuv/planar_functions.h" ++#include "libyuv/planar_functions.h" + + namespace webrtc { + namespace test { +diff --git test/video_codec_tester.cc test/video_codec_tester.cc +index 86f25b6..291bd06 100644 +--- test/video_codec_tester.cc ++++ test/video_codec_tester.cc +@@ -86,7 +86,7 @@ + #include "system_wrappers/include/clock.h" + #include "test/testsupport/frame_reader.h" + #include "test/testsupport/video_frame_writer.h" +-#include "third_party/libyuv/include/libyuv/compare.h" ++#include "libyuv/compare.h" + #include "video/config/encoder_stream_factory.h" + #include "video/config/video_encoder_config.h" + +diff --git test/video_codec_tester_unittest.cc test/video_codec_tester_unittest.cc +index ed34632..5e789d4 100644 +--- test/video_codec_tester_unittest.cc ++++ test/video_codec_tester_unittest.cc +@@ -53,7 +53,7 @@ + #include "test/gmock.h" + #include "test/gtest.h" + #include "test/testsupport/file_utils.h" +-#include "third_party/libyuv/include/libyuv/planar_functions.h" ++#include "libyuv/planar_functions.h" + + namespace webrtc { + namespace test { +diff --git tools_webrtc/iwyu/apply_include_cleaner_test.py tools_webrtc/iwyu/apply_include_cleaner_test.py +index 3248bf5..0906901 100755 +--- tools_webrtc/iwyu/apply_include_cleaner_test.py ++++ tools_webrtc/iwyu/apply_include_cleaner_test.py +@@ -42,7 +42,7 @@ class ApplyIncludeCleanerTest(unittest.TestCase): + self.assertEqual(output, self._OUTPUT) + mock_subprocess.assert_called_once() + file.write_text.assert_called_once_with( +- '#include "third_party/libyuv/include/libyuv/something.h"') ++ '#include "libyuv/something.h"') + + @mock.patch('subprocess.run', + return_value=mock.Mock(stdout=_OUTPUT, returncode=0)) diff --git a/base/cvd/build_external/libwebrtc/PATCH.vp9_frame_buffer_pool.patch b/base/cvd/build_external/libwebrtc/PATCH.vp9_frame_buffer_pool.patch new file mode 100644 index 00000000000..8a3d8aa329c --- /dev/null +++ b/base/cvd/build_external/libwebrtc/PATCH.vp9_frame_buffer_pool.patch @@ -0,0 +1,12 @@ +--- modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc ++++ modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc +@@ -42,5 +42,7 @@ + data_.SetSize(size); + // libvpx requires the frame buffer callback to zero the memory it hands out. + if (size > old_size) { +- absl::c_fill(std::span(data_).subspan(old_size), 0); ++ // absl::c_fill takes a non-const lvalue reference (C&) in BCR's abseil-cpp ++ // and cannot bind to the temporary std::span rvalue returned by subspan(). ++ std::fill(data_.data() + old_size, data_.data() + size, 0); + } + } diff --git a/base/cvd/build_external/libwebrtc/libwebrtc.MODULE.bazel b/base/cvd/build_external/libwebrtc/libwebrtc.MODULE.bazel index c63ef1f5195..c1e7cb4e269 100644 --- a/base/cvd/build_external/libwebrtc/libwebrtc.MODULE.bazel +++ b/base/cvd/build_external/libwebrtc/libwebrtc.MODULE.bazel @@ -3,10 +3,10 @@ git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "g git_repository( name = "libwebrtc", build_file = "@//build_external/libwebrtc:BUILD.libwebrtc.bazel", - commit = "e093c481bf8fd8e141fee4c007d63da488ce0ef5", + commit = "95554e4a0c5c343fdc989387d9d0ce18e2a2294b", patches = [ "@//build_external/libwebrtc:PATCH.third_party_libyuv.patch", - "@//build_external/libwebrtc:PATCH.dav1d_include.patch", + "@//build_external/libwebrtc:PATCH.vp9_frame_buffer_pool.patch", ], remote = "https://webrtc.googlesource.com/src/", ) diff --git a/base/cvd/build_external/libwebrtc/third_party/dav1d/libdav1d/include/dav1d/common.h b/base/cvd/build_external/libwebrtc/third_party/dav1d/libdav1d/include/dav1d/common.h new file mode 100644 index 00000000000..4678051357f --- /dev/null +++ b/base/cvd/build_external/libwebrtc/third_party/dav1d/libdav1d/include/dav1d/common.h @@ -0,0 +1 @@ +#include diff --git a/base/cvd/build_external/libwebrtc/third_party/dav1d/libdav1d/include/dav1d/data.h b/base/cvd/build_external/libwebrtc/third_party/dav1d/libdav1d/include/dav1d/data.h new file mode 100644 index 00000000000..d9ece1c3e68 --- /dev/null +++ b/base/cvd/build_external/libwebrtc/third_party/dav1d/libdav1d/include/dav1d/data.h @@ -0,0 +1 @@ +#include diff --git a/base/cvd/build_external/libwebrtc/third_party/dav1d/libdav1d/include/dav1d/dav1d.h b/base/cvd/build_external/libwebrtc/third_party/dav1d/libdav1d/include/dav1d/dav1d.h new file mode 100644 index 00000000000..7ab593d6cdd --- /dev/null +++ b/base/cvd/build_external/libwebrtc/third_party/dav1d/libdav1d/include/dav1d/dav1d.h @@ -0,0 +1 @@ +#include diff --git a/base/cvd/build_external/libwebrtc/third_party/dav1d/libdav1d/include/dav1d/headers.h b/base/cvd/build_external/libwebrtc/third_party/dav1d/libdav1d/include/dav1d/headers.h new file mode 100644 index 00000000000..640018112ad --- /dev/null +++ b/base/cvd/build_external/libwebrtc/third_party/dav1d/libdav1d/include/dav1d/headers.h @@ -0,0 +1 @@ +#include diff --git a/base/cvd/build_external/libwebrtc/third_party/dav1d/libdav1d/include/dav1d/picture.h b/base/cvd/build_external/libwebrtc/third_party/dav1d/libdav1d/include/dav1d/picture.h new file mode 100644 index 00000000000..d7af803c6d3 --- /dev/null +++ b/base/cvd/build_external/libwebrtc/third_party/dav1d/libdav1d/include/dav1d/picture.h @@ -0,0 +1 @@ +#include diff --git a/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vp8.h b/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vp8.h new file mode 100644 index 00000000000..f1bcae74e1e --- /dev/null +++ b/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vp8.h @@ -0,0 +1 @@ +#include diff --git a/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vp8cx.h b/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vp8cx.h new file mode 100644 index 00000000000..004748518b6 --- /dev/null +++ b/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vp8cx.h @@ -0,0 +1 @@ +#include diff --git a/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vp8dx.h b/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vp8dx.h new file mode 100644 index 00000000000..b95a8881176 --- /dev/null +++ b/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vp8dx.h @@ -0,0 +1 @@ +#include diff --git a/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_codec.h b/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_codec.h new file mode 100644 index 00000000000..2dcf766c683 --- /dev/null +++ b/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_codec.h @@ -0,0 +1 @@ +#include diff --git a/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_decoder.h b/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_decoder.h new file mode 100644 index 00000000000..227b7f1e989 --- /dev/null +++ b/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_decoder.h @@ -0,0 +1 @@ +#include diff --git a/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_encoder.h b/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_encoder.h new file mode 100644 index 00000000000..b8b15990950 --- /dev/null +++ b/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_encoder.h @@ -0,0 +1 @@ +#include diff --git a/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_ext_ratectrl.h b/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_ext_ratectrl.h new file mode 100644 index 00000000000..1c0222b458f --- /dev/null +++ b/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_ext_ratectrl.h @@ -0,0 +1 @@ +#include diff --git a/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_frame_buffer.h b/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_frame_buffer.h new file mode 100644 index 00000000000..67eb76d9f34 --- /dev/null +++ b/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_frame_buffer.h @@ -0,0 +1 @@ +#include diff --git a/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_image.h b/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_image.h new file mode 100644 index 00000000000..3c981ce9423 --- /dev/null +++ b/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_image.h @@ -0,0 +1 @@ +#include diff --git a/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_integer.h b/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_integer.h new file mode 100644 index 00000000000..dd07614e018 --- /dev/null +++ b/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_integer.h @@ -0,0 +1 @@ +#include diff --git a/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_tpl.h b/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_tpl.h new file mode 100644 index 00000000000..14016a3410e --- /dev/null +++ b/base/cvd/build_external/libwebrtc/third_party/libvpx/source/libvpx/vpx/vpx_tpl.h @@ -0,0 +1 @@ +#include diff --git a/base/cvd/build_external/libwebrtc/third_party/opus/src/include/opus_defines.h b/base/cvd/build_external/libwebrtc/third_party/opus/src/include/opus_defines.h new file mode 100644 index 00000000000..b02870acf6a --- /dev/null +++ b/base/cvd/build_external/libwebrtc/third_party/opus/src/include/opus_defines.h @@ -0,0 +1 @@ +#include diff --git a/base/cvd/build_external/libwebrtc/third_party/opus/src/include/opus_types.h b/base/cvd/build_external/libwebrtc/third_party/opus/src/include/opus_types.h new file mode 100644 index 00000000000..539a04025ec --- /dev/null +++ b/base/cvd/build_external/libwebrtc/third_party/opus/src/include/opus_types.h @@ -0,0 +1 @@ +#include diff --git a/base/cvd/build_external/libwebrtc/third_party/sframe/src/include/sframe/result.h b/base/cvd/build_external/libwebrtc/third_party/sframe/src/include/sframe/result.h new file mode 100644 index 00000000000..4b62c601444 --- /dev/null +++ b/base/cvd/build_external/libwebrtc/third_party/sframe/src/include/sframe/result.h @@ -0,0 +1 @@ +#include diff --git a/base/cvd/build_external/libwebrtc/third_party/sframe/src/include/sframe/sframe.h b/base/cvd/build_external/libwebrtc/third_party/sframe/src/include/sframe/sframe.h new file mode 100644 index 00000000000..6c0db9d0c6a --- /dev/null +++ b/base/cvd/build_external/libwebrtc/third_party/sframe/src/include/sframe/sframe.h @@ -0,0 +1 @@ +#include diff --git a/base/cvd/build_external/libyuv/BUILD.libyuv.bazel b/base/cvd/build_external/libyuv/BUILD.libyuv.bazel index 6e02785030c..019a27383e5 100644 --- a/base/cvd/build_external/libyuv/BUILD.libyuv.bazel +++ b/base/cvd/build_external/libyuv/BUILD.libyuv.bazel @@ -14,6 +14,10 @@ cc_library( "@platforms//cpu:arm64": glob(["source/*neon*.cc"]), "//conditions:default": [], }), + defines = [ + "LIBYUV_DISABLE_SME", + "LIBYUV_DISABLE_SVE", + ], hdrs = glob([ "include/libyuv/*.h", "include/libyuv.h", diff --git a/base/cvd/build_external/libyuv/libyuv.MODULE.bazel b/base/cvd/build_external/libyuv/libyuv.MODULE.bazel index a32dd718005..9021f97fbe3 100644 --- a/base/cvd/build_external/libyuv/libyuv.MODULE.bazel +++ b/base/cvd/build_external/libyuv/libyuv.MODULE.bazel @@ -3,6 +3,6 @@ git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "g git_repository( name = "libyuv", build_file = "@//build_external/libyuv:BUILD.libyuv.bazel", - commit = "af6ac8265bbd07bcf977526458b60305c4304288", + commit = "209763ad77fed3df2d57503d3ef40761e9473649", remote = "https://chromium.googlesource.com/libyuv/libyuv.git", ) diff --git a/base/cvd/build_external/sframe/BUILD.bazel b/base/cvd/build_external/sframe/BUILD.bazel new file mode 100644 index 00000000000..7ea4618e01e --- /dev/null +++ b/base/cvd/build_external/sframe/BUILD.bazel @@ -0,0 +1,17 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + +package( + default_visibility = [ + "//visibility:public", + ], +) + +cc_library( + name = "sframe_config", + hdrs = [ + "include/namespace.h", + ], + includes = [ + "include", + ], +) diff --git a/base/cvd/build_external/sframe/BUILD.sframe.bazel b/base/cvd/build_external/sframe/BUILD.sframe.bazel new file mode 100644 index 00000000000..e6acc16736b --- /dev/null +++ b/base/cvd/build_external/sframe/BUILD.sframe.bazel @@ -0,0 +1,40 @@ +load("@rules_cc//cc:cc_library.bzl", "cc_library") + +package( + default_visibility = [ + "//visibility:public", + ], +) + +cc_library( + name = "sframe", + srcs = [ + "src/crypto.cpp", + "src/crypto.h", + "src/crypto_boringssl.cpp", + "src/header.cpp", + "src/header.h", + "src/result.cpp", + "src/sframe.cpp", + ], + hdrs = [ + "include/sframe/map.h", + "include/sframe/result.h", + "include/sframe/sframe.h", + "include/sframe/span.h", + "include/sframe/vector.h", + ], + copts = [ + "-std=c++20", + ], + defines = [ + "BORINGSSL", + ], + includes = [ + "include", + ], + deps = [ + "@//build_external/sframe:sframe_config", + "@boringssl//:crypto", + ], +) diff --git a/base/cvd/build_external/sframe/include/namespace.h b/base/cvd/build_external/sframe/include/namespace.h new file mode 100644 index 00000000000..cf5f61c574d --- /dev/null +++ b/base/cvd/build_external/sframe/include/namespace.h @@ -0,0 +1,4 @@ +#pragma once + +// Configurable top-level namespace +#define SFRAME_NAMESPACE sframe diff --git a/base/cvd/build_external/sframe/sframe.MODULE.bazel b/base/cvd/build_external/sframe/sframe.MODULE.bazel new file mode 100644 index 00000000000..97d6ac34b9a --- /dev/null +++ b/base/cvd/build_external/sframe/sframe.MODULE.bazel @@ -0,0 +1,8 @@ +git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") + +git_repository( + name = "sframe", + build_file = "@//build_external/sframe:BUILD.sframe.bazel", + commit = "6a37f061f4eda0c6594c91ecf99b5ff498c8c124", + remote = "https://github.com/cisco/sframe.git", +) diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/abgr_buffer.cpp b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/abgr_buffer.cpp index f6841a69fa9..8400e24a4a4 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/abgr_buffer.cpp +++ b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/abgr_buffer.cpp @@ -33,8 +33,8 @@ int AbgrBuffer::height() const { return buffer_->height(); } const uint8_t* AbgrBuffer::Data() const { return buffer_->Data(); } int AbgrBuffer::Stride() const { return buffer_->Stride(); } -rtc::scoped_refptr AbgrBuffer::ToI420() { - rtc::scoped_refptr i420_buffer = +webrtc::scoped_refptr AbgrBuffer::ToI420() { + webrtc::scoped_refptr i420_buffer = webrtc::I420Buffer::Create(width(), height()); uint32_t format = buffer_->PixelFormat(); diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/abgr_buffer.h b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/abgr_buffer.h index a792f145211..553e1a83966 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/abgr_buffer.h +++ b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/abgr_buffer.h @@ -32,7 +32,7 @@ class AbgrBuffer : public webrtc::VideoFrameBuffer { int width() const override; int height() const override; - rtc::scoped_refptr ToI420() override; + webrtc::scoped_refptr ToI420() override; const uint8_t* Data() const; int Stride() const; diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/av1_nvenc_encoder_provider.cpp b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/av1_nvenc_encoder_provider.cpp index 1b02918ed24..b49bbbe02ae 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/av1_nvenc_encoder_provider.cpp +++ b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/av1_nvenc_encoder_provider.cpp @@ -101,6 +101,7 @@ class Av1NvencEncoderProvider : public EncoderProvider { } Result> CreateEncoder( + const webrtc::Environment& env, const webrtc::SdpVideoFormat& format) const override { if (!available_) { return CF_ERR("NVENC AV1 not available"); diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/builtin_decoder_provider.cpp b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/builtin_decoder_provider.cpp index 96d3afe726b..8e2a5d2a3c9 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/builtin_decoder_provider.cpp +++ b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/builtin_decoder_provider.cpp @@ -18,6 +18,7 @@ #include #include +#include "api/environment/environment.h" #include "api/video_codecs/builtin_video_decoder_factory.h" #include "api/video_codecs/sdp_video_format.h" #include "api/video_codecs/video_decoder.h" @@ -56,9 +57,10 @@ class BuiltinDecoderProvider : public DecoderProvider { } Result> CreateDecoder( + const webrtc::Environment& env, const webrtc::SdpVideoFormat& format) const override { std::unique_ptr decoder = - factory_->CreateVideoDecoder(format); + factory_->Create(env, format); CF_EXPECT(decoder != nullptr, "Builtin decoder failed to create " << format.name); return decoder; diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/builtin_encoder_provider.cpp b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/builtin_encoder_provider.cpp index 793509365f5..a6f7b64f7fb 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/builtin_encoder_provider.cpp +++ b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/builtin_encoder_provider.cpp @@ -18,6 +18,7 @@ #include #include +#include "api/environment/environment.h" #include "api/video_codecs/builtin_video_encoder_factory.h" #include "api/video_codecs/sdp_video_format.h" #include "api/video_codecs/video_encoder.h" @@ -56,9 +57,10 @@ class BuiltinEncoderProvider : public EncoderProvider { } Result> CreateEncoder( + const webrtc::Environment& env, const webrtc::SdpVideoFormat& format) const override { std::unique_ptr encoder = - factory_->CreateVideoEncoder(format); + factory_->Create(env, format); CF_EXPECT(encoder != nullptr, "Builtin encoder failed to create " << format.name); return encoder; diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/composite_decoder_factory.cpp b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/composite_decoder_factory.cpp index fc7e39943f1..5b64cb26ffb 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/composite_decoder_factory.cpp +++ b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/composite_decoder_factory.cpp @@ -16,6 +16,7 @@ #include "cuttlefish/host/frontend/webrtc/libcommon/composite_decoder_factory.h" +#include #include #include @@ -49,11 +50,12 @@ class CompositeDecoderFactory : public webrtc::VideoDecoderFactory { return all_formats; } - std::unique_ptr CreateVideoDecoder( + std::unique_ptr Create( + const webrtc::Environment& env, const webrtc::SdpVideoFormat& format) override { for (DecoderProvider* provider : registry_->GetProviders()) { Result> result = - provider->CreateDecoder(format); + provider->CreateDecoder(env, format); if (result.has_value() && *result) { LOG(INFO) << "Created decoder for " << format.ToString() << " using provider: " << provider->GetName(); @@ -66,8 +68,9 @@ class CompositeDecoderFactory : public webrtc::VideoDecoderFactory { return nullptr; } - CodecSupport QueryCodecSupport(const webrtc::SdpVideoFormat& format, - bool reference_scaling) const override { + CodecSupport QueryCodecSupport( + const webrtc::SdpVideoFormat& format, bool reference_scaling, + std::optional resolution) const override { for (const DecoderProvider* provider : registry_->GetProviders()) { for (const webrtc::SdpVideoFormat& supported : provider->GetSupportedFormats()) { diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/composite_encoder_factory.cpp b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/composite_encoder_factory.cpp index 8bf802038d2..f8e54ba74d1 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/composite_encoder_factory.cpp +++ b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/composite_encoder_factory.cpp @@ -16,6 +16,7 @@ #include "cuttlefish/host/frontend/webrtc/libcommon/composite_encoder_factory.h" +#include #include #include @@ -49,11 +50,12 @@ class CompositeEncoderFactory : public webrtc::VideoEncoderFactory { return all_formats; } - std::unique_ptr CreateVideoEncoder( + std::unique_ptr Create( + const webrtc::Environment& env, const webrtc::SdpVideoFormat& format) override { for (EncoderProvider* provider : registry_->GetProviders()) { Result> result = - provider->CreateEncoder(format); + provider->CreateEncoder(env, format); if (result.has_value() && *result) { LOG(INFO) << "Created encoder for " << format.ToString() << " using provider: " << provider->GetName(); @@ -68,7 +70,8 @@ class CompositeEncoderFactory : public webrtc::VideoEncoderFactory { CodecSupport QueryCodecSupport( const webrtc::SdpVideoFormat& format, - absl::optional scalability_mode) const override { + std::optional scalability_mode, + std::optional resolution) const override { for (const EncoderProvider* provider : registry_->GetProviders()) { for (const webrtc::SdpVideoFormat& supported : provider->GetSupportedFormats()) { diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/connection_controller.cpp b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/connection_controller.cpp index cc1a5c76375..41e3f6c32fc 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/connection_controller.cpp +++ b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/connection_controller.cpp @@ -259,18 +259,18 @@ void ConnectionController::OnSetRemoteDescriptionComplete( // these pointers with scoped_refptr. webrtc::CreateSessionDescriptionObserver* ConnectionController::ThisAsCreateSDPObserver() { - return new rtc::RefCountedObject< + return new webrtc::RefCountedObject< CreateSessionDescriptionObserverIntermediate>(*this); } webrtc::SetSessionDescriptionObserver* ConnectionController::ThisAsSetSDPObserver() { - return new rtc::RefCountedObject( - *this); + return new webrtc::RefCountedObject< + SetSessionDescriptionObserverIntermediate>(*this); } -rtc::scoped_refptr +webrtc::scoped_refptr ConnectionController::ThisAsSetRemoteSDPObserver() { - return rtc::scoped_refptr( - new rtc::RefCountedObject( + return webrtc::scoped_refptr( + new webrtc::RefCountedObject( *this)); } @@ -317,19 +317,19 @@ void ConnectionController::OnSignalingChange( // Triggered when media is received on a new stream from remote peer. void ConnectionController::OnAddStream( - rtc::scoped_refptr stream) { + webrtc::scoped_refptr stream) { VLOG(1) << "Stream added: " << stream->id(); } // Triggered when a remote peer closes a stream. void ConnectionController::OnRemoveStream( - rtc::scoped_refptr stream) { + webrtc::scoped_refptr stream) { VLOG(1) << "Stream removed: " << stream->id(); } // Triggered when a remote peer opens a data channel. void ConnectionController::OnDataChannel( - rtc::scoped_refptr data_channel) { + webrtc::scoped_refptr data_channel) { observer_.OnDataChannel(data_channel); } @@ -435,8 +435,7 @@ void ConnectionController::OnIceCandidateError(const std::string& address, } // Ice candidates have been removed. -void ConnectionController::OnIceCandidatesRemoved( - const std::vector&) { +void ConnectionController::OnIceCandidateRemoved(const webrtc::IceCandidate*) { // ignore } @@ -449,7 +448,7 @@ void ConnectionController::OnIceCandidatesRemoved( // specified in section 2.2.8.2.5 of the "Set the RTCSessionDescription" // algorithm: https://w3c.github.io/webrtc-pc/#set-description void ConnectionController::OnTrack( - rtc::scoped_refptr transceiver) { + webrtc::scoped_refptr transceiver) { observer_.OnTrack(transceiver); } @@ -461,7 +460,7 @@ void ConnectionController::OnTrack( // will have changed direction to either sendonly or inactive. // https://w3c.github.io/webrtc-pc/#process-remote-track-removal void ConnectionController::OnRemoveTrack( - rtc::scoped_refptr receiver) { + webrtc::scoped_refptr receiver) { observer_.OnRemoveTrack(receiver); } diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/connection_controller.h b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/connection_controller.h index 8c2dbf2eca6..cea815eca2a 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/connection_controller.h +++ b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/connection_controller.h @@ -33,7 +33,7 @@ namespace webrtc_streaming { class PeerConnectionBuilder { public: virtual ~PeerConnectionBuilder() = default; - virtual Result> Build( + virtual Result> Build( webrtc::PeerConnectionObserver& observer, const std::vector& per_connection_servers) = 0; @@ -65,13 +65,13 @@ class ConnectionController : public webrtc::PeerConnectionObserver { // Called when new media tracks are added to the peer connection. virtual void OnTrack( - rtc::scoped_refptr transceiver) = 0; + webrtc::scoped_refptr transceiver) = 0; // Called when media tracks are removed from the peer connection. virtual void OnRemoveTrack( - rtc::scoped_refptr receiver) = 0; + webrtc::scoped_refptr receiver) = 0; // Called when a data channel is added to the peer connection. virtual void OnDataChannel( - rtc::scoped_refptr data_channel) = 0; + webrtc::scoped_refptr data_channel) = 0; }; ConnectionController(PeerSignalingHandler& sig_handler, @@ -92,7 +92,7 @@ class ConnectionController : public webrtc::PeerConnectionObserver { // the function returns, but that's not guaranteed. void HandleSignalingMessage(const Json::Value& msg); - rtc::scoped_refptr peer_connection() { + webrtc::scoped_refptr peer_connection() { return peer_connection_; } @@ -100,11 +100,11 @@ class ConnectionController : public webrtc::PeerConnectionObserver { void OnSignalingChange( webrtc::PeerConnectionInterface::SignalingState new_state) override; void OnAddStream( - rtc::scoped_refptr stream) override; + webrtc::scoped_refptr stream) override; void OnRemoveStream( - rtc::scoped_refptr stream) override; - void OnDataChannel( - rtc::scoped_refptr data_channel) override; + webrtc::scoped_refptr stream) override; + void OnDataChannel(webrtc::scoped_refptr + data_channel) override; void OnRenegotiationNeeded() override; void OnStandardizedIceConnectionChange( webrtc::PeerConnectionInterface::IceConnectionState new_state) override; @@ -116,8 +116,7 @@ class ConnectionController : public webrtc::PeerConnectionObserver { void OnIceCandidateError(const std::string& address, int port, const std::string& url, int error_code, const std::string& error_text) override; - void OnIceCandidatesRemoved( - const std::vector& candidates) override; + void OnIceCandidateRemoved(const webrtc::IceCandidate* candidate) override; // The following can be overridden but are not needed by either the device or // client at the moement. void OnIceConnectionReceivingChange(bool receiving) // override; void OnIceSelectedCandidatePairChanged( const @@ -126,10 +125,10 @@ class ConnectionController : public webrtc::PeerConnectionObserver { // const std::vector>& // streams) override; // void OnInterestingUsage(int usage_pattern) override; - void OnTrack( - rtc::scoped_refptr transceiver) override; + void OnTrack(webrtc::scoped_refptr + transceiver) override; void OnRemoveTrack( - rtc::scoped_refptr receiver) override; + webrtc::scoped_refptr receiver) override; void Shutdown() { shutting_down_ = true; } @@ -155,7 +154,7 @@ class ConnectionController : public webrtc::PeerConnectionObserver { webrtc::CreateSessionDescriptionObserver* ThisAsCreateSDPObserver(); webrtc::SetSessionDescriptionObserver* ThisAsSetSDPObserver(); - rtc::scoped_refptr + webrtc::scoped_refptr ThisAsSetRemoteSDPObserver(); Result OnCreateSDPSuccess(webrtc::SessionDescriptionInterface* desc); @@ -169,7 +168,7 @@ class ConnectionController : public webrtc::PeerConnectionObserver { Observer& observer_; bool shutting_down_; - rtc::scoped_refptr peer_connection_; + webrtc::scoped_refptr peer_connection_; std::vector> pending_ice_candidates_; diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/decoder_provider.h b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/decoder_provider.h index 2123e236322..61a9a50b2f6 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/decoder_provider.h +++ b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/decoder_provider.h @@ -20,6 +20,7 @@ #include #include +#include "api/environment/environment.h" #include "api/video_codecs/sdp_video_format.h" #include "api/video_codecs/video_decoder.h" @@ -43,6 +44,7 @@ class DecoderProvider { virtual bool IsAvailable() const = 0; virtual std::vector GetSupportedFormats() const = 0; virtual Result> CreateDecoder( + const webrtc::Environment& env, const webrtc::SdpVideoFormat& format) const = 0; // Descending: higher priority sorts first. diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/encoder_provider.h b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/encoder_provider.h index 5103ec65d85..3e3b1f15fc7 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/encoder_provider.h +++ b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/encoder_provider.h @@ -20,6 +20,7 @@ #include #include +#include "api/environment/environment.h" #include "api/video_codecs/sdp_video_format.h" #include "api/video_codecs/video_encoder.h" @@ -44,6 +45,7 @@ class EncoderProvider { virtual bool IsAvailable() const = 0; virtual std::vector GetSupportedFormats() const = 0; virtual Result> CreateEncoder( + const webrtc::Environment& env, const webrtc::SdpVideoFormat& format) const = 0; // Descending: higher priority sorts first. diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/nvenc_video_encoder.cpp b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/nvenc_video_encoder.cpp index 42cee5c4bb0..8477e937b01 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/nvenc_video_encoder.cpp +++ b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/nvenc_video_encoder.cpp @@ -410,7 +410,7 @@ Result NvencVideoEncoder::EncodeInner( << frame.width() << "x" << frame.height()); - rtc::scoped_refptr buffer = + webrtc::scoped_refptr buffer = frame.video_frame_buffer(); CF_EXPECT(buffer->type() == webrtc::VideoFrameBuffer::Type::kNative, "Non-native buffer type: " << static_cast(buffer->type())); @@ -524,7 +524,7 @@ Result NvencVideoEncoder::EncodeInner( lock_bs.bitstreamSizeInBytes)); encoded_image._encodedWidth = width_; encoded_image._encodedHeight = height_; - encoded_image.SetTimestamp(frame.timestamp()); + encoded_image.SetRtpTimestamp(frame.rtp_timestamp()); encoded_image.ntp_time_ms_ = frame.ntp_time_ms(); encoded_image.capture_time_ms_ = frame.render_time_ms(); encoded_image.rotation_ = frame.rotation(); diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/peer_connection_utils.cpp b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/peer_connection_utils.cpp index bd263662e9e..939dd3c600a 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/peer_connection_utils.cpp +++ b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/peer_connection_utils.cpp @@ -32,21 +32,19 @@ namespace cuttlefish { namespace webrtc_streaming { -Result> CreateAndStartThread( +Result> CreateAndStartThread( const std::string& name) { - auto thread = rtc::Thread::CreateWithSocketServer(); + auto thread = webrtc::Thread::CreateWithSocketServer(); CF_EXPECTF(thread.get(), "Failed to create \"{}\" thread", name); thread->SetName(name, nullptr); CF_EXPECTF(thread->Start(), "Failed to start \"{}\" thread", name); return thread; } -Result> +Result> CreatePeerConnectionFactory( - rtc::Thread* network_thread, rtc::Thread* worker_thread, - rtc::Thread* signal_thread, - rtc::scoped_refptr audio_device_module) { - + webrtc::Thread* network_thread, webrtc::Thread* signal_thread, + webrtc::scoped_refptr audio_device_module) { VLOG(1) << "Available encoder providers:"; for (EncoderProvider* provider : EncoderProviderRegistry::Get().GetProviders()) { @@ -76,9 +74,9 @@ CreatePeerConnectionFactory( video_encoder_factory->GetSupportedFormats(); std::vector decoder_formats = video_decoder_factory->GetSupportedFormats(); - LOG(INFO) << "PeerConnectionFactory: " - << encoder_formats.size() << " encoder format(s), " - << decoder_formats.size() << " decoder format(s)"; + LOG(INFO) << "PeerConnectionFactory: " << encoder_formats.size() + << " encoder format(s), " << decoder_formats.size() + << " decoder format(s)"; for (const webrtc::SdpVideoFormat& fmt : encoder_formats) { VLOG(1) << " encoder: " << fmt.ToString(); } @@ -87,12 +85,11 @@ CreatePeerConnectionFactory( } auto peer_connection_factory = webrtc::CreatePeerConnectionFactory( - network_thread, worker_thread, signal_thread, audio_device_module, + network_thread, signal_thread, audio_device_module, webrtc::CreateBuiltinAudioEncoderFactory(), webrtc::CreateBuiltinAudioDecoderFactory(), - std::move(video_encoder_factory), - std::move(video_decoder_factory), nullptr /* audio_mixer */, - nullptr /* audio_processing */); + std::move(video_encoder_factory), std::move(video_decoder_factory), + nullptr /* audio_mixer */, nullptr /* audio_processing */); CF_EXPECT(peer_connection_factory.get(), "Failed to create peer connection factory"); @@ -105,12 +102,12 @@ CreatePeerConnectionFactory( return peer_connection_factory; } -Result> +Result> CreatePeerConnection( - rtc::scoped_refptr + webrtc::scoped_refptr peer_connection_factory, - webrtc::PeerConnectionDependencies dependencies, - uint16_t min_port, uint16_t max_port, + webrtc::PeerConnectionDependencies dependencies, uint16_t min_port, + uint16_t max_port, const std::vector& servers) { webrtc::PeerConnectionInterface::RTCConfiguration config; config.sdp_semantics = webrtc::SdpSemantics::kUnifiedPlan; diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/peer_connection_utils.h b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/peer_connection_utils.h index f2f869d8b2b..29db675363e 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/peer_connection_utils.h +++ b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/peer_connection_utils.h @@ -24,25 +24,23 @@ namespace cuttlefish { namespace webrtc_streaming { -Result> CreateAndStartThread( +Result> CreateAndStartThread( const std::string& name); -Result> +Result> CreatePeerConnectionFactory( - rtc::Thread* network_thread, rtc::Thread* worker_thread, - rtc::Thread* signal_thread, - rtc::scoped_refptr audio_device_module); + webrtc::Thread* network_thread, webrtc::Thread* signal_thread, + webrtc::scoped_refptr audio_device_module); // TODO(b/263528313): Use a packet socket factory instead of a port range. -Result> +Result> CreatePeerConnection( - rtc::scoped_refptr + webrtc::scoped_refptr peer_connection_factory, - webrtc::PeerConnectionDependencies dependencies, - uint16_t min_port, uint16_t max_port, + webrtc::PeerConnectionDependencies dependencies, uint16_t min_port, + uint16_t max_port, const std::vector& per_connection_servers); } // namespace webrtc_streaming } // namespace cuttlefish - diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/vp8only_encoder_factory.cpp b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/vp8only_encoder_factory.cpp index 8d9149128ee..d4a7e182845 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/vp8only_encoder_factory.cpp +++ b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/vp8only_encoder_factory.cpp @@ -36,9 +36,9 @@ std::vector VP8OnlyEncoderFactory::GetSupportedFormats() return ret; } -std::unique_ptr VP8OnlyEncoderFactory::CreateVideoEncoder( - const webrtc::SdpVideoFormat& format) { - return inner_->CreateVideoEncoder(format); +std::unique_ptr VP8OnlyEncoderFactory::Create( + const webrtc::Environment& env, const webrtc::SdpVideoFormat& format) { + return inner_->Create(env, format); } std::unique_ptr diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/vp8only_encoder_factory.h b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/vp8only_encoder_factory.h index 4a03dcf63fd..39f4b111afd 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/vp8only_encoder_factory.h +++ b/base/cvd/cuttlefish/host/frontend/webrtc/libcommon/vp8only_encoder_factory.h @@ -28,7 +28,8 @@ class VP8OnlyEncoderFactory : public webrtc::VideoEncoderFactory { std::vector GetSupportedFormats() const override; - std::unique_ptr CreateVideoEncoder( + std::unique_ptr Create( + const webrtc::Environment& env, const webrtc::SdpVideoFormat& format) override; std::unique_ptr GetEncoderSelector() const override; diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/audio_track_source_impl.cpp b/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/audio_track_source_impl.cpp index f2160728470..db9ba40d67e 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/audio_track_source_impl.cpp +++ b/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/audio_track_source_impl.cpp @@ -45,8 +45,8 @@ void AudioTrackSourceImpl::RemoveSink(webrtc::AudioTrackSinkInterface* sink) { sinks_.erase(sink); } -const cricket::AudioOptions AudioTrackSourceImpl::options() const { - return cricket::AudioOptions(); +const webrtc::AudioOptions AudioTrackSourceImpl::options() const { + return webrtc::AudioOptions(); } void AudioTrackSourceImpl::OnFrame(const AudioFrameBuffer& frame, diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/audio_track_source_impl.h b/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/audio_track_source_impl.h index 504a21f90db..5da165dc8e6 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/audio_track_source_impl.h +++ b/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/audio_track_source_impl.h @@ -42,7 +42,7 @@ class AudioTrackSourceImpl : public webrtc::AudioSourceInterface { // Returns options for the AudioSource. // (for some of the settings this approach is broken, e.g. setting // audio network adaptation on the source is the wrong layer of abstraction). - virtual const cricket::AudioOptions options() const override; + virtual const webrtc::AudioOptions options() const override; void OnFrame(const AudioFrameBuffer& frame, int64_t timestamp_ms); @@ -71,7 +71,8 @@ class AudioTrackSourceImplSinkWrapper : public AudioSink { public: virtual ~AudioTrackSourceImplSinkWrapper() = default; - AudioTrackSourceImplSinkWrapper(rtc::scoped_refptr obj) + AudioTrackSourceImplSinkWrapper( + webrtc::scoped_refptr obj) : track_source_impl_(obj) {} void OnFrame(const AudioFrameBuffer& frame, int64_t timestamp_ms) override { @@ -79,7 +80,7 @@ class AudioTrackSourceImplSinkWrapper : public AudioSink { } private: - rtc::scoped_refptr track_source_impl_; + webrtc::scoped_refptr track_source_impl_; }; } // namespace webrtc_streaming diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/camera_streamer.h b/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/camera_streamer.h index 1d1943b6f0f..18c1cae00ae 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/camera_streamer.h +++ b/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/camera_streamer.h @@ -31,7 +31,7 @@ namespace cuttlefish { namespace webrtc_streaming { -class CameraStreamer : public rtc::VideoSinkInterface, +class CameraStreamer : public webrtc::VideoSinkInterface, public CameraController { public: CameraStreamer(unsigned int port, unsigned int cid, bool vhost_user); @@ -63,7 +63,7 @@ class CameraStreamer : public rtc::VideoSinkInterface, std::string settings_buffer_; std::mutex frame_mutex_; std::mutex onframe_mutex_; - rtc::scoped_refptr scaled_frame_; + webrtc::scoped_refptr scaled_frame_; unsigned int cid_; unsigned int port_; bool vhost_user_; diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/client_handler.cpp b/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/client_handler.cpp index 0b692cbe34c..a4f30436706 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/client_handler.cpp +++ b/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/client_handler.cpp @@ -33,8 +33,8 @@ namespace webrtc_streaming { // This class hides away that complexity and allows to set up sinks only once. class ClientVideoTrackImpl : public ClientVideoTrackInterface { public: - void AddOrUpdateSink(rtc::VideoSinkInterface *sink, - const rtc::VideoSinkWants &wants) override { + void AddOrUpdateSink(webrtc::VideoSinkInterface *sink, + const webrtc::VideoSinkWants &wants) override { sink_ = sink; wants_ = wants; if (video_track_) { @@ -57,8 +57,8 @@ class ClientVideoTrackImpl : public ClientVideoTrackInterface { private: webrtc::VideoTrackInterface* video_track_; - rtc::VideoSinkInterface *sink_ = nullptr; - rtc::VideoSinkWants wants_ = {}; + webrtc::VideoSinkInterface *sink_ = nullptr; + webrtc::VideoSinkWants wants_ = {}; }; std::shared_ptr ClientHandler::Create( @@ -89,10 +89,10 @@ ClientHandler::~ClientHandler() { controller_.Shutdown(); } -rtc::scoped_refptr +webrtc::scoped_refptr ClientHandler::AddTrackToConnection( - rtc::scoped_refptr track, - rtc::scoped_refptr peer_connection, + webrtc::scoped_refptr track, + webrtc::scoped_refptr peer_connection, const std::string &label) { if (!peer_connection) { return nullptr; @@ -130,7 +130,7 @@ ClientHandler::AddTrackToConnection( } bool ClientHandler::AddDisplay( - rtc::scoped_refptr video_track, + webrtc::scoped_refptr video_track, const std::string &label) { auto [it, inserted] = displays_.emplace(label, DisplayTrackAndSender{ .track = video_track, @@ -167,7 +167,7 @@ bool ClientHandler::RemoveDisplay(const std::string &label) { } bool ClientHandler::AddAudio( - rtc::scoped_refptr audio_track, + webrtc::scoped_refptr audio_track, const std::string &label) { audio_streams_.emplace_back(audio_track, label); auto peer_connection = controller_.peer_connection(); @@ -187,7 +187,7 @@ Result ClientHandler::SendMessage(const Json::Value &msg) { return {}; } -Result> +Result> ClientHandler::Build( webrtc::PeerConnectionObserver &observer, const std::vector @@ -285,12 +285,12 @@ void ClientHandler::OnConnectionStateChange( } void ClientHandler::OnDataChannel( - rtc::scoped_refptr data_channel) { + webrtc::scoped_refptr data_channel) { data_channels_handler_.OnDataChannelOpen(data_channel); } void ClientHandler::OnTrack( - rtc::scoped_refptr transceiver) { + webrtc::scoped_refptr transceiver) { auto track = transceiver->receiver()->track(); if (track && track->kind() == webrtc::MediaStreamTrackInterface::kVideoKind) { // It's ok to take the raw pointer here because we make sure to unset it @@ -300,7 +300,7 @@ void ClientHandler::OnTrack( } } void ClientHandler::OnRemoveTrack( - rtc::scoped_refptr receiver) { + webrtc::scoped_refptr receiver) { auto track = receiver->track(); if (track && track->kind() == webrtc::MediaStreamTrackInterface::kVideoKind) { // this only unsets if the track matches the one already in store diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/client_handler.h b/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/client_handler.h index 9dc7478c528..77f22315a33 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/client_handler.h +++ b/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/client_handler.h @@ -62,11 +62,11 @@ class ClientHandler : public ConnectionController::Observer, std::function on_connection_changed_cb); ~ClientHandler() override; - bool AddDisplay(rtc::scoped_refptr track, + bool AddDisplay(webrtc::scoped_refptr track, const std::string& label); bool RemoveDisplay(const std::string& label); - bool AddAudio(rtc::scoped_refptr track, + bool AddAudio(webrtc::scoped_refptr track, const std::string& label); ClientVideoTrackInterface* GetCameraStream(); @@ -77,11 +77,11 @@ class ClientHandler : public ConnectionController::Observer, void OnConnectionStateChange( Result new_state) override; void OnDataChannel( - rtc::scoped_refptr data_channel) override; + webrtc::scoped_refptr data_channel) override; void OnTrack( - rtc::scoped_refptr transceiver) override; + webrtc::scoped_refptr transceiver) override; void OnRemoveTrack( - rtc::scoped_refptr receiver) override; + webrtc::scoped_refptr receiver) override; // PeerSignalingHandling implementation Result SendMessage(const Json::Value& msg) override; @@ -89,7 +89,7 @@ class ClientHandler : public ConnectionController::Observer, // PeerConnectionBuilder implementation // Delegates on its own pc builder to create the pc and then adds the displays // and other streams as required. - Result> Build( + Result> Build( webrtc::PeerConnectionObserver& observer, const std::vector& per_connection_servers) override; @@ -105,9 +105,9 @@ class ClientHandler : public ConnectionController::Observer, void LogAndReplyError(const std::string& error_msg) const; - rtc::scoped_refptr AddTrackToConnection( - rtc::scoped_refptr track, - rtc::scoped_refptr peer_connection, + webrtc::scoped_refptr AddTrackToConnection( + webrtc::scoped_refptr track, + webrtc::scoped_refptr peer_connection, const std::string& label); int client_id_; @@ -119,12 +119,12 @@ class ClientHandler : public ConnectionController::Observer, DataChannelHandlers data_channels_handler_; std::unique_ptr camera_track_; struct DisplayTrackAndSender { - rtc::scoped_refptr track; - rtc::scoped_refptr sender; + webrtc::scoped_refptr track; + webrtc::scoped_refptr sender; }; std::map displays_; std::vector< - std::pair, std::string>> + std::pair, std::string>> audio_streams_; bool connected_once_ = false; }; @@ -133,8 +133,8 @@ class ClientVideoTrackInterface { public: virtual ~ClientVideoTrackInterface() = default; virtual void AddOrUpdateSink( - rtc::VideoSinkInterface* sink, - const rtc::VideoSinkWants& wants) = 0; + webrtc::VideoSinkInterface* sink, + const webrtc::VideoSinkWants& wants) = 0; }; } // namespace webrtc_streaming diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/data_channels.cpp b/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/data_channels.cpp index 5fb0c35b7b6..bd306dc2f5f 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/data_channels.cpp +++ b/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/data_channels.cpp @@ -41,7 +41,7 @@ class DataChannelHandler : public webrtc::DataChannelObserver { protected: // Provide access to the underlying data channel and the connection observer. - virtual rtc::scoped_refptr channel() = 0; + virtual webrtc::scoped_refptr channel() = 0; virtual std::shared_ptr observer() = 0; // Subclasses must override this to process messages. @@ -391,7 +391,7 @@ template class DataChannelHandlerImpl : public H { public: DataChannelHandlerImpl( - rtc::scoped_refptr channel, + webrtc::scoped_refptr channel, std::shared_ptr observer) : channel_(channel), observer_(observer) { channel->RegisterObserver(this); @@ -400,13 +400,13 @@ class DataChannelHandlerImpl : public H { protected: // DataChannelHandler implementation - rtc::scoped_refptr channel() override { + webrtc::scoped_refptr channel() override { return channel_; } std::shared_ptr observer() override { return observer_; } private: - rtc::scoped_refptr channel_; + webrtc::scoped_refptr channel_; std::shared_ptr observer_; }; @@ -414,7 +414,7 @@ class DataChannelHandlerImpl : public H { bool DataChannelHandler::Send(const uint8_t *msg, size_t size, bool binary) { webrtc::DataBuffer buffer( - rtc::CopyOnWriteBuffer(absl::MakeSpan(msg, size)), binary); + webrtc::CopyOnWriteBuffer(absl::MakeSpan(msg, size)), binary); // TODO (b/185832105): When the SCTP channel is congested data channel // messages are buffered up to 16MB, when the buffer is full the channel // is abruptly closed. Keep track of the buffered data to avoid losing the @@ -453,7 +453,7 @@ DataChannelHandlers::DataChannelHandlers( DataChannelHandlers::~DataChannelHandlers() {} void DataChannelHandlers::OnDataChannelOpen( - rtc::scoped_refptr channel) { + webrtc::scoped_refptr channel) { auto label = channel->label(); VLOG(1) << "Data channel connected: " << label; if (label == kInputChannelLabel) { diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/data_channels.h b/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/data_channels.h index e049dc30cd0..b334f39346d 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/data_channels.h +++ b/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/data_channels.h @@ -40,7 +40,7 @@ class DataChannelHandlers { ~DataChannelHandlers(); void OnDataChannelOpen( - rtc::scoped_refptr channel); + webrtc::scoped_refptr channel); private: std::unique_ptr input_; diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/local_recorder.cpp b/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/local_recorder.cpp index 525e1128d18..d565f36dd21 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/local_recorder.cpp +++ b/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/local_recorder.cpp @@ -25,6 +25,7 @@ #include "absl/log/check.h" #include "absl/log/log.h" +#include "api/environment/environment_factory.h" #include "api/media_stream_interface.h" #include "api/rtp_parameters.h" #include "api/task_queue/default_task_queue_factory.h" @@ -45,7 +46,7 @@ constexpr double kRtpTicksPerNs = kRtpTicksPerUs / 1000.; class LocalRecorder::Display : public webrtc::EncodedImageCallback, - public rtc::VideoSinkInterface { + public webrtc::VideoSinkInterface { public: Display(LocalRecorder::Impl& impl); ~Display() { @@ -63,6 +64,8 @@ class LocalRecorder::Display virtual webrtc::EncodedImageCallback::Result OnEncodedImage( const webrtc::EncodedImage& encoded_image, const webrtc::CodecSpecificInfo* codec_specific_info) override; + void OnFrameDropped(uint32_t rtp_timestamp, int spatial_id, + bool is_end_of_temporal_unit) override {} LocalRecorder::Impl& impl_; std::shared_ptr source_; @@ -130,7 +133,7 @@ void LocalRecorder::AddDisplay( auto display = existing_display->second.get(); CHECK(display); display->source_ = source; - source->AddOrUpdateSink(display, rtc::VideoSinkWants{}); + source->AddOrUpdateSink(display, webrtc::VideoSinkWants{}); return; } @@ -143,8 +146,8 @@ void LocalRecorder::AddDisplay( return; } - display->video_encoder_ = impl_->encoder_factory_->CreateVideoEncoder( - webrtc::SdpVideoFormat("VP8")); + display->video_encoder_ = impl_->encoder_factory_->Create( + webrtc::CreateEnvironment(), webrtc::SdpVideoFormat("VP8")); if (!display->video_encoder_) { LOG(ERROR) << "Could not create vp8 video encoder"; return; @@ -155,7 +158,7 @@ void LocalRecorder::AddDisplay( LOG(ERROR) << "Could not register encode complete callback"; return; } - source->AddOrUpdateSink(display.get(), rtc::VideoSinkWants{}); + source->AddOrUpdateSink(display.get(), webrtc::VideoSinkWants{}); webrtc::VideoCodec codec{}; memset(&codec, 0, sizeof(codec)); @@ -235,7 +238,7 @@ void LocalRecorder::Display::EncoderLoop() { auto timestamp_diff = std::chrono::duration_cast( now - start_timestamp); frame->set_timestamp_us(timestamp_diff.count()); - frame->set_timestamp(timestamp_diff.count() * kRtpTicksPerUs); + frame->set_rtp_timestamp(timestamp_diff.count() * kRtpTicksPerUs); std::vector types; auto time_since_keyframe = now - last_keyframe_time; @@ -266,7 +269,7 @@ void LocalRecorder::Display::Stop() { webrtc::EncodedImageCallback::Result LocalRecorder::Display::OnEncodedImage( const webrtc::EncodedImage& encoded_image, const webrtc::CodecSpecificInfo* codec_specific_info) { - uint64_t timestamp = encoded_image.Timestamp() / kRtpTicksPerNs; + uint64_t timestamp = encoded_image.RtpTimestamp() / kRtpTicksPerNs; std::lock_guard lock(impl_.mkv_mutex_); @@ -281,7 +284,7 @@ webrtc::EncodedImageCallback::Result LocalRecorder::Display::OnEncodedImage( : webrtc::EncodedImageCallback::Result::Error::ERROR_SEND_FAILED); if (success) { - result.frame_id = encoded_image.Timestamp(); + result.frame_id = encoded_image.RtpTimestamp(); } return result; } diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/recording_manager.cpp b/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/recording_manager.cpp index d209322461f..457665b8d92 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/recording_manager.cpp +++ b/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/recording_manager.cpp @@ -113,7 +113,7 @@ void RecordingManager::StartSingleRecorder(const std::string& label) { return; } - int recording_time = rtc::TimeMillis(); + int recording_time = webrtc::TimeMillis(); std::string recording_path = fmt::format("{}recording_{}_{}_{}.webm", recording_directory_, instance_name_, label, recording_time); diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/streamer.cpp b/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/streamer.cpp index e47b637beff..b32c2d3dd5e 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/streamer.cpp +++ b/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/streamer.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include "cuttlefish/host/frontend/webrtc/libcommon/audio_device.h" @@ -91,7 +91,7 @@ struct DisplayDescriptor { int height; int dpi; bool touch_enabled; - rtc::scoped_refptr source; + webrtc::scoped_refptr source; }; struct TouchpadDescriptor { @@ -116,7 +116,7 @@ struct OperatorServerConfig { class AudioDeviceModuleWrapper : public AudioSource { public: AudioDeviceModuleWrapper( - rtc::scoped_refptr device_module) + webrtc::scoped_refptr device_module) : device_module_(device_module) {} int GetMoreAudioData(void* data, int bytes_per_sample, int samples_per_channel, int num_channels, @@ -126,12 +126,12 @@ class AudioDeviceModuleWrapper : public AudioSource { sample_rate, muted); } - rtc::scoped_refptr device_module() { + webrtc::scoped_refptr device_module() { return device_module_; } private: - rtc::scoped_refptr device_module_; + webrtc::scoped_refptr device_module_; }; } // namespace @@ -159,7 +159,7 @@ class Streamer::Impl : public ServerConnectionObserver, void HandleClientMessage(const Json::Value& server_message); // PeerConnectionBuilder - Result> Build( + Result> Build( webrtc::PeerConnectionObserver& observer, const std::vector& per_connection_servers) override; @@ -170,14 +170,13 @@ class Streamer::Impl : public ServerConnectionObserver, OperatorServerConfig operator_config_; std::unique_ptr server_connection_; std::shared_ptr connection_observer_factory_; - rtc::scoped_refptr + webrtc::scoped_refptr peer_connection_factory_; - std::unique_ptr network_thread_; - std::unique_ptr worker_thread_; - std::unique_ptr signal_thread_; + std::unique_ptr network_thread_; + std::unique_ptr signal_thread_; std::map displays_; std::map touchpads_; - std::map> + std::map> audio_sources_; std::map> clients_; std::weak_ptr operator_observer_; @@ -197,7 +196,7 @@ Streamer::Streamer(std::unique_ptr impl) std::unique_ptr Streamer::Create( const StreamerConfig& cfg, RecordingManager& recording_manager, std::shared_ptr connection_observer_factory) { - rtc::LogMessage::LogToDebug(rtc::LS_ERROR); + webrtc::LogMessage::LogToDebug(webrtc::LS_ERROR); std::unique_ptr impl(new Streamer::Impl()); impl->config_ = cfg; @@ -211,13 +210,6 @@ std::unique_ptr Streamer::Create( } impl->network_thread_ = std::move(*network_thread_result); - auto worker_thread_result = CreateAndStartThread("worker-thread"); - if (!worker_thread_result.has_value()) { - LOG(ERROR) << worker_thread_result.error(); - return nullptr; - } - impl->worker_thread_ = std::move(*worker_thread_result); - auto signal_thread_result = CreateAndStartThread("signal-thread"); if (!signal_thread_result.has_value()) { LOG(ERROR) << signal_thread_result.error(); @@ -226,12 +218,12 @@ std::unique_ptr Streamer::Create( impl->signal_thread_ = std::move(*signal_thread_result); impl->audio_device_module_ = std::make_shared( - rtc::scoped_refptr( - new rtc::RefCountedObject())); + webrtc::scoped_refptr( + new webrtc::RefCountedObject())); auto result = CreatePeerConnectionFactory( - impl->network_thread_.get(), impl->worker_thread_.get(), - impl->signal_thread_.get(), impl->audio_device_module_->device_module()); + impl->network_thread_.get(), impl->signal_thread_.get(), + impl->audio_device_module_->device_module()); if (!result.has_value()) { LOG(ERROR) << result.error(); @@ -253,19 +245,19 @@ std::shared_ptr Streamer::AddDisplay(const std::string& label, LOG(ERROR) << "Display with same label already exists: " << label; return nullptr; } - rtc::scoped_refptr source( - new rtc::RefCountedObject(width, height)); + webrtc::scoped_refptr source( + new webrtc::RefCountedObject(width, height)); impl_->displays_[label] = {width, height, dpi, touch_enabled, source}; auto video_track = impl_->peer_connection_factory_->CreateVideoTrack( - label, source.get()); + source, label); for (auto& [_, client] : impl_->clients_) { client->AddDisplay(video_track, label); } if (impl_->recording_manager_) { - rtc::scoped_refptr source2 = + webrtc::scoped_refptr source2 = source; auto deleter = [](webrtc::VideoTrackSourceInterface* source) { source->Release(); @@ -320,8 +312,8 @@ std::shared_ptr Streamer::AddAudioStream(const std::string& label) { << label; return nullptr; } - rtc::scoped_refptr source( - new rtc::RefCountedObject()); + webrtc::scoped_refptr source( + new webrtc::RefCountedObject()); impl_->audio_sources_[label] = source; return std::shared_ptr( new AudioTrackSourceImplSinkWrapper(source)); @@ -659,7 +651,7 @@ std::shared_ptr Streamer::Impl::CreateClientHandler( auto& video_source = entry.second.source; auto video_track = - peer_connection_factory_->CreateVideoTrack(label, video_source.get()); + peer_connection_factory_->CreateVideoTrack(video_source, label); client_handler->AddDisplay(video_track, label); } @@ -674,7 +666,7 @@ std::shared_ptr Streamer::Impl::CreateClientHandler( return client_handler; } -Result> +Result> Streamer::Impl::Build( webrtc::PeerConnectionObserver& observer, const std::vector& @@ -741,7 +733,7 @@ void Streamer::Impl::SetupCameraForClient(int client_id) { auto camera_track = client_handler->GetCameraStream(); if (camera_track) { camera_track->AddOrUpdateSink(camera_streamer_.get(), - rtc::VideoSinkWants()); + webrtc::VideoSinkWants()); } } } diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/video_track_source_impl.cpp b/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/video_track_source_impl.cpp index a0013f6e9c4..bf613f69199 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/video_track_source_impl.cpp +++ b/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/video_track_source_impl.cpp @@ -42,8 +42,8 @@ void VideoTrackSourceImpl::OnFrame(std::shared_ptr frame, last_timestamp_us_ = timestamp_us; } - rtc::scoped_refptr buffer( - new rtc::RefCountedObject(std::move(frame))); + webrtc::scoped_refptr buffer( + new webrtc::RefCountedObject(std::move(frame))); auto video_frame = webrtc::VideoFrame::Builder() .set_video_frame_buffer(buffer) @@ -59,7 +59,8 @@ bool VideoTrackSourceImpl::GetStats(Stats* stats) { } bool VideoTrackSourceImpl::SupportsEncodedOutput() const { return false; } -rtc::VideoSourceInterface* VideoTrackSourceImpl::source() { +webrtc::VideoSourceInterface* +VideoTrackSourceImpl::source() { return &broadcaster_; } diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/video_track_source_impl.h b/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/video_track_source_impl.h index c3b2e1983b9..6a1749e4d06 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/video_track_source_impl.h +++ b/base/cvd/cuttlefish/host/frontend/webrtc/libdevice/video_track_source_impl.h @@ -16,7 +16,7 @@ #pragma once -#include +#include #include #include @@ -53,18 +53,18 @@ class VideoTrackSourceImpl : public webrtc::VideoTrackSource { bool SupportsEncodedOutput() const override; void GenerateKeyFrame() override {} void AddEncodedSink( - rtc::VideoSinkInterface* sink) override {} + webrtc::VideoSinkInterface* sink) override {} void RemoveEncodedSink( - rtc::VideoSinkInterface* sink) override {} + webrtc::VideoSinkInterface* sink) override {} - rtc::VideoSourceInterface* source() override; + webrtc::VideoSourceInterface* source() override; private: int width_; int height_; std::mutex timestamp_mutex_; int64_t last_timestamp_us_ = 0; // Ensure strictly monotonic timestamps - rtc::VideoBroadcaster broadcaster_; + webrtc::VideoBroadcaster broadcaster_; }; // Wraps a VideoTrackSourceImpl as an implementation of the VideoSink interface. @@ -77,7 +77,8 @@ class VideoTrackSourceImplSinkWrapper : public VideoSink { public: virtual ~VideoTrackSourceImplSinkWrapper() = default; - VideoTrackSourceImplSinkWrapper(rtc::scoped_refptr obj) + VideoTrackSourceImplSinkWrapper( + webrtc::scoped_refptr obj) : track_source_impl_(obj) {} void OnFrame(std::shared_ptr frame, @@ -86,7 +87,7 @@ class VideoTrackSourceImplSinkWrapper : public VideoSink { } private: - rtc::scoped_refptr track_source_impl_; + webrtc::scoped_refptr track_source_impl_; }; } // namespace webrtc_streaming diff --git a/base/cvd/cuttlefish/host/frontend/webrtc/main.cpp b/base/cvd/cuttlefish/host/frontend/webrtc/main.cpp index 81466e67ce2..83471d9c5dd 100644 --- a/base/cvd/cuttlefish/host/frontend/webrtc/main.cpp +++ b/base/cvd/cuttlefish/host/frontend/webrtc/main.cpp @@ -643,7 +643,7 @@ int CuttlefishMain() { int main(int argc, char** argv) { cuttlefish::DefaultSubprocessLogging(argv); - rtc::LogMessage::LogToDebug(rtc::LS_WARNING); + webrtc::LogMessage::LogToDebug(webrtc::LS_WARNING); ::gflags::ParseCommandLineFlags(&argc, &argv, true); return cuttlefish::CuttlefishMain(); }