summaryrefslogtreecommitdiffstats
path: root/libmpdemux
Commit message (Collapse)AuthorAgeFilesLines
* demux_y4m: increase error message verbosity from MSGL_V to MSGL_ERRreimar2010-11-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31464 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_ty: Cleanup some code, possibly fix vstream support (untested)reimar2010-11-021-7/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31423 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanup: #include loader/wine/winbase.h instead of local declarationsdiego2010-11-021-4/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31414 b3059339-0415-0410-9bf9-f77b7e298cf2
* rtsp: Support RTSP/RTP over HTTP via LIVE555cehoyos2010-11-022-1/+8
| | | | | | | | | | Patch by Malte Särner, malte D sarner A multiq se git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31347 b3059339-0415-0410-9bf9-f77b7e298cf2 Fix compilation with nemesi and live555. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31348 b3059339-0415-0410-9bf9-f77b7e298cf2
* demuxer.c: Make ds_get_next_pts work for the first packet of a streamreimar2010-10-271-1/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31338 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_real: Don't try to read index if stream is not seekablereimar2010-10-271-1/+2
| | | | | | | Fixes playback of piped real files (except multirate where this seems not possible). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31335 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_mkv: support V_MJPEG video tagUoti Urpala2010-10-272-0/+2
|
* demux_mkv: accept files with no doctype in EBML headerUoti Urpala2010-10-211-1/+4
| | | | | | Assume files which start with an EBML header but have no DocType element in that header have type "matroska", and attempt to play them. Reportedly some mkvmerge versions create such files.
* Merge svn changes r31318 to r31328Uoti Urpala2010-06-052-6/+11
|\ | | | | | | | | r31328 is a somewhat questionable (changing the option at that point isn't quite safe), but it was a failure case already...
| * Add partial support for dirac to TS demuxer.reimar2010-06-051-1/+9
| | | | | | | | | | | | | | E.g. no header parsing is implemented so -fps must be specified manually. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31327 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Also print current stream position in mp_read debug output.reimar2010-06-051-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31326 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove explicit eof check for mp_read code, stream code handles this casereimar2010-06-051-2/+0
| | | | | | | | | | | | | | better, e.g. properly supporting growing files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31325 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Di not do a stream_reset on seeking backwards, the seek itself shouldreimar2010-06-051-2/+0
| | | | | | | | | | | | | | do whatever is best/necessary, this method will just drop cached data. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31324 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Default to -correct-pts off if -fps was given, since -fps has no effectreimar2010-06-041-3/+2
| | | | | | | | | | | | | | (and doesn't really make sense) with correct-pts mode. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31316 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Try always enabling correct pts again for lavf demuxer, since the knowreimar2010-06-031-4/+0
| | | | | | | | | | | | | | | | issue with PAFF seems solved to me, and disabled correct-pts causes flickering with -ass (which of course should be fixed as well though). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31313 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Switch mkv demuxing to lavf by default.aurel2010-05-311-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31294 b3059339-0415-0410-9bf9-f77b7e298cf2
* | demux_mkv: enable automatic index generation by defaultUoti Urpala2010-06-021-1/+1
| | | | | | | | | | | | | | | | | | Change demux_mkv to behave by default as it did with -idx before. The index generation code in demux_mkv linearly scans the file up to the seek timestamp (it doesn't read the whole file up front like some other demuxers do). Doing that is probably a better default for files with no index than rejecting the seek request and asking user to specify -idx.
* | Merge svn changes up to r31291Uoti Urpala2010-06-022-1/+2
|\|
| * Move TS_MAX_PROBE_SIZE #define to demux_ts.h instead of duplicating it.diego2010-05-302-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31291 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cast void* pointer to appropriate type before using it in an addition; fixesdiego2010-05-291-1/+1
| | | | | | | | | | | | | | libmpdemux/demux_mkv.c:1873: warning: pointer of type 'void *' used in arithmetic git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31276 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Drop pointless _t suffix from 'struct lavf_priv'.diego2010-05-281-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31247 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Drop pointless _s suffix from 'struct af_stream'.diego2010-05-271-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31238 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Reformat in K&R coding style.diego2010-05-272-2568/+2379
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31234 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove two pointless void* casts.diego2010-05-271-3/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31233 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unnecessary demux_mkv_seek() forward declaration.diego2010-05-271-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31232 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Drop pointless _s suffix from 'struct ad_functions'.diego2010-05-271-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31231 b3059339-0415-0410-9bf9-f77b7e298cf2
* | demux_mkv: fix possible seek crashUoti Urpala2010-05-311-2/+2
| | | | | | | | | | | | | | | | | | Commit fc39d48465 ("demux_mkv: store streams sequentially in demuxer->[avs]_streams") had a copy-paste error causing it to look up a video ID where it should have been an audio one. The most likely visible symptom was a segfault when seeking while playing a high-numbered audio track. Looks like I was careless with that original commit, second bug in the same one...
* | demux_mkv: support VP8 video tagUoti Urpala2010-05-302-0/+2
| |
* | demux_mkv: support WebM filesUoti Urpala2010-05-301-2/+3
| | | | | | | | Accept files with doctype "webm" in addition to "matroska".
* | Merge svn changes up to r31226Uoti Urpala2010-05-301-0/+1
|\|
| * Switch ogg demuxing to lavf by default.reimar2010-05-261-0/+1
| | | | | | | | | | | | | | | | This has the side-effect of using fftheora by default instead of theora, which possibly should be changed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31225 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streamshyc2010-05-251-3/+21
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31218 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not use correct-pts for mpeg-ps: It breaks PAFF samples.cehoyos2010-05-221-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31190 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31169Uoti Urpala2010-05-301-1/+4
|\|
| * Remove internal liba52 copy.diego2010-05-091-2/+0
| | | | | | | | | | | | | | Nowadays FFmpeg is faster than liba52 and external liba52 is well supported. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31147 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use the system liba52 headers when internal liba52 is disabled, fixes:diego2010-05-091-0/+5
| | | | | | | | | | | | | | libmpdemux/muxer_mpeg.c:2121: warning: implicit declaration of function 'a52_syncinfo' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31146 b3059339-0415-0410-9bf9-f77b7e298cf2
* | cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf"Uoti Urpala2010-05-291-2/+2
| | | | | | | | | | | | | | Change 'struct vf_instance' pointer arguments to more standard style as in the subject. Also some other minor formatting fixes. Patch by Diego Biurrun.
* | demux_mkv: fix realvideo extradata handlingUoti Urpala2010-05-261-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The code handling larger-than-minimum realvideo extradata sizes was complete nonsense. It tried to add the additional data to the exported track extradata by reading data from the input stream, which was completely bogus as this code is called long after the original Matroska track extradata information has been read. As a result the data read had nothing to do with correct values, and the read call messed up the stream position which likely broke further parsing of the file and caused complete playback failure. Change the code to instead copy any additional part at the end of input extradata to the end of output extradata. I believe this is the intended semantics, though I haven't verified it from any specs.
* | demux_mkv: fix crash bug introduced by recent changeUoti Urpala2010-05-241-2/+2
| | | | | | | | | | | | | | Commit fc39d48465 ("demux_mkv: store streams sequentially in demuxer->[avs]_streams") had a simple bug in automatic stream selection causing a crash if no video or audio track was marked as 'default'. Fix.
* | demux_mkv: support switching to/from -nosoundUoti Urpala2010-05-221-18/+13
| | | | | | | | | | | | Allow audio stream switching to turn off sound or enable it, and also include nosound as one of the values cycled through when stepping to the next audio stream.
* | demux_mkv: store streams sequentially in demuxer->[avs]_streamsUoti Urpala2010-05-221-49/+55
| | | | | | | | | | | | | | | | | | demux_mkv used the Matroska TrackNumber as the array offset in demuxer stream lists. The TrackNumber entry stored in the file can be an arbitrary 64-bit value, and some of the code could try reading from the arrays with that offset, causing a crash if the file had insane values. Fill the arrays sequentially instead. Also add some checks to make the handling of too high stream counts more robust.
* | Make audio stream index handling saner in stream switchingUoti Urpala2010-05-222-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The handling of audio stream numbering was handled in the stream selection property was a total mess. The most important issue was confusion between values used as index for demuxer->audio_streams[] array (consistently stored in demuxer->audio->id) and values stored in sh_audio->aid and used as "-aid N" option values. Now demuxer audio switch control functions and demuxer_switch_audio() are supposed to return the new value for the "-aid" option (internal MPEG demuxers still don't; the demuxer requirement could perhaps be dropped as it can be easily calculated afterwards). That is also the value returned for the "switch_audio" property. The main changes are: - Make command.c mp_property_audio() consistently use and return the "-aid" values. Before it used that as input but the array index as output, with extra mess related to demuxer_switch_audio() return value. Don't modify the audio_id option field any more. - Make demuxer_switch_audio() always return "-aid" values (like it takes as input). There are two changes for this: picking this return value in case the demuxer doesn't support switching, and overriding demuxer return value (for internal MPEG demuxers). - Make demux_lavf return "-aid" values from DEMUXER_CTRL_SWITCH_AUDIO code. This isn't actually necessary because of the override part above. Here's some history of the relevant behavior that I looked up: * For most demuxers array index and "-aid" values are the same. At least demux_mkv, (some of?) the internal MPEG demuxers and demux_ogg have differed for a long time. demux_ogg doesn't matter because it doesn't support stream switching. * Old code seemed to assume that demuxer_switch_audio() return value was array index, but this wasn't true at least for demux_mkv. * In svn r19951 reimar mostly removed use of the return value. * In r20162 ptt added mp_property_audio(). This set the global audio_id variable (-aid option value) to the return value of demuxer_switch_audio() and treated the global as the persistent value of the property, apparently assuming that it would be set to the "-aid" value, not array index. This was false for internal MPEG. * In r30124 reimar changed the property code so that even though it still modified the option value it didn't use that as the value of the property any more; instead it incorrectly used the array index. This meant that for demux_mkv the return value didn't match -aid any more (though input still did, so setting the property and querying it didn't match as they used different value systems). * In r31129 aurel made demux_lavf changes that resulted in its -aid and array index values no longer matching either. He didn't change the return value from audio switch when changing -aid, so it now matched array index only. The latter part didn't cause additional problems from r20162 though because either choice would have been broken anyway after r30124 as long as they weren't the same value.
* | options: move -alang and -slang to option structUoti Urpala2010-05-223-12/+11
| | | | | | | | | | | | | | The option field corresponding to -slang is now called "sub_lang" instead of the old misleading global name "dvdsub_lang". The code handling -slang in subreader.c looks rather broken; disable it instead of converting it to use the option field.
* | stream.h: remove bad EOF check in stream_seek()Uoti Urpala2010-05-221-1/+0
| | | | | | | | Also remove a redundant stream->eof = 0 in demuxer.c.
* | demux_mkv: read tags.Anton Khirnov2010-05-223-5/+77
| |
* | demux: use bstr arguments for demuxer_add_attachment() and demuxer_add_chapter()Anton Khirnov2010-05-224-29/+25
| |
* | demuxer.c: add demux_info_add_bstr(), use talloc for info fieldAnton Khirnov2010-05-212-15/+18
| | | | | | | | demux_info_add() is now a wrapper around demux_info_add_bstr().
* | bstr.[ch]: add new files for struct bstr related functionalityUoti Urpala2010-05-203-9/+5
| | | | | | | | | | | | | | | | Move "struct bstr" definition from ebml.h to its own header and add some utility functions/macros. Change length field type from int to size_t and adjust using code accordingly. Partially based on a patch from Anton Khirnov.
* | Merge svn changes up to r31141Uoti Urpala2010-05-071-1/+1
|\|
| * cosmetic: typo, this wasn't supposed to be pluralaurel2010-05-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31137 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31133Uoti Urpala2010-05-072-19/+41
|\|
| * print a more detailed and more useful description of each stream with lavfaurel2010-05-031-6/+17
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31132 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 10l: correctly use video_stream instead of audio_stream in the video sectionaurel2010-05-031-2/+2
| | | | | | | | | | | | | | ( copy&paste error :( ) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31131 b3059339-0415-0410-9bf9-f77b7e298cf2
| * add ID_..._NAME to -identify for each lavf stream which has a titleaurel2010-05-031-0/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31130 b3059339-0415-0410-9bf9-f77b7e298cf2
| * uniformize handling of aid and vid with lavf so that it matches handling of sidaurel2010-05-031-14/+10
| | | | | | | | | | | | | | | | | | aid and vid are now 0-based, instead of being a globally unique id. This matches the way sid is handled and the way other demuxers manage aid. As a side effect, it slightly simplifies demux_lavf. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31129 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Silence permanent warning messages when decoding H264 over rtsp withcehoyos2010-05-021-1/+6
| | | | | | | | | | | | | | | | | | live555. Patch by Gil Pedersen, gil A cmi D aau D dk git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31128 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Continue probing even for score == AVPROBE_SCORE_MAX / 4 to matchreimar2010-05-01</