Обновлен ffmpeg n9.1-dev-861-gb16b5f2a01.

Добавлен патч для libavutil/slicethread.c.

Author: v0lt

docs/Changelog.Rus.txt

@@ -4,6 +4,9 @@
 =============================
 Обновлен болгарский перевод (автор jekovcar).
 
+Обновлены библиотеки:
+	ffmpeg n9.1-dev-861-gb16b5f2a01.
+
 
 1.9.1 - 2026-08-08
 =============================

docs/Changelog.txt

@@ -4,6 +4,9 @@
 =============================
 Updated Bulgarian translation (by jekovcar).
 
+Updated libraries:
+	ffmpeg n9.1-dev-861-gb16b5f2a01.
+
 
 1.9.1 - 2026-08-08
 =============================

docs/custom_code/ffmpeg.txt

@@ -39,6 +39,7 @@
 * libavutil/hwcontext_d3d12va.c
 * libavutil/hwcontext_d3d12va.h
 * libavutil/hwcontext_dxva2.c
+* libavutil/slicethread.c
 
 ======
 The following files are available only in MPC-BE (compared with ffmpeg):

src/ExtLib/ffmpeg/config_components.asm

@@ -1 +1,4 @@
 %define CONFIG_RV40_DECODER 1
+%define CONFIG_TTA_DECODER 1
+
+%define CONFIG_TTA_ENCODER 0

src/ExtLib/ffmpeg/libavcodec/ac3dec.c

@@ -390,6 +390,26 @@ typedef struct mant_groups {
     int b4;
 } mant_groups;
 
+static av_always_inline int dequantize_coeff(int mantissa, int exponent,
+                                             int coeff_bits)
+{
+#if USE_FIXED
+    return (mantissa * (1 << coeff_bits)) >> exponent;
+#else
+    return mantissa >> exponent;
+#endif
+}
+
+#if USE_FIXED
+static av_always_inline int dequantize_dexp24_dither(int mantissa)
+{
+    int scaled = mantissa * (1 << AC3_FIXED_COEFF_BITS);
+    int round  = 1 << (AC3_FIXED_EXPONENT_MAX - 1);
+
+    return (scaled + round - (scaled < 0)) >> AC3_FIXED_EXPONENT_MAX;
+}
+#endif
+
 /**
  * Decode the transform coefficients for a particular channel
  * reference: Section 7.3 Quantization and Decoding of Mantissas
@@ -402,6 +422,11 @@ static void ac3_decode_transform_coeffs_ch(AC3DecodeContext *s, int ch_index, ma
     int8_t *exps   = s->dexps[ch_index];
     int32_t *coeffs = s->fixed_coeffs[ch_index];
     int dither     = (ch_index == CPL_CH) || s->dither_flag[ch_index];
+#if USE_FIXED
+    int coeff_bits = fixed_coeff_bits(s);
+#else
+    int coeff_bits = 0;
+#endif
     GetBitContext *gbc = &s->gbc;
     int freq;
 
@@ -411,10 +436,19 @@ static void ac3_decode_transform_coeffs_ch(AC3DecodeContext *s, int ch_index, ma
         switch (bap) {
         case 0:
             /* random noise with approximate range of -0.707 to 0.707 */
-            if (dither)
+            if (dither) {
                 mantissa = (((av_lfg_get(&s->dith_state)>>8)*181)>>8) - 5931008;
-            else
+#if USE_FIXED
+                /* At dexp 24 the dither is below half a Q0 step. Keep two
+                 * fractional bits so it is not truncated to -1 or 0. */
+                if (coeff_bits && exps[freq] == AC3_FIXED_EXPONENT_MAX) {
+                    coeffs[freq] = dequantize_dexp24_dither(mantissa);
+                    continue;
+                }
+#endif
+            } else {
                 mantissa = 0;
+            }
             break;
         case 1:
             if (m->b1) {
@@ -466,7 +500,7 @@ static void ac3_decode_transform_coeffs_ch(AC3DecodeContext *s, int ch_index, ma
             mantissa = (unsigned)get_sbits(gbc, ff_ac3_quantization_tab[bap]) << (24 - ff_ac3_quantization_tab[bap]);
             break;
         }
-        coeffs[freq] = mantissa >> exps[freq];
+        coeffs[freq] = dequantize_coeff(mantissa, exps[freq], coeff_bits);
     }
 }
 
