Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b45cd756 authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab
Browse files

[media] add mux and video interface bridge entity functions 



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: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarSteve Longerbeam <steve_longerbeam@mentor.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 4e12ad40

Documentation/media/uapi/mediactl/media-types.rst

+21 −0
Original line number Original line Diff line number Diff line
@@ -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

	  received on its sink pad and outputs the statistics data on

	  its source pad.

	  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}|

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

include/uapi/linux/media.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -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_SCALER		(MEDIA_ENT_F_BASE + 0x4005)

#define MEDIA_ENT_F_PROC_VIDEO_STATISTICS	(MEDIA_ENT_F_BASE + 0x4006)

#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

 * Connectors

 */

 */