~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to ffmpeg/libavcodec/x86/mpegaudiodec_mmx.c

  • Committer: Gauvain Pocentek
  • Date: 2012-03-06 11:59:12 UTC
  • mfrom: (66.1.15 precise)
  • Revision ID: gauvain@pocentek.net-20120306115912-h9d6kt9j0l532oo5
* Merge from Ubuntu:
  - put back faac support
  - recommends apport-hooks-medibuntu
  - change Maintainer, Uploaders & Vcs-* fields.
* New upstream snapshot
* upload to unstable
* Build against external libmpeg2
* drop 51_FTBFS_arm.patch again
* no longer build depend on libcdparanoia-dev on the Hurd
* Fix FTBFS on the hurd.
  Thanks to Samuel Thibault <sthibault@debian.org> (Closes: #654974)
* Fix FTBFS on arm
* New upstream snapshot, Closes: #650339, #643621, #481807
* Imported Upstream version 1.0~rc4+svn34492
* Bump standards version
* Bump dependency on libav >= 4:0.8~, Closes: #653887
* Fix build-indep
* Build mplayer-gui again, Closes: #568514
* Drop debian/all-lang-config-mak.sh, no longer needed
* include .dfsg1 in version number
* remove get-orig-source target
* no longer prune compiler flags from the environment
* No longer advertise nor build 3fdx, mga and dxr3 backends,
  Closes: #496106, #442181, #533546
* beautify mplayer version identification string
* Brown paperbag upload.
* Next try to fix build failure on sparce after recent binutils change.
* Brown paperbag upload.
* Really fix build failure on sparc after recent binutils change.
* Properly set Replaces/Conflicts on mplayer2{,-dbg} to avoid
  file overwrite errors.
* Adjust versioning of mplayer listed in the mplayer-dbg's Depends field.
* Fix build failure on sparc after recent binutils change.
* Urgency medium bumped because of RC-level bugfix
  and speeding up x264 transition.
* Update to my @debian.org email.
* Upload to unstable
* Enable joystick support on Linux only, Closes: #638408
* Rebuild fixes toolchain issue on arm, Closes: #637077
* New upstream snapshot
* following the discussion started by Diego Biurrun <diego@biurrun.de>
  in debian-devel, I have prepared a new packaging of 'mplayer'
  (with code that comes from CVS)
* the upstream tar.bz cannot be distributed by Debian, since it contains
   CSS code; so I am repackaging it 
* I have tried my best to address all known issues:
  - the package contains the detailed Copyright made by Diego Biurrun 
  - the package does not contain CSS code, or  AFAIK other code on which 
     there is active patent enforcement
  - there is a script  debian/cvs-changelog.sh  that shows all changes
     done to files included in this source.
    This should comply with GPLv2 sec 2.a  (in spirit if not in letter)
    For this reason, the source code contains CVS directories.
* needs   make (>= 3.80) for 'html-chunked-$(1)' in DOCS/xml/Makefile

* some corrections, as suggested Diego Biurrun
  - binary codecs should go into /usr/lib/codecs (upstream default)
  - better template 'mplayer/install_codecs'
  - an empty 'font=' in mplayer.conf breaks mplayer: postinst corrected
* correction in 'mplayer/cfgnote'
* better mplayer.postinst and mplayer.config

* New upstream release
* better debian/copyright file
* do not ship a skin
* New upstream release
* changed DEB_BUILD_OPTIONS to DEB_BUILD_CONFIGURE ,
  DEB_BUILD_OPTIONS is used as in debian policy
* use gcc-3.4
* changed xlibs-dev to a long list of dependencies, for Debian/etch
* try to adhere to  http://www.mplayerhq.hu/DOCS/tech/binary-packaging.txt
  (see README.Debian for details)
* removed dependency on xlibmesa-dev, disabled opengl
* New upstream release
* Simon McVittie <hacks@pseudorandom.co.uk> wonderful work:
- Work around Debian bug #267442 (glibc's sys/uio.h and gcc's altivec.h have
  conflicting uses for __vector) by re-ordering #includes
- Fix potential symlink attack in ./configure
- Disable support for binary codecs on platforms for which those codecs
  aren't available; also disable the corresponding Debconf note when it's
  inappropriate
- Changed Build-Depends: so it works in pbuilder
- Explicitly build-depend on libjpeg62-dev, libfontconfig1-dev,
  libungif4-dev 
- Tweak debian/rules to avoid certain errors being ignored
- Use --language=all
* provide a target  'debian/rules get-orig-source' 
  that recreates the orig.tar.gz ; then use the above orig.tar.gz
* rewrote some parts of debian/rules
* don't clean and recompile docs if upstream ships them
* mplayer-doc was shipping too much stuff
* translated man pages where not installed properly
* compile with libdv4-dev
* correct README.Debian
* Forgot build-dep on libtheora
* Must not depend on libxvidcore
* New upstream release
* new release.
* rc1 to become 0.90
* new pre-release
* new pre-release
* gtk bug fixed.
* new release.
* version bumped
* 0.60 pre2 release
* 0.60 pre-release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
24
24
#include "libavcodec/dsputil.h"
25
25
#include "libavcodec/mpegaudiodsp.h"
26
26
 
 
27
void ff_imdct36_float_sse(float *out, float *buf, float *in, float *win);
 
28
void ff_imdct36_float_sse2(float *out, float *buf, float *in, float *win);
 
