Hi Philipp, On Mon, May 29, 2017 at 05:12:10PM +0200, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx> > > - renamed MEDIA_ENT_F_MUX to MEDIA_ENT_F_VID_MUX > > Signed-off-by: Steve Longerbeam <steve_longerbeam@xxxxxxxxxx> > --- > Changes since [1]: > - Reword the video interface bridge description, do not use "bus format" to > avoid confiusion with media bus formats. > > [1] https://patchwork.linuxtv.org/patch/41467/ > --- > Documentation/media/uapi/mediactl/media-types.rst | 22 ++++++++++++++++++++++ > include/uapi/linux/media.h | 6 ++++++ > 2 files changed, 28 insertions(+) > > diff --git a/Documentation/media/uapi/mediactl/media-types.rst b/Documentation/media/uapi/mediactl/media-types.rst > index 2a5164aea2b40..1d15542f447c1 100644 > --- a/Documentation/media/uapi/mediactl/media-types.rst > +++ b/Documentation/media/uapi/mediactl/media-types.rst > @@ -299,6 +299,28 @@ 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. Video > + frame(s) from the inactive sink pads are discarded. I don't think the last sentence is needed, I'd drop it as redundant. Up to you. > + > + - .. 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 one source pad. It receives video frames on It's not clear whether there must be at least one source pad or one source pad. How about either: "must have at least one sink pad and at least one source pad" or "must have at least one sink pad and exactly one source pad"? With this considered, Acked-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx> > + 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}| > > diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h > index 4890787731b85..fac96c64fe513 100644 > --- a/include/uapi/linux/media.h > +++ b/include/uapi/linux/media.h > @@ -105,6 +105,12 @@ struct media_device_info { > #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 > */ > /* It is a responsibility of the entity drivers to add connectors and links */ -- Regards, Sakari Ailus e-mail: sakari.ailus@xxxxxx XMPP: sailus@xxxxxxxxxxxxxx
