[MPlayer-cvslog] CVS: main/libmpcodecs ve_x264.c,1.17,1.18

[Loren Merritt CVS]

CVS change done by Loren Merritt CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv11824/libmpcodecs

Modified Files:
	ve_x264.c 
Log Message:
Sync to x264 r134: weighted prediction for B-frames.


Index: ve_x264.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_x264.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ve_x264.c	20 Feb 2005 02:21:26 -0000	1.17
+++ ve_x264.c	22 Feb 2005 05:50:10 -0000	1.18
@@ -74,6 +74,7 @@
 static int p8x8mv = 1;
 static int b8x8mv = 1;
 static int direct_pred = X264_DIRECT_PRED_TEMPORAL;
+static int weight_b = 0;
 static float ip_factor = 1.4;
 static float pb_factor = 1.3;
 static int rc_buffer_size = -1;
@@ -114,6 +115,8 @@
     {"b8x8mv", &b8x8mv, CONF_TYPE_FLAG, 0, 0, 1, NULL},
     {"nob8x8mv", &b8x8mv, CONF_TYPE_FLAG, 0, 1, 0, NULL},
     {"direct_pred", &direct_pred, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL},
+    {"weight_b", &weight_b, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+    {"noweight_b", &weight_b, CONF_TYPE_FLAG, 0, 1, 0, NULL},
     {"ip_factor", &ip_factor, CONF_TYPE_FLOAT, CONF_RANGE, -10.0, 10.0, NULL},
     {"pb_factor", &pb_factor, CONF_TYPE_FLOAT, CONF_RANGE, -10.0, 10.0, NULL},
     {"rc_buffer_size", &rc_buffer_size, CONF_TYPE_INT, CONF_RANGE, 0, 24000000, NULL},
@@ -215,6 +218,7 @@
     if(b8x8mv)
         mod->param.analyse.inter |= X264_ANALYSE_BSUB16x16;
     mod->param.analyse.i_direct_mv_pred = direct_pred;
+    mod->param.analyse.b_weighted_bipred = weight_b;
 
     mod->param.i_width = width;
     mod->param.i_height = height;