Commit Graph

100 Commits

Author SHA1 Message Date
uau 6723323303 Clean up audio pts handling, make audio pts tracking in the audio-only
case work the same as with video.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18713 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-14 19:48:54 +00:00
nicodvb 7535dc582a moved store_ughvlc() before #ifdef HAVE_OGGVORBIS, so it can be used by other demuxers when libogg and/or libvorbis are missing
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18670 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-09 21:43:23 +00:00
nicodvb d96e0e658a support for vorbis in mp4/mov
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18668 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-09 21:30:06 +00:00
nicodvb 068fffa36a first vorbis packet before vorbis_synthesis_headeri() must have b_o_s==1
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18638 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-07 22:40: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
rfelker 2539dc0417 accidentally committed this overflow fix with the declaration fix before.
messed up indention corrected at oded's request. :)
10^100l to me too..


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18469 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-13 06:12:25 +00:00
rfelker e70c326727 10^100l c++ declarations
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18466 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-13 05:48:16 +00:00
nicodvb 5d2679c504 unbind demux_ogg from ad_libvorbis; this permits to use -ac ffvorbis without crashes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18431 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-10 22:54:24 +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
diego a33158d60d Convert printfs in aviprint.c to mp_msg and give the information printing
functions in this file a verbosity_level parameter.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17978 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-27 17:25:41 +00:00
diego eebf08b978 Convert all if(verbose>X) to mp_msg_test calls.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17933 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-24 08:12:03 +00:00
reimar e078b7a14e in demux_ogg_read_packet initialize data to whole packet, reduces code and
fixes missing initialization in else + header packet case.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17786 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-08 22:23:21 +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
rathann e7db4ccf1a Patch by Stefan Huehner / stefan % huehner ! org \
patch replaces '()' for the correct '(void)' in function
declarations/prototypes which have no parameters. The '()' syntax tell
thats there is a variable list of arguments, so that the compiler cannot
check this. The extra CFLAG '-Wstrict-declarations' shows those cases.

Comments about a similar patch applied to ffmpeg:

That in C++ these mean the same, but in ANSI C the semantics are
different; function() is an (obsolete) K&R C style forward declaration,
it basically means that the function can have any number and any types
of parameters, effectively completely preventing the compiler from doing
any sort of type checking. -- Erik Slagter

