Commit Graph

345 Commits

Author SHA1 Message Date
michael 87323740ed feed something (hopefully correct timestamps) into the video filter chain
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17911 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-21 23:09:52 +00:00
nicodvb 36ac215b45 temporarily disabled the coercion of audio_preload=0 for -of mpeg until I find a proper fix: it horribly distorts filtered sound
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17896 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-19 17:28:13 +00:00
diego 47a665f8c9 The system-wide and the user-specific MEncoder configuration file should both
be called 'mencoder.conf', not two different names over which code and
documentation disagree.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17870 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-14 23:33:37 +00:00
ods15 6133e7cf87 Add uninit for audio before switching to next file and completing encode
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17676 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-24 15:43:20 +00:00
corey 960b978a03 Fix video delay when encoding with B-frames.
Encoding delay is adjusted for on-the-fly during encoding.

Decoding delay is compensated for by setting an appropriate dwStart on
the audio stream (only in muxer_avi at this point).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17660 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-21 09:39:22 +00:00
corey 6f446f41b5 New option: -ignore-start
Makes mplayer and mencoder ignore dwStart in AVI files.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17655 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-20 09:36:10 +00:00
corey 89d848a8a2 dwStart support for mencoder.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17649 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-19 09:34:37 +00:00
ods15 0d29a779f8 deobfuscate some a/v sync code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17648 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-19 04:31:14 +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
nicodvb f888ebd181 muxer_mpeg MUST be used with audio_preload=0
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17591 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-11 21:29:03 +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
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
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
michael e6338c5858 change muxer_write_chunk() so that pts/dts _could_ be passed from encoder to muxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17488 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-26 19:32:07 +00:00
rathann 2601de4120 massive attack: mp_msg printf format fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17367 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-12 20:04:36 +00:00
gpoirier a68b16aec1 Update copyright date to 2006
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17313 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-04 15:28:02 +00:00
nicodvb fc64668e65 disable dvd subtitles by default
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17298 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-03 20:55:27 +00:00
ods15 da8fe66f05 "cfg-mplayer-def.h" is what is written in ~/.mplayer/config when it is not
found, completely unnecessary in mencoder.c


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17214 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-17 19:55:39 +00:00
wanderer 83e5f5e72a make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17197 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-15 17:57:18 +00:00
ods15 d23cd76afb more warning fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17123 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-07 10:07:27 +00:00
ods15 aba4eee72d compiler warning fixes, some of these were actual (printing) bugs.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17122 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-07 09:56:44 +00:00
ods15 5cba0a4078 Some more cola for msglevel, codec-cfg can't even call mp_msg_init or it'll
print bogus stuff.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17121 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-07 05:12:07 +00:00
ods15 5aac28ec24 new -msglevel option, constrols msg level for every msg module
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17107 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-06 08:42:48 +00:00
rfelker 6a3353a1e9 fatal error when muxer cannot initialize
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17079 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-02 19:41:25 +00:00
reynaldo 2ae5a0788d Clean up some muxer messages, patch by Corey Hickey bugfood-ml AT -fatooh/org- , small fixes by me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17066 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-29 22:04:57 +00:00
nicodvb 7a8f8317fd buffering in the muxer layer; patch by Corey Hickey (bugfood-ml ad fatooh punctum org) plus small fixes by me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17024 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-21 22:53:14 +00:00
gpoirier 618d511e43 print the number of encoded frames per seconds (fps) with a greater precision
(float instead of int).
Original thread:
Date: Nov 17, 2005 3:25 PM
Subject: [MPlayer-dev-eng] [PATCH] MEncoder: print more precise FPS


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17006 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-17 19:17:53 +00:00
reimar 5ecff936b4 Provide percentage even when demuxer->movi_start and movi_end are not available
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16876 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-30 09:11:40 +00:00
rfelker db1aa87238 comment on -noskip patch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16837 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-23 15:05:11 +00:00
rfelker f14a68b53e honor decoder's/filter's decision to remove frames when using -noskip.
this may go against the original intention of the vf layer, but it's
how all the filters that drop frames have been written to work, so
it's now the de-facto standard.

