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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
73f0dec489
fixed corner case previously mishandled: don't play an audio only stream when
...
-nosound is specified
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20289 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-17 21:26:30 +00:00
d944bfd221
during stream detection always parse ts_probesize bytes (even with -nosound set),
...
otherwise the demuxer may not have a chance to correctly identify the stream type
(e.g. H264 was misidentified as MPEG2 with -nosound set)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20219 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-15 09:29:02 +00:00
ccf75d6711
Get rid of demux_aid_vid_mismatch mess.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19546 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-26 19:17:04 +00:00
d8dab41707
don't try to autodetect aac in pes packets (the detection is prone to give wrong results); use the stream_type from the PMT instead
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19543 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-26 17:31:42 +00:00
d4b348d3ef
reduced standard verbosity and changed output messages to more uniform descriptions
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18717 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-14 22:22:34 +00:00
be03496d6b
support for audio stream switching
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18691 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-12 23:06:21 +00:00
4b73c3e3a4
support for dts (identified only by the PMT, not from the bitstream)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18566 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-04 23:23:58 +00:00
38df528583
fixed wrong assignment of stream type in generic PES_PRIVATE1 streams (didn't respect the type qualified in the PMT)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18565 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-04 23:16:09 +00:00
b938bd87d4
one more a52 descriptor (dvb impl., untested)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18564 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-04 23:11:40 +00:00
9da9317579
Fix potential integer overflows in memory allocation.
...
Patch by Rich and me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18559 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-04 22:41:27 +00:00
2f1b01e307
where necesary, replaced all realloc() with realloc_struct() to prevent int oveflows
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18476 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-13 10:49:46 +00:00
a36608cd9a
when searching ac3 in unqualified pes_private1 streams there's no need to scan > 64 KB of data: frames can't be so far apart
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18475 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-13 10:09:33 +00:00
daa31ef05c
allocate correct extradata size
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18465 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-12 22:33:42 +00:00
e631410ee7
raised max extradata size and refuse to store more than the limit
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18463 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-12 22:21:29 +00:00
e32c4c5712
don't allocate (and demux_push() immediately) demux_packet()s > MAX_PACK_SIZE; releasing immediately audio packets (before the pes is complete) doesn't make any sense and deteriorates interleaving
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18462 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-12 21:34:06 +00:00
dd9d768293
search ac3 in dvd substream only if pes_aligned flag is set in the pes headers, otherwise false positives are likely to occur
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18461 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-12 20:26:05 +00:00
3a406e94d7
Get ride of the several if(identify) messy lines and rearangment of some of the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18238 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 07:20:34 +00:00
7d8d007650
segfault fix: assign param->apid (that is the audio id found) when inexistent audio language is specified; patch by Erik Auerswald auerswal a unix-ag d uni-kl d de
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18044 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-05 18:50:24 +00:00
c446e2e8ee
init variable in parse_mp4_object_descriptor before using it; fixes cid 237
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17817 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-11 23:26:02 +00:00
63985abe1a
print ts_probe; 0x88 .. 0x8F in pes_private streams are not AC3 but DTS tracks (unsupported); save the size of the payload of the current PES packet in any case (used for ac3 detection)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17725 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-04 11:00:20 +00:00
1ab575101a
Second-try commit of this patch.
...
1. Include audio_delay as an argument to demux_seek.
2. Modify demux_seek_avi to adjust the audio/video stream positions so
that mplayer/mencoder will instantly be in sync even when -delay is
specified.
I've quadruple checked this time; hopefully I haven't missed anything.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17637 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-17 01:57:41 +00:00
3f6e7ce5f5
Reverse commit of unfinished patch for passing audio_delay to the demuxers.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17570 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-09 19:39:51 +00:00
15debd85d2
1. Include audio_delay as an argument to demux_seek.
...
2. Modify demux_seek_avi to adjust the audio/video stream positions so
that mplayer/mencoder will instantly be in sync even when -delay is
specified.
Other demuxers could be modified similarly in the future.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17554 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-07 20:22:44 +00:00
3ba7533cca
export custom mp_a52_framesize(), needed to parse ac3 frames when liba52 is not present; will be moved in a more appropriate place sometimes in the future
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17493 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-27 23:07:16 +00:00
reimar
diego
nicodvb
rtogni
reynaldo
corey