[FFmpeg-devel] [PATCH v2 2/5] imdct15: rename to mdct15 and add a forward transform

[Rostislav Pehlivanov]

On 11 February 2017 at 01:26, Rostislav Pehlivanov <atomnuker at gmail.com>
wrote:

>
>
> On 11 February 2017 at 01:22, James Almer <jamrial at gmail.com> wrote:
>
>> On 2/10/2017 9:25 PM, Rostislav Pehlivanov wrote:
>> > Handles strides (needed for Opus transients), does pre-reindexing and
>> folding
>> > without needing a copy.
>> >
>> > Signed-off-by: Rostislav Pehlivanov <atomnuker at gmail.com>
>> > ---
>> >  configure                    |   6 +-
>> >  libavcodec/Makefile          |   2 +-
>> >  libavcodec/aac.h             |   4 +-
>> >  libavcodec/aacdec.c          |   2 +-
>> >  libavcodec/aacdec_template.c |   4 +-
>> >  libavcodec/mdct15.c          | 335 ++++++++++++++++++++++++++++++
>> +++++++++++++
>> >  libavcodec/mdct15.h          |  70 +++++++++
>> >  libavcodec/opus_celt.c       |  10 +-
>> >  8 files changed, 419 insertions(+), 14 deletions(-)
>> >  create mode 100644 libavcodec/mdct15.c
>> >  create mode 100644 libavcodec/mdct15.h
>>
>> Forgot to do "git rm libavcodec/imdct15.*"?
>>
>> > diff --git a/libavcodec/mdct15.h b/libavcodec/mdct15.h
>> > new file mode 100644
>> > index 0000000000..2a503e5996
>> > --- /dev/null
>> > +++ b/libavcodec/mdct15.h
>> > @@ -0,0 +1,70 @@
>> > +/*
>> > + * Copyright (c) 2017 Rostislav Pehlivanov <atomnuker at gmail.com>
>> > + *
>> > + * This file is part of FFmpeg.
>> > + *
>> > + * FFmpeg is free software; you can redistribute it and/or
>> > + * modify it under the terms of the GNU Lesser General Public
>> > + * License as published by the Free Software Foundation; either
>> > + * version 2.1 of the License, or (at your option) any later version.
>> > + *
>> > + * FFmpeg is distributed in the hope that it will be useful,
>> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>> > + * Lesser General Public License for more details.
>> > + *
>> > + * You should have received a copy of the GNU Lesser General Public
>> > + * License along with FFmpeg; if not, write to the Free Software
>> > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
>> 02110-1301 USA
>> > + */
>> > +
>> > +#ifndef AVCODEC_MDCT15_H
>> > +#define AVCODEC_MDCT15_H
>> > +
>> > +#include <stddef.h>
>> > +
>> > +#include "fft.h"
>> > +
>> > +typedef struct MDCT15Context {
>> > +    int fft_n;
>> > +    int len2;
>> > +    int len4;
>> > +    int inverse;
>> > +    int *pfa_prereindex;
>> > +    int *pfa_postreindex;
>> > +
>> > +    FFTContext ptwo_fft;
>> > +
>> > +    FFTComplex *tmp;
>> > +
>> > +    FFTComplex *twiddle_exptab;
>> > +
>> > +    /* 0 - 18: fft15 twiddles, 19 - 20: fft5 twiddles */
>> > +    FFTComplex exptab[21];
>> > +
>> > +    /**
>> > +     * Calculate a full 2N -> N MDCT
>> > +     */
>> > +    void (*mdct)(struct MDCT15Context *s, float *dst, const float
>> *src, ptrdiff_t stride);
>> > +
>> > +    /**
>> > +     * Calculate the middle half of the iMDCT
>> > +     */
>> > +    void (*imdct_half)(struct MDCT15Context *s, float *dst, const
>> float *src,
>> > +                       ptrdiff_t src_stride, float scale);
>> > +} MDCT15Context;
>> > +
>> > +/**
>> > + * Init an (i)MDCT of the length 2 * 15 * (2^N)
>> > + */
>> > +int ff_mdct15_init(MDCT15Context **ps, int inverse, int N, double
>> scale);
>> > +
>> > +/**
>> > + * Frees a context
>> > + */
>> > +void ff_mdct15_uninit(MDCT15Context **ps);
>> > +
>> > +
>> > +void ff_mdct15_init_aarch64(MDCT15Context *s);
>>
>> This seems like a remnant of old code.
>>
>>
> Yep, it is, changed locally to delete ff_mdct15_init_aarch64().
>

Nevermind, I saw what you meant.
Added that change and removed the imdct15.c/.h

I've attached the new patch.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-imdct15-rename-to-mdct15-and-add-a-forward-transform.patch
Type: text/x-patch
Size: 14427 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20170211/b58a323d/attachment.bin>