Update H.265 presets and support to use timestamps

Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>

presets.c

@@ -23,6 +23,8 @@
 #include <linux/media.h>
 #include <linux/videodev2.h>
 #include <mpeg2-ctrls.h>
+#include <h264-ctrls.h>
+#include <hevc-ctrls.h>
 
 #include "v4l2-request-test.h"
 
@@ -203,9 +205,6 @@ int frame_controls_fill(struct frame *frame, struct preset *preset,
 			unsigned int buffers_count, unsigned int index,
 			unsigned int slice_size)
 {
-	unsigned int count;
-	unsigned int i;
-
 	if (frame == NULL || preset == NULL)
 		return -1;
 
@@ -218,23 +217,6 @@ int frame_controls_fill(struct frame *frame, struct preset *preset,
 
 	memcpy(frame, &preset->frames[index], sizeof(*frame));
 
-	switch (preset->type) {
-	case CODEC_TYPE_MPEG2:
-	case CODEC_TYPE_H264:
-		break;
-#ifdef V4L2_PIX_FMT_HEVC_SLICE
-	case CODEC_TYPE_H265:
-		count = frame->frame.h265.slice_params.num_active_dpb_entries;
-
-		for (i = 0; i < count; i++)
-			frame->frame.h265.slice_params.dpb[i].buffer_index %=
-				buffers_count;
-		break;
-#endif
-	default:
-		return -1;
-	}
-
 	return 0;
 }
 

v4l2-request-test.h

@@ -23,8 +23,9 @@
 #include <linux/types.h>
 #include <linux/v4l2-controls.h>
 #include <linux/videodev2.h>
-#include <h264-ctrls.h>
 #include <mpeg2-ctrls.h>
+#include <h264-ctrls.h>
+#include <hevc-ctrls.h>
 
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
 #define TS_REF_INDEX(index) ((index) * 1000)

v4l2.c

@@ -30,6 +30,8 @@
 #include <linux/media.h>
 #include <linux/videodev2.h>
 #include <mpeg2-ctrls.h>
+#include <h264-ctrls.h>
+#include <hevc-ctrls.h>
 
 #include "v4l2-request-test.h"