remove the restriction on number of threads as a function of resolution (it was wrong...

git-svn-id: svn://svn.videolan.org/x264/trunk@650 df754926-b1dd-0310-bc7b-ec298dee348c

diff --git a/common/common.h b/common/common.h
index 74f8c1085285373e3785a92a3aea80baa10e1d06..fadc3664ca9d209782e6b8c204bc322fd53f4aa6 100644 (file)
--- a/common/common.h
+++ b/common/common.h
@@ -125,7 +125,7 @@
 }
 
 #define X264_BFRAME_MAX 16
-#define X264_THREAD_MAX 16
+#define X264_THREAD_MAX 128
 #define X264_SLICE_MAX 4
 #define X264_NAL_MAX (4 + X264_SLICE_MAX)
 #define X264_THREAD_HEIGHT 24 // number of pixels (per thread) in progress at any given time. could theoretically be as low as 22

diff --git a/encoder/encoder.c b/encoder/encoder.c
index ddf843abc1bfa89a01daaafc0481569d2d146a6b..181685a11858544895363999263090c835cef8e2 100644 (file)
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -352,7 +352,6 @@ static int x264_validate_parameters( x264_t *h )
     if( h->param.i_threads == 0 )
         h->param.i_threads = x264_cpu_num_processors() * 3/2;
     h->param.i_threads = x264_clip3( h->param.i_threads, 1, X264_THREAD_MAX );
-    h->param.i_threads = X264_MIN( h->param.i_threads, 1 + (h->param.i_height >> h->param.b_interlaced) / (X264_THREAD_HEIGHT + 16) ); // FIXME exact limit?
     if( h->param.i_threads > 1 )
     {
 #ifndef HAVE_PTHREAD