Merge branch 'i8e' into i9e

i9e
Arkady L. Shane 8 months ago
commit 5848c1cdd4
Signed by: tigro
GPG Key ID: 1EC08A25C9DB2503

@ -90,7 +90,7 @@ diff -up chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition
- : kMaxEmptyCacheIndexBits; // < kMaxFreeableSpans.
- uint16_t unused2_ : (16 - 1 - kMaxEmptyCacheIndexBits);
+ bool in_empty_cache_ : 1;
+ uint8_t empty_cache_index_ : kEmptyCacheIndexBits; // < kMaxFreeableSpans.
+ uint8_t empty_cache_index_ : kMaxEmptyCacheIndexBits; // < kMaxFreeableSpans.
// Can use only 48 bits (6B) in this bitfield, as this structure is embedded
// in PartitionPage which has 2B worth of fields and must fit in 32B.

@ -1,5 +1,6 @@
#!/bin/bash
# Copyright 2013-2015 Tomas Popela <tpopela@redhat.com>
# Copyright 2022-2024 Than Ngo <than@redhat.com>
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
# "Software"), to deal in the Software without restriction, including
@ -42,6 +43,10 @@ function copy_files() {
where=$(pwd)
pushd $1
patch -p0 < ../ffmpeg-clean.patch
popd
if ! generated_files=$(./get_free_ffmpeg_source_files.py "$1" "$2"); then
exit 1
fi
@ -87,9 +92,6 @@ header_files=" libavcodec/x86/inline_asm.h \
libavcodec/dv.h \
libavcodec/error_resilience.h \
libavcodec/fdctdsp.h \
libavcodec/fft.h \
libavcodec/fft-internal.h \
libavcodec/fft_table.h \
libavcodec/flac.h \
libavcodec/flacdsp.h \
libavcodec/flac_parse.h \
@ -100,6 +102,7 @@ header_files=" libavcodec/x86/inline_asm.h \
libavcodec/hevc.h \
libavcodec/hpeldsp.h \
libavcodec/hwaccels.h \
libavcodec/hwaccel_internal.h \
libavcodec/hwconfig.h \
libavcodec/idctdsp.h \
libavcodec/internal.h \
@ -177,11 +180,14 @@ header_files=" libavcodec/x86/inline_asm.h \
libavformat/version.h \
libavformat/version_major.h \
libavformat/w64.h \
libavformat/iamf_parse.h \
libavformat/iamf_reader.h \
libavformat/iamf.h \
libavutil/aarch64/cpu.h \
libavutil/x86/asm.h \
libavutil/x86/bswap.h \
libavutil/x86/cpu.h \
libavutil/x86/emms.h
libavutil/emms.h \
libavutil/x86/intreadwrite.h \
libavutil/x86/intmath.h
libavutil/x86/timer.h \
@ -217,16 +223,15 @@ header_files=" libavcodec/x86/inline_asm.h \
libavutil/timestamp.h \
libavutil/tx_priv.h \
libavutil/version.h \
libavutil/sfc64.h \
libswresample/swresample.h \
libswresample/version.h \
libswresample/version_major.h \
compat/va_copy.h \
compat/atomics/gcc/stdatomic.h "
manual_files=" libavcodec/aarch64/fft_neon.S \
libavcodec/aarch64/h264pred_neon.S \
manual_files=" libavcodec/aarch64/h264pred_neon.S \
libavcodec/aarch64/hpeldsp_neon.S \
libavcodec/aarch64/mdct_neon.S \
libavcodec/aarch64/neon.S \
libavcodec/aarch64/vorbisdsp_neon.S \
libavcodec/aarch64/vorbisdsp_init.c \
@ -240,7 +245,6 @@ manual_files=" libavcodec/aarch64/fft_neon.S \
libavcodec/x86/vp3dsp.asm \
libavcodec/x86/vp8dsp.asm \
libavcodec/bit_depth_template.c \
libavcodec/fft_template.c \
libavcodec/flacdec.c \
libavcodec/flacdsp.c \
libavcodec/flacdsp_template.c \
@ -248,7 +252,6 @@ manual_files=" libavcodec/aarch64/fft_neon.S \
libavcodec/h264pred_template.c \
libavcodec/hpel_template.c \
libavcodec/hpeldsp.c \
libavcodec/mdct_template.c \
libavcodec/options.c \
libavcodec/pcm.c \
libavcodec/pel_template.c \
@ -301,7 +304,6 @@ mp3_files=" libavcodec/aarch64/aacpsdsp_init_aarch64.c \
libavcodec/autorename_libavcodec_mpegaudiodsp.c \
libavcodec/autorename_libavcodec_sbrdsp.c \
libavcodec/cbrt_data.c \
libavcodec/dct.c \
libavcodec/dct32_fixed.c \
libavcodec/dct32_float.c \
libavcodec/dct32_template.c \
@ -319,7 +321,6 @@ mp3_files=" libavcodec/aarch64/aacpsdsp_init_aarch64.c \
libavcodec/sbrdsp.c \
libavcodec/sbrdsp_template.c \
libavcodec/sinewin.c \
libavcodec/x86/dct_init.c \
libavcodec/x86/dct32.asm \
libavcodec/x86/imdct36.asm \
libavcodec/x86/mpegaudiodsp.c \

@ -0,0 +1,14 @@
diff -up third_party/ffmpeg/ffmpeg_generated.gni.me third_party/ffmpeg/ffmpeg_generated.gni
--- third_party/ffmpeg/ffmpeg_generated.gni.me 2024-05-05 00:45:53.017100841 +0200
+++ third_party/ffmpeg/ffmpeg_generated.gni 2024-05-05 00:46:20.244559951 +0200
@@ -17,8 +17,8 @@ use_linux_config = is_linux || is_chrome
if ((is_android && current_cpu == "arm" && arm_use_neon) ||
(is_android && current_cpu == "arm64") ||
(is_android && current_cpu == "x64") ||
- (is_android && current_cpu == "x86") || is_apple || is_win ||
- use_linux_config) {
+ (is_android && current_cpu == "x86") || (is_apple) || (is_win) ||
+ (use_linux_config)) {
ffmpeg_c_sources += [
"libavcodec/ac3_channel_layout_tab.c",
"libavcodec/ac3_parser.c",
Loading…
Cancel
Save