From patchwork Wed Jan 3 00:43:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Dekker X-Patchwork-Id: 7092 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp15301951jad; Tue, 2 Jan 2018 16:43:40 -0800 (PST) X-Google-Smtp-Source: ACJfBoux3zzgMJN8p0ZpD2v+TMVK8WDLl7hbgJz81OJlNXKjeSce8fFImXaVLfv/4hGVkNa4ezqu X-Received: by 10.223.138.144 with SMTP id y16mr37326911wry.167.1514940220672; Tue, 02 Jan 2018 16:43:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514940220; cv=none; d=google.com; s=arc-20160816; b=PSdYHZfe0pUY8ZBT1FGQkxnMNWojPweJQdTPJXrZPNOjVfj9fJUtfzy9v/63yjn16N oHqhxdCPt4DA0Xvq5eBKMIFZc5fMYl+uflIsAcy2MNgmtKNwCLVIEev0GJsj6urD2W8J uQFbnGD949N8Lv5D631PUN3Q85ucIRACi6wjJuehKdorrzBkqW8/xtFS9sWJnMjSBJE4 FpecCgfLGA96TX1fV1IOmRzSc308zk691PcORCAzoo7u8cUb9Iv/Vv0oNwTku/w07Sqi dHgXRY/ZLUZhZ96yDj3HblIQxIqOtCLDAC9MqEfPyLnOE9YPZ+kOrE4CFM4Qc6UK+nzA JzQQ== 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=jsJ1sUDZ1+w9+lh1puZCR6EhUbVYQyzOyf/SPf3du04=; b=q31usHYSZ7KjX6yQZW+PXGUpsSRA9o0HVfusfIOkoz+drMw/748caxVX+AYPXhHDla 3XeZEObc11bbdyGvYDTiM1QSjWBFsigh0hr0ym7nK4MD9h6cBdCdGUoADemyz6bl7TFh 0uEEQa4A8iD48YKTFz/munR2oTIbqFxZFgzxCiACAwoEemi5rxDN1AFb9Is5qv8a21eB GhhhVc0RCea9/5S9lEyEmyR0///yXfcWP9FDZl/QDbtvMYlGQ6MnrGNXbqptQJhRxhit DbtVMylz6zMJohg+84HsBiWvSjcJYxuZrmaMG3ZrreedEP/xihvZq8FBPOT3xmIHFP6T PLZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=mesmtp header.b=CiRmEaJO; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=W+OSb0Ah; 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 q204si36621wmb.146.2018.01.02.16.43.40; Tue, 02 Jan 2018 16:43:40 -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=CiRmEaJO; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=W+OSb0Ah; 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 A3C8C688357; Wed, 3 Jan 2018 02:43:00 +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 E050F68835E for ; Wed, 3 Jan 2018 02:42:58 +0200 (EET) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 5D9CE20CA3 for ; Tue, 2 Jan 2018 19:43:14 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute4.internal (MEProxy); Tue, 02 Jan 2018 19:43:14 -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=Bmk9vhuPjon+JFg0daLK7lZ0KAFXyKjT/OP/DzY4GSE=; b=CiRmE aJOhH8EhA/1QpI8jLg1dO6JDhL9Fr2B5JhPWoT6XajcMnn7PHwB8VUYGtH3uQEaX ojaIjS41V2Ol1IH+nlqVlVFaR95Fc9OL34yRSCgbnSkofbkG0LUq4mvyLeUM6Kby ulZGPQC8fslORl1L6g6NOfWdMIlIYkC39dP568= 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=Bmk9vhuPjon+JFg0daLK7lZ0KAFXy KjT/OP/DzY4GSE=; b=W+OSb0Ah3MMYboHUAHVfrZJ1ybI5XS4ToopdFcs8WKk8x UMfeNFcCG8xAartsHLwsQhQ6oO8KGl1NW525Owhg3yntK9o15Q374BSQ2r2NxgUJ CbG5zJwoNk3Ui0RQhYI7iMOjSHYVIpBbUq5g2ZP5Owo4/L/WTVfLtiQNtSNZX0mb DTmTW7z3JywXJzA18aWszNuAsVR2IgVnmthYNODJgFtDKoYm75wHRrGxeWWPfVgw BA+pHwqEE02LQU3l+c8L664/ORKQ39xmFxE4Esl9aSJWr0dFbyf8xd9lQ3qB8igR OWqYuHVKamZ02ynjUdD3Pryl2vWkI9WNwjAlauNWg== 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 D5AA07E17D for ; Tue, 2 Jan 2018 19:43:13 -0500 (EST) Date: Wed, 3 Jan 2018 00:43:12 +0000 From: Josh de Kock To: ffmpeg-devel@ffmpeg.org Message-Id: <20180103004312.10ebcab171cb66235643a3e9@itanimul.li> X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.23; i686-pc-mingw32) Mime-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/6] lavf: add avpriv function to register 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" --- libavdevice/alldevices.c | 6 +++++- libavformat/allformats.c | 44 +++++++++++++++++++++++++++++++++++++++----- libavformat/avformat.h | 4 ++++ 3 files changed, 48 insertions(+), 6 deletions(-) diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c index 6b2a512..041eb85 100644 --- a/libavdevice/alldevices.c +++ b/libavdevice/alldevices.c @@ -105,6 +105,8 @@ static void av_device_init_next(void) } if (previn) previn->next = NULL; + + avpriv_register_devices(outdev_list, indev_list); } void avdevice_register_all(void) @@ -115,9 +117,11 @@ void avdevice_register_all(void) static void *device_next(void *prev, int output, AVClassCategory c1, AVClassCategory c2) { - pthread_once(&av_device_next_init, av_device_init_next); const AVClass *pc; AVClassCategory category = AV_CLASS_CATEGORY_NA; + + pthread_once(&av_device_next_init, av_device_init_next); + if (!prev && !(prev = (output ? (void*)outdev_list[0] : (void*)indev_list[0]))) return NULL; diff --git a/libavformat/allformats.c b/libavformat/allformats.c index fa72acd..52b7088 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -20,6 +20,7 @@ */ #include "libavutil/thread.h" +#include "libavdevice/avdevice.h" #include "avformat.h" #include "rtp.h" #include "rdt.h" @@ -482,6 +483,7 @@ const AVOutputFormat *av_muxer_iterate(void **opaque) { uintptr_t i = (uintptr_t)*opaque; const AVOutputFormat *f = muxer_list[i]; + if (f) *opaque = (void*)(i + 1); return f; @@ -499,45 +501,77 @@ const AVInputFormat *av_demuxer_iterate(void **opaque){ #if FF_API_NEXT pthread_once_t av_format_next_init = PTHREAD_ONCE_INIT; +static AVInputFormat **indev_list = NULL; +static AVOutputFormat **outdev_list = NULL; + static void av_format_init_next(void) { AVOutputFormat *prevout = NULL, *out; AVInputFormat *previn = NULL, *in; void *i = 0; - while ((out = (AVOutputFormat*)av_muxer_iterate(&i))) { + + for (i = 0; (out = (AVOutputFormat*)av_muxer_iterate(&i));) { if (prevout) prevout->next = out; prevout = out; } + + if (outdev_list) { + for (i = 0; (out = (AVOutputFormat*)outdev_list[(int)i]); i = (void*)(i + 1)) { + if (prevout) + prevout->next = out; + prevout = out; + } + } + if (prevout) prevout->next = NULL; - i = 0; - while ((in = (AVInputFormat*)av_demuxer_iterate(&i))) { + for (i = 0; (in = (AVInputFormat*)av_demuxer_iterate(&i));) { if (previn) previn->next = in; previn = in; } + + if (indev_list) { + for (i = 0; (in = (AVInputFormat*)indev_list[(int)i]); i = (void*)(i + 1)) { + if (previn) + previn->next = in; + previn = in; + } + } + if (previn) previn->next = NULL; } +void avpriv_register_devices(AVOutputFormat *o[], AVInputFormat *i[]) +{ + outdev_list = o; + indev_list = i; + av_format_init_next(); +} + AVInputFormat *av_iformat_next(const AVInputFormat *f) { + void *i = 0; pthread_once(&av_format_next_init, av_format_init_next); if (f) return f->next; else - return demuxer_list[0]; + /* If there are no demuxers but input devices, then return the first input device. + * This will still return null if both there are both no demuxers or input devices. */ + return demuxer_list[0] ? (AVInputFormat*)demuxer_list[0] : (AVInputFormat*)av_indev_iterate(&i); } AVOutputFormat *av_oformat_next(const AVOutputFormat *f) { + void *i = 0; pthread_once(&av_format_next_init, av_format_init_next); if (f) return f->next; else - return muxer_list[0]; + return muxer_list[0] ? (AVOutputFormat*)muxer_list[0] : (AVOutputFormat*)av_outdev_iterate(&i); } void av_register_all(void) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index d38ca4e..56ec41a 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -2014,6 +2014,10 @@ int avformat_network_deinit(void); #if FF_API_NEXT /** + * Register devices in deprecated format linked list. + */ +void avpriv_register_devices(AVOutputFormat *o[], AVInputFormat *i[]); +/** * If f is NULL, returns the first registered input format, * if f is non-NULL, returns the next registered input format after f * or NULL if f is the last one.