diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2018-07-04 17:13:47 +0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2018-07-25 15:07:58 +0300 |
commit | 45841a977391f24b9bf713548c588d148a576d22 (patch) | |
tree | 7142bd726f79178c20900ec03c6e2b2fdd67261d | |
parent | 8601494e0ec0a7697230b2abca25d786b793341b (diff) | |
download | linux-45841a977391f24b9bf713548c588d148a576d22.tar.xz |
media: media.h: add encoder/decoder functions for codecs
Add MEDIA_ENT_F_PROC_VIDEO_EN/DECODER to be used for the encoder
and decoder entities of codec hardware.
[mchehab+samsung@kernel.org: split description on two senteces by adding dots]
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-rw-r--r-- | Documentation/media/uapi/mediactl/media-types.rst | 11 | ||||
-rw-r--r-- | include/uapi/linux/media.h | 2 |
2 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/media/uapi/mediactl/media-types.rst b/Documentation/media/uapi/mediactl/media-types.rst index e90d4d0a7f8b..7b17acc049cf 100644 --- a/Documentation/media/uapi/mediactl/media-types.rst +++ b/Documentation/media/uapi/mediactl/media-types.rst @@ -37,6 +37,8 @@ Types and flags used to represent the media graph elements .. _MEDIA-ENT-F-PROC-VIDEO-LUT: .. _MEDIA-ENT-F-PROC-VIDEO-SCALER: .. _MEDIA-ENT-F-PROC-VIDEO-STATISTICS: +.. _MEDIA-ENT-F-PROC-VIDEO-ENCODER: +.. _MEDIA-ENT-F-PROC-VIDEO-DECODER: .. _MEDIA-ENT-F-VID-MUX: .. _MEDIA-ENT-F-VID-IF-BRIDGE: .. _MEDIA-ENT-F-DTV-DECODER: @@ -188,6 +190,15 @@ Types and flags used to represent the media graph elements received on its sink pad and outputs the statistics data on its source pad. + * - ``MEDIA_ENT_F_PROC_VIDEO_ENCODER`` + - Video (MPEG, HEVC, VPx, etc.) encoder. An entity capable of + compressing video frames. Must have one sink pad and one source pad. + + * - ``MEDIA_ENT_F_PROC_VIDEO_DECODER`` + - Video (MPEG, HEVC, VPx, etc.) decoder. An entity capable of + decompressing a compressed video stream into uncompressed video + frames. Must have one sink pad and one source pad. + * - ``MEDIA_ENT_F_VID_MUX`` - Video multiplexer. An entity capable of multiplexing must have at least two sink pads and one source pad, and must pass the video diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h index 76d9bd64c116..82ec9f132a53 100644 --- a/include/uapi/linux/media.h +++ b/include/uapi/linux/media.h @@ -126,6 +126,8 @@ struct media_device_info { #define MEDIA_ENT_F_PROC_VIDEO_LUT (MEDIA_ENT_F_BASE + 0x4004) #define MEDIA_ENT_F_PROC_VIDEO_SCALER (MEDIA_ENT_F_BASE + 0x4005) #define MEDIA_ENT_F_PROC_VIDEO_STATISTICS (MEDIA_ENT_F_BASE + 0x4006) +#define MEDIA_ENT_F_PROC_VIDEO_ENCODER (MEDIA_ENT_F_BASE + 0x4007) +#define MEDIA_ENT_F_PROC_VIDEO_DECODER (MEDIA_ENT_F_BASE + 0x4008) /* * Switch and bridge entity functions |