RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

"One can cause a permanent hang on a seek, and the other just causes 

general jerkiness because the writer thread was holding a lock
  during the time it was writing to the network."
patch by Sidik Isani <lksi@cfht.hawaii.edu>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7450 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2002-09-20 18:26:54 +00:00
parent 10bdbae171
commit 8680f58f89
1 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libao2/ao_nas.c
View File

@ -108,6 +108,7 @@ struct ao_nas_data {
int flow_paused; int flow_paused;
void *client_buffer; void *client_buffer;
void *server_buffer;
int client_buffer_size; int client_buffer_size;
int client_buffer_used; int client_buffer_used;
int server_buffer_size; int server_buffer_size;
@ -148,16 +149,30 @@ static int nas_readBuffer(struct ao_nas_data *nas_data, int num)
if (nas_data->client_buffer_used < num) if (nas_data->client_buffer_used < num)
num = nas_data->client_buffer_used; num = nas_data->client_buffer_used;
AuWriteElement(nas_data->aud, nas_data->flow, 0, num, nas_data->client_buffer, AuFalse, &as); /*
if (as != AuSuccess) * It is not appropriate to call AuWriteElement() here because the
nas_print_error(nas_data->aud, "nas_readBuffer(): AuWriteElement", as); * buffer is locked and delays writing to the network will cause
else { * other threads to block waiting for buffer_mutex. Instead the
* data is copied to "server_buffer" and written it to the network
* outside of the locked section of code.
*
* (Note: Rather than these two buffers, a single circular buffer
* could eliminate the memcpy/memmove steps.)
*/
memcpy(nas_data->server_buffer, nas_data->client_buffer, num);
nas_data->client_buffer_used -= num; nas_data->client_buffer_used -= num;
nas_data->server_buffer_used += num; nas_data->server_buffer_used += num;
memmove(nas_data->client_buffer, nas_data->client_buffer + num, nas_data->client_buffer_used); memmove(nas_data->client_buffer, nas_data->client_buffer + num, nas_data->client_buffer_used);
}
pthread_mutex_unlock(&nas_data->buffer_mutex); pthread_mutex_unlock(&nas_data->buffer_mutex);
/*
* Now write the new buffer to the network.
*/
AuWriteElement(nas_data->aud, nas_data->flow, 0, num, nas_data->server_buffer, AuFalse, &as);
if (as != AuSuccess)
nas_print_error(nas_data->aud, "nas_readBuffer(): AuWriteElement", as);
if (nas_data->flow_paused) { if (nas_data->flow_paused) {
AuPauseFlow(nas_data->aud, nas_data->flow, &as); AuPauseFlow(nas_data->aud, nas_data->flow, &as);
if (as != AuSuccess) if (as != AuSuccess)
@ -333,6 +348,7 @@ static int init(int rate,int channels,int format,int flags)
nas_data->client_buffer_size = NAS_BUFFER_SIZE; nas_data->client_buffer_size = NAS_BUFFER_SIZE;
nas_data->client_buffer = malloc(nas_data->client_buffer_size); nas_data->client_buffer = malloc(nas_data->client_buffer_size);
nas_data->server_buffer_size = NAS_BUFFER_SIZE; nas_data->server_buffer_size = NAS_BUFFER_SIZE;
nas_data->server_buffer = malloc(nas_data->server_buffer_size);
ao_data.samplerate = rate; ao_data.samplerate = rate;
ao_data.channels = channels; ao_data.channels = channels;
@ -403,6 +419,7 @@ static void uninit(){
AuCloseServer(nas_data->aud); AuCloseServer(nas_data->aud);
nas_data->aud = 0; nas_data->aud = 0;
free(nas_data->client_buffer); free(nas_data->client_buffer);
free(nas_data->server_buffer);
} }
// stop playing and empty buffers (for seeking/pause) // stop playing and empty buffers (for seeking/pause)
@ -478,7 +495,12 @@ static int play(void* data,int len,int flags)
if (as != AuSuccess) if (as != AuSuccess)
nas_print_error(nas_data->aud, "play(): AuStartFlow", as); nas_print_error(nas_data->aud, "play(): AuStartFlow", as);
nas_data->flow_stopped = 0; nas_data->flow_stopped = 0;
while (!nas_empty_event_queue(nas_data)); // wait for first buffer underrun event /*
* Do not continue to wait if there is nothing in the server
* buffer. (The event never happens and mplayer can freeze.)
*/
while (nas_data->server_buffer_used > 0 &&
!nas_empty_event_queue(nas_data)); // wait for first buffer underrun event
} }
pthread_mutex_lock(&nas_data->buffer_mutex); pthread_mutex_lock(&nas_data->buffer_mutex);