Merge remote-tracking branch 'upstream/master' into shio/master

* upstream/master: (687 commits)
  riscv/cpu: add V subset feature detection
  vf_colorspace: allow for extended primaries and colorspace
  swscale: allow extended primaries
  Revert "Re-initialize stream on new metadata."
  fftools/ffmpeg_sched: prevent demuxers from getting stuck
  tests/fate/hevc: add a mv-hevc sample using long term ref
  avcodec/hevc: reset long_term_rps.nb_refs for IDR
  avcodec/hevc: remove an always true condition
  avfilter/vf_libopencv: bump to opencv4
  avcodec/rv60dec: Clear blk_info
  avformat/whip: Fix rtp_ctx->streams access
  Re-initialize stream on new metadata.
  avformat/mp3enc: Avoid av_unused
  swresample/swresample: Avoid av_unused
  Don't reset last{pts,dts} on new sequentialized ogg streams.
  avcodec/utvideodec: Set B for the width= 1 case in restore_median_planar_il()
  avcodec/osq: Fix 32bit sample overflow
  vulkan/prores: forward quantization parameter to the IDCT shader
  libavutil: fix memory leak of drmVersion
  avformat: Make ff_make_codec_str output to an AVBPrint object
  ...

Author: mtneug

.forgejo/CODEOWNERS

@@ -14,7 +14,7 @@ libavcodec/.*aac.* @lynne
 libavcodec/.*ac3.* @lynne
 libavcodec/.*adpcm.* @zane @pross
 libavcodec/anm.* @pross
-libavcodec/amf.* @OvchinnikovDmitrii
+libavcodec/amf.* @OvchinnikovDmitrii @ArazIusubov
 libavcodec/ansi.* @pross
 libavcodec/aom_film_grain.* @haasn
 libavcodec/.*atrac9.* @lynne
@@ -82,6 +82,7 @@ libavcodec/bsf/smpte436m_to_eia608.* @programmerjake
 libavcodec/aarch64/.* @lynne @mstorsjo
 libavcodec/arm/.* @mstorsjo
 libavcodec/ppc/.* @sean_mcg
+libavcodec/riscv/.* @Courmisch
 libavcodec/wasm/hevc/.* @quink
 libavcodec/x86/.* @lynne
 libavcodec/x86/vp8.* @rbultje
@@ -91,14 +92,15 @@ libavcodec/x86/vpx.* @rbultje
 # avfilter
 # =======
 libavfilter/af_whisper.* @vpalmisano
-libavfilter/.*_amf* @OvchinnikovDmitrii
+libavfilter/.*_amf* @OvchinnikovDmitrii @ArazIusubov
 libavfilter/avfiltergraph.* @haasn
 libavfilter/colorspace.* @rbultje
 libavfilter/formats.* @haasn
 libavfilter/.*f_ebur128.* @haasn
 libavfilter/vf_blackdetect.* @haasn
 libavfilter/vf_colordetect.* @haasn
 libavfilter/vf_colorspace.* @rbultje
+libavfilter/.*drawvg.* @ayosec
 libavfilter/vf_icc.* @haasn
 libavfilter/vf_libplacebo.* @haasn
 libavfilter/vf_premultiply.* @haasn
@@ -110,6 +112,7 @@ libavfilter/vf_yadif.* @michaelni
 libavfilter/vsrc_mandelbrot.* @michaelni
 
 libavfilter/aarch64/.* @mstorsjo
+libavfilter/riscv/.* @Courmisch
 libavfilter/x86/colorspace.* @rbultje
 libavfilter/x86/scene_sad.* @haasn
 
@@ -153,7 +156,7 @@ libavformat/wtv.* @pross
 
 # avutil
 # ======
-libavutil/.*_amf* @OvchinnikovDmitrii
+libavutil/.*_amf* @OvchinnikovDmitrii @ArazIusubov
 libavutil/.*crc.* @lynne @michaelni
 libavutil/.*d3d12va.* @jianhuaw @tong1wu
 libavutil/csp.* @rbultje @haasn
