Add v4l-audio support to helper headers.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xxxxxxxxx>
---
utils/common/cv4l-helpers.h | 7 ++++++
utils/common/v4l-helpers.h | 44 +++++++++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+)
diff --git a/utils/common/cv4l-helpers.h b/utils/common/cv4l-helpers.h
index 91a04146..235368ec 100644
--- a/utils/common/cv4l-helpers.h
+++ b/utils/common/cv4l-helpers.h
@@ -78,6 +78,13 @@ public:
bool has_rds_out() const { return v4l_has_rds_out(this); }
bool has_sdr_cap() const { return v4l_has_sdr_cap(this); }
bool has_sdr_out() const { return v4l_has_sdr_out(this); }
+ bool has_touch() const { return v4l_has_touch(this); }
+ bool has_meta_cap() const { return v4l_has_meta_cap(this); }
+ bool has_meta_out() const { return v4l_has_meta_out(this); }
+ bool has_audio_cap() const { return v4l_has_audio_cap(this); }
+ bool has_audio_out() const { return v4l_has_audio_out(this); }
+ bool has_audio_m2m() const { return v4l_has_audio_m2m(this); }
+ bool has_m2m() const { return v4l_has_m2m(this); }
bool has_hwseek() const { return v4l_has_hwseek(this); }
bool has_rw() const { return v4l_has_rw(this); }
bool has_streaming() const { return v4l_has_streaming(this); }
diff --git a/utils/common/v4l-helpers.h b/utils/common/v4l-helpers.h
index f8e96d58..a01b3e48 100644
--- a/utils/common/v4l-helpers.h
+++ b/utils/common/v4l-helpers.h
@@ -404,6 +404,26 @@ static inline bool v4l_has_touch(const struct v4l_fd *f)
return v4l_g_caps(f) & V4L2_CAP_TOUCH;
}
+static inline bool v4l_has_audio_cap(const struct v4l_fd *f)
+{
+ return v4l_g_caps(f) & V4L2_CAP_AUDIO_M2M;
+}
+
+static inline bool v4l_has_audio_out(const struct v4l_fd *f)
+{
+ return v4l_g_caps(f) & V4L2_CAP_AUDIO_M2M;
+}
+
+static inline bool v4l_has_audio_m2m(const struct v4l_fd *f)
+{
+ return v4l_g_caps(f) & V4L2_CAP_AUDIO_M2M;
+}
+
+static inline bool v4l_has_m2m(const struct v4l_fd *f)
+{
+ return v4l_has_vid_m2m(f) || v4l_has_audio_m2m(f);
+}
+
static inline bool v4l_has_hwseek(const struct v4l_fd *f)
{
return v4l_g_caps(f) & V4L2_CAP_HW_FREQ_SEEK;
@@ -449,6 +469,10 @@ static inline __u32 v4l_determine_type(const struct v4l_fd *f)
return V4L2_BUF_TYPE_META_CAPTURE;
if (v4l_has_meta_out(f))
return V4L2_BUF_TYPE_META_OUTPUT;
+ if (v4l_has_audio_cap(f))
+ return V4L2_BUF_TYPE_AUDIO_CAPTURE;
+ if (v4l_has_audio_out(f))
+ return V4L2_BUF_TYPE_AUDIO_OUTPUT;
return 0;
}
@@ -701,6 +725,10 @@ static inline void v4l_format_s_pixelformat(struct v4l2_format *fmt, __u32 pixel
case V4L2_BUF_TYPE_META_OUTPUT:
fmt->fmt.meta.dataformat = pixelformat;
break;
+ case V4L2_BUF_TYPE_AUDIO_CAPTURE:
+ case V4L2_BUF_TYPE_AUDIO_OUTPUT:
+ fmt->fmt.audio.audioformat = pixelformat;
+ break;
}
}
@@ -722,6 +750,9 @@ static inline __u32 v4l_format_g_pixelformat(const struct v4l2_format *fmt)
case V4L2_BUF_TYPE_META_CAPTURE:
case V4L2_BUF_TYPE_META_OUTPUT:
return fmt->fmt.meta.dataformat;
+ case V4L2_BUF_TYPE_AUDIO_CAPTURE:
+ case V4L2_BUF_TYPE_AUDIO_OUTPUT:
+ return fmt->fmt.audio.audioformat;
default:
return 0;
}
@@ -1063,6 +1094,9 @@ v4l_format_g_sizeimage(const struct v4l2_format *fmt, unsigned plane)
case V4L2_BUF_TYPE_META_CAPTURE:
case V4L2_BUF_TYPE_META_OUTPUT:
return plane ? 0 : fmt->fmt.meta.buffersize;
+ case V4L2_BUF_TYPE_AUDIO_CAPTURE:
+ case V4L2_BUF_TYPE_AUDIO_OUTPUT:
+ return plane ? 0 : fmt->fmt.audio.buffersize;
default:
return 0;
}
@@ -1187,12 +1221,22 @@ static inline bool v4l_type_is_meta(unsigned type)
type == V4L2_BUF_TYPE_META_OUTPUT;
}
+static inline bool v4l_type_is_audio(unsigned type)
+{
+ return type == V4L2_BUF_TYPE_AUDIO_CAPTURE ||
+ type == V4L2_BUF_TYPE_AUDIO_OUTPUT;
+}
+
static inline unsigned v4l_type_invert(unsigned type)
{
if (v4l_type_is_planar(type))
return v4l_type_is_output(type) ?
V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE :
V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
+ if (v4l_type_is_audio(type))
+ return v4l_type_is_output(type) ?
+ V4L2_BUF_TYPE_AUDIO_CAPTURE :
+ V4L2_BUF_TYPE_AUDIO_OUTPUT;
return v4l_type_is_output(type) ?
V4L2_BUF_TYPE_VIDEO_CAPTURE :
V4L2_BUF_TYPE_VIDEO_OUTPUT;
--
2.42.0
