summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r27399Uoti Urpala2008-08-021-1/+1
|\ | | | | | | | | | | | | | | | | | | Conflicts: libmpcodecs/vd.c libmpcodecs/ve_raw.c libvo/video_out.c libvo/x11_common.c mplayer.c
| * Change a bunch of codec-specific preprocessor directives from a HAVE_diego2008-08-021-1/+1
| | | | | | | | | | | | | | prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27395 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Start unifying names of internal preprocessor directives.diego2008-07-301-1/+1
| | | | | | | | | | | | | | | | Replace all USE_ prefixes by CONFIG_ prefixes to indicate options which are configurable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27332Uoti Urpala2008-07-211-1/+3
|\|
| * Avoid including avcodec.h in demuxer.h (and thus many other files) just to getreimar2008-07-171-6/+2
| | | | | | | | | | | | | | | | | | FF_INPUT_BUFFER_PADDING_SIZE. Instead use MP_INPUT_BUFFER_PADDING_SIZE and add a preprocessor check that it is big enough. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27314 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move duplicate FF_INPUT_BUFFER_PADDING_SIZE handling into demuxer.hreimar2008-07-161-1/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27301 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27123Uoti Urpala2008-06-231-0/+1
|\| | | | | | | | | | | | | Conflicts: libmenu/menu_filesel.c libmenu/menu_pt.c
| * Add missing #includes that are required for things used in the header.diego2008-06-171-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27095 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26979Uoti Urpala2008-06-041-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the conflicts are trivial. Conflicts: Makefile cfg-mplayer.h input/input.c libmenu/vf_menu.c libmpcodecs/dec_video.c libmpcodecs/vf_expand.c libmpcodecs/vf_vo.c libmpdemux/demux_mkv.c libmpdemux/demuxer.c libmpdemux/demuxer.h libvo/vo_directfb2.c libvo/vo_gl.c libvo/vo_winvidix.c libvo/vo_xv.c libvo/vo_xvidix.c libvo/vo_xvmc.c libvo/x11_common.c mplayer.c osdep/timer-linux.c stream/cache2.c
| * added and reused demux_flush() instead of emptying the demux_stream buffers;nicodvb2008-06-021-0/+1
| | | | | | | | | | | | | | patch by Bryan Henderson - giraffedata gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26958 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove _s/_st suffix from some struct namesUoti Urpala2008-04-251-17/+17
| | | | | | | | | | Since the names are always used after the keyword "struct" having a suffix as in "struct demuxer_st" is almost completely pointless.
* | Remove some unnecessary recursive includesUoti Urpala2008-04-231-4/+1
| | | | | | | | | | | | | | | | Remove some #include lines from headers, some of those removals made possible by using incomplete struct types instead of typedefs. Include mp_osd.h in mplayer.c and command.c after removing it from mp_core.h. Remove "#ifdef USE_ASS" around some "struct ass_track_s *" fields which will now compile even without ASS support.
* | Move correct_pts to options structUoti Urpala2008-04-231-3/+0
| |
* | Add option pointer to demuxers and stheader.h structsUoti Urpala2008-04-231-2/+5
| |
* | Declare demuxer *_streams fields with proper typesUoti Urpala2008-04-231-3/+3
|/ | | | | | | | Give sh_audio_t, sh_video_t and sh_sub_t which before had typedef names only a matching struct name (without _t) too. Change the a_streams, v_streams and s_streams demuxer fields from void * to struct sh_audio *, struct sh_video * and struct sh_sub *. Remove a now unnecessary cast from mplayer.c.
* Remove unused function demux_read_data_packuau2008-04-111-1/+0
| | | | | | | | According to VCS history this function has never been used since it was added in 2001... git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26401 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support 'default' attribute for audio and subtitle tracks.eugeni2008-03-301-0/+6
| | | | | | | | | The first default track is chosen for playback if language-based selection failes. Additionally, for audio tracks, the first one is chosen if there are no default tracks at all. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26301 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing header #includes to fix 'make checkheaders'.diego2008-03-051-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26175 b3059339-0415-0410-9bf9-f77b7e298cf2
* Demuxer-independent functions for selecting tracks based on language.eugeni2008-02-291-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26118 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fill sh_sub_t.lang in lavf, mkv and ogg demuxers. Use it for printing subtitleeugeni2008-02-291-1/+0
| | | | | | | track language. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26116 b3059339-0415-0410-9bf9-f77b7e298cf2
* New member in demuxer_t: reference_clock.nicodvb2008-02-231-0/+1
| | | | | | | | | | | | | If it's != MP_NOPTS_VALUE ds_fill_buffer() will keep on demuxing until the pts of the next_pts is <= reference_clock. It guarantees the compliance with the buffering model indicated by the transmitter of the multiplex and a long-time stability of playback (at least for me). In any case up to a maximum of 64 packets are accumulated to prevent memory hogging and leaks. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26069 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add MPLAYER_ prefix to multiple inclusion guards.diego2008-02-221-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change to always use MP_NOPTS_VALUE (instead of sometimes 0) for unknown pts.reimar2008-02-121-3/+1
| | | | | | | | I did not see anything obvious that would break, it if it does it should be fixed properly once and for all. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25988 b3059339-0415-0410-9bf9-f77b7e298cf2
* Allow demuxers to choose a default value for correct_ptsreimar2008-02-031-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25951 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use defines to give names to the different seek flags.reimar2008-01-291-0/+3
| | | | | | | | A better solution should be considered later, esp. for the many broken demuxers that do not treat these flags correctly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25911 b3059339-0415-0410-9bf9-f77b7e298cf2
* First step towards making all demuxer_desc_t constreimar2008-01-131-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25734 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add demuxer interface for attachments.eugeni2008-01-121-0/+14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25685 b3059339-0415-0410-9bf9-f77b7e298cf2
* wrapper functions to get/set angle: the wrapping is needed to RESYNC the ↵nicodvb2008-01-051-0/+6
| | | | | | demuxer; patch by oattila chello hu git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25603 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add some const/static qualifiers as appropriatereimar2007-12-241-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25523 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add demuxer functions for chapter feature.ulion2007-12-131-0/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25386 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make libnemesi use specific struct and DEMUXER_TYPElu_zero2007-12-041-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25294 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not use leading underscores in multiple inclusion guards, they are reserved.diego2007-07-021-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23709 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 demuxer.h multiple inclusion guarduau2007-06-201-2/+2
| | | | | | | | The "#ifndef __DEMUXER_H" / "#endif" pair did not cover the whole file. Move the #endif to the last line. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23591 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use 'static inline' instead of 'inline static' to avoid warningszuxy2007-06-041-8/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23461 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make realloc_struct inline as other functions defined in demuxer.hzuxy2007-06-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23451 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add lavf_preferred demuxer for lavf formats we want to be probedreimar2007-04-141-1/+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
* Another round of subtitle code cleanupreimar2007-02-051-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22155 b3059339-0415-0410-9bf9-f77b7e298cf2
* added stream_pts to demuxer_t and demux_packet_t to hold the time value ↵nicodvb2006-12-311-0/+3
| | | | | | reported by the stream layer git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21796 b3059339-0415-0410-9bf9-f77b7e298cf2
* new DEMUXER_CTRL_IDENTIFY_PROGRAM to identify programs (a+v+s)nicodvb2006-11-181-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21021 b3059339-0415-0410-9bf9-f77b7e298cf2
* added code to switch video streamnicodvb2006-11-161-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20964 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move sh_sub_t to stheader.h, where all the other sh structs are definedreimar2006-11-131-14/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20892 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make subtitle stream handling more similar to audio and video streams.reimar2006-11-131-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20888 b3059339-0415-0410-9bf9-f77b7e298cf2
* added demuxer_get_current_time() to get the current playtime (possibly aided ↵nicodvb2006-11-071-0/+1
| | | | | | by the stream layer) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20765 b3059339-0415-0410-9bf9-f77b7e298cf2
* added definition of DEMUXER_CTRL_RESYNCnicodvb2006-11-071-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20763 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add demux_nut to MPlayer repoods152006-09-171-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19867 b3059339-0415-0410-9bf9-f77b7e298cf2
* demuxer_seek_chapter() returns informations about chapters count and namenicodvb2006-08-211-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19484 b3059339-0415-0410-9bf9-f77b7e298cf2
* added first revision of demuxer_seek_chapter()nicodvb2006-08-181-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19441 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add matroska chapter seeking capability.eugeni2006-08-061-0/+12
| | | | 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
* Initial libass release (without mencoder support).eugeni2006-07-071-1/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18942 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename mkv_sh_sub_t to sh_sub_t, move it to demuxer.h.eugeni2006-07-071-0/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18939 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add a new video pts tracking mode, enabled by option -correct-pts.uau2006-07-061-1/+5
| | | | | | | | | | | | | | 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
* Fix potential integer overflows in memory allocation.rtogni2006-06-041-0/+12
| | | | | | | Patch by Rich and me git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18559 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change common pts variables from floats to doubles. Individual demuxersuau2006-04-271-4/+4
| | | | | | | 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/+1
| | | | | | | | | 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
* 3 - Move a definition of MP_NOPTS_VALUE from muxer.h to demuxer.h tortognimp2006-04-241-4/+1
| | | | | | | | | make it available in more files (needed for next patch). Patch by Uoti Urpala git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18242 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
* do not forget to initialize dp->bufferhenry2006-02-121-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17612 b3059339-0415-0410-9bf9-f77b7e298cf2
* forgotten cast (blows on gcc4)henry2006-02-121-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17600 b3059339-0415-0410-9bf9-f77b7e298cf2
* add some sanity checks to new/resize_demux_packetreimar2006-02-121-4/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17598 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/+2
| | | | | | | 3-byte pattern. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17418 b3059339-0415-0410-9bf9-f77b7e298cf2
* add a demux_peekc function that allows to just "have a look" at the nextreimar2005-09-171-0/+3
| | | | | | | byte of data from the demuxer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16505 b3059339-0415-0410-9bf9-f77b7e298cf2
* faster mpg and much faster gxf demuxingreimar2005-09-031-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16370 b3059339-0415-0410-9bf9-f77b7e298cf2
*