[third_party/ffmpeg] stop renaming files, use newest Chromium commit
This CL fixes an issue with the roll process that was creating a bad
ffmpeg_generated.gni file. It also brings third_party/ffmpeg
up-to-date with respect to Chromium's ffmpeg repo. The new Chromium
commit is 5f4813ac6fded755ee386f94fbc5440748c09e71.
The roll process was doing some unnecessary renaming, which is used
in Chromium to ensure all source files have unique basenames. This is
evidently required for the mac build. Fuchsia has no such need.
Our roll process was doing some renames that had not been done in
Chromium, causing files to be referenced by names that don't appear
in the Chromium repo. This CL removes all the renaming code from
the generated_gn.py script, so all files are referenced by their
unmodified names.
Test: build issue
Change-Id: I8a9c6e4d67c03145666e36588c21205aca7ab659
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/ffmpeg/+/747862
Reviewed-by: Nathan Mulcahey <nmulcahey@google.com>
diff --git a/CREDITS.fuchsia b/CREDITS.fuchsia
index c15fd512..b5df7a7 100644
--- a/CREDITS.fuchsia
+++ b/CREDITS.fuchsia
@@ -278,74 +278,6 @@
********************************************************************************
-libswresample/swresample.h
-
-Copyright (C) 2011-2013 Michael Niedermayer (michaelni@gmx.at)
-
-This file is part of libswresample
-
-libswresample is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-libswresample is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with libswresample; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-********************************************************************************
-
-libswresample/version.h
-
-Version macros.
-
-This file is part of libswresample
-
-libswresample is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-libswresample is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with libswresample; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-********************************************************************************
-
-libswresample/version_major.h
-
-Version macros.
-
-This file is part of libswresample
-
-libswresample is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-libswresample is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with libswresample; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-********************************************************************************
-
-libavcodec/jfdctfst.c
-libavcodec/jfdctint_template.c
libavcodec/jrevdct.c
This file is part of the Independent JPEG Group's software.
diff --git a/README.fuchsia b/README.fuchsia
index 2fa7ce6..ef45bc0 100644
--- a/README.fuchsia
+++ b/README.fuchsia
@@ -3,7 +3,7 @@
License: LGPL 2.1
License File: CREDITS.fuchsia
Upstream Git: https://chromium.googlesource.com/chromium/third_party/ffmpeg/
-Last Upstream Merge: d48312f668c54cd65f7a9a8d85dbc0f2efbdcd90, Sep 29, 2022
+Last Upstream Merge: 5f4813ac6fded755ee386f94fbc5440748c09e71, Oct 24, 2022
Description:
This file documents the layout of the Fuchsia copy of FFmpeg, some common
diff --git a/config/default/arm64/config.h b/config/default/arm64/config.h
index 13c5d0a..cbe7e20 100644
--- a/config/default/arm64/config.h
+++ b/config/default/arm64/config.h
@@ -57,6 +57,7 @@
#define HAVE_POWER8 0
#define HAVE_PPC4XX 0
#define HAVE_VSX 0
+#define HAVE_RVV 0
#define HAVE_AESNI 0
#define HAVE_AMD3DNOW 0
#define HAVE_AMD3DNOWEXT 0
@@ -105,6 +106,7 @@
#define HAVE_POWER8_EXTERNAL 0
#define HAVE_PPC4XX_EXTERNAL 0
#define HAVE_VSX_EXTERNAL 0
+#define HAVE_RVV_EXTERNAL 0
#define HAVE_AESNI_EXTERNAL 0
#define HAVE_AMD3DNOW_EXTERNAL 0
#define HAVE_AMD3DNOWEXT_EXTERNAL 0
@@ -153,6 +155,7 @@
#define HAVE_POWER8_INLINE 0
#define HAVE_PPC4XX_INLINE 0
#define HAVE_VSX_INLINE 0
+#define HAVE_RVV_INLINE 0
#define HAVE_AESNI_INLINE 0
#define HAVE_AMD3DNOW_INLINE 0
#define HAVE_AMD3DNOWEXT_INLINE 0
@@ -324,6 +327,7 @@
#define HAVE_NANOSLEEP 1
#define HAVE_PEEKNAMEDPIPE 0
#define HAVE_POSIX_MEMALIGN 1
+#define HAVE_PRCTL 0
#define HAVE_PTHREAD_CANCEL 1
#define HAVE_SCHED_GETAFFINITY 1
#define HAVE_SECITEMIMPORT 0
diff --git a/config/default/arm64/config_components.h b/config/default/arm64/config_components.h
index 3d6242e..e710ea9 100644
--- a/config/default/arm64/config_components.h
+++ b/config/default/arm64/config_components.h
@@ -8,6 +8,7 @@
#define CONFIG_CHOMP_BSF 0
#define CONFIG_DUMP_EXTRADATA_BSF 0
#define CONFIG_DCA_CORE_BSF 0
+#define CONFIG_DTS2PTS_BSF 0
#define CONFIG_DV_ERROR_MARKER_BSF 0
#define CONFIG_EAC3_CORE_BSF 0
#define CONFIG_EXTRACT_EXTRADATA_BSF 0
@@ -162,6 +163,7 @@
#define CONFIG_M101_DECODER 0
#define CONFIG_MAGICYUV_DECODER 0
#define CONFIG_MDEC_DECODER 0
+#define CONFIG_MEDIA100_DECODER 0
#define CONFIG_MIMIC_DECODER 0
#define CONFIG_MJPEG_DECODER 0
#define CONFIG_MJPEGB_DECODER 0
@@ -304,6 +306,7 @@
#define CONFIG_VP9_RKMPP_DECODER 0
#define CONFIG_VP9_V4L2M2M_DECODER 0
#define CONFIG_VQA_DECODER 0
+#define CONFIG_VQC_DECODER 0
#define CONFIG_WBMP_DECODER 0
#define CONFIG_WEBP_DECODER 0
#define CONFIG_WCMV_DECODER 0
@@ -339,6 +342,7 @@
#define CONFIG_ALS_DECODER 0
#define CONFIG_AMRNB_DECODER 0
#define CONFIG_AMRWB_DECODER 0
+#define CONFIG_APAC_DECODER 0
#define CONFIG_APE_DECODER 0
#define CONFIG_APTX_DECODER 1
#define CONFIG_APTX_HD_DECODER 0
@@ -368,6 +372,7 @@
#define CONFIG_FASTAUDIO_DECODER 0
#define CONFIG_FFWAVESYNTH_DECODER 0
#define CONFIG_FLAC_DECODER 1
+#define CONFIG_FTR_DECODER 0
#define CONFIG_G723_1_DECODER 0
#define CONFIG_G729_DECODER 0
#define CONFIG_GSM_DECODER 0
@@ -818,6 +823,7 @@
#define CONFIG_AAC_MF_ENCODER 0
#define CONFIG_AC3_MF_ENCODER 0
#define CONFIG_H263_V4L2M2M_ENCODER 0
+#define CONFIG_AV1_QSV_ENCODER 0
#define CONFIG_LIBOPENH264_ENCODER 0
#define CONFIG_H264_AMF_ENCODER 0
#define CONFIG_H264_MF_ENCODER 0
@@ -929,6 +935,7 @@
#define CONFIG_DVDSUB_PARSER 0
#define CONFIG_DVD_NAV_PARSER 0
#define CONFIG_FLAC_PARSER 1
+#define CONFIG_FTR_PARSER 0
#define CONFIG_G723_1_PARSER 0
#define CONFIG_G729_PARSER 0
#define CONFIG_GIF_PARSER 0
@@ -1559,6 +1566,7 @@
#define CONFIG_AMRNB_DEMUXER 0
#define CONFIG_AMRWB_DEMUXER 0
#define CONFIG_ANM_DEMUXER 0
+#define CONFIG_APAC_DEMUXER 0
#define CONFIG_APC_DEMUXER 0
#define CONFIG_APE_DEMUXER 0
#define CONFIG_APM_DEMUXER 0
diff --git a/config/default/arm64/libavutil/ffversion.h b/config/default/arm64/libavutil/ffversion.h
index ba49b9c..b2dcf5b 100644
--- a/config/default/arm64/libavutil/ffversion.h
+++ b/config/default/arm64/libavutil/ffversion.h
@@ -1,5 +1,5 @@
/* Automatically generated by version.sh, do not manually edit! */
#ifndef AVUTIL_FFVERSION_H
#define AVUTIL_FFVERSION_H
-#define FFMPEG_VERSION "git-2022-09-29-d48312f668"
+#define FFMPEG_VERSION "git-2022-10-24-5f4813ac6f"
#endif /* AVUTIL_FFVERSION_H */
diff --git a/config/default/x64/config.asm b/config/default/x64/config.asm
index 3d40712..56c7cb2 100644
--- a/config/default/x64/config.asm
+++ b/config/default/x64/config.asm
@@ -41,6 +41,7 @@
%define HAVE_POWER8 0
%define HAVE_PPC4XX 0
%define HAVE_VSX 0
+%define HAVE_RVV 0
%define HAVE_AESNI 1
%define HAVE_AMD3DNOW 1
%define HAVE_AMD3DNOWEXT 1
@@ -89,6 +90,7 @@
%define HAVE_POWER8_EXTERNAL 0
%define HAVE_PPC4XX_EXTERNAL 0
%define HAVE_VSX_EXTERNAL 0
+%define HAVE_RVV_EXTERNAL 0
%define HAVE_AESNI_EXTERNAL 1
%define HAVE_AMD3DNOW_EXTERNAL 1
%define HAVE_AMD3DNOWEXT_EXTERNAL 1
@@ -137,6 +139,7 @@
%define HAVE_POWER8_INLINE 0
%define HAVE_PPC4XX_INLINE 0
%define HAVE_VSX_INLINE 0
+%define HAVE_RVV_INLINE 0
%define HAVE_AESNI_INLINE 1
%define HAVE_AMD3DNOW_INLINE 1
%define HAVE_AMD3DNOWEXT_INLINE 1
@@ -308,6 +311,7 @@
%define HAVE_NANOSLEEP 1
%define HAVE_PEEKNAMEDPIPE 0
%define HAVE_POSIX_MEMALIGN 1
+%define HAVE_PRCTL 1
%define HAVE_PTHREAD_CANCEL 1
%define HAVE_SCHED_GETAFFINITY 1
%define HAVE_SECITEMIMPORT 0
diff --git a/config/default/x64/config.h b/config/default/x64/config.h
index 385d42a..eafb26b 100644
--- a/config/default/x64/config.h
+++ b/config/default/x64/config.h
@@ -57,6 +57,7 @@
#define HAVE_POWER8 0
#define HAVE_PPC4XX 0
#define HAVE_VSX 0
+#define HAVE_RVV 0
#define HAVE_AESNI 1
#define HAVE_AMD3DNOW 1
#define HAVE_AMD3DNOWEXT 1
@@ -105,6 +106,7 @@
#define HAVE_POWER8_EXTERNAL 0
#define HAVE_PPC4XX_EXTERNAL 0
#define HAVE_VSX_EXTERNAL 0
+#define HAVE_RVV_EXTERNAL 0
#define HAVE_AESNI_EXTERNAL 1
#define HAVE_AMD3DNOW_EXTERNAL 1
#define HAVE_AMD3DNOWEXT_EXTERNAL 1
@@ -153,6 +155,7 @@
#define HAVE_POWER8_INLINE 0
#define HAVE_PPC4XX_INLINE 0
#define HAVE_VSX_INLINE 0
+#define HAVE_RVV_INLINE 0
#define HAVE_AESNI_INLINE 1
#define HAVE_AMD3DNOW_INLINE 1
#define HAVE_AMD3DNOWEXT_INLINE 1
@@ -324,6 +327,7 @@
#define HAVE_NANOSLEEP 1
#define HAVE_PEEKNAMEDPIPE 0
#define HAVE_POSIX_MEMALIGN 1
+#define HAVE_PRCTL 0
#define HAVE_PTHREAD_CANCEL 1
#define HAVE_SCHED_GETAFFINITY 1
#define HAVE_SECITEMIMPORT 0
diff --git a/config/default/x64/config_components.h b/config/default/x64/config_components.h
index 4efb86a..3c4ce2b 100644
--- a/config/default/x64/config_components.h
+++ b/config/default/x64/config_components.h
@@ -8,6 +8,7 @@
#define CONFIG_CHOMP_BSF 0
#define CONFIG_DUMP_EXTRADATA_BSF 0
#define CONFIG_DCA_CORE_BSF 0
+#define CONFIG_DTS2PTS_BSF 0
#define CONFIG_DV_ERROR_MARKER_BSF 0
#define CONFIG_EAC3_CORE_BSF 0
#define CONFIG_EXTRACT_EXTRADATA_BSF 0
@@ -162,6 +163,7 @@
#define CONFIG_M101_DECODER 0
#define CONFIG_MAGICYUV_DECODER 0
#define CONFIG_MDEC_DECODER 0
+#define CONFIG_MEDIA100_DECODER 0
#define CONFIG_MIMIC_DECODER 0
#define CONFIG_MJPEG_DECODER 0
#define CONFIG_MJPEGB_DECODER 0
@@ -304,6 +306,7 @@
#define CONFIG_VP9_RKMPP_DECODER 0
#define CONFIG_VP9_V4L2M2M_DECODER 0
#define CONFIG_VQA_DECODER 0
+#define CONFIG_VQC_DECODER 0
#define CONFIG_WBMP_DECODER 0
#define CONFIG_WEBP_DECODER 0
#define CONFIG_WCMV_DECODER 0
@@ -339,6 +342,7 @@
#define CONFIG_ALS_DECODER 0
#define CONFIG_AMRNB_DECODER 0
#define CONFIG_AMRWB_DECODER 0
+#define CONFIG_APAC_DECODER 0
#define CONFIG_APE_DECODER 0
#define CONFIG_APTX_DECODER 1
#define CONFIG_APTX_HD_DECODER 0
@@ -368,6 +372,7 @@
#define CONFIG_FASTAUDIO_DECODER 0
#define CONFIG_FFWAVESYNTH_DECODER 0
#define CONFIG_FLAC_DECODER 1
+#define CONFIG_FTR_DECODER 0
#define CONFIG_G723_1_DECODER 0
#define CONFIG_G729_DECODER 0
#define CONFIG_GSM_DECODER 0
@@ -818,6 +823,7 @@
#define CONFIG_AAC_MF_ENCODER 0
#define CONFIG_AC3_MF_ENCODER 0
#define CONFIG_H263_V4L2M2M_ENCODER 0
+#define CONFIG_AV1_QSV_ENCODER 0
#define CONFIG_LIBOPENH264_ENCODER 0
#define CONFIG_H264_AMF_ENCODER 0
#define CONFIG_H264_MF_ENCODER 0
@@ -929,6 +935,7 @@
#define CONFIG_DVDSUB_PARSER 0
#define CONFIG_DVD_NAV_PARSER 0
#define CONFIG_FLAC_PARSER 1
+#define CONFIG_FTR_PARSER 0
#define CONFIG_G723_1_PARSER 0
#define CONFIG_G729_PARSER 0
#define CONFIG_GIF_PARSER 0
@@ -1559,6 +1566,7 @@
#define CONFIG_AMRNB_DEMUXER 0
#define CONFIG_AMRWB_DEMUXER 0
#define CONFIG_ANM_DEMUXER 0
+#define CONFIG_APAC_DEMUXER 0
#define CONFIG_APC_DEMUXER 0
#define CONFIG_APE_DEMUXER 0
#define CONFIG_APM_DEMUXER 0
diff --git a/config/default/x64/libavutil/ffversion.h b/config/default/x64/libavutil/ffversion.h
index ba49b9c..b2dcf5b 100644
--- a/config/default/x64/libavutil/ffversion.h
+++ b/config/default/x64/libavutil/ffversion.h
@@ -1,5 +1,5 @@
/* Automatically generated by version.sh, do not manually edit! */
#ifndef AVUTIL_FFVERSION_H
#define AVUTIL_FFVERSION_H
-#define FFMPEG_VERSION "git-2022-09-29-d48312f668"
+#define FFMPEG_VERSION "git-2022-10-24-5f4813ac6f"
#endif /* AVUTIL_FFVERSION_H */
diff --git a/config/max/arm64/config.h b/config/max/arm64/config.h
index f7f73a6..514f253 100644
--- a/config/max/arm64/config.h
+++ b/config/max/arm64/config.h
@@ -57,6 +57,7 @@
#define HAVE_POWER8 0
#define HAVE_PPC4XX 0
#define HAVE_VSX 0
+#define HAVE_RVV 0
#define HAVE_AESNI 0
#define HAVE_AMD3DNOW 0
#define HAVE_AMD3DNOWEXT 0
@@ -105,6 +106,7 @@
#define HAVE_POWER8_EXTERNAL 0
#define HAVE_PPC4XX_EXTERNAL 0
#define HAVE_VSX_EXTERNAL 0
+#define HAVE_RVV_EXTERNAL 0
#define HAVE_AESNI_EXTERNAL 0
#define HAVE_AMD3DNOW_EXTERNAL 0
#define HAVE_AMD3DNOWEXT_EXTERNAL 0
@@ -153,6 +155,7 @@
#define HAVE_POWER8_INLINE 0
#define HAVE_PPC4XX_INLINE 0
#define HAVE_VSX_INLINE 0
+#define HAVE_RVV_INLINE 0
#define HAVE_AESNI_INLINE 0
#define HAVE_AMD3DNOW_INLINE 0
#define HAVE_AMD3DNOWEXT_INLINE 0
@@ -324,6 +327,7 @@
#define HAVE_NANOSLEEP 1
#define HAVE_PEEKNAMEDPIPE 0
#define HAVE_POSIX_MEMALIGN 1
+#define HAVE_PRCTL 0
#define HAVE_PTHREAD_CANCEL 1
#define HAVE_SCHED_GETAFFINITY 1
#define HAVE_SECITEMIMPORT 0
@@ -669,7 +673,7 @@
#define CONFIG_EXIF 1
#define CONFIG_FAANDCT 0
#define CONFIG_FAANIDCT 0
-#define CONFIG_FDCTDSP 1
+#define CONFIG_FDCTDSP 0
#define CONFIG_FMTCONVERT 0
#define CONFIG_FRAME_THREAD_ENCODER 0
#define CONFIG_G722DSP 0
@@ -713,7 +717,7 @@
#define CONFIG_MSMPEG4DEC 0
#define CONFIG_MSMPEG4ENC 0
#define CONFIG_MSS34DSP 0
-#define CONFIG_PIXBLOCKDSP 1
+#define CONFIG_PIXBLOCKDSP 0
#define CONFIG_QPELDSP 1
#define CONFIG_QSV 0
#define CONFIG_QSVDEC 0
diff --git a/config/max/arm64/config_components.h b/config/max/arm64/config_components.h
index 13bf2e5..5f937f93 100644
--- a/config/max/arm64/config_components.h
+++ b/config/max/arm64/config_components.h
@@ -8,6 +8,7 @@
#define CONFIG_CHOMP_BSF 0
#define CONFIG_DUMP_EXTRADATA_BSF 0
#define CONFIG_DCA_CORE_BSF 0
+#define CONFIG_DTS2PTS_BSF 0
#define CONFIG_DV_ERROR_MARKER_BSF 0
#define CONFIG_EAC3_CORE_BSF 0
#define CONFIG_EXTRACT_EXTRADATA_BSF 0
@@ -162,6 +163,7 @@
#define CONFIG_M101_DECODER 0
#define CONFIG_MAGICYUV_DECODER 0
#define CONFIG_MDEC_DECODER 0
+#define CONFIG_MEDIA100_DECODER 0
#define CONFIG_MIMIC_DECODER 0
#define CONFIG_MJPEG_DECODER 0
#define CONFIG_MJPEGB_DECODER 0
@@ -304,6 +306,7 @@
#define CONFIG_VP9_RKMPP_DECODER 0
#define CONFIG_VP9_V4L2M2M_DECODER 0
#define CONFIG_VQA_DECODER 0
+#define CONFIG_VQC_DECODER 0
#define CONFIG_WBMP_DECODER 0
#define CONFIG_WEBP_DECODER 0
#define CONFIG_WCMV_DECODER 0
@@ -339,6 +342,7 @@
#define CONFIG_ALS_DECODER 0
#define CONFIG_AMRNB_DECODER 1
#define CONFIG_AMRWB_DECODER 1
+#define CONFIG_APAC_DECODER 0
#define CONFIG_APE_DECODER 0
#define CONFIG_APTX_DECODER 1
#define CONFIG_APTX_HD_DECODER 0
@@ -368,6 +372,7 @@
#define CONFIG_FASTAUDIO_DECODER 0
#define CONFIG_FFWAVESYNTH_DECODER 0
#define CONFIG_FLAC_DECODER 1
+#define CONFIG_FTR_DECODER 0
#define CONFIG_G723_1_DECODER 0
#define CONFIG_G729_DECODER 0
#define CONFIG_GSM_DECODER 0
@@ -818,6 +823,7 @@
#define CONFIG_AAC_MF_ENCODER 0
#define CONFIG_AC3_MF_ENCODER 0
#define CONFIG_H263_V4L2M2M_ENCODER 0
+#define CONFIG_AV1_QSV_ENCODER 0
#define CONFIG_LIBOPENH264_ENCODER 0
#define CONFIG_H264_AMF_ENCODER 0
#define CONFIG_H264_MF_ENCODER 0
@@ -929,6 +935,7 @@
#define CONFIG_DVDSUB_PARSER 0
#define CONFIG_DVD_NAV_PARSER 0
#define CONFIG_FLAC_PARSER 1
+#define CONFIG_FTR_PARSER 0
#define CONFIG_G723_1_PARSER 0
#define CONFIG_G729_PARSER 0
#define CONFIG_GIF_PARSER 0
@@ -1559,6 +1566,7 @@
#define CONFIG_AMRNB_DEMUXER 0
#define CONFIG_AMRWB_DEMUXER 0
#define CONFIG_ANM_DEMUXER 0
+#define CONFIG_APAC_DEMUXER 0
#define CONFIG_APC_DEMUXER 0
#define CONFIG_APE_DEMUXER 0
#define CONFIG_APM_DEMUXER 0
diff --git a/config/max/arm64/libavutil/ffversion.h b/config/max/arm64/libavutil/ffversion.h
index ba49b9c..b2dcf5b 100644
--- a/config/max/arm64/libavutil/ffversion.h
+++ b/config/max/arm64/libavutil/ffversion.h
@@ -1,5 +1,5 @@
/* Automatically generated by version.sh, do not manually edit! */
#ifndef AVUTIL_FFVERSION_H
#define AVUTIL_FFVERSION_H
-#define FFMPEG_VERSION "git-2022-09-29-d48312f668"
+#define FFMPEG_VERSION "git-2022-10-24-5f4813ac6f"
#endif /* AVUTIL_FFVERSION_H */
diff --git a/config/max/x64/config.asm b/config/max/x64/config.asm
index a12edda..a53b0fe 100644
--- a/config/max/x64/config.asm
+++ b/config/max/x64/config.asm
@@ -41,6 +41,7 @@
%define HAVE_POWER8 0
%define HAVE_PPC4XX 0
%define HAVE_VSX 0
+%define HAVE_RVV 0
%define HAVE_AESNI 1
%define HAVE_AMD3DNOW 1
%define HAVE_AMD3DNOWEXT 1
@@ -89,6 +90,7 @@
%define HAVE_POWER8_EXTERNAL 0
%define HAVE_PPC4XX_EXTERNAL 0
%define HAVE_VSX_EXTERNAL 0
+%define HAVE_RVV_EXTERNAL 0
%define HAVE_AESNI_EXTERNAL 1
%define HAVE_AMD3DNOW_EXTERNAL 1
%define HAVE_AMD3DNOWEXT_EXTERNAL 1
@@ -137,6 +139,7 @@
%define HAVE_POWER8_INLINE 0
%define HAVE_PPC4XX_INLINE 0
%define HAVE_VSX_INLINE 0
+%define HAVE_RVV_INLINE 0
%define HAVE_AESNI_INLINE 1
%define HAVE_AMD3DNOW_INLINE 1
%define HAVE_AMD3DNOWEXT_INLINE 1
@@ -308,6 +311,7 @@
%define HAVE_NANOSLEEP 1
%define HAVE_PEEKNAMEDPIPE 0
%define HAVE_POSIX_MEMALIGN 1
+%define HAVE_PRCTL 1
%define HAVE_PTHREAD_CANCEL 1
%define HAVE_SCHED_GETAFFINITY 1
%define HAVE_SECITEMIMPORT 0
@@ -653,7 +657,7 @@
%define CONFIG_EXIF 1
%define CONFIG_FAANDCT 0
%define CONFIG_FAANIDCT 0
-%define CONFIG_FDCTDSP 1
+%define CONFIG_FDCTDSP 0
%define CONFIG_FMTCONVERT 0
%define CONFIG_FRAME_THREAD_ENCODER 0
%define CONFIG_G722DSP 0
@@ -697,7 +701,7 @@
%define CONFIG_MSMPEG4DEC 0
%define CONFIG_MSMPEG4ENC 0
%define CONFIG_MSS34DSP 0
-%define CONFIG_PIXBLOCKDSP 1
+%define CONFIG_PIXBLOCKDSP 0
%define CONFIG_QPELDSP 1
%define CONFIG_QSV 0
%define CONFIG_QSVDEC 0
diff --git a/config/max/x64/config.h b/config/max/x64/config.h
index 6c44c4f8..9bc6e0e 100644
--- a/config/max/x64/config.h
+++ b/config/max/x64/config.h
@@ -57,6 +57,7 @@
#define HAVE_POWER8 0
#define HAVE_PPC4XX 0
#define HAVE_VSX 0
+#define HAVE_RVV 0
#define HAVE_AESNI 1
#define HAVE_AMD3DNOW 1
#define HAVE_AMD3DNOWEXT 1
@@ -105,6 +106,7 @@
#define HAVE_POWER8_EXTERNAL 0
#define HAVE_PPC4XX_EXTERNAL 0
#define HAVE_VSX_EXTERNAL 0
+#define HAVE_RVV_EXTERNAL 0
#define HAVE_AESNI_EXTERNAL 1
#define HAVE_AMD3DNOW_EXTERNAL 1
#define HAVE_AMD3DNOWEXT_EXTERNAL 1
@@ -153,6 +155,7 @@
#define HAVE_POWER8_INLINE 0
#define HAVE_PPC4XX_INLINE 0
#define HAVE_VSX_INLINE 0
+#define HAVE_RVV_INLINE 0
#define HAVE_AESNI_INLINE 1
#define HAVE_AMD3DNOW_INLINE 1
#define HAVE_AMD3DNOWEXT_INLINE 1
@@ -324,6 +327,7 @@
#define HAVE_NANOSLEEP 1
#define HAVE_PEEKNAMEDPIPE 0
#define HAVE_POSIX_MEMALIGN 1
+#define HAVE_PRCTL 0
#define HAVE_PTHREAD_CANCEL 1
#define HAVE_SCHED_GETAFFINITY 1
#define HAVE_SECITEMIMPORT 0
@@ -669,7 +673,7 @@
#define CONFIG_EXIF 1
#define CONFIG_FAANDCT 0
#define CONFIG_FAANIDCT 0
-#define CONFIG_FDCTDSP 1
+#define CONFIG_FDCTDSP 0
#define CONFIG_FMTCONVERT 0
#define CONFIG_FRAME_THREAD_ENCODER 0
#define CONFIG_G722DSP 0
@@ -713,7 +717,7 @@
#define CONFIG_MSMPEG4DEC 0
#define CONFIG_MSMPEG4ENC 0
#define CONFIG_MSS34DSP 0
-#define CONFIG_PIXBLOCKDSP 1
+#define CONFIG_PIXBLOCKDSP 0
#define CONFIG_QPELDSP 1
#define CONFIG_QSV 0
#define CONFIG_QSVDEC 0
diff --git a/config/max/x64/config_components.h b/config/max/x64/config_components.h
index da9b72a..4ed5f9f 100644
--- a/config/max/x64/config_components.h
+++ b/config/max/x64/config_components.h
@@ -8,6 +8,7 @@
#define CONFIG_CHOMP_BSF 0
#define CONFIG_DUMP_EXTRADATA_BSF 0
#define CONFIG_DCA_CORE_BSF 0
+#define CONFIG_DTS2PTS_BSF 0
#define CONFIG_DV_ERROR_MARKER_BSF 0
#define CONFIG_EAC3_CORE_BSF 0
#define CONFIG_EXTRACT_EXTRADATA_BSF 0
@@ -162,6 +163,7 @@
#define CONFIG_M101_DECODER 0
#define CONFIG_MAGICYUV_DECODER 0
#define CONFIG_MDEC_DECODER 0
+#define CONFIG_MEDIA100_DECODER 0
#define CONFIG_MIMIC_DECODER 0
#define CONFIG_MJPEG_DECODER 0
#define CONFIG_MJPEGB_DECODER 0
@@ -304,6 +306,7 @@
#define CONFIG_VP9_RKMPP_DECODER 0
#define CONFIG_VP9_V4L2M2M_DECODER 0
#define CONFIG_VQA_DECODER 0
+#define CONFIG_VQC_DECODER 0
#define CONFIG_WBMP_DECODER 0
#define CONFIG_WEBP_DECODER 0
#define CONFIG_WCMV_DECODER 0
@@ -339,6 +342,7 @@
#define CONFIG_ALS_DECODER 0
#define CONFIG_AMRNB_DECODER 1
#define CONFIG_AMRWB_DECODER 1
+#define CONFIG_APAC_DECODER 0
#define CONFIG_APE_DECODER 0
#define CONFIG_APTX_DECODER 1
#define CONFIG_APTX_HD_DECODER 0
@@ -368,6 +372,7 @@
#define CONFIG_FASTAUDIO_DECODER 0
#define CONFIG_FFWAVESYNTH_DECODER 0
#define CONFIG_FLAC_DECODER 1
+#define CONFIG_FTR_DECODER 0
#define CONFIG_G723_1_DECODER 0
#define CONFIG_G729_DECODER 0
#define CONFIG_GSM_DECODER 0
@@ -818,6 +823,7 @@
#define CONFIG_AAC_MF_ENCODER 0
#define CONFIG_AC3_MF_ENCODER 0
#define CONFIG_H263_V4L2M2M_ENCODER 0
+#define CONFIG_AV1_QSV_ENCODER 0
#define CONFIG_LIBOPENH264_ENCODER 0
#define CONFIG_H264_AMF_ENCODER 0
#define CONFIG_H264_MF_ENCODER 0
@@ -929,6 +935,7 @@
#define CONFIG_DVDSUB_PARSER 0
#define CONFIG_DVD_NAV_PARSER 0
#define CONFIG_FLAC_PARSER 1
+#define CONFIG_FTR_PARSER 0
#define CONFIG_G723_1_PARSER 0
#define CONFIG_G729_PARSER 0
#define CONFIG_GIF_PARSER 0
@@ -1559,6 +1566,7 @@
#define CONFIG_AMRNB_DEMUXER 0
#define CONFIG_AMRWB_DEMUXER 0
#define CONFIG_ANM_DEMUXER 0
+#define CONFIG_APAC_DEMUXER 0
#define CONFIG_APC_DEMUXER 0
#define CONFIG_APE_DEMUXER 0
#define CONFIG_APM_DEMUXER 0
diff --git a/config/max/x64/libavutil/ffversion.h b/config/max/x64/libavutil/ffversion.h
index ba49b9c..b2dcf5b 100644
--- a/config/max/x64/libavutil/ffversion.h
+++ b/config/max/x64/libavutil/ffversion.h
@@ -1,5 +1,5 @@
/* Automatically generated by version.sh, do not manually edit! */
#ifndef AVUTIL_FFVERSION_H
#define AVUTIL_FFVERSION_H
-#define FFMPEG_VERSION "git-2022-09-29-d48312f668"
+#define FFMPEG_VERSION "git-2022-10-24-5f4813ac6f"
#endif /* AVUTIL_FFVERSION_H */
diff --git a/ffmpeg_generated.gni b/ffmpeg_generated.gni
index 1311447..2fe3899 100644
--- a/ffmpeg_generated.gni
+++ b/ffmpeg_generated.gni
@@ -18,13 +18,6 @@
"libavcodec/allcodecs.c",
"libavcodec/aptx.c",
"libavcodec/aptxdec.c",
- "libavcodec/autorename_libavcodec_flacdsp.c",
- "libavcodec/autorename_libavcodec_hpeldsp.c",
- "libavcodec/autorename_libavcodec_mpegaudiodsp.c",
- "libavcodec/autorename_libavcodec_videodsp.c",
- "libavcodec/autorename_libavcodec_vorbisdsp.c",
- "libavcodec/autorename_libavcodec_vp3dsp.c",
- "libavcodec/autorename_libavcodec_vp8dsp.c",
"libavcodec/avcodec.c",
"libavcodec/avdct.c",
"libavcodec/avfft.c",
@@ -49,9 +42,11 @@
"libavcodec/flac_parser.c",
"libavcodec/flacdata.c",
"libavcodec/flacdec.c",
+ "libavcodec/flacdsp.c",
"libavcodec/get_buffer.c",
"libavcodec/golomb.c",
"libavcodec/h264pred.c",
+ "libavcodec/hpeldsp.c",
"libavcodec/imgconvert.c",
"libavcodec/jni.c",
"libavcodec/libopus.c",
@@ -69,15 +64,14 @@
"libavcodec/mpegaudiodec_common.c",
"libavcodec/mpegaudiodec_fixed.c",
"libavcodec/mpegaudiodecheader.c",
+ "libavcodec/mpegaudiodsp.c",
"libavcodec/mpegaudiodsp_data.c",
"libavcodec/mpegaudiodsp_fixed.c",
"libavcodec/mpegaudiodsp_float.c",
"libavcodec/mpegaudiotabs.c",
"libavcodec/options.c",
- "libavcodec/opus.c",
+ "libavcodec/opus_parse.c",
"libavcodec/opus_parser.c",
- "libavcodec/opus_rc.c",
- "libavcodec/opustab.c",
"libavcodec/parser.c",
"libavcodec/parsers.c",
"libavcodec/pcm.c",
@@ -93,24 +87,23 @@
"libavcodec/sbcdec_data.c",
"libavcodec/utils.c",
"libavcodec/version.c",
+ "libavcodec/videodsp.c",
"libavcodec/vlc.c",
"libavcodec/vorbis.c",
"libavcodec/vorbis_data.c",
"libavcodec/vorbis_parser.c",
"libavcodec/vorbisdec.c",
+ "libavcodec/vorbisdsp.c",
"libavcodec/vp3.c",
"libavcodec/vp3_parser.c",
+ "libavcodec/vp3dsp.c",
"libavcodec/vp8.c",
"libavcodec/vp8_parser.c",
+ "libavcodec/vp8dsp.c",
"libavcodec/vpx_rac.c",
"libavcodec/xiph.c",
"libavformat/ac3_channel_layout_tab.c",
"libavformat/allformats.c",
- "libavformat/autorename_libavformat_flacdec.c",
- "libavformat/autorename_libavformat_options.c",
- "libavformat/autorename_libavformat_pcm.c",
- "libavformat/autorename_libavformat_utils.c",
- "libavformat/autorename_libavformat_version.c",
"libavformat/avformat.c",
"libavformat/avio.c",
"libavformat/aviobuf.c",
@@ -120,6 +113,7 @@
"libavformat/dump.c",
"libavformat/dv.c",
"libavformat/flac_picture.c",
+ "libavformat/flacdec.c",
"libavformat/format.c",
"libavformat/id3v1.c",
"libavformat/id3v2.c",
@@ -145,7 +139,9 @@
"libavformat/oggparsetheora.c",
"libavformat/oggparsevorbis.c",
"libavformat/oggparsevp8.c",
+ "libavformat/options.c",
"libavformat/os_support.c",
+ "libavformat/pcm.c",
"libavformat/protocols.c",
"libavformat/qtpalette.c",
"libavformat/rawdec.c",
@@ -155,17 +151,12 @@
"libavformat/rmsipr.c",
"libavformat/seek.c",
"libavformat/url.c",
+ "libavformat/utils.c",
+ "libavformat/version.c",
"libavformat/vorbiscomment.c",
"libavformat/wavdec.c",
"libavutil/aes.c",
"libavutil/aes_ctr.c",
- "libavutil/autorename_libavutil_cpu.c",
- "libavutil/autorename_libavutil_fixed_dsp.c",
- "libavutil/autorename_libavutil_float_dsp.c",
- "libavutil/autorename_libavutil_imgutils.c",
- "libavutil/autorename_libavutil_tx_float.c",
- "libavutil/autorename_libavutil_utils.c",
- "libavutil/autorename_libavutil_version.c",
"libavutil/avstring.c",
"libavutil/base64.c",
"libavutil/bprint.c",
@@ -173,6 +164,7 @@
"libavutil/camellia.c",
"libavutil/channel_layout.c",
"libavutil/color_utils.c",
+ "libavutil/cpu.c",
"libavutil/crc.c",
"libavutil/csp.c",
"libavutil/detection_bbox.c",
@@ -186,11 +178,14 @@
"libavutil/fifo.c",
"libavutil/file_open.c",
"libavutil/film_grain_params.c",
+ "libavutil/fixed_dsp.c",
+ "libavutil/float_dsp.c",
"libavutil/frame.c",
"libavutil/hdr_dynamic_metadata.c",
"libavutil/hdr_dynamic_vivid_metadata.c",
"libavutil/hwcontext.c",
"libavutil/hwcontext_stub.c",
+ "libavutil/imgutils.c",
"libavutil/integer.c",
"libavutil/intmath.c",
"libavutil/lfg.c",
@@ -220,8 +215,11 @@
"libavutil/twofish.c",
"libavutil/tx.c",
"libavutil/tx_double.c",
+ "libavutil/tx_float.c",
"libavutil/tx_int32.c",
+ "libavutil/utils.c",
"libavutil/uuid.c",
+ "libavutil/version.c",
"libavutil/video_enc_params.c",
]
ffmpeg_yasm_sources += [
@@ -244,24 +242,13 @@
"libavcodec/amrnbdec.c",
"libavcodec/amrwbdec.c",
"libavcodec/atsc_a53.c",
- "libavcodec/autorename_libavcodec_blockdsp.c",
- "libavcodec/autorename_libavcodec_idctdsp.c",
- "libavcodec/autorename_libavcodec_mdct15.c",
- "libavcodec/autorename_libavcodec_me_cmp.c",
- "libavcodec/autorename_libavcodec_mpegvideo.c",
- "libavcodec/autorename_libavcodec_mpegvideodsp.c",
- "libavcodec/autorename_libavcodec_pixblockdsp.c",
- "libavcodec/autorename_libavcodec_qpeldsp.c",
- "libavcodec/autorename_libavcodec_sbrdsp.c",
- "libavcodec/autorename_libavcodec_simple_idct.c",
- "libavcodec/autorename_libavcodec_xvididct.c",
+ "libavcodec/blockdsp.c",
"libavcodec/cabac.c",
"libavcodec/cbrt_data.c",
"libavcodec/celp_filters.c",
"libavcodec/celp_math.c",
"libavcodec/error_resilience.c",
"libavcodec/exif.c",
- "libavcodec/fdctdsp.c",
"libavcodec/gsm_parser.c",
"libavcodec/gsmdec.c",
"libavcodec/gsmdec_data.c",
@@ -290,33 +277,40 @@
"libavcodec/h264idct.c",
"libavcodec/h264qpel.c",
"libavcodec/h274.c",
+ "libavcodec/idctdsp.c",
"libavcodec/ituh263dec.c",
- "libavcodec/jfdctfst.c",
- "libavcodec/jfdctint.c",
"libavcodec/jrevdct.c",
"libavcodec/kbdwin.c",
"libavcodec/latm_parser.c",
"libavcodec/lsp.c",
+ "libavcodec/mdct15.c",
+ "libavcodec/me_cmp.c",
"libavcodec/mpeg4video.c",
"libavcodec/mpeg4video_parser.c",
"libavcodec/mpeg4videodec.c",
+ "libavcodec/mpeg4videodsp.c",
"libavcodec/mpeg_er.c",
"libavcodec/mpegpicture.c",
"libavcodec/mpegutils.c",
+ "libavcodec/mpegvideo.c",
"libavcodec/mpegvideo_dec.c",
"libavcodec/mpegvideo_motion.c",
"libavcodec/mpegvideodata.c",
"libavcodec/msgsmdec.c",
+ "libavcodec/qpeldsp.c",
"libavcodec/rl.c",
+ "libavcodec/sbrdsp.c",
+ "libavcodec/simple_idct.c",
"libavcodec/sinewin.c",
"libavcodec/startcode.c",
"libavcodec/tiff_common.c",
"libavcodec/to_upper4.c",
+ "libavcodec/xvididct.c",
+ "libavformat/aacdec.c",
"libavformat/amr.c",
"libavformat/apetag.c",
- "libavformat/autorename_libavformat_aacdec.c",
- "libavformat/autorename_libavformat_gsmdec.c",
"libavformat/avidec.c",
+ "libavformat/gsmdec.c",
"libavformat/img2.c",
]
ffmpeg_yasm_sources += [
@@ -338,8 +332,6 @@
"libavcodec/vp9mvs.c",
"libavcodec/vp9prob.c",
"libavcodec/vp9recon.c",
- "libavcodec/x86/autorename_libavcodec_x86_videodsp_init.c",
- "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c",
"libavcodec/x86/constants.c",
"libavcodec/x86/dct_init.c",
"libavcodec/x86/fft_init.c",
@@ -348,22 +340,22 @@
"libavcodec/x86/hpeldsp_init.c",
"libavcodec/x86/hpeldsp_vp3_init.c",
"libavcodec/x86/mpegaudiodsp.c",
+ "libavcodec/x86/videodsp_init.c",
+ "libavcodec/x86/vorbisdsp_init.c",
"libavcodec/x86/vp3dsp_init.c",
"libavcodec/x86/vp8dsp_init.c",
"libavcodec/x86/vp9dsp_init.c",
"libavcodec/x86/vp9dsp_init_10bpp.c",
"libavcodec/x86/vp9dsp_init_12bpp.c",
"libavcodec/x86/vp9dsp_init_16bpp.c",
- "libavutil/x86/autorename_libavutil_x86_cpu.c",
- "libavutil/x86/autorename_libavutil_x86_float_dsp_init.c",
- "libavutil/x86/autorename_libavutil_x86_tx_float_init.c",
+ "libavutil/x86/cpu.c",
"libavutil/x86/fixed_dsp_init.c",
+ "libavutil/x86/float_dsp_init.c",
"libavutil/x86/imgutils_init.c",
"libavutil/x86/lls_init.c",
+ "libavutil/x86/tx_float_init.c",
]
ffmpeg_yasm_sources += [
- "libavcodec/x86/autorename_libavcodec_x86_videodsp.asm",
- "libavcodec/x86/autorename_libavcodec_x86_vp9lpf.asm",
"libavcodec/x86/dct32.asm",
"libavcodec/x86/fft.asm",
"libavcodec/x86/flacdsp.asm",
@@ -373,6 +365,7 @@
"libavcodec/x86/hpeldsp.asm",
"libavcodec/x86/hpeldsp_vp3.asm",
"libavcodec/x86/imdct36.asm",
+ "libavcodec/x86/videodsp.asm",
"libavcodec/x86/vorbisdsp.asm",
"libavcodec/x86/vp3dsp.asm",
"libavcodec/x86/vp8dsp.asm",
@@ -381,6 +374,7 @@
"libavcodec/x86/vp9intrapred_16bpp.asm",
"libavcodec/x86/vp9itxfm.asm",
"libavcodec/x86/vp9itxfm_16bpp.asm",
+ "libavcodec/x86/vp9lpf.asm",
"libavcodec/x86/vp9lpf_16bpp.asm",
"libavcodec/x86/vp9mc.asm",
"libavcodec/x86/vp9mc_16bpp.asm",
@@ -396,10 +390,7 @@
if (current_cpu == "x64" && ffmpeg_profile == "max") {
ffmpeg_c_sources += [
"libavcodec/x86/aacpsdsp_init.c",
- "libavcodec/x86/autorename_libavcodec_x86_mpegvideo.c",
"libavcodec/x86/blockdsp_init.c",
- "libavcodec/x86/fdct.c",
- "libavcodec/x86/fdctdsp_init.c",
"libavcodec/x86/h263dsp_init.c",
"libavcodec/x86/h264_qpel.c",
"libavcodec/x86/h264chroma_init.c",
@@ -407,8 +398,8 @@
"libavcodec/x86/idctdsp_init.c",
"libavcodec/x86/mdct15_init.c",
"libavcodec/x86/me_cmp_init.c",
- "libavcodec/x86/mpegvideodsp.c",
- "libavcodec/x86/pixblockdsp_init.c",
+ "libavcodec/x86/mpeg4videodsp.c",
+ "libavcodec/x86/mpegvideo.c",
"libavcodec/x86/qpeldsp_init.c",
"libavcodec/x86/sbrdsp_init.c",
"libavcodec/x86/xvididct_init.c",
@@ -430,7 +421,6 @@
"libavcodec/x86/idctdsp.asm",
"libavcodec/x86/mdct15.asm",
"libavcodec/x86/me_cmp.asm",
- "libavcodec/x86/pixblockdsp.asm",
"libavcodec/x86/qpel.asm",
"libavcodec/x86/qpeldsp.asm",
"libavcodec/x86/sbrdsp.asm",
@@ -477,7 +467,6 @@
"libavcodec/aarch64/h264qpel_init_aarch64.c",
"libavcodec/aarch64/idctdsp_init_aarch64.c",
"libavcodec/aarch64/me_cmp_init_aarch64.c",
- "libavcodec/aarch64/pixblockdsp_init_aarch64.c",
"libavcodec/aarch64/sbrdsp_init_aarch64.c",
"libavcodec/neon/mpegvideo.c",
]
@@ -489,7 +478,6 @@
"libavcodec/aarch64/h264qpel_neon.S",
"libavcodec/aarch64/idctdsp_neon.S",
"libavcodec/aarch64/me_cmp_neon.S",
- "libavcodec/aarch64/pixblockdsp_neon.S",
"libavcodec/aarch64/sbrdsp_neon.S",
"libavcodec/aarch64/simple_idct_neon.S",
]
diff --git a/scripts/build_ffmpeg.py b/scripts/build_ffmpeg.py
index 77d5f7e..253bfb1 100755
--- a/scripts/build_ffmpeg.py
+++ b/scripts/build_ffmpeg.py
@@ -68,6 +68,11 @@
RewriteFile(
os.path.join(config_dir, 'config.h'),
+ r'(#define HAVE_PRCTL [01])',
+ (r'#define HAVE_PRCTL 0'))
+
+ RewriteFile(
+ os.path.join(config_dir, 'config.h'),
r'(#define HAVE_SYSCTL [01])',
(r'#define HAVE_SYSCTL 0'))
diff --git a/scripts/generate_gn.py b/scripts/generate_gn.py
index cc9690a..68ce730 100755
--- a/scripts/generate_gn.py
+++ b/scripts/generate_gn.py
@@ -554,13 +554,6 @@
action='store_true',
help='Print all licenses to console.')
- parser.add_option(
- '-i',
- '--output_git_commands',
- dest='output_git_commands',
- default=False,
- help='Write git commands for renames to a file.')
-
options, args = parser.parse_args()
if not options.source_dir:
@@ -640,18 +633,6 @@
# or defines).
EXOTIC_INCLUDE_REGEX = re.compile('[#%]\s*include\s+[^"<\s].+')
-# Prefix added to renamed files as part of
-RENAME_PREFIX = 'autorename'
-
-# Match an absolute path to a generated auotorename_ file.
-RENAME_REGEX = re.compile('.*' + RENAME_PREFIX + '_.+')
-
-# Content for the rename file. #includes the original file to ensure the two
-# files stay in sync.
-RENAME_CONTENT = """{0} File automatically generated. See crbug.com/495833.
-{1}include "{2}"
-"""
-
def GetIncludedSources(file_path, source_dir, include_set, scan_only=False):
"""Recurse over include tree, accumulating absolute paths to all included
@@ -742,85 +723,6 @@
with open(os.path.join('src', new_path), 'w') as new_file:
new_file.write(content)
-
-def FixObjectBasenameCollisions(disjoint_sets,
- all_sources,
- do_rename_cb,
- log_renames=True):
- """Mac libtool warns needlessly when it encounters two object files with
- the same basename in a given static library. See more at
- https://code.google.com/p/gyp/issues/detail?id=384#c7
-
- Here we hack around the issue by making a new source file with a different
- base name, and #including the original file.
-
- If upstream changes the name such that the collision no longer exists, we
- detect the presence of a renamed file in all_sources which is overridden and
- warn that it should be removed.
-
- This will return a tuple of two sets. The first is a list of all currently
- renamed files, in their renamed form. The second is a list of renamed files
- that we have in the working directory, but no longer need."""
-
- SourceRename = collections.namedtuple('SourceRename', 'old_path, new_path')
- known_basenames = set()
- all_renames = set()
-
- # Set of files that have renames, but no longer collide.
- old_renames_to_delete = set()
-
- for source_set in disjoint_sets:
- # Track needed adjustments to change when we're done with each SourceSet.
- renames = set()
-
- for source_path in sorted(source_set.sources):
- folder, filename = os.path.split(source_path)
- basename, _ = os.path.splitext(filename)
-
- # Sanity check: source set should not have any renames prior to this step.
- if RENAME_PREFIX in basename:
- exit('Found unexpected renamed file in SourceSet: %s' % source_path)
-
- # Craft a new unique basename from the path of the colliding file
- if basename in known_basenames:
- name_parts = source_path.split(os.sep)
- name_parts.insert(0, RENAME_PREFIX)
- new_filename = '_'.join(name_parts)
- new_source_path = (
- new_filename
- if folder == '' else os.sep.join([folder, new_filename]))
-
- renames.add(SourceRename(source_path, new_source_path))
- else:
- known_basenames.add(basename)
-
- for rename in renames:
- if log_renames:
- print(
- f'Fixing basename collision: {rename.old_path} -> {rename.new_path}')
- _, old_filename = os.path.split(rename.old_path)
- _, file_extension = os.path.splitext(old_filename)
- include_prefix = '%' if (file_extension == '.asm') else '#'
- comment_prefix = ';' if (file_extension == '.asm') else '//'
-
- do_rename_cb(
- rename.old_path, rename.new_path,
- RENAME_CONTENT.format(comment_prefix, include_prefix, old_filename))
-
- source_set.sources.remove(rename.old_path)
- source_set.sources.add(rename.new_path)
- all_renames.add(rename.new_path)
-
- # Now, with all collisions handled, walk the set of known sources and warn
- # about any renames that were not replaced. This should indicate that an old
- # collision is now resolved by some external/upstream change.
- for source_path in all_sources:
- if RENAME_PREFIX in source_path and source_path not in all_renames:
- old_renames_to_delete.add(source_path)
- print(f'WARNING: {source_path} no longer collides. DELETE ME!')
-
- return all_renames, old_renames_to_delete
-
def UpdateCredits(sources_to_check, source_dir):
print('Updating ffmpeg credits...')
updater = credits_updater.CreditsUpdater(source_dir)
@@ -829,18 +731,6 @@
updater.PrintStats()
updater.WriteCredits()
-def WriteGitCommands(filename, all_renames, old_renames_to_delete):
- """Write a shell script that will add renames and delete old ones."""
- with open(filename, 'w') as git_file:
- git_file.write("#!/bin/sh\n")
- git_file.write("# Git commands to add all renames and delete old ones.\n")
- git_file.write("# This file is automatically generated by generate_gn.py\n")
- for renamed_file in all_renames:
- git_file.write("git add %s || exit 1\n" % renamed_file)
- for unrenamed_file in old_renames_to_delete:
- git_file.write("git rm %s -f || exit 1\n" % unrenamed_file)
- git_file.write("exit 0\n")
-
def main():
options, _ = ParseOptions()
@@ -877,33 +767,17 @@
'Are build_dir (%s) and/or source_dir (%s) options correct?' %
(options.build_dir, options.source_dir))
- # Sort sets prior to further processing (e.g. FixObjectBasenameCollisions) and
- # printing to make order deterministic between runs.
+ # Sort sets prior to further processing and printing to make order
+ # deterministic between runs.
sets = sorted(sets,
key=functools.cmp_to_key(SourceSetCompare));
- all_renames, old_renames_to_delete = FixObjectBasenameCollisions(
- sets,
- source_files,
- FixBasenameCollision)
- if options.output_git_commands:
- WriteGitCommands(
- options.output_git_commands,
- all_renames,
- old_renames_to_delete)
-
# Build up set of all sources and includes.
sources_to_check = set()
for source_set in sets:
for source in source_set.sources:
GetIncludedSources(source, source_dir, sources_to_check)
- # Remove autorename_ files now that we've grabbed their underlying includes.
- # We generated autorename_ files above and should not consider them for
- # licensing or credits.
- sources_to_check = list(filter(lambda s: not RENAME_REGEX.search(s),
- sources_to_check))
-
UpdateCredits(sources_to_check, source_dir)
gn_file_name = os.path.join('.', 'ffmpeg_generated.gni')
