[FFmpeg-devel] [PATCH 2/2] Move MDCT function pointers to MDCTContext

[Michael Niedermayer]

On Fri, Sep 18, 2009 at 08:58:20PM +0100, M?ns Rullg?rd wrote:
> M?ns Rullg?rd <mans at mansr.com> writes:
> 
> > Michael Niedermayer <michaelni at gmx.at> writes:
> >
> >> On Thu, Sep 17, 2009 at 12:51:06AM +0100, M?ns Rullg?rd wrote:
> >>> Michael Niedermayer <michaelni at gmx.at> writes:
> >>> 
> >>> > On Thu, Sep 17, 2009 at 12:33:11AM +0100, M?ns Rullg?rd wrote:
> >>> >> Mans Rullgard <mans at mansr.com> writes:
> >>> >> 
> >>> >> > ---
> >>> >> >  libavcodec/arm/fft_init_arm.c |    6 +++---
> >>> >> >  libavcodec/dsputil.h          |   12 ++++++------
> >>> >> >  libavcodec/mdct.c             |    6 +++---
> >>> >> >  libavcodec/x86/fft.c          |   12 ++++++------
> >>> >> >  4 files changed, 18 insertions(+), 18 deletions(-)
> >>> >> 
> >>> >> Ping.  What about this, assuming the first patch is OK?
> >>> >
> >>> > Its the first patch iam uncertain about
> >>> > it does " 41 insertions(+), 14 deletions(-)"
> >>> > which is it makes the code bigger and iam not sure what that is good
> >>> > for ..
> >>> 
> >>> I thought it made sense in preparation for the patch I just sent,
> >>> which will then be followed by another patch making the NEON MDCT a
> >>> few % faster.  Feel free to suggest a better way.
> >>
> >> what is the problem with just not spliting it?
> >
> > fft_init() works (rightly) on FFTContext, and I need to change things
> > in MDCTContext.  I can't make the arch init calls from mdct_init since
> > fft can be used without mdct.  Besides, having the mdct function
> > pointers in FFTContext seems like a mistake to begin with.
> >
> > What I ultimately need is for the cos/sin tables in MDCTContext to be
> > interleaved as per another patch.
> 
> Loren suggested merging the two structs instead.  The attached patch
> does that.  Is this more palatable?
> 
> -- 
> M?ns Rullg?rd
> mans at mansr.com

>  aac.h              |    4 ++--
>  aacenc.h           |    4 ++--
>  ac3dec.h           |    4 ++--
>  arm/fft_init_arm.c |    6 +++---
>  arm/mdct_neon.S    |   34 ++++++++++++++++------------------
>  atrac1.c           |    4 ++--
>  atrac3.c           |    2 +-
>  cook.c             |    2 +-
>  dca.c              |    2 +-
>  dsputil.h          |   44 +++++++++++++++++++-------------------------
>  fft-test.c         |    2 +-
>  mdct.c             |   32 ++++++++++++++++----------------
>  nellymoserdec.c    |    2 +-
>  nellymoserenc.c    |    2 +-
>  twinvq.c           |    2 +-
>  vorbis_dec.c       |    2 +-
>  vorbis_enc.c       |    2 +-
>  wma.h              |    2 +-
>  wmaprodec.c        |    2 +-
>  x86/fft.h          |   12 ++++++------
>  x86/fft_3dn2.c     |   12 ++++++------
>  x86/fft_sse.c      |   12 ++++++------
>  22 files changed, 91 insertions(+), 99 deletions(-)
> 54a369c6092560b4512b1471baf16fa98b11998c  0001-Merge-FFTContext-and-MDCTContext.patch
> >From d9055e37652d6f53e4aac697ccd1bdbadf534cbb Mon Sep 17 00:00:00 2001
> From: Mans Rullgard <mans at mansr.com>
> Date: Fri, 18 Sep 2009 20:50:35 +0100
> Subject: [PATCH] Merge FFTContext and MDCTContext

ok, if the other devels agree

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

If you think the mosad wants you dead since a long time then you are either
wrong or dead since a long time.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20090920/55e46d1f/attachment.pgp>