RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-11 04:01:31 +00:00
Code Issues Releases Wiki Activity

Always call cache_uninit to immediately free everything cache-related if we

Browse Source 
fail to enable the cache.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30404 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2010-01-23 12:27:13 +00:00
parent 73dea88956
commit 570f1f5dec
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
stream/cache2.c
View File

@ -318,6 +318,7 @@ static void exit_sighandler(int x){
*/ */
int stream_enable_cache(stream_t *stream,int size,int min,int seek_limit){ int stream_enable_cache(stream_t *stream,int size,int min,int seek_limit){
int ss = stream->sector_size ? stream->sector_size : STREAM_BUFFER_SIZE; int ss = stream->sector_size ? stream->sector_size : STREAM_BUFFER_SIZE;
int res = -1;
cache_vars_t* s; cache_vars_t* s;
if (stream->flags & STREAM_NON_CACHEABLE) { if (stream->flags & STREAM_NON_CACHEABLE) {
@ -365,7 +366,7 @@ int stream_enable_cache(stream_t *stream,int size,int min,int seek_limit){
if (!stream->cache_pid) { if (!stream->cache_pid) {
mp_msg(MSGT_CACHE, MSGL_ERR, mp_msg(MSGT_CACHE, MSGL_ERR,
"Starting cache process/thread failed: %s.\n", strerror(errno)); "Starting cache process/thread failed: %s.\n", strerror(errno));
return -1; goto err_out;
} }
// wait until cache is filled at least prefill_init % // wait until cache is filled at least prefill_init %
mp_msg(MSGT_CACHE,MSGL_V,"CACHE_PRE_INIT: %"PRId64" [%"PRId64"] %"PRId64" pre:%d eof:%d \n", mp_msg(MSGT_CACHE,MSGL_V,"CACHE_PRE_INIT: %"PRId64" [%"PRId64"] %"PRId64" pre:%d eof:%d \n",
@ -376,11 +377,17 @@ int stream_enable_cache(stream_t *stream,int size,int min,int seek_limit){
(int64_t)s->max_filepos-s->read_filepos (int64_t)s->max_filepos-s->read_filepos
); );
if(s->eof) break; // file is smaller than prefill size if(s->eof) break; // file is smaller than prefill size
if(stream_check_interrupt(PREFILL_SLEEP_TIME)) if(stream_check_interrupt(PREFILL_SLEEP_TIME)) {
return 0; res = 0;
goto err_out;
}
} }
mp_msg(MSGT_CACHE,MSGL_STATUS,"\n"); mp_msg(MSGT_CACHE,MSGL_STATUS,"\n");
return 1; // parent exits return 1; // parent exits
err_out:
cache_uninit(stream);
return res;
} }
#if defined(__MINGW32__) || defined(PTHREAD_CACHE) || defined(__OS2__) #if defined(__MINGW32__) || defined(PTHREAD_CACHE) || defined(__OS2__)