Merge pull request #173 from nyanmisaka/ff5.1

New upstream version 5.1
jellyfin · Jul 30, 2022 · ae2db3b · ae2db3b
2 parents 6bd84bb + ceacfe5
commit ae2db3b
Show file tree

Hide file tree

Showing 2,718 changed files with 94,023 additions and 48,897 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -30,7 +30,7 @@ jobs:
     uses: ./.github/workflows/_meta.yaml
     with:
       distro: 'ubuntu'
-      codenames: '["jammy", "focal", "bionic", "impish"]'
+      codenames: '["jammy", "focal", "bionic"]'
       architectures: '["amd64", "arm64", "armhf"]'
       release: false
 

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -22,7 +22,7 @@ jobs:
     uses: ./.github/workflows/_meta.yaml
     with:
       distro: 'ubuntu'
-      codenames: '["jammy", "focal", "bionic", "impish"]'
+      codenames: '["jammy", "focal", "bionic"]'
       architectures: '["amd64", "arm64", "armhf"]'
       release: true
     secrets:
@@ -59,7 +59,6 @@ jobs:
           {distro: 'ubuntu', codename: 'jammy'},
           {distro: 'ubuntu', codename: 'focal'},
           {distro: 'ubuntu', codename: 'bionic'},
-          {distro: 'ubuntu', codename: 'impish'},
           {distro: 'windows', codename: 'windows'},
         ]
     steps:

diff --git a/Changelog b/Changelog
@@ -1,65 +1,30 @@
 Entries are sorted chronologically from oldest to youngest within each release,
 releases are sorted from youngest to oldest.
 
