diff options
| author | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2021-03-11 17:47:00 +0100 |
|---|---|---|
| committer | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2021-03-11 17:47:00 +0100 |
| commit | a6eab98a2a046f59514bcc33f549d22626d05b2e (patch) | |
| tree | 9dbe860a37beb5b3fb1304f347ecbc9eb4eb685e | |
| parent | f253495fa6de2b01fdf56d496b9ee71b04558409 (diff) | |
| download | v4l-utils-a6eab98a2a046f59514bcc33f549d22626d05b2e.tar.gz | |
v4l-utils: sync with latest media kernel
Also drop the 'grep -v V4L2_PIX_FMT_H264_SLICE' in sync-with-kernel.sh.
This is now part of the stable API, so allow this.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
| -rw-r--r-- | contrib/freebsd/include/linux/v4l2-controls.h | 2 | ||||
| -rw-r--r-- | include/linux/v4l2-controls.h | 2 | ||||
| -rwxr-xr-x | sync-with-kernel.sh | 2 | ||||
| -rw-r--r-- | utils/common/v4l2-pix-formats.h | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/contrib/freebsd/include/linux/v4l2-controls.h b/contrib/freebsd/include/linux/v4l2-controls.h index 708a2faf..40cf8b41 100644 --- a/contrib/freebsd/include/linux/v4l2-controls.h +++ b/contrib/freebsd/include/linux/v4l2-controls.h @@ -1327,7 +1327,7 @@ struct v4l2_ctrl_h264_sps { * struct v4l2_ctrl_h264_pps - H264 picture parameter set * * Except where noted, all the members on this picture parameter set - * structure match the sequence parameter set syntax as specified + * structure match the picture parameter set syntax as specified * by the H264 specification. * * In particular, V4L2_H264_PPS_FLAG_SCALING_MATRIX_PRESENT flag diff --git a/include/linux/v4l2-controls.h b/include/linux/v4l2-controls.h index 708a2faf..40cf8b41 100644 --- a/include/linux/v4l2-controls.h +++ b/include/linux/v4l2-controls.h @@ -1327,7 +1327,7 @@ struct v4l2_ctrl_h264_sps { * struct v4l2_ctrl_h264_pps - H264 picture parameter set * * Except where noted, all the members on this picture parameter set - * structure match the sequence parameter set syntax as specified + * structure match the picture parameter set syntax as specified * by the H264 specification. * * In particular, V4L2_H264_PPS_FLAG_SCALING_MATRIX_PRESENT flag diff --git a/sync-with-kernel.sh b/sync-with-kernel.sh index c57f38bb..fa881949 100755 --- a/sync-with-kernel.sh +++ b/sync-with-kernel.sh @@ -50,7 +50,7 @@ patch -d ${TOPSRCDIR} --no-backup-if-mismatch -p1 <${TOPSRCDIR}/utils/common/v4l cp -a ${KERNEL_DIR}/drivers/media/test-drivers/vicodec/codec-fwht.[ch] ${TOPSRCDIR}/utils/common/ cp -a ${KERNEL_DIR}/drivers/media/test-drivers/vicodec/codec-v4l2-fwht.[ch] ${TOPSRCDIR}/utils/common/ patch -d ${TOPSRCDIR} --no-backup-if-mismatch -p1 <${TOPSRCDIR}/utils/common/codec-fwht.patch -grep V4L2_.*_FMT.*descr ${KERNEL_DIR}/drivers/media/v4l2-core/v4l2-ioctl.c | grep -v V4L2_PIX_FMT_H264_SLICE | grep -v V4L2_PIX_FMT_VP8_FRAME | grep -v V4L2_PIX_FMT_HEVC_SLICE | perl -pe 's/.*V4L2_(.*)_FMT/\tcase V4L2_\1_FMT/; s/:.*descr = /: return /; s/;.*/;/;' >${TOPSRCDIR}/utils/common/v4l2-pix-formats.h +grep V4L2_.*_FMT.*descr ${KERNEL_DIR}/drivers/media/v4l2-core/v4l2-ioctl.c | grep -v V4L2_PIX_FMT_VP8_FRAME | grep -v V4L2_PIX_FMT_HEVC_SLICE | perl -pe 's/.*V4L2_(.*)_FMT/\tcase V4L2_\1_FMT/; s/:.*descr = /: return /; s/;.*/;/;' >${TOPSRCDIR}/utils/common/v4l2-pix-formats.h function keytable { SRCDIR=${TOPSRCDIR}/utils/keytable diff --git a/utils/common/v4l2-pix-formats.h b/utils/common/v4l2-pix-formats.h index c8f55eb9..4bf091ac 100644 --- a/utils/common/v4l2-pix-formats.h +++ b/utils/common/v4l2-pix-formats.h @@ -173,6 +173,7 @@ case V4L2_PIX_FMT_H264: return "H.264"; case V4L2_PIX_FMT_H264_NO_SC: return "H.264 (No Start Codes)"; case V4L2_PIX_FMT_H264_MVC: return "H.264 MVC"; + case V4L2_PIX_FMT_H264_SLICE: return "H.264 Parsed Slice Data"; case V4L2_PIX_FMT_H263: return "H.263"; case V4L2_PIX_FMT_MPEG1: return "MPEG-1 ES"; case V4L2_PIX_FMT_MPEG2: return "MPEG-2 ES"; |