[Asterisk-code-review] app mp3: remove 10 seconds of silence after mp3 playback (asterisk[13])

[Sam Wierema]

Sam Wierema has uploaded this change for review. ( https://gerrit.asterisk.org/9190


Change subject: app_mp3: remove 10 seconds of silence after mp3 playback
......................................................................

app_mp3: remove 10 seconds of silence after mp3 playback

This patch changes the way asterisk polls output from mpg123, instead
of waiting for 10 seconds(when playing an http url) it now uses a
timeout of one second and iterates 10 times using this same timeout.

The main difference is that for every timeout asterisk receives it now
checks if mpg123 is still running before poll again.

ASTERISK-27752

Change-Id: Ib7df8462e3e380cb328011890ad9270d9e9b4620
---
M apps/app_mp3.c
1 file changed, 25 insertions(+), 7 deletions(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/90/9190/1

diff --git a/apps/app_mp3.c b/apps/app_mp3.c
index 17f7874..c589c88 100644
--- a/apps/app_mp3.c
+++ b/apps/app_mp3.c
@@ -37,6 +37,7 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <sys/time.h>
+#include <sys/types.h>
 #include <signal.h>
 
 #include "asterisk/lock.h"
@@ -138,17 +139,34 @@
 	_exit(0);
 }
 
-static int timed_read(int fd, void *data, int datalen, int timeout)
+static int timed_read(int fd, void *data, int datalen, int timeout, int pid)
 {
 	int res;
+	int i;
 	struct pollfd fds[1];
 	fds[0].fd = fd;
 	fds[0].events = POLLIN;
-	res = ast_poll(fds, 1, timeout);
-	if (res < 1) {
-		ast_log(LOG_NOTICE, "Poll timed out/errored out with %d\n", res);
+	for (i = 0; i < timeout; i++) {
+		res = ast_poll(fds, 1, 1000);
+		if (res > 0) {
+			break;
+		} else if (res == 0) {
+			/* is mpg123 still running? */
+			kill(pid, 0);
+			if (errno == ESRCH) {
+				return -1;
+			}
+		} else {
+			ast_log(LOG_NOTICE, "error polling mpg123: %s\n", strerror(errno));
+			return -1;
+		}
+	}
+
+	if (i == timeout) {
+		ast_log(LOG_NOTICE, "Poll timed out.\n");
 		return -1;
 	}
+
 	return read(fd, data, datalen);
 
 }
@@ -160,7 +178,7 @@
 	int ms = -1;
 	int pid = -1;
 	RAII_VAR(struct ast_format *, owriteformat, NULL, ao2_cleanup);
-	int timeout = 2000;
+	int timeout = 2;
 	struct timeval next;
 	struct ast_frame *f;
 	struct myframe {
@@ -208,7 +226,7 @@
 
 	res = mp3play(data, sampling_rate, fds[1]);
 	if (!strncasecmp(data, "http://", 7)) {
-		timeout = 10000;
+		timeout = 10;
 	}
 	/* Wait 1000 ms first */
 	next = ast_tvnow();
@@ -220,7 +238,7 @@
 		for (;;) {
 			ms = ast_tvdiff_ms(next, ast_tvnow());
 			if (ms <= 0) {
-				res = timed_read(fds[0], myf.frdata, sizeof(myf.frdata), timeout);
+				res = timed_read(fds[0], myf.frdata, sizeof(myf.frdata), timeout, pid);
 				if (res > 0) {
 					myf.f.datalen = res;
 					myf.f.samples = res / 2;

-- 
To view, visit https://gerrit.asterisk.org/9190
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7df8462e3e380cb328011890ad9270d9e9b4620
Gerrit-Change-Number: 9190
Gerrit-PatchSet: 1
Gerrit-Owner: Sam Wierema <sam at messagebird.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180615/24d718bf/attachment.html>