[x265] [PATCH v2]: CLI: remove CLI option rdoqts; cleanup

[Deepthi Nandakumar]

# HG changeset patch
# User Deepthi Nandakumar <deepthi at multicorewareinc.com>
# Date 1379334518 -19800
# Node ID 46b065f7d676e7ff26c46a40f1790bdae290d7fa
# Parent  881444f5910b2b0e0f286a6ca47fcc743515cbb2
CLI options: Eliminate rdoqts option; cleanup

1. Eliminate rdoqts CLI option: enabled when rdoq and ts are both enabled.
2. Rearrange default initialisations in x265_param_ t structure

diff -r 881444f5910b -r 46b065f7d676 source/common/common.cpp
--- a/source/common/common.cpp    Mon Sep 16 09:41:34 2013 +0530
+++ b/source/common/common.cpp    Mon Sep 16 17:58:38 2013 +0530
@@ -115,45 +115,58 @@
     va_end(arg);
 }

-extern "C"
 void x265_param_default(x265_param_t *param)
 {
     memset(param, 0, sizeof(x265_param_t));
+
+    /* Applying non-zero default values to all elements in the param
structure */
+    param->logLevel = X265_LOG_INFO;
+    param->bEnableWavefront = 1;
     param->frameNumThreads = 1;
-    param->logLevel = X265_LOG_INFO;
+
+    param->internalBitDepth = 8;
+
+    /* CU definitions */
+    param->maxCUSize = 64;
+    param->tuQTMaxInterDepth = 3;
+    param->tuQTMaxIntraDepth = 3;
+
+    /* Coding Structure */
+    param->decodingRefreshType = 1;
+    param->keyframeMin = 0;
+    param->keyframeMax = 250;
+    param->bframes = 3;
+    param->lookaheadDepth = 10;
+    param->bFrameAdaptive = X265_B_ADAPT_FAST;
+    param->scenecutThreshold = 40; /* Magic number pulled in from x264*/
+
+    /* Intra Coding Tools */
+    param->bEnableStrongIntraSmoothing = 1;
+
+    /* Inter Coding tools */
     param->searchMethod = X265_STAR_SEARCH;
     param->subpelRefine = 5;
     param->searchRange = 60;
     param->bipredSearchRange = 4;
-    param->internalBitDepth = 8;
-    param->decodingRefreshType = 1;
-    param->maxCUSize = 64;
-    param->tuQTMaxInterDepth = 3;
-    param->tuQTMaxIntraDepth = 3;
+    param->maxNumMergeCand = 5u;
     param->bEnableAMP = 1;
     param->bEnableRectInter = 1;
-
-    param->bEnableLoopFilter = 1;
-    param->bEnableSAO = 1;
-    param->bEnableWavefront = 1;
-    param->saoLcuBasedOptimization = 1;
-    param->maxNumMergeCand = 5u;
+    param->bRDLevel = X265_FULL_RDO;
+    param->bEnableRDO = 1;
+    param->bEnableRDOQ = 1;
+    param->bEnableRDOQTS = 1;
     param->bEnableSignHiding = 1;
-    param->bEnableStrongIntraSmoothing = 1;
-
-    param->bEnableRDOQTS = 1;
     param->bEnableTransformSkip = 1;
     param->bEnableTSkipFast = 1;
+
+    /* Loop Filter */
+    param->bEnableLoopFilter = 1;

-    param->bRDLevel = X265_FULL_RDO;
-
-    param->bFrameAdaptive = X265_B_ADAPT_FAST;
-    param->lookaheadDepth = 10;
-    param->bframes = 3;
-    param->scenecutThreshold = 40; /* Magic number pulled in from x264*/
-    param->keyframeMin = 0;
-    param->keyframeMax = 250;
-
+    /*SAO Loop Filter */
+    param->bEnableSAO = 1;
+    param->saoLcuBasedOptimization = 1;
+
+    /* Rate control options */
     param->rc.bitrate = 0;
     param->rc.rateTolerance = 0.1;
     param->rc.qCompress = 0.6;
diff -r 881444f5910b -r 46b065f7d676 source/encoder/encoder.cpp
--- a/source/encoder/encoder.cpp    Mon Sep 16 09:41:34 2013 +0530
+++ b/source/encoder/encoder.cpp    Mon Sep 16 17:58:38 2013 +0530
@@ -219,6 +219,11 @@
         _param->rc.rateControlMode = X265_RC_ABR;
     }

+    if(!(_param->bEnableRDOQ && _param->bEnableTransformSkip))
+    {
+        _param->bEnableRDOQTS = 0;
+    }
+
     /* Set flags according to RDLevel specified - check_params has
verified that RDLevel is within range */
     switch(_param->bRDLevel)
     {
diff -r 881444f5910b -r 46b065f7d676 source/x265opts.h
--- a/source/x265opts.h    Mon Sep 16 09:41:34 2013 +0530
+++ b/source/x265opts.h    Mon Sep 16 17:58:38 2013 +0530
@@ -80,8 +80,6 @@
 OPT("cbqpoffs",        param->cbQpOffset,             required_argument,
0, "Chroma Cb QP Offset")
 OPT("crqpoffs",        param->crQpOffset,             required_argument,
0, "Chroma Cr QP Offset")
 OPT("rd",              param->bRDLevel,               required_argument,
0, "Level of RD in mode decision 0:least....2:full RDO")
-OPT("no-rdoqts",       param->bEnableRDOQTS,                no_argument,
0, "Disable RDO quantization with transform skip")
-OPT("rdoqts",          param->bEnableRDOQTS,                no_argument,
0, "Enable RDO quantization with transform skip")
 OPT("no-signhide",     param->bEnableSignHiding,            no_argument,
0, "Disable hide sign bit of one coeff per TU (rdo)")
 OPT("signhide",        param->bEnableSignHiding,            no_argument,
0, "Hide sign bit of one coeff per TU (rdo)")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/x265-devel/attachments/20130916/457d6465/attachment-0001.html>