summaryrefslogtreecommitdiffstats
path: root/stream
Commit message (Collapse)AuthorAgeFilesLines
* stream/tv: move free_handle() from header to tv.cdiego2010-11-026-18/+20
| | | | | | | Move TV input free_handle static function to tv.c and make it non-static. There is no need to duplicate the function in the binary. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32174 b3059339-0415-0410-9bf9-f77b7e298cf2
* cache: Remove unused cache_stats functiondiego2010-11-021-10/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32121 b3059339-0415-0410-9bf9-f77b7e298cf2
* cache: Move cache_fill_status extern declaration to cache2.hdiego2010-11-021-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32120 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream/http.c: Move mime_type_table extern declaration to network.hdiego2010-11-022-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32108 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream: make stream_read_line() terminate line on EOFreimar2010-11-021-1/+1
| | | | | | | Make sure we return an "empty" line on eof, to make sure we get no buffer overflows in case some code fails to check the return value. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31999 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_file: Simplify and document MinGW stdin hackreimar2010-11-021-3/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31964 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_dvd[nav]: Add const qualifiers to string argumentsreimar2010-11-024-8/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31957 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify code: make open_stream() accept NULL file_format argumentreimar2010-11-021-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31952 b3059339-0415-0410-9bf9-f77b7e298cf2
* printf format fixes ("%d" -> "%zd")diego2010-11-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Add 'z' length modifier to %d printf format specifier for size_t argument. stream/http.c:675: warning: format '%d' expects type 'int', but argument 4 has type 'size_t' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31933 b3059339-0415-0410-9bf9-f77b7e298cf2 Add 'z' length modifier to %d printf format specifiers for size_t arguments. libmpdemux/demux_avi.c:553: warning: format '%u' expects type 'unsigned int', but argument 5 has type 'size_t' libmpdemux/demux_avi.c:553: warning: format '%u' expects type 'unsigned int', but argument 7 has type 'size_t' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31935 b3059339-0415-0410-9bf9-f77b7e298cf2 Add 'z' length modifier to %d printf format specifiers for size_t arguments. libmpdemux/demux_lmlm4.c:75: warning: format '%d' expects type 'int', but argument 5 has type 'ssize_t' libmpdemux/demux_lmlm4.c:163: warning: format '%d' expects type 'int', but argument 6 has type 'ssize_t' libmpdemux/demux_lmlm4.c:163: warning: format '%d' expects type 'int', but argument 7 has type 'ssize_t' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31937 b3059339-0415-0410-9bf9-f77b7e298cf2 Add 'z' length modifier to %d printf format specifier for size_t argument. stream/asf_streaming.c:676: warning: format '%d' expects type 'int', but argument 5 has type 'size_t' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31938 b3059339-0415-0410-9bf9-f77b7e298cf2
* cache: add sanity-check for sector sizereimar2010-11-022-2/+9
| | | | | | | Add sanity-check for sector size to avoid strange crashes if it is too large. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31914 b3059339-0415-0410-9bf9-f77b7e298cf2
* spelling fixessiretart2010-11-025-9/+9
| | | | | | | | | | Found by the Debian QA tool 'lintian' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31913 b3059339-0415-0410-9bf9-f77b7e298cf2 reintroduce typo in genres.h that was fixed fixed r31913 to match the id3v2 spec git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31920 b3059339-0415-0410-9bf9-f77b7e298cf2
* cache: Don't mess up current position if time-based seek failsreimar2010-11-021-1/+2
| | | | | | | | Avoid STREAM_CTRL_SEEK_TO_TIME messing up the current position for stream types which do not support it. Fixes seeking in local flv files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31907 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_dvd: Improve seeking by positiondiego2010-11-021-15/+8
| | | | | | | | | The current code takes the angle into account. This is a mistake since the position is independent of the angle. patch by Olivier Rolland, billl users.sourceforge net git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31895 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_dvd: Improve seeking by chaptersdiego2010-11-021-5/+12
| | | | | | | | | | | The current code seeks to the start of the chapter. From this position, it then tries to figure out the starting cell. This is completely suboptimal and error prone since the starting cell can be directly deduced from the chapter. patch by Olivier Rolland, billl users.sourceforge net git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31894 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_dvd: fix incorrect assumption about chapter countdiego2010-11-021-10/+38
| | | | | | | | | Fix the incorrect assumption that the number of chapters of a DVD title is equal to the number of cells. patch by Olivier Rolland, billl users.sourceforge net git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31893 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_dvb.c: avoid compiler warning by adding initializationdiego2010-11-021-0/+1
| | | | | | | | Initialize conf_file variable to kill the warning: stream/stream_dvb.c:755: warning: 'conf_file' may be used uninitialized in this function Blessed and suggested by Nico Sabbi. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31877 b3059339-0415-0410-9bf9-f77b7e298cf2
* configure: Rename "network" variable and option to "networking"diego2010-11-022-6/+6
| | | | | | This avoids conflicts with the FFmpeg variable of the same name. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31749 b3059339-0415-0410-9bf9-f77b7e298cf2
* cache: Use sigaction() instead of signal()reimar2010-11-021-3/+6
| | | | | | | | | | | Signal() has an unavoidable race-condition on "broken by backwards-compatibility" systems like Solaris. (Upon receiving a signal, the handler is reset to SIG_DFL, thus a second signal will kill the process. The problem could also be reduced by re-installing the handler inside the handler, but there's still a race-condition and the risk of the handler being called inside the handler). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31738 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream.c: add <libavutil/common.h> include needed for GET_UTF16reimar2010-11-021-0/+2
| | | | | | Patch by Erik Auerswald {auerswal unix-ag.uni-kl.de} git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31658 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_bluray: implement slave mode compatible controlsben2010-11-021-6/+119
| | | | | | Added stream controls: get/set for chapters and angles. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31640 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_bluray: add unencrypted Blu-ray playbackben2010-11-023-0/+244
| | | | | | | Support for unencrypted Blu-ray playback through libbluray. Use it through: mplayer br:////path/to/disc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31631 b3059339-0415-0410-9bf9-f77b7e298cf2
* Factorize MPlayer/MEncoder version string handling.diego2010-11-022-10/+6
| | | | | | | The string now resides in a central object file instead of being duplicated in every file that requires a version string. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31577 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream: Use MSG_NOSIGNAL flag if available for send().reimar2010-11-027-8/+15
| | | | | | | | This avoids MPlayer quitting due to SIGPIPE at least for these cases. Ignoring SIGPIPE in general would break window-closing with some window-managers. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31566 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream/dvbin.h: Use angular brackets for system #includes.diego2010-11-021-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31516 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_cddb: move structs to the file they're used indiego2010-11-022-18/+18
| | | | | | Move cddb_data_t and cd_toc_t structs to the only place they are used. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31514 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_cdda: change printf format for cdda_tracks to %ddiego2010-11-021-1/+1
| | | | | | | Adjust printf length modifier, fixes the warning: stream/stream_cdda.c:358: warning: format '%ld' expects type 'long int', but argument 4 has type 'int' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31512 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_cdda.c: Reorder functions to avoid forward declarations.diego2010-11-021-110/+106
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31511 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_cdd*: Move declarations for stream_cddb.c functions to cdd.hdiego2010-11-022-4/+4
| | | | | | This fixes a bunch of warnings about missing function prototypes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31509 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_cddb: Remove unused static functionsdiego2010-11-021-31/+0
| | | | | | | | | | | Remove unused static function cddb_get_freedb_sites(), fixes the warning: stream/stream_cddb.c:747: warning: 'cddb_get_freedb_sites' defined but not used git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31508 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove unused static function cddb_freedb_sites_parse(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31510 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_ccda: Move cdda_priv structure to the only place it is useddiego2010-11-022-23/+21
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31506 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream/tcp.c: Prefer the use of inet_ntop over inet_ntoaattila2010-11-021-3/+3
| | | | | | | inet_ntop is ipv6 safe. This fixes bug #1491. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31498 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream.h: support backswards stream_skip() within bufferreimar2010-11-021-1/+1
| | | | | | | Never just ignore a backwards skip, even if the stream is not seekable it might still be in a buffer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31465 b3059339-0415-0410-9bf9-f77b7e298cf2
* tv.h: Change function pointer types to proper declarationsreimar2010-11-026-13/+16
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31388 b3059339-0415-0410-9bf9-f77b7e298cf2 Note that the code is still questionable after this commit - the shared data structure has pointers to "struct priv", but different files use different incompatible definitions for that struct.
* cache: Respect -cache-seek-min also for on-disk filesreimar2010-11-021-3/+5
| | | | | | | 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
* Merge svn changes up to r31291Uoti Urpala2010-06-021-0/+18
|\
| * Add a referrer option to set the HTTP Referer field.reimar2010-05-301-0/+18
| | | | | | | | | | | | | | Patch by chocolateboy [chocolate cpan org] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31288 b3059339-0415-0410-9bf9-f77b7e298cf2
| * misc cosmetics: K&R style nits, #include placement, indentationdiego2010-05-291-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31263 b3059339-0415-0410-9bf9-f77b7e298cf2
* | stream_radio.c: fix corrupt line from e3061749Uoti Urpala2010-06-021-1/+1
| |
* | Merge svn changes up to r31256Uoti Urpala2010-05-303-6/+38
|\|
| * Fix typo in message.reimar2010-05-281-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31256 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 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.reimar