summaryrefslogtreecommitdiffstats
path: root/mp3lib/sr1.c
Commit message (Collapse)AuthorAgeFilesLines
* mp3lib: drop internal mp3lib treeUoti Urpala2011-04-021-605/+0
| | | | | | | | | | | | | Delete mp3lib which has been the default mp3 decoder until now. In addition to being an unnecessary embedded library it now fails to compile correctly with the new gcc-4.6, producing noise. After the deletion the default decoder priority for mp3 will be first libmpg123 (a newer version of the code that mp3lib was based on) if available, then ffmp3float which should be available in all normal compiles. I think that some tweaking may be required as these decoder alternatives get wider testing, but any problems should be solvable and there should be no need for mp3lib.
* Merge svn changes up to r31141Uoti Urpala2010-05-071-1/+0
|\
| * Remove seemingly misplaced and commented-out liba52 #include.diego2010-05-071-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31140 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31033Uoti Urpala2010-04-261-18/+18
|\|
| * the great MPlayer tab removal: part Idiego2010-04-121-18/+18
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31032 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30732Uoti Urpala2010-03-101-0/+2
|\|
| * Fix compilation: the dct64_MMX_func variable should be declared only once,reimar2010-02-231-0/+2
| | | | | | | | | | | | | | not every time the header is included. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30724 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30702Uoti Urpala2010-03-101-8/+0
|\|
| * Declare all public mp3lib functions in mpg123.h.diego2010-02-221-8/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30700 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30595Uoti Urpala2010-03-091-3/+1
|\| | | | | | | | | | | Conflicts: mplayer.c vidix/nvidia_vid.c
| * Add header file for mplayer_audio_read() instead of forward declaring it.diego2010-02-161-3/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30594 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30216Uoti Urpala2010-01-081-3/+0
|\|
| * Refactor real --> float #define to a typedef in a common header.diego2010-01-041-3/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30209 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29912Uoti Urpala2009-11-161-5/+5
|\|
| * Fix 100l typo introduced in last commit.diego2009-10-081-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29761 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Remove some pointless parentheses from return calls.diego2009-10-081-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29759 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove unnecessary libavutil/internal.h includesUoti Urpala2009-07-261-4/+0
| | | | | | | | | | | | | | These includes were added earlier after the definition of the DECLARE_ALIGNED and DECLARE_ASM_CONST macros were moved to this header in FFmpeg. However now those macros are again in the public mem.h header, and there is no need to include internal.h.
* | Remove trailing whitespace from most filesUoti Urpala2009-07-071-2/+2
|/
* Move libavutil #includes below all others so that they do not overridediego2009-02-171-2/+3
| | | | | | | | | system functions and cause the warning: In file included from mp3lib/sr1.c:27: /mp_msg.h:115: warning: 'please_use_av_log_instead_of_printf' is an unrecognized format function type git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28622 b3059339-0415-0410-9bf9-f77b7e298cf2
* some more HAVE_3DNOW --> HAVE_AMD3DNOWdiego2009-01-261-6/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28373 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg.diego2009-01-251-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28362 b3059339-0415-0410-9bf9-f77b7e298cf2
* HAVE_3DNOWEX --> HAVE_3DNOWEXTdiego2009-01-251-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28361 b3059339-0415-0410-9bf9-f77b7e298cf2
* Lots and lots of #ifdef ARCH_... -> #if ARCH_...reimar2009-01-161-10/+12
| | | | | | | | and #ifdef HAVE_MMX etc -> #if HAVE_MMX. There might be still more that need to be fixed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28325 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing 'void' keyword to parameterless function declarations.diego2009-01-051-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28267 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing 'void' to parameterless function declaration.diego2008-12-111-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28129 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of pointless 'extern' keywords.diego2008-12-031-7/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
* Start unifying names of internal preprocessor directives.diego2008-07-301-2/+2
| | | | | | | | Replace all USE_ prefixes by CONFIG_ prefixes to indicate options which are configurable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
* Always use inline instead of _inline, the former is supported by allreimar2008-01-271-4/+0
| | | | | | | compilers we care about, while e.g. ICC does not support the later. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25876 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unnecessary <signal.h> includesuau2008-01-091-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25654 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Move public function declarations together.diego2007-12-121-6/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25377 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing declaration for dct64_altivec, fixes the warning:diego2007-12-121-0/+2
| | | | | | | | | | In file included from layer3.c:1171, from sr1.c:391: decod386.c: In function 'synth_1to1': decod386.c:145: warning: implicit declaration of function 'dct64_altivec' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25376 b3059339-0415-0410-9bf9-f77b7e298cf2
* Enable SIMD optmizations for mp3lib on AMD64zuxy2007-06-081-7/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23515 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace implicit use of fast_memcpy via macro by explicit use to allowreimar2007-06-051-1/+1
| | | | | | | for future optimization. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23475 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change '%ld' to '%d' to remove warnings introduced by r23452zuxy2007-06-041-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23460 b3059339-0415-0410-9bf9-f77b7e298cf2
* Correct dct64 functions' declarationszuxy2007-06-041-5/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23459 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use int and uint32_t instead of long and unsigned long, when appropriate.zuxy2007-06-021-16/+16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23452 b3059339-0415-0410-9bf9-f77b7e298cf2
* Record what was produced by make_decode_table_MMX() and used that data tozuxy2007-05-251-2/+0
| | | | | | | | initialize mp3lib_decwins directly, then remove call to make_decode_table_MMX() and tabinit_MMX.c itself. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23383 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make sure buffer is aligned so no unaligned access happens.reimar2007-02-051-5/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22158 b3059339-0415-0410-9bf9-f77b7e298cf2
* Hack around libavutil/bswap.h compilation problems due to always_inline ↵reimar2006-12-071-1/+1
| | | | | | undefined. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21523 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove bswap.h, use libavutil/bswap.h instead.diego2006-11-291-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21388 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove (now hopefully unnecessary) workarounds added in r21056reimar2006-11-191-5/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21065 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix mp3lib compilation on OSXnplourde2006-11-191-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21056 b3059339-0415-0410-9bf9-f77b7e298cf2
* mp3lib asm does not compile on AMD64.reimar2006-11-011-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20591 b3059339-0415-0410-9bf9-f77b7e298cf2
* always use 3dnowext version of dct64 when supported by the CPU (K6-3+ and up).gpoirier2006-08-231-1/+1
| | | | | | | | | | Patch by Zuxy Meng Original thread: Date: Aug 9, 2006 7:05 AM Subject: Re: [MPlayer-dev-eng] [PATCH] Saturation & PSWAPD bugfix in mp3lib/dct64_3dnow.c & mp3lib/dct64_k7.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19506 b3059339-0415-0410-9bf9-f77b7e298cf2
* Explicitly include libmpcodecs/img_format.h and libvo/fastmemcpy.h.diego2006-08-181-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19437 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l, i missed ifdefs around the callsrfelker2006-07-191-0/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19138 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add dct64_sse, a replacement for dct64_MMX. About 60% faster on its author's ↵gpoirier2006-07-071-0/+7
| | | | | | | | | | | | | Pentium III Currently only used on CPUs that _only_ support SSE (otherwise try 3DNow* before) Patch by The Mighty Zuxy Meng %zuxy * meng $ gmail * com% Original thread: Date: Jun 21, 2006 10:20 AM Subject: [MPlayer-dev-eng] [PATCH] SSE version of DCT64 for mp3lib git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18937 b3059339-0415-0410-9bf9-f77b7e298cf2
* CVS --> Subversion in copyright noticesdiego2006-06-221-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18786 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make mp3lib say that it's using Altivec to decode instead of generic Cdiego2006-04-151-0/+7
| | | | | | | | when it uses the optimized IMDCT. patch by Alexander Strange, astrange __ at __ ithinksw __ dot __ com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18102 b3059339-0415-0410-9bf9-f77b7e298cf2
* Patch by Stefan Huehner / stefan % huehner ! org \rathann2006-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | patch replaces '()' for the correct '(void)' in function declarations/prototypes which have no parameters. The '()' syntax tell thats there is a variable list of arguments, so that the compiler cannot check this. The extra CFLAG '-Wstrict-declarations' shows those cases. Comments about a similar patch applied to ffmpeg: That in C++ these mean the same, but in ANSI C the semantics are different; function() is an (obsolete) K&R C style forward declaration, it basically means that the function can have any number and any types of parameters, effectively completely preventing the compiler from doing any sort of type checking. -- Erik Slagter Defining functions with unspecified arguments is allowed but bad. With arguments unspecified the compiler can't report an error/warning if the function is called with incorrect arguments. -- Måns Rullgård git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17567 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reverse commit 31 Dec 2005 18:56:35 -0000 1.34gpoirier2006-01-031-2/+1
| | | | | | | | | | This was an incorrect fix made at the codec when it should be done at the demuxer level. static variables in codecs are ALWAYS wrong: the demuxer is supposed to have already removed all the junk Does anyone have an idea of a fix for the demuxer? (discussed on IRC) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17301 b3059339-0415-0410-9bf9-f77b7e298cf2
* "Currently mplayer looks for only one MP3 frame sync. The attachedgpoirier2005-12-311-1/+2
| | | | | | | | | | | | | | | | | | patch makes it to look for two consecutive valid MP3 frame headers, reducing the probability of false positives, which causes Bug 380. Funny that the fix is so simple. Seems that someone has forgotten to initialize MP3_resync correctly. Also this is the recommended way to sync MP3 frames. See http://www.dv.co.yu/mpgscript/mpeghdr.htm. " Original thread: Date: Dec 31, 2005 10:15 AM Subject: [MPlayer-dev-eng] [PATCH] Try twice when searching for MP3 frame header, fixes Bug 380 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17280 b3059339-0415-0410-9bf9-f77b7e298cf2
* Unify include paths, -I.. is in CFLAGS.diego2005-11-151-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16990 b3059339-0415-0410-9bf9-f77b7e298cf2
* Mark modified imported files as such to comply with (L)GPL §2a.diego2005-04-151-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15168 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reduce excessive verbosity.diego2004-11-151-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13947 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix symbol clashes when linking with libmp3lame including mp3 decoder, man, ↵alex2004-04-061-3/+3
| | | | | | mp3lib is so much bloated git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12132 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed obsoleted (or never ending) codealex2003-10-221-10/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11242 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed the stdcall conventionalex2003-10-221-5/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11241 b3059339-0415-0410-9bf9-f77b7e298cf2
* remove debug messagenexus2003-08-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10553 b3059339-0415-0410-9bf9-f77b7e298cf2
* layer-1 supportarpi2003-07-241-5/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10469 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanup & fix cpu detection & init stuffarpi2002-12-241-53/+20
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8546 b3059339-0415-0410-9bf9-f77b7e298cf2
* layer-1 stream parsing (NOT decoding) supportarpi2002-09-281-0/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7521 b3059339-0415-0410-9bf9-f77b7e298cf2
* pshufw is a mmx2 instruction, so don't use dct64_MMX_3dnowex on k6-3 whicharpi2002-09-211-1/+1
| | | | | | | has no mmxext (but has 3dnowex) - bug found by Diego, help by Michael git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7462 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cygwin stdcall mismatch fix.atmos42002-05-241-5/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6178 b3059339-0415-0410-9bf9-f77b7e298cf2
* big cosmetics patch, cleanup of messages printed by mplayer and libs.arpi2002-05-201-11/+14
| | | | | | | | some printf->mp_msg conversion, and some debug messages moved from warn/info to v/dbg2 mplayer's output is now shorter, readable and consistent git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6139 b3059339-0415-0410-9bf9-f77b7e298cf2
* don't re-detect cpuarpi2002-04-281-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5889 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fixing compilation on non-MMX but x86 systemsnick2002-01-231-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4322 b3059339-0415-0410-9bf9-f77b7e298cf2
* Using cpudetect code instead of d_cpu.snick2002-01-191-151/+29
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4263 b3059339-0415-0410-9bf9-f77b7e298cf2
* runtime cpudetect support #2 - still not working (i can't identify the ↵alex2002-01-141-90/+137
| | | | | | problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4151 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixedalex2001-11-301-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3220 b3059339-0415-0410-9bf9-f77b7e298cf2
* Disable SSE code and reenable FPU dct for SSE cpus (fpu code is 0.3% faster ↵atmos42001-11-291-6/+6
| | | | | | and I don't get data aligned in dct64_sse.s, so I can't finish optimizing it) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3204 b3059339-0415-0410-9bf9-f77b7e298cf2
* changed to use cpudetect.c (to use change te #if 1 -> #if 0 :)alex2001-11-231-0/+83
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3089