changeset 14738:408d14601dca

x264: expose option "level_idc". patch by Jeff Clagg <snacky at ikaruga dot co dot uk>.

--- a/DOCS/man/en/mplayer.1	Sat Feb 19 23:15:34 2005 +0000
+++ b/DOCS/man/en/mplayer.1	Sun Feb 20 02:21:26 2005 +0000
@@ -7523,6 +7523,14 @@
 4x4, 4x8, 8x4 are tried only if 8x8 is better than 16x16.
 .
 .TP
+.B level_idc=<10\-51>
+Set the bitstream's Level as defined by Annex A of the H.264 standard.
+This is used for telling the decoder what capabilities it needs to
+support. Use this parameter only if you know what it means, and you
+have a need to set it.
+Default: 40 (Level 4.0)
+.
+.TP
 .B log=<-1\-3>
 Adjust the amount of logging info printed to the screen.
 .RSs

--- a/configure	Sat Feb 19 23:15:34 2005 +0000
+++ b/configure	Sun Feb 20 02:21:26 2005 +0000
@@ -5906,7 +5906,7 @@
 #include <stdint.h>
 #include <stdarg.h>
 #include <x264.h>
-#if X264_BUILD < 0x0010
+#if X264_BUILD < 0x0011
 #error We do not support old versions of x264. Get the latest from SVN.
 #endif
 int main(void) { x264_encoder_open((void*)0); return 0; }

--- a/libmpcodecs/ve_x264.c	Sat Feb 19 23:15:34 2005 +0000
+++ b/libmpcodecs/ve_x264.c	Sun Feb 20 02:21:26 2005 +0000
@@ -88,6 +88,7 @@
 static float complexity_blur = 20;
 static char *rc_eq = "blurCplx^(1-qComp)";
 static int subq = 5;
+static int level_idc = 40;
 static int psnr = 0;
 static int log_level = 2;
 
@@ -127,6 +128,7 @@
     {"qblur", &qblur, CONF_TYPE_FLOAT, CONF_RANGE, 0, 99, NULL},
     {"cplx_blur", &complexity_blur, CONF_TYPE_FLOAT, CONF_RANGE, 0, 999, NULL},
     {"subq", &subq, CONF_TYPE_INT, CONF_RANGE, 1, 5, NULL},
+    {"level_idc", &level_idc, CONF_TYPE_INT, CONF_RANGE, 10, 51, NULL},
     {"psnr", &psnr, CONF_TYPE_FLAG, 0, 0, 1, NULL},
     {"nopsnr", &psnr, CONF_TYPE_FLAG, 0, 1, 0, NULL},
     {"log", &log_level, CONF_TYPE_INT, CONF_RANGE, -1, 3, NULL},
@@ -218,6 +220,7 @@
     mod->param.i_height = height;
     mod->param.i_fps_num = mod->mux->h.dwRate;
     mod->param.i_fps_den = mod->mux->h.dwScale;
+    mod->param.i_level_idc = level_idc;
     mod->param.analyse.b_psnr = psnr;
     mod->param.i_log_level = log_level;
     mod->param.vui.i_sar_width = d_width*height;