Commit Graph

81 Commits

Author SHA1 Message Date
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
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
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
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
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
nicodvb 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
nicodvb 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
reimar 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
nicodvb 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
nicodvb 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
nicodvb 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
nicodvb 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
nicodvb 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
nicodvb 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
rtogni 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
nicodvb 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
nicodvb 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
nicodvb 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
nicodvb 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
nicodvb 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
nicodvb 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
reynaldo 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
nicodvb 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
nicodvb 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
nicodvb 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
corey 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
corey 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
corey 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
nicodvb 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
diego 988281c471 Update licensing information: The FSF changed postal address.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17368 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-13 00:23:32 +00:00
diego 36e1974be0 Unify include path handling, -I.. is in CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17013 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-18 14:39:25 +00:00
nicodvb f57a65dd86 fixed possible uint8 overflow; assign progid to the newly created pmt
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16935 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-06 16:17:17 +00:00
nicodvb af89106f3f more precise seeking based on calculated average video bitrate; works quite well in case of a TS with only 1 video stream
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16884 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-31 23:38:32 +00:00
reimar 2912984517 move resync_audio_stream after seeking to demuxer.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16878 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-30 09:19:05 +00:00
reimar 169416fd51 Use PRI?64 defines as format strings for 64 bit variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16751 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-13 18:33:56 +00:00
gpoirier dd4390af8b Crash fix for: "[MPlayer-users] Crash of mencoder in demux_ts.c line 2728"
"The code which crashes looks like its trying to parse the subtitle stream,
 and failing, I assume because dvbsub_lang is a invalid pointer, or null."
Patch by Nico Sabi


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16293 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-23 08:23:53 +00:00
rtognimp cd68e1618b Demuxer modularization
Demuxer selection by name with -demuxer command (bakward compatible)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16176 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-05 19:57:47 +00:00
nicodvb 8f224ba1bc pass along audio extradata if present
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15670 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-06 20:49:55 +00:00
nicodvb 4493ca4321 set width, height and biCompression when the video stream contains avc1; reuse a private member rather than a in-stack packet[204]; set pes_es->is_synced =1 when au_start=1 (SL); update PMT when setting mp4es codec (SL); fix tss->is_synced assignment (don't forget the value when it was previously set)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15076 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-09 11:30:59 +00:00