resample.* is no longer needed in audio_outxine-0_5_2-release0.5.2

CVS patchset: 555
CVS date: 2001/09/02 22:45:00

4 files changed, 4 insertions, 332 deletions

diff --git a/src/audio_out/Makefile.am b/src/audio_out/Makefile.am
index e8818b6ca..7ac547bd7 100644
--- a/src/audio_out/Makefile.am
+++ b/src/audio_out/Makefile.am
@@ -58,7 +58,7 @@ lib_LTLIBRARIES = $(oss_module) $(alsa_module) $(esd_module) $(sun_module) $(art
 xineplug_ao_out_oss_la_SOURCES = audio_oss_out.c
 xineplug_ao_out_oss_la_LDFLAGS = -avoid-version -module
 
-xineplug_ao_out_alsa05_la_SOURCES = audio_alsa05_out.c resample.c
+xineplug_ao_out_alsa05_la_SOURCES = audio_alsa05_out.c 
 xineplug_ao_out_alsa05_la_LIBADD = $(ALSA_LIBS)	
 xineplug_ao_out_alsa05_la_LDFLAGS = -avoid-version -module
 
@@ -66,14 +66,14 @@ xineplug_ao_out_alsa_la_SOURCES = audio_alsa_out.c
 xineplug_ao_out_alsa_la_LIBADD = $(ALSA_LIBS)
 xineplug_ao_out_alsa_la_LDFLAGS = -avoid-version -module
 
-xineplug_ao_out_esd_la_SOURCES = audio_esd_out.c resample.c
+xineplug_ao_out_esd_la_SOURCES = audio_esd_out.c 
 xineplug_ao_out_esd_la_LIBADD = $(ESD_LIBS)
 xineplug_ao_out_esd_la_LDFLAGS = -avoid-version -module
 
 xineplug_ao_out_sun_la_SOURCES = audio_sun_out.c
 xineplug_ao_out_sun_la_LDFLAGS = -avoid-version -module
 
-## xineplug_ao_out_irixal_la_SOURCES = audio_irixal_out.c resample.c
+## xineplug_ao_out_irixal_la_SOURCES = audio_irixal_out.c 
 ## xineplug_ao_out_irixal_la_LIBADD = $(IRIXAL_LIBS)
 ## xineplug_ao_out_irixal_la_LDFLAGS = -avoid-version -module
 
diff --git a/src/audio_out/audio_esd_out.c b/src/audio_out/audio_esd_out.c
index 8434e91c8..20cc131b9 100644
--- a/src/audio_out/audio_esd_out.c
+++ b/src/audio_out/audio_esd_out.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_esd_out.c,v 1.7 2001/08/24 01:05:30 guenter Exp $
+ * $Id: audio_esd_out.c,v 1.8 2001/09/02 22:45:00 guenter Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -36,7 +36,6 @@
 #include "xine_internal.h"
 #include "monitor.h"
 #include "audio_out.h"
-#include "resample.h"
 #include "metronom.h"
 #include "utils.h"
 
diff --git a/src/audio_out/resample.c b/src/audio_out/resample.c
deleted file mode 100644
index 8a5419d24..000000000
--- a/src/audio_out/resample.c
+++ /dev/null
@@ -1,282 +0,0 @@
-/* 
- * Copyright (C) 2000 the xine project
- * 
- * This file is part of xine, a unix video player.
- * 
- * xine is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * xine is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
- *
- * $Id: resample.c,v 1.3 2001/07/22 11:22:00 ehasenle Exp $
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <inttypes.h>
-
-/* contributed by paul flinders */
-
-void audio_out_resample_mono(int16_t* input_samples, uint32_t in_samples, 
-			     int16_t* output_samples, uint32_t out_samples)
-{
-  int osample;
-  /* 16+16 fixed point math */
-  uint32_t isample = 0;
-  uint32_t istep = (in_samples << 16)/out_samples;
-
-#ifdef VERBOSE
-  printf ("Audio : resample %d samples to %d\n",
-          in_samples, out_samples);
-#endif
-
-  for (osample = 0; osample < out_samples - 1; osample++) {
-    int  s1;
-    int  s2;
-    int16_t  os;
-    uint32_t t = isample&0xffff;
-    
-    /* don't "optimize" the (isample >> 16)*2 to (isample >> 15) */
-    s1 = input_samples[(isample >> 16)];
-    s2 = input_samples[(isample >> 16)+1];
-    
-    os = (s1 * (0x10000-t)+ s2 * t) >> 16;
-    output_samples[osample] = os;
-
-    isample += istep;
-  }
-  output_samples[out_samples-1] = input_samples[in_samples-1];
-}
-
-void audio_out_resample_stereo(int16_t* input_samples, uint32_t in_samples, 
-			       int16_t* output_samples, uint32_t out_samples)
-{
-  int osample;
-  /* 16+16 fixed point math */
-  uint32_t isample = 0;
-  uint32_t istep = (in_samples << 16)/out_samples;
-
-#ifdef VERBOSE
-  printf ("Audio : resample %d samples to %d\n",
-          in_samples, out_samples);
-#endif
-
-  for (osample = 0; osample < out_samples - 1; osample++) {
-    int  s1;
-    int  s2;
-    int16_t  os;
-    uint32_t t = isample&0xffff;
-    
-    /* don't "optimize" the (isample >> 16)*2 to (isample >> 15) */
-    s1 = input_samples[(isample >> 16)*2];
-    s2 = input_samples[(isample >> 16)*2+2];
-    
-    os = (s1 * (0x10000-t)+ s2 * t) >> 16;
-    output_samples[osample * 2] = os;
-
-    s1 = input_samples[(isample >> 16)*2+1];
-    s2 = input_samples[(isample >> 16)*2+3];
-    
-    os = (s1 * (0x10000-t)+ s2 * t) >> 16;
-    output_samples[(osample * 2 )+1] = os;
-    isample += istep;
-  }
-  output_samples[out_samples*2-2] = input_samples[in_samples*2-2];
-  output_samples[out_samples*2-1] = input_samples[in_samples*2-1];
-}
-
-
-void audio_out_resample_4channel(int16_t* input_samples, uint32_t in_samples, 
-				 int16_t* output_samples, uint32_t out_samples)
-{
-  int osample;
-  /* 16+16 fixed point math */
-  uint32_t isample = 0;
-  uint32_t istep = (in_samples << 16)/out_samples;
-
-#ifdef VERBOSE
-  printf ("Audio : resample %d samples to %d\n",
-          in_samples, out_samples);
-#endif
-
-  for (osample = 0; osample < out_samples - 1; osample++) {
-    int  s1;
-    int  s2;
-    int16_t  os;
-    uint32_t t = isample&0xffff;
-    
-    /* don't "optimize" the (isample >> 16)*2 to (isample >> 15) */
-    s1 = input_samples[(isample >> 16)*4];
-    s2 = input_samples[(isample >> 16)*4+4];
-    
-    os = (s1 * (0x10000-t)+ s2 * t) >> 16;
-    output_samples[osample * 4] = os;
-
-    s1 = input_samples[(isample >> 16)*4+1];
-    s2 = input_samples[(isample >> 16)*4+5];
-    
-    os = (s1 * (0x10000-t)+ s2 * t) >> 16;
-    output_samples[(osample * 4 )+1] = os;
-
-    s1 = input_samples[(isample >> 16)*4+2];
-    s2 = input_samples[(isample >> 16)*4+6];
-    
-    os = (s1 * (0x10000-t)+ s2 * t) >> 16;
-    output_samples[(osample * 4 )+2] = os;
-
-    s1 = input_samples[(isample >> 16)*4+3];
-    s2 = input_samples[(isample >> 16)*4+7];
-    
-    os = (s1 * (0x10000-t)+ s2 * t) >> 16;
-    output_samples[(osample * 4 )+3] = os;
-
-    isample += istep;
-  }
-  output_samples[out_samples*4-4] = input_samples[in_samples*4-4];
-  output_samples[out_samples*4-3] = input_samples[in_samples*4-3];
-  output_samples[out_samples*4-2] = input_samples[in_samples*4-2];
-  output_samples[out_samples*4-1] = input_samples[in_samples*4-1];
-
-}
-
-
-void audio_out_resample_5channel(int16_t* input_samples, uint32_t in_samples, 
-				 int16_t* output_samples, uint32_t out_samples)
-{
-  int osample;
-  /* 16+16 fixed point math */
-  uint32_t isample = 0;
-  uint32_t istep = (in_samples << 16)/out_samples;
-
-#ifdef VERBOSE
-  printf ("Audio : resample %d samples to %d\n",
-          in_samples, out_samples);
-#endif
-
-  for (osample = 0; osample < out_samples - 1; osample++) {
-    int  s1;
-    int  s2;
-    int16_t  os;
-    uint32_t t = isample&0xffff;
-    
-    /* don't "optimize" the (isample >> 16)*2 to (isample >> 15) */
-    s1 = input_samples[(isample >> 16)*5];
-    s2 = input_samples[(isample >> 16)*5+5];
-    
-    os = (s1 * (0x10000-t)+ s2 * t) >> 16;
-    output_samples[osample * 5] = os;
-
-    s1 = input_samples[(isample >> 16)*5+1];
-    s2 = input_samples[(isample >> 16)*5+6];
-    
-    os = (s1 * (0x10000-t)+ s2 * t) >> 16;
-    output_samples[(osample * 5 )+1] = os;
-
-    s1 = input_samples[(isample >> 16)*5+2];
-    s2 = input_samples[(isample >> 16)*5+7];
-    
-    os = (s1 * (0x10000-t)+ s2 * t) >> 16;
-    output_samples[(osample * 5 )+2] = os;
-
-    s1 = input_samples[(isample >> 16)*5+3];
-    s2 = input_samples[(isample >> 16)*5+8];
-    
-    os = (s1 * (0x10000-t)+ s2 * t) >> 16;
-    output_samples[(osample * 5 )+3] = os;
-
-    s1 = input_samples[(isample >> 16)*5+4];
-    s2 = input_samples[(isample >> 16)*5+9];
-    
-    os = (s1 * (0x10000-t)+ s2 * t) >> 16;
-    output_samples[(osample * 5 )+4] = os;
-
-    isample += istep;
-  }
-
-  output_samples[out_samples*5-5] = input_samples[in_samples*5-5];
-  output_samples[out_samples*5-4] = input_samples[in_samples*5-4];
-  output_samples[out_samples*5-3] = input_samples[in_samples*5-3];
-  output_samples[out_samples*5-2] = input_samples[in_samples*5-2];
-  output_samples[out_samples*5-1] = input_samples[in_samples*5-1];
-}
-
-
-void audio_out_resample_6channel(int16_t* input_samples, uint32_t in_samples, 
-				 int16_t* output_samples, uint32_t out_samples)
-{
-  int osample;
-  /* 16+16 fixed point math */
-  uint32_t isample = 0;
-  uint32_t istep = (in_samples << 16)/out_samples;
-
-#ifdef VERBOSE
-  printf ("Audio : resample %d samples to %d\n",
-          in_samples, out_samples);
-#endif
-
-  for (osample = 0; osample < out_samples - 1; osample++) {
-    int  s1;
-    int  s2;
-    int16_t  os;
-    uint32_t t = isample&0xffff;
-    
-    /* don't "optimize" the (isample >> 16)*2 to (isample >> 15) */
-    s1 = input_samples[(isample >> 16)*6];
-    s2 = input_samples[(isample >> 16)*6+6];
-    
-    os = (s1 * (0x10000-t)+ s2 * t) >> 16;
-    output_samples[osample * 6] = os;
-
-    s1 = input_samples[(isample >> 16)*6+1];
-    s2 = input_samples[(isample >> 16)*6+7];
-    
-    os = (s1 * (0x10000-t)+ s2 * t) >> 16;
-    output_samples[(osample * 6 )+1] = os;
-
-    s1 = input_samples[(isample >> 16)*6+2];
-    s2 = input_samples[(isample >> 16)*6+8];
-    
-    os = (s1 * (0x10000-t)+ s2 * t) >> 16;
-    output_samples[(osample * 6 )+2] = os;
-
-    s1 = input_samples[(isample >> 16)*6+3];
-    s2 = input_samples[(isample >> 16)*6+9];
-    
-    os = (s1 * (0x10000-t)+ s2 * t) >> 16;
-    output_samples[(osample * 6 )+3] = os;
-
-    s1 = input_samples[(isample >> 16)*6+4];
-    s2 = input_samples[(isample >> 16)*6+10];
-    
-    os = (s1 * (0x10000-t)+ s2 * t) >> 16;
-    output_samples[(osample * 6 )+4] = os;
-
-    s1 = input_samples[(isample >> 16)*6+5];
-    s2 = input_samples[(isample >> 16)*6+11];
-    
-    os = (s1 * (0x10000-t)+ s2 * t) >> 16;
-    output_samples[(osample * 6 )+5] = os;
-
-    isample += istep;
-  }
-
-  output_samples[out_samples*6-6] = input_samples[in_samples*6-6];
-  output_samples[out_samples*6-5] = input_samples[in_samples*6-5];
-  output_samples[out_samples*6-4] = input_samples[in_samples*6-4];
-  output_samples[out_samples*6-3] = input_samples[in_samples*6-3];
-  output_samples[out_samples*6-2] = input_samples[in_samples*6-2];
-  output_samples[out_samples*6-1] = input_samples[in_samples*6-1];
-}
-
-
diff --git a/src/audio_out/resample.h b/src/audio_out/resample.h
deleted file mode 100644
index 0b5facf47..000000000
--- a/src/audio_out/resample.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2000 the xine project
- * 
- * This file is part of xine, a unix video player.
- * 
- * xine is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * xine is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
- *
- * $Id: resample.h,v 1.2 2001/07/22 11:22:00 ehasenle Exp $
- *
- * utilitiy functions for audio drivers
- *
- * FIXME: not all of them are implemented yet
- */
-
-#ifndef HAVE_RESAMPLE_H
-#define HAVE_RESAMPLE_H
-
-void audio_out_resample_stereo(int16_t* input_samples, uint32_t in_samples, 
-			       int16_t* output_samples, uint32_t out_samples);
-
-void audio_out_resample_mono(int16_t* input_samples, uint32_t in_samples, 
-			     int16_t* output_samples, uint32_t out_samples);
-
-void audio_out_resample_4channel(int16_t* input_samples, uint32_t in_samples, 
-				 int16_t* output_samples, uint32_t out_samples);
-
-void audio_out_resample_5channel(int16_t* input_samples, uint32_t in_samples, 
-				 int16_t* output_samples, uint32_t out_samples);
-
-void audio_out_resample_6channel(int16_t* input_samples, uint32_t in_samples, 
-				 int16_t* output_samples, uint32_t out_samples);
-
-#endif