[x265] [PATCH]: RDLevel: remove CLI option no-rdoqts

[Deepthi Nandakumar]

# HG changeset patch
# User Deepthi Nandakumar <deepthi at multicorewareinc.com>
# Date 1379311495 -19800
# Node ID 22c4e67c7246cd77968a86e967377e4a18b47b31
# Parent  881444f5910b2b0e0f286a6ca47fcc743515cbb2
RDLevel: remove CLI option no-rdoqts

If RDOQ and TS are enabled, RDOQTS is enabled.

diff -r 881444f5910b -r 22c4e67c7246 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 11:34:55 2013 +0530
@@ -219,6 +219,11 @@
         _param->rc.rateControlMode = X265_RC_ABR;
     }

+    if(_param->bEnableRDOQ && _param->bEnableTransformSkip)
+    {
+        _param->bEnableRDOQTS = 1;
+    }
+
     /* Set flags according to RDLevel specified - check_params has
verified that RDLevel is within range */
     switch(_param->bRDLevel)
     {
diff -r 881444f5910b -r 22c4e67c7246 source/x265opts.h
--- a/source/x265opts.h    Mon Sep 16 09:41:34 2013 +0530
+++ b/source/x265opts.h    Mon Sep 16 11:34:55 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/2daf9920/attachment.html>