Update patches and ffmpeg

Author: seydx

FFmpeg

@@ -2,7 +2,7 @@ Index: FFmpeg/configure
 ===================================================================
 --- FFmpeg.orig/configure
 +++ FFmpeg/configure
-@@ -3418,6 +3418,8 @@ scale_cuda_filter_deps="ffnvcodec"
+@@ -3417,6 +3417,8 @@ scale_cuda_filter_deps="ffnvcodec"
  scale_cuda_filter_deps_any="cuda_nvcc cuda_llvm"
  thumbnail_cuda_filter_deps="ffnvcodec"
  thumbnail_cuda_filter_deps_any="cuda_nvcc cuda_llvm"
@@ -11,7 +11,7 @@ Index: FFmpeg/configure
  transpose_npp_filter_deps="ffnvcodec libnpp"
  overlay_cuda_filter_deps="ffnvcodec"
  overlay_cuda_filter_deps_any="cuda_nvcc cuda_llvm"
-@@ -4852,8 +4854,10 @@ if enabled cuda_nvcc; then
+@@ -4851,8 +4853,10 @@ if enabled cuda_nvcc; then
      nvcc_default="nvcc"
      nvccflags_default="-gencode arch=compute_30,code=sm_30 -O2"
  else
@@ -23,7 +23,7 @@ Index: FFmpeg/configure
      NVCC_C=""
  fi
 
-@@ -4866,6 +4870,11 @@ if enabled cuda_nvcc; then
+@@ -4865,6 +4869,11 @@ if enabled cuda_nvcc; then
      if $nvcc $nvccflags_default 2>&1 | grep -qi unsupported; then
          nvccflags_default="-gencode arch=compute_75,code=sm_75 -O2"
      fi

patches/jellyfin/0004-add-cuda-tonemap-impl.patch

@@ -2,7 +2,7 @@ Index: FFmpeg/configure
 ===================================================================
 --- FFmpeg.orig/configure
 +++ FFmpeg/configure
-@@ -4079,6 +4079,7 @@ rubberband_filter_deps="librubberband"
+@@ -4078,6 +4078,7 @@ rubberband_filter_deps="librubberband"
  sab_filter_deps="gpl swscale"
  scale2ref_filter_deps="swscale"
  scale_filter_deps="swscale"

patches/jellyfin/0006-add-opencl-scaler-and-pixfmt-converter-impl.patch

@@ -2,7 +2,7 @@ Index: FFmpeg/configure
 ===================================================================
 --- FFmpeg.orig/configure
 +++ FFmpeg/configure
-@@ -4027,6 +4027,7 @@ gblur_vulkan_filter_deps="vulkan spirv_c
+@@ -4026,6 +4026,7 @@ gblur_vulkan_filter_deps="vulkan spirv_c
  hflip_vulkan_filter_deps="vulkan spirv_compiler"
  histeq_filter_deps="gpl"
  hqdn3d_filter_deps="gpl"

patches/jellyfin/0014-add-vaapi-hwupload-filter.patch

@@ -218,15 +218,15 @@ Index: FFmpeg/libavcodec/qsvenc.c
 ===================================================================
 --- FFmpeg.orig/libavcodec/qsvenc.c
 +++ FFmpeg/libavcodec/qsvenc.c
