media: uapi: vp8: Rename v4l2_vp8_loopfilter to v4l2_vp8_loop_filter

Rename to struct v4l2_vp8_loop_filter, which is closer to the
VP8 syntax. This change is only cosmetics, but since this API
is exposed to userspace, it's worth the trouble to get it consistent.

Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
index 7c778f42f80eeea1f3d1fc0e954baec2aaa88276..1fa9a54f63bff1e2bb8d9656f0989c27f0cda98d 100644 (file)
--- a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
+++ b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
@@ -1829,7 +1829,7 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type -
     * - struct :c:type:`v4l2_vp8_segment`
       - ``segment``
       - Structure with segment-based adjustments metadata.
-    * - struct :c:type:`v4l2_vp8_loopfilter`
+    * - struct :c:type:`v4l2_vp8_loop_filter`
       - ``lf``
       - Structure with loop filter level adjustments metadata.
     * - struct :c:type:`v4l2_vp8_quantization`
@@ -2027,13 +2027,13 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type -
 
     \normalsize
 
-.. c:type:: v4l2_vp8_loopfilter
+.. c:type:: v4l2_vp8_loop_filter
 
 .. cssclass:: longtable
 
 .. tabularcolumns:: |p{1.5cm}|p{3.9cm}|p{11.9cm}|
 
-.. flat-table:: struct v4l2_vp8_loopfilter
+.. flat-table:: struct v4l2_vp8_loop_filter
     :header-rows:  0
     :stub-columns: 0
     :widths:       1 1 2
@@ -2055,11 +2055,11 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type -
       - Applications and drivers must set this to zero.
     * - __u32
       - ``flags``
-      - See :ref:`Loopfilter Flags <vp8_loopfilter_flags>`
+      - See :ref:`Loop Filter Flags <vp8_loop_filter_flags>`
 
-.. _vp8_loopfilter_flags:
+.. _vp8_loop_filter_flags:
 
-``Loopfilter Flags``
+``Loop Filter Flags``
 
 .. tabularcolumns:: |p{7.0cm}|p{1.2cm}|p{9.1cm}|
 

diff --git a/drivers/staging/media/hantro/hantro_g1_vp8_dec.c b/drivers/staging/media/hantro/hantro_g1_vp8_dec.c
index 07acb4ea5dd07420a0f5afbbce81742ab1870c5f..cbe1d087f1037343b303030dab1042f494e687f0 100644 (file)
--- a/drivers/staging/media/hantro/hantro_g1_vp8_dec.c
+++ b/drivers/staging/media/hantro/hantro_g1_vp8_dec.c
@@ -136,7 +136,7 @@ static void cfg_lf(struct hantro_ctx *ctx,
                   const struct v4l2_ctrl_vp8_frame *hdr)
 {
        const struct v4l2_vp8_segment *seg = &hdr->segment;
-       const struct v4l2_vp8_loopfilter *lf = &hdr->lf;
+       const struct v4l2_vp8_loop_filter *lf = &hdr->lf;
        struct hantro_dev *vpu = ctx->dev;
        unsigned int i;
        u32 reg;

diff --git a/drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c b/drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c
index 4dfd4dddbcac1a0a0c84691726db4c56c3f30bd6..1a0d7fef47232b39b89256e0b097f2ed8d9e63fe 100644 (file)
--- a/drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c
+++ b/drivers/staging/media/hantro/rk3399_vpu_hw_vp8_dec.c
@@ -277,7 +277,7 @@ static void cfg_lf(struct hantro_ctx *ctx,
                   const struct v4l2_ctrl_vp8_frame *hdr)
 {
        const struct v4l2_vp8_segment *seg = &hdr->segment;
-       const struct v4l2_vp8_loopfilter *lf = &hdr->lf;
+       const struct v4l2_vp8_loop_filter *lf = &hdr->lf;
        struct hantro_dev *vpu = ctx->dev;
        unsigned int i;
        u32 reg;

diff --git a/include/media/vp8-ctrls.h b/include/media/vp8-ctrls.h
index 3f74012e23ff61c54ac8f52a7819acb105f59603..3afaf6ea4bc9a737d9cc46960d22f33e481df775 100644 (file)
--- a/include/media/vp8-ctrls.h
+++ b/include/media/vp8-ctrls.h
@@ -34,7 +34,7 @@ struct v4l2_vp8_segment {
 #define V4L2_VP8_LF_ADJ_ENABLE 0x01
 #define V4L2_VP8_LF_DELTA_UPDATE       0x02
 #define V4L2_VP8_LF_FILTER_TYPE_SIMPLE 0x04
-struct v4l2_vp8_loopfilter {
+struct v4l2_vp8_loop_filter {
        __s8 ref_frm_delta[4];
        __s8 mb_mode_delta[4];
        __u8 sharpness_level;
@@ -82,7 +82,7 @@ struct v4l2_vp8_entropy_coder_state {
 
 struct v4l2_ctrl_vp8_frame {
        struct v4l2_vp8_segment segment;
-       struct v4l2_vp8_loopfilter lf;
+       struct v4l2_vp8_loop_filter lf;
        struct v4l2_vp8_quantization quant;
        struct v4l2_vp8_entropy entropy;
        struct v4l2_vp8_entropy_coder_state coder_state;