summaryrefslogtreecommitdiff
path: root/vpx
diff options
context:
space:
mode:
authorJohann <johannkoenig@google.com>2017-12-28 14:57:02 -0800
committerJohann <johannkoenig@google.com>2018-01-11 12:35:24 -0800
commitf5b2dd2a662ec3c52c00ed3319f4e031211b510a (patch)
tree3b2d457da1f4f545b8ce0c3dc39198be3b2d704f /vpx
parent1633786bfb5a3566d55ccdf827dd7999b2c2fab4 (diff)
downloadlibvpx-f5b2dd2a662ec3c52c00ed3319f4e031211b510a.tar
libvpx-f5b2dd2a662ec3c52c00ed3319f4e031211b510a.tar.gz
libvpx-f5b2dd2a662ec3c52c00ed3319f4e031211b510a.tar.bz2
libvpx-f5b2dd2a662ec3c52c00ed3319f4e031211b510a.zip
adopt some clang 5.0.0 formatting
At least the changes that don't conflict with 4.0.1 Change-Id: I9b6a7c14dadc0738cd0f628a10ece90fc7ee89fd
Diffstat (limited to 'vpx')
-rw-r--r--vpx/vp8cx.h36
-rw-r--r--vpx/vpx_encoder.h12
2 files changed, 24 insertions, 24 deletions
diff --git a/vpx/vp8cx.h b/vpx/vp8cx.h
index c21b8b60d..6c67ec24f 100644
--- a/vpx/vp8cx.h
+++ b/vpx/vp8cx.h
@@ -529,7 +529,7 @@ enum vp8e_enc_control_id {
* struct #vpx_svc_ref_frame_config defined below.
*
* Supported in codecs: VP9
- */
+ */
VP9E_SET_SVC_REF_FRAME_CONFIG,
/*!\brief Codec control function to set intended rendering image size.
@@ -550,11 +550,11 @@ enum vp8e_enc_control_id {
VP9E_SET_TARGET_LEVEL,
/*!\brief Codec control function to set row level multi-threading.
- *
- * 0 : off, 1 : on
- *
- * Supported in codecs: VP9
- */
+ *
+ * 0 : off, 1 : on
+ *
+ * Supported in codecs: VP9
+ */
VP9E_SET_ROW_MT,
/*!\brief Codec control function to get bitstream level.
@@ -574,18 +574,18 @@ enum vp8e_enc_control_id {
VP9E_SET_ALT_REF_AQ,
/*!\brief Boost percentage for Golden Frame in CBR mode.
- *
- * This value controls the amount of boost given to Golden Frame in
- * CBR mode. It is expressed as a percentage of the average
- * per-frame bitrate, with the special (and default) value 0 meaning
- * the feature is off, i.e., no golden frame boost in CBR mode and
- * average bitrate target is used.
- *
- * For example, to allow 100% more bits, i.e, 2X, in a golden frame
- * than average frame, set this to 100.
- *
- * Supported in codecs: VP8
- */
+ *
+ * This value controls the amount of boost given to Golden Frame in
+ * CBR mode. It is expressed as a percentage of the average
+ * per-frame bitrate, with the special (and default) value 0 meaning
+ * the feature is off, i.e., no golden frame boost in CBR mode and
+ * average bitrate target is used.
+ *
+ * For example, to allow 100% more bits, i.e, 2X, in a golden frame
+ * than average frame, set this to 100.
+ *
+ * Supported in codecs: VP8
+ */
VP8E_SET_GF_CBR_BOOST_PCT,
/*!\brief Codec control function to enable the extreme motion vector unit test
diff --git a/vpx/vpx_encoder.h b/vpx/vpx_encoder.h
index e7670bdf0..de964eb46 100644
--- a/vpx/vpx_encoder.h
+++ b/vpx/vpx_encoder.h
@@ -598,10 +598,10 @@ typedef struct vpx_codec_enc_cfg {
unsigned int rc_2pass_vbr_maxsection_pct;
/*!\brief Two-pass corpus vbr mode complexity control
- * Used only in VP9: A value representing the corpus midpoint complexity
- * for corpus vbr mode. This value defaults to 0 which disables corpus vbr
- * mode in favour of normal vbr mode.
- */
+ * Used only in VP9: A value representing the corpus midpoint complexity
+ * for corpus vbr mode. This value defaults to 0 which disables corpus vbr
+ * mode in favour of normal vbr mode.
+ */
unsigned int rc_2pass_vbr_corpus_complexity;
/*
@@ -684,7 +684,7 @@ typedef struct vpx_codec_enc_cfg {
* membership of frames to temporal layers. For example, if the
* ts_periodicity = 8, then the frames are assigned to coding layers with a
* repeated sequence of length 8.
- */
+ */
unsigned int ts_periodicity;
/*!\brief Template defining the membership of frames to temporal layers.
@@ -693,7 +693,7 @@ typedef struct vpx_codec_enc_cfg {
* For a 2-layer encoding that assigns even numbered frames to one temporal
* layer (0) and odd numbered frames to a second temporal layer (1) with
* ts_periodicity=8, then ts_layer_id = (0,1,0,1,0,1,0,1).
- */
+ */
unsigned int ts_layer_id[VPX_TS_MAX_PERIODICITY];
/*!\brief Target bitrate for each spatial/temporal layer.