29
void ff_imdct36_float_sse3(float *out, float *buf, float *in, float *win);
 
30
void ff_imdct36_float_ssse3(float *out, float *buf, float *in, float *win);
 
31
void ff_imdct36_float_avx(float *out, float *buf, float *in, float *win);
 
32
void ff_four_imdct36_float_sse(float *out, float *buf, float *in, float *win,
 
33
                               float *tmpbuf);
 
34
void ff_four_imdct36_float_avx(float *out, float *buf, float *in, float *win,
 
35
                               float *tmpbuf);
 
36
 
 
37
DECLARE_ALIGNED(16, static float, mdct_win_sse)[2][4][4*40];
 
38
 
27
39
#define MACS(rt, ra, rb) rt+=(ra)*(rb)
28
40
#define MLSS(rt, ra, rb) rt-=(ra)*(rb)
29
41
 
147
159
    *out = sum;
148
160
}
149
161
 
 
162
 
 
163
#define DECL_IMDCT_BLOCKS(CPU1, CPU2)                                       \
 
164
static void imdct36_blocks_ ## CPU1(float *out, float *buf, float *in,      \
 
165
                               int count, int switch_point, int block_type) \
 
166
{                                                                           \
 
167
    int align_end = count - (count & 3);                                \
 
168
    int j;                                                              \
 
169
    for (j = 0; j < align_end; j+= 4) {                                 \
 
170
        LOCAL_ALIGNED_16(float, tmpbuf, [1024]);                        \
 
171
        float *win = mdct_win_sse[switch_point && j < 4][block_type];   \
 
172
        /* apply window & overlap with previous buffer */               \
 
173
                                                                        \
 
174
        /* select window */                                             \
 
175
        ff_four_imdct36_float_ ## CPU2(out, buf, in, win, tmpbuf);      \
 
176
        in      += 4*18;                                                \
 
177
        buf     += 4*18;                                                \
 
178
        out     += 4;                                                   \
 
179
    }                                                                   \
 
180
    for (; j < count; j++) {                                            \
 
181
        /* apply window & overlap with previous buffer */               \
 
182
                                                                        \
 
183
        /* select window */                                             \
 
184
        int win_idx = (switch_point && j < 2) ? 0 : block_type;         \
 
185
        float *win = ff_mdct_win_float[win_idx + (4 & -(j & 1))];       \
 
186
                                                                        \
 
187
        ff_imdct36_float_ ## CPU1(out, buf, in, win);                   \
 
188
                                                                        \
 
189
        in  += 18;                                                      \
 
190
        buf++;                                                          \
 
191
        out++;                                                          \
 
192
    }                                                                   \
 
193
}
 
194
 
 
195
DECL_IMDCT_BLOCKS(sse,sse)
 
196
DECL_IMDCT_BLOCKS(sse2,sse)
 
197
DECL_IMDCT_BLOCKS(sse3,sse)
 
198
DECL_IMDCT_BLOCKS(ssse3,sse)
 
199
DECL_IMDCT_BLOCKS(avx,avx)
 
200
 
150
201
void ff_mpadsp_init_mmx(MPADSPContext *s)
151
202
{
152
203
    int mm_flags = av_get_cpu_flags();
153
204
 
 
205
    int i, j;
 
206
    for (j = 0; j < 4; j++) {
 
207
        for (i = 0; i < 40; i ++) {
 
208
            mdct_win_sse[0][j][4*i    ] = ff_mdct_win_float[j    ][i];
 
209
            mdct_win_sse[0][j][4*i + 1] = ff_mdct_win_float[j + 4][i];
 
210
            mdct_win_sse[0][j][4*i + 2] = ff_mdct_win_float[j    ][i];
 
211
            mdct_win_sse[0][j][4*i + 3] = ff_mdct_win_float[j + 4][i];
 
212
            mdct_win_sse[1][j][4*i    ] = ff_mdct_win_float[0    ][i];
 
213
            mdct_win_sse[1][j][4*i + 1] = ff_mdct_win_float[4    ][i];
 
214
            mdct_win_sse[1][j][4*i + 2] = ff_mdct_win_float[j    ][i];
 
215
            mdct_win_sse[1][j][4*i + 3] = ff_mdct_win_float[j + 4][i];
 
216
        }
 
217
    }
 
218
 
154
219
    if (mm_flags & AV_CPU_FLAG_SSE2) {
155
220
        s->apply_window_float = apply_window_mp3;
156
221
    }
 
222
#if HAVE_YASM
 
223
    if (mm_flags & AV_CPU_FLAG_AVX && HAVE_AVX) {
 
224
        s->imdct36_blocks_float = imdct36_blocks_avx;
 
225
#if HAVE_SSE
 
226
    } else if (mm_flags & AV_CPU_FLAG_SSSE3) {
 
227
        s->imdct36_blocks_float = imdct36_blocks_ssse3;
 
228
    } else if (mm_flags & AV_CPU_FLAG_SSE3) {
 
229
        s->imdct36_blocks_float = imdct36_blocks_sse3;
 
230
    } else if (mm_flags & AV_CPU_FLAG_SSE2) {
 
231
        s->imdct36_blocks_float = imdct36_blocks_sse2;
 
232
    } else if (mm_flags & AV_CPU_FLAG_SSE) {
 
233
        s->imdct36_blocks_float = imdct36_blocks_sse;
 
234
#endif /* HAVE_SSE */
 
235
    }
 
236
#endif /* HAVE_YASM */
157
237
}