1
mirror of https://github.com/mpv-player/mpv synced 2025-01-09 01:36:25 +01:00
Commit Graph

108 Commits

Author SHA1 Message Date
diego
43bd3a468e warning fixes:
input.c: In function 'mp_input_set_section':
input.c:1640: warning: suggest parentheses around assignment used as truth value
input.c:1643: warning: suggest parentheses around assignment used as truth value
mga_common.c: In function 'mga_init':
mga_common.c:394: warning: suggest parentheses around assignment used as truth value
playtreeparser.c: In function 'parse_smil':
playtreeparser.c:523: warning: suggest parentheses around assignment used as truth value
libmpdemux/demux_ts.c: In function 'ts_parse':
libmpdemux/demux_ts.c:2795: warning: suggest parentheses around assignment used as truth value
libmpdemux/demux_ts.c: In function 'demux_open_ts':
libmpdemux/demux_ts.c:591: warning: 'frame_length' may be used uninitialized in this function


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24444 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-13 13:16:30 +00:00
diego
a0c2348a70 Remove redundant variable declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24167 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 12:12:31 +00:00
rtogni
4b2b42adfa Fix for bugzilla #835
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
2007-07-24 21:04:08 +00:00
nicodvb
990b33b1c2 init ts_probe to 0 and probe up to TS_MAX_PROBE_SIZE if the parameter
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
2007-06-09 18:20:21 +00:00
nicodvb
90a8abd89c added support for DTS1 audio descriptor
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23527 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-09 11:57:22 +00:00
nicodvb
3c4127353a 1000000l, descriptor VC-1 identifies VIDEO_VC1, not AUDIO_DTS
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23526 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-09 11:56:10 +00:00
nicodvb
5fe0ff0e1b prog_id is an uint16_t; reported by Mario Rossi (mariofurire googlemail com)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23445 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-02 10:26:37 +00:00
diego
e085bc8dcf Add explicit location for headers from the stream/ directory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22623 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 18:36:36 +00:00
nicodvb
5ad12e4fbb removed duplicated code in demux_seek(); stream_seek() already aligns to STREAM_BUFFER_SIZE boundary
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22370 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-27 20:22:05 +00:00
nicodvb
2dd4906d55 cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22249 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-17 17:24:07 +00:00
nicodvb
9b618f615e when seeking in h264 sync to idr frames
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22183 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-09 19:47:20 +00:00
nicodvb
9194c790ea when playing vc1 content sync to sequence or entry point header
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22181 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-09 19:44:21 +00:00
nicodvb
1f357e2f06 vc1 in mpegts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22180 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-09 19:39:31 +00:00
nicodvb
fc65d8d101 reduced verbosity
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22068 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-29 23:35:08 +00:00
nicodvb
4d31f5e2ea 5l, check that the codec type detected by ts_detect_streams() is actually audio before fixing it in the array
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22067 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-29 23:10:01 +00:00
nicodvb
9b9485027e fix audio type when ts_detect_streams detects that a private1 stream is actually ac3
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22066 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-29 22:49:14 +00:00
nicodvb
8397554a2a unified creation of sh_audio and sh_video is ts_add_stream; patch by elupus
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21947 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-17 00:12:35 +00:00
reimar
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
diego
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
nicodvb
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
nicodvb
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
nicodvb
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
nicodvb
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
nicodvb
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
nicodvb
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
nicodvb
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
nicodvb
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
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