-version 5.0.1:
-- avcodec/exr: Avoid signed overflow in displayWindow
-- avcodec/diracdec: avoid signed integer overflow in global mv
-- avcodec/takdsp: Fix integer overflow in decorrelate_sf()
-- avcodec/apedec: fix a integer overflow in long_filter_high_3800()
-- avdevice/dshow: fix regression
-- avfilter/vf_subtitles: pass storage size to libass
-- avcodec/vp9_superframe_split_bsf: Don't read inexistent data
-- avcodec/vp9_superframe_split_bsf: Discard invalid zero-sized frames
-- avcodec/vp9_superframe_bsf: Check for existence of data before reading it
-- avcodec/vp9_raw_reorder_bsf: Check for existence of data before reading it
-- avformat/imf: fix packet pts, dts and muxing
-- avformat/imf: open resources only when first needed
-- avformat/imf: cosmetics
-- avformat/imf_cpl: do not use filesize when reading XML file
-- avformat/imfdec: Use proper logcontext
-- avformat/imfdec: do not use filesize when reading XML file
-- doc/utils: add missing 22.2 layout entry
-- avcodec/av1: only set the private context pix_fmt field if get_pixel_format() succeeds
-- avformat/aqtitledec: Skip unrepresentable durations
-- avformat/cafdec: Do not store empty keys in read_info_chunk()
-- avformat/mxfdec: Do not clear array in mxf_read_strong_ref_array() before writing
-- avformat/mxfdec: Check for avio_read() failure in mxf_read_strong_ref_array()
-- avformat/mxfdec: Check count in mxf_read_strong_ref_array()
-- avformat/hls: Check target_duration
-- avcodec/pixlet: Avoid signed integer overflow in scaling in filterfn()
-- avformat/matroskadec: Check pre_ns
-- avcodec/sonic: Use unsigned for predictor_k to avoid undefined behavior
-- avcodec/libuavs3d: Check ff_set_dimensions() for failure
-- avcodec/speexdec: Align some comments
-- avcodec/speexdec: Use correct doxygen comments
-- avcodec/mjpegbdec: Set buf_size
-- avformat/matroskadec: Use rounded down duration in get_cue_desc() check
-- avcodec/argo: Check packet size
-- avcodec/g729_parser: Check channels
-- avformat/avidec: Check height
-- avformat/rmdec: Better duplicate tags check
-- avformat/mov: Disallow empty sidx
-- avformat/argo_cvg:: Fix order of operations in error check in argo_cvg_write_trailer()
-- avformat/argo_asf: Fix order of operations in error check in argo_asf_write_trailer()
-- avcodec/movtextdec: add () to CMP() macro to avoid unexpected behavior
-- avformat/matroskadec: Check duration
-- avformat/mov: Corner case encryption error cleanup in mov_read_senc()
-- avcodec/jpeglsdec: Fix if( code style
-- avcodec/jpeglsdec: Check get_ur_golomb_jpegls() for error
-- avcodec/motion_est: fix indention of ff_get_best_fcode()
-- avcodec/motion_est: Fix xy indexing on range violation in ff_get_best_fcode()
-- avformat/hls: Use unsigned for iv computation
-- avcodec/jpeglsdec: Increase range for N in ls_get_code_runterm() by using unsigned
-- avformat/matroskadec: Check desc_bytes
-- avformat/utils: Fix invalid NULL pointer operation in ff_parse_key_value()
-- avformat/matroskadec: Fix infinite loop with bz decompression
-- avformat/utils: keep chapter monotonicity on chapter updates
-- avformat/mov: Check size before subtraction
-- avcodec/cfhd: Avoid signed integer overflow in coeff
-- avcodec/libdav1d: free the Dav1dData packet on dav1d_send_data() failure
-- avcodec/h264_parser: don't alter decoder private data
-- configure: link to libatomic when it's present
-- fate/ffmpeg: add missing samples dependency to fate-shortest
+version 5.1:
+- add ipfs/ipns protocol support
+- dialogue enhance audio filter
+- dropped obsolete XvMC hwaccel
+- pcm-bluray encoder
+- DFPWM audio encoder/decoder and raw muxer/demuxer
+- SITI filter
+- Vizrt Binary Image encoder/decoder
+- avsynctest source filter
+- feedback video filter
+- pixelize video filter
+- colormap video filter
+- colorchart video source filter
+- multiply video filter
+- PGS subtitle frame merge bitstream filter
+- blurdetect filter
+- tiltshelf audio filter
+- QOI image format support
+- ffprobe -o option
+- virtualbass audio filter
+- VDPAU AV1 hwaccel
+- PHM image format support
+- remap_opencl filter
+- added chromakey_cuda filter
 
 
 version 5.0:

diff --git a/MAINTAINERS b/MAINTAINERS
@@ -161,6 +161,7 @@ Codecs:
   cscd.c                                Reimar Doeffinger
   cuviddec.c                            Timo Rothenpieler
   dca*                                  foo86
+  dfpwm*                                Jack Bruienne
   dirac*                                Rostislav Pehlivanov
   dnxhd*                                Baptiste Coudurier
   dolby_e*                              foo86
@@ -193,6 +194,7 @@ Codecs:
   libcodec2.c                           Tomas Härdin
   libdirac*                             David Conrad
   libdavs2.c                            Huiwen Ren
+  libjxl*.c, libjxl.h                   Leo Izen
   libgsm.c                              Michel Bardiaux
   libkvazaar.c                          Arttu Ylä-Outinen
   libopenh264enc.c                      Martin Storsjo, Linjie Fu
@@ -266,7 +268,6 @@ Codecs:
   xan.c                                 Mike Melanson
   xbm*                                  Paul B Mahol
   xface                                 Stefano Sabatini
-  xvmc.c                                Ivan Kalvachev
   xwd*                                  Paul B Mahol
 
 Hardware acceleration:
@@ -354,6 +355,7 @@ Filters:
   vf_il.c                               Paul B Mahol
   vf_(t)interlace                       Thomas Mundt (CC <[email protected]>)
   vf_lenscorrection.c                   Daniel Oberhoff
+  vf_libplacebo.c                       Niklas Haas
   vf_mergeplanes.c                      Paul B Mahol
   vf_mestimate.c                        Davinder Singh
   vf_minterpolate.c                     Davinder Singh
@@ -416,6 +418,7 @@ Muxers/Demuxers:
   dashdec.c                             Steven Liu
   dashenc.c                             Karthick Jeyapal
   daud.c                                Reimar Doeffinger
+  dfpwmdec.c                            Jack Bruienne
   dss.c                                 Oleksij Rempel
   dtsdec.c                              foo86
   dtshddec.c                            Paul B Mahol
@@ -436,6 +439,7 @@ Muxers/Demuxers:
   ipmovie.c                             Mike Melanson
   ircam*                                Paul B Mahol
   iss.c                                 Stefan Gehrer
+  jpegxl_probe.*                        Leo Izen
   jvdec.c                               Peter Ross
   kvag.c                                Zane van Iperen
   libmodplug.c                          Clément Bœsch
@@ -515,6 +519,7 @@ Protocols:
   bluray.c                              Petri Hintukainen
   ftp.c                                 Lukasz Marek
   http.c                                Ronald S. Bultje
+  libsrt.c                              Zhao Zhili
   libssh.c                              Lukasz Marek
   libzmq.c                              Andriy Gelman
   mms*.c                                Ronald S. Bultje
@@ -541,6 +546,7 @@ Operating systems / CPU architectures
 
 Alpha                                   Falk Hueffner
 MIPS                                    Manojkumar Bhosale, Shiyou Yin
+LoongArch                               Shiyou Yin
 Mac OS X / PowerPC                      Romain Dolbeau, Guillaume Poirier
 Amiga / PowerPC                         Colin Ward
 Linux / PowerPC                         Lauri Kasanen
@@ -615,10 +621,12 @@ Haihao Xiang (haihao)         1F0C 31E8 B4FE F7A4 4DC1 DC99 E0F5 76D4 76FC 437F
 Jaikrishnan Menon             61A1 F09F 01C9 2D45 78E1 C862 25DC 8831 AF70 D368
 James Almer                   7751 2E8C FD94 A169 57E6 9A7A 1463 01AD 7376 59E0
 Jean Delvare                  7CA6 9F44 60F1 BDC4 1FD2 C858 A552 6B9B B3CD 4E6A
+Leo Izen (thebombzen)         B6FD 3CFC 7ACF 83FC 9137 6945 5A71 C331 FD2F A19A
 Loren Merritt                 ABD9 08F4 C920 3F65 D8BE 35D7 1540 DAA7 060F 56DE
 Lynne                         FE50 139C 6805 72CA FD52 1F8D A2FE A5F0 3F03 4464
 Michael Niedermayer           9FF2 128B 147E F673 0BAD F133 611E C787 040B 0FAB
 Nicolas George                24CE 01CE 9ACC 5CEB 74D8 8D9D B063 D997 36E5 4C93
+Niklas Haas (haasn)           1DDB 8076 B14D 5B48 32FC 99D9 EB52 DA9C 02BA 6FB4
 Nikolay Aleksandrov           8978 1D8C FB71 588E 4B27 EAA8 C4F0 B5FC E011 13B1
 Panagiotis Issaris            6571 13A3 33D9 3726 F728 AA98 F643 B12E ECF3 E029
 Peter Ross                    A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B

diff --git a/Makefile b/Makefile
@@ -19,6 +19,8 @@ vpath %/fate_config.sh.template $(SRC_PATH)
 TESTTOOLS   = audiogen videogen rotozoom tiny_psnr tiny_ssim base64 audiomatch
 HOSTPROGS  := $(TESTTOOLS:%=tests/%) doc/print_options
 
+ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale swresample
+
 # $(FFLIBS-yes) needs to be in linking order
 FFLIBS-$(CONFIG_AVDEVICE)   += avdevice
 FFLIBS-$(CONFIG_AVFILTER)   += avfilter
@@ -76,13 +78,14 @@ tools/target_dem_%_fuzzer$(EXESUF): $(FF_DEP_LIBS)
 CONFIGURABLE_COMPONENTS =                                           \
     $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c))                 \
     $(SRC_PATH)/libavcodec/bitstream_filters.c                      \
