Merge commit '3d5d46233cd81f78138a6d7418d480af04d3f6c8'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Feb 2015 19:43:13 +0000 (20:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Feb 2015 19:43:13 +0000 (20:43 +0100)
* commit '3d5d46233cd81f78138a6d7418d480af04d3f6c8':
  opus: Factor out imdct15 into a standalone component

Conflicts:
configure
libavcodec/opus_celt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavcodec/Makefile
libavcodec/aarch64/imdct15_init.c
libavcodec/aarch64/imdct15_neon.S
libavcodec/imdct15.c
libavcodec/imdct15.h
libavcodec/opus_celt.c

diff --cc configure
+++ b/configure
@@@ -1868,10 -1578,9 +1868,11 @@@ CONFIG_EXTRA=
      huffyuvencdsp
      idctdsp
      iirfilter
+     imdct15
      intrax8
      lgplv3
 +    llauddsp
 +    llviddsp
      lpc
      me_cmp
      mpeg_er
@@@ -2191,10 -1872,12 +2192,11 @@@ nellymoser_decoder_select="mdct sinewin
  nellymoser_encoder_select="audio_frame_queue mdct sinewin"
  nuv_decoder_select="idctdsp lzo"
  on2avc_decoder_select="mdct"
 -opus_decoder_deps="avresample"
 +opus_decoder_deps="swresample"
+ opus_decoder_select="imdct15"
 -png_decoder_deps="zlib"
 -png_encoder_deps="zlib"
 -png_encoder_select="huffyuvencdsp"
 -prores_decoder_select="idctdsp"
 +png_decoder_select="zlib"
 +png_encoder_select="huffyuvencdsp zlib"
 +prores_decoder_select="blockdsp idctdsp"
  prores_encoder_select="fdctdsp"
  qcelp_decoder_select="lsp"
  qdm2_decoder_select="mdct rdft mpegaudiodsp"
@@@ -66,13 -57,12 +66,14 @@@ OBJS-$(CONFIG_HUFFYUVDSP)              
  OBJS-$(CONFIG_HUFFYUVENCDSP)           += huffyuvencdsp.o
  OBJS-$(CONFIG_IDCTDSP)                 += idctdsp.o simple_idct.o jrevdct.o
  OBJS-$(CONFIG_IIRFILTER)               += iirfilter.o
+ OBJS-$(CONFIG_IMDCT15)                 += imdct15.o
  OBJS-$(CONFIG_INTRAX8)                 += intrax8.o intrax8dsp.o
  OBJS-$(CONFIG_LIBXVID)                 += libxvid_rc.o
 +OBJS-$(CONFIG_LLAUDDSP)                += lossless_audiodsp.o
 +OBJS-$(CONFIG_LLVIDDSP)                += lossless_videodsp.o
  OBJS-$(CONFIG_LPC)                     += lpc.o
  OBJS-$(CONFIG_LSP)                     += lsp.o
 -OBJS-$(CONFIG_MDCT)                    += mdct_fixed.o mdct_float.o
 +OBJS-$(CONFIG_MDCT)                    += mdct_fixed.o mdct_float.o mdct_fixed_32.o
  OBJS-$(CONFIG_ME_CMP)                  += me_cmp.o
  OBJS-$(CONFIG_MPEG_ER)                 += mpeg_er.o
  OBJS-$(CONFIG_MPEGAUDIO)               += mpegaudio.o mpegaudiodata.o   \
@@@ -348,11 -293,9 +349,10 @@@ OBJS-$(CONFIG_MXPEG_DECODER)           
  OBJS-$(CONFIG_NELLYMOSER_DECODER)      += nellymoserdec.o nellymoser.o
  OBJS-$(CONFIG_NELLYMOSER_ENCODER)      += nellymoserenc.o nellymoser.o
  OBJS-$(CONFIG_NUV_DECODER)             += nuv.o rtjpeg.o
 +OBJS-$(CONFIG_NVENC_ENCODER)           += nvenc.o
  OBJS-$(CONFIG_ON2AVC_DECODER)          += on2avc.o on2avcdata.o
  OBJS-$(CONFIG_OPUS_DECODER)            += opusdec.o opus.o opus_celt.o \
-                                           opus_imdct.o opus_silk.o     \
-                                           vorbis_data.o
+                                           opus_silk.o vorbis_data.o
  OBJS-$(CONFIG_PAF_AUDIO_DECODER)       += pafaudio.o
  OBJS-$(CONFIG_PAF_VIDEO_DECODER)       += pafvideo.o
  OBJS-$(CONFIG_PAM_DECODER)             += pnmdec.o pnm.o
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -61,8 -61,8 +61,8 @@@ typedef struct CeltFrame 
  struct CeltContext {
      // constant values that do not change during context lifetime
      AVCodecContext    *avctx;
-     CeltIMDCTContext  *imdct[4];
+     IMDCT15Context    *imdct[4];
 -    AVFloatDSPContext  dsp;
 +    AVFloatDSPContext  *dsp;
      int output_channels;
  
      // values that have inter-frame effect and must be reset on flush
@@@ -2179,9 -2179,8 +2179,9 @@@ void ff_celt_free(CeltContext **ps
          return;
  
      for (i = 0; i < FF_ARRAY_ELEMS(s->imdct); i++)
-         ff_celt_imdct_uninit(&s->imdct[i]);
+         ff_imdct15_uninit(&s->imdct[i]);
  
 +    av_freep(&s->dsp);
      av_freep(ps);
  }