[x265] [PATCH] common: tighten up tool descriptions; save horizontal space

[Steve Borho]

# HG changeset patch
# User Steve Borho <st...@borho.org>
# Date 1380666567 18000
#      Tue Oct 01 17:29:27 2013 -0500
# Node ID 3a4f4005d583b18215b911eb34dd5c4cd255eae4
# Parent  73f1415009ea83511469f34a9ddbf999e1c64757
common: tighten up tool descriptions; save horizontal space

diff -r 73f1415009ea -r 3a4f4005d583 source/common/common.cpp
--- a/source/common/common.cpp  Tue Oct 01 17:18:31 2013 -0500
+++ b/source/common/common.cpp  Tue Oct 01 17:29:27 2013 -0500
@@ -405,30 +405,27 @@
     TOOLOPT(param->bEnableCbfFastMode, "cfm");
     TOOLOPT(param->bEnableConstrainedIntra, "cip");
     TOOLOPT(param->bEnableEarlySkip, "esd");
-    switch (param->bRDLevel)
-    {
-    case X265_NO_RDO_NO_RDOQ: 
-        fprintf(stderr, "%s", "no-rdo no-rdoq "); break;
-    case X265_NO_RDO:
-        fprintf(stderr, "%s", "no-rdo rdoq "); break;
-    case X265_FULL_RDO:
-        fprintf(stderr, "%s", "rdo rdoq "); break;
-    default: 
-        fprintf(stderr, "%s", "Unknown RD Level");
-    }
+    fprintf(stderr, "rd=%d ", param->bRDLevel);
 
     TOOLOPT(param->bEnableLoopFilter, "lft");
     if (param->bEnableSAO)
     {
-        TOOLOPT(param->bEnableSAO, "sao");
-        TOOLOPT(param->saoLcuBasedOptimization, "sao-lcu");
+        if (param->saoLcuBasedOptimization)
+            fprintf(stderr, "sao-lcu ");
+        else
+            fprintf(stderr, "sao-frame ");
     }
     TOOLOPT(param->bEnableSignHiding, "sign-hide");
     if (param->bEnableTransformSkip)
     {
-        TOOLOPT(param->bEnableTransformSkip, "tskip");
-        TOOLOPT(param->bEnableTSkipFast, "tskip-fast");
-        TOOLOPT(param->bEnableRDOQTS, "rdoqts");
+        if (param->bEnableTSkipFast && param->bEnableRDOQTS)
+            fprintf(stderr, "tskip(fast+rdo) ");
+        else if (param->bEnableTSkipFast)
+            fprintf(stderr, "tskip(fast) ");
+        else if (param->bEnableRDOQTS)
+            fprintf(stderr, "tskip(rdo) ");
+        else
+            fprintf(stderr, "tskip ");
     }
     TOOLOPT(param->bEnableWeightedPred, "weightp");
     TOOLOPT(param->bEnableWeightedBiPred, "weightbp");

# HG changeset patch
# User Steve Borho <st...@borho.org>
# Date 1380666567 18000
#      Tue Oct 01 17:29:27 2013 -0500
# Node ID 3a4f4005d583b18215b911eb34dd5c4cd255eae4
# Parent  73f1415009ea83511469f34a9ddbf999e1c64757
common: tighten up tool descriptions; save horizontal space

diff -r 73f1415009ea -r 3a4f4005d583 source/common/common.cpp
--- a/source/common/common.cpp	Tue Oct 01 17:18:31 2013 -0500
+++ b/source/common/common.cpp	Tue Oct 01 17:29:27 2013 -0500
@@ -405,30 +405,27 @@
     TOOLOPT(param->bEnableCbfFastMode, "cfm");
     TOOLOPT(param->bEnableConstrainedIntra, "cip");
     TOOLOPT(param->bEnableEarlySkip, "esd");
-    switch (param->bRDLevel)
-    {
-    case X265_NO_RDO_NO_RDOQ: 
-        fprintf(stderr, "%s", "no-rdo no-rdoq "); break;
-    case X265_NO_RDO:
-        fprintf(stderr, "%s", "no-rdo rdoq "); break;
-    case X265_FULL_RDO:
-        fprintf(stderr, "%s", "rdo rdoq "); break;
-    default: 
-        fprintf(stderr, "%s", "Unknown RD Level");
-    }
+    fprintf(stderr, "rd=%d ", param->bRDLevel);
 
     TOOLOPT(param->bEnableLoopFilter, "lft");
     if (param->bEnableSAO)
     {
-        TOOLOPT(param->bEnableSAO, "sao");
-        TOOLOPT(param->saoLcuBasedOptimization, "sao-lcu");
+        if (param->saoLcuBasedOptimization)
+            fprintf(stderr, "sao-lcu ");
+        else
+            fprintf(stderr, "sao-frame ");
     }
     TOOLOPT(param->bEnableSignHiding, "sign-hide");
     if (param->bEnableTransformSkip)
     {
-        TOOLOPT(param->bEnableTransformSkip, "tskip");
-        TOOLOPT(param->bEnableTSkipFast, "tskip-fast");
-        TOOLOPT(param->bEnableRDOQTS, "rdoqts");
+        if (param->bEnableTSkipFast && param->bEnableRDOQTS)
+            fprintf(stderr, "tskip(fast+rdo) ");
+        else if (param->bEnableTSkipFast)
+            fprintf(stderr, "tskip(fast) ");
+        else if (param->bEnableRDOQTS)
+            fprintf(stderr, "tskip(rdo) ");
+        else
+            fprintf(stderr, "tskip ");
     }
     TOOLOPT(param->bEnableWeightedPred, "weightp");
     TOOLOPT(param->bEnableWeightedBiPred, "weightbp");

_______________________________________________
x265-devel mailing list
x265-devel@videolan.org
https://mailman.videolan.org/listinfo/x265-devel