Changeset 53d7625

Timestamp:

Oct 24, 2003, 4:31:42 PM (21 years ago)

Author:

jtwang <jtwang>

Branches:

master, debian, mac, no-cups, nodebathena, web

Children:

ab55f2e

Parents:

6761cd4

git-author:

jtwang <jtwang> (10/24/03 16:31:42)

git-committer:

jtwang <jtwang> (10/24/03 16:31:42)

Message:

Removed output buffer when playing MPEG streams because files seem to
be cut by mpg123 if transfer cannot keep up with the file bitrate when
output buffer is enabled.

Added code to handle shoutcast playlists (Content-Type: audio/x-scpls)

File:

• gutenbach/debian/lib/sipbmp3-filter (modified) (8 diffs)

gutenbach/debian/lib/sipbmp3-filter

@@ -2 +2 @@
 # Play the data on STDIN as an audio file
 #
-# $Id: sipbmp3-filter,v 1.10 2003-10-22 20:36:08 jhawk Exp $
+# $Id: sipbmp3-filter,v 1.11 2003-10-24 20:31:42 jtwang Exp $
 # $Source: /tmp/tmp.UFBNno9997/RCS/sipbmp3-filter,v $
 #
@@ -43 +43 @@
 #  -P logname
 #  -Q queuename (lpr -Q)
+#  -Z random user-specified options
 #  -a printcap af (accounting file name)
 #  -d printcap sd entry (spool dir)
@@ -122 +123 @@
     #
     # Where <URI> is a valid URI for the stream, and <format> is a
-    # recognized format name (currently 'MP3' or 'OGG'). <user:pass>
-    # is an optional user and password pair for HTTP Basic Auth.
+    # recognized format name (currently 'MP3' or 'OGG' or 'SHOUTCAST').
+    # <user:pass> is an optional user and password pair for HTTP Basic Auth.
     my $format, $uri, $userpass;
 
@@ -152 +153 @@
               print ZEPHYR "Couldn't fork: $!\n";
               close(ZEPHYR);
-              return;
+              die;
           }
 
@@ -165 +166 @@
               elsif ($contenttype eq "application/x-ogg") { $format="OGG" }
               elsif ($contenttype eq "application/ogg") { $format="OGG" }
+              elsif ($contenttype eq "audio/x-scpls") { $format="SHOUTCAST" }
               else {
                   print ZEPHYR
@@ -194 +196 @@
     if (($format eq "MP3") ||
         ($format eq "mp3")) {
-      print ZEPHYR "Playing MP3 audio stream...\n";
+      print ZEPHYR "MP3 audio stream...\n";
       close(ZEPHYR);
       &play_mpeg_stream($uri, $userpass);
-    } elsif (($format eq "OGG") ||
+    }
+    elsif ($format eq "SHOUTCAST") {
+        print ZEPHYR "Shoutcast playlist...\n";
+        #Don't close ZEPHYR yet, will print the name of the stream if available
+        $uri = &get_shoutcast($uri);
+        close(ZEPHYR);
+        &play_mpeg_stream($uri, undef);
+    }   
+    elsif (($format eq "OGG") ||
              ($format eq "ogg")) {
-      print ZEPHYR "Playing OggVorbis audio stream...\n";
+      print ZEPHYR "OggVorbis stream...\n";
       close(ZEPHYR);
       &play_ogg_stream($uri, $userpass);
@@ -208 +218 @@
 }
 
+# Process a Shoutcast playlist
+# get_shoutcast(URI)
+sub get_shoutcast {
+  my $uri = shift(@_);
+  
+  # grab the shoutcast .pls file
+  my $pid = open(W3M, "-|");
+  unless (defined $pid) {
+      print ZEPHYR "Couldn't fork: $!\n";
+      close(ZEPHYR);
+      die;
+  }
+  if (!$pid) { # child
+      exec("/mit/sipb/bin/w3m","-dump_source",$uri) || die "Couldn't fork";
+  }
+  while (<W3M>) {
+      if (/^File\d+=(\S+)/) {
+          push(@uris, $1);
+      }
+      if (/^Title\d+=(.+)$/) {
+          push(@titles, $1);
+      }
+  }
+  close(W3M);
+  
+  # choose a random server
+  $server = int(rand scalar(@uris));
+  # print the name of the stream if available
+  print ZEPHYR "$titles[$server]\n";
+  return $uris[$server];
+}
 
 # Play an MPEG audio stream
@@ -255 +296 @@
       # redirect STDERR to STDOUT
       open STDERR, '>&STDOUT';
-      exec("/mit/infoagents/bin/mpg123", "-b16384", "-q", $up, $uri) ||
+
+      # disabling the buffer seems to improve streaming performances
+      # (files don't get cut in the middle) - perhaps mpg123 fails to
+      # wait for OS TCP buffer to be filled. -- jtwang 22 Oct 2003
+      #exec("/mit/infoagents/bin/mpg123", "-b16384", "-q", $up, $uri ||
+      #   die "Couldn't exec";
+      exec("/mit/infoagents/bin/mpg123", "-q", $up, $uri) ||
           die "Couldn't exec";
   }