From patchwork Wed Jan 3 00:43:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Dekker X-Patchwork-Id: 7094 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp15301838jad; Tue, 2 Jan 2018 16:43:31 -0800 (PST) X-Google-Smtp-Source: ACJfBot72IhqbDZWBbN7rRDGAVPTGe3Kfxky9hBS3MysluO8gx4GeofDHTsIIYi3sskVj+BBid1w X-Received: by 10.28.63.14 with SMTP id m14mr34913wma.116.1514940211083; Tue, 02 Jan 2018 16:43:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514940211; cv=none; d=google.com; s=arc-20160816; b=tsyEfUNEsCPozSSItnnFmbZkgnYXAkpr9122I/pXPZXYAByc+2QZFDavEbZ5zTrift W82U496nVxQ1nlyRiNsxOiiWP2yXZZcdUTo04MBjZloxZ022Dp89jKo5LypugXBTY3hX Hihl4F+dv2tJnQ0STiuUlOFyte09mayyd3yM5WgMmW+mIdg7alauSnCk+81OpgqcF1Se AnzR9LmyeN9lo4D2fXoD66GWhmKOS9MZxX0+DS0EsivknSWu5db5+834dPDxHywcF2a7 GqQWnpemn7o0E8zjascNp5PMSIqEdI0AsCCzywunrI3XJs0cx7euuzJonJgFV4Gowf8S Qyyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:to:from:date :dkim-signature:dkim-signature:delivered-to :arc-authentication-results; bh=LiynJ4pTgfKC//Awvs7JtGs38Tavw65dnXpDVwW1pGE=; b=c07K1KEKFKkqp3Qy4gEZdUiKMRciRMa7OLYI1CTzLsMTWFBnD9tgTudE8UhBiWWDaP 17HbrMaKKTHh3XLJ+APGY3tdAx/7Tpc3sm8h6LdVPHqDUzcOZD3Pu19UYnw29kXii57A fi4f5uFm4v9g4IVKm0YzheNa713A3AYjANOUvQljIOGoxKs9rRlvRUYuzlHMMU/A3ybS feyIMmWVgVw8C14uYmmsKoj2F7fHB81euVoSxNsxmfFHAzOodCawPMHZIZTNqOjggqCh Ju85GSbsw0yfeVBbtkZzMkTZrcwxaDEuN60AaiTUtkBEBbZ+HRn3r1LXlhTaa/ppk9tG T+uQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=mesmtp header.b=blidrQyo; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=djMPJlOW; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o62si17822042wrc.389.2018.01.02.16.43.30; Tue, 02 Jan 2018 16:43:31 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=mesmtp header.b=blidrQyo; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=djMPJlOW; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 44948688341; Wed, 3 Jan 2018 02:42:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2BF74680A6A for ; Wed, 3 Jan 2018 02:42:52 +0200 (EET) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id A5F2020CB2 for ; Tue, 2 Jan 2018 19:43:07 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute4.internal (MEProxy); Tue, 02 Jan 2018 19:43:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= mesmtp; bh=8AKAKxvi/Tm6TSGxefZzuGGXcj6lcH3xNtmEHzhUQ30=; b=blidr QyoVmda3RiwmFDVtVa1nteMYZjonNXNxQXs3e42G3H5FbyoWzkJWekDOCyJuzUmN kZoxqiQN86+iW6SZ9KmQ0q550N1hXtp890ZvJQq54y6b97Bt2CzMKxvRZgCfkgbc gFb9SzmCCbTelRXHCYns5vIcMfQjrWj79feAac= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=8AKAKxvi/Tm6TSGxefZzuGGXcj6lc H3xNtmEHzhUQ30=; b=djMPJlOW4xx2CeeUyrcemKTki+kaTCteHwGeKWKf+C5r8 1JhojigoQZL46TQIrnzhnogbr2uGigdBas+vXoJXzXTEUUYKFmiBNmCtEQpx1LI5 fQLLwObdvUvdrmZOsj1EbyMG3cEA8G7ehLYFxTvcTK90F7SlnX2MGsAXiwvFpXuK +uR2ZThCgaWRigSyi/RfY3UB/JJ5STgtOMRxOKPbAsENxplBbsWsiqN5zYWGpkfk lesd2cBmf7zMZxKyw9JEVwjxdoLiykwWGCn3Lku/t8iyyt4p8mKdvzYeIx9kRYJB 4ret5PS7jD0RUX7a9eBJaLrkCI4i7ajF7l7DOmpng== X-ME-Sender: Received: from DESKTOP-AFAL1BE (cpc75394-sotn16-2-0-cust168.15-1.cable.virginm.net [82.22.8.169]) by mail.messagingengine.com (Postfix) with ESMTPA id 2076A7E300 for ; Tue, 2 Jan 2018 19:43:07 -0500 (EST) Date: Wed, 3 Jan 2018 00:43:06 +0000 From: Josh de Kock To: ffmpeg-devel@ffmpeg.org Message-Id: <20180103004306.ea1d9e88da02019a788141d6@itanimul.li> X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.23; i686-pc-mingw32) Mime-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/6] lavd: add new API for iterating input and output devices X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- configure | 27 ++++++-- libavdevice/alldevices.c | 172 +++++++++++++++++++++++++++++++++++------------ libavdevice/avdevice.c | 46 ------------- libavdevice/avdevice.h | 28 ++++++++ libavdevice/version.h | 4 ++ 5 files changed, 184 insertions(+), 93 deletions(-) diff --git a/configure b/configure index 7b46e5c..79eb95a 100755 --- a/configure +++ b/configure @@ -569,6 +569,12 @@ add_suffix(){ for v; do echo ${v}${suffix}; done } +remove_suffix(){ + suffix=$1 + shift + for v; do echo ${v%$suffix}; done +} + set_all(){ value=$1 shift @@ -3525,17 +3531,18 @@ find_things(){ sed -n "s/^[^#]*$pattern.*([^,]*, *\([^,]*\)\(,.*\)*).*/\1_$thing/p" "$file" } -OUTDEV_LIST=$(find_things outdev OUTDEV libavdevice/alldevices.c) -INDEV_LIST=$(find_things indev _IN libavdevice/alldevices.c) FILTER_LIST=$(find_things filter FILTER libavfilter/allfilters.c) find_things_extern(){ thing=$1 pattern=$2 file=$source_path/$3 - sed -n "s/^[^#]*extern.*$pattern *ff_\([^ ]*\)_$thing;/\1_$thing/p" "$file" + out=${4:-$thing} + sed -n "s/^[^#]*extern.*$pattern *ff_\([^ ]*\)_$thing;/\1_$out/p" "$file" } +OUTDEV_LIST=$(find_things_extern muxer AVOutputFormat libavdevice/alldevices.c outdev) +INDEV_LIST=$(find_things_extern demuxer AVInputFormat libavdevice/alldevices.c indev) MUXER_LIST=$(find_things_extern muxer AVOutputFormat libavformat/allformats.c) DEMUXER_LIST=$(find_things_extern demuxer AVInputFormat libavformat/allformats.c) ENCODER_LIST=$(find_things_extern encoder AVCodec libavcodec/allcodecs.c) @@ -7032,7 +7039,17 @@ print_enabled_components(){ shift 3 echo "static const $struct_name * const $name[] = {" > $TMPH for c in $*; do - enabled $c && printf " &ff_%s,\n" $c >> $TMPH + if enabled $c; then + case $name in + indev_list) + c=$(add_suffix _demuxer $(remove_suffix _indev $c)) + ;; + outdev_list) + c=$(add_suffix _muxer $(remove_suffix _outdev $c)) + ;; + esac + printf " &ff_%s,\n" $c >> $TMPH + fi done echo " NULL };" >> $TMPH cp_if_changed $TMPH $file @@ -7041,6 +7058,8 @@ print_enabled_components(){ print_enabled_components libavcodec/codec_list.c AVCodec codec_list $CODEC_LIST print_enabled_components libavcodec/parser_list.c AVCodecParser parser_list $PARSER_LIST print_enabled_components libavcodec/bsf_list.c AVBitStreamFilter bitstream_filters $BSF_LIST +print_enabled_components libavdevice/indev_list.c AVInputFormat indev_list $INDEV_LIST +print_enabled_components libavdevice/outdev_list.c AVOutputFormat outdev_list $OUTDEV_LIST print_enabled_components libavformat/demuxer_list.c AVInputFormat demuxer_list $DEMUXER_LIST print_enabled_components libavformat/muxer_list.c AVOutputFormat muxer_list $MUXER_LIST print_enabled_components libavformat/protocol_list.c URLProtocol url_protocols $PROTOCOL_LIST diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c index b767b6a..6b2a512 100644 --- a/libavdevice/alldevices.c +++ b/libavdevice/alldevices.c @@ -22,57 +22,143 @@ #include "libavutil/thread.h" #include "avdevice.h" -#define REGISTER_OUTDEV(X, x) \ - { \ - extern AVOutputFormat ff_##x##_muxer; \ - if (CONFIG_##X##_OUTDEV) \ - av_register_output_format(&ff_##x##_muxer); \ +/* devices */ +extern AVInputFormat ff_alsa_demuxer; +extern AVOutputFormat ff_alsa_muxer; +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; + +/* external libraries */ +extern AVInputFormat ff_libcdio_demuxer; +extern AVInputFormat ff_libdc1394_demuxer; + +#include "outdev_list.c" +#include "indev_list.c" + +const AVOutputFormat *av_outdev_iterate(void **opaque) +{ + uintptr_t i = (uintptr_t)*opaque; + const AVOutputFormat *f = outdev_list[i]; + if (f) + *opaque = (void*)(i + 1); + return f; +} + +const AVInputFormat *av_indev_iterate(void **opaque) +{ + uintptr_t i = (uintptr_t)*opaque; + const AVInputFormat *f = indev_list[i]; + + if (f) + *opaque = (void*)(i + 1); + return f; +} + +#if FF_API_NEXT +static pthread_once_t av_device_next_init = PTHREAD_ONCE_INIT; + +static void av_device_init_next(void) +{ + AVOutputFormat *prevout = NULL, *out; + AVInputFormat *previn = NULL, *in; + void *i = 0; + while ((out = (AVOutputFormat*)av_outdev_iterate(&i))) { + if (prevout) + prevout->next = out; + prevout = out; } + if (prevout) + prevout->next = NULL; -#define REGISTER_INDEV(X, x) \ - { \ - extern AVInputFormat ff_##x##_demuxer; \ - if (CONFIG_##X##_INDEV) \ - av_register_input_format(&ff_##x##_demuxer); \ + i = 0; + while ((in = (AVInputFormat*)av_indev_iterate(&i))) { + if (previn) + previn->next = in; + previn = in; } + if (previn) + previn->next = NULL; +} -#define REGISTER_INOUTDEV(X, x) REGISTER_OUTDEV(X, x); REGISTER_INDEV(X, x) +void avdevice_register_all(void) +{ + pthread_once(&av_device_next_init, av_device_init_next); +} -static void register_all(void) +static void *device_next(void *prev, int output, + AVClassCategory c1, AVClassCategory c2) { - /* devices */ - REGISTER_INOUTDEV(ALSA, alsa); - REGISTER_INDEV (AVFOUNDATION, avfoundation); - REGISTER_INDEV (BKTR, bktr); - REGISTER_OUTDEV (CACA, caca); - REGISTER_INOUTDEV(DECKLINK, decklink); - REGISTER_INOUTDEV(LIBNDI_NEWTEK, libndi_newtek); - REGISTER_INDEV (DSHOW, dshow); - REGISTER_INOUTDEV(FBDEV, fbdev); - REGISTER_INDEV (GDIGRAB, gdigrab); - REGISTER_INDEV (IEC61883, iec61883); - REGISTER_INDEV (JACK, jack); - REGISTER_INDEV (KMSGRAB, kmsgrab); - REGISTER_INDEV (LAVFI, lavfi); - REGISTER_INDEV (OPENAL, openal); - REGISTER_OUTDEV (OPENGL, opengl); - REGISTER_INOUTDEV(OSS, oss); - REGISTER_INOUTDEV(PULSE, pulse); - REGISTER_OUTDEV (SDL2, sdl2); - REGISTER_INOUTDEV(SNDIO, sndio); - REGISTER_INOUTDEV(V4L2, v4l2); - REGISTER_INDEV (VFWCAP, vfwcap); - REGISTER_INDEV (XCBGRAB, xcbgrab); - REGISTER_OUTDEV (XV, xv); - - /* external libraries */ - REGISTER_INDEV (LIBCDIO, libcdio); - REGISTER_INDEV (LIBDC1394, libdc1394); + pthread_once(&av_device_next_init, av_device_init_next); + const AVClass *pc; + AVClassCategory category = AV_CLASS_CATEGORY_NA; + if (!prev && !(prev = (output ? (void*)outdev_list[0] : (void*)indev_list[0]))) + return NULL; + + do { + if (output) { + if (!(prev = ((AVOutputFormat *)prev)->next)) + break; + pc = ((AVOutputFormat *)prev)->priv_class; + } else { + if (!(prev = ((AVInputFormat *)prev)->next)) + break; + pc = ((AVInputFormat *)prev)->priv_class; + } + if (!pc) + continue; + category = pc->category; + } while (category != c1 && category != c2); + return prev; } -void avdevice_register_all(void) +AVInputFormat *av_input_audio_device_next(AVInputFormat *d) { - static AVOnce control = AV_ONCE_INIT; + return device_next(d, 0, AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT, + AV_CLASS_CATEGORY_DEVICE_INPUT); +} - ff_thread_once(&control, register_all); +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); } +#endif diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c index 72e1b67..a42d349 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) { diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h index ee94624..dd6ad93 100644 --- a/libavdevice/avdevice.h +++ b/libavdevice/avdevice.h @@ -66,6 +66,29 @@ const char *avdevice_configuration(void); const char *avdevice_license(void); /** + * Iterate over all registered output devices. + * + * @param opaque a pointer where libavdevice will store the iteration state. Must + * point to NULL to start the iteration. + * + * @return the next registered output device or NULL when the iteration is + * finished + */ +const AVOutputFormat *av_outdev_iterate(void **opaque); + +/** + * Iterate over all registered input devices. + * + * @param opaque a pointer where libavdevice will store the iteration state. Must + * point to NULL to start the iteration. + * + * @return the next registered input device or NULL when the iteration is + * finished + */ +const AVInputFormat *av_indev_iterate(void **opaque); + +#if FF_API_NEXT +/** * Initialize libavdevice and register all the input and output devices. */ void avdevice_register_all(void); @@ -77,6 +100,7 @@ void avdevice_register_all(void); * if d is non-NULL, returns the next registered input audio/video device after d * or NULL if d is the last one. */ +attribute_deprecated AVInputFormat *av_input_audio_device_next(AVInputFormat *d); /** @@ -86,6 +110,7 @@ AVInputFormat *av_input_audio_device_next(AVInputFormat *d); * if d is non-NULL, returns the next registered input audio/video device after d * or NULL if d is the last one. */ +attribute_deprecated AVInputFormat *av_input_video_device_next(AVInputFormat *d); /** @@ -95,6 +120,7 @@ AVInputFormat *av_input_video_device_next(AVInputFormat *d); * if d is non-NULL, returns the next registered output audio/video device after d * or NULL if d is the last one. */ +attribute_deprecated AVOutputFormat *av_output_audio_device_next(AVOutputFormat *d); /** @@ -104,7 +130,9 @@ AVOutputFormat *av_output_audio_device_next(AVOutputFormat *d); * if d is non-NULL, returns the next registered output audio/video device after d * or NULL if d is the last one. */ +attribute_deprecated AVOutputFormat *av_output_video_device_next(AVOutputFormat *d); +#endif typedef struct AVDeviceRect { int x; /**< x coordinate of top left corner */ diff --git a/libavdevice/version.h b/libavdevice/version.h index 364404d..5a3246f 100644 --- a/libavdevice/version.h +++ b/libavdevice/version.h @@ -47,4 +47,8 @@ * the public API and may change, break or disappear at any time. */ +#ifndef FF_API_NEXT +#define FF_API_NEXT (LIBAVDEVICE_VERSION_MAJOR < 59) +#endif + #endif /* AVDEVICE_VERSION_H */