File 40-fast-swap-and-buffer.dpatch of Package gramofile

Overview Repositories Revisions Requests Users Attributes Meta

File 40-fast-swap-and-buffer.dpatch of Package gramofile (Revision 5964074c6d5419aa5b4eec835c39a0c1)

Currently displaying revision 5964074c6d5419aa5b4eec835c39a0c1 , Show latest

# Patch by J. Dru Lemley.

Index: Makefile
===================================================================
--- Makefile.orig	2012-04-20 15:53:01.592016038 +0200
+++ Makefile	2012-04-20 15:53:51.999797199 +0200
@@ -28,7 +28,7 @@ LDFLAGS =
 ########## CHOOSE YOUR ARCHITECTURE:    (NOTE: also see bplaysrc/Makefile!)
 
 # For Linux (and maybe others), use these:
-CFLAGS = $(RPM_OPT_FLAGS) -W -Wall -DTURBO_MEDIAN -DTURBO_BUFFER
+CFLAGS = $(RPM_OPT_FLAGS) -funroll-loops -W -Wall -DTURBO_MEDIAN -DTURBO_BUFFER
 DEPS = $(OBJS) makebplay
 LIBS = -lncurses -lm
 COPY_A = -a
Index: endian.h
===================================================================
--- endian.h.orig	2000-03-28 23:07:26.000000000 +0200
+++ endian.h	2012-04-20 15:53:01.647014708 +0200
@@ -8,4 +8,10 @@ extern u_short SwapTwoBytes (u_short);
 extern u_long SwapFourBytes (u_long);
 extern sample_t SwapSample (sample_t);
 
+/* macro to swap endianness of values in a sample_t with */
+/* a few 32-bit operations -- very fast                  */
+#define SWAPSAMPLEREF(s) *((uint32_t *)(s)) = \
+	((*((uint32_t *)(s)) & 0xff00ff00) >> 8) | \
+	((*((uint32_t *)(s)) & 0x00ff00ff) << 8)
+
 #endif
Index: signpr_wav.c
===================================================================
--- signpr_wav.c.orig	2000-03-28 23:07:26.000000000 +0200
+++ signpr_wav.c	2012-04-20 15:55:42.566130285 +0200
@@ -22,6 +22,8 @@
 /* ----- SOURCE & READING -------------------------------------------------- */
 
 FILE *sourcefile;
+int num_read_samples_buffered = 0;
+sample_t readsamplebuffer[44100];
 
 int
 openwavsource (char *filename)
@@ -106,6 +108,7 @@ processed.");
     }
 
   /* Well, everything seems to be OK */
+  num_read_samples_buffered = 0;
   return 1;
 }
 
@@ -113,6 +116,7 @@ void
 closewavsource ()
 {
   fclose (sourcefile);
+  num_read_samples_buffered = 0;
 }
 
 int
@@ -121,6 +125,9 @@ seeksamplesource (long samplenumber)
 {
   struct stat buf;
 
+  /* throw away buffer on fseek */
+  num_read_samples_buffered = 0;
+
   if (fstat (fileno (sourcefile), &buf))
     return 0;
 
@@ -136,21 +143,27 @@ seeksamplesource (long samplenumber)
 sample_t
 readsamplesource ()
 {
-  sample_t sample;
+  /* millions of calls to fread sure slow things down.... buffer it a little */
+  static int i;
 
-  if (fread (&sample, 1, 4, sourcefile) != 4)
-    {
-      /* reading after end of file - this just happens when using
-         pre-read buffers! */
-      sample.left = 0;
-      sample.right = 0;
-    }
+  if (i >= num_read_samples_buffered)
+  {
+    num_read_samples_buffered = fread(readsamplebuffer, 4, sizeof(readsamplebuffer)/4, sourcefile);
+    i = 0;
+    if (!num_read_samples_buffered)
+      {
+        /* reading after end of file - this just happens when using
+           pre-read buffers! */
+        readsamplebuffer[0].left = 0;
+        readsamplebuffer[0].right = 0;
+    	return readsamplebuffer[0];
+      }
+  }
 
 #ifdef SWAP_ENDIAN
-  sample = SwapSample (sample);
+  SWAPSAMPLEREF (readsamplebuffer+i);
 #endif
-
-  return sample;
+  return readsamplebuffer[i++];
 }
 
 
@@ -158,6 +171,8 @@ readsamplesource ()
 
 FILE *destfile;
 int destfileispipe;		/* remember open() - - -> close() */
+int num_write_samples_buffered = 0;
+sample_t writesamplebuffer[44100];
 
 int
 openwavdest (char *filename, long bcount)
@@ -216,12 +231,20 @@ openwavdest (char *filename, long bcount
 
   fwrite (&header, sizeof (header), 1, destfile);
 
+  num_write_samples_buffered = 0;  /* just in case */
   return 1;
 }
 
+void flushwritebuffer()
+{
+	fwrite(writesamplebuffer, 4 * num_write_samples_buffered, 1, destfile);
+	num_write_samples_buffered = 0;
+}
+
 void
 closewavdest ()
 {
+  flushwritebuffer();
   if (destfileispipe)
     pclose (destfile);
   else
@@ -233,8 +256,9 @@ writesampledest (sample_t sample)
 {
 
 #ifdef SWAP_ENDIAN
-  sample = SwapSample (sample);
+  SWAPSAMPLEREF(&sample);
 #endif
-
-  fwrite (&sample, 4, 1, destfile);
+  if (num_write_samples_buffered == (sizeof (writesamplebuffer) / 4))
+	flushwritebuffer();
+  writesamplebuffer[num_write_samples_buffered++] = sample;
 }

Places

File 40-fast-swap-and-buffer.dpatch of Package gramofile (Revision 5964074c6d5419aa5b4eec835c39a0c1)

Places