The media/v4l2-info sources now understand the new Audio types.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xxxxxxxxx>
---
utils/common/media-info.cpp | 3 +++
utils/common/media-info.h | 1 +
utils/common/v4l2-info.cpp | 6 ++++++
3 files changed, 10 insertions(+)
diff --git a/utils/common/media-info.cpp b/utils/common/media-info.cpp
index 95e4c74f..060e8b64 100644
--- a/utils/common/media-info.cpp
+++ b/utils/common/media-info.cpp
@@ -44,6 +44,7 @@ static constexpr struct {
{ "swradio", MEDIA_TYPE_SDR },
{ "v4l-subdev", MEDIA_TYPE_SUBDEV },
{ "v4l-touch", MEDIA_TYPE_TOUCH },
+ { "v4l-audio", MEDIA_TYPE_AUDIO },
{ "media", MEDIA_TYPE_MEDIA },
{ "frontend", MEDIA_TYPE_DVB_FRONTEND },
{ "demux", MEDIA_TYPE_DVB_DEMUX },
@@ -280,6 +281,7 @@ static constexpr flag_def interface_types_def[] = {
{ MEDIA_INTF_T_V4L_SUBDEV, "V4L Sub-Device" },
{ MEDIA_INTF_T_V4L_SWRADIO, "V4L Software Defined Radio" },
{ MEDIA_INTF_T_V4L_TOUCH, "V4L Touch" },
+ { MEDIA_INTF_T_V4L_AUDIO, "V4L Audio" },
{ MEDIA_INTF_T_ALSA_PCM_CAPTURE, "ALSA PCM Capture" },
{ MEDIA_INTF_T_ALSA_PCM_PLAYBACK, "ALSA PCM Playback" },
@@ -335,6 +337,7 @@ static constexpr flag_def entity_functions_def[] = {
{ MEDIA_ENT_F_PROC_VIDEO_DECODER, "Video Decoder" },
{ MEDIA_ENT_F_PROC_VIDEO_ENCODER, "Video Encoder" },
{ MEDIA_ENT_F_PROC_VIDEO_ISP, "Image Signal Processor" },
+ { MEDIA_ENT_F_PROC_AUDIO_RESAMPLER, "Audio Resampler" },
{ MEDIA_ENT_F_VID_MUX, "Video Muxer" },
{ MEDIA_ENT_F_VID_IF_BRIDGE, "Video Interface Bridge" },
{ 0, nullptr }
diff --git a/utils/common/media-info.h b/utils/common/media-info.h
index c0dd6304..3c333df3 100644
--- a/utils/common/media-info.h
+++ b/utils/common/media-info.h
@@ -16,6 +16,7 @@ enum media_type {
MEDIA_TYPE_RADIO,
MEDIA_TYPE_SDR,
MEDIA_TYPE_TOUCH,
+ MEDIA_TYPE_AUDIO,
MEDIA_TYPE_SUBDEV,
MEDIA_TYPE_DVB_FRONTEND,
MEDIA_TYPE_DVB_DEMUX,
diff --git a/utils/common/v4l2-info.cpp b/utils/common/v4l2-info.cpp
index 72731bad..6e1e8b8b 100644
--- a/utils/common/v4l2-info.cpp
+++ b/utils/common/v4l2-info.cpp
@@ -97,6 +97,8 @@ static std::string cap2s(unsigned cap)
s += "\t\tExtended Pix Format\n";
if (cap & V4L2_CAP_DEVICE_CAPS)
s += "\t\tDevice Capabilities\n";
+ if (cap & V4L2_CAP_AUDIO_M2M)
+ s += "\t\tAudio Memory-to-Memory\n";
return s;
}
@@ -194,6 +196,10 @@ std::string buftype2s(int type)
return "Metadata Capture";
case V4L2_BUF_TYPE_META_OUTPUT:
return "Metadata Output";
+ case V4L2_BUF_TYPE_AUDIO_CAPTURE:
+ return "Audio Capture";
+ case V4L2_BUF_TYPE_AUDIO_OUTPUT:
+ return "Audio Output";
case V4L2_BUF_TYPE_PRIVATE:
return "Private";
default:
--
2.42.0
