GithubStar/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2026-10-25 04:29:53 +08:00
Code Issues Packages Projects Releases Wiki Activity
32,133 Commits 44 Branches 89 Tags
8115fedc97871c27fb096d3365fb7a052d42dd01
Commit Graph
74 Commits
Author SHA1 Message Date
reimar 93891d0880 cache: Respect -cache-seek-min also for on-disk files 
Should reduce issues with mp4/mov (playing those may involve a lot of
seeking inside the file).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31371 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-11-02 04:07:42 +02:00
Uoti Urpala 0e0d88ede9 Merge svn changes up to r31256 2010-05-30 16:39:41 +03:00
Uoti Urpala 688c66a5d5 Merge svn changes up to r31244 2010-05-30 16:29:14 +03:00
Uoti Urpala 8ce2c41ca5 Merge svn changes up to r31226 2010-05-30 16:25:04 +03:00
Uoti Urpala 2f1a518d45 Merge svn changes up to r31211 
The merged cache2.c changes are known to have problems. Will merge
further fixes to them before merging this to the master branch.
 2010-05-30 16:14:55 +03:00
Uoti Urpala 1888e57af7 cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf" 
Change 'struct vf_instance' pointer arguments to more standard style
as in the subject. Also some other minor formatting fixes.

Patch by Diego Biurrun.
 2010-05-29 17:20:44 +03:00
reimar a564c5a6cc Fix typo in message. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31256 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-28 20:59:53 +00:00
reimar 27d41fa5b3 100l, stream_check_for_interrupt argument is not in usec, 
so we would end up sleeping for 10s instead of 10ms.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31254 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-28 18:47:03 +00:00
reimar 6f7c1ea409 Improve handling of cache process/thread hanging/being killed. 
In particular allow a single STRG+C to quit MPlayer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31251 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-28 17:26:31 +00:00
reimar 4448190ef0 Fix cache process accidentally being killed by SIGUSR1. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31250 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-28 16:57:16 +00:00
diego ae85fe1d2f Fix a bunch of typos in the stream cache code. 
patch by Giorgio Vazzana, mywing81 gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31242 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-27 22:18:10 +00:00
reimar c36de0867f Retry reading even if we hit eof before. 
This allows playing growing files even with a large cache.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31226 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-26 18:23:43 +00:00
reimar 328306708f Re-enable wakeup-on-signal for cache process. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31224 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-26 17:56:11 +00:00
reimar d304c1d56c Disable waking the cache process up via a signal, it 
currently causes read errors due to not handling EINTR.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31223 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-26 17:27:38 +00:00
reimar 8e84b9288c Slightly reduce number of #ifs 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31204 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-23 22:26:10 +00:00
reimar bc2adc2e48 Use an extra define to simplify ifdefs 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31203 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-23 22:09:40 +00:00
reimar 991b9b9e6d Try reducing the #ifdef mess for the different cache variants. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31202 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-23 22:04:01 +00:00
reimar 939df8d5a8 Extract the cache main loop into a separate function. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31201 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-23 21:58:50 +00:00
reimar 2ced41082c Optimize cache behaviour for the many-consecutive-seeks case. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31199 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-23 21:53:48 +00:00
reimar cc7a2d3287 Add code to wake up cache process when e.g. a seek is needed. 
Dramatically reduces seeking times with lavf ogg demuxer.
Needs a spearate implementation for the thread-based cache implementation.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31198 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-23 19:49:28 +00:00
Uoti Urpala 00323c06e2 Delete things related to old translation system 
Remove the help/ subdirectory, configure code to create toplevel
help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
 2010-03-10 03:47:14 +02:00
Uoti Urpala bc1d0ca37d Merge svn changes up to r30798 2010-03-10 02:35:02 +02:00
Uoti Urpala 12d3caebc7 Merge svn changes up to r30475 2010-03-09 19:18:43 +02:00
Uoti Urpala 5234c72e28 Restore collapsed whitespace in output messages 
For some reason commit e306174952, which
replaced translation macro names with the corresponding English
strings, also collapsed multiple consecutive space characters into
one. Change most of these back. In a couple of cases the amount of
whitespace is important for alignment, and for the rest it at least
keeps the strings closer to the existing translations.
 2010-03-07 21:34:54 +02:00
