[FFmpeg-devel] [PATCH] mips: optimization for float aac decoder (core module)

[Michael Niedermayer]

On Wed, Jan 16, 2013 at 04:39:58PM +0100, Nedeljko Babic wrote:
> From: Mirjana Vulin <mvulin at mips.com>
> 
> Change-Id: I20673f7528108d4b607a25194dc4c7cf490ff1e0
> Signed-off-by: Mirjana Vulin <mvulin at mips.com>
> ---
>  libavcodec/aac.h                |   18 +-
>  libavcodec/aacdec.c             |   37 ++-
>  libavcodec/mips/Makefile        |    1 +
>  libavcodec/mips/aacdec_mips.c   |  831 +++++++++++++++++++++++++++++++++++++++
>  libavcodec/mips/aacdec_mips.h   |  249 ++++++++++++
>  libavcodec/mips/dsputil_mips.c  |   84 ++++-
>  libavutil/mips/float_dsp_mips.c |   41 ++-
>  7 files changed, 1246 insertions(+), 15 deletions(-)
>  create mode 100644 libavcodec/mips/aacdec_mips.c
>  create mode 100644 libavcodec/mips/aacdec_mips.h
> 
> diff --git a/libavcodec/aac.h b/libavcodec/aac.h
> index 9e9fa0e..e23d18b 100644
> --- a/libavcodec/aac.h
> +++ b/libavcodec/aac.h

> @@ -257,10 +257,12 @@ typedef struct ChannelElement {
>      SpectralBandReplication sbr;
>  } ChannelElement;
>  
> +typedef struct AACContext AACContext;
> +
>  /**
>   * main AAC context
>   */
> -typedef struct AACContext {
> +struct AACContext {
>      AVClass        *class;
>      AVCodecContext *avctx;
>      AVFrame frame;

is that change needed ?

also i tried to apply the patch but it doesnt apply cleanly anymore

CONFLICT (content): Merge conflict in libavutil/mips/float_dsp_mips.c
CONFLICT (modify/delete): libavcodec/mips/dsputil_mips.c deleted in HEAD and modified in mips: optimization for float aac decoder (core module). Version mips: optimization for float aac decoder (core module) of libavcodec/mips/dsputil_mips.c left in tree.

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

Breaking DRM is a little like attempting to break through a door even
though the window is wide open and the only thing in the house is a bunch
of things you dont want and which you would get tomorrow for free anyway
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20130118/3dab9b87/attachment.asc>