[x264-devel] Re: x264: svn commit r318 (pengvado)

[Guillaume POIRIER]

Hi,

On 10/8/05, Subversion daemon <svn at videolan.org> wrote:
> r318 | pengvado | 2005-10-08 08:49:29 +0200 (Sat, 08 Oct 2005) | 5 lines
> Changed paths:
>    M /trunk/encoder/analyse.c
>    M /trunk/encoder/me.c
>    M /trunk/encoder/me.h
>    M /trunk/x264.c
>    M /trunk/x264.h
>
> new option: --mixed-refs
> Allows each 8x8 or 16x8 partition to independently select a reference frame, as opposed to only one ref per macroblock.
> patch mostly by Alex Wright (alexw0885 at hotmail dot com).

For those of you who would like to used mixed refs in mencoder, the
attached patch should work all right.

Cheers,

Guillaume
--
Reading doesn't hurt, really!
  -- Dominik 'Rathann' Mierzejewski
-------------- next part --------------
Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1073
diff -u -r1.1073 configure
--- configure	5 Oct 2005 19:52:13 -0000	1.1073
+++ configure	8 Oct 2005 10:18:40 -0000
@@ -6069,7 +6069,7 @@
 cat > $TMPC << EOF
 #include <inttypes.h>
 #include <x264.h>
-#if X264_BUILD < 29
+#if X264_BUILD < 36
 #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; }
Index: libmpcodecs/ve_x264.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_x264.c,v
retrieving revision 1.35
diff -u -r1.35 ve_x264.c
--- libmpcodecs/ve_x264.c	2 Sep 2005 21:54:16 -0000	1.35
+++ libmpcodecs/ve_x264.c	8 Oct 2005 10:18:43 -0000
@@ -81,6 +81,7 @@
 static int direct_pred = X264_DIRECT_PRED_TEMPORAL;
 static int weight_b = 0;
 static int chroma_me = 1;
+static int b_mixed_references = 0; /* allow each mb partition in P-frames to have it's own reference number */
 static int chroma_qp_offset = 0;
 static float ip_factor = 1.4;
 static float pb_factor = 1.3;
@@ -150,6 +151,8 @@
     {"noweight_b", &weight_b, CONF_TYPE_FLAG, 0, 1, 0, NULL},
     {"chroma_me", &chroma_me, CONF_TYPE_FLAG, 0, 0, 1, NULL},
     {"nochroma_me", &chroma_me, CONF_TYPE_FLAG, 0, 1, 0, NULL},
+    {"mixed-refs", &b_mixed_references, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+    {"nomixed-refs", &b_mixed_references, CONF_TYPE_FLAG, 0, 1, 0, NULL},
     {"chroma_qp_offset", &chroma_qp_offset, CONF_TYPE_INT, CONF_RANGE, -12, 12, 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},
@@ -281,6 +284,7 @@
     mod->param.analyse.b_weighted_bipred = weight_b;
     mod->param.analyse.i_chroma_qp_offset = chroma_qp_offset;
     mod->param.analyse.b_chroma_me = chroma_me;
+    mod->param.analyse.b_mixed_references = b_mixed_references;
 
     mod->param.i_width = width;
     mod->param.i_height = height;