without this patch, -noskip will result in tons of duplicate frames
(either soft or hard duplicates) and a/v desync whenever decimation,
ivtc, etc. is used. even with this patch -noskip is still a bad idea
for most of these purposes, but it will work reliably with filmdint,
framestep, and some other filters with fixed in:out ratios as long as
the right -ofps value is used. without this patch, there is no hope of
-noskip working with frame-dropping filters.

(this patch was previously committed erroneously as part of another
change, then reversed. it is now being committed again.)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16830 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-23 07:37:55 +00:00
rfelker 98c0ee2923 reapply rawaudio muxer fix (don't disable audio without user's permission!) (previously reversed because of mistake in patch.. 10l to me :)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16829 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-23 07:32:35 +00:00
rfelker a6549bd26b reverse patch that was mistakenly applied with unwanted unrelated changes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16828 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-23 07:30:56 +00:00
ods15 def1404bc4 document hack
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16815 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-20 05:54:51 +00:00
rfelker 3892465935 processing audio is sometimes essential for a/v sync, so 1000l to
whoever made rawvideo muxer disable audio!!

with this patch, audio is processed but simply thrown away by the
muxer. various 'error' conditions in rawvideo muxer are removed to
make it work. feel free to re-add them if they can be done without
breaking anything, but do not use printf !!!!

btw old behavior can be obtained by manually specifying -nosound.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16806 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-19 05:44:27 +00:00
faust3 dbc1f67ca2 allow mencoder to load win32 codecs properly patch by Zuxy <zuxy.meng at gmail.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16782 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-16 19:14:09 +00:00
ods15 a38ef47cb3 cosmetics. does not change functionality, but makes code easier to read
(removes redundant switch-case)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16757 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-13 20:54:21 +00:00
ods15 91117f5372 weirdness, flags aren't restored right unless you add this second push
mencoder a.avi b.avi -flag c.avi

-flag should've only applied to b, but it applied to both b and c!!

No clue why this happens and more so why this solves it. but it does.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16754 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-13 20:27:48 +00:00
ods15 c3ea61ff6c fix mencoder multi-file with some files having audio but others dont
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16753 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-13 19:30:07 +00:00
ods15 fa70ed4a03 100000l to me
fixdelay() pre-read a frame to make pts sane, and then called slowseek(),
which AGAIN read another frame, and then tries to decode it (which breaks
as all frames should be read)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16709 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-08 17:21:00 +00:00
ods15 591fadadfd Make frameno.avi not turn on by default. this is deprecated and this entire
feature should be removed anyway. manpage update in a bit...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16529 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-19 19:23:38 +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
al bd342e463a Support new static libavcodec (depends on libavutil).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16166 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-01 20:16:56 +00:00
iive 84ec577508 remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16153 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-31 00:26:07 +00:00
ods15 c47ccea6f8 1000l to me. Broke compilation when EDL is disabled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16066 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-23 06:51:35 +00:00
reimar 2affcd2e61 fix invalid pointers passed to init_audio_filters
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16061 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-22 21:27:54 +00:00
reimar 3c7c21274c define SIGHUP and SIGPIPE for MinGW and catch SIGPIPE also in mplayer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16050 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-22 17:11:39 +00:00
alex a5a752770c catch HUP and PIPE signals aswell. Patch by Sergey Khlutchin (@gmail.com)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16003 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-18 19:59:03 +00:00
ods15 efee32de2b -delay for MEncoder, final step 6.
TODO: make it encode silence instead of cutting video as cutting
video is unreliable with -ovc copy.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15998 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-17 19:40:05 +00:00
ods15 e805f50a76 -delay for MEncoder, step 5.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15997 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-17 19:28:01 +00:00
ods15 78600ea9bc -delay for MEncoder, step 4.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15996 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-17 19:27:27 +00:00