summaryrefslogtreecommitdiffstats
path: root/stream
Commit message (Collapse)AuthorAgeFilesLines
...
| * stream_check_interrupt should sleep even if no callback is set.reimar2010-05-281-1/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31255 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 100l, stream_check_for_interrupt argument is not in usec,reimar2010-05-281-3/+3
| | | | | | | | | | | | | | 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
| * Document time scale for stream_check_interrupt argument.reimar2010-05-281-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31253 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Improve handling of cache process/thread hanging/being killed.reimar2010-05-281-3/+23
| | | | | | | | | | | | | | 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
| * Fix cache process accidentally being killed by SIGUSR1.reimar2010-05-281-0/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31250 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31244Uoti Urpala2010-05-301-6/+6
|\|
| * Fix a bunch of typos in the stream cache code.diego2010-05-271-6/+6
| | | | | | | | | | | | | | patch by Giorgio Vazzana, mywing81 gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31242 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Drop pointless _st suffix from 'struct stream'.diego2010-05-276-29/+29
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31237 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31226Uoti Urpala2010-05-302-4/+15
|\|
| * Retry reading even if we hit eof before.reimar2010-05-262-3/+6
| | | | | | | | | | | | | | 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
| * Re-enable wakeup-on-signal for cache process.reimar2010-05-261-5/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31224 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Disable waking the cache process up via a signal, itreimar2010-05-261-1/+4
| | | | | | | | | | | | | | currently causes read errors due to not handling EINTR. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31223 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streamshyc2010-05-251-1/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31218 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31211Uoti Urpala2010-05-301-45/+78
|\| | | | | | | | | The merged cache2.c changes are known to have problems. Will merge further fixes to them before merging this to the master branch.
| * Slightly reduce number of #ifsreimar2010-05-231-22/+20
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31204 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use an extra define to simplify ifdefsreimar2010-05-231-14/+20
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31203 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Try reducing the #ifdef mess for the different cache variants.reimar2010-05-231-15/+13
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31202 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Extract the cache main loop into a separate function.reimar2010-05-231-14/+19
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31201 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Optimize cache behaviour for the many-consecutive-seeks case.reimar2010-05-231-1/+13
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31199 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add code to wake up cache process when e.g. a seek is needed.reimar2010-05-231-0/+14
| | | | | | | | | | | | | | | | 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
* | cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf"Uoti Urpala2010-05-293-7/+13
| | | | | | | | | | | | | | Change 'struct vf_instance' pointer arguments to more standard style as in the subject. Also some other minor formatting fixes. Patch by Diego Biurrun.
* | stream.h: remove bad EOF check in stream_seek()Uoti Urpala2010-05-221-2/+0
| | | | | | | | Also remove a redundant stream->eof = 0 in demuxer.c.
* | Merge svn changes up to r31033Uoti Urpala2010-04-267-3/+26
|\|
| * Do not print the "Loading cookie file" message twice.reimar2010-04-051-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31024 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Try to fix VCD compilation on non-Linux systems.reimar2010-04-056-1/+26
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31023 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31020Uoti Urpala2010-04-261-0/+35
|\|
| * Export VCD tracks as chapters, just like for cue:// URLs.reimar2010-04-051-0/+35
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31019 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31004Uoti Urpala2010-04-262-3/+6
|\|
| * Remove commented-out #include of a non-existing file.diego2010-04-031-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30992 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change type to uint8_t to avoid checks depending on char signedness.reimar2010-04-021-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30983 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Sanitize ICY metadata a bit before printing it.reimar2010-03-311-0/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30980 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30967Uoti Urpala2010-04-262-2/+5
|\|
| * Make http_read_response fail if parsing the response failed.reimar2010-03-231-1/+4
| | | | | | | | | | | | | | | | 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
| * Rename get_path.[ch] --> path.[ch].diego2010-03-201-1/+1
| | | | | | | | | | | | | | 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
* | options: move -chapter values to option structUoti Urpala2010-04-255-45/+3
| | | | | | | | | | | | | | | | | | | | | | -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.
* | demux_lavf, stream_ffmpeg: support librtmp seeksUoti Urpala2010-04-231-1/+10
| |
* | stream_ffmpeg, demux_lavf: Use flv demuxer for rtmp streamsUoti Urpala2010-04-232-0/+8
| | | | | | | | | | | | | | | | | | | | 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).
* | stream_ffmpeg.c: change reads back to url_read_complete()Uoti Urpala2010-04-231-1/+1
| | | | | | | | | | | | | | | | 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.
* | Delete things related to old translation systemUoti Urpala2010-03-1034-35/+0
| | | | | | | | | | Remove the help/ subdirectory, configure code to create toplevel help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
* | Merge svn changes up to r30876Uoti Urpala2010-03-104-10/+5
|\|
| * Define O_BINARY in stream/stream.h unless it is defined yet, and use itkomh2010-03-064-10/+5
| | | | | | | | | | | | | | | | | | | | | | in other places. This removes platform specific checks and prevents repeated definitions of O_BINARY. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30850 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30848Uoti Urpala2010-03-106-324/+263
|\|
| * Define HAVE_SETMODE conditionally, and use it in stream/stream_file.c insteadkomh2010-03-041-4/+4
| | | | | | | | | | | | | | | | of platform specific predefined macros. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30829 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a VCD support for OS/2komh2010-03-032-0/+254
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30819 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Drop support for old-style DVB code.diego2010-03-023-320/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30818 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30815Uoti Urpala2010-03-103-102/+217
|\|
| * Remove unused and useless define.reimar2010-03-011-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30815 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix memleak due to strdup'd filename not being freed.reimar2010-03-011-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30814 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move functions into proper order to avoid extra declarations.reimar2010-03-011-15/+12
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30813 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Deduplicate code to set stream start_pos/end_pos.reimar2010-03-011-12/+15
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30812 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Set stream->pos correctly after seeking to a VCD title.reimar2010-03-011-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30811 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Ensure that cue_current_pos.track is not set to an invalid value afterreimar2010-03-011-8/+5
| | | | | | | | | | | | | | attempting to seek to e.g. track 0. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30810 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix off-by-one error in chapter<->VCD track conversion.reimar2010-03-011-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30809 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix cue_read_toc_entry to also reject negative track numbersreimar2010-03-011-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30808 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Implement cue:// track switching via chapter forward/backward like for audio ↵reimar2010-03-011-0/+28
| | | | | | | | | | | | CDs. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30807 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix cue_vcd_get_track_end to not change the current position.reimar2010-03-011-4/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30806 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Avoid fd_bin and fd_cue global variables.reimar2010-03-011-9/+9
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30805 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Avoid a global variable and a strcpy.reimar2010-03-011-6/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30804 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reindent.reimar2010-03-011-19/+19
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30803 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Avoid code duplication and excessively deep nesting in cue_find_binreimar2010-03-011-37/+32
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30802 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use sizeof instead of hardcoded size.reimar2010-03-011-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30801 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Extend stream_read_line to support reading lines from UTF-16 encoded filesreimar2010-02-282-6/+102
| | | | | | | | | | | | | | and use this to support reading UTF-16 encoded subtitle files in subreader.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30799 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30798Uoti Urpala2010-03-109-104/+114
|\|
| * Move stream_read_line implementation from stream.h to stream.c,reimar2010-02-282-26/+27
| | | | | | | | | | | | | | | | it is not speed critical and the function call overhead is not relevant for its overall speed anyway. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30796 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify handling of 0-termination in stream_read_linereimar2010-02-281-3/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30795 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove useless cast.reimar2010-02-281-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30794 b3059339-0415-0410-9bf9-f77b7e298cf2