player: remove redundant code path for fetch/play thread

conditional wait code was redundant since a contributed change that
plays silence if nothing is in the buffer. that also broke the buffer
fill estimator reset pathway.
This commit is contained in:
James Laird
2013-04-08 20:51:01 +10:00
parent 47853a05c5
commit 9bfa48f100
2 changed files with 14 additions and 14 deletions
+11 -13
View File
@@ -88,7 +88,8 @@ static abuf_t audio_buffer[BUFFER_FRAMES];
static seq_t ab_read, ab_write;
static int ab_buffering = 1, ab_synced = 0;
static pthread_mutex_t ab_mutex = PTHREAD_MUTEX_INITIALIZER;
static pthread_cond_t ab_buffer_ready = PTHREAD_COND_INITIALIZER;
static void bf_est_reset(short fill);
static void ab_resync(void) {
int i;
@@ -221,7 +222,7 @@ void player_put_packet(seq_t seqno, uint8_t *data, int len) {
if (ab_buffering && buf_fill >= config.buffer_start_fill) {
debug(1, "buffering over. starting play\n");
ab_buffering = 0;
pthread_cond_signal(&ab_buffer_ready);
bf_est_reset(buf_fill);
}
pthread_mutex_unlock(&ab_mutex);
}
@@ -343,20 +344,17 @@ static short *buffer_get_frame(void) {
abuf_t *abuf = 0;
int i;
if (ab_buffering)
return 0;
pthread_mutex_lock(&ab_mutex);
buf_fill = seq_diff(ab_read, ab_write);
if (buf_fill < 1 || !ab_synced || ab_buffering) { // init or underrun. stop and wait
if (ab_synced)
if (buf_fill < 1 || !ab_synced) {
if (buf_fill < 1)
warn("underrun.\n");
ab_buffering = 1;
pthread_cond_wait(&ab_buffer_ready, &ab_mutex);
ab_read++;
buf_fill = seq_diff(ab_read, ab_write);
bf_est_reset(buf_fill);
pthread_mutex_unlock(&ab_mutex);
return 0;
}
if (buf_fill >= BUFFER_FRAMES) { // overrunning! uh-oh. restart at a sane distance
@@ -455,9 +453,9 @@ static void *player_thread_func(void *arg) {
#endif
while (!please_stop) {
do {
inbuf = ab_buffering ? silence : buffer_get_frame();
} while (!inbuf);
inbuf = buffer_get_frame();
if (!inbuf)
inbuf = silence;
#ifdef FANCY_RESAMPLING
if (fancy_resampling) {
+3 -1
View File
@@ -175,7 +175,9 @@ void rtp_request_resend(seq_t first, seq_t last) {
if (!running)
die("rtp_request_resend called without active stream!\n");
warn("requesting resend on %d packets\n", seq_diff(first,last) + 1);
warn("requesting resend on %d packets (%04X:%04X)\n",
seq_diff(first,last) + 1, first, last);
char req[8]; // *not* a standard RTCP NACK
req[0] = 0x80;
req[1] = 0x55|0x80; // Apple 'resend'