summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mpg.c
Commit message (Collapse)AuthorAgeFilesLines
* Remove trailing whitespace from most filesUoti Urpala2009-07-071-6/+6
|
* Merge svn changes up to r29304Uoti Urpala2009-07-071-1/+20
|\
| * Add standard license header to all files in libmpdemux.diego2009-05-081-1/+20
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29280 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Translation system changes part 2: replace macros by stringsAmar Takhar2009-07-071-4/+4
| | | | | | | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* | Translation system changes part 1: wrap translated stringsAmar Takhar2009-07-071-4/+4
| | | | | | | | | | Replace mp_msg() calls which have a translated string as the format argument with mp_tmsg and add _() around all other translated strings.
* | Merge svn changes up to r28087Uoti Urpala2008-12-041-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: command.c libao2/ao_ivtv.c libao2/ao_v4l2.c libmpcodecs/dec_video.h libvo/aspect.h libvo/sub.c libvo/sub.h libvo/vo_directx.c libvo/vo_macosx.m libvo/vo_quartz.c mp_core.h mplayer.c mplayer.h osdep/getch2.h osdep/timer.h
| * Get rid of pointless 'extern' keywords.diego2008-12-031-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Make various functions staticUoti Urpala2008-08-121-3/+3
|/
* use demux_flush() where appropriatenicodvb2008-06-021-6/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26959 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use defines to give names to the different seek flags.reimar2008-01-291-4/+4
| | | | | | | | 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
* in the crazy ES probing code return DEMUXER_TYPE_MPEG_ES (mpeg12v) only if ↵nicodvb2008-01-261-1/+4
| | | | | | we have at least a couple of SEQ/GOP startcodes git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25866 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make all demuxer_desc_t const, thus moving them to .rodatareimar2008-01-131-6/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25735 b3059339-0415-0410-9bf9-f77b7e298cf2
* reindentednicodvb2007-11-051-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24974 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l, setting a non-existent timestamp (default 0.0) when the pts flag isn't ↵nicodvb2007-11-051-0/+1
| | | | | | | | | set in the PES header is just wrong; leave the default MP_NOPTS_VALUE instead git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24973 b3059339-0415-0410-9bf9-f77b7e298cf2
* in update_stats() removed a wrong 'else' that would prevent h264 headers to ↵nicodvb2007-10-041-1/+1
| | | | | | | | | | be recognized: all 0x12x headers were accounted for only in num_elementary_packets12x. Fixes detection of certain H264 in ES/PS streams git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24701 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: typo fix UNSUPORTED --> UNSUPPORTEDdiego2007-08-281-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24277 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100% cosmetics: reindentation and removal of trailing spacesnicodvb2007-07-081-52/+49
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23743 b3059339-0415-0410-9bf9-f77b7e298cf2
* unified the skip of header and stuffing bytes after the parsing of ↵nicodvb2007-07-081-6/+3
| | | | | | pes_extension[12] fields git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23742 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l, forgot to skip the stuffing bytes eventually prepended to vc1 packets ↵nicodvb2007-07-071-0/+2
| | | | | | (identified by pes_extension2 subid) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23731 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: split separate instructions in separate linesnicodvb2007-07-071-3/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23730 b3059339-0415-0410-9bf9-f77b7e298cf2
* proper parsing of pes_extension[12] fields (replaces the previous code that ↵nicodvb2007-07-071-2/+35
| | | | | | relied on specific flags set git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23729 b3059339-0415-0410-9bf9-f77b7e298cf2
* Set subtitle type in mpg demuxer. Fixes subtitle switching with 'j'reimar2007-06-171-1/+2
| | | | | | | (previously subtitles would just disappear). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23570 b3059339-0415-0410-9bf9-f77b7e298cf2
* clearly specify the valid substream id range, rather than using unreadable ↵nicodvb2007-06-121-2/+3
| | | | | | bitmasks (it also prevents misdetection 0xFF as valid) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23550 b3059339-0415-0410-9bf9-f77b7e298cf2
* "()" to "(void)" function param list fixesuau2007-04-011-1/+1
| | | | | | | patch from Stefan Huehner, stefan huehner org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22904 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
* Source files should not contain non-ASCII characters.diego2007-03-121-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22525 b3059339-0415-0410-9bf9-f77b7e298cf2
* test the continuity of timestamps for STREAMTYPE_VCD, too; patch by Zuxy Mengnicodvb2007-02-281-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22381 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed duplicated code in demux_seek(); stream_seek() already aligns to ↵nicodvb2007-02-271-5/+0
| | | | | | STREAM_BUFFER_SIZE boundary git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22370 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100000l: average != semidistance, fixed seeking to the middle position; ↵nicodvb2007-02-271-1/+1
| | | | | | patch by Zuxy meng (zuxy.megn gmail com) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22369 b3059339-0415-0410-9bf9-f77b7e298cf2
* substream id 0x98..0x9f identifies dtsnicodvb2007-02-091-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22188 b3059339-0415-0410-9bf9-f77b7e298cf2
* when seeking and the codec is VC1 sync to sequence or entry point headersnicodvb2007-02-071-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22173 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_mpg_probe() seek to the initial position before returning - patch by ↵nicodvb2007-02-031-0/+2
| | | | | | reimar git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22112 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed unused variablesnicodvb2007-02-031-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22106 b3059339-0415-0410-9bf9-f77b7e298cf2
* sanity checks during codec detection; also reset demuxer->stream->eofnicodvb2007-01-281-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22059 b3059339-0415-0410-9bf9-f77b7e298cf2
* added code to scan the video stream to search the actual video codec used;nicodvb2007-01-281-0/+30
| | | | | | | | | | triggered only if requested by the user with option -psprobe. Evo files require this option because H264 is stored like MPEG2 without using the PSM git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22055 b3059339-0415-0410-9bf9-f77b7e298cf2
* include math.h for fabsf()nicodvb2007-01-281-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22054 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: reindentation and braces removalnicodvb2007-01-281-6/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22053 b3059339-0415-0410-9bf9-f77b7e298cf2
* moved scoreboarding code to 2 separate functions (update_stats() and ↵nicodvb2007-01-281-28/+41
| | | | | | clear_stats()) to be reused next git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22052 b3059339-0415-0410-9bf9-f77b7e298cf2
* set has_valid_timestamps and corresponding first and final pts only afternicodvb2007-01-281-46/+122
| | | | | | | | | | | | | | having checked that at the beginning, at the middle and at the end of the stream timestamps don't reset and that they seem to progress (almost-) linearly; additionally probe those timestamps only when the stream type is file and it's seekable, so all other stream types (especially network ones) won't waste time trying to seek and possibly slowing down detection. Seeking is not negatively affected by these changes. Patch by Christian Aistleitner (zaek7q gmx net) reworked by me. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22039 b3059339-0415-0410-9bf9-f77b7e298cf2
* substream 0x75 doesn't seem to be a valid vc1 stream, after all; removednicodvb2007-01-221-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21997 b3059339-0415-0410-9bf9-f77b7e298cf2
* set priv->last_pts to the pts read only if the pts was really read; patch by ↵nicodvb2007-01-221-1/+6
| | | | | | zaek7q gmx net (Christian Aistleitner) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21996 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux vc1 (stream id 0x1Fd with 0x55 <= substream id <= 0x5F in the ↵nicodvb2007-01-201-2/+37
| | | | | | pes_extension_2 payload) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21966 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1000l; fixed wrong operator precedencenicodvb2007-01-171-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21952 b3059339-0415-0410-9bf9-f77b7e298cf2
* in evo files [e]ac3 substreams range from 0xc0 to 0xcfnicodvb2007-01-161-2/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21945 b3059339-0415-0410-9bf9-f77b7e298cf2
* one more #if 1 removednicodvb2007-01-151-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21937 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed useless #if1s added too long time agonicodvb2007-01-151-4/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21936 b3059339-0415-0410-9bf9-f77b7e298cf2
* in EVO files substreams 0xC0 of private streams 0xBD contain [e]ac3.nicodvb2007-01-151-1/+2
| | | | | | | | A more proper range will be committed when specs begin to appear; for the time being enjoy the audio stream git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21935 b3059339-0415-0410-9bf9-f77b7e298cf2
* set dp->stream_pts only when feeding the video stream to workaroundnicodvb2007-01-011-1/+7
| | | | | | | | | strange interleaving patterns in some samples (that show with wild alternations of the OSD timer going back and forth) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21807 b3059339-0415-0410-9bf9-f77b7e298cf2
* replace call to ds_read_packet() with the usual ↵nicodvb2006-12-311-1/+19
| | | | | | | | | | stream_read()+ds_add_packet() sequence; fill demux_packet->stream_pts if the stream layer supports it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21797 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of min/max macros from aviheader.h, they do not belong here.reimar2006-12-091-2/+2
| | | | | | | Replace their uses by FFMIN/FFMAX git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21547 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make subtitle stream handling more similar to audio and video streams.reimar2006-11-131-1/+1
| | | | 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-6/+2
| | | | | | 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
* Reset demuxer->sub (consistently with audio and video) after seeking and at ↵nicodvb2006-10-011-0/+2
| | | | | | | | | the end of demux_mpg_open() to prevent ghost packets. Patch by Olaf Mandel - olaf mandel name. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20011 b3059339-0415-0410-9bf9-f77b7e298cf2
* demuxer->movi_end is updated after ds_fill_buffer(),nicodvb2006-09-181-1/+2
| | | | | | | | this in demux_mpg_probe() end_seq_start must be assigned after ds_fill_buffer git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19902 b3059339-0415-0410-9bf9-f77b7e298cf2
* Incorrect check in gxf demuxer leading to crash with textKO.gxf sample filereimar2006-07-261-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19187 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused variables, patch by Stefan Huehner stefan at huehner org.diego2006-07-081-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18963 b3059339-0415-0410-9bf9-f77b7e298cf2
* rm unnecesary casts from void* - part 4reynaldo2006-07-031-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18890 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove misleading Encrypted VOB message; patch by Ismail Donmez (ismail ab ↵nicodvb2006-06-191-3/+0
| | | | | | pardus punctum org puntum tr) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18761 b3059339-0415-0410-9bf9-f77b7e298cf2
* workaround: at every read update demux->movi_end with stream->end_pos; ↵nicodvb2006-06-141-0/+5
| | | | | | needed to show the progress bar when playing dvdnav streams git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18716 b3059339-0415-0410-9bf9-f77b7e298cf2
* now any audio stream can be chosen during DEMUXER_CTRL_SWITCH_AUDIO, ↵nicodvb2006-06-111-4/+0
| | | | | | irrispective of the codec used git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18683 b3059339-0415-0410-9bf9-f77b7e298cf2
* psm longer than 1018 bytes is not allowed, thus invalidnicodvb2006-05-181-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18550 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixed %d->PRIu64 in read_mpeg_timestamp()nicodvb2006-05-031-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18383 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_read_word() returns _unsigned_ intnicodvb2006-05-031-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18382 b3059339-0415-0410-9bf9-f77b7e298cf2
* in read_mpeg_timestamp() cast int expression to uint64_t before shifting to ↵nicodvb2006-05-031-1/+1
| | | | | | avoid truncation of bits and to prevent propagation of bit 1 as sign bit in pts git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18381 b3059339-0415-0410-9bf9-f77b7e298cf2
* timestamps are 33 bits long, so they don't fit in an unsigned int; 10lnicodvb2006-04-111-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18078 b3059339-0415-0410-9bf9-f77b7e298cf2
* make sure the check for valid timestamps does not accidentially search throughreimar2006-04-101-2/+10
| | | | | | | | several hundered MB (e.g. happens under MinGW with certain DVDs due to movi_end overflowing). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18073 b3059339-0415-0410-9bf9-f77b7e298cf2
* fail immediately if any of the parameters necessary to switch audio stream ↵nicodvb2006-03-121-1/+5
| | | | | | isn't set/correct; closes cid 55 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17823 b3059339-0415-0410-9bf9-f77b7e298cf2
* check sh_video before seeking; closes cid 56nicodvb2006-03-121-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17822 b3059339-0415-0410-9bf9-f77b7e298cf2
* init sh_a (new audio stream) to sh_audio (current audio stream); closes cid 241nicodvb2006-03-121-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17820 b3059339-0415-0410-9bf9-f77b7e298cf2
* Missing free_demux_packet after read errorreimar2006-03-081-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17780 b3059339-0415-0410-9bf9-f77b7e298cf2
* try to get duration from the stream layer, if an implementation of ↵nicodvb2006-02-271-0/+8
| | | | | | STREAM_CTRL_GET_TIME_LENGTH is available git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17700 b3059339-0415-0410-9bf9-f77b7e298cf2
* Second-try commit of this patch.corey2006-02-171-1/+1
| | | | | | | | | | | | 1. Include audio_delay as an argument to demux_