Improve app_mp3
[asterisk/asterisk.git] / apps / app_mp3.c
index 0013fe8..b2bddb7 100755 (executable)
@@ -11,6 +11,7 @@
  * the GNU General Public License
  */
  
+#include <asterisk/lock.h>
 #include <asterisk/file.h>
 #include <asterisk/logger.h>
 #include <asterisk/channel.h>
@@ -37,8 +38,8 @@ static char *synopsis = "Play an MP3 file or stream";
 
 static char *descrip = 
 "  MP3Player(location) Executes mpg123 to play the given location\n"
-"  which typically would be a filename or a URL.  Returns -1 on\n"
-"  hangup or 0 otherwise.  User can exit by pressing any key\n.";
+"which typically would be a  filename  or  a URL. Returns  -1  on\n"
+"hangup or 0 otherwise. User can exit by pressing any key\n.";
 
 STANDARD_LOCAL_USER;
 
@@ -47,12 +48,17 @@ LOCAL_USER_DECL;
 static int mp3play(char *filename, int fd)
 {
        int res;
+       int x;
        res = fork();
        if (res < 0) 
                ast_log(LOG_WARNING, "Fork failed\n");
        if (res)
                return res;
        dup2(fd, STDOUT_FILENO);
+       for (x=0;x<256;x++) {
+               if (x != STDOUT_FILENO)
+                       close(x);
+       }
        /* Execute mpg123, but buffer if it's a net connection */
        if (strncmp(filename, "http://", 7)) 
            execl(MPG_123, MPG_123, "-q", "-s", "-b", "1024", "--mono", "-r", "8000", filename, NULL);
@@ -67,20 +73,15 @@ static int mp3_exec(struct ast_channel *chan, void *data)
        int res=0;
        struct localuser *u;
        int fds[2];
-       int rfds[1 + AST_MAX_FDS];
        int ms = -1;
-       int pid;
-       int us;
-       int exception;
+       int pid = -1;
        int owriteformat;
-       struct timeval tv;
        struct timeval last;
        struct ast_frame *f;
-       int x;
        struct myframe {
                struct ast_frame f;
                char offset[AST_FRIENDLY_OFFSET];
-               char frdata[160];
+               short frdata[160];
        } myf;
        last.tv_usec = 0;
        last.tv_sec = 0;
@@ -103,29 +104,20 @@ static int mp3_exec(struct ast_channel *chan, void *data)
        }
        
        res = mp3play((char *)data, fds[1]);
+       /* Wait 1000 ms first */
+       ms = 1000;
        if (res >= 0) {
                pid = res;
                /* Order is important -- there's almost always going to be mp3...  we want to prioritize the
                   user */
-               for (x=0;x<AST_MAX_FDS;x++) 
-                       rfds[x] = chan->fds[x];
-               rfds[x] = fds[0];
                for (;;) {
-                       CHECK_BLOCKING(chan);
-                       res = ast_waitfor_n_fd(rfds, AST_MAX_FDS+1, &ms, &exception);
-                       chan->blocking = 0;
-                       if (res < 1) {
+                       ms = ast_waitfor(chan, ms);
+                       if (ms < 0) {
                                ast_log(LOG_DEBUG, "Hangup detected\n");
                                res = -1;
                                break;
                        }
-                       for(x=0;x<AST_MAX_FDS;x++) 
-                               if (res == chan->fds[x])
-                                       break;
-
-                       if (x < AST_MAX_FDS) {
-                               if (exception)
-                                       chan->exception = 1;
+                       if (ms) {
                                f = ast_read(chan);
                                if (!f) {
                                        ast_log(LOG_DEBUG, "Null frame == hangup() detected\n");
@@ -139,26 +131,13 @@ static int mp3_exec(struct ast_channel *chan, void *data)
                                        break;
                                }
                                ast_frfree(f);
-                       } else if (res == fds[0]) {
-                               gettimeofday(&tv, NULL);
-                               if (last.tv_sec || last.tv_usec) {
-                                       /* We should wait at least a frame length */
-                                       us = sizeof(myf.frdata) / 16 * 1000;
-                                       /* Subtract 1,000,000 us for each second late we've passed */
-                                       us -= (tv.tv_sec - last.tv_sec) * 1000000;
-                                       /* And one for each us late we've passed */
-                                       us -= (tv.tv_usec - last.tv_usec);
-                                       /* Sleep that long if needed */
-                                       if (us > 0)
-                                               usleep(us);
-                               }
-                               last = tv;
+                       } else  {
                                res = read(fds[0], myf.frdata, sizeof(myf.frdata));
                                if (res > 0) {
                                        myf.f.frametype = AST_FRAME_VOICE;
                                        myf.f.subclass = AST_FORMAT_SLINEAR;
                                        myf.f.datalen = res;
-                                       myf.f.timelen = res / 16;
+                                       myf.f.samples = res / 2;
                                        myf.f.mallocd = 0;
                                        myf.f.offset = AST_FRIENDLY_OFFSET;
                                        myf.f.src = __PRETTY_FUNCTION__;
@@ -170,19 +149,18 @@ static int mp3_exec(struct ast_channel *chan, void *data)
                                } else {
                                        ast_log(LOG_DEBUG, "No more mp3\n");
                                        res = 0;
+                                       break;
                                }
-                       } else {
-                               ast_log(LOG_DEBUG, "HuhHHH?\n");
-                               res = -1;
-                               break;
+                               ms = res / 16;
                        }
                }
-               kill(pid, SIGTERM);
        }
        close(fds[0]);
        close(fds[1]);
        LOCAL_USER_REMOVE(u);
-       if (!res)
+       if (pid > -1)
+               kill(pid, SIGKILL);
+       if (!res && owriteformat)
                ast_set_write_format(chan, owriteformat);
        return res;
 }