+    $(SRC_PATH)/libavcodec/hwaccels.h                               \
     $(SRC_PATH)/libavcodec/parsers.c                                \
     $(SRC_PATH)/libavformat/protocols.c                             \
 
-config.h: ffbuild/.config
+config_components.h: ffbuild/.config
 ffbuild/.config: $(CONFIGURABLE_COMPONENTS)
 	@-tput bold 2>/dev/null
-	@-printf '\nWARNING: $(?) newer than config.h, rerun configure\n\n'
+	@-printf '\nWARNING: $(?) newer than config_components.h, rerun configure\n\n'
 	@-tput sgr0 2>/dev/null
 
 SUBDIR_VARS := CLEANFILES FFLIBS HOSTPROGS TESTPROGS TOOLS               \
@@ -113,12 +116,13 @@ include $(SRC_PATH)/fftools/Makefile
 include $(SRC_PATH)/doc/Makefile
 include $(SRC_PATH)/doc/examples/Makefile
 
-libavcodec/avcodec.o libavformat/utils.o libavdevice/avdevice.o libavfilter/avfilter.o libavutil/utils.o libpostproc/postprocess.o libswresample/swresample.o libswscale/utils.o : libavutil/ffversion.h
+$(ALLFFLIBS:%=lib%/version.o): libavutil/ffversion.h
 
 $(PROGS): %$(PROGSSUF)$(EXESUF): %$(PROGSSUF)_g$(EXESUF)
 ifeq ($(STRIPTYPE),direct)
 	$(STRIP) -o $@ $<
 else
