lkml.org 
[lkml]   [2017]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 14/39] add mux and video interface bridge entity functions
    Date
    From: Philipp Zabel <p.zabel@pengutronix.de>

    Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>

    - renamed MEDIA_ENT_F_MUX to MEDIA_ENT_F_VID_MUX

    Signed-off-by: Steve Longerbeam <steve_longerbeam@mentor.com>
    ---
    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 2a5164a..47ee003 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.
    +
    + - .. 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 frame(s) on
    + its sink pad in one bus format (HDMI, eDP, MIPI CSI-2, ...) and
    + converts them and outputs them on its source pad in another bus format
    + (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 4890787..fac96c6 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 */
    --
    2.7.4
    \
     
     \ /
      Last update: 2017-03-28 02:51    [W:4.809 / U:0.724 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site