diff options
| author | Adrian Grange <agrange@google.com> | 2014-05-02 08:13:06 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-05-02 08:13:06 -0700 |
| commit | 8b2b7370b54c601c1b443f6398f6c6565efe34b7 (patch) | |
| tree | 46753441da6b90f84e7e9760c0bfa19f187ec182 /vpx | |
| parent | a481fcc3e032ff68061c8feeee332f6574e75a19 (diff) | |
| parent | 0a386b923427d3ee1d8b964118c04d40145f2e54 (diff) | |
| download | libvpx-8b2b7370b54c601c1b443f6398f6c6565efe34b7.tar libvpx-8b2b7370b54c601c1b443f6398f6c6565efe34b7.tar.gz libvpx-8b2b7370b54c601c1b443f6398f6c6565efe34b7.tar.bz2 libvpx-8b2b7370b54c601c1b443f6398f6c6565efe34b7.zip | |
Merge "Revert "Force ARNR filtering to be centered on the ARF frame""
Diffstat (limited to 'vpx')
| -rw-r--r-- | vpx/vp8cx.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vpx/vp8cx.h b/vpx/vp8cx.h index 8944a2664..bc8df807e 100644 --- a/vpx/vp8cx.h +++ b/vpx/vp8cx.h @@ -160,8 +160,10 @@ enum vp8e_enc_control_id { scale as used by the rc_*_quantizer config parameters */ VP8E_SET_ARNR_MAXFRAMES, /**< control function to set the max number of frames blurred creating arf*/ - VP8E_SET_ARNR_STRENGTH, /**< control function to set the filter strength for the arf */ - VP8E_SET_ARNR_TYPE, /**< control function to set the type of filter to use for the arf*/ + VP8E_SET_ARNR_STRENGTH, //!< control function to set the filter + //!< strength for the arf + VP8E_SET_ARNR_TYPE, //!< control function to set the type of + //!< filter to use for the arf VP8E_SET_TUNING, /**< control function to set visual tuning */ /*!\brief control function to set constrained quality level * |