Commit Graph

61 Commits

Author SHA1 Message Date
lorenm f8e6b3f0b8 x264: don't enable turbo in the middle pass of a 3pass encode. (broke in r20060)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20346 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-21 21:57:15 +00:00
reimar a21dc05006 Add a call to x264enc_set_param in config, otherwise mencoder -ovc x264
would crash when no x264encopts specified.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20339 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-21 19:34:06 +00:00
lorenm 11a8049263 make any parse error in -x264encopts fatal
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20323 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-20 19:19:29 +00:00
lorenm 9f8a17df72 make -passlogfile work with x264 again (broke in r20060)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20303 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-19 08:15:47 +00:00
lorenm 34a5cd1be8 fix multiple instances of -x264encopts on the commandline (broke in r20060)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20258 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-15 23:11:36 +00:00
lorenm 0594cd07a0 Remove the x264 option parser, and pass the options on to libx264 as a string instead. This provides automatic support for all current and future x264 options.
A few options had to be reorganized: partitions, deblockalpha/beta, me, direct_pred.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20060 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-05 02:03:10 +00:00
diego e8dc2242b9 Add noglobal counterpart to the global flag.
patch by Jeff Clagg, snacky {at} ikaruga {dot} co {dot} uk


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19629 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-01 20:38:45 +00:00
diego 66b1d0d001 The FSF changed postal address.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19620 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-01 12:11:11 +00:00
michael 7f3113fab8 "global header" support, this is pretty much just copy and pasted code from
libavcodec/x264.c and libmpcodecs/ve_lavc.c, with it -ovc x264 can be used 
together with lavf to make working .psp files amongth other things
feel free to reverse, flame, ...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19583 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-28 19:32:53 +00:00
lorenm e08fe8174f sync to x264 r537 (api change)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19130 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-18 01:28:56 +00:00
reynaldo 58ed2c3fe0 marks several read-only string parameters which aren't modified inside the called function as const. Patch by Stefan Huehner, stefan AT huehner-org
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19109 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-15 16:03:12 +00:00
lorenm 94b93ccc69 sync to x264 r503 (dct_decimate)
patch by Guillaume Poirier.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18208 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-22 19:30:57 +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
lorenm 5283b5beef sync to x264 r476 (subq=7)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17903 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-20 23:13:37 +00:00
lorenm 66419046a2 sync to x264 r457 (direct_pred=3)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17732 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-05 07:23:12 +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
diego 872a28cc57 Move conditional compilation out of the code and into the build system.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17524 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-31 23:36:12 +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
lorenm 7bf3599898 sync to x264 r398.
patch by Guillaume Poirier.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17403 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-16 01:37:32 +00:00
lorenm 457b63508d sync to x264 r390 (bime)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17269 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-30 05:15:27 +00:00
lorenm fc2831619d 10l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17027 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-22 05:32:28 +00:00
lorenm c965918454 sync to x264 r373 (brdo)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17026 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-22 05:17:17 +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
lorenm 3c1298e0f7 sync to x264 r360 (trellis)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16899 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-04 01:01:19 +00:00
lorenm ff48164f90 sync to x264 r334 (crf)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16847 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-24 04:39:18 +00:00
lorenm 9b1096e251 sync to x264 r318 (mixed_refs)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16713 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-08 22:28:27 +00:00
gpoirier b2e88f2b32 custom quantization matrix for x264, original patch by Robert Swain < robert POUM swain AH gmail POUM com>
Lots of nits and improvement by the MPlayer team
Original thread:
Date: Jul 12, 2005 5:04 PM
Subject: [MPlayer-dev-eng] [PATCH] CQMs in x264


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16367 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-02 21:54:17 +00:00
iive 28cdf537a0 add (no)visualize options
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16017 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-19 17:56:51 +00:00
gpoirier f0e62b7c9c 1/2 l: last patch lacked the option name, so it wasn't activeable
^^^ wasn't breaking CVS ;-)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15967 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-11 19:02:39 +00:00
gpoirier c60555edbf x264 fast first pass, patch by Robert Swain < robert POUM swain AH gmail POUM com >
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15965 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-11 17:52:03 +00:00
lorenm 8348626c8f sync to x264 rev264 (lossless)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15745 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-17 08:26:12 +00:00
lorenm 4e27543174 sync to x264 rev263 (RDO)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15725 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-15 02:28:06 +00:00
lorenm 09dce31b8b sync to x264 r252 (8x8dct)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15655 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-05 19:05:00 +00:00
lorenm 2bdc7899a1 sync to x264 r240 (threads)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15591 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-29 19:05:32 +00:00
lorenm d6a8698f57 sync to x264 r239 (zoned ratecontrol and UMHex ME)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15558 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-24 06:03:37 +00:00
lorenm 18a4416a88 sync to x264 rev223 (options: ratetol, vbv_*)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15414 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-11 16:00:12 +00:00
lorenm 7bbd20a293 expose x264 options 'me' and 'me_range'.
patch by Guillaume Poirier.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15353 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-05 17:10:16 +00:00
lorenm 18fe92cd19 remove x264 option "cabacidc", because the default is always best.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15150 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-13 19:10:29 +00:00
lorenm 20a3c8c24c sync to x264 171: chroma_me, chroma_qp_offset
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14944 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-14 23:26:11 +00:00
lorenm 8f11e599c4 sync to x264 r150: new option 'b_pyramid'
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14917 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-04 13:11:01 +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
lorenm 4bad12384c memory leak
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14847 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-27 21:54:40 +00:00
lorenm 4087d12af9 sync to x264 r137: adaptive B-frame decision, flush delayed frames.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14785 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-23 19:59:24 +00:00
lorenm 1db1d5ea38 Sync to x264 r134: weighted prediction for B-frames.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14760 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-22 05:50:10 +00:00
lorenm 9b1bd1ae0f x264: expose option "level_idc".
patch by Jeff Clagg <snacky at ikaruga dot co dot uk>.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14739 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-20 02:21:26 +00:00
lorenm 6f8427e09a Move x264 version check into configure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14723 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-18 03:55:27 +00:00
lorenm 31bb03baaa sync to x264 r129: modified ratecontrol equation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14720 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-17 19:32:44 +00:00
lorenm e71314fcc9 sync to x264 r93:
Change the mechanics of option "keyint": Now controls the GOP size directly and allows variable numbers of non-IDR I-frames within a GOP.
Remove option "idrint" and replace it with "keyint_min".
Add option "8x8mv" for the sake of completeness.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14469 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-12 09:54:56 +00:00
lorenm b0cd65d541 x264: disable subq=0 (the huge bitrate penalty wasn't worth the speed),
and set default subq to best. wording.
renumber direct_pred (temporal seems to be best)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14412 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-07 11:11:21 +00:00
lorenm f91146fe95 change rc_init_buffer to be a fraction of total buffer size.
disallow qp_step=0.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14308 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-02 22:35:37 +00:00