v4l2-ctl/qv4l2: sync to latest vivid-tpg code

This updates vivid-tpg to the latest kernel version.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>

diff --git a/utils/v4l2-ctl/vivid-tpg.c b/utils/v4l2-ctl/vivid-tpg.c
index 71eeca5..8576b2c 100644 (file)
--- a/utils/v4l2-ctl/vivid-tpg.c
+++ b/utils/v4l2-ctl/vivid-tpg.c
@@ -57,9 +57,9 @@ const char * const tpg_aspect_strings[] = {
 };
 
 /*
- * Sinus table: sin[0] = 127 * sin(-180 degrees)
- *              sin[128] = 127 * sin(0 degrees)
- *              sin[256] = 127 * sin(180 degrees)
+ * Sine table: sin[0] = 127 * sin(-180 degrees)
+ *             sin[128] = 127 * sin(0 degrees)
+ *             sin[256] = 127 * sin(180 degrees)
  */
 static const s8 sin[257] = {
           0,   -4,   -7,  -11,  -13,  -18,  -20,  -22,  -26,  -29,  -33,  -35,  -37,  -41,  -43,  -48,

diff --git a/utils/v4l2-ctl/vivid-tpg.h b/utils/v4l2-ctl/vivid-tpg.h
index 1ac8039..76c373a 100644 (file)
--- a/utils/v4l2-ctl/vivid-tpg.h
+++ b/utils/v4l2-ctl/vivid-tpg.h
@@ -55,6 +55,11 @@ static inline void *vzalloc(unsigned long size)
        __val = __val < __min ? __min: __val;   \
        __val > __max ? __max: __val; })
 
+static inline u32 prandom_u32_max(u32 ep_ro)
+{
+       return rand() % ep_ro;
+}
+
 #include "vivid-tpg-colors.h"
 
 enum tpg_pattern {
@@ -463,9 +468,4 @@ static inline bool tpg_pattern_is_static(const struct tpg_data *tpg)
               tpg->mv_vert_mode == TPG_MOVE_NONE;
 }
 
-static inline u32 prandom_u32_max(u32 ep_ro)
-{
-       return rand() % ep_ro;
-}
-
 #endif