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

[Derek Buitenhuis]

On Mon, Sep 16, 2013 at 1:30 PM, Deepthi Nandakumar
<deepthi at multicorewareinc.com> wrote:
> # 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)

This looks incorrect. The function needs to be exported and to be able
to be called
from C.


> 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;
> +    }

Please add a note in the commit message about this.

Rest is OK.

- Derek