0e0d88ede9
Merge svn changes up to r31256
2010-05-30 16:39:41 +03:00
688c66a5d5
Merge svn changes up to r31244
2010-05-30 16:29:14 +03:00
8ce2c41ca5
Merge svn changes up to r31226
2010-05-30 16:25:04 +03:00
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
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
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
6b255e5083
stream_check_interrupt should sleep even if no callback is set.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31255 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-28 18:49:02 +00:00
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
16e3978e1e
Document time scale for stream_check_interrupt argument.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31253 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-28 18:45:25 +00:00
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
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
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
5e71e43bb5
Drop pointless _st suffix from 'struct stream'.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31237 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 20:38:25 +00:00
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
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
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
3c1cedaa56
Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31218 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-25 23:07:28 +00:00
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
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
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
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
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
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
de5566f0b5
stream.h: remove bad EOF check in stream_seek()
...
Also remove a redundant stream->eof = 0 in demuxer.c.
2010-05-22 06:40:34 +03:00
7795726e0f
Merge svn changes up to r31033
2010-04-26 18:25:34 +03:00
837c48ddee
Merge svn changes up to r31020
2010-04-26 18:06:00 +03:00
e913d6c5da
Merge svn changes up to r31004
2010-04-26 17:55:05 +03:00
4785c2617e
Merge svn changes up to r30967
2010-04-26 17:42:20 +03:00
a2133d7684
options: move -chapter values to option struct
...
-chapter can optionally take a range with a start and an end. Add a
new option type which supports such values and use that instead of a
custom per-option function.
This commit also fixes a build configuration bug: before the
availability of the -chapter option depended on DVD functionality
being enabled in the binary, even though the option works with other
sources too.
2010-04-25 22:48:10 +03:00
7be5f14c3a
demux_lavf, stream_ffmpeg: support librtmp seeks
2010-04-23 23:50:34 +03:00
1d4d1bff82
stream_ffmpeg, demux_lavf: Use flv demuxer for rtmp streams
...
Use lavf's flv demuxer for rtmp/rtmps/... stream types. Letting
generic format probing handle this could work, but with the current
probing implementation it'd at least depend on not-really-guaranteed
details of the stream layer (probing different formats and then
decoding depends on seeking back in between; rtmp streams don't
support such seeking directly so would need to rely on details of
caching behavior).
2010-04-23 22:57:25 +03:00
eb48fefe94
stream_ffmpeg.c: change reads back to url_read_complete()
...
Change reading data from FFmpeg from url_read() back to
url_read_complete(). url_read_complete() behavior has changed in
FFmpeg and no longer returns an error for partial reads at EOF so it's
usable now. Using it is probably not significantly better than
url_read(), but at least it handles EAGAIN.
2010-04-23 21:19:50 +03:00
7e8bfbef4b
Do not print the "Loading cookie file" message twice.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31024 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-05 19:35:35 +00:00
d62bef6ee5
Try to fix VCD compilation on non-Linux systems.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31023 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-05 19:31:55 +00:00
9521c190c3
Export VCD tracks as chapters, just like for cue:// URLs.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31019 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-05 16:40:04 +00:00
c7cdd996f5
Remove commented-out #include of a non-existing file.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30992 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-03 14:40:08 +00:00
fd6ce85192
Change type to uint8_t to avoid checks depending on char signedness.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30983 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-02 07:14:21 +00:00
006c481c1e
Sanitize ICY metadata a bit before printing it.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30980 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-31 19:42:15 +00:00
f76e141402
Make http_read_response fail if parsing the response failed.
...
Avoids possible crashes since other code assumes http_hdr->protocol
is a valid string if it succeeds.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30951 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-23 19:45:33 +00:00
70c66c0476
Rename get_path.[ch] --> path.[ch].
...
These files now contain different functions related to path handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30943 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-20 23:38:27 +00:00
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
0269d22d32
Merge svn changes up to r30876
2010-03-10 03:18:42 +02:00
240550bbb9
Merge svn changes up to r30848
2010-03-10 03:00:14 +02:00
4857965118
Merge svn changes up to r30815
2010-03-10 02:36:35 +02:00
bc1d0ca37d
Merge svn changes up to r30798
2010-03-10 02:35:02 +02:00
e74708f619
Merge svn changes up to r30748
2010-03-10 01:50:55 +02:00
acdce0176a
Merge svn changes up to r30732
2010-03-10 01:25:15 +02:00
194efde18f
Merge svn changes up to r30702
2010-03-10 01:08:50 +02:00
0dce155dd3
Merge svn changes up to r30694
2010-03-10 01:01:15 +02:00
327463be52
Merge svn changes up to r30672
2010-03-10 00:34:16 +02:00
Uoti Urpala
reimar
diego
hyc