@@ -180,6 +183,7 @@ libavutil/tx.* @lynne
 libavutil/aarch64/.* @lynne @mstorsjo
 libavutil/arm/.* @mstorsjo
 libavutil/ppc/.* @sean_mcg
+libavutil/riscv/.* @Courmisch
 libavutil/x86/.* @lynne
 
 # swresample
@@ -193,6 +197,7 @@ libswresample/.* @michaelni
 libswscale/aarch64/.* @mstorsjo
 libswscale/arm/.* @mstorsjo
 libswscale/ppc/.* @sean_mcg
+libswscale/riscv/.* @Courmisch
 libswscale/.* @haasn
 
 # tools
@@ -210,4 +215,6 @@ doc/.* @GyanD
 
 # tests
 # =====
+tests/checkasm/riscv/.* @Courmisch
+tests/ref/.*drawvg.* @ayosec
 tests/ref/fate/sub-mcc.* @programmerjake

.forgejo/workflows/test.yml

@@ -9,11 +9,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        runner: [linux-amd64,linux-aarch64]
+        runner: [linux-aarch64]
+        shared: ['false']
         bits: ['64']
         include:
           - runner: linux-amd64
+            shared: 'false'
             bits: '32'
+          - runner: linux-amd64
+            shared: 'true'
+            bits: '64'
     runs-on: ${{ matrix.runner }}
     steps:
       - name: Checkout
@@ -22,6 +27,7 @@ jobs:
         run: |
           ./configure --enable-gpl --enable-nonfree --enable-memory-poisoning --assert-level=2 \
               $([ "${{ matrix.bits }}" != "32" ] || echo --arch=x86_32 --extra-cflags=-m32 --extra-cxxflags=-m32 --extra-ldflags=-m32) \
+              $([ "${{ matrix.shared }}" != "true" ] || echo --enable-shared --disable-static) \
               || CFGRES=$? && CFGRES=$?
           cat ffbuild/config.log
           exit $CFGRES
@@ -39,15 +45,15 @@ jobs:
         id: fate
         run: |
           make fate-rsync SAMPLES=$PWD/fate-suite
-          echo "hash=$(find fate-suite -type f | sort | sha256sum | cut -d' ' -f1)" >> $FORGEJO_OUTPUT
+          echo "hash=$(find fate-suite -type f -printf "%P %s %T@\n" | sort | sha256sum | cut -d' ' -f1)" >> $FORGEJO_OUTPUT
       - name: Cache Fate-Suite
         uses: actions/cache/save@v4
         if: ${{ format('fate-suite-{0}', steps.fate.outputs.hash) != steps.cache.outputs.cache-matched-key }}
         with:
           path: fate-suite
           key: fate-suite-${{ steps.fate.outputs.hash }}
       - name: Run Fate
-        run: make fate SAMPLES=$PWD/fate-suite -j$(nproc)
+        run: LD_LIBRARY_PATH="$(printf "%s:" "$PWD"/lib*)$PWD" make fate fate-build SAMPLES=$PWD/fate-suite -j$(nproc)
   compile_only:
     strategy:
       fail-fast: false
@@ -66,3 +72,5 @@ jobs:
               --extra-libs="$FF_LIBS" --extra-ldflags="$FF_LDFLAGS" --extra-ldexeflags="$FF_LDEXEFLAGS"
       - name: Build
         run: make -j$(nproc)
+      - name: Run Fate
+        run: make -j$(nproc) fate-build

.gitignore

@@ -36,6 +36,7 @@
 /ffprobe
 /config.asm
 /config.h
+/config_components.asm
 /config_components.h
 /coverage.info
 /lcov/

Changelog

@@ -4,6 +4,12 @@ releases are sorted from youngest to oldest.
 version <next>:
 - ffprobe -codec option
 - EXIF Metadata Parsing
+- gfxcapture: Windows.Graphics.Capture based window/monitor capture
+- hxvs demuxer for HXVS/HXVT IP camera format
+- MPEG-H 3D Audio decoding via mpeghdec
+- D3D12 H.264 encoder
+- drawvg filter via libcairo
+- ffmpeg CLI tiled HEIF support
 
 
 version 8.0:

