moonlight-stream/moonlight-ios
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-ios.git synced 2025-07-23 20:53:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Use a semaphore to prevent us from having to busy wait on the audio buffer queue"

Browse Source 
This reverts commit f3b3d2bd089508d1cf245b3447c50f981c2cd98e.
This commit is contained in:
Cameron Gutman 2014-10-20 12:56:37 -04:00
parent f14a2a66dd
commit b1938610dd
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Limelight/Connection.m
View File

@ -11,8 +11,6 @@
#import <AudioUnit/AudioUnit.h> #import <AudioUnit/AudioUnit.h>
#import <AVFoundation/AVFoundation.h> #import <AVFoundation/AVFoundation.h>
#include <dispatch/dispatch.h>
#include "Limelight.h" #include "Limelight.h"
#include "opus.h" #include "opus.h"
@ -42,7 +40,6 @@ struct AUDIO_BUFFER_QUEUE_ENTRY {
static short decodedPcmBuffer[512]; static short decodedPcmBuffer[512];
static NSLock *audioLock; static NSLock *audioLock;
static struct AUDIO_BUFFER_QUEUE_ENTRY *audioBufferQueue; static struct AUDIO_BUFFER_QUEUE_ENTRY *audioBufferQueue;
static dispatch_semaphore_t audioQueueSemaphore;
static int audioBufferQueueLength; static int audioBufferQueueLength;
static AudioComponentInstance audioUnit; static AudioComponentInstance audioUnit;
static VideoDecoderRenderer* renderer; static VideoDecoderRenderer* renderer;
@ -94,8 +91,6 @@ void ArInit(void)
opusDecoder = opus_decoder_create(48000, 2, &err); opusDecoder = opus_decoder_create(48000, 2, &err);
audioLock = [[NSLock alloc] init]; audioLock = [[NSLock alloc] init];
audioQueueSemaphore = dispatch_semaphore_create(0);
} }
void ArRelease(void) void ArRelease(void)
@ -140,15 +135,9 @@ void ArDecodeAndPlaySample(char* sampleData, int sampleLength)
// Clear all values from the buffer queue // Clear all values from the buffer queue
struct AUDIO_BUFFER_QUEUE_ENTRY *entry; struct AUDIO_BUFFER_QUEUE_ENTRY *entry;
while (audioBufferQueue != NULL) { while (audioBufferQueue != NULL) {
// Unlink the current entry
entry = audioBufferQueue; entry = audioBufferQueue;
audioBufferQueue = entry->next; audioBufferQueue = entry->next;
// Decrease the semaphore count and queue length
audioBufferQueueLength--; audioBufferQueueLength--;
dispatch_semaphore_wait(audioQueueSemaphore, DISPATCH_TIME_NOW);
// Free the entry
free(entry); free(entry);
} }
} }
@ -163,13 +152,9 @@ void ArDecodeAndPlaySample(char* sampleData, int sampleLength)
} }
lastEntry->next = newEntry; lastEntry->next = newEntry;
} }
// Increment the queue size and unlock
audioBufferQueueLength++; audioBufferQueueLength++;
[audioLock unlock];
// Signal the other thread [audioLock unlock];
dispatch_semaphore_signal(audioQueueSemaphore);
} }
} }
} }
@ -333,13 +318,10 @@ static OSStatus playbackCallback(void *inRefCon,
} }
// Wait for a buffer to be available // Wait for a buffer to be available
// FIXME: This needs optimization to avoid busy waiting for buffers
struct AUDIO_BUFFER_QUEUE_ENTRY *audioEntry = NULL; struct AUDIO_BUFFER_QUEUE_ENTRY *audioEntry = NULL;
while (audioEntry == NULL) while (audioEntry == NULL)
{ {
// Wait for an entry to be present in the queue
dispatch_semaphore_wait(audioQueueSemaphore, DISPATCH_TIME_FOREVER);
// If there's an entry there, dequeue it
[audioLock lock]; [audioLock lock];
if (audioBufferQueue != NULL) { if (audioBufferQueue != NULL) {
// Dequeue this entry temporarily // Dequeue this entry temporarily
@ -368,7 +350,6 @@ static OSStatus playbackCallback(void *inRefCon,
audioBufferQueue = audioEntry; audioBufferQueue = audioEntry;
audioBufferQueueLength++; audioBufferQueueLength++;
[audioLock unlock]; [audioLock unlock];
dispatch_semaphore_signal(audioQueueSemaphore);
} }
else { else {
// This entry is fully depleted so free it // This entry is fully depleted so free it