-@@ -205,6 +205,7 @@ static void dump_video_param(AVCodecCont
+@@ -203,6 +203,7 @@ static void dump_video_param(AVCodecCont
  #endif
 
      const char *tmp_str = NULL;
 +    mfxExtHEVCParam *exthevcparam = NULL;
 
      if (q->co2_idx > 0)
          co2 = (mfxExtCodingOption2*)coding_opts[q->co2_idx];
-@@ -220,6 +221,8 @@ static void dump_video_param(AVCodecCont
+@@ -218,6 +219,8 @@ static void dump_video_param(AVCodecCont
          exthypermodeparam = (mfxExtHyperModeParam *)coding_opts[q->exthypermodeparam_idx];
  #endif
 
@@ -235,7 +235,7 @@ Index: FFmpeg/libavcodec/qsvenc.c
      av_log(avctx, AV_LOG_VERBOSE, "profile: %s; level: %"PRIu16"\n",
             print_profile(avctx->codec_id, info->CodecProfile), info->CodecLevel);
 
-@@ -400,6 +403,11 @@ static void dump_video_param(AVCodecCont
+@@ -398,6 +401,11 @@ static void dump_video_param(AVCodecCont
          av_log(avctx, AV_LOG_VERBOSE, "\n");
      }
  #endif
@@ -247,7 +247,7 @@ Index: FFmpeg/libavcodec/qsvenc.c
  }
 
  static void dump_video_vp9_param(AVCodecContext *avctx, QSVEncContext *q,
-@@ -1211,6 +1219,18 @@ static int init_video_param(AVCodecConte
+@@ -1209,6 +1217,18 @@ static int init_video_param(AVCodecConte
          q->extparam_internal[q->nb_extparam_internal++] = (mfxExtBuffer *)&q->exthevctiles;
      }
 
@@ -266,7 +266,7 @@ Index: FFmpeg/libavcodec/qsvenc.c
      q->extvsi.VideoFullRange = (avctx->color_range == AVCOL_RANGE_JPEG);
      q->extvsi.ColourDescriptionPresent = 0;
 
-@@ -1463,12 +1483,17 @@ static int qsv_retrieve_enc_params(AVCod
+@@ -1461,12 +1481,17 @@ static int qsv_retrieve_enc_params(AVCod
      };
  #endif
 
@@ -285,7 +285,7 @@ Index: FFmpeg/libavcodec/qsvenc.c
      ext_buffers[ext_buf_num++] = (mfxExtBuffer*)&extradata;
      ext_buffers[ext_buf_num++] = (mfxExtBuffer*)&co;
 
-@@ -1496,6 +1521,10 @@ static int qsv_retrieve_enc_params(AVCod
+@@ -1494,6 +1519,10 @@ static int qsv_retrieve_enc_params(AVCod
          ext_buffers[ext_buf_num++] = (mfxExtBuffer*)&hyper_mode_param_buf;
      }
  #endif

patches/jellyfin/0019-backport-fixes-for-qsv-from-cartwheel.patch

@@ -14,7 +14,7 @@ Index: FFmpeg/libavcodec/qsvenc.c
 ===================================================================
 --- FFmpeg.orig/libavcodec/qsvenc.c
 +++ FFmpeg/libavcodec/qsvenc.c
-@@ -1900,6 +1900,10 @@ static void clear_unused_frames(QSVEncCo
+@@ -1898,6 +1898,10 @@ static void clear_unused_frames(QSVEncCo
              memset(&cur->enc_ctrl, 0, sizeof(cur->enc_ctrl));
              cur->enc_ctrl.Payload = cur->payloads;
              cur->enc_ctrl.ExtParam = cur->extparam;
@@ -25,7 +25,7 @@ Index: FFmpeg/libavcodec/qsvenc.c
              if (cur->frame->format == AV_PIX_FMT_QSV) {
                  av_frame_unref(cur->frame);
              }
-@@ -2071,6 +2075,16 @@ static int submit_frame(QSVEncContext *q
+@@ -2069,6 +2073,16 @@ static int submit_frame(QSVEncContext *q
          return ret;
 
      if (frame->format == AV_PIX_FMT_QSV) {
@@ -42,7 +42,7 @@ Index: FFmpeg/libavcodec/qsvenc.c
          ret = av_frame_ref(qf->frame, frame);
          if (ret < 0)
              return ret;
-@@ -2079,10 +2093,19 @@ static int submit_frame(QSVEncContext *q
+@@ -2077,10 +2091,19 @@ static int submit_frame(QSVEncContext *q
 
          if (q->frames_ctx.mids) {
              ret = ff_qsv_find_surface_idx(&q->frames_ctx, qf);

patches/jellyfin/0021-add-external-frame-support-for-qsv-enc.patch

@@ -9,5 +9,5 @@ Index: FFmpeg/tests/fate/hevc.mak
 -fate-hevc-bsf-mp4toannexb: REF = 73019329ed7f81c24f9af67c34c640c0
 +fate-hevc-bsf-mp4toannexb: REF = 7d05a79c7a6665ae22c0043a4d83a811
 
- fate-hevc-skiploopfilter: CMD = framemd5 -skip_loop_filter nokey -i $(TARGET_SAMPLES)/hevc-conformance/SAO_D_Samsung_5.bit -sws_flags bitexact
- FATE_HEVC-$(call FRAMEMD5, HEVC, HEVC, HEVC_PARSER) += fate-hevc-skiploopfilter
+ # Start with IDR, POC < 0 after the second IDR
+ FATE_HEVC-$(call FRAMECRC, MOV HEVC,, HEVC_PARSER MOV_MUXER DTS2PTS_BSF) += fate-hevc-bsf-dts2pts-idr

patches/jellyfin/0023-add-fixes-for-hevc-hdr-decoding-in-bsf.patch

@@ -98,7 +98,7 @@ Index: FFmpeg/libavformat/hlsenc.c
 ===================================================================
 --- FFmpeg.orig/libavformat/hlsenc.c
 +++ FFmpeg/libavformat/hlsenc.c
-@@ -883,7 +883,7 @@ static int hls_mux_init(AVFormatContext
+@@ -775,7 +775,7 @@ static int hls_mux_init(AVFormatContext
      AVFormatContext *vtt_oc = NULL;
      int byterange_mode = (hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size > 0);
      int remaining_options;
@@ -107,7 +107,7 @@ Index: FFmpeg/libavformat/hlsenc.c
 
      ret = avformat_alloc_output_context2(&vs->avf, vs->oformat, NULL, NULL);
      if (ret < 0)
-@@ -931,6 +931,20 @@ static int hls_mux_init(AVFormatContext
+@@ -823,6 +823,20 @@ static int hls_mux_init(AVFormatContext
              st->codecpar->codec_tag = 0;
          }
 
@@ -157,15 +157,15 @@ Index: FFmpeg/libavformat/movenc.c
          } else if (dovi) {
              av_log(mov->fc, AV_LOG_WARNING, "Not writing 'dvcC'/'dvvC' box. Requires -strict unofficial.\n");
          }
-@@ -8829,6 +8831,7 @@ static const AVCodecTag codec_mp4_tags[]
+@@ -8843,6 +8845,7 @@ static const AVCodecTag codec_mp4_tags[]
      { AV_CODEC_ID_HEVC,            MKTAG('h', 'e', 'v', '1') },
      { AV_CODEC_ID_HEVC,            MKTAG('h', 'v', 'c', '1') },
      { AV_CODEC_ID_HEVC,            MKTAG('d', 'v', 'h', '1') },
 +    { AV_CODEC_ID_HEVC,            MKTAG('d', 'v', 'h', 'e') },
      { AV_CODEC_ID_VVC,             MKTAG('v', 'v', 'c', '1') },
      { AV_CODEC_ID_VVC,             MKTAG('v', 'v', 'i', '1') },
      { AV_CODEC_ID_EVC,             MKTAG('e', 'v', 'c', '1') },
-@@ -8843,6 +8846,7 @@ static const AVCodecTag codec_mp4_tags[]
+@@ -8857,6 +8860,7 @@ static const AVCodecTag codec_mp4_tags[]
      { AV_CODEC_ID_TSCC2,           MKTAG('m', 'p', '4', 'v') },
      { AV_CODEC_ID_VP9,             MKTAG('v', 'p', '0', '9') },
      { AV_CODEC_ID_AV1,             MKTAG('a', 'v', '0', '1') },

patches/jellyfin/0030-pass-dovi-sidedata-to-hlsenc-and-mpegtsenc.patch

@@ -2,7 +2,7 @@ Index: FFmpeg/configure
 ===================================================================
 --- FFmpeg.orig/configure
 +++ FFmpeg/configure
-@@ -5791,7 +5791,7 @@ elif enabled x86; then
+@@ -5790,7 +5790,7 @@ elif enabled x86; then
          ;;
          # everything else should support nopl and conditional mov (cmov)
          *)

patches/jellyfin/0032-enable-gcc-vectorization-and-fix-cpuflags.patch

@@ -18,7 +18,7 @@ Index: FFmpeg/libavcodec/nvenc.c
  #include "libavutil/mem.h"
  #include "libavutil/pixdesc.h"
  #include "libavutil/timecode_internal.h"
-@@ -2892,6 +2894,80 @@ static int prepare_sei_data_array(AVCode
+@@ -2891,6 +2893,80 @@ static int prepare_sei_data_array(AVCode
              }
          }
      }