Commit Graph

3327 Commits

Author SHA1 Message Date
reimar 78ecbc1e6f Replace incorrect usage of strncpy.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30500 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-03 22:36:47 +00:00
reimar 9d9b7a1e22 Reindent
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30499 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-03 22:33:35 +00:00
reimar 8613396aa0 Add support for FFmpeg's rtsp dummy URL-with-pseudo-demuxer scheme.
ffmpeg://rtsp://... will play a rtsp stream via FFmpeg.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30498 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-03 22:32:48 +00:00
reimar cc95355a0a Remove ds_fill_buffer calls from demux_resync, they cause issues at least with
the ASF demuxer (seek seems to end up right after the keyframe?) and seem to have
no purpose anyway.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30438 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-26 21:08:01 +00:00
reimar b1f3c590c7 Enable parsing for ASF audio streams.
This is necessary to use the ffmp2 decoder with dvr-ms files.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30437 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-26 18:19:57 +00:00
reimar 2e50d88ab2 If audio was identified as DTS in the PMT do not override that with TrueHD
based only on substream id.
Works with all available DTS and TrueHD samples available (2 each).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30429 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-24 20:54:17 +00:00
reimar b8b5fe5570 Add support for parsing MLP and TrueHD.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30427 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-24 20:05:28 +00:00
reimar 632a899a22 Add forgotten declaration of ds_clear_parser.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30424 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-24 17:05:53 +00:00
reimar 644f2b33ec Remove now unused variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30423 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-24 16:38:46 +00:00
reimar 573a57de1c Reset the parser on seek. Should fix some cases of audio "blips" after seeking.
AC3 is still broken due to the libavcodec parser being broken.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30421 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-24 15:19:14 +00:00
reimar 71dcc053fe Move the resync-related code into more consistent places instead of having it
scattered all over the place with half of it forgotten in some places.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30420 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-24 15:16:39 +00:00
reimar 1a5841fbbb Add a proper header for our strsep implementation so strsep will
not be used without a declaration, causing issues on 64 bit systems.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30355 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-17 15:08:31 +00:00
reimar 1c6c7706ec -demuxer rawaudio data will often need parsing (e.g. when it is used for raw
AC3 instead of libavformat), so set needs_parsing.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30312 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-15 19:01:03 +00:00
reimar e38bcd7d05 Use double-precision constants instead of single precision that gets cast to double.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30299 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-13 17:49:48 +00:00
cehoyos 2b3a5105ff Use double instead of float for pts.
Patch by Dan Oscarsson, Dan D Oscarsson A tieto D com 


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30298 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-12 23:03:03 +00:00
cehoyos a91c19964d Fix MP1 with demuxer lavf in MPEG (PS) files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30250 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-09 11:33:06 +00:00
reimar 2e557e3b28 Add support for JPEG2000 via FFmpeg/OpenJPEG
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30174 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 00:58:56 +00:00
cehoyos ed4dbd3cbd Do not use correct-pts for mpeg-ts and matroska: It breaks PAFF samples.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30134 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-28 13:49:08 +00:00
cehoyos d79daa2736 Revert r30100: It breaks some mov and asf samples.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30133 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-28 13:39:26 +00:00
reimar ca2af2d0e7 Add support for parsing audio streams (though should be easy to extend to video)
via libavcodec.
Parsing can be done at the demuxer stage (currently disabled) or at the decoder
(ad_ffmpeg, enabled).
Should allow using the libavcodec AAC, DTS, ... decoders independent of container
format.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30130 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 15:28:01 +00:00
reimar bcda7b2f99 Remove currently unneeded members accidentally added in the last revision.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30129 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 14:42:37 +00:00
reimar 52dab179cb Introduce a sh_common struct that contains the parts in common by the audio, video
and sub "stream headers".
One reason for this is to help avoid/make more obvious things like members with
the same function but different name (extradata vs. codecdata etc.), or members
with the same name but different semantics (pts for audio vs. pts for video).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30128 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 14:40:56 +00:00
reimar 4fbcbaacbc Remove one more incorrect direct ass.h include.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30127 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 14:35:09 +00:00
reimar e0423842de Fix grammar/missing verb in description.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30112 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-25 09:03:02 +00:00
reimar 57963ac45d Remove unnecessary entries from extension_table, these formats are already
in the lavf preferred_list, and thus will be handled by lavf immediately.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30111 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-25 08:55:36 +00:00
reimar d7549acc01 Add a (unfortunately rather long) explanation on how and when to use it
to the file extension -> demuxer mapping list.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30110 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-25 08:48:57 +00:00
compn c0aeb1c1c7 force cdg to lavf demuxer in extensions.c, misdetected as mpeg otherwise
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30109 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-24 18:20:03 +00:00
compn a0601ed256 create CDGR fourcc in mp_taglist and add ffcdgraphics to codecs.conf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30104 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-24 04:36:04 +00:00
cehoyos 468d5f2e0a Do not use correct-pts by default for demuxer lavf, it breaks all PAFF files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30100 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-22 20:56:59 +00:00
reimar 4ab63df7af Never include ass.h and ass_types.h directly, use ass_mp.h instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30067 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-19 15:32:17 +00:00
reimar baaee832fd Do not modify priv->idx_pos when regenerating the index, use a local
variable instead.
should fix seeking after starting playback with -force-idx broken by
r29914.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30052 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-17 18:31:59 +00:00
reimar a5ceff924f Avoid miscompilation issues with the grow_array function more permanently
by marking it noinline.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29992 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-11 22:27:42 +00:00
reimar af2988cbce Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too many
name clashes, in particular with Windows headers (which define STREAM_SEEK as an enum type).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29962 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-22 15:18:21 +00:00
reimar 897f210bf4 av_alloc_format_context -> avformat_alloc_context
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29959 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-22 14:15:41 +00:00
reimar 054d1889ef Reuse buffer in priv context instead of allocating the 32kB probe buffer
on the stack.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29953 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-22 13:06:44 +00:00
reimar d1a2c82198 Move 128kB buffer from stack to demuxer context.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29940 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-20 23:48:16 +00:00
reimar 66c41d41c5 calloc instead of malloc+memset.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29939 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-20 23:41:06 +00:00
cehoyos c038d74c9b Silence two gcc warnings: suggest parentheses around && within ||
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29934 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-18 18:24:05 +00:00
cehoyos 69e86099e2 Set display size in sh_video when decoding H264.
This fixes H264 VDPAU decoding with some native demuxers.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29920 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-16 21:38:32 +00:00
reimar 9a2be82856 Use calloc instead of initializing each struct member individually to 0.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29914 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-16 10:44:00 +00:00
reimar 4eac890e07 Try to detect broken files with unaligned chunks.
This patch hopefully makes them playable as long as they have and index without
breaking any other files.
Fixes http://samples.mplayerhq.hu/avi/invalid_unaligned.avi with native demuxer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29913 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-16 10:41:06 +00:00
reimar 30ffc2dea4 Fix declarations in mp_taglists.h and include it in mp_taglists.c to
make such mismatches impossible in the future.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29901 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-11 11:52:36 +00:00
reimar 085f35f4b4 Allow lavf demuxer to also probe and play files < 32 kB (full probe buffer size).
Based on patch by On2.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29882 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 16:49:00 +00:00
reimar 5fd17a2c07 Calculate length of ASF files with more than 1 second precision.
Based on patch by On2.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29881 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 16:24:16 +00:00
reimar 48938efe63 Fix length calculation for ASF, preroll is in ms, play time in 100 ns.
Based on patch by On2


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29880 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 16:19:44 +00:00
reimar af9c1fbda3 Remove useless cast
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29879 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 16:15:39 +00:00
reimar 1135e23dfc Free demuxer->teletext when closing the demuxer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29874 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 11:26:03 +00:00
cehoyos 419e4f684a Allow demuxer lavf to export CODEC_ID_DVB_TELETEXT.
Patch by Francesco Lavra, francescolavra interfree it


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29849 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-07 12:55:07 +00:00
cehoyos 423c415534 Separate teletext from tv support.
Path by Francesco Lavra, francescolavra interfree it


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29848 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-07 12:31:05 +00:00
reimar 1698db0726 Remove pointless and broken (e.g. does not set aid and vid) -tsprog handling
from lavf demuxer, mplayer.c makes sure IDENTIFY_PROGRAM is called with the
right arguments, and that code actually works in contrast to the one in demux_open_lavf.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29847 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-07 11:15:26 +00:00