reimar 827df51f1d Threaded cache fixes: do not free the stream_t struct twice on windows 
and make sure the cache thread quits also for streams without a control
function (e.g. http).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30773 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-27 21:02:44 +00:00
reimar 50fed7d1f9 Restructure #ifs to be clearer, also ensures that we return from the thread 
proc instead of calling exit() on __MINGW32__.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30754 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-27 06:17:14 +00:00
reimar bdf546c7c6 Remove declarations of functions now already declared in stream.h 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30733 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-25 22:19:32 +00:00
diego 2c8f5fa622 stream: Mark functions not used outside of their files as static. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30599 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-16 16:32:38 +00:00
diego 59e26907b6 Add license header to all files missing it in the stream subdirectory. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30468 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-30 22:26:47 +00:00
Uoti Urpala e28e4a1b15 Merge svn changes up to r30419 2010-01-25 15:59:53 +02:00
reimar 570f1f5dec Always call cache_uninit to immediately free everything cache-related if we 
fail to enable the cache.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30404 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-23 12:27:13 +00:00
reimar 4e28b4bc9e Change code to allow playing a stream even if enabling the cache failed 
while still handling it when the user aborts the cache fill.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30402 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-23 12:13:28 +00:00
reimar 0e86058912 Make cache_init static, it is not used outside this file 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30401 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-23 11:51:13 +00:00
reimar 567a8d69a4 Add an exit() to silence a gcc warning and ensure forked code will never 
leave the cache-loop function.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30397 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-23 11:03:10 +00:00
reimar a2d8222f3d 100l, shouldn't write to memory after freeing it. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30396 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-23 11:00:13 +00:00
reimar 9869be806b Reindent. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30395 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-23 10:54:03 +00:00
reimar 3fae575483 Zero freed pointers. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30394 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-23 10:53:28 +00:00
reimar 7afaecc111 Check for fork failing and make sure cache_uninit always frees the cache data 
even if fork failed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30393 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-23 10:50:50 +00:00
Uoti Urpala 5995bc175a Merge svn changes up to r29962 2009-11-23 01:56:21 +02:00
reimar e02a2e7f08 Deobfuscate the special hack to disable cache for live555. 
Cache can not be used for it, since it does not provide any
data stream, the data is provided to the demuxer "behind
MPlayer's back".


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29930 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-11-17 19:23:55 +00:00
Anton Khirnov 87366694d8 Remove the internal GUI 
The GUI is badly designed and too closely coupled to the internal
details of other code. The GUI code is in bad shape and unmaintained
for years. There is no indication that anyone would maintain it in the
future either. Even if someone did volunteer to implement a better
integrated GUI having the current code in the tree probably wouldn't
help much. So get rid of it.
 2009-07-07 21:49:42 +03:00
Uoti Urpala 0eb321bf2c Remove trailing whitespace from most files 2009-07-07 02:34:35 +03:00
Amar Takhar e306174952 Translation system changes part 2: replace macros by strings 
Replace all MSGTR_ macros in the source by the corresponding English
string.
 2009-07-07 01:38:20 +03:00
Amar Takhar b5972d6f14 Translation system changes part 1: wrap translated strings 
Replace mp_msg() calls which have a translated string as the format
argument with mp_tmsg and add _() around all other translated strings.
 2009-07-07 01:28:07 +03:00
diego 6e9cbdc104 whitespace cosmetics: Remove all trailing whitespace. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-05-13 02:58:57 +00:00
Uoti Urpala e62517ef6a Merge svn changes up to r28065 2008-12-02 18:02:05 +02:00
reimar bd7e915bf5 Move PTHREAD_CACHE define logic to configure. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28048 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-28 17:04:36 +00:00
Uoti Urpala 1715c2a336 Merge svn changes up to r27949 
Conflicts:
	common.mak
	libvo/vo_xv.c
	libvo/x11_common.c
	libvo/x11_common.h
	stream/cache2.c
 2008-11-17 20:50:23 +02:00
reimar 7ecf9a6d04 100l, stream->cache_pid can not be used directly in pthread_create, 
it has the wrong type. Luckily we currently do not need the value anyway.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27930 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-15 19:43:39 +00:00
reimar ca77ee41f0 Use pthreads for the cache on Cygwin, since _beginthread is not available 
and the previous CreateThread method would probably leak memory here, too.
Also pthreads seems to be the official Cygwin threading API.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27928 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-15 19:08:50 +00:00