Updating prebuilts and/or headers

da5475c4506f0f70011e5723f4f3e1e7368a0554 - nvbufsurface.h d53a1ccd9593f927408e1c19b0c0f98260b3c7cf - v4l2_nv_extensions.h d27a433ddeaefb9f42d0312c23472514b0cd6a45 - gst-nvcustomevent.h 98d803db7a9d6076b0e0281dd98dfac09aa7e662 - gst-v4l2/gstv4l2object.h 778ea5a8ef47b1d761bc1c0fbf94b5eda2927c43 - gst-v4l2/gstv4l2h264enc.c 870a72e5038dba9f4df37f900d53a059beee9bbc - gst-v4l2/gstv4l2h26xparser.h a002edef13a3bbbdc41e42a7fca40e574ad1bb3e - gst-v4l2/v4l2-utils.c 5948d70c07e87f9b1dc403789dcbed6acfa47ad9 - gst-v4l2/gstv4l2av1enc.c 4e79cf75c4fa29791e1f5141318dc8aec13a7835 - gst-v4l2/nalutils.h 9f726e4439379bb399f29c68736242f21dab3dd0 - gst-v4l2/gstv4l2allocator.c 49a66f0ce02abc71f33e096a65645ddedf5c7f46 - gst-v4l2/gstv4l2bufferpool.c b827fd6cb1e3b8ecebd6a07f8556e846e26cba17 - gst-v4l2/gstv4l2allocator.h dd0804801357dc06664d7c2862d5d76bde28121c - gst-v4l2/gstv4l2h265enc.c 110bd46e7f8753e4471cc9a1836c6ff7bded5ce6 - gst-v4l2/Makefile c81eacb7d88c4fb839506dd70055e30d7a9feeec - gst-v4l2/v4l2-utils.h 39fcb2f599e6906ab0fd7ab9a46fef3ea58a8cab - gst-v4l2/gstv4l2vp8enc.h d89a680415f6ff5acec2571cde0fce9054d8e81f - gst-v4l2/gstv4l2vp9enc.h bb104683f5e4f7402e3f765a891e149edc794e02 - gst-v4l2/gstv4l2h264enc.h 71be284b547ee68fb0e2cd14b0aeb14734a915a1 - gst-v4l2/gstv4l2bufferpool.h 02d142337f4b96fcb0c9f2405a3cbe90c5917cca - gst-v4l2/gstv4l2vp9enc.c 4e483adcc7b66b228ee8546981a3fa15ae9ad3b4 - gst-v4l2/v4l2_calls.c b1cd923335aa60985ff9866fba91a2068e8671c7 - gst-v4l2/LICENSE.gst-nvvideo4linux2 1efde38d61491d533f93f31ad52d4fab3595eaf0 - gst-v4l2/gstv4l2videodec.c cbc84dccd2506afa4c8f03849c95bb28c83ef4a3 - gst-v4l2/gstv4l2av1enc.h 6e63f8b6431493365ed1915ca57670216589159c - gst-v4l2/gstv4l2.c 9027f628c33b67f04782255a9833766b772d5f15 - gst-v4l2/gstv4l2videoenc.h 55a2c81ab3ffd72e07fc680369683d9635a3665c - gst-v4l2/gstv4l2h265enc.h 5ecd059e5ef9be4014eface37e5e2f7598960f4e - gst-v4l2/nalutils.c 807bc9859585a540b0f85e98f147756aab24e1bd - gst-v4l2/gstv4l2vp8enc.c 99d65d620807b5ba1ca29a838e032940c9b019cc - gst-v4l2/sei_parse.c 4b70823ac5f9a70cce0c909e284c73aed4bccbd6 - gst-v4l2/gstv4l2h26xparser.c d5952b0286c34bf13fbf5e09fe552ced0da49368 - gst-v4l2/gstv4l2videodec.h 2259dd5971ec37757e0659b564fdf802de72c757 - gst-v4l2/gstv4l2videoenc.c 6c06eb12b6e1fc0c6f17d37861ee003ebaeaeb30 - gst-v4l2/gstv4l2object.c e864ee6647f3572b144403d799f68152e9900da1 - gst-v4l2/gst/gettext.h 20c4f7c0cb89c83256650bc3353ed82154cf3a9d - gst-v4l2/gst/gst-i18n-plugin.h 499a9feb17ceabf1f1443923dffa1e0180bf5972 - gst-v4l2/gst/glib-compat-private.h fe847595bb202501a56702a7c602f0514d23c328 - gst-v4l2/ext/v4l2-common.h 583075e89482f1faa08be7f7b278336bf7756def - gst-v4l2/ext/v4l2-controls.h 72a34a694337f8f6da3bb94c9faced6730cbd2fc - gst-v4l2/ext/types-compat.h 2253e5f55e37aace35af706d5662ef017f17e877 - gst-v4l2/ext/videodev2.h Change-Id: I0c51779067f53b10846910ad859992dafc3533e4
2025-12-25 11:43:22 +03:00 · 2023-12-05 20:48:34 -08:00
20 changed files with 2132 additions and 599 deletions
--- a/commitFile.txt
+++ b/commitFile.txt
@@ -1,43 +1,43 @@
 Updating prebuilts and/or headers 

-ed8273ff6102bb0b4fa7975a401b12b3e95a7187 - nvbufsurface.h
-270379cd6bd312a0164ae9763879548928114222 - v4l2_nv_extensions.h
+da5475c4506f0f70011e5723f4f3e1e7368a0554 - nvbufsurface.h
+d53a1ccd9593f927408e1c19b0c0f98260b3c7cf - v4l2_nv_extensions.h
 d27a433ddeaefb9f42d0312c23472514b0cd6a45 - gst-nvcustomevent.h
-3f7cafe5beb4395caf2e1591bf0a835e5076031a - gst-v4l2/gstv4l2object.h
-e8e973c103725b65232d32817e0305d12d6ff309 - gst-v4l2/gstv4l2h264enc.c
-c2099692cdb374440c2a040cb6ad01bbc1549ce5 - gst-v4l2/gstv4l2h26xparser.h
+98d803db7a9d6076b0e0281dd98dfac09aa7e662 - gst-v4l2/gstv4l2object.h
+778ea5a8ef47b1d761bc1c0fbf94b5eda2927c43 - gst-v4l2/gstv4l2h264enc.c
+870a72e5038dba9f4df37f900d53a059beee9bbc - gst-v4l2/gstv4l2h26xparser.h
 a002edef13a3bbbdc41e42a7fca40e574ad1bb3e - gst-v4l2/v4l2-utils.c
 5948d70c07e87f9b1dc403789dcbed6acfa47ad9 - gst-v4l2/gstv4l2av1enc.c
 4e79cf75c4fa29791e1f5141318dc8aec13a7835 - gst-v4l2/nalutils.h
 9f726e4439379bb399f29c68736242f21dab3dd0 - gst-v4l2/gstv4l2allocator.c
 49a66f0ce02abc71f33e096a65645ddedf5c7f46 - gst-v4l2/gstv4l2bufferpool.c
 b827fd6cb1e3b8ecebd6a07f8556e846e26cba17 - gst-v4l2/gstv4l2allocator.h
-dc1a3f7292873f1f71dc27300f97f3ab918ed79f - gst-v4l2/gstv4l2h265enc.c
-65de802e5f162aa04518b7ade5841cc3ced01111 - gst-v4l2/Makefile
+dd0804801357dc06664d7c2862d5d76bde28121c - gst-v4l2/gstv4l2h265enc.c
+110bd46e7f8753e4471cc9a1836c6ff7bded5ce6 - gst-v4l2/Makefile
 c81eacb7d88c4fb839506dd70055e30d7a9feeec - gst-v4l2/v4l2-utils.h
 39fcb2f599e6906ab0fd7ab9a46fef3ea58a8cab - gst-v4l2/gstv4l2vp8enc.h
 d89a680415f6ff5acec2571cde0fce9054d8e81f - gst-v4l2/gstv4l2vp9enc.h
 bb104683f5e4f7402e3f765a891e149edc794e02 - gst-v4l2/gstv4l2h264enc.h
 71be284b547ee68fb0e2cd14b0aeb14734a915a1 - gst-v4l2/gstv4l2bufferpool.h
 02d142337f4b96fcb0c9f2405a3cbe90c5917cca - gst-v4l2/gstv4l2vp9enc.c
-73b03969d7ae0a8adb374c93999c43af88ea93b2 - gst-v4l2/v4l2_calls.c
+4e483adcc7b66b228ee8546981a3fa15ae9ad3b4 - gst-v4l2/v4l2_calls.c
 b1cd923335aa60985ff9866fba91a2068e8671c7 - gst-v4l2/LICENSE.gst-nvvideo4linux2
-b52a5ee4c739818736b9a3683442df285ebe9eda - gst-v4l2/gstv4l2videodec.c
+1efde38d61491d533f93f31ad52d4fab3595eaf0 - gst-v4l2/gstv4l2videodec.c
 cbc84dccd2506afa4c8f03849c95bb28c83ef4a3 - gst-v4l2/gstv4l2av1enc.h
-21a860247c06670e4619b8eaae1d92db31bdd3e8 - gst-v4l2/gstv4l2.c
-489fde70531590e94d1d211a42f10f81ae68d2b9 - gst-v4l2/gstv4l2videoenc.h
-d29e3a719400c3cb27314366d48ec792a3c12363 - gst-v4l2/gstv4l2h265enc.h
+6e63f8b6431493365ed1915ca57670216589159c - gst-v4l2/gstv4l2.c
+9027f628c33b67f04782255a9833766b772d5f15 - gst-v4l2/gstv4l2videoenc.h
+55a2c81ab3ffd72e07fc680369683d9635a3665c - gst-v4l2/gstv4l2h265enc.h
 5ecd059e5ef9be4014eface37e5e2f7598960f4e - gst-v4l2/nalutils.c
 807bc9859585a540b0f85e98f147756aab24e1bd - gst-v4l2/gstv4l2vp8enc.c
 99d65d620807b5ba1ca29a838e032940c9b019cc - gst-v4l2/sei_parse.c
-398c24d1eef98ec9003a06587bc3784050602cd2 - gst-v4l2/gstv4l2h26xparser.c
+4b70823ac5f9a70cce0c909e284c73aed4bccbd6 - gst-v4l2/gstv4l2h26xparser.c
 d5952b0286c34bf13fbf5e09fe552ced0da49368 - gst-v4l2/gstv4l2videodec.h
-9681f7b98dfdfbc4d845f9ce7f11c3692b923195 - gst-v4l2/gstv4l2videoenc.c
-884e5b97b9fa8d07b6153e6efe6999884922b813 - gst-v4l2/gstv4l2object.c
+2259dd5971ec37757e0659b564fdf802de72c757 - gst-v4l2/gstv4l2videoenc.c
+6c06eb12b6e1fc0c6f17d37861ee003ebaeaeb30 - gst-v4l2/gstv4l2object.c
 e864ee6647f3572b144403d799f68152e9900da1 - gst-v4l2/gst/gettext.h
 20c4f7c0cb89c83256650bc3353ed82154cf3a9d - gst-v4l2/gst/gst-i18n-plugin.h
 499a9feb17ceabf1f1443923dffa1e0180bf5972 - gst-v4l2/gst/glib-compat-private.h
-a745675b051a2b8434a430c80fde3f245864ca89 - gst-v4l2/ext/v4l2-common.h
-1636366b5a062e4bc1791b7bc3012ccf5635b363 - gst-v4l2/ext/v4l2-controls.h
+fe847595bb202501a56702a7c602f0514d23c328 - gst-v4l2/ext/v4l2-common.h
+583075e89482f1faa08be7f7b278336bf7756def - gst-v4l2/ext/v4l2-controls.h
 72a34a694337f8f6da3bb94c9faced6730cbd2fc - gst-v4l2/ext/types-compat.h
-522ab8fc8531a2c758b9278d29642f5b763fd3e7 - gst-v4l2/ext/videodev2.h
+2253e5f55e37aace35af706d5662ef017f17e877 - gst-v4l2/ext/videodev2.h
--- a/gst-v4l2/Makefile
+++ b/gst-v4l2/Makefile
@@ -19,6 +19,7 @@ NVDS_VERSION:=6.0
 ifeq ($(TARGET_DEVICE),aarch64)
  GST_INSTALL_DIR?=/usr/lib/aarch64-linux-gnu/gstreamer-1.0/
  LIB_INSTALL_DIR?=/usr/lib/aarch64-linux-gnu/tegra/
+  INCLUDES += -I/usr/src/jetson_multimedia_api/include/
  CFLAGS:=
 else
  GST_INSTALL_DIR?=/opt/nvidia/deepstream/deepstream-$(NVDS_VERSION)/lib/gst-plugins/
@@ -30,7 +31,6 @@ LIBS:= -lnvbufsurface -lnvbufsurftransform -lgstnvdsseimeta -lgstnvcustomhelper
 SRCS := $(wildcard *.c)

 INCLUDES += -I./ -I../
-INCLUDES += -I/usr/src/jetson_multimedia_api/include/

 PKGS := gstreamer-1.0 \
 	gstreamer-base-1.0 \
--- a/gst-v4l2/ext/v4l2-common.h
+++ b/gst-v4l2/ext/v4l2-common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) */
 /*
 * include/linux/v4l2-common.h
 *
@@ -53,7 +54,7 @@
 #ifndef __V4L2_COMMON__
 #define __V4L2_COMMON__

-#include "ext/types-compat.h"
+#include <linux/types.h>

 /*
 *
@@ -78,24 +79,11 @@
 /* Current composing area plus all padding pixels */
 #define V4L2_SEL_TGT_COMPOSE_PADDED	0x0103

-/* Backward compatibility target definitions --- to be removed. */
-#define V4L2_SEL_TGT_CROP_ACTIVE	V4L2_SEL_TGT_CROP
-#define V4L2_SEL_TGT_COMPOSE_ACTIVE	V4L2_SEL_TGT_COMPOSE
-#define V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL	V4L2_SEL_TGT_CROP
-#define V4L2_SUBDEV_SEL_TGT_COMPOSE_ACTUAL V4L2_SEL_TGT_COMPOSE
-#define V4L2_SUBDEV_SEL_TGT_CROP_BOUNDS	V4L2_SEL_TGT_CROP_BOUNDS
-#define V4L2_SUBDEV_SEL_TGT_COMPOSE_BOUNDS V4L2_SEL_TGT_COMPOSE_BOUNDS
-
 /* Selection flags */
 #define V4L2_SEL_FLAG_GE		(1 << 0)
 #define V4L2_SEL_FLAG_LE		(1 << 1)
 #define V4L2_SEL_FLAG_KEEP_CONFIG	(1 << 2)

-/* Backward compatibility flag definitions --- to be removed. */
-#define V4L2_SUBDEV_SEL_FLAG_SIZE_GE	V4L2_SEL_FLAG_GE
-#define V4L2_SUBDEV_SEL_FLAG_SIZE_LE	V4L2_SEL_FLAG_LE
-#define V4L2_SUBDEV_SEL_FLAG_KEEP_CONFIG V4L2_SEL_FLAG_KEEP_CONFIG
-
 struct v4l2_edid {
 	__u32 pad;
 	__u32 start_block;
@@ -104,4 +92,17 @@ struct v4l2_edid {
 	__u8  *edid;
 };

+/* Backward compatibility target definitions --- to be removed. */
+#define V4L2_SEL_TGT_CROP_ACTIVE	V4L2_SEL_TGT_CROP
+#define V4L2_SEL_TGT_COMPOSE_ACTIVE	V4L2_SEL_TGT_COMPOSE
+#define V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL	V4L2_SEL_TGT_CROP
+#define V4L2_SUBDEV_SEL_TGT_COMPOSE_ACTUAL V4L2_SEL_TGT_COMPOSE
+#define V4L2_SUBDEV_SEL_TGT_CROP_BOUNDS	V4L2_SEL_TGT_CROP_BOUNDS
+#define V4L2_SUBDEV_SEL_TGT_COMPOSE_BOUNDS V4L2_SEL_TGT_COMPOSE_BOUNDS
+
+/* Backward compatibility flag definitions --- to be removed. */
+#define V4L2_SUBDEV_SEL_FLAG_SIZE_GE	V4L2_SEL_FLAG_GE
+#define V4L2_SUBDEV_SEL_FLAG_SIZE_LE	V4L2_SEL_FLAG_LE
+#define V4L2_SUBDEV_SEL_FLAG_KEEP_CONFIG V4L2_SEL_FLAG_KEEP_CONFIG
+
 #endif /* __V4L2_COMMON__ */
--- a/gst-v4l2/ext/v4l2-controls.h
+++ b/gst-v4l2/ext/v4l2-controls.h
--- a/gst-v4l2/ext/videodev2.h
+++ b/gst-v4l2/ext/videodev2.h
@@ -1,8 +1,8 @@
+/* SPDX-License-Identifier: ((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) */
 /*
 *  Video for Linux Two header file
 *
 *  Copyright (C) 1999-2012 the contributors
- *  Copyright (c) 2021, NVIDIA CORPORATION. All rights reserved
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -54,32 +54,21 @@
 *              Hans Verkuil <hverkuil@xs4all.nl>
 *		et al.
 */
-#ifndef _UAPI__LINUX_VIDEODEV2_H
-#define _UAPI__LINUX_VIDEODEV2_H
+#ifndef __LINUX_VIDEODEV2_H
+#define __LINUX_VIDEODEV2_H

 #include <sys/time.h>
-#include <sys/ioctl.h>

-#include "ext/types-compat.h"
-#include "ext/v4l2-common.h"
-#include "ext/v4l2-controls.h"
+#include <linux/ioctl.h>
+#include <linux/types.h>
+#include <linux/v4l2-common.h>
+#include <linux/v4l2-controls.h>

 /*
 * Common stuff for both V4L1 and V4L2
 * Moved from videodev.h
 */
-#ifdef USE_V4L2_TARGET_NV
-/*
- * As video decoder base class has to queue all the decoded frames
- * between IDR interval for reverse playback, buffers are increased
- * to 64 to support IDR interval till 60. As per the experiments,
- * (IDR interval + 4) buffers are required at decoder capture plane
- * for reverse playback
- */
-#define VIDEO_MAX_FRAME               64
-#else
 #define VIDEO_MAX_FRAME               32
-#endif
 #define VIDEO_MAX_PLANES               8

 /*
@@ -89,7 +78,7 @@
 /*  Four-character-code (FOURCC) */
 #define v4l2_fourcc(a, b, c, d)\
 	((__u32)(a) | ((__u32)(b) << 8) | ((__u32)(c) << 16) | ((__u32)(d) << 24))
-#define v4l2_fourcc_be(a, b, c, d)	(v4l2_fourcc(a, b, c, d) | (1 << 31))
+#define v4l2_fourcc_be(a, b, c, d)	(v4l2_fourcc(a, b, c, d) | (1U << 31))

 /*
 *	E N U M S
@@ -116,14 +105,14 @@ enum v4l2_field {
 					 transmitted first */
 };
 #define V4L2_FIELD_HAS_TOP(field)	\