@@ -500,7 +534,8 @@ static inline void decode_transform_coeffs_ch(AC3DecodeContext *s, int blk,
         if (CONFIG_EAC3_DECODER && !blk)
             ff_eac3_decode_transform_coeffs_aht_ch(s, ch);
         for (bin = s->start_freq[ch]; bin < s->end_freq[ch]; bin++) {
-            s->fixed_coeffs[ch][bin] = s->pre_mantissa[ch][bin][blk] >> s->dexps[ch][bin];
+            s->fixed_coeffs[ch][bin] = dequantize_coeff(
+                s->pre_mantissa[ch][bin][blk], s->dexps[ch][bin], 0);
         }
     }
 }
@@ -571,6 +606,9 @@ static void do_rematrixing(AC3DecodeContext *s)
 static inline void do_imdct(AC3DecodeContext *s, int channels, int offset)
 {
     int ch;
+#if USE_FIXED
+    int window_bits = 8 + fixed_coeff_bits(s);
+#endif
 
     for (ch = 1; ch <= channels; ch++) {
         if (s->block_switch[ch]) {
@@ -581,7 +619,7 @@ static inline void do_imdct(AC3DecodeContext *s, int channels, int offset)
             s->tx_fn_128(s->tx_128, s->tmp_output, x, sizeof(INTFLOAT));
 #if USE_FIXED
             s->fdsp->vector_fmul_window_scaled(s->outptr[ch - 1], s->delay[ch - 1 + offset],
-                                       s->tmp_output, s->window, 128, 8);
+                                       s->tmp_output, s->window, 128, window_bits);
 #else
             s->fdsp->vector_fmul_window(s->outptr[ch - 1], s->delay[ch - 1 + offset],
                                        s->tmp_output, s->window, 128);
@@ -593,7 +631,7 @@ static inline void do_imdct(AC3DecodeContext *s, int channels, int offset)
             s->tx_fn_256(s->tx_256, s->tmp_output, s->transform_coeffs[ch], sizeof(INTFLOAT));
 #if USE_FIXED
             s->fdsp->vector_fmul_window_scaled(s->outptr[ch - 1], s->delay[ch - 1 + offset],
-                                       s->tmp_output, s->window, 128, 8);
+                                       s->tmp_output, s->window, 128, window_bits);
 #else
             s->fdsp->vector_fmul_window(s->outptr[ch - 1], s->delay[ch - 1 + offset],
                                        s->tmp_output, s->window, 128);
@@ -1287,7 +1325,11 @@ static int decode_audio_block(AC3DecodeContext *s, int blk, int offset)
             gain = s->dynamic_range[audio_channel];
 
 #if USE_FIXED
-        scale_coefs(s->transform_coeffs[ch], s->fixed_coeffs[ch], gain, 256);
+        if (fixed_coeff_bits(s))
+            scale_coefs_q2(s->transform_coeffs[ch], s->fixed_coeffs[ch], gain,
+                           256);
+        else
+            scale_coefs(s->transform_coeffs[ch], s->fixed_coeffs[ch], gain, 256);
 #else
         if (s->target_level != 0)
           gain = gain * s->level_gain[audio_channel];
@@ -1356,6 +1398,9 @@ static int ac3_decode_frame(AVCodecContext *avctx, AVFrame *frame,
     AC3DecodeContext *s = avctx->priv_data;
     int blk, ch, err, offset, ret;
     int i;
+#if USE_FIXED
+    int previous_coeff_bits;
+#endif
     int skip = 0, got_independent_frame = 0;
     const uint8_t *channel_map;
     uint8_t extended_channel_map[EAC3_MAX_CHANNELS];
@@ -1390,13 +1435,23 @@ static int ac3_decode_frame(AVCodecContext *avctx, AVFrame *frame,
 
     buf = s->input_buffer;
 dependent_frame:
+#if USE_FIXED
+    previous_coeff_bits = fixed_coeff_bits(s);
+#endif
     /* initialize the GetBitContext with the start of valid AC-3 Frame */
     if ((ret = init_get_bits8(&s->gbc, buf, buf_size)) < 0)
         return ret;
 
     /* parse the syncinfo */
     err = parse_frame_header(s);
 
+#if USE_FIXED
+    /* Do not mix Q0 and Q2 overlap samples if a malformed or explicitly
+     * forced stream switches between E-AC-3 and AC-3. */
+    if (!err && previous_coeff_bits != fixed_coeff_bits(s))
+        memset(s->delay, 0, sizeof(s->delay));
+#endif
+
     if (err) {
         switch (err) {
         case AC3_PARSE_ERROR_SYNC:

src/ExtLib/ffmpeg/libavcodec/ac3dec.h

@@ -266,20 +266,20 @@ struct AC3HeaderInfo;
  * Parse the E-AC-3 frame header.
  * This parses both the bit stream info and audio frame header.
  */
-static int ff_eac3_parse_header(AC3DecodeContext *s, const struct AC3HeaderInfo *hdr);
+av_unused static int ff_eac3_parse_header(AC3DecodeContext *s, const struct AC3HeaderInfo *hdr);
 
 /**
  * Decode mantissas in a single channel for the entire frame.
  * This is used when AHT mode is enabled.
  */
-static void ff_eac3_decode_transform_coeffs_aht_ch(AC3DecodeContext *s, int ch);
+av_unused static void ff_eac3_decode_transform_coeffs_aht_ch(AC3DecodeContext *s, int ch);
 
 /**
  * Apply spectral extension to each channel by copying lower frequency
  * coefficients to higher frequency bins and applying side information to
  * approximate the original high frequency signal.
  */
-static void ff_eac3_apply_spectral_extension(AC3DecodeContext *s);
+av_unused static void ff_eac3_apply_spectral_extension(AC3DecodeContext *s);
 
 #if (!USE_FIXED)
 extern float ff_ac3_heavy_dynamic_range_tab[256];

src/ExtLib/ffmpeg/libavcodec/avcodec.h

@@ -2233,6 +2233,32 @@ int avcodec_parameters_to_context(AVCodecContext *codec,
  */
 int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options);
 
+/**
+ * Try to reconfigure the encoder with the provided dictionary. May only be used
+ * if a codec with AV_CODEC_CAP_ENCODER_RECONF has been opened.
+ *
+ * Not all options can be changed, and it depends on the encoder. If any of the
+ * options can't be applied (Either because the option can't be changed, because
+ * invalid values for them were passed, or other errors), it is not guaranteed that
+ * the state of the encoder is the same as prior to calling this function, but in
+ * most cases it should.
+ * Unapplied options will remain in *dict, and owned by the caller.
+ *
+ * @param avctx   The context to reconfigure.
+ * @param options A dictionary filled with AVCodecContext and codec-private
+ *                options, which are set on top of the options already set in
+ *                avctx. Can't be NULL.
+ *
+ * @retval 0                         success
+ * @retval AVERROR_OPTION_NOT_FOUND  an entry with an invalid key was passed. The
+ *                                   context is untouched.
+ * @retval AVERROR(EINVAL)           an entry with an invalid value or an invalid
+ *                                   argument was passed.
+ * @retval AVERROR(ENOSYS)           unsupported encoder. The context is untouched.
+ * @retval "another negative error code" other errors.
+ */
+int avcodec_encode_reconfigure(AVCodecContext *avctx, AVDictionary **options);
+
 /**
  * Free all allocated data in the given subtitle struct.
  *

src/ExtLib/ffmpeg/libavcodec/codec.h

@@ -47,6 +47,12 @@
  * avcodec_default_get_buffer2 or avcodec_default_get_encode_buffer.
  */
 #define AV_CODEC_CAP_DR1                 (1 <<  1)
+
+/**
+ * Encoder can be reconfigured by passing new initialization parameters.
+ */
+#define AV_CODEC_CAP_ENCODER_RECONF      (1 <<  2)
+
 /**
  * Encoder or decoder requires flushing with NULL input at the end in order to
  * give the complete and correct output.

src/ExtLib/ffmpeg/libavcodec/codec_internal.h

@@ -97,9 +97,11 @@
 typedef struct FFCodecDefault {
     const char *key;
     const char *value;
+    int flags;
 } FFCodecDefault;
 
 struct AVCodecContext;
+struct AVDictionary;
 struct AVSubtitle;
 struct AVPacket;
 
@@ -254,11 +256,19 @@ typedef struct FFCodec {
      */
     void (*flush)(struct AVCodecContext *);
 
-    /**
-     * Decoding only, a comma-separated list of bitstream filters to apply to
-     * packets before decoding.
-     */
-    const char *bsfs;
+    union {
+        /**
+        * Encoding only. Reconfigure the encoder
+        * Called by avcodec_encode_reconfigure()
+        */
+        int (*reconf)(struct AVCodecContext *avctx, struct AVDictionary **dict);
+
+        /**
+        * Decoding only, a comma-separated list of bitstream filters to apply to
+        * packets before decoding.
+        */
+        const char *bsfs;
+    };
 
     /**
      * Array of pointers to hardware configurations supported by the codec,

src/ExtLib/ffmpeg/libavcodec/dirac_dwt.c

@@ -73,7 +73,7 @@ void ff_spatial_idwt_slice2(DWTContext *d, int y)
     for (level = d->decomposition_count-1; level >= 0; level--) {
         int wl = d->width  >> level;
         int hl = d->height >> level;
-        int stride_l = d->stride << level;
+        ptrdiff_t stride_l = d->stride << level;
 
         while (d->cs[level].y <= FFMIN((y>>level)+support, hl))
             d->spatial_compose(d, level, wl, hl, stride_l);