MAINTAINERS

@@ -152,7 +152,7 @@ Codecs:
   adpcm.c                               Zane van Iperen
   alacenc.c                             Jaikrishnan Menon
   alsdec.c                              Thilo Borgmann, Umair Khan
-  amfdec*,amfenc*                   [2] Dmitrii Ovchinnikov
+  amfdec*,amfenc*                   [2] Dmitrii Ovchinnikov, Araz Iusubov
   aptx.c                                Aurelien Jacobs
   ass*                                  Aurelien Jacobs
   asv*                                  Michael Niedermayer
@@ -211,7 +211,7 @@ Codecs:
   libkvazaar.c                          Arttu Ylä-Outinen
   libopenh264enc.c                      Martin Storsjo, Linjie Fu
   libopenjpegenc.c                      Michael Bradshaw
-  libtheoraenc.c                        David Conrad
+  libtheoraenc.c                    [0]
   libvorbis.c                           David Conrad
   libvpx*                               James Zern
   libxavs.c                             Stefan Gehrer
@@ -278,7 +278,7 @@ Codecs:
   xface                                 Stefano Sabatini
 
 Hardware acceleration:
-  amf*                              [2] Dmitrii Ovchinnikov
+  amf*                              [2] Dmitrii Ovchinnikov, Araz Iusubov
   dxva2*                                Hendrik Leppkes, Laurent Aimar, Steve Lhomme
   d3d11va*                              Steve Lhomme
   d3d12va*                              Wu Jianhua
@@ -522,7 +522,7 @@ LoongArch                           [2] Shiyou Yin
 Darwin (macOS, iOS)                 [2] Marvin Scholz
 Mac OS X / PowerPC                  [0]
 Amiga / PowerPC                         Colin Ward
-Linux / PowerPC                     [1] Lauri Kasanen
+Linux / PowerPC                     [2] Sean McGovern (CC <[email protected]>), Lauri Kasanen
 RISC-V                              [2] Rémi Denis-Courmont
 Windows MinGW                           Alex Beregszaszi, Ramiro Polla
 Windows Cygwin                          Victor Paesa
@@ -618,6 +618,7 @@ Reinhard Tartler              9300 5DC2 7E87 6C37 ED7B CA9A 9808 3544 9453 48A4
 Reynaldo H. Verdejo Pinochet  6E27 CD34 170C C78E 4D4F 5F40 C18E 077F 3114 452A
 Robert Swain                  EE7A 56EA 4A81 A7B5 2001 A521 67FA 362D A2FC 3E71
 Sascha Sommer                 38A0 F88B 868E 9D3A 97D4 D6A0 E823 706F 1E07 0D3C
+Sean McGovern (Sean_McG)      6D03 BC60 3A33 E615 6E2E 06AD 8C06 8175 6F59 8684
 Stefano Sabatini              0D0B AD6B 5330 BBAD D3D6 6A0C 719C 2839 FC43 2D5F
 Steinar H. Gunderson          C2E9 004F F028 C18E 4EAD DB83 7F61 7561 7797 8F76
 Stephan Hilb                  4F38 0B3A 5F39 B99B F505 E562 8D5C 5554 4E17 8863

Makefile

@@ -53,31 +53,31 @@ FF_DEP_LIBS  := $(DEP_LIBS)
 FF_STATIC_DEP_LIBS := $(STATIC_DEP_LIBS)
 
 $(TOOLS): %$(EXESUF): %.o
-	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(filter-out $(FF_DEP_LIBS), $^) $(EXTRALIBS-$(*F)) $(EXTRALIBS) $(ELIBS)
+	$(call LINK,$(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(filter-out $(FF_DEP_LIBS), $^) $(EXTRALIBS-$(*F)) $(EXTRALIBS) $(ELIBS))
 
 target_dec_%_fuzzer$(EXESUF): target_dec_%_fuzzer.o $(FF_DEP_LIBS)
-	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH)
+	$(call LINK,$(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH))
 
 target_enc_%_fuzzer$(EXESUF): target_enc_%_fuzzer.o $(FF_DEP_LIBS)
