[Redbutton-devel] SF.net SVN: redbutton: [94] redbutton-browser/trunk

[<ski...@us...>]

Revision: 94
Author:   skilvington
Date:     2006-06-12 04:56:41 -0700 (Mon, 12 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/redbutton/?rev=94&view=rev

Log Message:
-----------
stop audio thread if stream ends during initial buffering

Modified Paths:
--------------
    redbutton-browser/trunk/MHEGStreamPlayer.c
    redbutton-browser/trunk/MHEGStreamPlayer.h
Modified: redbutton-browser/trunk/MHEGStreamPlayer.c
===================================================================
--- redbutton-browser/trunk/MHEGStreamPlayer.c	2006-06-12 11:04:50 UTC (rev 93)
+++ redbutton-browser/trunk/MHEGStreamPlayer.c	2006-06-12 11:56:41 UTC (rev 94)
@@ -616,6 +616,10 @@
 		pthread_mutex_unlock(&p->audioq_lock);
 	}
 
+	/* do we need to bomb out early */
+	if(p->stop)
+		return NULL;
+
 	/* even if this fails, we still need to consume the audioq */
 	(void) MHEGAudioOutput_init(&ao);
 

Modified: redbutton-browser/trunk/MHEGStreamPlayer.h
===================================================================
--- redbutton-browser/trunk/MHEGStreamPlayer.h	2006-06-12 11:04:50 UTC (rev 93)
+++ redbutton-browser/trunk/MHEGStreamPlayer.h	2006-06-12 11:56:41 UTC (rev 94)
@@ -17,8 +17,7 @@
 #define INIT_VIDEO_BUFFER_WAIT	1.0
 
 /* seconds of audio to buffer before we start playing it (only used if we have no video) */
-//#define INIT_AUDIO_BUFFER_WAIT	1.0
-#define INIT_AUDIO_BUFFER_WAIT	0.5
+#define INIT_AUDIO_BUFFER_WAIT	1.0
 
 /* list of decoded video frames to be displayed */
 typedef struct


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.