Bill's force audio rate patches, preparing for 0.9.40.9.4

CVS patchset: 953
CVS date: 2001/11/04 22:49:38

6 files changed, 15 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index 06e2ffc31..0af7c6137 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+xine (0.9.4) unstable; urgency=low
+
   * new SyncFB video out plugin (see README.syncfb)
   * catch SIGSEGV during libdivxdecore version probing. see README.divx4.
-  
+  * audio_force_rate .xinerc option
+	
+ -- Guenter Bartsch <guenter@users.sourceforge.net> Sun Nov  4 23:43:55 CET 2001
+	
 xine (0.9.3) unstable; urgency=low
 
   * XShm gamma adjusting (brightness)
diff --git a/acconfig.h b/acconfig.h
index 727a9c7b7..8e7969521 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -81,9 +81,6 @@
 /* Define this if you have ip_mreqn in netinet/in.h */
 #undef HAVE_IP_MREQN
 
-/* Define this to cap audio sample rate at 44.1K, some drivers (dmasound) don't handle 48K request correctly */
-#undef FORCE_44K_MAX
-
 /* Define one of these to select libmad fixed point arithmetic implementation */
 #undef FPM_INTEL
 #undef FPM_64BIT
diff --git a/configure.in b/configure.in
index 054ba36aa..42436e592 100644
--- a/configure.in
+++ b/configure.in
@@ -25,10 +25,10 @@ dnl set XINE_BIN_AGE _and_ XINE_IFACE_AGE to 0.
 dnl
 XINE_MAJOR=0
 XINE_MINOR=9
-XINE_SUB=3
+XINE_SUB=4
 XINE_PRE=""
-XINE_IFACE_AGE=3
-XINE_BIN_AGE=3
+XINE_IFACE_AGE=4
+XINE_BIN_AGE=4
 
 AC_SUBST(XINE_MAJOR)
 AC_SUBST(XINE_MINOR)
@@ -537,7 +537,6 @@ case "$host_or_hostalias" in
   ppc-*-linux* | powerpc-*) 
     GLOBAL_CFLAGS="$GLOBAL_CFLAGS -O3 -pipe -fomit-frame-pointer $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -funroll-all-loops -finline-functions"
     DEBUG_CFLAGS="$DEBUG_CFLAGS -O3"
-    FORCE_44K_MAX=yes
     AC_DEFINE(FPM_PPC)
     ;;
 
@@ -693,18 +692,6 @@ AC_SUBST(w32_path)
 
 
 dnl
-dnl Force 44.1K maximum audio sample rate for drivers/devices that don't
-dnl correctly handle 48K rates, e.g. PowerMac dmasound through at least
-dnl early 2.4.*. Will need dynamic test once fix makes it into source
-dnl trees.
-dnl
-if test x$FORCE_44K_MAX = xyes; then
-  echo "including FORCE_44K_MAX capping"
-  AC_DEFINE(FORCE_44K_MAX,1,[Cap audio sample rate at 44.1K, some drivers (dmasound) don't handle 48K request correctly])
-fi
-
-
-dnl
 dnl Some include paths ( !!! DO NOT REMOVE !!! )
 dnl
 INCLUDES='-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/src/xine-engine -I$(top_builddir)/src/xine-engine -I$(top_srcdir)/src/xine-utils -I$(top_builddir)/src/xine-utils'
diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c
index 8c169df46..b1598005d 100644
--- a/src/audio_out/audio_oss_out.c
+++ b/src/audio_out/audio_oss_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_oss_out.c,v 1.47 2001/10/21 23:14:08 miguelfreitas Exp $
+ * $Id: audio_oss_out.c,v 1.48 2001/11/04 22:49:38 guenter Exp $
  *
  * 20-8-2001 First implementation of Audio sync and Audio driver separation.
  * Copyright (C) 2001 James Courtier-Dutton James@superbug.demon.co.uk
@@ -189,10 +189,6 @@ static int ao_oss_open(ao_driver_t *this_gen,
     ioctl(this->audio_fd,SNDCTL_DSP_SAMPLESIZE,&tmp);
 
     tmp = this->input_sample_rate;
-#ifdef FORCE_44K_MAX
-    if(tmp > 44100)
-       tmp = 44100;
-#endif
     if (ioctl(this->audio_fd,SNDCTL_DSP_SPEED, &tmp) == -1) {
 
       printf ("audio_oss_out: warning: sampling rate %d Hz not supported, trying 44100 Hz\n", this->input_sample_rate);
diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c
index 442e0c388..ab5cb40f4 100644
--- a/src/xine-engine/audio_out.c
+++ b/src/xine-engine/audio_out.c
@@ -17,7 +17,7 @@
  * along with self program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_out.c,v 1.22 2001/10/16 17:57:31 joachim_koenig Exp $
+ * $Id: audio_out.c,v 1.23 2001/11/04 22:49:38 guenter Exp $
  * 
  * 22-8-2001 James imported some useful AC3 sections from the previous alsa driver.
  *   (c) 2001 Andy Lo A Foe <andy@alsaplayer.org>
@@ -126,7 +126,7 @@ static int ao_open(ao_instance_t *this,
 		   uint32_t bits, uint32_t rate, int mode)
 { 
   int output_sample_rate;
-  if ((output_sample_rate=this->driver->open(this->driver,bits,rate,mode)) == 0) {
+  if ((output_sample_rate=this->driver->open(this->driver,bits,(this->force_rate ? this->force_rate : rate),mode)) == 0) {
     printf("audio_out: open failed!\n");
     return 0;
   }; 
@@ -460,6 +460,7 @@ ao_instance_t *ao_new_instance (ao_driver_t *driver, metronom_t *metronom,
   this->gap_tolerance         = driver->get_gap_tolerance (this->driver);
 
   this->resample_conf = config->lookup_int (config, "audio_resample_mode", 0);
+  this->force_rate    = config->lookup_int (config, "audio_force_rate", 0);
 
   return this;
 }
diff --git a/src/xine-engine/audio_out.h b/src/xine-engine/audio_out.h
index 501eac29a..b167f1563 100644
--- a/src/xine-engine/audio_out.h
+++ b/src/xine-engine/audio_out.h
@@ -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_out.h,v 1.18 2001/10/01 23:04:57 f1rmb Exp $
+ * $Id: audio_out.h,v 1.19 2001/11/04 22:49:38 guenter Exp $
  */
 #ifndef HAVE_AUDIO_OUT_H
 #define HAVE_AUDIO_OUT_H
@@ -175,6 +175,7 @@ struct ao_instance_s {
   int             audio_started;
   uint32_t        last_audio_vpts;
   int             resample_conf;
+  int             force_rate;           /* force audio output rate to this value if non-zero */
   int             do_resample;
   int	 	  mode;
   int             bits;