diff mbox series

[FFmpeg-devel,1/6,v2] avdevice/alldevices: stop using deprecated linked list API

Message ID 20201014141900.2946-1-jamrial@gmail.com
State New
Headers show
Series [FFmpeg-devel,1/6,v2] avdevice/alldevices: stop using deprecated linked list API
Related show

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished

Commit Message

James Almer Oct. 14, 2020, 2:19 p.m. UTC
Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavdevice/alldevices.c | 72 ++++++++++++++++++++++++++++++++++++++++
 libavdevice/avdevice.c   | 46 -------------------------
 2 files changed, 72 insertions(+), 46 deletions(-)

Comments

Anton Khirnov Oct. 19, 2020, 2:51 p.m. UTC | #1
Quoting James Almer (2020-10-14 16:19:00)
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  libavdevice/alldevices.c | 72 ++++++++++++++++++++++++++++++++++++++++
>  libavdevice/avdevice.c   | 46 -------------------------
>  2 files changed, 72 insertions(+), 46 deletions(-)

Looks ok
diff mbox series

Patch

diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c
index a6f68dd3bb..c3e5190e6f 100644
--- a/libavdevice/alldevices.c
+++ b/libavdevice/alldevices.c
@@ -67,3 +67,75 @@  void avdevice_register_all(void)
 {
     avpriv_register_devices(outdev_list, indev_list);
 }
+
+static void *next_input(AVInputFormat *prev, AVClassCategory c2)
+{
+    const AVClass *pc;
+    const AVClassCategory c1 = AV_CLASS_CATEGORY_DEVICE_INPUT;
+    AVClassCategory category = AV_CLASS_CATEGORY_NA;
+    const AVInputFormat *fmt = NULL;
+    int i = 0;
+
+    while (prev && (fmt = indev_list[i])) {
+        i++;
+        if (prev == fmt)
+            break;
+    }
+
+    do {
+        fmt = indev_list[i++];
+        if (!fmt)
+            break;
+        pc = fmt->priv_class;
+        if (!pc)
+            continue;
+        category = pc->category;
+    } while (category != c1 && category != c2);
+    return (AVInputFormat *)fmt;
+}
+
+static void *next_output(AVOutputFormat *prev, AVClassCategory c2)
+{
+    const AVClass *pc;
+    const AVClassCategory c1 = AV_CLASS_CATEGORY_DEVICE_OUTPUT;
+    AVClassCategory category = AV_CLASS_CATEGORY_NA;
+    const AVOutputFormat *fmt = NULL;
+    int i = 0;
+
+    while (prev && (fmt = outdev_list[i])) {
+        i++;
+        if (prev == fmt)
+            break;
+    }
+
+    do {
+        fmt = outdev_list[i++];
+        if (!fmt)
+            break;
+        pc = fmt->priv_class;
+        if (!pc)
+            continue;
+        category = pc->category;
+    } while (category != c1 && category != c2);
+    return (AVOutputFormat *)fmt;
+}
+
+AVInputFormat *av_input_audio_device_next(AVInputFormat  *d)
+{
+    return next_input(d, AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT);
+}
+
+AVInputFormat *av_input_video_device_next(AVInputFormat  *d)
+{
+    return next_input(d, AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT);
+}
+
+AVOutputFormat *av_output_audio_device_next(AVOutputFormat *d)
+{
+    return next_output(d, AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT);
+}
+
+AVOutputFormat *av_output_video_device_next(AVOutputFormat *d)
+{
+    return next_output(d, AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT);
+}
diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c
index 3d03d89f04..ec84d3b990 100644
--- a/libavdevice/avdevice.c
+++ b/libavdevice/avdevice.c
@@ -78,52 +78,6 @@  const char * avdevice_license(void)
     return &LICENSE_PREFIX FFMPEG_LICENSE[sizeof(LICENSE_PREFIX) - 1];
 }
 
-static void *device_next(void *prev, int output,
-                         AVClassCategory c1, AVClassCategory c2)
-{
-    const AVClass *pc;
-    AVClassCategory category = AV_CLASS_CATEGORY_NA;
-    do {
-        if (output) {
-            if (!(prev = av_oformat_next(prev)))
-                break;
-            pc = ((AVOutputFormat *)prev)->priv_class;
-        } else {
-            if (!(prev = av_iformat_next(prev)))
-                break;
-            pc = ((AVInputFormat *)prev)->priv_class;
-        }
-        if (!pc)
-            continue;
-        category = pc->category;
-    } while (category != c1 && category != c2);
-    return prev;
-}
-
-AVInputFormat *av_input_audio_device_next(AVInputFormat  *d)
-{
-    return device_next(d, 0, AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT,
-                       AV_CLASS_CATEGORY_DEVICE_INPUT);
-}
-
-AVInputFormat *av_input_video_device_next(AVInputFormat  *d)
-{
-    return device_next(d, 0, AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT,
-                       AV_CLASS_CATEGORY_DEVICE_INPUT);
-}
-
-AVOutputFormat *av_output_audio_device_next(AVOutputFormat *d)
-{
-    return device_next(d, 1, AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT,
-                       AV_CLASS_CATEGORY_DEVICE_OUTPUT);
-}
-
-AVOutputFormat *av_output_video_device_next(AVOutputFormat *d)
-{
-    return device_next(d, 1, AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT,
-                       AV_CLASS_CATEGORY_DEVICE_OUTPUT);
-}
-
 int avdevice_app_to_dev_control_message(struct AVFormatContext *s, enum AVAppToDevMessageType type,
                                         void *data, size_t data_size)
 {