mirror of
https://github.com/Fishwaldo/build.git
synced 2025-07-22 21:08:49 +00:00
cc7ab6a6b1
* Attach Meson64 to mainline with a bunch of patches. Tested, but need further work. * Enable DVFS on N2 which sometimes works, sometime doesn't, cleanup * Enable beta targets for Meson64 kernel family * Bump with version
52 lines
2.3 KiB
Diff
52 lines
2.3 KiB
Diff
From f13b6014af30426eef07bb798afc98a5dbd63975 Mon Sep 17 00:00:00 2001
|
|
From: Jonas Karlman <jonas@kwiboo.se>
|
|
Date: Tue, 29 Oct 2019 01:26:01 +0000
|
|
Subject: [PATCH] RFC: media: uapi: h264: Add DPB entry field reference flags
|
|
|
|
Add DPB entry flags to help indicate when a reference frame is a field picture
|
|
and how the DPB entry is referenced, top or bottom field or full frame.
|
|
|
|
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
|
|
---
|
|
Documentation/media/uapi/v4l/ext-ctrls-codec.rst | 12 ++++++++++++
|
|
include/media/h264-ctrls.h | 4 ++++
|
|
2 files changed, 16 insertions(+)
|
|
|
|
diff --git a/Documentation/media/uapi/v4l/ext-ctrls-codec.rst b/Documentation/media/uapi/v4l/ext-ctrls-codec.rst
|
|
index 28313c0f4e7c..d472a54d1c4d 100644
|
|
--- a/Documentation/media/uapi/v4l/ext-ctrls-codec.rst
|
|
+++ b/Documentation/media/uapi/v4l/ext-ctrls-codec.rst
|
|
@@ -2028,6 +2028,18 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type -
|
|
V4L2_H264_DPB_ENTRY_FLAG_FIELD is set but
|
|
V4L2_H264_DPB_ENTRY_FLAG_BOTTOM_FIELD is not, that means the
|
|
DPB entry is a top field reference
|
|
+ * - ``V4L2_H264_DPB_ENTRY_FLAG_FIELD_PICTURE``
|
|
+ - 0x00000008
|
|
+ - The DPB entry is a field picture
|
|
+ * - ``V4L2_H264_DPB_ENTRY_FLAG_REF_TOP``
|
|
+ - 0x00000010
|
|
+ - The DPB entry is a top field reference
|
|
+ * - ``V4L2_H264_DPB_ENTRY_FLAG_REF_BOTTOM``
|
|
+ - 0x00000020
|
|
+ - The DPB entry is a bottom field reference
|
|
+ * - ``V4L2_H264_DPB_ENTRY_FLAG_REF_FRAME``
|
|
+ - 0x00000030
|
|
+ - The DPB entry is a reference frame
|
|
|
|
``V4L2_CID_MPEG_VIDEO_H264_DECODE_MODE (enum)``
|
|
Specifies the decoding mode to use. Currently exposes slice-based and
|
|
diff --git a/include/media/h264-ctrls.h b/include/media/h264-ctrls.h
|
|
index e877bf1d537c..76020ebd1e6c 100644
|
|
--- a/include/media/h264-ctrls.h
|
|
+++ b/include/media/h264-ctrls.h
|
|
@@ -185,6 +185,10 @@ struct v4l2_ctrl_h264_slice_params {
|
|
#define V4L2_H264_DPB_ENTRY_FLAG_LONG_TERM 0x04
|
|
#define V4L2_H264_DPB_ENTRY_FLAG_FIELD 0x08
|
|
#define V4L2_H264_DPB_ENTRY_FLAG_BOTTOM_FIELD 0x10
|
|
+#define V4L2_H264_DPB_ENTRY_FLAG_FIELD_PICTURE 0x08
|
|
+#define V4L2_H264_DPB_ENTRY_FLAG_REF_TOP 0x10
|
|
+#define V4L2_H264_DPB_ENTRY_FLAG_REF_BOTTOM 0x20
|
|
+#define V4L2_H264_DPB_ENTRY_FLAG_REF_FRAME 0x30
|
|
|
|
struct v4l2_h264_dpb_entry {
|
|
__u64 reference_ts;
|