Обновление ffmpeg git-n7.1-dev-1158-g7560db937d.

Aleksoid1978 · Jun 8, 2024 · cdd63c2 · cdd63c2
1 parent 44e27ef
commit cdd63c2
Show file tree

Hide file tree

Showing 52 changed files with 598 additions and 467 deletions.
diff --git a/docs/Changelog.Rus.txt b/docs/Changelog.Rus.txt
@@ -3,7 +3,7 @@
 1.7.2.x dev
 =============================
 Обновлены библиотеки:
-	ffmpeg git-n7.1-dev-1103-gba56a300a9.
+	ffmpeg git-n7.1-dev-1158-g7560db937d.
 
 
 1.7.2 - 2024-06-07

diff --git a/docs/Changelog.txt b/docs/Changelog.txt
@@ -3,7 +3,7 @@
 1.7.2.x dev
 =============================
 Updated libraries:
-	ffmpeg git-n7.1-dev-1103-gba56a300a9.
+	ffmpeg git-n7.1-dev-1158-g7560db937d.
 
 
 1.7.2 - 2024-06-07

diff --git a/src/ExtLib/ffmpeg/ffmpeg.mak b/src/ExtLib/ffmpeg/ffmpeg.mak
@@ -67,6 +67,7 @@ OBJ_DIRS = $(OBJ_DIR) \
 	$(OBJ_DIR)libavcodec \
 	$(OBJ_DIR)libavcodec/bsf \
 	$(OBJ_DIR)libavcodec/aac \
+	$(OBJ_DIR)libavcodec/hevc \
 	$(OBJ_DIR)libavcodec/vvc \
 	$(OBJ_DIR)libavcodec/x86 \
 	$(OBJ_DIR)libavcodec/x86/h26x \
@@ -292,18 +293,6 @@ SRCS_LC = \
 	libavcodec/half2float.c \
 	libavcodec/hap.c \
 	libavcodec/hapdec.c \
-	libavcodec/hevc_cabac.c \
-	libavcodec/hevc_data.c \
-	libavcodec/hevc_filter.c \
-	libavcodec/hevc_mvs.c \
-	libavcodec/hevc_parse.c \
-	libavcodec/hevc_parser.c \
-	libavcodec/hevc_ps.c \
-	libavcodec/hevc_refs.c \
-	libavcodec/hevc_sei.c \
-	libavcodec/hevcdec.c \
-	libavcodec/hevcdsp.c \
-	libavcodec/hevcpred.c \
 	libavcodec/hpeldsp.c \
 	libavcodec/hq_hqa.c \
 	libavcodec/hq_hqadsp.c \
@@ -425,7 +414,20 @@ SRCS_LC = \
 	libavcodec/aac/aacdec_float.c \
 	libavcodec/aac/aacdec_lpd.c \
 	libavcodec/aac/aacdec_tab.c \
-	libavcodec/aac/aacdec_usac.c
+	libavcodec/aac/aacdec_usac.c \
+	\
+	libavcodec/hevc/cabac.c \
+	libavcodec/hevc/data.c \
+	libavcodec/hevc/dsp.c \
+	libavcodec/hevc/filter.c \
+	libavcodec/hevc/hevcdec.c \
+	libavcodec/hevc/mvs.c \
+	libavcodec/hevc/parse.c \
+	libavcodec/hevc/parser.c \
+	libavcodec/hevc/pred.c \
+	libavcodec/hevc/ps.c \
+	libavcodec/hevc/refs.c \
+	libavcodec/hevc/sei.c
 
 SRCS_LC_B = \
 	libavcodec/nvdec.c \

diff --git a/src/ExtLib/ffmpeg/libavcodec/aac.h b/src/ExtLib/ffmpeg/libavcodec/aac.h
@@ -31,7 +31,7 @@
 #define AVCODEC_AAC_H
 
 #define MAX_CHANNELS 64
-#define MAX_ELEM_ID 16
+#define MAX_ELEM_ID 64
 
 #define TNS_MAX_ORDER 20
 #define MAX_LTP_LONG_SFB 40

diff --git a/src/ExtLib/ffmpeg/libavcodec/aac/aacdec.c b/src/ExtLib/ffmpeg/libavcodec/aac/aacdec.c
@@ -1046,7 +1046,6 @@ static int decode_audio_specific_config_gb(AACDecContext *ac,
             return ret;
         break;
 #if CONFIG_AAC_DECODER
-    case AOT_USAC_NOSBR: /* fallthrough */
     case AOT_USAC:
         if ((ret = ff_aac_usac_config_decode(ac, avctx, gb,
                                              oc, m4ac->chan_config)) < 0)
@@ -1335,6 +1334,7 @@ static int decode_ics_info(AACDecContext *ac, IndividualChannelStream *ics,
         ics->use_kb_window[1]   = ics->use_kb_window[0];
         ics->use_kb_window[0]   = get_bits1(gb);
     }
+    ics->prev_num_window_groups = FFMAX(ics->num_window_groups, 1);
     ics->num_window_groups  = 1;
     ics->group_len[0]       = 1;
     if (ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE) {
@@ -1571,8 +1571,7 @@ int ff_aac_decode_tns(AACDecContext *ac, TemporalNoiseShaping *tns,
                       GetBitContext *gb, const IndividualChannelStream *ics)
 {
     int tns_max_order = INT32_MAX;
-    const int is_usac = ac->oc[1].m4ac.object_type == AOT_USAC ||
-                        ac->oc[1].m4ac.object_type == AOT_USAC_NOSBR;
+    const int is_usac = ac->oc[1].m4ac.object_type == AOT_USAC;
     int w, filt, i, coef_len, coef_res, coef_compress;
     const int is8 = ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE;
 
@@ -2421,8 +2420,7 @@ static int aac_decode_frame_int(AVCodecContext *avctx, AVFrame *frame,
 
     ac->tags_mapped = 0;
 
-    if ((ac->oc[1].m4ac.object_type == AOT_USAC) ||
-        (ac->oc[1].m4ac.object_type == AOT_USAC_NOSBR)) {
+    if (ac->oc[1].m4ac.object_type == AOT_USAC) {
         if (ac->is_fixed) {
             avpriv_report_missing_feature(ac->avctx,
                                           "AAC USAC fixed-point decoding");

diff --git a/src/ExtLib/ffmpeg/libavcodec/aac/aacdec.h b/src/ExtLib/ffmpeg/libavcodec/aac/aacdec.h
@@ -125,6 +125,7 @@ typedef struct LongTermPrediction {
 typedef struct AACUsacElemData {
     uint8_t core_mode;
     uint8_t scale_factor_grouping;
+    uint8_t tns_data_present;
 
     /* Timewarping ratio */
 #define NUM_TW_NODES 16
@@ -163,6 +164,7 @@ typedef struct IndividualChannelStream {
     enum WindowSequence window_sequence[2];
     uint8_t use_kb_window[2];   ///< If set, use Kaiser-Bessel window, otherwise use a sine window.
     int num_window_groups;
+    int prev_num_window_groups; ///< Previous frame's number of window groups
     uint8_t group_len[8];
     LongTermPrediction ltp;
     const uint16_t *swb_offset; ///< table of offsets to the lowest spectral coefficient of a scalefactor band, sfb, for a particular window
@@ -230,6 +232,7 @@ typedef struct SingleChannelElement {
 typedef struct AACUsacStereo {
     uint8_t common_window;
     uint8_t common_tw;
+    uint8_t tns_on_lr; ///< Apply TNS before M/S and stereo prediction
 
     uint8_t ms_mask_mode;
     uint8_t config_idx;