summaryrefslogtreecommitdiffstats
path: root/libhb/encx264.h
diff options
context:
space:
mode:
authorRodeo <[email protected]>2012-05-26 21:02:51 +0000
committerRodeo <[email protected]>2012-05-26 21:02:51 +0000
commitc906e05b28bae440471dd2a816627b9852eed3e8 (patch)
tree622667592536aedbeb83776d865a7f8cb399dff2 /libhb/encx264.h
parent12c2588e4d281f4cc16683d211a6cb8a76b4b1d5 (diff)
Bump x264 to r2200-999b753.
- H.264 Level 5.2 support. - Threaded lookahead: improved encoding speed with very fast settings, on systems with 8 processor "threads" or more. 'By default, lookahead threads are 1/6 of regular threads. This isn't exacting, but it seems to work well for all presets on real systems. With sliced-threads, it's the same as the number of encoding threads.' Mini-benchmark: --------------- 2.2 GHz Intel Core i7, 8 processor threads (4 physical cores + 4 virtual cores), Mac OS X 10.7.4. HandBrake's "Normal" preset. libavcodec decoding threads: 8 / 2 + 1 = 5 x264 encoding threads: 8 * 3 / 2 = 12 x264 lookahead threads: 12 / 6 = 2 Blu-ray, H.264, 1920x1080 -> 1920x800 ~48 fps with threaded lookahead, ~42 fps without DVD, MPEG-2, 720x576 -> 720x576 ~224 fps with threaded lookahead, ~192 fps without git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4704 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/encx264.h')
-rw-r--r--libhb/encx264.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libhb/encx264.h b/libhb/encx264.h
index a2ab9db34..0add70062 100644
--- a/libhb/encx264.h
+++ b/libhb/encx264.h
@@ -4,8 +4,8 @@
#include "x264.h"
-static const char * const h264_level_names[] = { "1.0", "1b", "1.1", "1.2", "1.3", "2.0", "2.1", "2.2", "3.0", "3.1", "3.2", "4.0", "4.1", "4.2", "5.0", "5.1", 0 };
-static const int const h264_level_values[] = { 10, 9, 11, 12, 13, 20, 21, 22, 30, 31, 32, 40, 41, 42, 50, 51, 0 };
+static const char * const h264_level_names[] = { "1.0", "1b", "1.1", "1.2", "1.3", "2.0", "2.1", "2.2", "3.0", "3.1", "3.2", "4.0", "4.1", "4.2", "5.0", "5.1", "5.2", 0 };
+static const int const h264_level_values[] = { 10, 9, 11, 12, 13, 20, 21, 22, 30, 31, 32, 40, 41, 42, 50, 51, 52, 0 };
/* x264 preferred option names (left) and synonyms (right).
* The "preferred" names match names used in x264's param2string function more