Commit Graph

33 Commits

Author SHA1 Message Date
diego 60f223f766 Move #ifdefs around complete files into the build system.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18774 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-21 14:49:09 +00:00
michael 02b199e5e9 passing pts through the filter layer (lets see if pts or cola comes out at the end)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17907 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-21 21:26:42 +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
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
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
henry 18abbb69a1 fixes for encoding of multiple files
- do not uninitialize video encoder between files
- checks for image size & format change moved from mencoder.c to vfilters

by Oded Shimon <ods15@ods15.dyndns.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14879 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-01 20:21:58 +00:00
reimar b46fa6a150 Initialized BITMAPINFOHEADER to 0 to avoid problems, esp. windows has problems
when unused parts have bogus values.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14550 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-20 22:53:37 +00:00
ranma 7068c1b886 Use aspect from encoder for AVI vprp header
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12062 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-03-24 15:16:36 +00:00
iive 64060df2c7 XviD Api4 support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11437 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-11-12 00:43:42 +00:00
alex 2283b6305f Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10595 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-13 16:29:32 +00:00
rguyom 57711f674d + bf_threshold
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9844 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-04-06 15:46:05 +00:00
rguyom f1aea7a0fe 100l.
Noticed by Andreas Hess <jaska at gmx dot net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9836 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-04-04 20:45:05 +00:00
rguyom 3eea968d24 "psnr" & related code is only for the -HEAD (unstable) XviD branch.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9824 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-04-04 15:22:59 +00:00
rguyom 3e97df7613 Shift vhq values and set vhq=1 to MODEDECISION.
Higher values seems to loose PSNR atm.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9820 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-04-04 05:47:27 +00:00
rguyom 7b20293196 - added <time.h> since we're using time() related functions
- "vhq" now takes an argument (0..3)
- me_quality default is now 6 (max)
- xvidenc_pref -> xvidenc_chroma_opt


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9818 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-04-03 20:36:58 +00:00
rguyom 9e88c30a9d Actually do something useful with XVID_GLOBAL_EXTRASTATS / XVID_EXTRASTATS.
Now we can really compare XviD and libavcodec :)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9810 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-04-03 06:53:01 +00:00
rguyom fb9e995db8 XviD:
- "greyscale" is supported in the stable tree
- a few typos


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9807 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-04-02 22:27:35 +00:00
rguyom e75f013a11 XviD :
Added a few options : "interlacing", "packed", "divx5bvop", "greyscale".
Renamed "me_colour" to "chroma_me".
Some documentation.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9806 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-04-02 22:13:44 +00:00
rguyom 8f2869dd1f Updating XviD :
- deleted "hinted_me" and "hint_file", the whole idea is bogus.
- commented-out "lumi_mask", it's too buggy.
- better defaults for "bquant_ratio" / "bquant_offset"
- fixed a typo : "extrastatl" -> "extrastat"


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9805 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-04-02 21:33:19 +00:00
henry a039bd2d53 xvid fixes and more options by elcabesa & Martin Drab
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9804 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-04-02 20:31:47 +00:00
arpi 489b07338c Cleanup of the muxer API, func parameters muxer & muxer_f eliminated.
patch by Andriy N. Gritsenko <andrej@lucky.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9015 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-19 01:48:52 +00:00
arpi bf46a109ed the long-waited MUXER layer, and new MPEG-PS muxer
patch by Andriy N. Gritsenko <andrej@lucky.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8586 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-27 22:43:20 +00:00
rguyom 8e5e2a0f0d API change in dev-api-3 branch.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8562 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-25 11:44:14 +00:00
rguyom 906a569973 Use the XVID_API_UNSTABLE macro instead of a home-made one.
Print a big warning if compiled for the unstable XViD tree.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8492 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-18 08:10:24 +00:00
rguyom c69f138c48 Support the latest development code from XViD dev-api-3 CVS
branch. Still compatible (at compile time) with the stable XViD code.

Adds :
- GMC, global motion compensation (gmc)
- quarter pixel motion estimation (qpel)
- B frames (max_bframes, bquant_ratio, bquant_offset)
- half-resolution U&V encoding (reduced)
- ?? (me_colour)

Based on a patch by Marco "elcabesa" Belli <elcabesa at inwind dot it>.


Also :
* renamed option "br" to "bitrate".
* renamed option "quality" to "me_quality" and defaults to 4 (fast and
  still not that bad).
* added option "4mv", was previously silently included in quality 4, 5
  and 6.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8463 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-15 18:35:11 +00:00
rguyom 4534c5de2c Instead of min_quantizer, max_quantizer, min_iquantizer, etc... use a
single "quant_range" option.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8248 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-22 08:19:08 +00:00
rguyom 7ab2e83945 Implements [min|max]_[i|p]quantizer.
Better default for min_key_interval.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8222 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-17 13:01:06 +00:00
rguyom 679bb3155e A bit more sane range.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8194 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-14 21:57:34 +00:00
rguyom 14604b4b4a - added modulated quatization
- fixed the default and range of kfthreshold, kfreduction and keyframe_boost
- added a few comments


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8193 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-14 21:46:36 +00:00
arpi f859d013a8 *HUGE* set of compiler warning fixes, unused variables removal
based on patch by Dominik Mierzejewski <dominik@rangers.eu.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8124 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-06 23:54:29 +00:00
rguyom 18304c06fa bugfixes :
- It seems the CONF_TYPE_SUBCONFIG array for the "mode" option eats
all other -xvidencopts parameters. With it it wasn't possible to set
the bitrate or in fact any other parameter beside "mode".
- xvidencopts_conf wasn't properly initialised for some of the
lines. Probably didn't cause bugs but at least this shaves a few gcc
warnings.
- Rewrote initialisation code & defaults according to
xvidcore/docs/xvid-encoder.txt in XViD CVS tree. Some of the defaults
where bad. Done with the help of Markus Liebl < lieblm at web dot de >

modified features:
- Changed "debug" default to 0. Use the "debug" flag to enable it.
- Changed the interpretation of "br" to be consistent with lavc (now
in kbits/s if <16000, else bits/s). Should be backward compatible.
- Now use "-xvidopts pass=(1|2)" instead of "-xvidopts mode=2pass-(1|2)".
- Use the "-passtmpfile" global option instead of a hardwired name.
- Use the same motion presets as XViD's vfw CVS code (which is the
source of the windows codec I assume).

coding style etc...:
- Use static variables instead of a big struct for individual options,
easier to initialize.
- [f]printf() ->> mp_msg()

added features:
- Added "lumi_mask", "mpeg_quant", "hintedme" and "hintfile" options,
all off by default.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8079 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-03 12:43:30 +00:00
kmkaplan a51fad2519 Use string selection to choose mode
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7459 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-21 13:09:57 +00:00
kmkaplan 40bd44670e Support for XviD encoding
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7457 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-21 12:34:02 +00:00