lkml.org 
[lkml]   [2020]   [Nov]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 7/9] media: uapi: Move the H264 stateless control types out of staging
    Date
    Move the H264 stateless control types out of staging,
    and re-number them to avoid any confusion.

    Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
    ---
    include/media/h264-ctrls.h | 8 --------
    include/uapi/linux/videodev2.h | 7 +++++++
    2 files changed, 7 insertions(+), 8 deletions(-)

    diff --git a/include/media/h264-ctrls.h b/include/media/h264-ctrls.h
    index 4be80969fa44..192f491220f8 100644
    --- a/include/media/h264-ctrls.h
    +++ b/include/media/h264-ctrls.h
    @@ -35,14 +35,6 @@
    #define V4L2_CID_MPEG_VIDEO_H264_START_CODE (V4L2_CID_CODEC_BASE+1006)
    #define V4L2_CID_MPEG_VIDEO_H264_PRED_WEIGHTS (V4L2_CID_CODEC_BASE+1007)

    -/* enum v4l2_ctrl_type type values */
    -#define V4L2_CTRL_TYPE_H264_SPS 0x0110
    -#define V4L2_CTRL_TYPE_H264_PPS 0x0111
    -#define V4L2_CTRL_TYPE_H264_SCALING_MATRIX 0x0112
    -#define V4L2_CTRL_TYPE_H264_SLICE_PARAMS 0x0113
    -#define V4L2_CTRL_TYPE_H264_DECODE_PARAMS 0x0114
    -#define V4L2_CTRL_TYPE_H264_PRED_WEIGHTS 0x0115
    -
    /**
    * enum v4l2_mpeg_video_h264_decode_mode - Decoding mode
    *
    diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
    index 306d569bec11..261123cb6642 100644
    --- a/include/uapi/linux/videodev2.h
    +++ b/include/uapi/linux/videodev2.h
    @@ -1776,6 +1776,13 @@ enum v4l2_ctrl_type {
    V4L2_CTRL_TYPE_U16 = 0x0101,
    V4L2_CTRL_TYPE_U32 = 0x0102,
    V4L2_CTRL_TYPE_AREA = 0x0106,
    +
    + V4L2_CTRL_TYPE_H264_SPS = 0x0200,
    + V4L2_CTRL_TYPE_H264_PPS = 0x0201,
    + V4L2_CTRL_TYPE_H264_SCALING_MATRIX = 0x0202,
    + V4L2_CTRL_TYPE_H264_SLICE_PARAMS = 0x0203,
    + V4L2_CTRL_TYPE_H264_DECODE_PARAMS = 0x0204,
    + V4L2_CTRL_TYPE_H264_PRED_WEIGHTS = 0x0205,
    };

    /* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
    --
    2.27.0
    \
     
     \ /
      Last update: 2020-11-13 22:53    [W:2.871 / U:0.184 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site