-	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH)
+	$(call LINK,$(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH))
 
 tools/target_bsf_%_fuzzer$(EXESUF): tools/target_bsf_%_fuzzer.o $(FF_DEP_LIBS)
-	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH)
+	$(call LINK,$(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH))
 
 target_dem_%_fuzzer$(EXESUF): target_dem_%_fuzzer.o $(FF_DEP_LIBS)
-	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH)
+	$(call LINK,$(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH))
 
 tools/target_dem_fuzzer$(EXESUF): tools/target_dem_fuzzer.o $(FF_DEP_LIBS)
-	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH)
+	$(call LINK,$(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH))
 
 tools/target_io_dem_fuzzer$(EXESUF): tools/target_io_dem_fuzzer.o $(FF_DEP_LIBS)
-	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH)
+	$(call LINK,$(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH))
 
 tools/target_sws_fuzzer$(EXESUF): tools/target_sws_fuzzer.o $(FF_DEP_LIBS)
-	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH)
+	$(call LINK,$(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH))
 
 tools/target_swr_fuzzer$(EXESUF): tools/target_swr_fuzzer.o $(FF_DEP_LIBS)
-	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH)
+	$(call LINK,$(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH))
 
 tools/enum_options$(EXESUF): ELIBS = $(FF_EXTRALIBS)
 tools/enum_options$(EXESUF): $(FF_DEP_LIBS)
@@ -144,7 +144,7 @@ else
 endif
 
 %$(PROGSSUF)_g$(EXESUF): $(FF_DEP_LIBS)
-	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS)
+	$(call LINK,$(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS))
 
 VERSION_SH  = $(SRC_PATH)/ffbuild/version.sh
 ifeq ($(VERSION_TRACKING),yes)

compat/w32pthreads.h

@@ -46,7 +46,7 @@
 #include "libavutil/time.h"
 #include "libavutil/wchar_filename.h"
 
-typedef struct pthread_t {
+typedef struct w32pthread_t {
     void *handle;
     void *(*func)(void* arg);
     void *arg;
@@ -72,20 +72,20 @@ typedef CONDITION_VARIABLE pthread_cond_t;
 #define THREADFUNC_RETTYPE unsigned
 #endif
 
-static av_unused THREADFUNC_RETTYPE
+av_unused static THREADFUNC_RETTYPE
 __stdcall attribute_align_arg win32thread_worker(void *arg)
 {
     pthread_t h = (pthread_t)arg;
     h->ret = h->func(h->arg);
     return 0;
 }
 
-static av_unused int pthread_create(pthread_t *thread, const void *unused_attr,
+av_unused static int pthread_create(pthread_t *thread, const void *unused_attr,
                                     void *(*start_routine)(void*), void *arg)
 {
     pthread_t ret;
 
-    ret = av_mallocz(sizeof(*ret));
+    ret = (pthread_t)av_mallocz(sizeof(*ret));
     if (!ret)
         return EAGAIN;
 
@@ -109,7 +109,7 @@ static av_unused int pthread_create(pthread_t *thread, const void *unused_attr,
     return 0;
 }
 
-static av_unused int pthread_join(pthread_t thread, void **value_ptr)
+av_unused static int pthread_join(pthread_t thread, void **value_ptr)
 {
     DWORD ret = WaitForSingleObject(thread->handle, INFINITE);
     if (ret != WAIT_OBJECT_0) {
@@ -149,7 +149,7 @@ static inline int pthread_mutex_unlock(pthread_mutex_t *m)
 typedef INIT_ONCE pthread_once_t;
 #define PTHREAD_ONCE_INIT INIT_ONCE_STATIC_INIT
 
-static av_unused int pthread_once(pthread_once_t *once_control, void (*init_routine)(void))
+av_unused static int pthread_once(pthread_once_t *once_control, void (*init_routine)(void))
 {
     BOOL pending = FALSE;
     InitOnceBeginInitialize(once_control, 0, &pending, NULL);