[FFmpeg-devel] [PATCH 2/4] libavcodec/libavutil: Implementation of AAC_fixed_decoder (LC-module)

[Paul B Mahol]

On 10/5/13, Michael Niedermayer <michaelni at gmx.at> wrote:
> On Sat, Oct 05, 2013 at 01:03:20PM +0000, Paul B Mahol wrote:
>> On 9/18/13, Nedeljko Babic <nedeljko.babic at imgtec.com> wrote:
>> > From: Mirjana Vulin <mirjana.vulin at imgtec.com>
>> >
>> > Signed-off-by: Mirjana Vulin <mirjana.vulin at imgtec.com>
>> > ---
>> >  libavcodec/Makefile                    |   15 +-
>> >  libavcodec/aac.h                       |  104 +-
>> >  libavcodec/aac_float_emu.h             |  699 ++++++++
>> >  libavcodec/aacdec.c                    | 2763
>> > ++------------------------------
>> >  libavcodec/aacdec_fixed.c              |  458 ++++++
>> >  libavcodec/aacdec_template.c           | 2747
>> > +++++++++++++++++++++++++++++++
>> >  libavcodec/aacdectab.h                 |   34 +-
>> >  libavcodec/aactab.c                    |    2 +
>> >  libavcodec/aactab.h                    |    2 +
>> >  libavcodec/allcodecs.c                 |    1 +
>> >  libavcodec/cbrt_fixed_tablegen.c       |   24 +
>> >  libavcodec/cbrt_tablegen.c             |   17 +-
>> >  libavcodec/cbrt_tablegen.h             |   17 +-
>> >  libavcodec/cbrt_tablegen_template.c    |   37 +
>> >  libavcodec/dsputil.c                   |   12 +
>> >  libavcodec/dsputil.h                   |   17 +
>> >  libavcodec/float_emu.h                 |  400 +++++
>> >  libavcodec/float_emu_tab.c             |  296 ++++
>> >  libavcodec/fmtconvert.c                |   19 +-
>> >  libavcodec/fmtconvert.h                |    2 +
>> >  libavcodec/lpc.h                       |   48 +
>> >  libavcodec/mdct.c                      |    5 +
>> >  libavcodec/mips/Makefile               |   10 +-
>> >  libavcodec/mips/aacdec_mips.c          |    6 +-
>> >  libavcodec/mips/fmtconvert_mips.c      |    4 +
>> >  libavcodec/sinewin.c                   |    1 +
>> >  libavcodec/sinewin.h                   |   20 +-
>> >  libavcodec/sinewin_fixed.c             |   21 +
>> >  libavcodec/sinewin_fixed_tablegen.c    |   24 +
>> >  libavcodec/sinewin_tablegen.c          |   26 +-
>> >  libavcodec/sinewin_tablegen.h          |   31 +-
>> >  libavcodec/sinewin_tablegen_template.c |   60 +
>> >  libavcodec/tableprint.h                |    2 +
>> >  libavutil/fixed_dsp.c                  |   63 +-
>> >  libavutil/fixed_dsp.h                  |   53 +
>> >  35 files changed, 5269 insertions(+), 2771 deletions(-)
>> >  create mode 100644 libavcodec/aac_float_emu.h
>> >  create mode 100644 libavcodec/aacdec_fixed.c
>> >  create mode 100644 libavcodec/aacdec_template.c
>> >  create mode 100644 libavcodec/cbrt_fixed_tablegen.c
>> >  create mode 100644 libavcodec/cbrt_tablegen_template.c
>> >  create mode 100644 libavcodec/float_emu.h
>> >  create mode 100644 libavcodec/float_emu_tab.c
>> >  create mode 100644 libavcodec/sinewin_fixed.c
>> >  create mode 100644 libavcodec/sinewin_fixed_tablegen.c
>> >  create mode 100644 libavcodec/sinewin_tablegen_template.c
>> >
>>
>> [...]
>>
>> > diff --git a/libavcodec/aac_float_emu.h b/libavcodec/aac_float_emu.h
>> > new file mode 100644
>> > index 0000000..bbce0f4
>> > --- /dev/null
>> > +++ b/libavcodec/aac_float_emu.h
>> > @@ -0,0 +1,699 @@
>> > +/*
>> > + * Copyright (c) 2012
>> > + *      MIPS Technologies, Inc., California.
>> > + *
>> > + * Redistribution and use in source and binary forms, with or without
>> > + * modification, are permitted provided that the following conditions
>> > + * are met:
>> > + * 1. Redistributions of source code must retain the above copyright
>> > + *    notice, this list of conditions and the following disclaimer.
>> > + * 2. Redistributions in binary form must reproduce the above
>> > copyright
>> > + *    notice, this list of conditions and the following disclaimer in
>> > the
>> > + *    documentation and/or other materials provided with the
>> > distribution.
>> > + * 3. Neither the name of the MIPS Technologies, Inc., nor the names of
>> > is
>> > + *    contributors may be used to endorse or promote products derived
>> > from
>> > + *    this software without specific prior written permission.
>>
>> Why this 3 clause BSD license?
>> IIRC this conflict with LGPL.
>
> i think you mixup
> http://directory.fsf.org/wiki/License:BSD_3Clause
> and
> http://directory.fsf.org/wiki/License:BSD_4Clause
>
> also see:
> http://www.gnu.org/licenses/license-list.html

Yes, thanks for correction.

>
> [...]
> --
> Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>
> In a rich man's house there is no place to spit but his face.
> -- Diogenes of Sinope
>