[x265] [PATCH] cleaning up CLI options, and their params

[sumalatha at multicorewareinc.com]

# HG changeset patch
# User sumalatha
# Date 1372334962 -19800
# Node ID 8c818d8d27e4786cd20efe4122ece249701d679a
# Parent  3b93256a844bbbe5584ec1ae7b95e618bf955d69
cleaning up CLI options, and their params

diff -r 3b93256a844b -r 8c818d8d27e4 source/x265opts.h
--- a/source/x265opts.h	Thu Jun 27 16:14:14 2013 +0530
+++ b/source/x265opts.h	Thu Jun 27 17:39:22 2013 +0530
@@ -27,12 +27,7 @@
 HELP("Quad-Tree analysis:")
 OPT("wpp",             param->bEnableWavefront,         no_argument, 0, "Enable Wavefront Parallel Processing")
 OPT("no-wpp",          param->bEnableWavefront,         no_argument, 0, "Disable Wavefront Parallel Processing")
-OPT("ctu",             param->maxCUSize,          required_argument, 's', "Maximum CU size (default: 64x64)")
-OPT("cu-depth",        param->maxCUDepth,         required_argument, 'd', "Maximum CU recursion depth (default: 4)")
-OPT("tu-maxlog2",      param->tuQTMaxLog2Size,    required_argument, 0, "Maximum TU size in logarithm base 2")
-OPT("tu-minlog2",      param->tuQTMinLog2Size,    required_argument, 0, "Minimum TU size in logarithm base 2")
-OPT("tu-intra-depth",  param->tuQTMaxIntraDepth,  required_argument, 0, "Max TU recursive depth for intra CUs")
-OPT("tu-inter-depth",  param->tuQTMaxInterDepth,  required_argument, 0, "Max TU recursive depth for inter CUs")
+
 
 HELP("Temporal / motion search options:")
 OPT("me",              param->searchMethod,           required_argument, 0, "Motion search method 0:dia 1:hex 2:umh 3:star(default) 4:hm-orig 5:full")
@@ -44,13 +39,12 @@
 OPT("no-amp",          param->bEnableAMP,                   no_argument, 0, "Disable asymmetric motion partitions")
 OPT("rdo",             param->bEnableRDO,                   no_argument, 0, "Enable rate distortion-based mode decision")
 OPT("no-rdo",          param->bEnableRDO,                   no_argument, 0, "Enable mode decision without rate distortion optimization")
-OPT("max-merge",       param->maxNumMergeCand,        required_argument, 0, "Maximum number of merge candidates (default: 5)")
+
 OPT("fdm",             param->bEnableFastMergeDecision,     no_argument, 0, "Enable fast decision for Merge RD Cost")
 OPT("no-fdm",          param->bEnableFastMergeDecision,     no_argument, 0, "Disable fast decision for Merge RD Cost")
 OPT("early-skip",      param->bEnableEarlySkip,             no_argument, 0, "Enable early SKIP detection")
 OPT("no-early-skip",   param->bEnableEarlySkip,             no_argument, 0, "Disable early SKIP detection")
 OPT("merge-level",     param->log2ParallelMergeLevel, required_argument, 0, "Parallel merge estimation region")
-OPT("tmvp",            param->TMVPModeId,             required_argument, 0, "TMVP mode 0:disabled 1:enabled(default) 2:auto")
 OPT("fast-cbf",        param->bEnableCbfFastMode,           no_argument, 0, "Enable Cbf fast mode")
 OPT("no-fast-cbf",     param->bEnableCbfFastMode,           no_argument, 0, "Disable Cbf fast mode")
 
@@ -60,8 +54,7 @@
 OPT("no-tskip",        param->bEnableTransformSkip,         no_argument, 0, "Disable intra transform skipping")
 OPT("tskip-fast",      param->bEnableTSkipFast,             no_argument, 0, "Enable fast intra transform skipping")
 OPT("no-tskip-fast",   param->bEnableTSkipFast,             no_argument, 0, "Disable fast intra transform skipping")
-OPT("strong-intra-smoothing", param->bEnableStrongIntraSmoothing,  no_argument, 0, "Enable strong intra smoothing for 32x32 blocks")
-OPT("no-strong-intra-smoothing", param->bEnableStrongIntraSmoothing, no_argument, 0, "Disable strong intra smoothing for 32x32 blocks")
+
 OPT("constrained-intra", param->bEnableConstrainedIntra,    no_argument, 0, "Constrained intra prediction (use only intra coded reference pixels)")
 OPT("no-constrained-intra", param->bEnableConstrainedIntra, no_argument, 0, "Disable constrained intra prediction (use only intra coded reference pixels)")
 
@@ -74,7 +67,7 @@
 
 HELP("QP and rate distortion options:")
 OPT("qp",              param->qp,                     required_argument, 'q', "Base QP for CQP mode (default: 30)")
-OPT("cbqpoffs",        param->cbQpOffset,             required_argument, 0, "Chroma Cb QP Offset")
+
 OPT("crqpoffs",        param->crQpOffset,             required_argument, 0, "Chroma Cr QP Offset")
 OPT("aqselect",        param->bEnableAdaptQpSelect,         no_argument, 0, "Adaptive QP selection")
 OPT("aq",              param->bEnableAdaptiveQP,            no_argument, 0, "Enable QP adaptation based on a psycho-visual model")
-------------- next part --------------
A non-text attachment was scrubbed...
Name: June_27_sumalatha_new.patch
Type: text/x-patch
Size: 4516 bytes
Desc: not available
URL: <http://mailman.videolan.org/pipermail/x265-devel/attachments/20130627/3343c342/attachment.bin>