diff options
Diffstat (limited to 'libfaad2/local_changes.diff')
| -rw-r--r-- | libfaad2/local_changes.diff | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/libfaad2/local_changes.diff b/libfaad2/local_changes.diff index db2b60cd68..56d584093e 100644 --- a/libfaad2/local_changes.diff +++ b/libfaad2/local_changes.diff @@ -9,10 +9,10 @@ +** detailed changelog at http://svn.mplayerhq.hu/mplayer/trunk/ +** local_changes.diff contains the exact changes to this file. **/ - + #ifndef __BITS_H__ @@ -58,7 +61,7 @@ - + #if defined (_WIN32) && !defined(_WIN32_WCE) && !defined(__MINGW32__) #define BSWAP(a) __asm mov eax,a __asm bswap eax __asm mov a, eax -#elif defined(LINUX) || defined(DJGPP) || defined(__MINGW32__) @@ -31,10 +31,10 @@ +** detailed changelog at http://svn.mplayerhq.hu/mplayer/trunk/ +** local_changes.diff contains the exact changes to this file. **/ - + #ifndef __COMMON_H__ @@ -32,8 +35,13 @@ - + #ifdef HAVE_CONFIG_H # include "../config.h" #endif @@ -43,19 +43,19 @@ +#if defined(__CYGWIN__) +#define __STRICT_ANSI__ +#endif - + #define INLINE __inline #if 0 //defined(_WIN32) && !defined(_WIN32_WCE) #define ALIGN __declspec(align(16)) @@ -61,7 +67,7 @@ /* Use if target platform has address generators with autoincrement */ //#define PREFER_POINTERS - + -#ifdef _WIN32_WCE +#if defined(_WIN32_WCE) || defined(__arm__) || defined(__avr32__) #define FIXED_POINT #endif - + @@ -117,6 +123,9 @@ # ifdef MAIN_DEC # undef MAIN_DEC @@ -64,12 +64,12 @@ +# undef SBR_DEC +# endif #endif // FIXED_POINT - + #ifdef DRM @@ -151,6 +160,7 @@ - + #include <stdlib.h> - + +#if 0 typedef unsigned __int64 uint64_t; typedef unsigned __int32 uint32_t; @@ -83,11 +83,11 @@ +#endif + typedef float float32_t; - + @@ -289,7 +319,7 @@ } - - + + - #if defined(_WIN32) && !defined(__MINGW32__) + #if defined(_WIN32) && !defined(__MINGW32__) && !HAVE_LRINTF #define HAS_LRINTF @@ -103,9 +103,9 @@ // from http://www.stereopsis.com/FPU.html static INLINE int lrintf(float f) @@ -330,7 +360,7 @@ - + #else - + +#include <math.h> + -#ifdef HAVE_LRINTF @@ -115,7 +115,7 @@ @@ -338,8 +370,6 @@ # define __USE_ISOC99 1 #endif - + - #include <math.h> - #ifdef HAVE_SINF @@ -135,12 +135,12 @@ +** $Id: output.c,v 1.11 2005/04/05 05:43:41 rfelker Exp $ +** detailed changelog at http://svn.mplayerhq.hu/mplayer/trunk/ **/ - + #include "common.h" @@ -463,7 +462,7 @@ } } - + -void* output_to_PCM(NeAACDecHandle hDecoder, +void* output_to_PCM_sux(NeAACDecHandle hDecoder, real_t **input, void *sample_buffer, uint8_t channels, @@ -149,7 +149,7 @@ @@ -554,4 +553,51 @@ return sample_buffer; } - + +void* output_to_PCM(NeAACDecHandle hDecoder, + real_t **input, void *sample_buffer, uint8_t channels, + uint16_t frame_len, uint8_t format) @@ -209,10 +209,10 @@ +** detailed changelog at http://svn.mplayerhq.hu/mplayer/trunk/ +** local_changes.diff contains the exact changes to this file. **/ - + #include "common.h" @@ -159,7 +162,7 @@ - + /* static function declarations */ static void ps_data_decode(ps_info *ps); -static hyb_info *hybrid_init(); @@ -222,13 +222,13 @@ static void INLINE DCT3_4_unscaled(real_t *y, real_t *x); @@ -189,7 +192,7 @@ /* */ - - + + -static hyb_info *hybrid_init() +static hyb_info *hybrid_init(void) { uint8_t i; - + @@ -1935,8 +1938,8 @@ /* main Parametric Stereo decoding function */ uint8_t ps_decode(ps_info *ps, qmf_t X_left[38][64], qmf_t X_right[38][64]) @@ -237,7 +237,7 @@ - qmf_t X_hybrid_right[32][32] = {{0}}; + qmf_t X_hybrid_left[32][32] = {{{0}}}; + qmf_t X_hybrid_right[32][32] = {{{0}}}; - + /* delta decoding of the bitstream data */ ps_data_decode(ps); --- libfaad2.orig/sbr_dec.c 2006-03-16 20:15:04.000000000 +0100 @@ -251,8 +251,8 @@ +** detailed changelog at http://svn.mplayerhq.hu/mplayer/trunk/ +** local_changes.diff contains the exact changes to this file. **/ - - + + @@ -526,8 +529,8 @@ uint8_t l, k; uint8_t dont_process = 0; @@ -261,7 +261,7 @@ - ALIGN qmf_t X_right[38][64] = {{0}}; /* must set this to 0 */ + ALIGN qmf_t X_left[38][64] = {{{0}}}; + ALIGN qmf_t X_right[38][64] = {{{0}}}; /* must set this to 0 */ - + if (sbr == NULL) return 20; --- libfaad2.orig/specrec.c 2006-03-16 20:15:04.000000000 +0100 @@ -278,7 +278,7 @@ +** detailed changelog at http://svn.mplayerhq.hu/mplayer/trunk/ +** local_changes.diff contains the exact changes to this file. **/ - + /* @@ -673,29 +673,19 @@ /* MAIN object type prediction */ @@ -293,7 +293,7 @@ - } } #endif - + #ifdef LTP_DEC if (is_ltp_ot(hDecoder->object_type)) { @@ -306,7 +306,7 @@ - } } #endif - + - if (hDecoder->time_out[channel] == NULL) - { mul = 1; @@ -331,14 +331,14 @@ - } } #endif - + - if (hDecoder->fb_intermed[channel] == NULL) - { - hDecoder->fb_intermed[channel] = (real_t*)faad_malloc(hDecoder->frameLength*sizeof(real_t)); + hDecoder->fb_intermed[channel] = (real_t*)realloc(hDecoder->fb_intermed[channel], hDecoder->frameLength*sizeof(real_t)); memset(hDecoder->fb_intermed[channel], 0, hDecoder->frameLength*sizeof(real_t)); - } - + #ifdef SSR_DEC if (hDecoder->object_type == SSR) { @@ -359,9 +359,9 @@ - } } #endif - + @@ -865,22 +842,14 @@ - + /* always allocate 2 channels, PS can always "suddenly" turn up */ #if (defined(PS_DEC) || defined(DRM_PS)) - output_channels = 2; @@ -369,7 +369,7 @@ #else output_channels = 1; #endif - + - if (hDecoder->element_output_channels[hDecoder->fr_ch_ele] == 0) - { - /* element_output_channels not set yet */ @@ -391,7 +391,7 @@ return 23; } -#endif - + /* copy L to R when no PS is used */ #if (defined(PS_DEC) || defined(DRM_PS)) - if ((hDecoder->ps_used[hDecoder->fr_ch_ele] == 0)) @@ -404,6 +404,6 @@ } #endif +#endif - + return 0; } |