+	$(RM) $@
 	$(CP) $< $@
 	$(STRIP) $@
 endif
@@ -159,7 +163,7 @@ clean::
 	$(RM) -rf coverage.info coverage.info.in lcov
 
 distclean:: clean
-	$(RM) .version avversion.h config.asm config.h mapfile  \
+	$(RM) .version config.asm config.h config_components.h mapfile  \
 		ffbuild/.config ffbuild/config.* libavutil/avconfig.h \
 		version.h libavutil/ffversion.h libavcodec/codec_names.h \
 		libavcodec/bsf_list.c libavformat/protocol_list.c \

diff --git a/RELEASE b/RELEASE
@@ -1 +1 @@
-5.0.1
+5.1
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
@@ -1,10 +1,13 @@
 
-              ┌────────────────────────────────────────┐
-              │ RELEASE NOTES for FFmpeg 5.0 "Lorentz" │
-              └────────────────────────────────────────┘
+            ┌────────────────────────────────────────────┐
+            │ RELEASE NOTES for FFmpeg 5.1 "Riemann" LTS │
+            └────────────────────────────────────────────┘
 
-   The FFmpeg Project proudly presents FFmpeg 5.0 "Lorentz", about 9
-   months after the release of FFmpeg 4.4.
+   The FFmpeg Project proudly presents FFmpeg 5.1 "Riemann" LTS, about 6
+   months after the release of FFmpeg 5.0, our first Long Term Support
+   release. While several past FFmpeg releases have enjoyed long term
+   support, this is the first release where such an intention is made
+   clear at release.
 
    A complete Changelog is available at the root of the project, and the
    complete Git history on https://git.ffmpeg.org/gitweb/ffmpeg.git

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.0.1
+5.1
diff --git a/build b/build
@@ -8,7 +8,6 @@ usage() {
     echo -e " * bullseye         * armhf"
     echo -e " * bionic           * arm64"
     echo -e " * focal"
-    echo -e " * impish"
     echo -e " * jammy"
 }
 
@@ -35,10 +34,6 @@ case ${cli_release} in
         release="ubuntu:focal"
         gcc_version="9"
     ;;
-    'impish')
-        release="ubuntu:impish"
-        gcc_version="11"
-    ;;
     'jammy')
         release="ubuntu:jammy"
         gcc_version="11"

diff --git a/build-win64 b/build-win64
@@ -10,7 +10,7 @@ done
 
 # Use the latest distro for toolchains
 distro="ubuntu:jammy"
-ffrevison="8"
+ffrevison="1"
 image_name="jellyfin-ffmpeg-build-windows-win64"
 package_temporary_dir="$( mktemp -d )"
 current_user="$( whoami )"

diff --git a/build.yaml b/build.yaml
@@ -1,7 +1,7 @@
 ---
 # We just wrap `build` so this is really it
 name: "jellyfin-ffmpeg"
-version: "5.0.1-8"
+version: "5.1-1"
 packages:
   - buster-amd64
   - buster-armhf
@@ -15,9 +15,6 @@ packages:
   - focal-amd64
   - focal-armhf
   - focal-arm64
-  - impish-amd64
-  - impish-armhf
-  - impish-arm64
   - jammy-amd64
   - jammy-armhf
   - jammy-arm64
diff --git a/compat/cuda/cuda_runtime.h b/compat/cuda/cuda_runtime.h
@@ -181,7 +181,9 @@ static inline __device__ double trunc(double a) { return __builtin_trunc(a); }
 static inline __device__ float fabsf(float a) { return __builtin_fabsf(a); }
 static inline __device__ float fabs(float a) { return __builtin_fabsf(a); }
 static inline __device__ double fabs(double a) { return __builtin_fabs(a); }
+static inline __device__ float sqrtf(float a) { return __builtin_sqrtf(a); }
 
+static inline __device__ float __saturatef(float a) { return __nvvm_saturate_f(a); }
 static inline __device__ float __sinf(float a) { return __nvvm_sin_approx_f(a); }
 static inline __device__ float __cosf(float a) { return __nvvm_cos_approx_f(a); }
 static inline __device__ float __expf(float a) { return __nvvm_ex2_approx_f(a * (float)__builtin_log2(__builtin_exp(1))); }