Merge remote-tracking branch 'ffmpeg/master' into workflows

Author: winlinvip

MAINTAINERS

@@ -45,6 +45,8 @@ Commandline utility code:
 QuickTime faststart:
   tools/qt-faststart.c                  Baptiste Coudurier
 
+Execution Graph Printing
+  fftools/graph, fftools/resources  [2] softworkz
 
 Miscellaneous Areas
 ===================
@@ -267,7 +269,7 @@ Codecs:
   vp8                                   David Conrad, Ronald Bultje
   vp9                                   Ronald Bultje
   vqavideo.c                            Mike Melanson
-  vvc                               [2] Nuo Mi
+  vvc                               [2] Nuo Mi, Wu Jianhua, Frank Plowman
   wmaprodec.c                           Sascha Sommer
   wmavoice.c                            Ronald S. Bultje
   wmv2.c                                Michael Niedermayer
@@ -554,7 +556,6 @@ Pedro Arthur
 Sebastien Zwickert
 Vittorio Giovara
 wm4
-softworkz
 (this list is incomplete)
 
 
@@ -587,6 +588,7 @@ Benoit Fouet                  B22A 4F4F 43EF 636B BB66 FCDC 0023 AE1E 2985 49C8
 Clément Bœsch                 52D0 3A82 D445 F194 DB8B 2B16 87EE 2CB8 F4B8 FCF9
 Daniel Verkamp                78A6 07ED 782C 653E C628 B8B9 F0EB 8DD8 2F0E 21C7
 FFmpeg release signing key    FCF9 86EA 15E6 E293 A564 4F10 B432 2F04 D676 58D8
+Frank Plowman                 34E2 48D6 B7DF 4769 70C7 3304 03A8 4C6A 098F 2C6B
 Ganesh Ajjanagadde            C96A 848E 97C3 CEA2 AB72 5CE4 45F9 6A2D 3C36 FB1B
 Gwenole Beauchesne            2E63 B3A6 3E44 37E2 017D 2704 53C7 6266 B153 99C4
 Haihao Xiang (haihao)         1F0C 31E8 B4FE F7A4 4DC1 DC99 E0F5 76D4 76FC 437F

configure

@@ -2606,7 +2606,6 @@ CONFIG_EXTRA="
     iamfdec
     iamfenc
     idctdsp
-    iirfilter
     inflate_wrapper
     intrax8
     iso_media
@@ -2917,7 +2916,7 @@ wmv2dsp_select="qpeldsp"
 # decoders / encoders
 aac_decoder_select="adts_header mpeg4audio sinewin"
 aac_fixed_decoder_select="adts_header mpeg4audio"
-aac_encoder_select="audio_frame_queue iirfilter lpc sinewin"
+aac_encoder_select="audio_frame_queue lpc sinewin"
 aac_latm_decoder_select="aac_decoder aac_latm_parser"
 ac3_decoder_select="ac3_parser ac3dsp bswapdsp fmtconvert"
 ac3_fixed_decoder_select="ac3_parser ac3dsp bswapdsp"
@@ -7490,7 +7489,7 @@ fi
 
 enabled amf &&
     check_cpp_condition amf "AMF/core/Version.h" \
-        "(AMF_VERSION_MAJOR << 48 | AMF_VERSION_MINOR << 32 | AMF_VERSION_RELEASE << 16 | AMF_VERSION_BUILD_NUM) >= 0x0001000400230000"
+        "(AMF_VERSION_MAJOR << 48 | AMF_VERSION_MINOR << 32 | AMF_VERSION_RELEASE << 16 | AMF_VERSION_BUILD_NUM) >= 0x0001000400240000"
 
 # Funny iconv installations are not unusual, so check it after all flags have been set
 if enabled libc_iconv; then

doc/mips.txt

@@ -60,6 +60,5 @@ Files that have MIPS copyright notice in them:
       compute_antialias_float.h
       lsp_mips.h
       fmtconvert_mips.c
-      iirfilter_mips.c
       mpegaudiodsp_mips_fixed.c
       mpegaudiodsp_mips_float.c

libavcodec/Makefile

@@ -120,7 +120,6 @@ OBJS-$(CONFIG_HUFFMAN)                 += huffman.o
 OBJS-$(CONFIG_HUFFYUVDSP)              += huffyuvdsp.o
 OBJS-$(CONFIG_HUFFYUVENCDSP)           += huffyuvencdsp.o
 OBJS-$(CONFIG_IDCTDSP)                 += idctdsp.o simple_idct.o jrevdct.o
-OBJS-$(CONFIG_IIRFILTER)               += iirfilter.o
 OBJS-$(CONFIG_INFLATE_WRAPPER)         += zlib_wrapper.o
 OBJS-$(CONFIG_INTRAX8)                 += intrax8.o intrax8dsp.o msmpeg4_vc1_data.o
 OBJS-$(CONFIG_IVIDSP)                  += ivi_dsp.o
@@ -1336,7 +1335,6 @@ TESTPROGS-$(CONFIG_CABAC)                 += cabac
 TESTPROGS-$(CONFIG_GOLOMB)                += golomb
 TESTPROGS-$(CONFIG_IDCTDSP)               += dct
 TESTPROGS-$(CONFIG_DXV_ENCODER)           += hashtable
