Commit Graph

2796 Commits

Author SHA1 Message Date
nicodvb 9fba49e0bb in update_stats() removed a wrong 'else' that would prevent h264 headers to 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
2007-10-04 17:15:06 +00:00
uau 1c5d870414 Fix missing subtitles after seeking back
Subtitle packets that had been demuxed but whose start time had not
yet been reached were left in the demuxer stream after seeking.
When using the default (non-libass) subtitle rendering this could
block subtitles from appearing as long as the playback position stayed
below the original one before seek. External subtitle files were not
affected.

Fixed by making seek code free all packets from the subtitle stream.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24698 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-04 02:35:34 +00:00
nicodvb f334337426 support for DTS as specified in DVB (untested)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24696 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-03 21:39:01 +00:00
voroshil bc44b16cba Format 0x01 cannot be used with "AMV IMA ADPCM", because it belongs to normal PCM.
Make lavf demuxer set codec tag to AMVA in this case.
No need to use -ac +ffadpcmimaamva anymore.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24694 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-03 15:27:02 +00:00
reimar 9e3315675d Set biWidth/biHeight in fli demuxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24688 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-02 19:22:46 +00:00
reimar 2c1db11dd1 Make sure there is no uninitialized data in BITMAPINFOHEADER created by fli demuxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24687 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-02 19:18:33 +00:00
reimar 3b2eb5fec1 Remove ugly unused struct name from typedef
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24686 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-02 19:13:23 +00:00
voroshil 2b9b873707 AMV demuxer and audio/video decoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24673 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-30 03:49:22 +00:00
henry fffb09b9b3 analyzeduration option for lavf demuxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24655 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-29 07:55:43 +00:00
henry b267bd3921 remove useless int->double conversion
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24654 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-29 07:49:02 +00:00
henry 9b94c1387a fix warnings
demux_lavf.c: In function ‘demux_open_lavf’:
demux_lavf.c:276: warning: assignment discards qualifiers from pointer target type
demux_lavf.c:280: warning: assignment discards qualifiers from pointer target type


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24653 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-29 07:42:31 +00:00
nicodvb 1f2fa1ba48 fixed bug introduced with previous commit: patch_panscan() must work in the sequence_display_extension, not on se_ptr
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24651 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-28 21:20:41 +00:00
nicodvb 1cc65a7889 1000l, the tff flag was never cleared before being overwritten with the value on bff_mask;
also, the sequence extension pointer was set to point to the sequence_display_extension,
so the progressive_sequence was never set and the sde was being corrupted
patch by Christopher Montgomery (xhiphmont xiph org)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24650 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-28 21:13:26 +00:00
lu_zero c0b42bc94a h263 exposed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24645 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-28 11:41:25 +00:00
cehoyos e1fa5aef51 Fix playback of streams with more than one audio track (only one supported).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24618 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-25 22:34:01 +00:00
reimar e907bda20a Simplify: initialize at declaration at the start of the function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24612 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-24 22:21:14 +00:00
reimar fc686f0d6d Get rid of rather pointless asserts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24611 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-24 22:18:47 +00:00
uau b12a08fe6a demux_audio.c: Fix timestamp handling
The code calculated the pts values of audio packets by adding the length
of the current packet to the pts of the previous one. The length of the
previous packet should be added instead. This broke WAV timestamps near
the end of the stream where a short packet occurs.

Change the code to store the pts of the next packet instead of the last
one. This fixes the WAV timestamps and allows some simplifications.
MP3 timestamps are not affected as packets are always treated as
constant decoded length, and FLAC timestamps still have worse problems
(FLAC is treated as as if it was constant bitrate even though it isn't).

Also store the timestamps as double instead of float.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24609 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-24 21:49:56 +00:00
nicodvb 719cb34fb6 removed unused function parameters
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24590 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-22 08:40:02 +00:00
nicodvb 02bcb8e85c in ts_detect_streams() moved the iteration condition inside the loop
because it depends on the updated value of stream_tell();
(fixes infinite wait on enctrypted TS streams)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24589 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-22 08:29:25 +00:00
lu_zero 0ff4b3fd9f libnemesi support, yet another rtsp/rtp library...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24584 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-19 21:38:22 +00:00
diego f5656d7017 Add comment that clears up what _WINGDI_H is for.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24570 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-18 10:56:29 +00:00
ben 304a901fcf reverted useless r24539
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24540 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 21:26:20 +00:00
ben 87e3530225 added monkey audio fourcc in wave header
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24539 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 20:17:22 +00:00
reimar 16bd058e20 Add support for cook audio (though most .rm files don't work with lavf
demuxer anyway)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24538 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 19:33:58 +00:00
reimar 544a306147 Avoid one more code duplication
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24527 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 13:25:56 +00:00
reimar b03ca2821f get rid of pointless size parameter for tmf_load_chunk
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24526 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 12:13:45 +00:00
reimar 40f7ef2fb5 Avoid using demux->stream->end_pos, it rarely does any good.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24525 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 11:56:24 +00:00
reimar 5ea0bc8d0e Slightly simplify IsValidAudioPacket
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24524 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 11:44:51 +00:00
reimar 6bfcbe1e81 Simplify another two ifs into one
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24523 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 11:41:47 +00:00
reimar 7c8fcecc13 Make one mp_msg call out of 3
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24522 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 11:35:35 +00:00
reimar 6954f5c634 Simpler and more robust tar parsing
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24521 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 11:33:31 +00:00
reimar 0d74d82c74 Get rid of bloated ty_extension function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24520 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 11:03:38 +00:00
reimar 749b59ce6c Do not uselessly name structs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24519 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 10:59:27 +00:00
reimar 32c6bdf8c7 Remove another variable and reorder to avoid wasting space due to alignment
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24518 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 10:58:06 +00:00
reimar 41f50de3d0 PTS should be passed as int64_t to demux_ty_CopyToDemuxPacket
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24517 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 10:55:30 +00:00
reimar c1bb529a3e Remove now useless parameters from demux_ty_CopyToDemuxPacket
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24516 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 10:54:37 +00:00
reimar ee9b0c8066 Remove more unused code and variables
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24515 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 10:52:36 +00:00
diego c7303ab055 cosmetics: Fix typo in function name.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24514 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 10:07:08 +00:00
zuxy a353d4e055 Revert r24446 since it breaks mingw32 build: _WINGDI_H is defined in wingdi.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24510 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-15 07:46:38 +00:00
reimar eaf7b8614f live recordings can contain 0-size type 0 chunks, ignore them instead
of erroring out.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24509 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 21:17:48 +00:00
reimar 92f501d8b2 Move some more variable declarations
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24508 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 21:03:08 +00:00
reimar abac8f8fab Remove tabs and trailing whitespace
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24507 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 20:59:05 +00:00
reimar d1ee624657 A few more useless ()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24506 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 20:49:36 +00:00
reimar bf86cc9f87 Minor simplifications
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24505 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 20:48:04 +00:00
reimar 9bb5a91413 Further simplify demux_ty_FindESHeader
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24504 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 20:41:32 +00:00
reimar 99ef8adf6f Optimize demux_ty_FindESHeader
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24503 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 20:37:30 +00:00
reimar 9d885bbbe8 Remove some commented-out debugging code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24502 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 20:18:00 +00:00
reimar 7ffd4426a3 Fix demux_ty_FindESHeader so it won't overread
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24501 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 20:09:39 +00:00
reimar abfe1d69a1 Simplify demux_ty_FindESPacket by reusing demux_ty_FindESHeader
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24500 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-14 20:08:42 +00:00