summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.c
Commit message (Collapse)AuthorAgeFilesLines
* demuxer.c: Remove useless codeuau2007-10-251-21/+17
| | | | | | | | Remove "while(1) { }" around two instances of code that always do "return" in the loop body. No functionality changes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24854 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix missing subtitles after seeking backuau2007-10-041-0/+1
| | | | | | | | | | | | | | Subtitle packets that had been demuxed but whose start time had not yet been reached were left in the demuxer stream after seeking. When using the default (non-libass) subtitle rendering this could block subtitles from appearing as long as the playback position stayed below the original one before seek. External subtitle files were not affected. Fixed by making seek code free all packets from the subtitle stream. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24698 b3059339-0415-0410-9bf9-f77b7e298cf2
* libnemesi support, yet another rtsp/rtp library...lu_zero2007-09-191-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24584 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: typo fix UNSUPORTED --> UNSUPPORTEDdiego2007-08-281-6/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24277 b3059339-0415-0410-9bf9-f77b7e298cf2
* When a new subtitle stream becomes available check if it is the one thatreimar2007-08-091-0/+6
| | | | | | | | | was requested by the user and set up sub->id and sub->sh accordingly. Fixes -slang and -sid with DVD subtitles (basically only 'j' during playback could make them show). This was broken by r23786. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24042 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make sure fformat is set before usereimar2007-07-271-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23885 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove some unneeded extern variable declarationsreimar2007-07-271-8/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23884 b3059339-0415-0410-9bf9-f77b7e298cf2
* make opt argument of demux_info_get const.reimar2007-06-241-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23631 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix memleak due to not freeing demuxer->s_streamsreimar2007-06-231-0/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23612 b3059339-0415-0410-9bf9-f77b7e298cf2
* More accurate seeking for demuxers lacking DEMUXER_CTRL_GET_TIME_LENGTH controlzuxy2007-06-171-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23572 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace implicit use of fast_memcpy via macro by explicit use to allowreimar2007-06-051-2/+2
| | | | | | | for future optimization. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23475 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify preprocessor directives: There is a general variable fordiego2007-04-261-2/+2
| | | | | | | static/shared FFmpeg libraries now. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23139 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics: remove duplicate space in ifdefreimar2007-04-221-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23090 b3059339-0415-0410-9bf9-f77b7e298cf2
* demuxer_desc_lavf_preferred depends on USE_LIBAVFORMAT or USE_LIBAVFORMAT_SOnicodvb2007-04-221-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23087 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add lavf_preferred demuxer for lavf formats we want to be probedreimar2007-04-141-0/+2
| | | | | | | | before our native demuxers and remove some now unneeded file-extension hacks. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22989 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add explicit location for headers from the stream/ directory.diego2007-03-151-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22623 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move the sh_audio->delay field to mpctx->delay.uau2007-03-111-1/+0
| | | | | | | | The value is related to overall a/v sync and is not used by audio demuxers or decoders. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22506 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix a few gcc warnings, approved by Diego and Reimar.rathann2007-02-051-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22160 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make ds_get_next_pts return MP_NOPTS_VALUE instead of -1 on error,reimar2007-01-051-3/+3
| | | | | | | -1 could be a perfectly valid pts. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21827 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed unused variablenicodvb2006-12-311-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21803 b3059339-0415-0410-9bf9-f77b7e298cf2
* use demuxer->stream_pts rather than stream_control(STREAM_CTRL_GET_CURRENT_TIME)nicodvb2006-12-311-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21798 b3059339-0415-0410-9bf9-f77b7e298cf2
* added stream_pts to demuxer_t and demux_packet_t to hold the time value ↵nicodvb2006-12-311-2/+4
| | | | | | reported by the stream layer git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21796 b3059339-0415-0410-9bf9-f77b7e298cf2
* don't compile demux_mpc.c when libmpcdec is disabledaurel2006-12-281-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21783 b3059339-0415-0410-9bf9-f77b7e298cf2
* added code to switch video streamnicodvb2006-11-161-0/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20964 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make subtitle stream handling more similar to audio and video streams.reimar2006-11-131-0/+17
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20888 b3059339-0415-0410-9bf9-f77b7e298cf2
* consistency fix: STREAM_CTRL_GET_TIME_LENGTH and ↵nicodvb2006-11-121-5/+5
| | | | | | STREAM_CTRL_GET_CURRENT_TIME now return time in (double) seconds git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20867 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed duplicated check in demuxer_seek_chapternicodvb2006-11-111-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20857 b3059339-0415-0410-9bf9-f77b7e298cf2
* in demux_seek() if STREAM_CTRL_SEEK_TO_CHAPTER suceeds call ↵nicodvb2006-11-111-0/+2
| | | | | | DEMUXER_CTRL_RESYNC to notify the demuxer of the change git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20855 b3059339-0415-0410-9bf9-f77b7e298cf2
* added demuxer_get_current_time() to get the current playtime (possibly aided ↵nicodvb2006-11-071-0/+17
| | | | | | by the stream layer) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20765 b3059339-0415-0410-9bf9-f77b7e298cf2
* now demux_seek() tries to seek aided by the stream layer, if possiblenicodvb2006-11-071-0/+23
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20764 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics: indentation fix indentation broken by last two demuxer.c commitsreimar2006-10-201-25/+25
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20325 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix opening of demuxers without check_file function, broken by r20309.reimar2006-10-201-3/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20324 b3059339-0415-0410-9bf9-f77b7e298cf2
* Try other demuxers if open() fails.reimar2006-10-191-22/+18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20309 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify: replace malloc + memset 0 by callocreimar2006-10-051-4/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20078 b3059339-0415-0410-9bf9-f77b7e298cf2
* conditional declerations are unnecessaryods152006-09-171-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19868 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add demux_nut to MPlayer repoods152006-09-171-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19867 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of demux_aid_vid_mismatch mess.reimar2006-08-261-12/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19546 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l: *chapter_name was copied from the pointer rather than strupd()-ed (and ↵nicodvb2006-08-211-2/+5
| | | | | | next free()d in mplayer.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19485 b3059339-0415-0410-9bf9-f77b7e298cf2
* demuxer_seek_chapter() returns informations about chapters count and namenicodvb2006-08-211-1/+24
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19484 b3059339-0415-0410-9bf9-f77b7e298cf2
* clarification in a commentnicodvb2006-08-181-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19445 b3059339-0415-0410-9bf9-f77b7e298cf2
* support relative seeking in the stream-driven casenicodvb2006-08-181-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19444 b3059339-0415-0410-9bf9-f77b7e298cf2
* added first revision of demuxer_seek_chapter()nicodvb2006-08-181-0/+66
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19441 b3059339-0415-0410-9bf9-f77b7e298cf2
* Update information and print new value when demux_info_add is calledreimar2006-08-161-1/+3
| | | | | | | | twice for the same tag. Should show currently playing title with Ogg streams. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19419 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add matroska chapter seeking capability.eugeni2006-08-061-0/+20
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19348 b3059339-0415-0410-9bf9-f77b7e298cf2
* marks several string parameters as const, as they are not modified inside ↵reynaldo2006-07-131-1/+1
| | | | | | the function, Patch by Stefan Huehner, stefan AT huehner-org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19058 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add a new video pts tracking mode, enabled by option -correct-pts.uau2006-07-061-4/+7
| | | | | | | | | | | | | | This mode has the following differences: - Video timing is correct for streams with B frames, at least with some demuxers. - Video filters can modify frame timestamps and insert new frames, and removing frames is handled better than before. - Some things are known to break, it's not usable as the default yet. Things should work as before when the -correct-pts option is not used. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18922 b3059339-0415-0410-9bf9-f77b7e298cf2
* move some ill-behaving demuxers further down the listreimar2006-07-041-6/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18905 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change free_sh_audio() to take demuxer and stream id as parametersuau2006-06-141-4/+4
| | | | | | | | | | | | | | (same as new_sh_audio()) instead of sh_audio_t *, use those to remove the pointer from demuxer->a_streams[] before freeing it. Some demuxers use free_sh_audio() to undo the creation of an already-allocated audio stream in case of error. These uses were unsafe since free_sh_audio() freed the data structure but left the pointer in demuxer->a_streams[], leading to double free later in free_demuxer() (and perhaps use of the freed stream before that, I didn't check). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18711 b3059339-0415-0410-9bf9-f77b7e298cf2
* Unconditionally compile the Matroska demuxer.diego2006-05-081-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18405 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change common pts variables from floats to doubles. Individual demuxersuau2006-04-271-2/+3
| | | | | | | should be changed later. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18310 b3059339-0415-0410-9bf9-f77b7e298cf2
* 4 - Implement a better way to calculate current audio pts and use it forrtognimp2006-04-241-0/+21
| | | | | | | | | audio decoded with ad_libvorbis, ad_ffmpeg and ad_faad. Patch by Uoti Urpala git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18243 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get ride of the several if(identify) messy lines and rearangment of some of ↵reynaldo2006-04-241-12/+8
| | | | | | the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18238 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixes decoding demoscene.tv nsv at http://213.186.36.129:8000gpoirier2006-04-171-1/+1
| | | | | | | Fix suggested by Reimar, patch by RC. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18129 b3059339-0415-0410-9bf9-f77b7e298cf2
* Convert all if(verbose>X) to mp_msg_test calls.diego2006-03-241-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17933 b3059339-0415-0410-9bf9-f77b7e298cf2
* Second-try commit of this patch.corey2006-02-171-2/+2
| | | | | | | | | | | | 1. Include audio_delay as an argument to demux_seek. 2. Modify demux_seek_avi to adjust the audio/video stream positions so that mplayer/mencoder will instantly be in sync even when -delay is specified. I've quadruple checked this time; hopefully I haven't missed anything. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17637 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reverse commit of unfinished patch for passing audio_delay to the demuxers.corey2006-02-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17570 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1. Include audio_delay as an argument to demux_seek.corey2006-02-071-1/+1
| | | | | | | | | | | 2. Modify demux_seek_avi to adjust the audio/video stream positions so that mplayer/mencoder will instantly be in sync even when -delay is specified. Other demuxers could be modified similarly in the future. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17554 b3059339-0415-0410-9bf9-f77b7e298cf2
* function to read from a demuxer up to (and including) the specifiedreimar2006-01-171-0/+35
| | | | | | | 3-byte pattern. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17418 b3059339-0415-0410-9bf9-f77b7e298cf2
* massive attack: mp_msg printf format fixesrathann2006-01-121-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17367 b3059339-0415-0410-9bf9-f77b7e298cf2
* added support for external libavformatnicodvb2006-01-091-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17355 b3059339-0415-0410-9bf9-f77b7e298cf2
* include fastmemcpy.h before stream.h, so it is used for the stream_readreimar2005-12-171-1/+2
| | | | | | | function, too. Gives a small speedup for e.g. high bandwidth MPEG2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17201 b3059339-0415-0410-9bf9-f77b7e298cf2
* Unify include path handling, -I.. is in CFLAGS.diego2005-11-181-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17013 b3059339-0415-0410-9bf9-f77b7e298cf2
* estimate total time also for audio-only files.reimar2005-11-061-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16926 b3059339-0415-0410-9bf9-f77b7e298cf2
* move resync_audio_stream after seeking to demuxer.creimar2005-10-301-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16878 b3059339-0415-0410-9bf9-f77b7e298cf2
* "LIVE.COM Streaming Media" is now called "LIVE555 Streaming Media".rsf2005-09-231-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16573 b3059339-0415-0410-9bf9-f77b7e298cf2
* Prints -identify output for:gpoirier2005-09-191-0/+2
| | | | | | | | | | - video codec of the current file; - signal numbers; - demuxer help header. Patch by kiriuja <mplayer DATH patches AH en DATH directo POIS net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16523 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make the fourcc output endianness-independent.diego2005-09-131-2/+4
| | | | | | | patch by Luca Barbato < lu_zero -- at -- gentoo -- at -- org > git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16478 b3059339-0415-0410-9bf9-f77b7e298cf2
* execute the check function even when a demuxer is forced, to avoid crashes.reimar2005-09-061-2/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16414 b3059339-0415-0410-9bf9-f77b7e298cf2
* Forgotten mpc demuxerreimar2005-09-061-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16413 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make -identify's 'ID_LENGTH=' print a float and not an integer.. Theods152005-09-021-3/+3
| | | | | | | | accuracey may be totally fake for some demuxers (mpg), but accurate for others.. (avi) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16347 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix move playlists (control must be returned to mplayer.c, with the demuxerreimar2005-08-311-0/+4
| | | | | | | returning the real URL as a packet). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16327 b3059339-0415-0410-9bf9-f77b7e298cf2
* Allow forcing of demuxers and codecs by prepending '+'reimar2005-08-301-13/+32
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16322 b3059339-0415-0410-9bf9-f77b7e298cf2
* support MPEG in GXF container with extension-based detection.reimar2005-08-261-0/+2
| | | |