From patchwork Tue Jul 6 09:20:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Diederick C. Niehorster" X-Patchwork-Id: 28829 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bbc9:0:0:0:0:0 with SMTP id c9csp4367383ybk; Tue, 6 Jul 2021 02:24:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyw0MThlDUHL1aVAWtuKBPSJj34VRi5JmjRF/4RexU0fNRL6vFlFRmxgu3yq6bvxaVum7Xy X-Received: by 2002:aa7:c34a:: with SMTP id j10mr13488800edr.86.1625563490260; Tue, 06 Jul 2021 02:24:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625563490; cv=none; d=google.com; s=arc-20160816; b=EEMME06nq63GrI/vyn123S0xHN7NzY42TnbM1au8l7OHVbgB6W7kbhxgakOlIlndD0 v8iE2ooW1NDkFIZAPTitQ85pflCVoGt/h7CNafcTt+oTHKjW6cebe7ThehCpHhEZK8tL Vzuj5UvjGdWM9mSGdPlUbJeHEuhoqwyUxGWtxFH9FSieBqWZoziEPmDl9i1FiQILqk9s mvjDJ0g/T+mf1ZO7fev9Ce8wZEgilLwJrr7YPxijkSk+rsO2LGYV31eaRLHExbBtq0MF Lqpvvt3pm13+BiKKJR5LNaaW6NAshd9Up4+nuJHOG0Z1csaCaP4URYh7tXnW4fILBIrH g38Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=F9HADFYZWhrj2Z6QWWBppRzfuaFM4WqDwDpovowPpUc=; b=00qxhC6TwGvHfamsHzotzEfVbtYrStx0tL/Xf/uSIHBtqRKV3gs28S9cQ9m5TrbYKp 7mUzOCHGegNPuU9o3gYBSD6U3QIclDZSmFnwlRBjN8c4om79r3GAuigbNTN3jrA5jejw kLpRrsJPMBEgTx3IFkiKwa6cXQxTuli/tvrj6DOXjI39VucDzO5dgyg0NAmYOOWqFuvF RTLeZqr1TX9CLc5puipuqv/ivvKS5+rQGCsJKKe8exdPqUzclFPLH6jzel5rDMRBRDGb SNp8qJVai5PsbyCBzJftDh/T0plm8S7D+V6MvLQw/ZZXMqMugeG6ENMWpS/DQNwYXbOZ 4Czw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Q1gtQEUa; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id eb13si16439640edb.290.2021.07.06.02.24.49; Tue, 06 Jul 2021 02:24:50 -0700 (PDT) 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=@gmail.com header.s=20161025 header.b=Q1gtQEUa; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3C96668A790; Tue, 6 Jul 2021 12:24:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF8C368A790 for ; Tue, 6 Jul 2021 12:24:34 +0300 (EEST) Received: by mail-lf1-f51.google.com with SMTP id p16so9709303lfc.5 for ; Tue, 06 Jul 2021 02:24:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=F1Vb9QwOkJ+5k9zCsQgnCQMrhQQDeZuGL8C0Il6DaVg=; b=Q1gtQEUa0zFGeLyt+lx/mIbyWyIN/6ZXlD1RBDlg1GgLfklRu9PM74jVCVQc66Dfci jdsjo3AqTpz2KJO6WEviYDRR6xH86osk5WYLRtoq1BFGR1gn1nmagGACIjAouxV8tbVZ L5KOOOuUiTgLWebV74iYMntMYqkkq49kwh/34Lkoouwp2RtYIB+o0AQE2xObkz3/UovN aao4SgR+dlzThuH4WR0zZLImTMEhcGfSQ8ZF0LxUlegD8hSwadfdYEM3olZYU5sTxmrh IQiVzBxSz08dcXFmt1fzg6+SCAFVrbjrvuMSfYyanJhhg5kZcvPBxFMx5mNMeP5l+KOP sqLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=F1Vb9QwOkJ+5k9zCsQgnCQMrhQQDeZuGL8C0Il6DaVg=; b=rG+VwGcxy/kVTV4cpweG0F9kuUeXTvrljpPpPL0Ia2btUX2+LmLv6uMuFul75KlHoe OZlTPTW7fC3U25FXDhpfLgErHkRs/MfTf11RlraWFfkUjx6JHz6VXNGbZvWq9G9DAAdy /sVI6ozQfnP/0aLVISSeqmKnyWqMPDNj3B0jt7Ih1zloMkzngGx4w5jRpaQRHHXg0Egj 6xbzzNHqgKl+2WXwwnGmvGApmnSXlyNPmhdqwj5nNznEh2UWNs/pvI6F3ZLOCuEV8D2G iCJj+j6vgS2e5ROyuL7+k5R5ziDAIB1Sv7ji1OSzKQjgj/o5YvwPaSj5RED6Ktfz3PLF 0rAw== X-Gm-Message-State: AOAM532p7FIXoP5OEqRBXTcOycdVDeaI6FFwnGAgBShBOaolhFIcozZm tZ2GgDlNGVsiclzEhNDaMHVS6h6d+ws= X-Received: by 2002:ac2:5192:: with SMTP id u18mr2350367lfi.248.1625563473072; Tue, 06 Jul 2021 02:24:33 -0700 (PDT) Received: from localhost.localdomain (deedock.humlab.lu.se. [130.235.135.183]) by smtp.gmail.com with ESMTPSA id u9sm1061673lfm.127.2021.07.06.02.24.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 02:24:32 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Jul 2021 11:20:05 +0200 Message-Id: <20210706092020.1057-20-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20210706092020.1057-1-dcnieho@gmail.com> References: <20210706092020.1057-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 19/34] avdevice/avdevice: Revert "Deprecate AVDevice Capabilities API" X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Diederick Niehorster Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8coffiKRReW5 Content-Length: 7464 This reverts commit 4f49ca7bbc75a9db4cdf93f27f95a668c751f160. The next few patches clean up the API and implement this capability for avdevice/dshow. Signed-off-by: Diederick Niehorster --- libavdevice/avdevice.c | 71 ++++++++++++++++++++++++++++++++++++++---- libavdevice/avdevice.h | 5 --- libavformat/avformat.h | 21 +++++++++++++ 3 files changed, 86 insertions(+), 11 deletions(-) diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c index e339cebf2d..695b9143af 100644 --- a/libavdevice/avdevice.c +++ b/libavdevice/avdevice.c @@ -27,11 +27,39 @@ #include "libavutil/ffversion.h" const char av_device_ffversion[] = "FFmpeg version " FFMPEG_VERSION; -#if FF_API_DEVICE_CAPABILITIES +#define E AV_OPT_FLAG_ENCODING_PARAM +#define D AV_OPT_FLAG_DECODING_PARAM +#define A AV_OPT_FLAG_AUDIO_PARAM +#define V AV_OPT_FLAG_VIDEO_PARAM +#define OFFSET(x) offsetof(AVDeviceCapabilitiesQuery, x) + const AVOption av_device_capabilities[] = { + { "codec", "codec", OFFSET(codec), AV_OPT_TYPE_INT, + {.i64 = AV_CODEC_ID_NONE}, AV_CODEC_ID_NONE, INT_MAX, E|D|A|V }, + { "sample_format", "sample format", OFFSET(sample_format), AV_OPT_TYPE_SAMPLE_FMT, + {.i64 = AV_SAMPLE_FMT_NONE}, AV_SAMPLE_FMT_NONE, INT_MAX, E|D|A }, + { "sample_rate", "sample rate", OFFSET(sample_rate), AV_OPT_TYPE_INT, + {.i64 = -1}, -1, INT_MAX, E|D|A }, + { "channels", "channels", OFFSET(channels), AV_OPT_TYPE_INT, + {.i64 = -1}, -1, INT_MAX, E|D|A }, + { "channel_layout", "channel layout", OFFSET(channel_layout), AV_OPT_TYPE_CHANNEL_LAYOUT, + {.i64 = -1}, -1, INT_MAX, E|D|A }, + { "pixel_format", "pixel format", OFFSET(pixel_format), AV_OPT_TYPE_PIXEL_FMT, + {.i64 = AV_PIX_FMT_NONE}, AV_PIX_FMT_NONE, INT_MAX, E|D|V }, + { "window_size", "window size", OFFSET(window_width), AV_OPT_TYPE_IMAGE_SIZE, + {.str = NULL}, -1, INT_MAX, E|D|V }, + { "frame_size", "frame size", OFFSET(frame_width), AV_OPT_TYPE_IMAGE_SIZE, + {.str = NULL}, -1, INT_MAX, E|D|V }, + { "fps", "fps", OFFSET(fps), AV_OPT_TYPE_RATIONAL, + {.dbl = -1}, -1, INT_MAX, E|D|V }, { NULL } }; -#endif + +#undef E +#undef D +#undef A +#undef V +#undef OFFSET unsigned avdevice_version(void) { @@ -68,18 +96,49 @@ int avdevice_dev_to_app_control_message(struct AVFormatContext *s, enum AVDevToA return s->control_message_cb(s, type, data, data_size); } -#if FF_API_DEVICE_CAPABILITIES int avdevice_capabilities_create(AVDeviceCapabilitiesQuery **caps, AVFormatContext *s, AVDictionary **device_options) { - return AVERROR(ENOSYS); + int ret; + av_assert0(s && caps); + av_assert0(s->iformat || s->oformat); + if ((s->oformat && !s->oformat->create_device_capabilities) || + (s->iformat && !s->iformat->create_device_capabilities)) + return AVERROR(ENOSYS); + *caps = av_mallocz(sizeof(**caps)); + if (!(*caps)) + return AVERROR(ENOMEM); + (*caps)->device_context = s; + if (((ret = av_opt_set_dict(s->priv_data, device_options)) < 0)) + goto fail; + if (s->iformat) { + if ((ret = s->iformat->create_device_capabilities(s, *caps)) < 0) + goto fail; + } else { + if ((ret = s->oformat->create_device_capabilities(s, *caps)) < 0) + goto fail; + } + av_opt_set_defaults(*caps); + return 0; + fail: + av_freep(caps); + return ret; } void avdevice_capabilities_free(AVDeviceCapabilitiesQuery **caps, AVFormatContext *s) { - return; + if (!s || !caps || !(*caps)) + return; + av_assert0(s->iformat || s->oformat); + if (s->iformat) { + if (s->iformat->free_device_capabilities) + s->iformat->free_device_capabilities(s, *caps); + } else { + if (s->oformat->free_device_capabilities) + s->oformat->free_device_capabilities(s, *caps); + } + av_freep(caps); } -#endif int avdevice_list_devices(AVFormatContext *s, AVDeviceInfoList **device_list) { diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h index bbeb1ae21b..6443f865d5 100644 --- a/libavdevice/avdevice.h +++ b/libavdevice/avdevice.h @@ -331,7 +331,6 @@ int avdevice_dev_to_app_control_message(struct AVFormatContext *s, enum AVDevToAppMessageType type, void *data, size_t data_size); -#if FF_API_DEVICE_CAPABILITIES /** * Following API allows user to probe device capabilities (supported codecs, * pixel formats, sample formats, resolutions, channel counts, etc). @@ -427,7 +426,6 @@ typedef struct AVDeviceCapabilitiesQuery { /** * AVOption table used by devices to implement device capabilities API. Should not be used by a user. */ -attribute_deprecated extern const AVOption av_device_capabilities[]; /** @@ -447,7 +445,6 @@ extern const AVOption av_device_capabilities[]; * * @return >= 0 on success, negative otherwise. */ -attribute_deprecated int avdevice_capabilities_create(AVDeviceCapabilitiesQuery **caps, AVFormatContext *s, AVDictionary **device_options); @@ -457,9 +454,7 @@ int avdevice_capabilities_create(AVDeviceCapabilitiesQuery **caps, AVFormatConte * @param caps Device capabilities data to be freed. * @param s Context of the device. */ -attribute_deprecated void avdevice_capabilities_free(AVDeviceCapabilitiesQuery **caps, AVFormatContext *s); -#endif /** * Structure describes basic parameters of the device. diff --git a/libavformat/avformat.h b/libavformat/avformat.h index ed02b48c84..a276aad64a 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -583,6 +583,16 @@ typedef struct AVOutputFormat { * @see avdevice_list_devices() for more details. */ int (*get_device_list)(struct AVFormatContext *s, struct AVDeviceInfoList *device_list); + /** + * Initialize device capabilities submodule. + * @see avdevice_capabilities_create() for more details. + */ + int (*create_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps); + /** + * Free device capabilities submodule. + * @see avdevice_capabilities_free() for more details. + */ + int (*free_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps); enum AVCodecID data_codec; /**< default data codec */ /** * Initialize format. May allocate data here, and set any AVFormatContext or @@ -754,6 +764,17 @@ typedef struct AVInputFormat { */ int (*get_device_list)(struct AVFormatContext *s, struct AVDeviceInfoList *device_list); + /** + * Initialize device capabilities submodule. + * @see avdevice_capabilities_create() for more details. + */ + int (*create_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps); + + /** + * Free device capabilities submodule. + * @see avdevice_capabilities_free() for more details. + */ + int (*free_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps); } AVInputFormat; /** * @}