Commit Graph

2662 Commits

Author SHA1 Message Date
nicodvb 90654b8eff added code to scan the video stream to search the actual video codec used;
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
2007-01-28 21:42:22 +00:00
nicodvb 106158f4f1 include math.h for fabsf()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22054 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-28 21:27:15 +00:00
nicodvb 380d0dcebc cosmetics: reindentation and braces removal
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22053 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-28 21:25:50 +00:00
nicodvb ed9e5b1565 moved scoreboarding code to 2 separate functions (update_stats() and clear_stats()) to be reused next
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22052 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-28 21:22:39 +00:00
reimar 48eb95537d Fix number of rows in interlaced mode.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22042 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-28 13:51:24 +00:00
reimar b9b7060e60 10l, confused current "frame" with canvas width.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22040 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-28 11:02:52 +00:00
nicodvb 25918a8b31 set has_valid_timestamps and corresponding first and final pts only after
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
2007-01-28 10:45:34 +00:00
reimar fec3b1e82e Hack: use refmode == 1 instead of == 0, as browsers behave like this
and buggy files like http://samples.mplayerhq.hu/GIF/broken-gif/CLAIRE.GIF
rely on this.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22038 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-28 10:34:11 +00:00
reimar c518d68f25 Set sh_video->bih->biWidth properly, fixes decoding after latest dec_video.c change
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22037 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-28 09:53:42 +00:00
rtogni edf1fb46d2 Call real_fix_timestamp() after seeking, to avoid video freezing
because of wrong timestamps. Fixes seek_sample2.rmvb and others.
Patch by LR ))) hephooey ))(( gmail )( com (((


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22036 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-27 22:34:27 +00:00
reimar 92258be85a Simplify and make lzo decompression code more similar to zlib one.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22029 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-27 14:54:45 +00:00
reimar d7da0ebc20 Forgotten free on error
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22028 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-27 14:52:18 +00:00
reimar d8f2eaca08 *dest = malloc (*size); is useless directly before *dest = realloc (*dest, *size);
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22026 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-27 14:45:52 +00:00
diego ef3b7add5f Remove comment printed by -demuxer help, it belongs in the copyright header.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22015 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-25 17:48:38 +00:00
reimar fa7d28e854 Remove ff_gcd prototype and include avutil.h instead where it is defined.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22013 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-25 10:49:43 +00:00
rtogni 2669d9536a Use interleaver id to select the correct interleaver instead of guessing
it from the codec id.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22007 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-24 21:20:08 +00:00
rtogni e77fbf0bd7 Use interleaver id to select the correct interleaver instead of guessing
it from the codec id.
Fixes gittin_13.ra


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22005 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-24 15:05:42 +00:00
nicodvb ef29ff34ff better autodetection of framerate in case of h264; it works correctly with b-frames.
Patch by Eugen Hoyos (cehoyos ag or at)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22001 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-23 22:26:13 +00:00
nicodvb 68f75d788f substream 0x75 doesn't seem to be a valid vc1 stream, after all; removed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21997 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-22 22:29:54 +00:00
nicodvb 3253bba2b3 set priv->last_pts to the pts read only if the pts was really read; patch by zaek7q gmx net (Christian Aistleitner)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21996 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-22 22:24:50 +00:00
diego 2e66db0c4a Discard -Wdeclaration-after-statement warning.
patch by Carl Eugen Hoyos, cehoyos ag.or at


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21992 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-21 23:21:50 +00:00
reimar 8e374ff809 Instead of printing a useless "sig11 coming soon" message, just abort parsing
in the hope of still saving things (helps with at least
http://sam.zoy.org/zzuf/lol-mplayer.wmv).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21986 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-21 18:29:18 +00:00
reimar 75282a6a83 Sanity-check sh_video->bih->biSize
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21985 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-21 18:22:07 +00:00
reimar 4b9ddc69a0 Simplify by using av_codec_get_id and include riff.h only in demux_lavf.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21984 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-21 15:44:58 +00:00
reimar 3ccc6712e3 Forgotten CodecTag -> AVCodecTag
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21980 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-21 10:33:34 +00:00
reimar abb0510502 Fix compilation after lavf changes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21979 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-21 10:17:40 +00:00
reimar cb47a72a44 support -ffourcc with -of lavf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21978 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-21 10:10:07 +00:00
nicodvb 2abbb9c863 in h264_parse_sps() reuse mp_unescape03()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21971 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-20 13:46:17 +00:00
nicodvb 6d708c31b6 vc1 probing code: if sh_video->bih can't be callocated exit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21970 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-20 13:14:09 +00:00
nicodvb b5d12d6e0f in vc1 probing code, all packets before the first sequence header must be skipped, not read
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21969 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-20 13:10:40 +00:00
nicodvb 8823921db8 removed unused variables; replaced wrong call to realloc() with calloc() in vc1 probing code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21968 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-20 13:06:17 +00:00
nicodvb 488013915f decode vc1 sequence header and frame it in video_read_frame();
it doesn't work yet, but it permits debugging and development to Kostya



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21967 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-20 12:17:22 +00:00
nicodvb fa90811f58 demux vc1 (stream id 0x1Fd with 0x55 <= substream id <= 0x5F in the pes_extension_2 payload)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21966 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-20 12:13:50 +00:00
nicodvb 58c3d666eb added function to parse vc1 sequence header
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21965 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-20 12:04:20 +00:00
reimar c70d547ea6 Compile fix: LE_* -> AV_RL*
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21963 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-19 23:14:57 +00:00
nicodvb 34ef7517eb 1000l; fixed wrong operator precedence
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21952 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-17 21:42:04 +00:00
nicodvb 8397554a2a unified creation of sh_audio and sh_video is ts_add_stream; patch by elupus
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21947 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-17 00:12:35 +00:00
nicodvb 375fe84da6 in evo files [e]ac3 substreams range from 0xc0 to 0xcf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21945 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-16 22:50:47 +00:00
reimar 3d834fb592 Interlaced gif support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21940 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-16 07:12:32 +00:00
reimar 410b243885 Change some types to uint8_t where appropriate
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21939 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-16 07:05:28 +00:00
reimar e6c460e462 "Cosmetics" Introduce a memcpy function doing both transparent
and non-transparent copy.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21938 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-16 07:01:53 +00:00
nicodvb 9c56f01564 one more #if 1 removed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21937 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-15 23:03:45 +00:00
nicodvb 12233b5063 removed useless #if1s added too long time ago
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21936 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-15 21:39:30 +00:00
nicodvb 6443cc76f5 in EVO files substreams 0xC0 of private streams 0xBD contain [e]ac3.
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
2007-01-15 21:21:42 +00:00
diego 86756e67b0 demux_rtp_codec.cpp💯 `INT_MAX' undeclared (first use this function)
patch by Carl Eugen Hoyos, cehoyos ag.or at


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21929 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-15 04:57:43 +00:00
reimar cc05fc22e8 Cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21914 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 12:56:42 +00:00
reimar ba63e7b28d Implement gif transparency
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21913 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 12:56:02 +00:00
reimar 79cc33a851 Fix: refmodes 2 and 3 leave useref unchanged
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21912 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 12:46:27 +00:00
reimar 497403d31f Cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21911 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 12:39:13 +00:00
reimar 5b7eb989f2 Implement refmode == 2 in gif demuxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21910 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 12:37:53 +00:00
reimar 9cfea7d129 Partially support gif using "reference" images
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21909 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 12:19:42 +00:00
reimar 18fe1c0613 memset + malloc -> calloc
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21908 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 12:05:18 +00:00
reimar d765e163b8 Cast SWidth/SHeight to uint16_t, since that's what they actually are.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21905 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 11:49:20 +00:00
reimar f6a9b356cd Forgot to adjust length of memset
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21904 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 11:46:43 +00:00
reimar 16c183be83 Simplify gif demuxer by using memcpy_pic
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21903 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 11:44:36 +00:00
reimar d359f1537c One more bounds check, though IMO the gif lib really should do this.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21902 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 11:40:05 +00:00
reimar 0636ab5f58 Simplify
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21901 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 11:37:59 +00:00
reimar e52420a9fe Fix crash for gif images that have Top or Left set
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21900 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 11:37:18 +00:00
reimar eb2b0bc2a7 Fix invalid read for gifs with a palette for less than 256 colors
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21899 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 11:06:40 +00:00
reimar 6a2c85c59c Move global variables in gif demuxer into priv struct
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21898 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 11:05:32 +00:00
diego cc57387c23 cosmetics: typo fix pallete --> palette
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21894 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 06:02:31 +00:00
diego 4b8743d056 Frametime was being read from the wrong offset, compare
http://www.onicos.com/staff/iz/formats/gif.html#gceb
patch by John Koleszar, jkoleszar on2 com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21893 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 06:00:34 +00:00
gpoirier 18dedd6eec add support for avc1 in X-QT over RTSP
patch by Carl Eugen Hoyos cehoyos at ag.or.at


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21889 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-12 19:59:47 +00:00
michael 2394b7da95 dont write an index and dont use memory to build one if -noidx is specified
... maybe this should use its own option though instead of using -noidx ?


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21858 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-08 16:23:31 +00:00
reimar ca95de6acd Simplify demux_ogg to use the sub_clear_text and sub_add_text functions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21846 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-06 19:19:15 +00:00
reimar 61e4a80191 Subtitle handling cleanup: factor out code for parsing embedded subtitles
and adding and removing of lines in subtitle struct into subreader.c.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21845 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-06 19:07:58 +00:00
reimar 0c8d9ba25f Include "internal" libavformat/riff.h also when dynamic libavformat is used
instead of duplicating typedefs and function prototypes in already three
different places.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21840 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-06 17:28:11 +00:00
reimar a52c97540c Include libavformat/riff.h when building with static libavformat and
add and correct prototypes if not.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21838 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-06 14:40:05 +00:00
reimar 0a6856d341 Simplify after last demux_ogg commit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21830 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-05 18:03:58 +00:00
reimar 50dc3ce2c7 Do not access ogg_d->subs after freeing it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21829 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-05 18:02:18 +00:00
reimar e3fe6113a6 sizeof() is long, thus %d format in error message is wrong.
Fix by assigning extradata_size before and printing that, since
this also removes a bit of code duplication.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21828 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-05 15:41:00 +00:00
reimar 9e1add871e Make ds_get_next_pts return MP_NOPTS_VALUE instead of -1 on error,
-1 could be a perfectly valid pts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21827 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-05 15:24:38 +00:00
nicodvb 538674f6b6 set dp->stream_pts only when feeding the video stream to workaround
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
2007-01-01 22:47:14 +00:00
nicodvb 55303b223e removed unused variable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21803 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-31 17:24:14 +00:00
nicodvb 8558d03eb9 use demuxer->stream_pts rather than stream_control(STREAM_CTRL_GET_CURRENT_TIME)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21798 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-31 11:09:53 +00:00
nicodvb 33ce3088d1 replace call to ds_read_packet() with the usual 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
2006-12-31 11:08:27 +00:00
nicodvb b5898c2aa6 added stream_pts to demuxer_t and demux_packet_t to hold the time value reported by the stream layer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21796 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-31 11:05:26 +00:00
michael 9eb302dee8 sort
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21795 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-31 10:54:32 +00:00
michael f89822df44 dont read index if -noidx
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21788 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-29 19:01:55 +00:00
michael 8f7f2ad9e0 first step toward amr-nb muxing support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21787 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-29 18:56:28 +00:00
aurel 016b1cb9e5 don't compile demux_mpc.c when libmpcdec is disabled
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21783 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-28 23:44:38 +00:00
aurel d1c91ec012 add support for musepack native decoder from ffmpeg (require -demuxer lavf)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21779 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-28 00:40:49 +00:00
ods15 7c44ff0483 Sync to libnut, nom->num
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21739 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-23 12:34:31 +00:00
uau 29a0a85b48 Fix display of multiple simultaneous subtitles without libass.
Was broken in r19649.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21720 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-21 22:11:47 +00:00
nicodvb cf099b2100 muxers now write to output muxer->stream rather than to muxer->file
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21676 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-18 21:03:59 +00:00
reimar 7ac56b70b8 doxify a comment
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21667 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-18 15:15:21 +00:00
reimar 9526342555 Require 12 consecutive MPEG-audio headers before detecting as audio.
Fixes misdetection of http://samples.mplayerhq.hu/FLV/flv_misdetected_as_mpa


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21666 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-18 15:14:23 +00:00
reimar 370c07962b ASF aspect support via metadata reading.
Patch by Zuxy Meng (zuxy meng (at) gmail.com) with some
simplifications by me.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21626 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-15 21:51:20 +00:00
eugeni 8d4098a160 VobSub tracks cannot be handled by libass, do not mark them with 'a'.
This fixes the bug with VobSub not being displayed with -ass.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21625 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-15 19:35:06 +00:00
reimar b9e8186ac3 Respect -noidx in lavf demuxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21584 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-10 21:37:00 +00:00
uau 2cfcfc4f22 Set AVFMT_FLAG_GENPTS if -correct-pts is used.
This should allow using -correct-pts (and thus filters which adjust pts
or add frames) with dvd or other mpeg container files by specifying
"-correct-pts -demuxer lavf -vc ffmpeg12". Might work with libmpeg2
decoder too but certainly not with internal demuxer.
Using this flag isn't quite optimal as it can cause extra buffering of
demuxed frames, but at least it's better than just failing until a more
complex solution is implemented.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21564 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-10 00:50:38 +00:00
nicodvb 3e7616ecab align vbuf_size to the max value allowed by main profile @ high level
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21560 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-09 22:21:37 +00:00
reimar 77226f96ba Replace another MIN macro by FFMIN
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21548 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-09 12:25:25 +00:00
reimar 6caf5586ee Get rid of min/max macros from aviheader.h, they do not belong here.
Replace their uses by FFMIN/FFMAX


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21547 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-09 12:24:11 +00:00
reimar 83916cab7f Remove condition that should always be true
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21545 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-09 11:59:49 +00:00
reimar a8bf24702b Fix crash in ogg demuxer uninit with -aid
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21544 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-09 11:59:09 +00:00
nicodvb 4a5164d995 made vorbis_info a member of ogg_stream rather than ogg_demuxer;
this change paves the way for multi audio track support


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21535 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-07 20:53:05 +00:00
reimar 28564d6355 vorbis_comment is only used locally, move it out of demuxer struct
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21525 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-07 12:02:51 +00:00
reimar 6fb4b1b30a Remove unused ov_struct_t
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21524 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-07 12:02:01 +00:00
reimar 18004d2d98 Hack around libavutil/bswap.h compilation problems due to always_inline undefined.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21523 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-07 11:58:07 +00:00
reimar a4147be5f7 Fix memleaks caused by missing vorbis/theora_info/comment_clear calls.
Code still seems wrong to me for multiple audio tracks, since there is
only one vorbis comment/info entry for the demuxer, not one per track?


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21516 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-06 10:46:50 +00:00
nicodvb e704821b75 disable telecining when it can't be applied
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21502 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 22:08:11 +00:00
nicodvb a176dc29b9 since display_frames in increased by a possibly negative number it had better be signed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21501 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 21:58:07 +00:00
nicodvb 9e365b6032 cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21500 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 21:27:05 +00:00
nicodvb 7057e42777 removed dead code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21499 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 21:24:39 +00:00
nicodvb 8ec5a6a3ca reimplemented :telecine and :film2pal in terms of dgpulldown
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21498 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 21:20:01 +00:00
nicodvb 858813f36f pre-store in bff_mask the correct or-mask to be saved in the pce (slightly faster)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21497 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 20:38:46 +00:00
nicodvb 6dc68e8680 10l: wrong bitmask when patching the pce_ptr in soft_telecine()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21485 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 00:52:11 +00:00
nicodvb 2fded9964f added generalized teleciner by Donald Graft
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21483 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 00:02:15 +00:00
eugeni b5a682f0aa Rename: ass_process_font -> ass_add_font.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21471 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-03 17:35:40 +00:00
reimar 0639d41ffc Use libavutil LE_* macros instead of pointer casts which can result
in crashes due to missing alignment. Should fix bug #640.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21470 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-03 16:41:55 +00:00
nicodvb 6d8213c5d6 cosmetics: anti-chaos reindentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21464 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-03 12:06:08 +00:00
reimar 4a6ad7c674 Unicode support for demuxer info in ASF demuxer.
Patch by Zuxy Meng [zuxy meng <at> gmail com].


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21461 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-03 11:35:11 +00:00
diego 9c2d44923a Remove superfluous bswap.h include.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21437 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-02 12:32:44 +00:00
diego c00059b047 Remove suffix rules that are just copies of make builtin rules.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21436 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-02 12:08:25 +00:00
diego 44e2adf8d3 Use standard name for C++ flags.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21435 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-02 11:41:58 +00:00
nicodvb b5ecb3ba07 permit to specify the sizes of the decoders' buffers
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21429 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 23:51:51 +00:00
reimar 24f3a0132c 100l confused FFMIN/FFMAX
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21422 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 19:43:36 +00:00
reimar 0af2daec29 Proper fix for last demux_avi commit, stream switching now really should
not hang anymore


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21421 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 19:24:42 +00:00
reimar f32179337e Make sure we do not hang if no streams are available
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21420 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 18:51:44 +00:00
reimar d441d65f34 Implement stream switching for AVI demuxer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21419 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 17:57:29 +00:00
diego b125a9e129 Add libav include paths to CFLAGS without indirection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21406 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 01:11:42 +00:00
reimar ef393a0650 Use av_int2flt/av_int2dbl to read float values. This is simpler and more
correct since it also works for int endianness != float endianness.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21404 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-30 17:55:00 +00:00
reimar 15eb8639c6 Move initialization of sh_audio/sh_video members to aviheader
where possible so that all a_streams[]/v_streams[] are initialized
and switching becomes simpler.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21403 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-30 17:48:00 +00:00
diego b7b22bd874 Remove some superfluous include CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21390 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-29 15:14:03 +00:00
diego cac6c0eea2 Remove bswap.h, use libavutil/bswap.h instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21388 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-29 15:02:45 +00:00
diego 19300ef1db support for Westwood SND1 audio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21378 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-29 10:51:39 +00:00
uau 11d2b91f23 Fix 2 header bugs introduced by nplourde's previous commit:
#include "loader/qtx/qtxsdk/components.h" needs inttypes.h which was no
more implicitly included by earlier headers, and "#ifdef MACOSX" was 
used before '#include "config.h"'.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21370 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-28 23:53:07 +00:00
nplourde cf332d16c2 reordering of #include to avoid clash with math.h and quicktime/*.h, patch by Crhis Roccati<roccati@pobox.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21369 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-28 23:13:08 +00:00
reimar 3adbef1c80 Use av_int2dbl to read doubles instead of our somewhat broken le2me_dbl
(le2me_dbl assumes float and int endianness are the same).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21363 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-28 19:01:04 +00:00
reimar 01755ed66a Remove long double reading code, long double was never used AFAICT and
is gone from the specification since a long time due to portability issues.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21360 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-28 18:34:08 +00:00
diego 31844ae22d cosmetics: Sort SRCS by alphabetical order.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21353 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-28 11:53:08 +00:00
diego 02436df5fc Split muxers into a separate library that only MEncoder is linked against.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21326 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 14:26:52 +00:00
diego f415c639b9 Move common code to mpcommon.mak.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21323 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 13:32:24 +00:00
diego d4e86e6a11 Remove unnecessary header indirection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21305 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 02:20:15 +00:00
diego 42bf94ecc7 10l: Muxers were not being compiled even when MEncoder was enabled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21302 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 01:36:13 +00:00
diego a46183fb2c FFmpeg-style conditional dependency declaration
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21291 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 22:37:03 +00:00
diego dc2be42703 Merge common parts of all Makefiles into one file included by all.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21275 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 18:12:36 +00:00
diego c95db8d583 Simplify, remove useless indirection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21263 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 13:04:14 +00:00
reimar 53ba4dd6eb Cleanup for uselessly complicated closed-caption subtitle handling
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21252 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 22:06:00 +00:00
diego 27b0177662 Remove superfluous comment.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21222 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 16:12:36 +00:00
eugeni d8b0acaa87 Cosmetics: indentation fix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21182 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-23 17:37:28 +00:00
nicodvb e9ca4efbc0 permit muxing to raw pes (VDR uses this)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21157 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 22:09:58 +00:00
diego d52d16f96e Remove superfluous empty variable declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21120 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 11:25:44 +00:00
nicodvb a9eada9189 check we aren't short of sh_videos before allocating another one
and fail if the allocation doesn't succeed;
added support for video stream switching


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21116 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 23:31:01 +00:00
nicodvb a6961fa26f slight simplification in demux_control_ts: no need to check *arg with last_{aid,vid} (small bugfix, too)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21115 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 21:03:46 +00:00
diego cf4bf03dc2 Unify dep/depend targets.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21096 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 11:18:01 +00:00
uau 1390d0cf93 Reorganize code to move more things out of main().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21093 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 09:12:07 +00:00
nicodvb 07ccc9193c in demux_ts_control unified SWITCH_AUDIO and SWITCH_VIDEO (they were identical)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21088 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 23:36:14 +00:00
nicodvb f12bae62c0 during DEMUXER_CTRL_SWITCH_x *arg set to -2 identifies 'disable stream x'
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21083 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 23:10:30 +00:00
reimar e22ab31677 10l, compilation error in r21054
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21055 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 14:35:39 +00:00
reimar b38e1ca6e7 Generalize subtitle switching, demux_ogg does not need a special case
anymore and demux_mov works now, too.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21054 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 14:23:54 +00:00
reimar 8f14f6d551 Make -slang work again, sub->id is -2 by default, so -slang would be ignored
with old code.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21052 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 13:38:37 +00:00
reimar ceecfca462 Create a sh_sub_t for ogg subtitles.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21051 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 13:12:46 +00:00
reimar 5b391eb2a3 Support multiple subs in mov
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21048 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 11:55:03 +00:00
ods15 7a06410d18 fix demux_nut to give proper (estimate) of percent position after a seek
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21039 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 20:44:22 +00:00
ods15 75c1fd9c1d Add disabled EAGAIN testing code for libnut
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21038 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 20:13:18 +00:00
ods15 24be79ae8b move demux_nut priv calloc to init() instead of check_file()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21027 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 15:17:50 +00:00
nicodvb bdc75c29ae implemented DEMUXER_CTRL_IDENTIFY_PROGRAM
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21022 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 14:32:14 +00:00
nicodvb c97dc5061d new DEMUXER_CTRL_IDENTIFY_PROGRAM to identify programs (a+v+s)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21021 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 14:31:31 +00:00
diego 67efdbe07a support for XAN DPCM audio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21006 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 11:24:09 +00:00
diego 2f67bb7b34 support for some more fringe formats, still buggy ..
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20996 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 22:52:57 +00:00
reimar 2bf9053a66 Try reading palette for vobsub
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20995 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 20:13:21 +00:00
reimar 99280ec76e Pseudo-support for subtitles in http://samples.mplayerhq.hu/sub/jpn_engSUB_sample.3gp
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20992 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 19:16:07 +00:00
ods15 4295799cf5 missed piece in update to libnut API - non negative errors
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20987 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 17:43:40 +00:00
diego 1fb5f0f90a support flic video through lavf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20979 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 10:35:10 +00:00
nicodvb c3530411cb COSMETICS: reformatted
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20971 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 22:09:24 +00:00
nicodvb 81173eeb6c restored circular looping when changing audio and video stream (previously broken)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20970 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 22:08:14 +00:00
nicodvb ced53d9d19 reset demuxer's buffered demux_packet after DEMUXER_CTRL_SWITCH_AUDIO
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20968 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 21:31:44 +00:00
nicodvb 6a0ab89e43 implemented DEMUXER_CTRL_SWITCH_VIDEO
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20967 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 21:30:35 +00:00
nicodvb 96e829fc9c added code to switch video stream
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20964 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 21:23:06 +00:00
diego 84c9fdbab0 cosmetics: Restore alphabetical order, align both tables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20960 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 13:15:05 +00:00
diego 0245dc0efc support for RoQ video and audio through libavformat
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20958 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 12:42:32 +00:00
diego 77b21dc757 support for Electronic Arts ADPCM audio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20957 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 12:33:12 +00:00
diego 25d71db765 support for Delphine CIN audio and video
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20956 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 12:28:39 +00:00
ods15 f85f460eb9 update to libnut API, non-negative errors
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20954 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 07:07:22 +00:00
diego 199d26ea92 support for Interplay DPCM audio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20952 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 01:17:19 +00:00
diego ac47a614cd cosmetics: alphabetical order and prettyprinting for the CodecTag table
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20951 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 00:59:01 +00:00
diego d495a2823f support for Sierra VMD video
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20950 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 00:56:35 +00:00
diego adf53a4caa Add support for Tiertex SEQ video.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20949 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 00:20:55 +00:00
diego 61da56fefa Add support for Westwood IMA ADPCM audio.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20947 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-15 23:42:47 +00:00
ods15 41e99a2c76 update to libnut, no nut_skip_packet()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20942 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-15 11:36:22 +00:00
ods15 e7c9a5bbe4 update to libnut API, don't free the streams
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20941 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-15 11:26:05 +00:00
rtogni d4f55932c1 Don't spam the console with timestamps (non-error messages printed every
frame should be lower than V level)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20937 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 22:48:53 +00:00
rtogni 88990e297c Fix extradata passing to lavc RV20 decoder
Pass video codec extradata unchanged from demux_real, sync vd_realvid to 
the new format
Sync mkv demuxer to the changes above (cmsg24 extradata was totally 
broken before)
Detect cmsg24 size from extradata (was fixed)
Based on a patch by elupus >> elupus >a< ecce se <<


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20936 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 22:40:35 +00:00
ods15 214c8be4e1 update to libnut, add cache_syncpoints
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20925 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 17:00:47 +00:00
reimar 96ba82424f 10l copy&Ãpaste bug in subtitle sh handling
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20923 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 15:02:15 +00:00
ods15 f916c5d0c4 update to libnut, rename nut.h->libnut.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20909 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 06:01:54 +00:00
reimar 59e83201dd Try to handle oversized asf headers by ignoring anything beyond the first MB
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20894 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-13 19:16:39 +00:00
reimar fec63334f8 Incomplete support for vobsub (missing palette support) and
text (missing styles and edl support) subtitles in mov,
see also bug #611


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20893 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-13 18:41:24 +00:00
reimar 48c301ddbc Move sh_sub_t to stheader.h, where all the other sh structs are defined
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20892 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-13 18:38:29 +00:00
reimar 89b0172dce Add forgotten new_sh_sub
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20889 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-13 16:18:05 +00:00
reimar c5fa0bbf92 Make subtitle stream handling more similar to audio and video streams.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20888 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-13 16:15:23 +00:00
ods15 565a0e8e45 change include "nut.h" to <nut.h> to make gcc pick the correct nut.h for libnut de/muxer..
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20868 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-12 17:47:40 +00:00
nicodvb 6e28f63e36 consistency fix: STREAM_CTRL_GET_TIME_LENGTH and 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
2006-11-12 17:19:56 +00:00
diego 8619594a1d Remove duplicate message, the same info is printed anyway.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20863 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-12 16:03:39 +00:00
nicodvb c42fa438f4 removed duplicated check in demuxer_seek_chapter
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20857 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-11 13:57:09 +00:00
nicodvb 5c361eff9d in demux_seek() if STREAM_CTRL_SEEK_TO_CHAPTER suceeds call 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
2006-11-11 11:53:32 +00:00
ods15 acd40ca816 shut warning on "realloc undefined" in demuxer.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20831 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-10 07:46:07 +00:00
ods15 c29caa76bd update libnut API
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20830 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-10 07:32:01 +00:00
uau d1639ced67 Change some constants in pts arithmetic from float to double.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20811 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-09 01:52:11 +00:00
uau f037400b74 Changed code that used pts=0 in demux packets to indicate "not known".
Now demux_real should be usable with -correct-pts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20810 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-09 01:42:52 +00:00
gpoirier d8435fd9c6 Fix crash when attempting to seek in a streamed unseekable stream, like
mms://a632.v3306a.c3306.e.vm.akamaistream.net/7/632/3306/v1/multith.download.akamai.com/3306/2005/COMEDIE/1144-0186-001.wmv 
patch by alexandre % alex14fr A yahoo P fr %


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20808 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-08 23:54:21 +00:00
diego 508c93566d Move some FourCC values from libavformat/riff.c to our private mapping.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20776 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-08 10:49:34 +00:00
nicodvb 6200940dcb added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20765 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 22:55:49 +00:00
nicodvb 0fa1a3e4c6 now demux_seek() tries to seek aided by the stream layer, if possible
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20764 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 22:54:28 +00:00
nicodvb a46e8bb058 added definition of DEMUXER_CTRL_RESYNC
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20763 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 22:51:18 +00:00
michael 1052ab502a fprintf -> mp_msg
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20756 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 19:05:38 +00:00
mosu 9c4d028084 If parsing a seek head fails then mplayer should try continue parsing the file after the seek head.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20750 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 18:14:30 +00:00
reimar 8abf4e3f17 Add our own CODEC_ID -> fourcc translation tables so we do not need
to put them into ffmpeg.
Also adds support for S24BE and S8 audio formats, which fixes e.g.
http://samples.mplayerhq.hu/A-codecs/MACE/Bach1-1.aiff and
http://samples.mplayerhq.hu/MXF/ebu_small.mxf .


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20749 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 17:37:23 +00:00
reimar 4587221d67 Fix index-based seeking in audio-only files, fixes bug #621
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20728 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-05 20:29:29 +00:00
eugeni 8dc8dcf3cc Fix an obvious typo.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20716 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-05 17:32:18 +00:00
kraymer 09ebe87f57 better wording for "workarounding"
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20712 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-05 16:49:09 +00:00
kraymer ea922ff669 MSGTRs for demux_avi.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20711 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-05 16:36:02 +00:00
kraymer 66f0513be8 add MSGTR_MPDEMUX_MKV for demux_mkv.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20696 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-05 13:53:27 +00:00
nicodvb a28d7004b4 don't set the resolution for dvr-ms files: in the asf headers it seems to
be always set incorrectly; the decoder will deal with it much better.
Patch by John Donaghy (johnfdonaghy gmail com)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20652 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-03 22:53:24 +00:00
nicodvb 0c1724959f a previous commit introduced a bug that prevented tables
from being parsed in the feeding phase;
removed useless debugs


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20524 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 22:02:10 +00:00
nicodvb 6d60c545d4 simplified assignment of subtitles stream in ts_parse()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20522 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 21:29:23 +00:00
rtogni 54abc1a05e Prevent segfault if video codec init fails
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20515 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 14:26:23 +00:00
reimar ec9819db2c Make sure we do not read beyond end of subtitle packet
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20510 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 13:17:26 +00:00
reimar 64e9d8fc97 realloc subtitle buffers since subcp_recode might have decreased their size.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20509 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 12:44:15 +00:00
reimar 99c0130bda Quick hack to implement percent-based seeking, also fixes seeking with gmplayer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20508 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 12:32:12 +00:00
nicodvb 3675d0466d handle broken ts packets before parsing the rest
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20506 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 11:17:28 +00:00
reimar 7d91ecbd14 Support new flac-in-ogg, fixes bug #229
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20505 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 11:05:49 +00:00
nicodvb edf75a6184 cosmetics: reformatted after previous commit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20504 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 11:00:36 +00:00
nicodvb 891bd61076 1000l: fixed broken handling of the adaption field - part 2
The value of c must be between 0 and 183 inclusive; is c is 0
I can't skip c-1 bytes!


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20503 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 10:55:02 +00:00
nicodvb 4ea549d06f fixed mishandling of stream_read() (it doesn't necessarily return -1 in case of error)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20502 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 10:33:49 +00:00
nicodvb e534b4afa9 ts_parse() move section handling after stream_read() rather than repeating it
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20501 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 10:23:15 +00:00
nicodvb cb54570f66 removed useless check: when is_start is set the size of the payload
can be at most 184 bytes


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20496 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 17:51:32 +00:00
nicodvb feed289c95 in ts_parse() centralized stream_read()+stream_skip(); smaller and cleaner
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20494 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 17:42:25 +00:00
eugeni efea99c2c9 Libass interface reworked:
- ass_instance_t renamed to ass_renderer_t
- ass_library_t introduced
- use of mplayer-specific global variables limited to ass_mp.c


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20493 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 15:07:18 +00:00
reimar e5d30923d1 Cleanup/simplify nsv check_file function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20489 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 11:01:18 +00:00
nicodvb 267ed8021e readability cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20488 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 10:59:17 +00:00
nicodvb fb8eec9d28 unconditionally assign the language code when available;
more simplifications


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20487 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 10:52:12 +00:00
reimar 8777fbb596 Better check for non-broken NSVf-header to avoid incorrect detection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20486 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 10:44:45 +00:00
nicodvb c57f415693 reformatted ts_parse() after previous commit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20483 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 09:52:19 +00:00
nicodvb de8cb3f35a removed unreachable code (when len=pes_parse2() returns 0)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20481 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 09:44:18 +00:00
nicodvb fd08f0490e 10l: fixed misplaced adaption field check
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20480 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 09:03:51 +00:00
nicodvb 5f569045d4 removed commented crc32 code; I'll eventualy reuse the one in lavu
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20479 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 08:56:44 +00:00
nicodvb b705af5710 slight simplifications
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20478 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 08:54:31 +00:00
reynaldo e2b9f14a02 add two missing checks - PATCH by Karolina Lindqvist AT kramnet-se
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20448 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-25 20:39:01 +00:00
reimar 0aa92466a1 Allow lowercase letters in AVI stream id, fixes bug #277
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20416 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-23 16:46:16 +00:00
nicodvb a5d54eea12 if no stream could be muxed flush_buffers() returns 0: prevents while(1) stall at the end
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20350 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-22 10:32:59 +00:00
reimar 3b248ecf24 Avoid crash after "AVI: No audio stream found -> no sound." message,
audio was not correctly disabled.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20343 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-21 20:48:41 +00:00
reimar 08bea9d14d Try playing files with wrong wav header length, fixes riff_broken_hrdlen.wav
(bug #238)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20340 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-21 19:58:49 +00:00
reimar e87a925c4a Remove #ifdef HAVE_FLAC, it was never needed and nowadays is never defined.
Fixes http://samples.mplayerhq.hu/ogg/old_flac_in_ogg_flac_1_0_4.ogg


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20335 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-21 17:58:33 +00:00
reimar 2b13b3a6c8 Cosmetics: indentation fix indentation broken by last two demuxer.c commits
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20325 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-20 19:36:59 +00:00
reimar d42038edb9 Fix opening of demuxers without check_file function, broken by r20309.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20324 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-20 19:31:52 +00:00
reimar d4d22f49e9 Try other demuxers if open() fails.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20309 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-19 18:20:12 +00:00
reimar 325912bf97 redone subcp_recode: get rid of static buffer, skip lines that failed to
convert instead of removing all remaining lines and remove subcp_recode1
since subcp_recode should now work just as well.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20298 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-18 16:09:59 +00:00