From b1c6fb33ec77be15300265a7c8e223027e0eeb4d Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Thu, 23 Feb 2023 11:55:42 +0100
Subject: [PATCH] device: remove `device_consume_event` and
 `device_set_decoder_start`

---
 device/device.c       | 40 ----------------------------------------
 device/device.h       |  3 ---
 device/dummy/device.c |  5 -----
 device/dummy/dummy.c  |  1 -
 device/dummy/dummy.h  |  1 -
 device/v4l2/device.c  | 15 ---------------
 device/v4l2/v4l2.c    |  1 -
 device/v4l2/v4l2.h    |  1 -
 8 files changed, 67 deletions(-)

diff --git a/device/device.c b/device/device.c
index 89dbb9c..25c4c5b 100644
--- a/device/device.c
+++ b/device/device.c
@@ -179,46 +179,6 @@ int device_set_stream(device_t *dev, bool do_on)
   return 0;
 }
 
-int device_consume_event(device_t *dev)
-{
-  // TODO: support events
-
-#if 0
-	struct v4l2_event event;
-
-  if (!dev) {
-    return -1;
-  }
-
-	LOG_DEBUG(dev, "Consuming V4L2 event ...");
-  ERR_IOCTL(dev, dev->v4l2->dev_fd, VIDIOC_DQEVENT, &event, "Got some V4L2 device event, but where is it?");
-
-  switch (event.type) {
-    case V4L2_EVENT_SOURCE_CHANGE:
-      LOG_INFO(dev, "Got V4L2_EVENT_SOURCE_CHANGE: source changed");
-      return -1;
-    case V4L2_EVENT_EOS:
-      LOG_INFO(dev, "Got V4L2_EVENT_EOS: end of stream (ignored)");
-      return 0;
-  }
-
-  return 0;
-
-error:
-#endif
-
-  return -1;
-}
-
-int device_set_decoder_start(device_t *dev, bool do_on)
-{
-  if (!dev || dev->hw->device_set_decoder_start(dev, do_on) < 0)
-    return -1;
-
-  dev->decoder_started = do_on;
-  return 0;
-}
-
 int device_video_force_key(device_t *dev)
 {
   if (!dev || dev->hw->device_video_force_key(dev) < 0)
diff --git a/device/device.h b/device/device.h
index 354d5dd..9007dca 100644
--- a/device/device.h
+++ b/device/device.h
@@ -13,7 +13,6 @@ struct pollfd;
 typedef struct device_hw_s {
   int (*device_open)(device_t *dev);
   void (*device_close)(device_t *dev);
-  int (*device_set_decoder_start)(device_t *dev, bool do_on);
   int (*device_video_force_key)(device_t *dev);
   void (*device_dump_options)(device_t *dev, FILE *stream);
   int (*device_set_fps)(device_t *dev, int desired_fps);
@@ -63,10 +62,8 @@ buffer_list_t *device_open_buffer_list2(device_t *dev, const char *path, bool do
 buffer_list_t *device_open_buffer_list_output(device_t *dev, buffer_list_t *capture_list);
 buffer_list_t *device_open_buffer_list_capture(device_t *dev, const char *path, buffer_list_t *output_list, buffer_format_t fmt, bool do_mmap);
 buffer_list_t *device_open_buffer_list_capture2(device_t *dev, const char *path, buffer_list_t *output_list, unsigned choosen_format, bool do_mmap);
-int device_consume_event(device_t *dev);
 
 int device_set_stream(device_t *dev, bool do_on);
-int device_set_decoder_start(device_t *dev, bool do_on);
 int device_video_force_key(device_t *dev);
 
 void device_dump_options(device_t *dev, FILE *stream);
diff --git a/device/dummy/device.c b/device/dummy/device.c
index bfa0681..20daac5 100644
--- a/device/dummy/device.c
+++ b/device/dummy/device.c
@@ -15,11 +15,6 @@ void dummy_device_close(device_t *dev)
   free(dev->dummy);
 }
 
-int dummy_device_set_decoder_start(device_t *dev, bool do_on)
-{
-  return -1;
-}
-
 int dummy_device_video_force_key(device_t *dev)
 {
   return -1;
diff --git a/device/dummy/dummy.c b/device/dummy/dummy.c
index d86197f..1daad36 100644
--- a/device/dummy/dummy.c
+++ b/device/dummy/dummy.c
@@ -5,7 +5,6 @@
 device_hw_t dummy_device_hw = {
   .device_open = dummy_device_open,
   .device_close = dummy_device_close,
-  .device_set_decoder_start = dummy_device_set_decoder_start,
   .device_video_force_key = dummy_device_video_force_key,
   .device_set_fps = dummy_device_set_fps,
   .device_set_option = dummy_device_set_option,
diff --git a/device/dummy/dummy.h b/device/dummy/dummy.h
index bd51f9d..d344d12 100644
--- a/device/dummy/dummy.h
+++ b/device/dummy/dummy.h
@@ -23,7 +23,6 @@ typedef struct buffer_dummy_s {
 
 int dummy_device_open(device_t *dev);
 void dummy_device_close(device_t *dev);
-int dummy_device_set_decoder_start(device_t *dev, bool do_on);
 int dummy_device_video_force_key(device_t *dev);
 int dummy_device_set_fps(device_t *dev, int desired_fps);
 int dummy_device_set_option(device_t *dev, const char *key, const char *value);
diff --git a/device/v4l2/device.c b/device/v4l2/device.c
index 423afe8..7f2f7bd 100644
--- a/device/v4l2/device.c
+++ b/device/v4l2/device.c
@@ -49,21 +49,6 @@ void v4l2_device_close(device_t *dev)
   dev->v4l2 = NULL;
 }
 
-int v4l2_device_set_decoder_start(device_t *dev, bool do_on)
-{
-  struct v4l2_decoder_cmd cmd = {0};
-
-  cmd.cmd = do_on ? V4L2_DEC_CMD_START : V4L2_DEC_CMD_STOP;
-
-  LOG_DEBUG(dev, "Setting decoder state %s...", do_on ? "Start" : "Stop");
-  ERR_IOCTL(dev, dev->v4l2->dev_fd, VIDIOC_DECODER_CMD, &cmd, "Cannot set decoder state");
-
-  return 0;
-
-error:
-  return -1;
-}
-
 int v4l2_device_video_force_key(device_t *dev)
 {
   struct v4l2_control ctl = {0};
diff --git a/device/v4l2/v4l2.c b/device/v4l2/v4l2.c
index 88012e1..e918db1 100644
--- a/device/v4l2/v4l2.c
+++ b/device/v4l2/v4l2.c
@@ -4,7 +4,6 @@
 device_hw_t v4l2_device_hw = {
   .device_open = v4l2_device_open,
   .device_close = v4l2_device_close,
-  .device_set_decoder_start = v4l2_device_set_decoder_start,
   .device_video_force_key = v4l2_device_video_force_key,
   .device_dump_options = v4l2_device_dump_options,
   .device_set_fps = v4l2_device_set_fps,
diff --git a/device/v4l2/v4l2.h b/device/v4l2/v4l2.h
index 80bb39b..c71d5be 100644
--- a/device/v4l2/v4l2.h
+++ b/device/v4l2/v4l2.h
@@ -36,7 +36,6 @@ typedef struct buffer_v4l2_s {
 
 int v4l2_device_open(device_t *dev);
 void v4l2_device_close(device_t *dev);
-int v4l2_device_set_decoder_start(device_t *dev, bool do_on);
 int v4l2_device_video_force_key(device_t *dev);
 void v4l2_device_dump_options(device_t *dev, FILE *stream);
 int v4l2_device_set_fps(device_t *dev, int desired_fps);