summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_ts.c
Commit message (Collapse)AuthorAgeFilesLines
* Fix for bugzilla #835rtogni2007-07-241-1/+1
| | | | | | | | | | | | | | 1) set audio language preferences (on command line or in ~/.mplayer/config). (say, alang = Japanese[jpn],ja,jp,jpn,English[eng],en,eng,ko,ru,rus) 2) play a transport stream whose audio streams are not labeled -> no audio Patch by Sergey Svishchev >>> svs - ropnet ru <<< on bugzilla Blessed by nicodvb git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23855 b3059339-0415-0410-9bf9-f77b7e298cf2
* init ts_probe to 0 and probe up to TS_MAX_PROBE_SIZE if the parameternicodvb2007-06-091-4/+5
| | | | | | | | | is not explicitly set by the user; make the code that checks audio-only stream files respect -tsprobe git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23529 b3059339-0415-0410-9bf9-f77b7e298cf2
* added support for DTS1 audio descriptornicodvb2007-06-091-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23527 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1000000l, descriptor VC-1 identifies VIDEO_VC1, not AUDIO_DTSnicodvb2007-06-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23526 b3059339-0415-0410-9bf9-f77b7e298cf2
* prog_id is an uint16_t; reported by Mario Rossi (mariofurire googlemail com)nicodvb2007-06-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23445 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add explicit location for headers from the stream/ directory.diego2007-03-151-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22623 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed duplicated code in demux_seek(); stream_seek() already aligns to ↵nicodvb2007-02-271-6/+0
| | | | | | STREAM_BUFFER_SIZE boundary git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22370 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmeticsnicodvb2007-02-171-31/+28
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22249 b3059339-0415-0410-9bf9-f77b7e298cf2
* when seeking in h264 sync to idr framesnicodvb2007-02-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22183 b3059339-0415-0410-9bf9-f77b7e298cf2
* when playing vc1 content sync to sequence or entry point headernicodvb2007-02-091-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22181 b3059339-0415-0410-9bf9-f77b7e298cf2
* vc1 in mpegtsnicodvb2007-02-091-2/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22180 b3059339-0415-0410-9bf9-f77b7e298cf2
* reduced verbositynicodvb2007-01-291-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22068 b3059339-0415-0410-9bf9-f77b7e298cf2
* 5l, check that the codec type detected by ts_detect_streams() is actually ↵nicodvb2007-01-291-1/+1
| | | | | | audio before fixing it in the array git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22067 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix audio type when ts_detect_streams detects that a private1 stream is ↵nicodvb2007-01-291-0/+3
| | | | | | actually ac3 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22066 b3059339-0415-0410-9bf9-f77b7e298cf2
* unified creation of sh_audio and sh_video is ts_add_stream; patch by elupusnicodvb2007-01-171-70/+75
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21947 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of min/max macros from aviheader.h, they do not belong here.reimar2006-12-091-4/+4
| | | | | | | Replace their uses by FFMIN/FFMAX git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21547 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove superfluous bswap.h include.diego2006-12-021-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21437 b3059339-0415-0410-9bf9-f77b7e298cf2
* slight simplification in demux_control_ts: no need to check *arg with ↵nicodvb2006-11-201-1/+1
| | | | | | last_{aid,vid} (small bugfix, too) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21115 b3059339-0415-0410-9bf9-f77b7e298cf2
* in demux_ts_control unified SWITCH_AUDIO and SWITCH_VIDEO (they were identical)nicodvb2006-11-191-79/+33
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21088 b3059339-0415-0410-9bf9-f77b7e298cf2
* during DEMUXER_CTRL_SWITCH_x *arg set to -2 identifies 'disable stream x'nicodvb2006-11-191-6/+20
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21083 b3059339-0415-0410-9bf9-f77b7e298cf2
* implemented DEMUXER_CTRL_IDENTIFY_PROGRAMnicodvb2006-11-181-0/+85
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21022 b3059339-0415-0410-9bf9-f77b7e298cf2
* COSMETICS: reformattednicodvb2006-11-161-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20971 b3059339-0415-0410-9bf9-f77b7e298cf2
* restored circular looping when changing audio and video stream (previously ↵nicodvb2006-11-161-2/+6
| | | | | | broken) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20970 b3059339-0415-0410-9bf9-f77b7e298cf2
* reset demuxer's buffered demux_packet after DEMUXER_CTRL_SWITCH_AUDIOnicodvb2006-11-161-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20968 b3059339-0415-0410-9bf9-f77b7e298cf2
* implemented DEMUXER_CTRL_SWITCH_VIDEOnicodvb2006-11-161-1/+75
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20967 b3059339-0415-0410-9bf9-f77b7e298cf2
* a previous commit introduced a bug that prevented tables nicodvb2006-10-291-8/+4
| | | | | | | | 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
* simplified assignment of subtitles stream in ts_parse()nicodvb2006-10-291-14/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20522 b3059339-0415-0410-9bf9-f77b7e298cf2
* handle broken ts packets before parsing the restnicodvb2006-10-291-23/+16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20506 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: reformatted after previous commitnicodvb2006-10-291-8/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20504 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1000l: fixed broken handling of the adaption field - part 2nicodvb2006-10-291-1/+11
| | | | | | | | 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
* fixed mishandling of stream_read() (it doesn't necessarily return -1 in case ↵nicodvb2006-10-291-3/+3
| | | | | | of error) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20502 b3059339-0415-0410-9bf9-f77b7e298cf2
* ts_parse() move section handling after stream_read() rather than repeating itnicodvb2006-10-291-49/+41
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20501 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed useless check: when is_start is set the size of the payload nicodvb2006-10-281-6/+0
| | | | | | | can be at most 184 bytes git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20496 b3059339-0415-0410-9bf9-f77b7e298cf2
* in ts_parse() centralized stream_read()+stream_skip(); smaller and cleanernicodvb2006-10-281-31/+23
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20494 b3059339-0415-0410-9bf9-f77b7e298cf2
* readability cosmeticsnicodvb2006-10-281-3/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20488 b3059339-0415-0410-9bf9-f77b7e298cf2
* unconditionally assign the language code when available;nicodvb2006-10-281-14/+13
| | | | | | | more simplifications git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20487 b3059339-0415-0410-9bf9-f77b7e298cf2
* reformatted ts_parse() after previous commitnicodvb2006-10-281-34/+34
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20483 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed unreachable code (when len=pes_parse2() returns 0)nicodvb2006-10-281-25/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20481 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l: fixed misplaced adaption field checknicodvb2006-10-281-6/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20480 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed commented crc32 code; I'll eventualy reuse the one in lavunicodvb2006-10-281-16/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20479 b3059339-0415-0410-9bf9-f77b7e298cf2
* slight simplificationsnicodvb2006-10-281-19/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20478 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixed corner case previously mishandled: don't play an audio only stream whennicodvb2006-10-171-1/+3
| | | | | | | -nosound is specified git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20289 b3059339-0415-0410-9bf9-f77b7e298cf2
* during stream detection always parse ts_probesize bytes (even with -nosound ↵nicodvb2006-10-151-6/+0
| | | | | | | | | | 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
* Get rid of demux_aid_vid_mismatch mess.reimar2006-08-261-6/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19546 b3059339-0415-0410-9bf9-f77b7e298cf2
* don't try to autodetect aac in pes packets (the detection is prone to give ↵nicodvb2006-08-261-17/+2
| | | | | | 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
* reduced standard verbosity and changed output messages to more uniform ↵nicodvb2006-06-141-13/+13
| | | | | | descriptions git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18717 b3059339-0415-0410-9bf9-f77b7e298cf2
* support for audio stream switchingnicodvb2006-06-121-3/+98
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18691 b3059339-0415-0410-9bf9-f77b7e298cf2
* support for dts (identified only by the PMT, not from the bitstream)nicodvb2006-06-041-1/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18566 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixed wrong assignment of stream type in generic PES_PRIVATE1 streams ↵nicodvb2006-06-041-1/+1
| | | | | | (didn't respect the type qualified in the PMT) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18565 b3059339-0415-0410-9bf9-f77b7e298cf2
* one more a52 descriptor (dvb impl., untested)nicodvb2006-06-041-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18564 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix potential integer overflows in memory allocation.rtogni2006-06-041-7/+0
| | | | | | | Patch by Rich and me git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18559 b3059339-0415-0410-9bf9-f77b7e298cf2
* where necesary, replaced all realloc() with realloc_struct() to prevent int ↵nicodvb2006-05-131-4/+14
| | | | | | oveflows git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18476 b3059339-0415-0410-9bf9-f77b7e298cf2
* when searching ac3 in unqualified pes_private1 streams there's no need to ↵nicodvb2006-05-131-0/+3
| | | | | | 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
* allocate correct extradata sizenicodvb2006-05-121-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18465 b3059339-0415-0410-9bf9-f77b7e298cf2
* raised max extradata size and refuse to store more than the limitnicodvb2006-05-121-1/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18463 b3059339-0415-0410-9bf9-f77b7e298cf2
* don't allocate (and demux_push() immediately) demux_packet()s > ↵nicodvb2006-05-121-2/+4
| | | | | | 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
* search ac3 in dvd substream only if pes_aligned flag is set in the pes ↵nicodvb2006-05-121-1/+1
| | | | | | headers, otherwise false positives are likely to occur git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18461 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get ride of the several if(identify) messy lines and rearangment of some of ↵reynaldo2006-04-241-14/+7
| | | | | | 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
* segfault fix: assign param->apid (that is the audio id found) when ↵nicodvb2006-04-051-0/+1
| | | | | | 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
* init variable in parse_mp4_object_descriptor before using it; fixes cid 237nicodvb2006-03-111-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17817 b3059339-0415-0410-9bf9-f77b7e298cf2
* print ts_probe; 0x88 .. 0x8F in pes_private streams are not AC3 but DTS ↵nicodvb2006-03-041-2/+4
| | | | | | 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
* Second-try commit of this patch.corey2006-02-171-1/+1
| | | | | | | | | | | | 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
* Reverse commit of unfinished patch for passing audio_delay to the demuxers.corey2006-02-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17570 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1. Include audio_delay as an argument to demux_seek.corey2006-02-071-1/+1
| | | | | | | | | | | 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
* export custom mp_a52_framesize(), needed to parse ac3 frames when liba52 is ↵nicodvb2006-01-271-3/+6
| | | | | | 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
* Update licensing information: The FSF changed postal address.diego2006-01-131-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17368 b3059339-0415-0410-9bf9-f77b7e298cf2
* Unify include path handling, -I.. is in CFLAGS.diego2005-11-181-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17013 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixed possible uint8 overflow; assign progid to the newly created pmtnicodvb2005-11-061-7/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16935 b3059339-0415-0410-9bf9-f77b7e298cf2
* more precise seeking based on calculated average video bitrate; works quite ↵nicodvb2005-10-311-6/+49
| | | | | | 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
* move resync_audio_stream after seeking to demuxer.creimar2005-10-301-3/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16878 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use PRI?64 defines as format strings for 64 bit variables.reimar2005-10-131-5/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16751 b3059339-0415-0410-9bf9-f77b7e298cf2
* Crash fix for: "[MPlayer-users] Crash of mencoder in demux_ts.c line 2728"gpoirier2005-08-231-0/+3
| | | | | | | | | "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
* Demuxer modularizationrtognimp2005-08-051-7/+27
| | | | | | | Demuxer selection by name with -demuxer command (bakward compatible) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16176 b3059339-0415-0410-9bf9-f77b7e298cf2
* pass along audio extradata if presentnicodvb2005-06-061-0/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15670 b3059339-0415-0410-9bf9-f77b7e298cf2
* set width, height and biCompression when the video stream contains avc1; ↵nicodvb