-TESTPROGS-$(CONFIG_IIRFILTER)             += iirfilter
 TESTPROGS-$(CONFIG_MJPEG_ENCODER)         += mjpegenc_huffman
 TESTPROGS-$(HAVE_MMX)                     += motion
 TESTPROGS-$(CONFIG_MPEGVIDEO)             += mpeg12framerate

libavcodec/aacenc.c

@@ -845,8 +845,6 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
     }
 
     copy_input_samples(s, frame);
-    if (s->psypp)
-        ff_psy_preprocess(s->psypp, s->planar_samples, s->channels);
 
     if (!avctx->frame_num)
         return 0;
@@ -1141,8 +1139,6 @@ static av_cold int aac_encode_end(AVCodecContext *avctx)
     av_tx_uninit(&s->mdct128);
     ff_psy_end(&s->psy);
     ff_lpc_end(&s->lpc);
-    if (s->psypp)
-        ff_psy_preprocess_end(s->psypp);
     av_freep(&s->buffer.samples);
     av_freep(&s->cpe);
     av_freep(&s->fdsp);
@@ -1294,7 +1290,6 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
     if ((ret = ff_psy_init(&s->psy, avctx, 2, sizes, lengths,
                            s->chan_map[0], grouping)) < 0)
         return ret;
-    s->psypp = ff_psy_preprocess_init(avctx);
     ff_lpc_init(&s->lpc, 2*avctx->frame_size, TNS_MAX_ORDER, FF_LPC_TYPE_LEVINSON);
     s->random_state = 0x1f2e3d4c;
 

libavcodec/aacenc.h

@@ -199,7 +199,6 @@ typedef struct AACEncContext {
 
     ChannelElement *cpe;                         ///< channel elements
     FFPsyContext psy;
-    struct FFPsyPreprocessContext* psypp;
     const AACCoefficientsEncoder *coder;
     int cur_channel;                             ///< current channel for coder context
     int random_state;

libavcodec/aacpsy.c

@@ -593,7 +593,6 @@ static float calc_reduced_thr_3gpp(AacPsyBand *band, float min_snr,
     return thr;
 }
 
-#ifndef calc_thr_3gpp
 static void calc_thr_3gpp(const FFPsyWindowInfo *wi, const int num_bands, AacPsyChannel *pch,
                           const uint8_t *band_sizes, const float *coefs, const int cutoff)
 {
@@ -622,9 +621,7 @@ static void calc_thr_3gpp(const FFPsyWindowInfo *wi, const int num_bands, AacPsy
         }
     }
 }
-#endif /* calc_thr_3gpp */
 
-#ifndef psy_hp_filter
 static void psy_hp_filter(const float *firbuf, float *hpfsmpl, const float *psy_fir_coeffs)
 {
     int i, j;
@@ -641,7 +638,6 @@ static void psy_hp_filter(const float *firbuf, float *hpfsmpl, const float *psy_
         hpfsmpl[i] = (sum1 + sum2) * 32768.0f;
     }
 }
-#endif /* psy_hp_filter */
 
 /**
  * Calculate band thresholds as suggested in 3GPP TS26.403

libavcodec/huffman.c

@@ -39,7 +39,10 @@
 #define HNODE -1
 
 typedef struct HeapElem {
-    uint64_t val;
+    union {
+        uint64_t val;
+        uint16_t dummy; // exists solely to ensure alignof(HeapElem) >= alignof(uint16_t)
+    };
     int name;
 } HeapElem;
 
@@ -59,19 +62,23 @@ static void heap_sift(HeapElem *h, int root, int size)
 
 int ff_huff_gen_len_table(uint8_t *dst, const uint64_t *stats, int stats_size, int skip0)
 {
-    HeapElem *h  = av_malloc_array(sizeof(*h), stats_size);
-    int *up      = av_malloc_array(sizeof(*up) * 2, stats_size);
-    uint8_t *len = av_malloc_array(sizeof(*len) * 2, stats_size);
-    uint16_t *map= av_malloc_array(sizeof(*map), stats_size);
+    int *up;
+    uint16_t *map;
+    uint8_t *len;
+    HeapElem *h = av_malloc_array(stats_size,
+                                  sizeof(*h) + 2 * sizeof(up) + 2 * sizeof(len) + sizeof(map));
+    if (!h)
+        return AVERROR(ENOMEM);
+    up  = (int*)(h + stats_size);
+    // map is suitably aligned because up uses an even number of elements
+    // and alignof(uint16_t) is either 1 or 2.
+    map = (uint16_t*)(up + 2 * stats_size);
+    len = (uint8_t*)(map + stats_size);
+
     int offset, i, next;
     int size = 0;
     int ret = 0;
 
-    if (!h || !up || !len || !map) {
-        ret = AVERROR(ENOMEM);
-        goto end;
-    }
-
     for (i = 0; i<stats_size; i++) {
         dst[i] = 255;
         if (stats[i] || !skip0)
@@ -107,11 +114,7 @@ int ff_huff_gen_len_table(uint8_t *dst, const uint64_t *stats, int stats_size, i
         }
         if (i==size) break;
     }
-end:
     av_free(h);
-    av_free(up);
-    av_free(len);
-    av_free(map);
     return ret;
 }