summaryrefslogtreecommitdiffstats
path: root/mp3lib/mpg123.h
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-04-02 07:02:43 +0300
committerUoti Urpala <uau@mplayer2.org>2011-04-02 07:28:53 +0300
commitf9b5f2870cd7ebb8fe70eeb65e22d11bb88d5202 (patch)
tree3d369fff359296307c05e120b4d2b53ea5974928 /mp3lib/mpg123.h
parentb8e1456c25de18b8ecb8922d870bfe9161900d2a (diff)
downloadmpv-f9b5f2870cd7ebb8fe70eeb65e22d11bb88d5202.tar.bz2
mpv-f9b5f2870cd7ebb8fe70eeb65e22d11bb88d5202.tar.xz
mp3lib: drop internal mp3lib tree
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.
Diffstat (limited to 'mp3lib/mpg123.h')
-rw-r--r--mp3lib/mpg123.h144
1 files changed, 0 insertions, 144 deletions
diff --git a/mp3lib/mpg123.h b/mp3lib/mpg123.h
deleted file mode 100644
index 0b9f781f80..0000000000
--- a/mp3lib/mpg123.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Modified for use with MPlayer, for details see the changelog at
- * http://svn.mplayerhq.hu/mplayer/trunk/
- * $Id$
- */
-
-/*
- * mpg123 defines
- * used source: musicout.h from mpegaudio package
- */
-
-#ifndef MPLAYER_MP3LIB_MPG123_H
-#define MPLAYER_MP3LIB_MPG123_H
-
-#include "config.h"
-
-#ifndef M_PI
-#define M_PI 3.141592653589793238462
-#endif
-#ifndef M_SQRT2
-#define M_SQRT2 1.414213562373095048802
-#endif
-#define REAL_IS_FLOAT
-#define NEW_DCT9
-
-#undef MPG123_REMOTE /* Get rid of this stuff for Win32 */
-
-typedef float real;
-
-/*
-# define real float
-# define real long double
-# define real double
-#include "audio.h"
-
-// #define AUDIOBUFSIZE 4096
-*/
-
-#define FALSE 0
-#define TRUE 1
-
-#define MAX_NAME_SIZE 81
-#define SBLIMIT 32
-#define SCALE_BLOCK 12
-#define SSLIMIT 18
-
-#define MPG_MD_STEREO 0
-#define MPG_MD_JOINT_STEREO 1
-#define MPG_MD_DUAL_CHANNEL 2
-#define MPG_MD_MONO 3
-
-/* #define MAXOUTBURST 32768 */
-
-/* Pre Shift fo 16 to 8 bit converter table */
-#define AUSHIFT (3)
-
-struct al_table
-{
- short bits;
- short d;
-};
-
-struct frame {
- struct al_table *alloc;
- int (*synth)(real *,int,unsigned char *,int *);
- int (*synth_mono)(real *,unsigned char *,int *);
- int stereo;
- int jsbound;
- int single;
- int II_sblimit;
- int down_sample_sblimit;
- int lsf;
- int mpeg25;
- int down_sample;
- int header_change;
- int lay;
- int error_protection;
- int bitrate_index;
- int sampling_frequency;
- int padding;
- int extension;
- int mode;
- int mode_ext;
- int copyright;
- int original;
- int emphasis;
- int framesize; /* computed framesize */
-};
-
-
-struct gr_info_s {
- int scfsi;
- unsigned part2_3_length;
- unsigned big_values;
- unsigned scalefac_compress;
- unsigned block_type;
- unsigned mixed_block_flag;
- unsigned table_select[3];
- unsigned subblock_gain[3];
- unsigned maxband[3];
- unsigned maxbandl;
- unsigned maxb;
- unsigned region1start;
- unsigned region2start;
- unsigned preflag;
- unsigned scalefac_scale;
- unsigned count1table_select;
- real *full_gain[3];
- real *pow2gain;
-};
-
-struct III_sideinfo
-{
- unsigned main_data_begin;
- unsigned private_bits;
- struct {
- struct gr_info_s gr[2];
- } ch[2];
-};
-
-extern real mp3lib_decwin[(512+32)];
-extern real *mp3lib_pnts[];
-
-int synth_1to1_pent( real *, int, short * );
-int synth_1to1_MMX( real *, int, short * );
-int synth_1to1_MMX_s(real *, int, short *, short *, int *);
-
-void dct36_3dnow(real *, real *, real *, real *, real *);
-void dct36_3dnowex(real *, real *, real *, real *, real *);
-void dct36_sse(real *, real *, real *, real *, real *);
-
-void dct64_MMX(short *, short *, real *);
-void dct64_MMX_3dnow(short *, short *, real *);
-void dct64_MMX_3dnowex(short *, short *, real *);
-void dct64_sse(short *, short *, real *);
-void dct64_altivec(real *, real *, real *);
-extern void (*dct64_MMX_func)(short *, short *, real *);
-
-void mp3lib_dct64(real *, real *, real *);
-
-typedef int (*synth_func_t)( real *,int,short * );
-typedef void (*dct36_func_t)(real *,real *,real *,real *,real *);
-
-#endif /* MPLAYER_MP3LIB_MPG123_H */