-	((field) == V4L2_FIELD_TOP 	||\
+	((field) == V4L2_FIELD_TOP	||\
 	 (field) == V4L2_FIELD_INTERLACED ||\
 	 (field) == V4L2_FIELD_INTERLACED_TB ||\
 	 (field) == V4L2_FIELD_INTERLACED_BT ||\
 	 (field) == V4L2_FIELD_SEQ_TB	||\
 	 (field) == V4L2_FIELD_SEQ_BT)
 #define V4L2_FIELD_HAS_BOTTOM(field)	\
-	((field) == V4L2_FIELD_BOTTOM 	||\
+	((field) == V4L2_FIELD_BOTTOM	||\
 	 (field) == V4L2_FIELD_INTERLACED ||\
 	 (field) == V4L2_FIELD_INTERLACED_TB ||\
 	 (field) == V4L2_FIELD_INTERLACED_BT ||\
@@ -139,6 +128,13 @@ enum v4l2_field {
 	((field) == V4L2_FIELD_BOTTOM ||\
 	 (field) == V4L2_FIELD_TOP ||\
 	 (field) == V4L2_FIELD_ALTERNATE)
+#define V4L2_FIELD_IS_INTERLACED(field) \
+	((field) == V4L2_FIELD_INTERLACED ||\
+	 (field) == V4L2_FIELD_INTERLACED_TB ||\
+	 (field) == V4L2_FIELD_INTERLACED_BT)
+#define V4L2_FIELD_IS_SEQUENTIAL(field) \
+	((field) == V4L2_FIELD_SEQ_TB ||\
+	 (field) == V4L2_FIELD_SEQ_BT)

 enum v4l2_buf_type {
 	V4L2_BUF_TYPE_VIDEO_CAPTURE        = 1,
@@ -154,6 +150,7 @@ enum v4l2_buf_type {
 	V4L2_BUF_TYPE_SDR_CAPTURE          = 11,
 	V4L2_BUF_TYPE_SDR_OUTPUT           = 12,
 	V4L2_BUF_TYPE_META_CAPTURE         = 13,
+	V4L2_BUF_TYPE_META_OUTPUT	   = 14,
 	/* Deprecated, do not use */
 	V4L2_BUF_TYPE_PRIVATE              = 0x80,
 };
@@ -169,7 +166,10 @@ enum v4l2_buf_type {
 	 || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY	\
 	 || (type) == V4L2_BUF_TYPE_VBI_OUTPUT			\
 	 || (type) == V4L2_BUF_TYPE_SLICED_VBI_OUTPUT		\
-	 || (type) == V4L2_BUF_TYPE_SDR_OUTPUT)
+	 || (type) == V4L2_BUF_TYPE_SDR_OUTPUT			\
+	 || (type) == V4L2_BUF_TYPE_META_OUTPUT)
+
+#define V4L2_TYPE_IS_CAPTURE(type) (!V4L2_TYPE_IS_OUTPUT(type))

 enum v4l2_tuner_type {
 	V4L2_TUNER_RADIO	     = 1,
@@ -219,9 +219,7 @@ enum v4l2_colorspace {
 	V4L2_COLORSPACE_470_SYSTEM_M  = 5,

 	/*
-	 * EBU Tech 3213 PAL/SECAM colorspace. This only makes sense when
-	 * dealing with really old PAL/SECAM recordings. Superseded by
-	 * SMPTE 170M.
+	 * EBU Tech 3213 PAL/SECAM colorspace.
 	 */
 	V4L2_COLORSPACE_470_SYSTEM_BG = 6,

@@ -234,8 +232,8 @@ enum v4l2_colorspace {
 	/* For RGB colorspaces such as produces by most webcams. */
 	V4L2_COLORSPACE_SRGB          = 8,

-	/* AdobeRGB colorspace */
-	V4L2_COLORSPACE_ADOBERGB      = 9,
+	/* opRGB colorspace */
+	V4L2_COLORSPACE_OPRGB         = 9,

 	/* BT.2020 colorspace, used for UHDTV. */
 	V4L2_COLORSPACE_BT2020        = 10,
@@ -267,7 +265,7 @@ enum v4l2_xfer_func {
 	 *
 	 * V4L2_COLORSPACE_SRGB, V4L2_COLORSPACE_JPEG: V4L2_XFER_FUNC_SRGB
 	 *
-	 * V4L2_COLORSPACE_ADOBERGB: V4L2_XFER_FUNC_ADOBERGB
+	 * V4L2_COLORSPACE_OPRGB: V4L2_XFER_FUNC_OPRGB
 	 *
 	 * V4L2_COLORSPACE_SMPTE240M: V4L2_XFER_FUNC_SMPTE240M
 	 *
@@ -278,7 +276,7 @@ enum v4l2_xfer_func {
 	V4L2_XFER_FUNC_DEFAULT     = 0,
 	V4L2_XFER_FUNC_709         = 1,
 	V4L2_XFER_FUNC_SRGB        = 2,
-	V4L2_XFER_FUNC_ADOBERGB    = 3,
+	V4L2_XFER_FUNC_OPRGB       = 3,
 	V4L2_XFER_FUNC_SMPTE240M   = 4,
 	V4L2_XFER_FUNC_NONE        = 5,
 	V4L2_XFER_FUNC_DCI_P3      = 6,
@@ -290,7 +288,7 @@ enum v4l2_xfer_func {
 * This depends on the colorspace.
 */
 #define V4L2_MAP_XFER_FUNC_DEFAULT(colsp) \
-	((colsp) == V4L2_COLORSPACE_ADOBERGB ? V4L2_XFER_FUNC_ADOBERGB : \
+	((colsp) == V4L2_COLORSPACE_OPRGB ? V4L2_XFER_FUNC_OPRGB : \
 	 ((colsp) == V4L2_COLORSPACE_SMPTE240M ? V4L2_XFER_FUNC_SMPTE240M : \
 	  ((colsp) == V4L2_COLORSPACE_DCI_P3 ? V4L2_XFER_FUNC_DCI_P3 : \
 	   ((colsp) == V4L2_COLORSPACE_RAW ? V4L2_XFER_FUNC_NONE : \
@@ -304,7 +302,7 @@ enum v4l2_ycbcr_encoding {
 	 *
 	 * V4L2_COLORSPACE_SMPTE170M, V4L2_COLORSPACE_470_SYSTEM_M,
 	 * V4L2_COLORSPACE_470_SYSTEM_BG, V4L2_COLORSPACE_SRGB,
-	 * V4L2_COLORSPACE_ADOBERGB and V4L2_COLORSPACE_JPEG: V4L2_YCBCR_ENC_601
+	 * V4L2_COLORSPACE_OPRGB and V4L2_COLORSPACE_JPEG: V4L2_YCBCR_ENC_601
 	 *
 	 * V4L2_COLORSPACE_REC709 and V4L2_COLORSPACE_DCI_P3: V4L2_YCBCR_ENC_709
 	 *
@@ -326,14 +324,12 @@ enum v4l2_ycbcr_encoding {
 	/* Rec. 709/EN 61966-2-4 Extended Gamut -- HDTV */
 	V4L2_YCBCR_ENC_XV709          = 4,

-#ifndef __KERNEL__
 	/*
 	 * sYCC (Y'CbCr encoding of sRGB), identical to ENC_601. It was added
 	 * originally due to a misunderstanding of the sYCC standard. It should
 	 * not be used, instead use V4L2_YCBCR_ENC_601.
 	 */
 	V4L2_YCBCR_ENC_SYCC           = 5,
-#endif

 	/* BT.2020 Non-constant Luminance Y'CbCr */
 	V4L2_YCBCR_ENC_BT2020         = 6,
@@ -371,9 +367,9 @@ enum v4l2_hsv_encoding {

 enum v4l2_quantization {
 	/*
-	 * The default for R'G'B' quantization is always full range, except
-	 * for the BT2020 colorspace. For Y'CbCr the quantization is always
-	 * limited range, except for COLORSPACE_JPEG: this is full range.
+	 * The default for R'G'B' quantization is always full range.
+	 * For Y'CbCr the quantization is always limited range, except
+	 * for COLORSPACE_JPEG: this is full range.
 	 */
 	V4L2_QUANTIZATION_DEFAULT     = 0,
 	V4L2_QUANTIZATION_FULL_RANGE  = 1,
@@ -382,14 +378,22 @@ enum v4l2_quantization {

 /*
 * Determine how QUANTIZATION_DEFAULT should map to a proper quantization.
- * This depends on whether the image is RGB or not, the colorspace and the
- * Y'CbCr encoding.
+ * This depends on whether the image is RGB or not, the colorspace.
+ * The Y'CbCr encoding is not used anymore, but is still there for backwards
+ * compatibility.
 */
 #define V4L2_MAP_QUANTIZATION_DEFAULT(is_rgb_or_hsv, colsp, ycbcr_enc) \
-	(((is_rgb_or_hsv) && (colsp) == V4L2_COLORSPACE_BT2020) ? \
-	 V4L2_QUANTIZATION_LIM_RANGE : \
-	 (((is_rgb_or_hsv) || (colsp) == V4L2_COLORSPACE_JPEG) ? \
-	 V4L2_QUANTIZATION_FULL_RANGE : V4L2_QUANTIZATION_LIM_RANGE))
+	(((is_rgb_or_hsv) || (colsp) == V4L2_COLORSPACE_JPEG) ? \
+	 V4L2_QUANTIZATION_FULL_RANGE : V4L2_QUANTIZATION_LIM_RANGE)
+
+/*
+ * Deprecated names for opRGB colorspace (IEC 61966-2-5)
+ *
+ * WARNING: Please don't use these deprecated defines in your code, as
+ * there is a chance we have to remove them in the future.
+ */
+#define V4L2_COLORSPACE_ADOBERGB V4L2_COLORSPACE_OPRGB
+#define V4L2_XFER_FUNC_ADOBERGB  V4L2_XFER_FUNC_OPRGB

 enum v4l2_priority {
 	V4L2_PRIORITY_UNSET       = 0,  /* not initialized */
@@ -411,6 +415,11 @@ struct v4l2_fract {
 	__u32   denominator;
 };

+struct v4l2_area {
+	__u32   width;
+	__u32   height;
+};
+
 /**
  * struct v4l2_capability - Describes V4L2 device caps returned by VIDIOC_QUERYCAP
  *
@@ -467,21 +476,24 @@ struct v4l2_capability {
 #define V4L2_CAP_READWRITE              0x01000000  /* read/write systemcalls */
 #define V4L2_CAP_ASYNCIO                0x02000000  /* async I/O */
 #define V4L2_CAP_STREAMING              0x04000000  /* streaming I/O ioctls */
+#define V4L2_CAP_META_OUTPUT		0x08000000  /* Is a metadata output device */

 #define V4L2_CAP_TOUCH                  0x10000000  /* Is a touch device */

+#define V4L2_CAP_IO_MC			0x20000000  /* Is input/output controlled by the media controller */
+
 #define V4L2_CAP_DEVICE_CAPS            0x80000000  /* sets device capabilities field */

 /*
 *	V I D E O   I M A G E   F O R M A T
 */
 struct v4l2_pix_format {
-	__u32         		width;
+	__u32			width;
 	__u32			height;
 	__u32			pixelformat;
 	__u32			field;		/* enum v4l2_field */
-	__u32            	bytesperline;	/* for padding, zero if unused */
-	__u32          		sizeimage;
+	__u32			bytesperline;	/* for padding, zero if unused */
+	__u32			sizeimage;
 	__u32			colorspace;	/* enum v4l2_colorspace */
 	__u32			priv;		/* private data, depends on pixelformat */
 	__u32			flags;		/* format flags (V4L2_PIX_FMT_FLAG_*) */
@@ -497,26 +509,44 @@ struct v4l2_pix_format {

 /*      Pixel format         FOURCC                          depth  Description  */

-/* RGB formats */
+/* RGB formats (1 or 2 bytes per pixel) */
 #define V4L2_PIX_FMT_RGB332  v4l2_fourcc('R', 'G', 'B', '1') /*  8  RGB-3-3-2     */
 #define V4L2_PIX_FMT_RGB444  v4l2_fourcc('R', '4', '4', '4') /* 16  xxxxrrrr ggggbbbb */
 #define V4L2_PIX_FMT_ARGB444 v4l2_fourcc('A', 'R', '1', '2') /* 16  aaaarrrr ggggbbbb */
 #define V4L2_PIX_FMT_XRGB444 v4l2_fourcc('X', 'R', '1', '2') /* 16  xxxxrrrr ggggbbbb */
+#define V4L2_PIX_FMT_RGBA444 v4l2_fourcc('R', 'A', '1', '2') /* 16  rrrrgggg bbbbaaaa */
+#define V4L2_PIX_FMT_RGBX444 v4l2_fourcc('R', 'X', '1', '2') /* 16  rrrrgggg bbbbxxxx */
+#define V4L2_PIX_FMT_ABGR444 v4l2_fourcc('A', 'B', '1', '2') /* 16  aaaabbbb ggggrrrr */
+#define V4L2_PIX_FMT_XBGR444 v4l2_fourcc('X', 'B', '1', '2') /* 16  xxxxbbbb ggggrrrr */
+#define V4L2_PIX_FMT_BGRA444 v4l2_fourcc('G', 'A', '1', '2') /* 16  bbbbgggg rrrraaaa */
+#define V4L2_PIX_FMT_BGRX444 v4l2_fourcc('B', 'X', '1', '2') /* 16  bbbbgggg rrrrxxxx */
 #define V4L2_PIX_FMT_RGB555  v4l2_fourcc('R', 'G', 'B', 'O') /* 16  RGB-5-5-5     */
 #define V4L2_PIX_FMT_ARGB555 v4l2_fourcc('A', 'R', '1', '5') /* 16  ARGB-1-5-5-5  */
 #define V4L2_PIX_FMT_XRGB555 v4l2_fourcc('X', 'R', '1', '5') /* 16  XRGB-1-5-5-5  */
+#define V4L2_PIX_FMT_RGBA555 v4l2_fourcc('R', 'A', '1', '5') /* 16  RGBA-5-5-5-1  */
+#define V4L2_PIX_FMT_RGBX555 v4l2_fourcc('R', 'X', '1', '5') /* 16  RGBX-5-5-5-1  */
+#define V4L2_PIX_FMT_ABGR555 v4l2_fourcc('A', 'B', '1', '5') /* 16  ABGR-1-5-5-5  */
+#define V4L2_PIX_FMT_XBGR555 v4l2_fourcc('X', 'B', '1', '5') /* 16  XBGR-1-5-5-5  */
+#define V4L2_PIX_FMT_BGRA555 v4l2_fourcc('B', 'A', '1', '5') /* 16  BGRA-5-5-5-1  */
+#define V4L2_PIX_FMT_BGRX555 v4l2_fourcc('B', 'X', '1', '5') /* 16  BGRX-5-5-5-1  */
 #define V4L2_PIX_FMT_RGB565  v4l2_fourcc('R', 'G', 'B', 'P') /* 16  RGB-5-6-5     */
 #define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R', 'G', 'B', 'Q') /* 16  RGB-5-5-5 BE  */
 #define V4L2_PIX_FMT_ARGB555X v4l2_fourcc_be('A', 'R', '1', '5') /* 16  ARGB-5-5-5 BE */
 #define V4L2_PIX_FMT_XRGB555X v4l2_fourcc_be('X', 'R', '1', '5') /* 16  XRGB-5-5-5 BE */
 #define V4L2_PIX_FMT_RGB565X v4l2_fourcc('R', 'G', 'B', 'R') /* 16  RGB-5-6-5 BE  */
+
+/* RGB formats (3 or 4 bytes per pixel) */
 #define V4L2_PIX_FMT_BGR666  v4l2_fourcc('B', 'G', 'R', 'H') /* 18  BGR-6-6-6	  */
 #define V4L2_PIX_FMT_BGR24   v4l2_fourcc('B', 'G', 'R', '3') /* 24  BGR-8-8-8     */
 #define V4L2_PIX_FMT_RGB24   v4l2_fourcc('R', 'G', 'B', '3') /* 24  RGB-8-8-8     */
 #define V4L2_PIX_FMT_BGR32   v4l2_fourcc('B', 'G', 'R', '4') /* 32  BGR-8-8-8-8   */
 #define V4L2_PIX_FMT_ABGR32  v4l2_fourcc('A', 'R', '2', '4') /* 32  BGRA-8-8-8-8  */
 #define V4L2_PIX_FMT_XBGR32  v4l2_fourcc('X', 'R', '2', '4') /* 32  BGRX-8-8-8-8  */
+#define V4L2_PIX_FMT_BGRA32  v4l2_fourcc('R', 'A', '2', '4') /* 32  ABGR-8-8-8-8  */
+#define V4L2_PIX_FMT_BGRX32  v4l2_fourcc('R', 'X', '2', '4') /* 32  XBGR-8-8-8-8  */
 #define V4L2_PIX_FMT_RGB32   v4l2_fourcc('R', 'G', 'B', '4') /* 32  RGB-8-8-8-8   */
+#define V4L2_PIX_FMT_RGBA32  v4l2_fourcc('A', 'B', '2', '4') /* 32  RGBA-8-8-8-8  */
+#define V4L2_PIX_FMT_RGBX32  v4l2_fourcc('X', 'B', '2', '4') /* 32  RGBX-8-8-8-8  */
 #define V4L2_PIX_FMT_ARGB32  v4l2_fourcc('B', 'A', '2', '4') /* 32  ARGB-8-8-8-8  */
 #define V4L2_PIX_FMT_XRGB32  v4l2_fourcc('B', 'X', '2', '4') /* 32  XRGB-8-8-8-8  */

@@ -526,11 +556,13 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_Y6      v4l2_fourcc('Y', '0', '6', ' ') /*  6  Greyscale     */
 #define V4L2_PIX_FMT_Y10     v4l2_fourcc('Y', '1', '0', ' ') /* 10  Greyscale     */
 #define V4L2_PIX_FMT_Y12     v4l2_fourcc('Y', '1', '2', ' ') /* 12  Greyscale     */
+#define V4L2_PIX_FMT_Y14     v4l2_fourcc('Y', '1', '4', ' ') /* 14  Greyscale     */
 #define V4L2_PIX_FMT_Y16     v4l2_fourcc('Y', '1', '6', ' ') /* 16  Greyscale     */
 #define V4L2_PIX_FMT_Y16_BE  v4l2_fourcc_be('Y', '1', '6', ' ') /* 16  Greyscale BE  */

 /* Grey bit-packed formats */
 #define V4L2_PIX_FMT_Y10BPACK    v4l2_fourcc('Y', '1', '0', 'B') /* 10  Greyscale bit-packed */
+#define V4L2_PIX_FMT_Y10P    v4l2_fourcc('Y', '1', '0', 'P') /* 10  Greyscale, MIPI RAW10 packed */

 /* Palette formats */
 #define V4L2_PIX_FMT_PAL8    v4l2_fourcc('P', 'A', 'L', '8') /*  8  8-bit palette */
@@ -548,9 +580,12 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_YUV444  v4l2_fourcc('Y', '4', '4', '4') /* 16  xxxxyyyy uuuuvvvv */
 #define V4L2_PIX_FMT_YUV555  v4l2_fourcc('Y', 'U', 'V', 'O') /* 16  YUV-5-5-5     */
 #define V4L2_PIX_FMT_YUV565  v4l2_fourcc('Y', 'U', 'V', 'P') /* 16  YUV-5-6-5     */
+#define V4L2_PIX_FMT_YUV24   v4l2_fourcc('Y', 'U', 'V', '3') /* 24  YUV-8-8-8     */
 #define V4L2_PIX_FMT_YUV32   v4l2_fourcc('Y', 'U', 'V', '4') /* 32  YUV-8-8-8-8   */
-#define V4L2_PIX_FMT_HI240   v4l2_fourcc('H', 'I', '2', '4') /*  8  8-bit color   */
-#define V4L2_PIX_FMT_HM12    v4l2_fourcc('H', 'M', '1', '2') /*  8  YUV 4:2:0 16x16 macroblocks */
+#define V4L2_PIX_FMT_AYUV32  v4l2_fourcc('A', 'Y', 'U', 'V') /* 32  AYUV-8-8-8-8  */
+#define V4L2_PIX_FMT_XYUV32  v4l2_fourcc('X', 'Y', 'U', 'V') /* 32  XYUV-8-8-8-8  */
+#define V4L2_PIX_FMT_VUYA32  v4l2_fourcc('V', 'U', 'Y', 'A') /* 32  VUYA-8-8-8-8  */
+#define V4L2_PIX_FMT_VUYX32  v4l2_fourcc('V', 'U', 'Y', 'X') /* 32  VUYX-8-8-8-8  */
 #define V4L2_PIX_FMT_M420    v4l2_fourcc('M', '4', '2', '0') /* 12  YUV 4:2:0 2 lines y, 1 line uv interleaved */

 /* two planes -- one Y, one Cr + Cb interleaved  */
@@ -560,6 +595,7 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_NV61    v4l2_fourcc('N', 'V', '6', '1') /* 16  Y/CrCb 4:2:2  */
 #define V4L2_PIX_FMT_NV24    v4l2_fourcc('N', 'V', '2', '4') /* 24  Y/CbCr 4:4:4  */
 #define V4L2_PIX_FMT_NV42    v4l2_fourcc('N', 'V', '4', '2') /* 24  Y/CrCb 4:4:4  */
+#define V4L2_PIX_FMT_HM12    v4l2_fourcc('H', 'M', '1', '2') /*  8  YUV 4:2:0 16x16 macroblocks */

 /* two non contiguous planes - one Y, one Cr + Cb interleaved  */
 #define V4L2_PIX_FMT_NV12M   v4l2_fourcc('N', 'M', '1', '2') /* 12  Y/CbCr 4:2:0  */
@@ -613,6 +649,20 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_SGBRG12 v4l2_fourcc('G', 'B', '1', '2') /* 12  GBGB.. RGRG.. */
 #define V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2') /* 12  GRGR.. BGBG.. */
 #define V4L2_PIX_FMT_SRGGB12 v4l2_fourcc('R', 'G', '1', '2') /* 12  RGRG.. GBGB.. */
+	/* 12bit raw bayer packed, 6 bytes for every 4 pixels */
+#define V4L2_PIX_FMT_SBGGR12P v4l2_fourcc('p', 'B', 'C', 'C')
+#define V4L2_PIX_FMT_SGBRG12P v4l2_fourcc('p', 'G', 'C', 'C')
+#define V4L2_PIX_FMT_SGRBG12P v4l2_fourcc('p', 'g', 'C', 'C')
+#define V4L2_PIX_FMT_SRGGB12P v4l2_fourcc('p', 'R', 'C', 'C')
+#define V4L2_PIX_FMT_SBGGR14 v4l2_fourcc('B', 'G', '1', '4') /* 14  BGBG.. GRGR.. */
+#define V4L2_PIX_FMT_SGBRG14 v4l2_fourcc('G', 'B', '1', '4') /* 14  GBGB.. RGRG.. */
+#define V4L2_PIX_FMT_SGRBG14 v4l2_fourcc('G', 'R', '1', '4') /* 14  GRGR.. BGBG.. */
+#define V4L2_PIX_FMT_SRGGB14 v4l2_fourcc('R', 'G', '1', '4') /* 14  RGRG.. GBGB.. */
+	/* 14bit raw bayer packed, 7 bytes for every 4 pixels */
+#define V4L2_PIX_FMT_SBGGR14P v4l2_fourcc('p', 'B', 'E', 'E')
+#define V4L2_PIX_FMT_SGBRG14P v4l2_fourcc('p', 'G', 'E', 'E')
+#define V4L2_PIX_FMT_SGRBG14P v4l2_fourcc('p', 'g', 'E', 'E')
+#define V4L2_PIX_FMT_SRGGB14P v4l2_fourcc('p', 'R', 'E', 'E')
 #define V4L2_PIX_FMT_SBGGR16 v4l2_fourcc('B', 'Y', 'R', '2') /* 16  BGBG.. GRGR.. */
 #define V4L2_PIX_FMT_SGBRG16 v4l2_fourcc('G', 'B', '1', '6') /* 16  GBGB.. RGRG.. */
 #define V4L2_PIX_FMT_SGRBG16 v4l2_fourcc('G', 'R', '1', '6') /* 16  GRGR.. BGBG.. */
@@ -633,12 +683,18 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_H263     v4l2_fourcc('H', '2', '6', '3') /* H263          */
 #define V4L2_PIX_FMT_MPEG1    v4l2_fourcc('M', 'P', 'G', '1') /* MPEG-1 ES     */
 #define V4L2_PIX_FMT_MPEG2    v4l2_fourcc('M', 'P', 'G', '2') /* MPEG-2 ES     */
+#define V4L2_PIX_FMT_MPEG2_SLICE v4l2_fourcc('M', 'G', '2', 'S') /* MPEG-2 parsed slice data */
 #define V4L2_PIX_FMT_MPEG4    v4l2_fourcc('M', 'P', 'G', '4') /* MPEG-4 part 2 ES */
 #define V4L2_PIX_FMT_XVID     v4l2_fourcc('X', 'V', 'I', 'D') /* Xvid           */
 #define V4L2_PIX_FMT_VC1_ANNEX_G v4l2_fourcc('V', 'C', '1', 'G') /* SMPTE 421M Annex G compliant stream */
 #define V4L2_PIX_FMT_VC1_ANNEX_L v4l2_fourcc('V', 'C', '1', 'L') /* SMPTE 421M Annex L compliant stream */
 #define V4L2_PIX_FMT_VP8      v4l2_fourcc('V', 'P', '8', '0') /* VP8 */
+#define V4L2_PIX_FMT_VP8_FRAME v4l2_fourcc('V', 'P', '8', 'F') /* VP8 parsed frame */
 #define V4L2_PIX_FMT_VP9      v4l2_fourcc('V', 'P', '9', '0') /* VP9 */
+#define V4L2_PIX_FMT_HEVC     v4l2_fourcc('H', 'E', 'V', 'C') /* HEVC aka H.265 */
+#define V4L2_PIX_FMT_FWHT     v4l2_fourcc('F', 'W', 'H', 'T') /* Fast Walsh Hadamard Transform (vicodec) */
+#define V4L2_PIX_FMT_FWHT_STATELESS     v4l2_fourcc('S', 'F', 'W', 'H') /* Stateless FWHT (vicodec) */
+#define V4L2_PIX_FMT_H264_SLICE v4l2_fourcc('S', '2', '6', '4') /* H264 parsed slices */

 /*  Vendor-specific formats   */
 #define V4L2_PIX_FMT_CPIA1    v4l2_fourcc('C', 'P', 'I', 'A') /* cpia1 YUV */
@@ -672,6 +728,15 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_Z16      v4l2_fourcc('Z', '1', '6', ' ') /* Depth data 16-bit */
 #define V4L2_PIX_FMT_MT21C    v4l2_fourcc('M', 'T', '2', '1') /* Mediatek compressed block mode  */
 #define V4L2_PIX_FMT_INZI     v4l2_fourcc('I', 'N', 'Z', 'I') /* Intel Planar Greyscale 10-bit and Depth 16-bit */
+#define V4L2_PIX_FMT_SUNXI_TILED_NV12 v4l2_fourcc('S', 'T', '1', '2') /* Sunxi Tiled NV12 Format */
+#define V4L2_PIX_FMT_CNF4     v4l2_fourcc('C', 'N', 'F', '4') /* Intel 4-bit packed depth confidence information */
+#define V4L2_PIX_FMT_HI240    v4l2_fourcc('H', 'I', '2', '4') /* BTTV 8-bit dithered RGB */
+
+/* 10bit raw bayer packed, 32 bytes for every 25 pixels, last LSB 6 bits unused */
+#define V4L2_PIX_FMT_IPU3_SBGGR10	v4l2_fourcc('i', 'p', '3', 'b') /* IPU3 packed 10-bit BGGR bayer */
+#define V4L2_PIX_FMT_IPU3_SGBRG10	v4l2_fourcc('i', 'p', '3', 'g') /* IPU3 packed 10-bit GBRG bayer */
+#define V4L2_PIX_FMT_IPU3_SGRBG10	v4l2_fourcc('i', 'p', '3', 'G') /* IPU3 packed 10-bit GRBG bayer */
+#define V4L2_PIX_FMT_IPU3_SRGGB10	v4l2_fourcc('i', 'p', '3', 'r') /* IPU3 packed 10-bit RGGB bayer */

 /* SDR formats - used only for Software Defined Radio devices */
 #define V4L2_SDR_FMT_CU8          v4l2_fourcc('C', 'U', '0', '8') /* IQ u8 */
@@ -692,12 +757,20 @@ struct v4l2_pix_format {
 /* Meta-data formats */
 #define V4L2_META_FMT_VSP1_HGO    v4l2_fourcc('V', 'S', 'P', 'H') /* R-Car VSP1 1-D Histogram */
 #define V4L2_META_FMT_VSP1_HGT    v4l2_fourcc('V', 'S', 'P', 'T') /* R-Car VSP1 2-D Histogram */
+#define V4L2_META_FMT_UVC         v4l2_fourcc('U', 'V', 'C', 'H') /* UVC Payload Header metadata */
+#define V4L2_META_FMT_D4XX        v4l2_fourcc('D', '4', 'X', 'X') /* D4XX Payload Header metadata */
+#define V4L2_META_FMT_VIVID	  v4l2_fourcc('V', 'I', 'V', 'D') /* Vivid Metadata */
+
+/* Vendor specific - used for RK_ISP1 camera sub-system */
+#define V4L2_META_FMT_RK_ISP1_PARAMS	v4l2_fourcc('R', 'K', '1', 'P') /* Rockchip ISP1 3A Parameters */
+#define V4L2_META_FMT_RK_ISP1_STAT_3A	v4l2_fourcc('R', 'K', '1', 'S') /* Rockchip ISP1 3A Statistics */

 /* priv field value to indicates that subsequent fields are valid. */
 #define V4L2_PIX_FMT_PRIV_MAGIC		0xfeedcafe

 /* Flags */
 #define V4L2_PIX_FMT_FLAG_PREMUL_ALPHA	0x00000001
+#define V4L2_PIX_FMT_FLAG_SET_CSC	0x00000002

 /*
 *	F O R M A T   E N U M E R A T I O N
@@ -708,11 +781,20 @@ struct v4l2_fmtdesc {
 	__u32               flags;
 	__u8		    description[32];   /* Description string */
 	__u32		    pixelformat;       /* Format fourcc      */
-	__u32		    reserved[4];
+	__u32		    mbus_code;		/* Media bus code    */
+	__u32		    reserved[3];
 };

-#define V4L2_FMT_FLAG_COMPRESSED 0x0001
-#define V4L2_FMT_FLAG_EMULATED   0x0002
+#define V4L2_FMT_FLAG_COMPRESSED		0x0001
+#define V4L2_FMT_FLAG_EMULATED			0x0002
+#define V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM	0x0004
+#define V4L2_FMT_FLAG_DYN_RESOLUTION		0x0008
+#define V4L2_FMT_FLAG_ENC_CAP_FRAME_INTERVAL	0x0010
+#define V4L2_FMT_FLAG_CSC_COLORSPACE		0x0020
+#define V4L2_FMT_FLAG_CSC_XFER_FUNC		0x0040
+#define V4L2_FMT_FLAG_CSC_YCBCR_ENC		0x0080
+#define V4L2_FMT_FLAG_CSC_HSV_ENC		V4L2_FMT_FLAG_CSC_YCBCR_ENC
+#define V4L2_FMT_FLAG_CSC_QUANTIZATION		0x0100

 	/* Frame Size and frame rate enumeration */
 /*
@@ -841,13 +923,25 @@ struct v4l2_jpegcompression {
 /*
 *	M E M O R Y - M A P P I N G   B U F F E R S
 */
+
+
 struct v4l2_requestbuffers {
 	__u32			count;
 	__u32			type;		/* enum v4l2_buf_type */
 	__u32			memory;		/* enum v4l2_memory */
-	__u32			reserved[2];
+	__u32			capabilities;
+	__u32			reserved[1];
 };

+/* capabilities for struct v4l2_requestbuffers and v4l2_create_buffers */
+#define V4L2_BUF_CAP_SUPPORTS_MMAP			(1 << 0)
+#define V4L2_BUF_CAP_SUPPORTS_USERPTR			(1 << 1)
+#define V4L2_BUF_CAP_SUPPORTS_DMABUF			(1 << 2)
+#define V4L2_BUF_CAP_SUPPORTS_REQUESTS			(1 << 3)
+#define V4L2_BUF_CAP_SUPPORTS_ORPHANED_BUFS		(1 << 4)
+#define V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF	(1 << 5)
+#define V4L2_BUF_CAP_SUPPORTS_MMAP_CACHE_HINTS		(1 << 6)
+
 /**
 * struct v4l2_plane - plane info for multi-planar buffers
 * @bytesused:		number of bytes occupied by data in the plane (payload)
@@ -860,8 +954,10 @@ struct v4l2_requestbuffers {
 *			pointing to this plane
 * @fd:			when memory is V4L2_MEMORY_DMABUF, a userspace file
 *			descriptor associated with this plane
+ * @m:			union of @mem_offset, @userptr and @fd
 * @data_offset:	offset in the plane to the start of data; usually 0,
 *			unless there is a header in front of the data
+ * @reserved:		drivers and applications must zero this array
 *
 * Multi-planar buffers consist of one or more planes, e.g. an YCbCr buffer
 * with two planes can have one plane for Y, and another for interleaved CbCr
@@ -903,9 +999,14 @@ struct v4l2_plane {
 *		a userspace file descriptor associated with this buffer
 * @planes:	for multiplanar buffers; userspace pointer to the array of plane
 *		info structs for this buffer
+ * @m:		union of @offset, @userptr, @planes and @fd
 * @length:	size in bytes of the buffer (NOT its payload) for single-plane
 *		buffers (when type != *_MPLANE); number of elements in the
 *		planes array for multi-plane buffers
+ * @reserved2:	drivers and applications must zero this field
+ * @request_fd: fd of the request that this buffer should use
+ * @reserved:	for backwards compatibility with applications that do not know
+ *		about @request_fd
 *
 * Contains data exchanged by application and driver using one of the Streaming
 * I/O methods.
@@ -930,9 +1031,24 @@ struct v4l2_buffer {
 	} m;
 	__u32			length;
 	__u32			reserved2;
-	__u32			reserved;
+	union {
+		__s32		request_fd;
+		__u32		reserved;
+	};
 };

+/**
+ * v4l2_timeval_to_ns - Convert timeval to nanoseconds
+ * @tv:		pointer to the timeval variable to be converted
+ *
+ * Returns the scalar nanosecond representation of the timeval
+ * parameter.
+ */
+static __inline__ __u64 v4l2_timeval_to_ns(const struct timeval *tv)
+{
+	return (__u64)tv->tv_sec * 1000000000ULL + tv->tv_usec * 1000;
+}
+
 /*  Flags for 'flags' field */
 /* Buffer is mapped (flag) */
 #define V4L2_BUF_FLAG_MAPPED			0x00000001
@@ -948,8 +1064,12 @@ struct v4l2_buffer {
 #define V4L2_BUF_FLAG_BFRAME			0x00000020
 /* Buffer is ready, but the data contained within is corrupted. */
 #define V4L2_BUF_FLAG_ERROR			0x00000040
+/* Buffer is added to an unqueued request */
+#define V4L2_BUF_FLAG_IN_REQUEST		0x00000080
 /* timecode field is valid */
 #define V4L2_BUF_FLAG_TIMECODE			0x00000100
+/* Don't return the capture buffer until OUTPUT timestamp changes */
+#define V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF	0x00000200
 /* Buffer is prepared for queuing */
 #define V4L2_BUF_FLAG_PREPARED			0x00000400
 /* Cache handling flags */
@@ -966,6 +1086,8 @@ struct v4l2_buffer {
 #define V4L2_BUF_FLAG_TSTAMP_SRC_SOE		0x00010000
 /* mem2mem encoder/decoder */
 #define V4L2_BUF_FLAG_LAST			0x00100000
+/* request_fd is valid */
+#define V4L2_BUF_FLAG_REQUEST_FD		0x00800000

 /**
 * struct v4l2_exportbuffer - export of video buffer as DMABUF file descriptor
@@ -977,6 +1099,7 @@ struct v4l2_buffer {
 * @flags:	flags for newly created file, currently only O_CLOEXEC is
 *		supported, refer to manual of open syscall for more details
 * @fd:		file descriptor associated with DMABUF (set by driver)
+ * @reserved:	drivers and applications must zero this array
 *
 * Contains data used for exporting a video buffer as DMABUF file descriptor.
 * The buffer is identified by a 'cookie' returned by VIDIOC_QUERYBUF
@@ -1034,16 +1157,16 @@ struct v4l2_framebuffer {

 struct v4l2_clip {
 	struct v4l2_rect        c;
-	struct v4l2_clip	__user *next;
+	struct v4l2_clip	*next;
 };

 struct v4l2_window {
 	struct v4l2_rect        w;
 	__u32			field;	 /* enum v4l2_field */
 	__u32			chromakey;
-	struct v4l2_clip	__user *clips;
+	struct v4l2_clip	*clips;
 	__u32			clipcount;
-	void			__user *bitmap;
+	void			*bitmap;
 	__u8                    global_alpha;
 };

@@ -1115,6 +1238,10 @@ struct v4l2_selection {

 typedef __u64 v4l2_std_id;

+/*
+ * Attention: Keep the V4L2_STD_* bit definitions in sync with
+ * include/dt-bindings/display/sdtv-standards.h SDTV_STD_* bit definitions.
+ */
 /* one bit for each */
 #define V4L2_STD_PAL_B          ((v4l2_std_id)0x00000001)
 #define V4L2_STD_PAL_B1         ((v4l2_std_id)0x00000002)
@@ -1170,7 +1297,7 @@ typedef __u64 v4l2_std_id;
 				 V4L2_STD_NTSC_M_JP     |\
 				 V4L2_STD_NTSC_M_KR)
 /* Secam macros */
-#define V4L2_STD_SECAM_DK      	(V4L2_STD_SECAM_D	|\
+#define V4L2_STD_SECAM_DK	(V4L2_STD_SECAM_D	|\
 				 V4L2_STD_SECAM_K	|\
 				 V4L2_STD_SECAM_K1)
 /* All Secam Standards */
@@ -1251,7 +1378,7 @@ struct v4l2_standard {
 };

 /*
- *	D V 	B T	T I M I N G S
+ *	D V	B T	T I M I N G S
 */

 /** struct v4l2_bt_timings - BT.656/BT.1120 timing data
@@ -1389,6 +1516,13 @@ struct v4l2_bt_timings {
 * InfoFrame).
 */
 #define V4L2_DV_FL_HAS_HDMI_VIC			(1 << 8)
+/*
+ * CEA-861 specific: only valid for video receivers.
+ * If set, then HW can detect the difference between regular FPS and
+ * 1000/1001 FPS. Note: This flag is only valid for HDMI VIC codes with
+ * the V4L2_DV_FL_CAN_REDUCE_FPS flag set.
+ */
+#define V4L2_DV_FL_CAN_DETECT_REDUCED_FPS	(1 << 9)

 /* A few useful defines to calculate the total blanking and frame sizes */
 #define V4L2_DV_BT_BLANKING_WIDTH(bt) \
@@ -1397,7 +1531,8 @@ struct v4l2_bt_timings {
 	((bt)->width + V4L2_DV_BT_BLANKING_WIDTH(bt))
 #define V4L2_DV_BT_BLANKING_HEIGHT(bt) \
 	((bt)->vfrontporch + (bt)->vsync + (bt)->vbackporch + \
-	 (bt)->il_vfrontporch + (bt)->il_vsync + (bt)->il_vbackporch)
+	 ((bt)->interlaced ? \
+	  ((bt)->il_vfrontporch + (bt)->il_vsync + (bt)->il_vbackporch) : 0))
 #define V4L2_DV_BT_FRAME_HEIGHT(bt) \
 	((bt)->height + V4L2_DV_BT_BLANKING_HEIGHT(bt))

@@ -1571,36 +1706,46 @@ struct v4l2_ext_control {
 	union {
 		__s32 value;
 		__s64 value64;
-		char __user *string;
-		__u8 __user *p_u8;
-		__u16 __user *p_u16;
-		__u32 __user *p_u32;
-		void __user *ptr;
+		char *string;
+		__u8 *p_u8;
+		__u16 *p_u16;
+		__u32 *p_u32;
+		struct v4l2_area *p_area;
+		struct v4l2_ctrl_h264_sps *p_h264_sps;
+		struct v4l2_ctrl_h264_pps *p_h264_pps;
+		struct v4l2_ctrl_h264_scaling_matrix *p_h264_scaling_matrix;
+		struct v4l2_ctrl_h264_pred_weights *p_h264_pred_weights;
+		struct v4l2_ctrl_h264_slice_params *p_h264_slice_params;
+		struct v4l2_ctrl_h264_decode_params *p_h264_decode_params;
+		struct v4l2_ctrl_fwht_params *p_fwht_params;
+		struct v4l2_ctrl_vp8_frame *p_vp8_frame;
+		struct v4l2_ctrl_mpeg2_sequence *p_mpeg2_sequence;
+		struct v4l2_ctrl_mpeg2_picture *p_mpeg2_picture;
+		struct v4l2_ctrl_mpeg2_quantisation *p_mpeg2_quantisation;
+		void *ptr;
 	};
 } __attribute__ ((packed));

 struct v4l2_ext_controls {
 	union {
-#ifndef __KERNEL__
 		__u32 ctrl_class;
-#endif
 		__u32 which;
 	};
 	__u32 count;
 	__u32 error_idx;
-	__u32 reserved[2];
+	__s32 request_fd;
+	__u32 reserved[1];
 	struct v4l2_ext_control *controls;
 };

-#define V4L2_CTRL_ID_MASK      	  (0x0fffffff)
-#ifndef __KERNEL__
+#define V4L2_CTRL_ID_MASK	  (0x0fffffff)
 #define V4L2_CTRL_ID2CLASS(id)    ((id) & 0x0fff0000UL)
-#endif
 #define V4L2_CTRL_ID2WHICH(id)    ((id) & 0x0fff0000UL)
 #define V4L2_CTRL_DRIVER_PRIV(id) (((id) & 0xffff) >= 0x1000)
 #define V4L2_CTRL_MAX_DIMS	  (4)
 #define V4L2_CTRL_WHICH_CUR_VAL   0
 #define V4L2_CTRL_WHICH_DEF_VAL   0x0f000000
+#define V4L2_CTRL_WHICH_REQUEST_VAL 0x0f010000

 enum v4l2_ctrl_type {
 	V4L2_CTRL_TYPE_INTEGER	     = 1,
@@ -1618,6 +1763,25 @@ enum v4l2_ctrl_type {
 	V4L2_CTRL_TYPE_U8	     = 0x0100,
 	V4L2_CTRL_TYPE_U16	     = 0x0101,
 	V4L2_CTRL_TYPE_U32	     = 0x0102,
+	V4L2_CTRL_TYPE_AREA          = 0x0106,
+
+	V4L2_CTRL_TYPE_HDR10_CLL_INFO		= 0x0110,
+	V4L2_CTRL_TYPE_HDR10_MASTERING_DISPLAY	= 0x0111,
+
+	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,
+
+	V4L2_CTRL_TYPE_FWHT_PARAMS	    = 0x0220,
+
+	V4L2_CTRL_TYPE_VP8_FRAME            = 0x0240,
+
+	V4L2_CTRL_TYPE_MPEG2_QUANTISATION   = 0x0250,
+	V4L2_CTRL_TYPE_MPEG2_SEQUENCE       = 0x0251,
+	V4L2_CTRL_TYPE_MPEG2_PICTURE        = 0x0252,
 };

 /*  Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
@@ -1664,11 +1828,11 @@ struct v4l2_querymenu {
 /*  Control flags  */
 #define V4L2_CTRL_FLAG_DISABLED		0x0001
 #define V4L2_CTRL_FLAG_GRABBED		0x0002
-#define V4L2_CTRL_FLAG_READ_ONLY 	0x0004
-#define V4L2_CTRL_FLAG_UPDATE 		0x0008
-#define V4L2_CTRL_FLAG_INACTIVE 	0x0010
-#define V4L2_CTRL_FLAG_SLIDER 		0x0020
-#define V4L2_CTRL_FLAG_WRITE_ONLY 	0x0040
+#define V4L2_CTRL_FLAG_READ_ONLY	0x0004
+#define V4L2_CTRL_FLAG_UPDATE		0x0008
+#define V4L2_CTRL_FLAG_INACTIVE		0x0010
+#define V4L2_CTRL_FLAG_SLIDER		0x0020
+#define V4L2_CTRL_FLAG_WRITE_ONLY	0x0040
 #define V4L2_CTRL_FLAG_VOLATILE		0x0080
 #define V4L2_CTRL_FLAG_HAS_PAYLOAD	0x0100
 #define V4L2_CTRL_FLAG_EXECUTE_ON_WRITE	0x0200
@@ -1782,21 +1946,21 @@ struct v4l2_hw_freq_seek {
 */

 struct v4l2_rds_data {
-	__u8 	lsb;
-	__u8 	msb;
-	__u8 	block;
+	__u8	lsb;
+	__u8	msb;
+	__u8	block;
 } __attribute__ ((packed));

-#define V4L2_RDS_BLOCK_MSK 	 0x7
-#define V4L2_RDS_BLOCK_A 	 0
-#define V4L2_RDS_BLOCK_B 	 1
-#define V4L2_RDS_BLOCK_C 	 2
-#define V4L2_RDS_BLOCK_D 	 3
-#define V4L2_RDS_BLOCK_C_ALT 	 4
-#define V4L2_RDS_BLOCK_INVALID 	 7
+#define V4L2_RDS_BLOCK_MSK	 0x7
+#define V4L2_RDS_BLOCK_A	 0
+#define V4L2_RDS_BLOCK_B	 1
+#define V4L2_RDS_BLOCK_C	 2
+#define V4L2_RDS_BLOCK_D	 3
+#define V4L2_RDS_BLOCK_C_ALT	 4
+#define V4L2_RDS_BLOCK_INVALID	 7

 #define V4L2_RDS_BLOCK_CORRECTED 0x40
-#define V4L2_RDS_BLOCK_ERROR 	 0x80
+#define V4L2_RDS_BLOCK_ERROR	 0x80

 /*
 *	A U D I O
@@ -1873,6 +2037,7 @@ struct v4l2_encoder_cmd {
 #define V4L2_DEC_CMD_STOP        (1)
 #define V4L2_DEC_CMD_PAUSE       (2)
 #define V4L2_DEC_CMD_RESUME      (3)
+#define V4L2_DEC_CMD_FLUSH       (4)

 /* Flags for V4L2_DEC_CMD_START */
 #define V4L2_DEC_CMD_START_MUTE_AUDIO	(1 << 0)
@@ -2054,6 +2219,7 @@ struct v4l2_mpeg_vbi_fmt_ivtv {
 *			this plane will be used
 * @bytesperline:	distance in bytes between the leftmost pixels in two
 *			adjacent lines
+ * @reserved:		drivers and applications must zero this array
 */
 struct v4l2_plane_pix_format {
 	__u32		sizeimage;
@@ -2072,8 +2238,10 @@ struct v4l2_plane_pix_format {
 * @num_planes:		number of planes for this format
 * @flags:		format flags (V4L2_PIX_FMT_FLAG_*)
 * @ycbcr_enc:		enum v4l2_ycbcr_encoding, Y'CbCr encoding
+ * @hsv_enc:		enum v4l2_hsv_encoding, HSV encoding
 * @quantization:	enum v4l2_quantization, colorspace quantization
 * @xfer_func:		enum v4l2_xfer_func, colorspace transfer function
+ * @reserved:		drivers and applications must zero this array
 */
 struct v4l2_pix_format_mplane {
 	__u32				width;
@@ -2098,6 +2266,7 @@ struct v4l2_pix_format_mplane {
 * struct v4l2_sdr_format - SDR format definition
 * @pixelformat:	little endian four character code (fourcc)
 * @buffersize:		maximum size in bytes required for data
+ * @reserved:		drivers and applications must zero this array
 */
 struct v4l2_sdr_format {
 	__u32				pixelformat;
@@ -2124,6 +2293,8 @@ struct v4l2_meta_format {
 * @vbi:	raw VBI capture or output parameters
 * @sliced:	sliced VBI capture or output parameters
 * @raw_data:	placeholder for future extensions and custom formats
+ * @fmt:	union of @pix, @pix_mp, @win, @vbi, @sliced, @sdr, @meta
+ *		and @raw_data
 */
 struct v4l2_format {
 	__u32	 type;
@@ -2291,6 +2462,7 @@ struct v4l2_dbg_chip_info {
 *		return: number of created buffers
 * @memory:	enum v4l2_memory; buffer memory type
 * @format:	frame format, for which buffers are requested
+ * @capabilities: capabilities of this buffer type.
 * @reserved:	future extensions
 */
 struct v4l2_create_buffers {
@@ -2298,7 +2470,8 @@ struct v4l2_create_buffers {
 	__u32			count;
 	__u32			memory;
 	struct v4l2_format	format;
-	__u32			reserved[8];
+	__u32			capabilities;
+	__u32			reserved[7];
 };

 /*
@@ -2306,7 +2479,6 @@ struct v4l2_create_buffers {
 *
 */
 #define VIDIOC_QUERYCAP		 _IOR('V',  0, struct v4l2_capability)
-#define VIDIOC_RESERVED		  _IO('V',  1)
 #define VIDIOC_ENUM_FMT         _IOWR('V',  2, struct v4l2_fmtdesc)
 #define VIDIOC_G_FMT		_IOWR('V',  4, struct v4l2_format)
 #define VIDIOC_S_FMT		_IOWR('V',  5, struct v4l2_format)
@@ -2352,8 +2524,8 @@ struct v4l2_create_buffers {
 #define VIDIOC_S_CROP		 _IOW('V', 60, struct v4l2_crop)
 #define VIDIOC_G_JPEGCOMP	 _IOR('V', 61, struct v4l2_jpegcompression)
 #define VIDIOC_S_JPEGCOMP	 _IOW('V', 62, struct v4l2_jpegcompression)
-#define VIDIOC_QUERYSTD      	 _IOR('V', 63, v4l2_std_id)
-#define VIDIOC_TRY_FMT      	_IOWR('V', 64, struct v4l2_format)
+#define VIDIOC_QUERYSTD		 _IOR('V', 63, v4l2_std_id)
+#define VIDIOC_TRY_FMT		_IOWR('V', 64, struct v4l2_format)
 #define VIDIOC_ENUMAUDIO	_IOWR('V', 65, struct v4l2_audio)
 #define VIDIOC_ENUMAUDOUT	_IOWR('V', 66, struct v4l2_audioout)
 #define VIDIOC_G_PRIORITY	 _IOR('V', 67, __u32) /* enum v4l2_priority */
@@ -2374,8 +2546,8 @@ struct v4l2_create_buffers {
 * Only implemented if CONFIG_VIDEO_ADV_DEBUG is defined.
 * You must be root to use these ioctls. Never use these in applications!
 */
-#define	VIDIOC_DBG_S_REGISTER 	 _IOW('V', 79, struct v4l2_dbg_register)
-#define	VIDIOC_DBG_G_REGISTER 	_IOWR('V', 80, struct v4l2_dbg_register)
+#define	VIDIOC_DBG_S_REGISTER	 _IOW('V', 79, struct v4l2_dbg_register)
+#define	VIDIOC_DBG_G_REGISTER	_IOWR('V', 80, struct v4l2_dbg_register)

 #define VIDIOC_S_HW_FREQ_SEEK	 _IOW('V', 82, struct v4l2_hw_freq_seek)
 #define	VIDIOC_S_DV_TIMINGS	_IOWR('V', 87, struct v4l2_dv_timings)
@@ -2407,4 +2579,4 @@ struct v4l2_create_buffers {

 #define BASE_VIDIOC_PRIVATE	192		/* 192-255 are private */

-#endif /* _UAPI__LINUX_VIDEODEV2_H */
+#endif /* __LINUX_VIDEODEV2_H */
--- a/gst-v4l2/gstv4l2.c
+++ b/gst-v4l2/gstv4l2.c
@@ -295,31 +295,42 @@ static gboolean
 gst_v4l2_has_vp8_encoder(void)
 {
  gboolean ret = FALSE;
-  int fd = -1;
+  int fd = -1, rval = 0;
  long len = -1;
  struct stat statbuf;
  char info[128];

-  if (access (V4L2_DEVICE_PATH_TEGRA_INFO, F_OK) == 0) {
-    stat(V4L2_DEVICE_PATH_TEGRA_INFO, &statbuf);
-    if (statbuf.st_size > 0 && statbuf.st_size < 128)
+  fd = open(V4L2_DEVICE_PATH_TEGRA_INFO, O_RDONLY);
+  if (fd < 0)
+    return ret;
+  rval = stat(V4L2_DEVICE_PATH_TEGRA_INFO, &statbuf);
+  if (rval < 0)
+  {
+    close(fd);
+    return ret;
+  }
+  if (statbuf.st_size > 8 && statbuf.st_size < 128)
+  {
+    rval = read(fd, info, statbuf.st_size);
+    if (rval <= 0)
    {
-      fd = open(V4L2_DEVICE_PATH_TEGRA_INFO, O_RDONLY);
-      read(fd, info, statbuf.st_size);
-      len = statbuf.st_size - 8;
-      for (int i = 0; i < len; i ++)
-      {
-        if (strncmp(&info[i], "tegra", 5) == 0)
-        {
-          if (strncmp(&info[i], "tegra186", 8) == 0 ||
-              strncmp(&info[i], "tegra210", 8) == 0)
-            ret = TRUE;
-          break;
-        }
-      }
      close(fd);
+      return ret;
+    }
+    len = statbuf.st_size - 8;
+    for (int i = 0; i < len; i ++)
+    {
+      if (strncmp(&info[i], "tegra", 5) == 0)
+      {
+        if (strncmp(&info[i], "tegra186", 8) == 0 ||
+            strncmp(&info[i], "tegra210", 8) == 0)
+          ret = TRUE;
+        break;
+      }
    }
  }
+  close(fd);
+
  return ret;
 }

@@ -417,6 +428,11 @@ plugin_init (GstPlugin * plugin)
          V4L2_DEVICE_PATH_NVENC,
          NULL,
          NULL);
+    gst_v4l2_av1_enc_register (plugin,
+          V4L2_DEVICE_BASENAME_NVENC,
+          V4L2_DEVICE_PATH_NVENC,
+          NULL,
+          NULL);
  } else {
    if (!gst_v4l2_is_v4l2_nvenc_present()) {
      // Orin Nano does not have HW encoders, so early return here.
@@ -432,6 +448,11 @@ plugin_init (GstPlugin * plugin)
          V4L2_DEVICE_PATH_NVENC_ALT,
          NULL,
          NULL);
+    gst_v4l2_av1_enc_register (plugin,
+          V4L2_DEVICE_BASENAME_NVENC,
+          V4L2_DEVICE_PATH_NVENC_ALT,
+          NULL,
+          NULL);
  }

  if (is_cuvid == FALSE) {
@@ -448,27 +469,19 @@ plugin_init (GstPlugin * plugin)
          V4L2_DEVICE_PATH_NVENC,
          NULL,
          NULL);
-      gst_v4l2_av1_enc_register (plugin,
-          V4L2_DEVICE_BASENAME_NVENC,
-          V4L2_DEVICE_PATH_NVENC,
-          NULL,
-          NULL);
    } else {
-      gst_v4l2_vp8_enc_register (plugin,
-          V4L2_DEVICE_BASENAME_NVENC,
-          V4L2_DEVICE_PATH_NVENC_ALT,
-          NULL,
-          NULL);
+      if (gst_v4l2_has_vp8_encoder()) {
+        gst_v4l2_vp8_enc_register (plugin,
+            V4L2_DEVICE_BASENAME_NVENC,
+            V4L2_DEVICE_PATH_NVENC_ALT,
+            NULL,
+            NULL);
+      }
      gst_v4l2_vp9_enc_register (plugin,
          V4L2_DEVICE_BASENAME_NVENC,
          V4L2_DEVICE_PATH_NVENC_ALT,
          NULL,
          NULL);
-      gst_v4l2_av1_enc_register (plugin,
-          V4L2_DEVICE_BASENAME_NVENC,
-          V4L2_DEVICE_PATH_NVENC_ALT,
-          NULL,
-          NULL);
    }
  }

--- a/gst-v4l2/gstv4l2h264enc.c
+++ b/gst-v4l2/gstv4l2h264enc.c
@@ -1,7 +1,7 @@
 /*
 * Copyright (C) 2014 SUMOMO Computer Association
 *     Author: ayaka <ayaka@soulik.info>
- * Copyright (c) 2018-2022, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2018-2023, NVIDIA CORPORATION. All rights reserved.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Library General Public
@@ -629,7 +629,7 @@ gst_v4l2_h264_enc_register (GstPlugin * plugin, const gchar * basename,
 static GType
 gst_v4l2_videnc_profile_get_type (void)
 {
-  static volatile gsize profile = 0;
+  static GType profile = 0;
  static const GEnumValue profile_type[] = {
    {V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE,
          "GST_V4L2_H264_VIDENC_BASELINE_PROFILE",
--- a/gst-v4l2/gstv4l2h265enc.c
+++ b/gst-v4l2/gstv4l2h265enc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2020, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2018-2023, NVIDIA CORPORATION. All rights reserved.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Library General Public
@@ -48,7 +48,7 @@ gst_v4l2_videnc_profile_get_type (void);
 #define GST_TYPE_V4L2_VID_ENC_PROFILE (gst_v4l2_videnc_profile_get_type ())

 /* prototypes */
-gboolean set_v4l2_h265_encoder_properties (GstVideoEncoder * encoder);
+gboolean set_v4l2_h265_encoder_properties(GstVideoEncoder * encoder);
 gboolean gst_v4l2_h265_enc_slice_header_spacing (GstV4l2Object * v4l2object,
    guint32 slice_header_spacing, enum v4l2_enc_slice_length_type slice_length_type);
 void set_h265_video_enc_property (GstV4l2Object * v4l2object, guint label,
@@ -245,10 +245,67 @@ static gint
 v4l2_level_from_string (const gchar * level)
 {
  gint v4l2_level = -1;
+#ifdef USE_V4L2_TARGET_NV
+    if (is_cuvid == FALSE) {
+    if (g_str_equal(level, "main1.0")) {
+      v4l2_level = V4L2_MPEG_VIDEO_H265_LEVEL_1_0_MAIN_TIER;
+    } else if (g_str_equal(level, "high1.0")) {
+      v4l2_level = V4L2_MPEG_VIDEO_H265_LEVEL_1_0_HIGH_TIER;
+    } else if (g_str_equal(level, "main2.0")) {
+      v4l2_level = V4L2_MPEG_VIDEO_H265_LEVEL_2_0_MAIN_TIER;
+    } else if (g_str_equal(level, "high2.0")) {
+      v4l2_level = V4L2_MPEG_VIDEO_H265_LEVEL_2_0_HIGH_TIER;
+    } else if (g_str_equal(level, "main2.1")) {
+      v4l2_level = V4L2_MPEG_VIDEO_H265_LEVEL_2_1_MAIN_TIER;
+    } else if (g_str_equal(level, "high2.1")) {
+      v4l2_level = V4L2_MPEG_VIDEO_H265_LEVEL_2_1_HIGH_TIER;
+    } else if (g_str_equal(level, "main3.0")) {
+      v4l2_level = V4L2_MPEG_VIDEO_H265_LEVEL_3_0_MAIN_TIER;
+    } else if (g_str_equal(level, "high3.0")) {
+      v4l2_level = V4L2_MPEG_VIDEO_H265_LEVEL_3_0_HIGH_TIER;
+    } else if (g_str_equal(level, "main3.1")) {
+      v4l2_level = V4L2_MPEG_VIDEO_H265_LEVEL_3_1_MAIN_TIER;
+    } else if (g_str_equal(level, "high3.1")) {
+      v4l2_level = V4L2_MPEG_VIDEO_H265_LEVEL_3_1_HIGH_TIER;
+    } else if (g_str_equal(level, "main4.0")) {
+      v4l2_level = V4L2_MPEG_VIDEO_H265_LEVEL_4_0_MAIN_TIER;
+    } else if (g_str_equal(level, "high4.0")) {
+      v4l2_level = V4L2_MPEG_VIDEO_H265_LEVEL_4_0_HIGH_TIER;
+    } else if (g_str_equal(level, "main4.1")) {
+      v4l2_level = V4L2_MPEG_VIDEO_H265_LEVEL_4_1_MAIN_TIER;
+    } else if (g_str_equal(level, "high4.1")) {
+      v4l2_level = V4L2_MPEG_VIDEO_H265_LEVEL_4_1_HIGH_TIER;
+    } else if (g_str_equal(level, "main5.0")) {
+      v4l2_level = V4L2_MPEG_VIDEO_H265_LEVEL_5_0_MAIN_TIER;
+    } else if (g_str_equal(level, "high5.0")) {
+      v4l2_level = V4L2_MPEG_VIDEO_H265_LEVEL_5_0_HIGH_TIER;
+    } else if (g_str_equal(level, "main5.1")) {
+      v4l2_level = V4L2_MPEG_VIDEO_H265_LEVEL_5_1_MAIN_TIER;
+    } else if (g_str_equal(level, "high5.1")) {
+      v4l2_level = V4L2_MPEG_VIDEO_H265_LEVEL_5_1_HIGH_TIER;
+    } else if (g_str_equal(level, "main5.2")) {
+      v4l2_level = V4L2_MPEG_VIDEO_H265_LEVEL_5_2_MAIN_TIER;
+    } else if (g_str_equal(level, "high5.2")) {
+      v4l2_level = V4L2_MPEG_VIDEO_H265_LEVEL_5_2_HIGH_TIER;
+    } else if (g_str_equal(level, "main6.0")) {
+      v4l2_level = V4L2_MPEG_VIDEO_H265_LEVEL_6_0_MAIN_TIER;
+    } else if (g_str_equal(level, "high6.0")) {
+      v4l2_level = V4L2_MPEG_VIDEO_H265_LEVEL_6_0_HIGH_TIER;
+    } else if (g_str_equal(level, "main6.1")) {
+      v4l2_level = V4L2_MPEG_VIDEO_H265_LEVEL_6_1_MAIN_TIER;
+    } else if (g_str_equal(level, "high6.1")) {
+      v4l2_level = V4L2_MPEG_VIDEO_H265_LEVEL_6_1_HIGH_TIER;
+    } else if (g_str_equal(level, "main6.2")) {
+      v4l2_level = V4L2_MPEG_VIDEO_H265_LEVEL_6_2_MAIN_TIER;
+    } else if (g_str_equal(level, "high6.2")) {
+      v4l2_level = V4L2_MPEG_VIDEO_H265_LEVEL_6_2_HIGH_TIER;
+    } else
+    {
+      GST_WARNING("Unsupported level string '%s'", level);
+    }
+  }

-  //TODO : Since videodev2 file does not list H265 profiles
-  //we need to add profiles inside v4l2_nv_extensions.h
-  //and use them here.
+#endif

  return v4l2_level;
 }
@@ -256,6 +313,58 @@ v4l2_level_from_string (const gchar * level)
 static const gchar *
 v4l2_level_to_string (gint v4l2_level)
 {
+#ifdef USE_V4L2_TARGET_NV
+
+  if (is_cuvid == FALSE)
+  {
+    switch (v4l2_level)
+    {
+    case V4L2_MPEG_VIDEO_H265_LEVEL_1_0_MAIN_TIER:
+    case V4L2_MPEG_VIDEO_H265_LEVEL_1_0_HIGH_TIER:
+      return "1.0";
+    case V4L2_MPEG_VIDEO_H265_LEVEL_2_0_MAIN_TIER:
+    case V4L2_MPEG_VIDEO_H265_LEVEL_2_0_HIGH_TIER:
+      return "2.0";
+    case V4L2_MPEG_VIDEO_H265_LEVEL_2_1_MAIN_TIER:
+    case V4L2_MPEG_VIDEO_H265_LEVEL_2_1_HIGH_TIER:
+      return "2.1";
+    case V4L2_MPEG_VIDEO_H265_LEVEL_3_0_MAIN_TIER:
+    case V4L2_MPEG_VIDEO_H265_LEVEL_3_0_HIGH_TIER:
+      return "3.0";
+    case V4L2_MPEG_VIDEO_H265_LEVEL_3_1_MAIN_TIER:
+    case V4L2_MPEG_VIDEO_H265_LEVEL_3_1_HIGH_TIER:
+      return "3.1";
+    case V4L2_MPEG_VIDEO_H265_LEVEL_4_0_MAIN_TIER:
+    case V4L2_MPEG_VIDEO_H265_LEVEL_4_0_HIGH_TIER:
+      return "4.0";
+    case V4L2_MPEG_VIDEO_H265_LEVEL_4_1_MAIN_TIER:
+    case V4L2_MPEG_VIDEO_H265_LEVEL_4_1_HIGH_TIER:
+      return "4.1";
+    case V4L2_MPEG_VIDEO_H265_LEVEL_5_0_MAIN_TIER:
+    case V4L2_MPEG_VIDEO_H265_LEVEL_5_0_HIGH_TIER:
+      return "5.0";
+    case V4L2_MPEG_VIDEO_H265_LEVEL_5_1_MAIN_TIER:
+    case V4L2_MPEG_VIDEO_H265_LEVEL_5_1_HIGH_TIER:
+      return "5.1";
+    case V4L2_MPEG_VIDEO_H265_LEVEL_5_2_MAIN_TIER:
+    case V4L2_MPEG_VIDEO_H265_LEVEL_5_2_HIGH_TIER:
+      return "5.2";
+    case V4L2_MPEG_VIDEO_H265_LEVEL_6_0_MAIN_TIER:
+    case V4L2_MPEG_VIDEO_H265_LEVEL_6_0_HIGH_TIER:
+      return "6.0";
+    case V4L2_MPEG_VIDEO_H265_LEVEL_6_1_MAIN_TIER:
+    case V4L2_MPEG_VIDEO_H265_LEVEL_6_1_HIGH_TIER:
+      return "6.1";
+    case V4L2_MPEG_VIDEO_H265_LEVEL_6_2_MAIN_TIER:
+    case V4L2_MPEG_VIDEO_H265_LEVEL_6_2_HIGH_TIER:
+      return "6.2";
+    default:
+      GST_WARNING("Unsupported V4L2 level %i", v4l2_level);
+      break;
+    }
+  }
+#endif
+
  return NULL;
 }

@@ -399,7 +508,7 @@ gst_v4l2_h265_enc_class_init (GstV4l2H265EncClass * klass)
  baseclass->profile_cid = V4L2_CID_MPEG_VIDEO_H265_PROFILE;
  baseclass->profile_to_string = v4l2_profile_to_string;
  baseclass->profile_from_string = v4l2_profile_from_string;
-  //baseclass->level_cid = V4L2_CID_MPEG_VIDEO_H265_LEVEL;
+  baseclass->level_cid = V4L2_CID_MPEG_VIDEOENC_H265_LEVEL;
  baseclass->level_to_string = v4l2_level_to_string;
  baseclass->level_from_string = v4l2_level_from_string;
  baseclass->set_encoder_properties = set_v4l2_h265_encoder_properties;
@@ -425,7 +534,7 @@ gst_v4l2_h265_enc_register (GstPlugin * plugin, const gchar * basename,
 static GType
 gst_v4l2_videnc_profile_get_type (void)
 {
-  static volatile gsize profile = 0;
+  static GType profile = 0;
  static const GEnumValue profile_type[] = {
    {V4L2_MPEG_VIDEO_H265_PROFILE_MAIN,
          "GST_V4L2_H265_VIDENC_MAIN_PROFILE", "Main"},
--- a/gst-v4l2/gstv4l2h265enc.h
+++ b/gst-v4l2/gstv4l2h265enc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2021, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2018-2023, NVIDIA CORPORATION. All rights reserved.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Library General Public
@@ -43,6 +43,7 @@ struct _GstV4l2H265Enc
  GstV4l2VideoEnc parent;
  gboolean insert_sps_pps;
  guint profile;
+  guint level;
  guint nBFrames;
  guint nRefFrames;
  gboolean insert_aud;
--- a/gst-v4l2/gstv4l2h26xparser.c
+++ b/gst-v4l2/gstv4l2h26xparser.c
@@ -89,19 +89,6 @@ h264_parse_nalu_header (H264NalUnit * nalu)
  return TRUE;
 }

-static gboolean
-h264_sps_copy (H264SPS * dst_sps, const H264SPS * src_sps)
-{
-  g_return_val_if_fail (dst_sps != NULL, FALSE);
-  g_return_val_if_fail (src_sps != NULL, FALSE);
-
-  h264_sps_clear (dst_sps);
-
-  *dst_sps = *src_sps;
-
-  return TRUE;
-}
-
 static gboolean
 h264_parser_parse_scaling_list (NalReader * nr,
    guint8 scaling_lists_4x4[6][16], guint8 scaling_lists_8x8[6][64],
@@ -340,20 +327,12 @@ beach:
 }

 H264ParserResult
-h264_parser_parse_sps (H264NalParser * nalparser, H264NalUnit * nalu,
+h264_parser_parse_sps (H264NalUnit * nalu,
    H264SPS * sps, gboolean parse_vui_params)
 {
  H264ParserResult res = h264_parse_sps (nalu, sps, parse_vui_params);

  return res;
-  if (res == H264_PARSER_OK) {
-    GST_DEBUG ("adding sequence parameter set with id: %d to array", sps->id);
-
-    if (!h264_sps_copy (&nalparser->sps[sps->id], sps))
-      return H264_PARSER_ERROR;
-    nalparser->last_sps = &nalparser->sps[sps->id];
-  }
-  return res;
 }

 /* Parse seq_parameter_set_data() */
@@ -538,7 +517,7 @@ static gboolean
 h265_parse_nalu_header (H265NalUnit * nalu)
 {
  guint8 *data = nalu->data + nalu->offset;
-  GstBitReader br;
+  GstBitReader br = {0};

  if (nalu->size < 2)
    return FALSE;
@@ -752,7 +731,7 @@ h265_parser_identify_nalu_hevc (H265Parser * parser,
    const guint8 * data, guint offset, gsize size, guint8 nal_length_size,
    H265NalUnit * nalu)
 {
-  GstBitReader br;
+  GstBitReader br = {0};

  memset (nalu, 0, sizeof (*nalu));

@@ -798,13 +777,6 @@ h265_parser_parse_sps (H265Parser * parser, H265NalUnit * nalu,
 {
  H265ParserResult res =
      h265_parse_sps (parser, nalu, sps, parse_vui_params);
-  return res;
-  if (res == H265_PARSER_OK) {
-    GST_DEBUG ("adding sequence parameter set with id: %d to array", sps->id);
-
-    parser->sps[sps->id] = *sps;
-    parser->last_sps = &parser->sps[sps->id];
-  }

  return res;
 }
--- a/gst-v4l2/gstv4l2h26xparser.h
+++ b/gst-v4l2/gstv4l2h26xparser.h
@@ -215,7 +215,7 @@ H264ParserResult h264_parser_identify_nalu_unchecked (H264NalParser *nalparser,
                                                       gsize size, H264NalUnit *nalu);


-H264ParserResult h264_parser_parse_sps         (H264NalParser *nalparser, H264NalUnit *nalu,
+H264ParserResult h264_parser_parse_sps         (H264NalUnit *nalu,
                                                       H264SPS *sps, gboolean parse_vui_params);


--- a/gst-v4l2/gstv4l2object.c
+++ b/gst-v4l2/gstv4l2object.c
@@ -62,6 +62,12 @@ GST_DEBUG_CATEGORY_EXTERN (v4l2_debug);

 #define ENCODED_BUFFER_SIZE             (4 * 1024 * 1024)

+#ifdef USE_V4L2_TARGET_NV
+/* Structure to hold the video info inorder to modify the contents, incase of
+ * GST_VIDEO_FORMAT_I420_12LE format */
+  static GstVideoFormatInfo video_info;
+#endif
+
 enum
 {
  PROP_0,
@@ -2413,11 +2419,18 @@ gst_v4l2_object_add_interlace_mode (GstV4l2Object * v4l2object,
    gst_value_list_append_and_take_value (&interlace_formats, &interlace_enum);
  }

-  if (gst_v4l2src_value_simplify (&interlace_formats)
-      || gst_value_list_get_size (&interlace_formats) > 0)
-    gst_structure_take_value (s, "interlace-mode", &interlace_formats);
-  else
-    GST_WARNING_OBJECT (v4l2object, "Failed to determine interlace mode");
+#ifdef USE_V4L2_TARGET_NV
+  if (gst_value_list_get_size (&interlace_formats))
+  {
+#endif
+    if (gst_v4l2src_value_simplify (&interlace_formats)
+            || gst_value_list_get_size (&interlace_formats) > 0)
+      gst_structure_take_value (s, "interlace-mode", &interlace_formats);
+    else
+      GST_WARNING_OBJECT (v4l2object, "Failed to determine interlace mode");
+#ifdef USE_V4L2_TARGET_NV
+  }
+#endif

  g_value_unset(&interlace_formats);
  return;
@@ -3814,6 +3827,14 @@ gst_v4l2_object_set_format_full (GstV4l2Object * v4l2object, GstCaps * caps,
        if (ret)
          goto invalid_ctrl;
      }
+    } else {
+        if ((!strcmp (v4l2object->videodev, V4L2_DEVICE_PATH_NVDEC)) &&
+            V4L2_TYPE_IS_OUTPUT (v4l2object->type) &&
+            (width == 0 || height == 0)) {
+        GST_WARNING_OBJECT (v4l2object->dbg_obj,
+            "Invalid caps: %s", gst_caps_to_string(caps));
+        goto invalid_caps;
+      }
    }
 #endif

@@ -3865,16 +3886,19 @@ gst_v4l2_object_set_format_full (GstV4l2Object * v4l2object, GstCaps * caps,
    }
  }

+  if (videoenc) {
+    if (pixelformat == V4L2_PIX_FMT_AV1) {
+        set_v4l2_video_mpeg_class (videoenc->v4l2capture,
+            V4L2_CID_MPEG_VIDEOENC_AV1_HEADERS_WITH_FRAME, videoenc->v4l2capture->Enable_headers);
+      }
+  }
+
  if (is_cuvid == FALSE) {
    if (videoenc) {
      if (pixelformat == V4L2_PIX_FMT_VP8 || pixelformat == V4L2_PIX_FMT_VP9) {
        set_v4l2_video_mpeg_class (videoenc->v4l2capture,
            V4L2_CID_MPEG_VIDEOENC_VPX_HEADERS_WITH_FRAME, videoenc->v4l2capture->Enable_headers);
      }
-      if (pixelformat == V4L2_PIX_FMT_AV1) {
-        set_v4l2_video_mpeg_class (videoenc->v4l2capture,
-            V4L2_CID_MPEG_VIDEOENC_AV1_HEADERS_WITH_FRAME, videoenc->v4l2capture->Enable_headers);
-      }
    }
  }
  else if (is_cuvid == TRUE) {
@@ -3928,6 +3952,55 @@ gst_v4l2_object_set_format_full (GstV4l2Object * v4l2object, GstCaps * caps,
      ret = v4l2object->ioctl (fd, VIDIOC_S_EXT_CTRLS, &ctrls);
      if (ret)
        goto invalid_ctrl;
+
+      ctl.id = V4L2_CID_MPEG_VIDEO_MAXBITRATE;
+      ctl.value = videoenc->maxbitrate;
+      ctrls.count = 1;
+      ctrls.controls = &ctl ;
+      ret = v4l2object->ioctl (fd, VIDIOC_S_EXT_CTRLS, &ctrls);
+      if (ret)
+        goto invalid_ctrl;
+
+      ctl.id = V4L2_CID_MPEG_VIDEOENC_VBVBUFSIZE;
+      ctl.value = videoenc->vbvbufsize;
+      ctrls.count = 1;
+      ctrls.controls = &ctl ;
+      ret = v4l2object->ioctl (fd, VIDIOC_S_EXT_CTRLS, &ctrls);
+      if (ret)
+        goto invalid_ctrl;
+
+      ctl.id = V4L2_CID_MPEG_VIDEOENC_VBVINIT;
+      ctl.value = videoenc->vbvinit;
+      ctrls.count = 1;
+      ctrls.controls = &ctl ;
+      ret = v4l2object->ioctl (fd, VIDIOC_S_EXT_CTRLS, &ctrls);
+      if (ret)
+        goto invalid_ctrl;
+
+      ctl.id = V4L2_CID_MPEG_VIDEOENC_ENABLE_AQ;
+      ctl.value = videoenc->aqStrength;
+      ctrls.count = 1;
+      ctrls.controls = &ctl ;
+      ret = v4l2object->ioctl (fd, VIDIOC_S_EXT_CTRLS, &ctrls);
+      if (ret)
+        goto invalid_ctrl;
+
+      ctl.id = V4L2_CID_MPEG_VIDEOENC_ENABLE_TEMPORAL_AQ;
+      ctl.value = videoenc->enableTemporalAQ;
+      ctrls.count = 1;
+      ctrls.controls = &ctl ;
+      ret = v4l2object->ioctl (fd, VIDIOC_S_EXT_CTRLS, &ctrls);
+      if (ret)
+        goto invalid_ctrl;
+
+      ctl.id = V4L2_CID_MPEG_VIDEOENC_TARGET_QUALITY;
+      ctl.value = videoenc->targetQuality;
+      ctrls.count = 1;
+      ctrls.controls = &ctl ;
+      ret = v4l2object->ioctl (fd, VIDIOC_S_EXT_CTRLS, &ctrls);
+      if (ret)
+        goto invalid_ctrl;
+
    }
  }
 #endif
--- a/gst-v4l2/gstv4l2object.h
+++ b/gst-v4l2/gstv4l2object.h
@@ -138,12 +138,6 @@ typedef gboolean  (*GstV4l2UpdateFpsFunction) (GstV4l2Object * v4l2object);
    return FALSE;						\
  }

-#ifdef USE_V4L2_TARGET_NV
-/* Structure to hold the video info inorder to modify the contents, incase of
- * GST_VIDEO_FORMAT_I420_12LE format */
-  GstVideoFormatInfo video_info;
-#endif
-
 struct _GstV4l2Object {
  GstElement * element;
  GstObject * dbg_obj;
--- a/gst-v4l2/gstv4l2videodec.c
+++ b/gst-v4l2/gstv4l2videodec.c
@@ -1,7 +1,7 @@
 /*
 * Copyright (C) 2014-2023 Collabora Ltd.
 *     Author: Nicolas Dufresne <nicolas.dufresne@collabora.com>
- * Copyright (c) 2018-2024, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2018-2023, NVIDIA CORPORATION. All rights reserved.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Library General Public
@@ -136,11 +136,7 @@ gst_video_dec_capture_buffer_dynamic_allocation (void)
 /* Properties specifically applicable on GPU*/
 #define GST_TYPE_V4L2_VID_CUDADEC_MEM_TYPE (gst_video_cudadec_mem_type ())

-#ifndef __aarch64__
 #define DEFAULT_CUDADEC_MEM_TYPE V4L2_CUDA_MEM_TYPE_DEVICE
-#else
-#define DEFAULT_CUDADEC_MEM_TYPE V4L2_CUDA_MEM_TYPE_DEVICE
-#endif

 #define DEFAULT_CUDADEC_GPU_ID   0
 #define MAX_CUDADEC_NUM_SURFACES 20
@@ -847,37 +843,16 @@ gst_v4l2_video_dec_set_format (GstVideoDecoder * decoder,
      goto done;
    }
 #else
-    if (is_cuvid == TRUE) {
-        GstV4l2BufferPool *v4l2pool = GST_V4L2_BUFFER_POOL(self->v4l2output->pool);
-        GstV4l2Object *obj = v4l2pool->obj;
-        if ((GST_V4L2_PIXELFORMAT(obj) == V4L2_PIX_FMT_H264) ||
-            (GST_V4L2_PIXELFORMAT(obj) == V4L2_PIX_FMT_H265))
-        {
-          GST_INFO_OBJECT(self, "pix format is h264 or h265. skipping");
-          self->output_flow = GST_FLOW_OK;
-          self->set_format = true;
-          return TRUE;
-        }
-    } else if (is_cuvid == FALSE) {
-        {
-          GstStructure *config;
-          GstCaps *oldcaps;
-          GstStructure *structure;
-          gint width = 0;
-
-          config = gst_buffer_pool_get_config(self->v4l2output->pool);
-          gst_buffer_pool_config_get_params(config, &oldcaps, NULL, NULL, NULL);
-          structure = gst_caps_get_structure(oldcaps, 0);
-          if (gst_structure_get_int(structure, "width", &width))
-            self->is_drc = TRUE;
-          else
-            self->is_drc = FALSE;
-          gst_structure_free(config);
-        }
-        if (self->is_drc == FALSE)
-          return TRUE;
-        else
-          self->idr_received = FALSE;
+    GstV4l2BufferPool *v4l2pool = GST_V4L2_BUFFER_POOL(self->v4l2output->pool);
+    GstV4l2Object *obj = v4l2pool->obj;
+    if ((GST_V4L2_PIXELFORMAT(obj) == V4L2_PIX_FMT_H264) ||
+        (GST_V4L2_PIXELFORMAT(obj) == V4L2_PIX_FMT_H265))
+    {
+        GST_INFO_OBJECT(self, "Pix format is h264 or h265. Bypassing set_format."
+                              "Reset done from handle_frame");
+        self->output_flow = GST_FLOW_OK;
+        self->set_format = true;
+        return TRUE;
    }
 #endif
    gst_video_codec_state_unref (self->input_state);
@@ -910,31 +885,6 @@ gst_v4l2_video_dec_set_format (GstVideoDecoder * decoder,

    gst_v4l2_object_stop (self->v4l2capture);
    self->output_flow = GST_FLOW_OK;
-#ifdef USE_V4L2_TARGET_NV
-    if (is_cuvid == FALSE) {
-      if (self->is_drc == TRUE)
-      {
-        g_mutex_lock(&self->v4l2capture->cplane_stopped_lock);
-        while (self->v4l2capture->capture_plane_stopped != TRUE)
-        {
-          g_cond_wait(&self->v4l2capture->cplane_stopped_cond,
-                      &self->v4l2capture->cplane_stopped_lock);
-        }
-        self->v4l2capture->capture_plane_stopped = FALSE;
-        g_mutex_unlock(&self->v4l2capture->cplane_stopped_lock);
-        gst_v4l2_object_close(self->v4l2output);
-        gst_v4l2_object_close(self->v4l2capture);
-        gst_v4l2_object_open(self->v4l2output);
-        if (!gst_v4l2_object_open_shared(self->v4l2capture, self->v4l2output))
-        {
-          g_print("gstv4l2object open shared failed\n");
-          if (GST_V4L2_IS_OPEN(self->v4l2output))
-            gst_v4l2_object_close(self->v4l2output);
-          return FALSE;
-        }
-      }
-    }
-#endif
  }

  ret = gst_v4l2_object_set_format (self->v4l2output, state->caps, &error);
@@ -1468,7 +1418,6 @@ gst_h264_parse_process_nal (GstV4l2VideoDec *self, H264NalUnit * nalu)
 {
  guint nal_type;
  H264SPS sps = { 0, };
-  H264NalParser nalparser;
  H264ParserResult pres;

  /* nothing to do for broken input */
@@ -1487,11 +1436,11 @@ gst_h264_parse_process_nal (GstV4l2VideoDec *self, H264NalUnit * nalu)
  {
      GST_DEBUG_OBJECT (self, "GOT SPS frame\n");
  }
-  
+
  switch (nal_type) {
    case H264_NAL_SPS:
      /* reset state, everything else is obsolete */
-      pres = h264_parser_parse_sps (&nalparser, nalu, &sps, TRUE);
+      pres = h264_parser_parse_sps (nalu, &sps, TRUE);

      /* arranged for a fallback sps.id, so use that one and only warn */
      if (pres != H264_PARSER_OK) {
@@ -1511,8 +1460,8 @@ gst_h264_parse_process_nal (GstV4l2VideoDec *self, H264NalUnit * nalu)
 static GstFlowReturn
 gst_v4l2_h265_stream_parser (GstV4l2VideoDec *self, gpointer data, guint32 size)
 {
-    H265NalUnit nalu;
-    H265ParserResult pres;
+    H265NalUnit nalu = {0};
+    H265ParserResult pres = H265_PARSER_ERROR;
    gint current_off = 0;
    guint nalu_size = 0;
    GstFlowReturn ret = GST_FLOW_OK;
@@ -1674,7 +1623,7 @@ gst_v4l2_video_dec_handle_frame (GstVideoDecoder * decoder,
        if (((GST_V4L2_PIXELFORMAT(obj) == V4L2_PIX_FMT_VP8) ||
            (GST_V4L2_PIXELFORMAT(obj) == V4L2_PIX_FMT_VP9)) && self->valid_vpx == FALSE)
        {
-            GstMapInfo map;
+            GstMapInfo map = {0};
            if (!gst_buffer_map(frame->input_buffer, &map, GST_MAP_READ))
            {
              GST_ERROR_OBJECT(self, "couldnt map frame input_buffer\n");
@@ -1693,50 +1642,51 @@ gst_v4l2_video_dec_handle_frame (GstVideoDecoder * decoder,

            gst_buffer_unmap (frame->input_buffer, &map);
        }
-        if (((GST_V4L2_PIXELFORMAT(obj) == V4L2_PIX_FMT_H264) ||
-             (GST_V4L2_PIXELFORMAT(obj) == V4L2_PIX_FMT_H265)) &&
-            !(GST_BUFFER_FLAG_IS_SET(GST_BUFFER_CAST(frame->input_buffer),
-                                     GST_BUFFER_FLAG_DELTA_UNIT)))
+    }
+    if (((GST_V4L2_PIXELFORMAT(obj) == V4L2_PIX_FMT_H264) ||
+         (GST_V4L2_PIXELFORMAT(obj) == V4L2_PIX_FMT_H265)) &&
+        !(GST_BUFFER_FLAG_IS_SET(GST_BUFFER_CAST(frame->input_buffer),
+                                 GST_BUFFER_FLAG_DELTA_UNIT)))
+    {
+        GstMapInfo map = {0};
+        if (!gst_buffer_map(frame->input_buffer, &map, GST_MAP_READ))
        {
-            GstMapInfo map;
-            if (!gst_buffer_map(frame->input_buffer, &map, GST_MAP_READ))
-            {
-              GST_ERROR_OBJECT(self, "couldnt map frame input_buffer\n");
-            }
+            GST_ERROR_OBJECT(self, "couldnt map frame input_buffer\n");
+        }

-            if (GST_V4L2_PIXELFORMAT(obj) == V4L2_PIX_FMT_H264)
-            {
-              if (gst_v4l2_h264_stream_parser(self, map.data, map.size) != GST_FLOW_OK)
+        if (GST_V4L2_PIXELFORMAT(obj) == V4L2_PIX_FMT_H264)
+        {
+            if (gst_v4l2_h264_stream_parser(self, map.data, map.size) != GST_FLOW_OK)
                GST_ERROR_OBJECT(self, "h264 stream parsing failed");
-            }
-            else if ((GST_V4L2_PIXELFORMAT(obj) == V4L2_PIX_FMT_H265))
-            {
-              if (gst_v4l2_h265_stream_parser(self, map.data, map.size) != GST_FLOW_OK)
+        }
+        else if ((GST_V4L2_PIXELFORMAT(obj) == V4L2_PIX_FMT_H265))
+        {
+            if (gst_v4l2_h265_stream_parser(self, map.data, map.size) != GST_FLOW_OK)
                GST_ERROR_OBJECT(self, "h265 stream parsing failed");
-            }
-            gst_buffer_unmap (frame->input_buffer, &map);
+        }
+        gst_buffer_unmap(frame->input_buffer, &map);

-            if (self->old_width || self->old_height)
+        if (self->old_width || self->old_height)
+        {
+            if ((self->old_width != self->current_width) ||
+                (self->old_height != self->current_height))
            {
-              if ((self->old_width != self->current_width) ||
-                  (self->old_height != self->current_height))
-              {
                GST_INFO_OBJECT(self, "Decoder found new resolution. triggering DRC seq.");
                GST_INFO_OBJECT(self, "Old Resolution: [%d x %d], New Resolution: [%d x %d]",
-                  self->old_width, self->old_height, self->current_width, self->current_height);
+                                self->old_width, self->old_height, self->current_width, self->current_height);
                trigger_drc = true;
-              }
            }
+        }

-            self->old_width = self->current_width;
-            self->old_height = self->current_height;
+        self->old_width = self->current_width;
+        self->old_height = self->current_height;

-            if (trigger_drc == true)
+        if (trigger_drc == true)
+        {
+            GstStructure *structure = NULL;
+            GstCaps *dec_sink_caps = gst_pad_get_current_caps(decoder->sinkpad);
+            if (dec_sink_caps != NULL)
            {
-              GstStructure *structure = NULL;
-              GstCaps *dec_sink_caps = gst_pad_get_current_caps(decoder->sinkpad);
-              if (dec_sink_caps != NULL)
-              {
                dec_sink_caps = gst_caps_make_writable(dec_sink_caps);
                structure = gst_caps_get_structure(dec_sink_caps, 0);
                gst_structure_set(structure, "width", G_TYPE_INT, self->current_width,
@@ -1746,12 +1696,12 @@ gst_v4l2_video_dec_handle_frame (GstVideoDecoder * decoder,
                 * with downstream, not coded size. */
                gst_caps_map_in_place(dec_sink_caps, gst_v4l2_video_remove_padding, self);
                GST_DEBUG_OBJECT(self, "dec_sink_caps: %s", gst_caps_to_string(dec_sink_caps));
-              }
-              self->idr_received = FALSE;
+            }
+            self->idr_received = FALSE;

-              gst_v4l2_video_dec_finish(decoder);
-              gst_v4l2_object_stop(self->v4l2output);
-              {
+            gst_v4l2_video_dec_finish(decoder);
+            gst_v4l2_object_stop(self->v4l2output);
+            {
                GstCaps *caps = gst_pad_get_current_caps(decoder->srcpad);
                if (caps)
                {
@@ -1760,51 +1710,51 @@ gst_v4l2_video_dec_handle_frame (GstVideoDecoder * decoder,
                  gst_query_unref(query);
                  gst_caps_unref(caps);
                }
-              }
-              gst_v4l2_object_stop(self->v4l2capture);
-              self->output_flow = GST_FLOW_OK;
+            }
+            gst_v4l2_object_stop(self->v4l2capture);
+            self->output_flow = GST_FLOW_OK;

-              g_mutex_lock(&self->v4l2capture->cplane_stopped_lock);
-              while (self->v4l2capture->capture_plane_stopped != TRUE)
-              {
+            g_mutex_lock(&self->v4l2capture->cplane_stopped_lock);
+            while (self->v4l2capture->capture_plane_stopped != TRUE)
+            {
                g_cond_wait(&self->v4l2capture->cplane_stopped_cond,
                            &self->v4l2capture->cplane_stopped_lock);
-              }
-              self->v4l2capture->capture_plane_stopped = FALSE;
-              g_mutex_unlock(&self->v4l2capture->cplane_stopped_lock);
+            }
+            self->v4l2capture->capture_plane_stopped = FALSE;
+            g_mutex_unlock(&self->v4l2capture->cplane_stopped_lock);

-              gst_v4l2_object_close(self->v4l2output);
-              gst_v4l2_object_close(self->v4l2capture);
-              if (!gst_v4l2_object_open(self->v4l2output))
+            gst_v4l2_object_close(self->v4l2output);
+            gst_v4l2_object_close(self->v4l2capture);
+            if (!gst_v4l2_object_open(self->v4l2output))
                GST_ERROR_OBJECT(self, "gst_v4l2_object_open (self->v4l2output) failed\n");
-              if (!gst_v4l2_object_open_shared(self->v4l2capture, self->v4l2output))
-              {
+            if (!gst_v4l2_object_open_shared(self->v4l2capture, self->v4l2output))
+            {
                GST_ERROR_OBJECT(self, "gstv4l2object open shared failed\n");
                if (GST_V4L2_IS_OPEN(self->v4l2output))
                  gst_v4l2_object_close(self->v4l2output);
                return GST_FLOW_ERROR;
-              }
-              if (dec_sink_caps != NULL)
-              {
+            }
+            if (dec_sink_caps != NULL)
+            {
                ret = gst_v4l2_object_set_format(self->v4l2output, dec_sink_caps, &error);
                gst_caps_unref(dec_sink_caps);
-              } else
-              {
+            }
+            else
+            {
                GST_ERROR_OBJECT(self, "Decoder sink caps == NULL");
-              }
+            }

-              if (ret)
+            if (ret)
                self->input_state = gst_video_codec_state_ref(self->input_state);
-              else
+            else
                gst_v4l2_error(self, &error);

-              set_v4l2_controls(self);
-              GST_INFO_OBJECT(self, "Reset Done");
-            }
-            else if (self->set_format == true)
-            {
-              set_v4l2_controls(self);
-            }
+            set_v4l2_controls(self);
+            GST_INFO_OBJECT(self, "Reset Done");
+        }
+        else if (self->set_format == true)
+        {
+            set_v4l2_controls(self);
        }
    }

@@ -1857,7 +1807,7 @@ gst_v4l2_video_dec_handle_frame (GstVideoDecoder * decoder,

  if (G_UNLIKELY (!GST_V4L2_IS_ACTIVE (self->v4l2capture))) {
    GstBufferPool *pool = GST_BUFFER_POOL (self->v4l2output->pool);
-    GstVideoInfo info;
+    GstVideoInfo info = {0};
    GstVideoCodecState *output_state;
    GstBuffer *codec_data;
    GstCaps *acquired_caps, *available_caps, *caps, *filter;
@@ -2116,35 +2066,32 @@ gst_v4l2_video_dec_handle_frame (GstVideoDecoder * decoder,
 #endif
  }
 #ifdef USE_V4L2_TARGET_NV
-  if (is_cuvid == TRUE)
+  if ((trigger_drc == false) && (self->set_format == true))
  {
-    if ((trigger_drc == false) && (self->set_format == true))
+    GstStructure *sink_pad_st = NULL, *src_pad_st = NULL;
+    const GValue *framerate = NULL;
+    GstCaps *dec_sink_caps = gst_pad_get_current_caps(decoder->sinkpad);
+    GstCaps *dec_src_caps = gst_pad_get_current_caps(decoder->srcpad);
+    if (G_UNLIKELY(dec_sink_caps != NULL) && G_UNLIKELY(dec_src_caps != NULL))
    {
-      GstStructure *sink_pad_st = NULL, *src_pad_st = NULL;
-      const GValue *framerate = NULL;
-      GstCaps *dec_sink_caps = gst_pad_get_current_caps(decoder->sinkpad);
-      GstCaps *dec_src_caps = gst_pad_get_current_caps(decoder->srcpad);
-      if (G_UNLIKELY (dec_sink_caps != NULL) && G_UNLIKELY (dec_src_caps != NULL))
-      {
-        GST_DEBUG_OBJECT(self, "dec_sink_caps: %s", gst_caps_to_string(dec_sink_caps));
-        dec_src_caps = gst_caps_make_writable(dec_src_caps);
-        sink_pad_st = gst_caps_get_structure(dec_sink_caps, 0);
-        src_pad_st = gst_caps_get_structure(dec_src_caps, 0);
-        framerate = gst_structure_get_value(sink_pad_st, "framerate");
-        if (framerate)
-                gst_structure_set_value(src_pad_st, "framerate", framerate);
+      GST_DEBUG_OBJECT(self, "dec_sink_caps: %s", gst_caps_to_string(dec_sink_caps));
+      dec_src_caps = gst_caps_make_writable(dec_src_caps);
+      sink_pad_st = gst_caps_get_structure(dec_sink_caps, 0);
+      src_pad_st = gst_caps_get_structure(dec_src_caps, 0);
+      framerate = gst_structure_get_value(sink_pad_st, "framerate");
+      if (framerate)
+        gst_structure_set_value(src_pad_st, "framerate", framerate);

-        GST_DEBUG_OBJECT(self, "dec_src_caps: %s", gst_caps_to_string(dec_src_caps));
+      GST_DEBUG_OBJECT(self, "dec_src_caps: %s", gst_caps_to_string(dec_src_caps));

-        gst_pad_set_caps(decoder->srcpad, dec_src_caps);
+      gst_pad_set_caps(decoder->srcpad, dec_src_caps);

-        gst_caps_unref(dec_sink_caps);
-        gst_caps_unref(dec_src_caps);
-      }
+      gst_caps_unref(dec_sink_caps);
+      gst_caps_unref(dec_src_caps);
    }
-    trigger_drc = false;
-    self->set_format = false;
  }
+  trigger_drc = false;
+  self->set_format = false;
 #endif

  task_state = gst_pad_get_task_state (GST_VIDEO_DECODER_SRC_PAD (self));
@@ -2207,7 +2154,7 @@ gst_v4l2_video_dec_handle_frame (GstVideoDecoder * decoder,
  if ((is_cuvid == TRUE) && (self->extract_sei_type5_data == TRUE))
  {
      uint8_t *sei_type5_payload = NULL;
-      GstMapInfo map;
+      GstMapInfo map = {0};
      if (!gst_buffer_map (tmp, &map, GST_MAP_READWRITE))
      {
          GST_DEBUG_OBJECT (self, "couldnt map\n");
@@ -2581,9 +2528,6 @@ gst_v4l2_video_dec_subinstance_init (GTypeInstance * instance, gpointer g_class)
      gst_v4l2_get_output, gst_v4l2_set_output, NULL);
  self->v4l2output->no_initial_format = TRUE;
  self->v4l2output->keep_aspect = FALSE;
-#ifdef USE_V4L2_TARGET_NV
-  self->v4l2output->open_mjpeg_block = TRUE;
-#endif

  self->v4l2capture = gst_v4l2_object_new (GST_ELEMENT (self),
      GST_OBJECT (GST_VIDEO_DECODER_SRC_PAD (self)),
--- a/gst-v4l2/gstv4l2videoenc.c
+++ b/gst-v4l2/gstv4l2videoenc.c
@@ -123,6 +123,12 @@ enum
  PROP_CUDAENC_CONSTQP,
  PROP_CUDAENC_INITQP,
  PROP_CUDAENC_TUNING_INFO_ID,
+  PROP_MAXBITRATE,
+  PROP_VBVBUFSIZE,
+  PROP_VBVINIT,
+  PROP_AQ,
+  PROP_TEMPORAL_AQ,
+  PROP_CQ,
  /* Properties exposed on Tegra only */
  PROP_PEAK_BITRATE,
  PROP_QUANT_I_FRAMES,
@@ -137,13 +143,19 @@ enum
  PROP_IDR_FRAME_INTERVAL,
  PROP_FORCE_INTRA,
  PROP_COPY_METADATA,
-  PROP_FORCE_IDR
+  PROP_FORCE_IDR,
+  PROP_COPY_TIMESTAMP
 #endif
 };

 #ifdef USE_V4L2_TARGET_NV
 /* Defaults */
 #define GST_V4L2_VIDEO_ENC_BITRATE_DEFAULT           (4000000)
+#define GST_V4L2_VIDEO_ENC_MAXBITRATE_DEFAULT        (0)
+#define GST_V4L2_VIDEO_ENC_VBVBUFSIZE_DEFAULT        (0)
+#define GST_V4L2_VIDEO_ENC_VBVINIT_DEFAULT           (0)
+#define GST_V4L2_VIDEO_ENC_AQ_DEFAULT                (0)
+#define GST_V4L2_VIDEO_ENC_CQ_DEFAULT                (0)
 #define GST_V4L2_VIDEO_ENC_PEAK_BITRATE_DEFAULT      (0)
 #define DEFAULT_RATE_CONTROL                         V4L2_MPEG_VIDEO_BITRATE_MODE_CBR
 #define DEFAULT_INTRA_FRAME_INTERVAL                 30
@@ -291,6 +303,10 @@ gst_v4l2_video_enc_set_property_tegra (GObject * object,
      self->maxperf_enable = g_value_get_boolean (value);
      break;

+    case PROP_COPY_TIMESTAMP:
+      self->copy_timestamp = g_value_get_boolean(value);
+      break;
+
    case PROP_IDR_FRAME_INTERVAL:
      self->idrinterval = g_value_get_uint (value);
      break;
@@ -335,6 +351,30 @@ gst_v4l2_video_enc_set_property_cuvid (GObject * object,
      }
      break;

+    case PROP_MAXBITRATE:
+      self->maxbitrate = g_value_get_uint (value);
+      break;
+
+    case PROP_VBVBUFSIZE:
+      self->vbvbufsize = g_value_get_uint (value);
+      break;
+
+    case PROP_VBVINIT:
+      self->vbvinit = g_value_get_uint (value);
+      break;
+
+    case PROP_AQ:
+      self->aqStrength = g_value_get_uint (value);
+      break;
+
+    case PROP_TEMPORAL_AQ:
+      self->enableTemporalAQ = g_value_get_boolean (value);
+      break;
+
+    case PROP_CQ:
+      self->targetQuality = g_value_get_uint (value);
+      break;
+
    case PROP_INTRA_FRAME_INTERVAL:
      self->iframeinterval = g_value_get_uint (value);
      break;
@@ -461,6 +501,10 @@ gst_v4l2_video_enc_get_property_tegra (GObject * object,
      g_value_set_boolean (value, self->maxperf_enable);
      break;

+    case PROP_COPY_TIMESTAMP:
+      g_value_set_boolean(value, self->copy_timestamp);
+      break;
+
    case PROP_IDR_FRAME_INTERVAL:
      g_value_set_uint (value, self->idrinterval);
      break;
@@ -499,6 +543,30 @@ gst_v4l2_video_enc_get_property_cuvid (GObject * object,
      g_value_set_uint (value, self->bitrate);
      break;

+    case PROP_MAXBITRATE:
+      g_value_set_uint (value, self->maxbitrate);
+      break;
+
+    case PROP_VBVBUFSIZE:
+      g_value_set_uint (value, self->vbvbufsize);
+      break;
+
+    case PROP_VBVINIT:
+      g_value_set_uint (value, self->vbvinit);
+      break;
+
+    case PROP_AQ:
+      g_value_set_uint (value, self->aqStrength);
+      break;
+
+    case PROP_TEMPORAL_AQ:
+      g_value_set_boolean (value, self->enableTemporalAQ);
+      break;
+
+    case PROP_CQ:
+      g_value_set_uint (value, self->targetQuality);
+      break;
+
    case PROP_INTRA_FRAME_INTERVAL:
      g_value_set_uint (value, self->iframeinterval);
      break;
@@ -803,7 +871,7 @@ done:
 #ifdef USE_V4L2_TARGET_NV
 gboolean is_drc (GstVideoEncoder *encoder, GstCaps *input_caps)
 {
-  int curr_width, curr_height, new_width, new_height;
+  int curr_width = 0, curr_height = 0, new_width = 0, new_height = 0;
  GstStructure *sink_caps_st, *input_caps_st;
  GstCaps *sink_caps = gst_caps_make_writable(gst_pad_get_current_caps(encoder->sinkpad));
  sink_caps_st = gst_caps_get_structure(sink_caps, 0);
@@ -1015,6 +1083,7 @@ struct ProfileLevelCtx
  GstV4l2VideoEnc *self;
  const gchar *profile;
  const gchar *level;
+  const gchar *tier;
 };

 static gboolean
@@ -1101,6 +1170,8 @@ negotiate_profile_and_level (GstCapsFeatures * features, GstStructure * s,

  if (!failed && klass->level_cid && get_string_list (s, "level", &levels)) {
    GList *l;
+    gchar *tier;
+    GQueue tiers = G_QUEUE_INIT;

    for (l = levels.head; l; l = l->next) {
      struct v4l2_control control = { 0, };
@@ -1109,6 +1180,30 @@ negotiate_profile_and_level (GstCapsFeatures * features, GstStructure * s,

      GST_TRACE_OBJECT (ctx->self, "Trying level %s", level);

+      if (is_cuvid == FALSE) {
+        if (!strcmp (klass->codec_name, "H265")) {
+          /* Setting default tier*/
+          tier = "main";
+        }
+
+        if (!failed && get_string_list(s, "tier", &tiers)) {
+          GList *lt;
+
+          for (lt = tiers.head; lt; lt = lt->next) {
+            tier = lt->data;
+            GST_TRACE_OBJECT(ctx->self, "Trying tier %s", tier);
+          }
+        }
+
+        if (!strcmp (klass->codec_name, "H265")) {
+          gint size = strlen(level) + strlen(tier) + 1;
+          gchar tier_level[size];
+
+          stpcpy(stpcpy(tier_level, tier), level);
+          level = tier_level;
+        }
+      }
+
      control.id = klass->level_cid;
      control.value = v4l2_level = klass->level_from_string (level);

@@ -1939,6 +2034,7 @@ gst_v4l2_video_enc_init (GstV4l2VideoEnc * self)
  self->set_qpRange = FALSE;
  self->force_idr = FALSE;
  self->force_intra = FALSE;
+  self->copy_timestamp = FALSE;
  self->hw_preset_level = DEFAULT_HW_PRESET_LEVEL;
  self->virtual_buffer_size = DEFAULT_VBV_SIZE;
  self->ratecontrol_enable = TRUE;
@@ -2113,6 +2209,47 @@ gst_v4l2_video_enc_class_init (GstV4l2VideoEncClass * klass)
            FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
            GST_PARAM_MUTABLE_READY));

+    g_object_class_install_property (gobject_class, PROP_MAXBITRATE,
+      g_param_spec_uint ("maxbitrate", "Max Bitrate",
+          "Set maxbitrate for v4l2 encode. This mode is specified by setting rateControlMode to VBR",
+          0, G_MAXUINT, GST_V4L2_VIDEO_ENC_MAXBITRATE_DEFAULT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+          GST_PARAM_MUTABLE_READY));
+
+    g_object_class_install_property (gobject_class, PROP_VBVBUFSIZE,
+      g_param_spec_uint ("vbvbufsize", "VBV Buffer Size",
+          "Set VBV buffer size in bits.",
+          0, G_MAXUINT, GST_V4L2_VIDEO_ENC_VBVBUFSIZE_DEFAULT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+          GST_PARAM_MUTABLE_READY));
+
+    g_object_class_install_property (gobject_class, PROP_VBVINIT,
+      g_param_spec_uint ("vbvinit", "VBV Initial Delay",
+          "Set VBV initial delay in bits.",
+          0, G_MAXUINT, GST_V4L2_VIDEO_ENC_VBVINIT_DEFAULT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+          GST_PARAM_MUTABLE_READY));
+
+    g_object_class_install_property (gobject_class, PROP_AQ,
+      g_param_spec_uint ("aq", "Spatial AQ",
+          "Enable spatial AQ and set its stength (range 1-15, 0-auto)",
+          0, 15, GST_V4L2_VIDEO_ENC_AQ_DEFAULT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+          GST_PARAM_MUTABLE_READY));
+
+    g_object_class_install_property (gobject_class, PROP_TEMPORAL_AQ,
+      g_param_spec_boolean ("temporalaq", "Temporal AQ",
+          "Set this to enable adaptive quantization (Temporal).",
+          FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+          GST_PARAM_MUTABLE_READY));
+
+    g_object_class_install_property (gobject_class, PROP_CQ,
+      g_param_spec_uint ("cq", "targetQuality",
+          "Set targetQuality (Constant Quality) level for VBR mode. (range 0-51, 0-auto)",
+          0, 51, GST_V4L2_VIDEO_ENC_CQ_DEFAULT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+          GST_PARAM_MUTABLE_READY));
+
  } else if (is_cuvid == FALSE) {
    g_object_class_install_property (gobject_class, PROP_PEAK_BITRATE,
        g_param_spec_uint ("peak-bitrate", "Peak Bitrate",
@@ -2179,6 +2316,13 @@ gst_v4l2_video_enc_class_init (GstV4l2VideoEncClass * klass)
            TRUE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
            GST_PARAM_MUTABLE_READY));

+    g_object_class_install_property (gobject_class, PROP_COPY_TIMESTAMP,
+        g_param_spec_boolean ("copy-timestamp",
+            "Set the copy timestamp flag",
+            "Enabling the flag allows to copy the timestamps from input to the capture stream.",
+            FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
+            GST_PARAM_MUTABLE_READY));
+
    g_object_class_install_property (gobject_class, PROP_MAX_PERF,
        g_param_spec_boolean ("maxperf-enable",
            "Enable or Disable Max Performance mode",
@@ -2455,7 +2599,7 @@ gst_v4l2_videnc_hw_preset_level_get_type (void)
 static GType
 gst_v4l2_videnc_ratecontrol_get_type (void)
 {
-  static volatile gsize ratecontrol = 0;
+  static GType ratecontrol = 0;
  if (is_cuvid == false) {
      static const GEnumValue rc_type[] = {
          {V4L2_MPEG_VIDEO_BITRATE_MODE_VBR, "GST_V4L2_VIDENC_VARIABLE_BITRATE",
@@ -2734,6 +2878,14 @@ set_v4l2_video_encoder_properties (GstVideoEncoder * encoder)
    }
  }

+  if (video_enc->copy_timestamp) {
+    if (!set_v4l2_video_mpeg_class (video_enc->v4l2output,
+        V4L2_CID_MPEG_VIDEOENC_COPY_TIMESTAMP, video_enc->copy_timestamp)) {
+      g_print ("S_EXT_CTRLS for COPY_TIMESTAMP failed\n");
+      return FALSE;
+    }
+  }
+
  if (!set_v4l2_video_mpeg_class (video_enc->v4l2output,
      V4L2_CID_MPEG_VIDEOENC_VIRTUALBUFFER_SIZE,
      video_enc->virtual_buffer_size)) {
--- a/gst-v4l2/gstv4l2videoenc.h
+++ b/gst-v4l2/gstv4l2videoenc.h
@@ -1,7 +1,7 @@
 /*
 * Copyright (C) 2014 SUMOMO Computer Association.
 *     Author: ayaka <ayaka@soulik.info>
- * Copyright (c) 2018-2022, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2018-2023, NVIDIA CORPORATION. All rights reserved.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Library General Public
@@ -54,6 +54,9 @@ struct _GstV4l2VideoEnc
 #ifdef USE_V4L2_TARGET_NV
  guint32 ratecontrol;
  guint32 bitrate;
+  guint32 maxbitrate;
+  guint32 vbvbufsize;
+  guint32 vbvinit;
  guint32 peak_bitrate;
  guint32 idrinterval;
  guint32 iframeinterval;
@@ -73,6 +76,9 @@ struct _GstV4l2VideoEnc
  guint32 PInitQP;
  guint32 BInitQP;
  gboolean set_qpRange;
+  gboolean enableTemporalAQ;
+  guint32 aqStrength;
+  guint32 targetQuality;
  guint32 hw_preset_level;
  guint virtual_buffer_size;
  gboolean measure_latency;
@@ -80,6 +86,7 @@ struct _GstV4l2VideoEnc
  gboolean force_idr;
  gboolean force_intra;
  gboolean maxperf_enable;
+  gboolean copy_timestamp;
  FILE *tracing_file_enc;
  GQueue *got_frame_pt;
  guint32 cudaenc_gpu_id;
--- a/gst-v4l2/v4l2_calls.c
+++ b/gst-v4l2/v4l2_calls.c
@@ -51,9 +51,14 @@
 #include "gstv4l2videodec.h"

 #include "gst/gst-i18n-plugin.h"
+#include <ctype.h>
+
 GST_DEBUG_CATEGORY_EXTERN (v4l2_debug);
 #define GST_CAT_DEFAULT v4l2_debug

+static GMutex guard_dev_node;
+static GMutex guard_wsl_check;
+
 /******************************************************
 * gst_v4l2_get_capabilities():
 *   get the device's capturing capabilities
@@ -514,6 +519,56 @@ gst_v4l2_adjust_buf_type (GstV4l2Object * v4l2object)
  }
 }

+/* Function to create a dummy dev node in case of WSL setup */
+static gboolean create_dummy_dev_node(void)
+{
+    /* check if node already exists before creating */
+    g_mutex_lock(&guard_dev_node);
+    if (access("/dev/nvidia0", F_OK) == -1) {
+      const char *command = "cp -a /dev/null /dev/nvidia0";
+      int status = system(command);
+
+      if (status != 0) {
+        g_print("ERROR: create_dummy_dev_node /dev/nvidia0 failed.\n");
+        g_mutex_unlock(&guard_dev_node);
+        return false;
+      }
+    }
+    g_mutex_unlock(&guard_dev_node);
+    return true;
+}
+
+/* Function to check if running inside Windows Subsystem For Linux (WSL) */
+static gboolean is_running_in_WSL(void)
+{
+  static volatile gboolean verified = false;
+  static volatile gboolean ret = false;
+
+  g_mutex_lock(&guard_wsl_check);
+  if (!verified) {
+    verified = true;
+    FILE *versionFile = fopen("/proc/version", "r");
+    if (versionFile != NULL) {
+      char versionInfo[512];
+      if (fgets(versionInfo, sizeof(versionInfo), versionFile) != NULL) {
+        for (int i=0; versionInfo[i] != '\0'; i++) {
+          versionInfo[i] = tolower((unsigned char)versionInfo[i]);
+        }
+        if (strstr(versionInfo, "microsoft") != NULL) {
+          g_print("Running in WSL\n");
+          ret = true;
+        }
+      }
+      fclose(versionFile);
+    } else {
+      g_print("ERROR: opening /proc/version failed\n");
+    }
+  }
+  g_mutex_unlock(&guard_wsl_check);
+
+  return ret;
+}
+
 /******************************************************
 * gst_v4l2_open():
 *   open the video device (v4l2object->videodev)
@@ -525,6 +580,13 @@ gst_v4l2_open (GstV4l2Object * v4l2object)
  struct stat st;
  int libv4l2_fd = -1;

+  if (is_running_in_WSL())
+  {
+    /* WSL system doesn't have /dev/nvidia0 node. Use /dev/null as /dev/nvidia0.
+    We can use a dummy node since the ioctl calls we use are not true ioctls */
+    create_dummy_dev_node();
+  }
+
  GST_DEBUG_OBJECT (v4l2object->dbg_obj, "Trying to open device %s",
      v4l2object->videodev);

--- a/nvbufsurface.h
+++ b/nvbufsurface.h
@@ -278,6 +278,8 @@ typedef enum
  NVBUF_COLOR_FORMAT_NV12_12LE_709,
  /** Specifies BT.709 colorspace - Y/CbCr ER 4:2:0 12-bit multi-planar. */
  NVBUF_COLOR_FORMAT_NV12_12LE_709_ER,
+  /** Specifies 8 bit GRAY scale ER - single plane */
+  NVBUF_COLOR_FORMAT_GRAY8_ER,
  NVBUF_COLOR_FORMAT_LAST
 } NvBufSurfaceColorFormat;

@@ -699,7 +701,7 @@ int NvBufSurfaceCopy (NvBufSurface *srcSurf, NvBufSurface *dstSurf);
 * This function can be used to copy plane memory content from source raw buffer pointer
 * to specific destination batch buffer of supported memory type.
 *
- * @param[in] surf pointer to NvBufSurface structure.
+ * @param[in] Surf pointer to NvBufSurface structure.
 * @param[in] index index of buffer in the batch.
 * @param[in] plane index of plane in buffer.
 * @param[in] out_width aligned width of the raw data plane.
@@ -708,7 +710,7 @@ int NvBufSurfaceCopy (NvBufSurface *srcSurf, NvBufSurface *dstSurf);
 *
 * @return 0 for success, -1 for failure.
 */
-int NvBufSurface2Raw (NvBufSurface *Surf, unsigned int index, unsigned int plane, unsigned int outwidth, unsigned int outheight, unsigned char *ptr);
+int NvBufSurface2Raw (NvBufSurface *Surf, unsigned int index, unsigned int plane, unsigned int out_width, unsigned int out_height, unsigned char *ptr);

 /**
 * \brief Copies the raw buffer plane memory content to the NvBufSurface plane memory of a specific
@@ -722,11 +724,11 @@ int NvBufSurface2Raw (NvBufSurface *Surf, unsigned int index, unsigned int plane
 * @param[in] plane index of plane in buffer.
 * @param[in] in_width aligned width of the raw data plane.
 * @param[in] in_height aligned height of the raw data plane.
- * @param[in] surf pointer to NvBufSurface structure.
+ * @param[in] Surf pointer to NvBufSurface structure.
 *
 * @return 0 for success, -1 for failure.
 */
-int Raw2NvBufSurface (unsigned char *ptr, unsigned int index, unsigned int plane, unsigned int inwidth, unsigned int inheight, NvBufSurface *Surf);
+int Raw2NvBufSurface (unsigned char *ptr, unsigned int index, unsigned int plane, unsigned int in_width, unsigned int in_height, NvBufSurface *Surf);

 /**
 * Syncs the HW memory cache for the CPU.
--- a/push_info.txt
+++ b/push_info.txt
@@ -1 +1 @@
-jetson_35.5
+jetson_36.2
--- a/v4l2_nv_extensions.h
+++ b/v4l2_nv_extensions.h
@@ -192,26 +192,6 @@ enum v4l2_mpeg_video_h265_profile {
 #define V4L2_H264_SPS_FLAG_FRAME_MBS_ONLY           0x10
 #define V4L2_H264_SPS_FLAG_MB_ADAPTIVE_FRAME_FIELD      0x20
 #define V4L2_H264_SPS_FLAG_DIRECT_8X8_INFERENCE         0x40
-struct v4l2_ctrl_h264_sps {
-    __u8 profile_idc;
-    __u8 constraint_set_flags;
-    __u8 level_idc;
-    __u8 seq_parameter_set_id;
-    __u8 chroma_format_idc;
-    __u8 bit_depth_luma_minus8;
-    __u8 bit_depth_chroma_minus8;
-    __u8 log2_max_frame_num_minus4;
-    __u8 pic_order_cnt_type;
-    __u8 log2_max_pic_order_cnt_lsb_minus4;
-    __s32 offset_for_non_ref_pic;
-    __s32 offset_for_top_to_bottom_field;
-    __u8 num_ref_frames_in_pic_order_cnt_cycle;
-    __s32 offset_for_ref_frame[255];
-    __u8 max_num_ref_frames;
-    __u16 pic_width_in_mbs_minus1;
-    __u16 pic_height_in_map_units_minus1;
-    __u8 flags;
-};

 #define V4L2_H264_PPS_FLAG_ENTROPY_CODING_MODE              0x0001
 #define V4L2_H264_PPS_FLAG_BOTTOM_FIELD_PIC_ORDER_IN_FRAME_PRESENT  0x0002
@@ -221,31 +201,6 @@ struct v4l2_ctrl_h264_sps {
 #define V4L2_H264_PPS_FLAG_REDUNDANT_PIC_CNT_PRESENT            0x0020
 #define V4L2_H264_PPS_FLAG_TRANSFORM_8X8_MODE               0x0040
 #define V4L2_H264_PPS_FLAG_PIC_SCALING_MATRIX_PRESENT           0x0080
-struct v4l2_ctrl_h264_pps {
-    __u8 pic_parameter_set_id;
-    __u8 seq_parameter_set_id;
-    __u8 num_slice_groups_minus1;
-    __u8 num_ref_idx_l0_default_active_minus1;
-    __u8 num_ref_idx_l1_default_active_minus1;
-    __u8 weighted_bipred_idc;
-    __s8 pic_init_qp_minus26;
-    __s8 pic_init_qs_minus26;
-    __s8 chroma_qp_index_offset;
-    __s8 second_chroma_qp_index_offset;
-    __u8 flags;
-};
-
-struct v4l2_ctrl_h264_scaling_matrix {
-    __u8 scaling_list_4x4[6][16];
-    __u8 scaling_list_8x8[6][64];
-};
-
-struct v4l2_h264_weight_factors {
-    __s8 luma_weight[32];
-    __s8 luma_offset[32];
-    __s8 chroma_weight[32][2];
-    __s8 chroma_offset[32][2];
-};

 struct v4l2_h264_pred_weight_table {
    __u8 luma_log2_weight_denom;
@@ -299,20 +254,6 @@ struct v4l2_ctrl_h264_slice_param {
    __u8 flags;
 };

-/** Defines whether the v4l2_h264_dpb_entry structure is used.
-If not set, this entry is unused for reference. */
-#define V4L2_H264_DPB_ENTRY_FLAG_ACTIVE     0x01
-#define V4L2_H264_DPB_ENTRY_FLAG_LONG_TERM  0x02
-struct v4l2_h264_dpb_entry {
-    __u32 buf_index; /**< v4l2_buffer index. */
-    __u16 frame_num;
-    __u16 pic_num;
-    /** @note `v4l2_buffer.field` specifies this field. */
-    __s32 top_field_order_cnt;
-    __s32 bottom_field_order_cnt;
-    __u8 flags; /* V4L2_H264_DPB_ENTRY_FLAG_* */
-};
-
 struct v4l2_ctrl_h264_decode_param {
    __u32 num_slices;
    __u8 idr_pic_flag;
@@ -1382,7 +1323,7 @@ struct v4l2_ctrl_vp8_frame_hdr {
 /**
 * Defines the Control ID to enable lossless H.264/H.265 encoding.
 *
- * An boolean value must be supplied with this control. Default is 0.
+ * A boolean value must be supplied with this control. Default is 0.
 * Lossless encoding is supported only for YUV444 8/10-bit format.
 * @note This control must be set in case of H.264 YUV444 encoding as
 * it does not support lossy encoding.
@@ -1449,25 +1390,83 @@ struct v4l2_ctrl_vp8_frame_hdr {
 */
 #define V4L2_CID_MPEG_VIDEOENC_CUDA_CONSTQP (V4L2_CID_MPEG_BASE+580)

-/** Defines Control ID to configure FPS VALUE for CUVID Encoder
+/**
+ * Defines the Control ID to disable Asymmetric Motion Partitions for H.265 encoding.
+ *
+ * A boolean value must be supplied with this control. Default is 0.
+ * @note This control is supported only for Xavier.
+ *
+ * @attention This control should be set after setting formats on both the planes
+ * and before requesting buffers on either plane.
+ */
+#define V4L2_CID_MPEG_VIDEOENC_H265_DISABLE_AMP (V4L2_CID_MPEG_BASE + 581)
+
+ /** Defines Control ID to configure FPS VALUE for CUVID Encoder
 *
 * A positive integer value should be supplied with this control.
 *
 * @attention This control is runtime configurable and can be called anytime after setting
 * formats on both the planes.
 */
-#define V4L2_CID_MPEG_VIDEOENC_RECONFIG_FPS (V4L2_CID_MPEG_BASE+581)
+#define V4L2_CID_MPEG_VIDEOENC_RECONFIG_FPS (V4L2_CID_MPEG_BASE+582)

-/**
- * Defines the Control ID to disable SAO filter for HEVC.
+/** Defines Control ID to configure MAXBITRATE for CUVID Encoder
 *
- * A boolean value should be supplied with this control.
- * If value is true, SAO filter for H265 encoding is disabled. Enabled by default
+ * A positive integer value should be supplied with this control.
 *
- * @attention This control should be set after setting formats on both the planes
+ * @attention This control is runtime configurable and can be called anytime after setting
+ * formats on both the planes.
+ */
+#define V4L2_CID_MPEG_VIDEO_MAXBITRATE 		(V4L2_CID_MPEG_BASE+583)
+
+/** Defines Control ID to configure VBV BUFFERSIZE for CUVID Encoder
+ *
+ * A positive integer value should be supplied with this control.
+ *
+ * @attention This control is runtime configurable and can be called anytime after setting
+ * formats on both the planes.
+ */
+#define V4L2_CID_MPEG_VIDEOENC_VBVBUFSIZE 		(V4L2_CID_MPEG_BASE+584)
+
+/** Defines Control ID to configure VBV INITIAL DELAY for CUVID Encoder
+ *
+ * A positive integer value should be supplied with this control.
+ *
+ * @attention This control is runtime configurable and can be called anytime after setting
+ * formats on both the planes.
+ */
+#define V4L2_CID_MPEG_VIDEOENC_VBVINIT 		(V4L2_CID_MPEG_BASE+585)
+
+/** Defines Control ID to enable Spatial AQ for CUVID Encoder
+ *
+ * A positive integer value in the range 0-15 should be supplied with this control.
+ * Default is 0 (automatic).
+ *
+ * @attention This control must be set after setting formats on both the planes
 * and before requesting buffers on either plane.
- **/
-#define V4L2_CID_MPEG_VIDEOENC_H265_DISABLE_SAO (V4L2_CID_MPEG_BASE + 582)
+ */
+#define V4L2_CID_MPEG_VIDEOENC_ENABLE_AQ 		(V4L2_CID_MPEG_BASE+586)
+
+/** Defines Control ID to enable temporal AQ for CUVID Encoder
+ *
+ * A boolean value must be supplied with this control. Default is 0
+ *
+ * @attention This control must be set after setting formats on both the planes
+ * and before requesting buffers on either plane.
+ */
+#define V4L2_CID_MPEG_VIDEOENC_ENABLE_TEMPORAL_AQ 		(V4L2_CID_MPEG_BASE+587)
+
+/** Defines Control ID to configure target Quality for CUVID Encoder
+ *
+ * A positive integer value in the range 0-51 should be supplied with this control.
+ * Default is 0 (automatic).
+ *
+ * @attention This control must be set after setting formats on both the planes
+ * and before requesting buffers on either plane.
+ */
+#define V4L2_CID_MPEG_VIDEOENC_TARGET_QUALITY 		(V4L2_CID_MPEG_BASE+588)
+
+#define V4L2_CID_MPEG_VIDEOENC_COPY_TIMESTAMP (V4L2_CID_MPEG_BASE + 589)

 /** @} */