[x264-devel] commit: Make options SEI use weight* instead of wpred* ( Jason Garrett-Glaser )

[git at videolan.org]

x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Thu Apr 29 19:53:59 2010 -0700| [9d66767e2569e30339363a2d69c74213d84e7dbc] | committer: Jason Garrett-Glaser 

Make options SEI use weight* instead of wpred*
More intuitive and maps more reasonably to the CLI options.
Breaks statsfile backwards-compatibility.

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=9d66767e2569e30339363a2d69c74213d84e7dbc
---

 common/common.c       |    4 ++--
 encoder/ratecontrol.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/common.c b/common/common.c
index 6471c07..7bc6d6a 100644
--- a/common/common.c
+++ b/common/common.c
@@ -1225,11 +1225,11 @@ char *x264_param2string( x264_param_t *p, int b_res )
     s += sprintf( s, " bframes=%d", p->i_bframe );
     if( p->i_bframe )
     {
-        s += sprintf( s, " b_pyramid=%d b_adapt=%d b_bias=%d direct=%d wpredb=%d",
+        s += sprintf( s, " b_pyramid=%d b_adapt=%d b_bias=%d direct=%d weightb=%d",
                       p->i_bframe_pyramid, p->i_bframe_adaptive, p->i_bframe_bias,
                       p->analyse.i_direct_mv_pred, p->analyse.b_weighted_bipred );
     }
-    s += sprintf( s, " wpredp=%d", p->analyse.i_weighted_pred > 0 ? p->analyse.i_weighted_pred : 0 );
+    s += sprintf( s, " weightp=%d", p->analyse.i_weighted_pred > 0 ? p->analyse.i_weighted_pred : 0 );
 
     s += sprintf( s, " keyint=%d keyint_min=%d scenecut=%d intra_refresh=%d",
                   p->i_keyint_max, p->i_keyint_min, p->i_scenecut_threshold, p->b_intra_refresh );
diff --git a/encoder/ratecontrol.c b/encoder/ratecontrol.c
index c29e8c5..f461cc5 100644
--- a/encoder/ratecontrol.c
+++ b/encoder/ratecontrol.c
@@ -669,7 +669,7 @@ int x264_ratecontrol_new( x264_t *h )
                 return -1;
             }
 
-            CMP_OPT_FIRST_PASS( "wpredp", X264_MAX( 0, h->param.analyse.i_weighted_pred ) );
+            CMP_OPT_FIRST_PASS( "weightp", X264_MAX( 0, h->param.analyse.i_weighted_pred ) );
             CMP_OPT_FIRST_PASS( "bframes", h->param.i_bframe );
             CMP_OPT_FIRST_PASS( "b_pyramid", h->param.i_bframe_pyramid );
             CMP_OPT_FIRST_PASS( "intra_refresh", h->param.b_intra_refresh );