Defining functions with unspecified arguments is allowed but bad.
With arguments unspecified the compiler can't report an error/warning
if the function is called with incorrect arguments. -- Måns Rullgård


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17567 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-09 14:08:03 +00:00
reimar f8c0e0cf04 fix crash with invalid -vid and no audio stream
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17219 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-18 11:55:47 +00:00
rathann d5505c8f9e fix
demux_ogg.c:371: warning: implicit declaration of function '_ilog'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17091 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-05 01:25:31 +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
reimar 4e76145381 Speex support. Seeking and pts generation does not work.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16916 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-05 11:58:25 +00:00
reimar 754c2b98ef Fix two (loosely) related bugs: massive A-V desync with -audiofile (bugzilla
bug #375, sh_audio->delay must only be set when seeking, not at every packet)
and not switching to the next file when seeking hits eof.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16885 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-01 16:12:53 +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
rtognimp 2b04744d21 Don't pass NULL pointers to demux_info_add()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16605 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-26 20:13:10 +00:00
alex 00857cf5ce Disassemble comments and pass it to the demux_info interface
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16538 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-19 22:52:03 +00:00
ods15 d620029e4b Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
accuracey may be totally fake for some demuxers (mpg), but accurate for
others.. (avi)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16347 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-02 08:32:32 +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 a2ac4cd246 prevent possible exploit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15427 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-13 00:00:54 +00:00
nicodvb a66c45716a fixup the correct sh_a
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15425 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-12 23:27:22 +00:00
nicodvb 15ba985140 fixed too few parameters to mp_msg(); silence compilation warnings, removed unused variable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15424 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-12 23:12:27 +00:00
nicodvb da2a598d9d don't call fixup_audio if there's no audio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15423 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-12 23:01:52 +00:00
nicodvb 3d450d0389 vorbis extradata is now passed from demuxer to decoder in matroska's way
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15421 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-12 17:35:58 +00:00
reimar 83d4f16ae5 Fix the memleak fix: in case of error, demux_close_ogg should be called
only once and demuxer->priv be freed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15322 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-02 07:59:12 +00:00
mosu 9e5531f861 Nasty workaround for codec initialization data. In _at least_ one case (AAC) the stream_header.size element seems to be four bytes off. Skip those bytes but only for known cases (again AAC) and not for all.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15314 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-01 10:40:42 +00:00
rfelker 4eb1b755bb Fix the ogg fourcc nightmare!!!
The problem: once upon a time, windows idiots decided to try to store
vorbis-in-ogg-in-avi. Of course this failed miserably, but they used
the audio format tag 0xfffe for "extended" to do this. Later someone
working on MPlayer somehow decided 0xfffe was the format for vorbis,
which is nonsense, and now that's conflicting with real wav files with
extended audio format. This patch changes demux_ogg (and mkv) to use
sane fourcc's for vorbis and theora and gets rid of the 0xfffe
nonsense so hopefully wav files with extended audio will work now.
If there are problems, we'll have to find workarounds...and drive an
18-wheeler full of cola thru the house of whoever wrote this 0xfffe
nonsense in MPlayer to begin with...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14844 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-27 18:11:17 +00:00
henry 3d602b653c Theora fixes:
- do not use negative stride (fixes -vf pp crash)
- pass true image dimensions to VO, not the aligned ones (fixes incorrect
aspect ratio bug & black bar under video)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14764 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-22 19:18:45 +00:00
reimar 02f5ebf1d5 Memleak fixes. Based on patch by Timothy Lee (timothy lee at siriushk com).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14667 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-06 10:30:10 +00:00
mosu 3de4b2a2d5 More user-friendly stream, -xid and -slang info output even in non-verbose mode part 2.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14575 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-22 14:28:23 +00:00
mosu 1d60bf5454 More user-friendly stream, -xid and -slang info output even in non-verbose mode.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14563 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-21 18:55:01 +00:00
reimar e7568f0179 100l, completely broken pointer arithmetic causing crashes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14536 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-19 12:12:36 +00:00
mosu 50a86fcc34 Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14047 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-25 22:24:00 +00:00
mosu 9ea3354fbf Fix member alignment for usage on 64bit processors.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13882 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-05 21:40:34 +00:00
mosu 6bc7b34350 Declare a prototype for the function before it is used. Otherwise some compiler versions will "optimize" them away, and linking will fail.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13804 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-30 08:42:25 +00:00
reimar 82f168a4f6 some memory leaks fixed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13642 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-14 15:09:35 +00:00
joey c9040923b7 show ogg subtitle language on OSD, if available
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13503 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-28 14:00:49 +00:00
joey baef32bc2c fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13502 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-28 13:51:20 +00:00
mosu bddf8c6c27 Do not use globals. Put the variables into the appropriate demuxer struct instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13128 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-24 21:20:24 +00:00
joey 1b8e3babb8 moved combined vobsub_lang into sub_select
add support for dvd subs and ogg subs into sub_select
document sub_select
vobsub_lang left as a link to sub_select for backwards compatibility


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13090 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-22 18:47:48 +00:00
reimar 57b8d5c7f6 fixes a crash and unchecked string-handling in ENCA code.
Also does a bit of cleanup.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12910 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-07-28 12:40:35 +00:00
mosu e9ff38d39b The granulepos does not depend on the number of channels, only on the sample size. Patch by Wolfram Gloger (wmglo at dent dot med dot uni-muenchen dot de).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12704 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-06-27 13:55:40 +00:00
henry c1f6ffe35d ENCA support (http://trific.ath.cx/software/enca/)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12444 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-05-08 17:52:25 +00:00
mosu 7ca187a068 Cosmetics. Shortened the "displaying subtitle..." message. Replaced "OGG" with "Ogg" as it is a name, not an abbreviation/acronym.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12435 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-05-07 08:31:39 +00:00