X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavdevice%2Falldevices.c;h=fbbe187a51514bab133046bd95fdc8b51c75b9c4;hb=0814610ee35614e417d6942784f7b299f2414a9b;hp=adde749ce1302b1d2311a15f1ab56e818718d1fa;hpb=bec3b2041dcc20ab4b06a6b31d09130e1a7166c3;p=ffmpeg

diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c
index adde749ce13..fbbe187a515 100644
--- a/libavdevice/alldevices.c
+++ b/libavdevice/alldevices.c
@@ -24,42 +24,41 @@
 #include "avdevice.h"
 
 /* devices */
-extern AVInputFormat  ff_alsa_demuxer;
-extern AVOutputFormat ff_alsa_muxer;
-extern AVInputFormat  ff_android_camera_demuxer;
-extern AVInputFormat  ff_avfoundation_demuxer;
-extern AVInputFormat  ff_bktr_demuxer;
-extern AVOutputFormat ff_caca_muxer;
-extern AVInputFormat  ff_decklink_demuxer;
-extern AVOutputFormat ff_decklink_muxer;
-extern AVInputFormat  ff_libndi_newtek_demuxer;
-extern AVOutputFormat ff_libndi_newtek_muxer;
-extern AVInputFormat  ff_dshow_demuxer;
-extern AVInputFormat  ff_fbdev_demuxer;
-extern AVOutputFormat ff_fbdev_muxer;
-extern AVInputFormat  ff_gdigrab_demuxer;
-extern AVInputFormat  ff_iec61883_demuxer;
-extern AVInputFormat  ff_jack_demuxer;
-extern AVInputFormat  ff_kmsgrab_demuxer;
-extern AVInputFormat  ff_lavfi_demuxer;
-extern AVInputFormat  ff_openal_demuxer;
-extern AVOutputFormat ff_opengl_muxer;
-extern AVInputFormat  ff_oss_demuxer;
-extern AVOutputFormat ff_oss_muxer;
-extern AVInputFormat  ff_pulse_demuxer;
-extern AVOutputFormat ff_pulse_muxer;
-extern AVOutputFormat ff_sdl2_muxer;
-extern AVInputFormat  ff_sndio_demuxer;
-extern AVOutputFormat ff_sndio_muxer;
-extern AVInputFormat  ff_v4l2_demuxer;
-extern AVOutputFormat ff_v4l2_muxer;
-extern AVInputFormat  ff_vfwcap_demuxer;
-extern AVInputFormat  ff_xcbgrab_demuxer;
-extern AVOutputFormat ff_xv_muxer;
+extern const AVInputFormat  ff_alsa_demuxer;
+extern const AVOutputFormat ff_alsa_muxer;
+extern const AVInputFormat  ff_android_camera_demuxer;
+extern const AVOutputFormat ff_audiotoolbox_muxer;
+extern const AVInputFormat  ff_avfoundation_demuxer;
+extern const AVInputFormat  ff_bktr_demuxer;
+extern const AVOutputFormat ff_caca_muxer;
+extern const AVInputFormat  ff_decklink_demuxer;
+extern const AVOutputFormat ff_decklink_muxer;
+extern const AVInputFormat  ff_dshow_demuxer;
+extern const AVInputFormat  ff_fbdev_demuxer;
+extern const AVOutputFormat ff_fbdev_muxer;
+extern const AVInputFormat  ff_gdigrab_demuxer;
+extern const AVInputFormat  ff_iec61883_demuxer;
+extern const AVInputFormat  ff_jack_demuxer;
+extern const AVInputFormat  ff_kmsgrab_demuxer;
+extern const AVInputFormat  ff_lavfi_demuxer;
+extern const AVInputFormat  ff_openal_demuxer;
+extern const AVOutputFormat ff_opengl_muxer;
+extern const AVInputFormat  ff_oss_demuxer;
+extern const AVOutputFormat ff_oss_muxer;
+extern const AVInputFormat  ff_pulse_demuxer;
+extern const AVOutputFormat ff_pulse_muxer;
+extern const AVOutputFormat ff_sdl2_muxer;
+extern const AVInputFormat  ff_sndio_demuxer;
+extern const AVOutputFormat ff_sndio_muxer;
+extern const AVInputFormat  ff_v4l2_demuxer;
+extern const AVOutputFormat ff_v4l2_muxer;
+extern const AVInputFormat  ff_vfwcap_demuxer;
+extern const AVInputFormat  ff_xcbgrab_demuxer;
+extern const AVOutputFormat ff_xv_muxer;
 
 /* external libraries */
-extern AVInputFormat  ff_libcdio_demuxer;
-extern AVInputFormat  ff_libdc1394_demuxer;
+extern const AVInputFormat  ff_libcdio_demuxer;
+extern const AVInputFormat  ff_libdc1394_demuxer;
 
 #include "libavdevice/outdev_list.c"
 #include "libavdevice/indev_list.c"
@@ -68,3 +67,75 @@ void avdevice_register_all(void)
 {
     avpriv_register_devices(outdev_list, indev_list);
 }
+
+static const void *next_input(const 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 fmt;
+}
+
+static const void *next_output(const 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 fmt;
+}
+
+const AVInputFormat *av_input_audio_device_next(const AVInputFormat  *d)
+{
+    return next_input(d, AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT);
+}
+
+const AVInputFormat *av_input_video_device_next(const AVInputFormat  *d)
+{
+    return next_input(d, AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT);
+}
+
+const AVOutputFormat *av_output_audio_device_next(const AVOutputFormat *d)
+{
+    return next_output(d, AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT);
+}
+
+const AVOutputFormat *av_output_video_device_next(const AVOutputFormat *d)
+{
+    return next_output(d, AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT);
+}