Commit Graph

34 Commits

Author SHA1 Message Date
wm4 c323592c3a libmpdemux: add back demux_mpg
Apparently this was needed for good DVD playback.

This demuxer has been removed in 1fde09db6f. All code added comes
from the revision before that. Some other bits have been removed in
later commits, and are added back as well.

Usage of memalign() is replaced by av_malloc(). As far as I can tell,
this memory is never free'd or reallocated, so no calls to av_free()
have been added.

The code re-added to video.c is plain horrible, full of code
duplication, full of demuxer/codecs specifics, but apparently needed.

Unrelated to re-adding the demuxer, re-add one codepath for
DEMUXER_TYPE_TV, which was accidentally removed in the same commit
demux_mpg was removed.

The closed captions decoder is not re-added.
2012-09-18 21:07:30 +02:00
wm4 1fde09db6f Remove some demuxers and decoders
Most of these demuxers and decoders are provided in better form by
libav, while the mplayer builtin ones are essentially unmaintained. The
only legimitate use case for not using the libav ones was working around
libav bugs or bugs related to the way mplayer uses libav. Instead of
trying to keep dead code alive, development effort should go into
improving libav or the mplayer libav glue code.

Note that the libav demuxer have been preferred over the mplayer builtin
ones for a while in mplayer2. There were some exceptions: playing DVDs
with dvdnav or playing network sources. (That's because some stream
modules and network.c requested explicit file formats, such as
DEMUXER_TYPE_MPEG_PS, which mapped to builtin demuxers.) With this
commit, they are switched to use libav. One caveat is that the requested
format is not passed to libavformat, instead we rely on the auto probing
to select the correct libav demuxer (see code in demux_open_stream()).
2012-07-30 22:14:32 +02:00
reimar 00ffdc0da6 cleanup: some warning fixes and minor cleanups
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33399 b3059339-0415-0410-9bf9-f77b7e298cf2

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33400 b3059339-0415-0410-9bf9-f77b7e298cf2

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33421 b3059339-0415-0410-9bf9-f77b7e298cf2

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33425 b3059339-0415-0410-9bf9-f77b7e298cf2

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33426 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-06-29 09:17:19 +03:00
Clément Bœsch b68f9fef32 cleanup: shut up more warnings 2011-05-06 18:33:16 +03:00
diego 342c68283e mpeg_hdr.c: move function to avoid forward declaration
Move mp_unescape03 function around to avoid forward declaration.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32433 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
cehoyos 6c239f12ff Calculate width and height in mp4_header_process_vop().
Fixes elementary streams with -vc ffodivxvdpau and the native demuxer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30904 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-15 22:32:11 +00:00
cehoyos 0eee2d2bd5 Fix value of bit counter at end of functions to prepare for future patches.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30903 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-15 22:28:08 +00:00
reimar b3406c7d67 Initialize frame rate extension fields in mp_header_process_sequence_header
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30682 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-21 14:05:51 +00:00
reimar 264e6c23fe Parse and use the information from the frame rate extension header for MPEG-2.
-identify still does not show the right values though.
Fixes bug #1636.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30681 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-21 13:53:41 +00:00
cehoyos 6a3c6ad075 Fix H.264 SPS parsing in case of scaling list present.
Patch by Marco Munderloh, munderl A tnt D uni-hannover D de 


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29494 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-11 18:44:43 +00:00
diego 6e9cbdc104 whitespace cosmetics: Remove all trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-13 02:58:57 +00:00
diego f077569dff Add standard license header to all files in libmpdemux.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29280 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-08 21:51:13 +00:00
diego c610bb50be Mark constant argument of mp_header_process_sequence_header as such.
fixes warning:
vd_mpegpes.c: In function 'decode':
vd_mpegpes.c:49: warning: passing argument 2 of 'mp_header_process_sequence_header' discards qualifiers from pointer target type


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24812 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-19 10:08:02 +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 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
nicodvb 56286b38d4 COSMETICS: moved code to parse mpeg1/2 A/R to mpeg_hdr.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18399 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-07 16:05:38 +00:00
nicodvb 0b0fac0e9c H264: when fixed_fps is set the framerate is expressed in fields per second, so it must be halved
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17953 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-25 23:07:28 +00:00
nicodvb 24096d2755 multiplying fps by 10000 is no more necessary (when determining mp4v and h264 framerate)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16320 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-30 22:07:30 +00:00
rfelker a6e05bcdbb 100l to whoever wrote this crap using 1/10000 units. it caused framerates to get trashed from 30000/1001 to 2997/100, etc.!
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16185 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-06 16:15:07 +00:00
lorenm d4eed8f8d2 demux high profile H.264 ES
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15619 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-02 21:16:21 +00:00
rfelker 14158adbbc proper fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15226 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-20 15:17:08 +00:00
rfelker d9b5ebeba3 undo dominik's 1000l cvs admin -o (recommitting bad patch)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15225 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-20 15:16:31 +00:00
lorenm f3bf706a77 integer overflow when reading fps from h264 vui.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15218 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-19 21:17:39 +00:00
nicodvb f1a9cf6c69 assign picture->(width,height) when parsing h264
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15074 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-09 11:00:00 +00:00
nicodvb 2c2ea161cb export getbits() as mp_getbits()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14968 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-20 14:16:21 +00:00
rathann 8896e5e98f Fix:
mpeg_hdr.c:212: warning: no return statement in function returning non-void
mpeg_hdr.c:262: warning: suggest parentheses around assignment used as truth value
mpeg_hdr.c:264: warning: suggest parentheses around assignment used as truth value
mpeg_hdr.c:270: warning: suggest parentheses around assignment used as truth value
mpeg_hdr.c:275: warning: suggest parentheses around assignment used as truth value
mpeg_hdr.c:212: warning: control reaches end of non-void function

mp4_header_process_vop() return value isn't used anywhere anyway.

Approved by Nico.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14888 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-01 23:45:32 +00:00
rathann 77fab94da1 missing #include (for malloc and free)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14887 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-01 22:57:57 +00:00
nicodvb e0e161dd83 framerate autodetection for H264 in raw/ts streams
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14799 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-24 20:02:41 +00:00
nicodvb 70a7a6b450 automatic fps calculation for mpeg4 in raw stream/mpeg-ts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14478 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-12 20:43:53 +00:00
ranma 5d60484769 Remove useless "size restrictions" message
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12756 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-07-03 11:38:56 +00:00
iive ffce5bb4b4 mpeg2 chroma422/444 support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12563 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-06-11 08:09:24 +00:00
arpi 4441723cf9 after some STFW i've found some info about fps codes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5442 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-31 23:46:00 +00:00
arpi 12a1313fbd mtvp says its' 29.97 not 1 fps
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5441 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-31 23:30:55 +00:00
arpi f395431b7d mpeg video header parser
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2566 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-10-30 18:45:54 +00:00