Skip to content

Commit

Permalink
[media] add mux and video interface bridge entity functions
Browse files Browse the repository at this point in the history
Add two new media entity function definitions for video multiplexers
and video interface bridges.

- renamed MEDIA_ENT_F_MUX to MEDIA_ENT_F_VID_MUX

Signed-off-by: Philipp Zabel <[email protected]>
Signed-off-by: Steve Longerbeam <[email protected]>
Acked-by: Sakari Ailus <[email protected]>
Signed-off-by: Hans Verkuil <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
  • Loading branch information
pH5 authored and mchehab committed Jun 20, 2017
1 parent 4e12ad4 commit b45cd75
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 0 deletions.
21 changes: 21 additions & 0 deletions Documentation/media/uapi/mediactl/media-types.rst
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,27 @@ Types and flags used to represent the media graph elements
received on its sink pad and outputs the statistics data on
its source pad.

- .. row 29

.. _MEDIA-ENT-F-VID-MUX:

- ``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
frame(s) received from the active sink pad to the source pad.

- .. row 30

.. _MEDIA-ENT-F-VID-IF-BRIDGE:

- ``MEDIA_ENT_F_VID_IF_BRIDGE``

- Video interface bridge. A video interface bridge entity must have at
least one sink pad and at least one source pad. It receives video
frames on its sink pad from an input video bus of one type (HDMI, eDP,
MIPI CSI-2, ...), and outputs them on its source pad to an output
video bus of another type (eDP, MIPI CSI-2, parallel, ...).

.. tabularcolumns:: |p{5.5cm}|p{12.0cm}|

Expand Down
6 changes: 6 additions & 0 deletions include/uapi/linux/media.h
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,12 @@ struct media_device_info {
#define MEDIA_ENT_F_PROC_VIDEO_SCALER (MEDIA_ENT_F_BASE + 0x4005)
#define MEDIA_ENT_F_PROC_VIDEO_STATISTICS (MEDIA_ENT_F_BASE + 0x4006)

/*
* Switch and bridge entitites
*/
#define MEDIA_ENT_F_VID_MUX (MEDIA_ENT_F_BASE + 0x5001)
#define MEDIA_ENT_F_VID_IF_BRIDGE (MEDIA_ENT_F_BASE + 0x5002)

/*
* Connectors
*/
Expand Down

0 comments on commit b45cd75

Please sign in to comment.