From patchwork Fri Mar 25 14:10:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Diederick C. Niehorster" X-Patchwork-Id: 34970 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:ab0:5fda:0:0:0:0:0 with SMTP id g26csp1376726uaj; Fri, 25 Mar 2022 07:12:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCdIxAFBwT2r+meMzQ4HNyuaKsZjqKvWkm/CCQFWVv7xNtjkrSavRRpXKclr7dSdGaPsHM X-Received: by 2002:a17:907:2ce6:b0:6df:a489:d2e1 with SMTP id hz6-20020a1709072ce600b006dfa489d2e1mr12035059ejc.264.1648217567181; Fri, 25 Mar 2022 07:12:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648217567; cv=none; d=google.com; s=arc-20160816; b=WFRJfPvBidOPbJf4HyrfCtlexCp/YgQROddrl3R8fvDzsy8yNqkEtgTx86vZJDSQ5y WnZUFSgbF1PYp+zlGSuaeUWhI7gaBp3vssbK7THGEzWKc3sJuDGymbA9UOADnjWetLU9 +D2Q1Nu5UY6Ig+X5lrLMtbdPuUnMwBT5C5OoHjs//yeBogXIlDLrNpVSBAjugIm+qzRW DSF5qdFes3nAJTvrK9+bbLc+o9Wr/aCieEKwOmLTw0eOSxDbt64PqZn0SoRO6DI+i5FG Ne9hDYvbOICFiasVzA8V1BTyFxpLO9O5Ri1NSl7Qs3dSyj4AXu0QEY9yPQbMEKpGw8yx GjBQ== 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=4IAVJpP5hVW43jUiKFRtnKi0UKdRpeenOXF8gG4eCS0=; b=l0dAHh3bcje6FjMFv/ENCIIgeZ8mVJGQZ6ATKmgJb94NTfWLZ01Wmyk0I9aCG5rw6x nOyg0WG429/fl0exsoZ+UcOj6X1eAdPluy+cY9OjmgHcl58nQGUB3fnG6X9b60R9gXjg t+rg/o7Om/MTWbjSzoPamk83031tdutOIQZ1i7GABcG+o4FKvink07oQJtQaLoxB8GA3 1fMxd5BZh860fGv+3r5ftakK648asUPHyfbZgkw2yqgAVhrOg5coxNqzTuW/neIMYE3U DK3bHLWTsDab5WPHIjlJ9MeqwXwzlLEFxc0UKH5qvPGNgY1/4iANJ6G4CeAA2GdyPzqK Q5MQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=bNMN1Tqd; 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 ak15-20020a170906888f00b006df76385e08si2396667ejc.680.2022.03.25.07.12.46; Fri, 25 Mar 2022 07:12:47 -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=20210112 header.b=bNMN1Tqd; 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 ACBFF68B26D; Fri, 25 Mar 2022 16:12:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4995C68B204 for ; Fri, 25 Mar 2022 16:12:01 +0200 (EET) Received: by mail-lf1-f42.google.com with SMTP id w27so13609119lfa.5 for ; Fri, 25 Mar 2022 07:12:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JHNexG3mBtUPQd992q3SH0cxgNhq4KEn5pbZs6slYQI=; b=bNMN1TqdqKGzJLPhs2iB6ZSCXzDF08VTvWwwH4b+TY3JUAPhzrmBZke93S9nlmvI/f MxDv2J8LW9f4JtzaiHO2GNJaMDn3Io5gHMHL71EhUCbpC1+42N4KfWX/X7QMA2oXQOBg bZTj64ewHg30bXPOVHmL09yOcgGasY4Xo7zSDM9k9INJmwgEbnTLR19b1EGK73EsDts5 210OyYk0TxR58ARzJ93PQIMnv1DMpttERRHeqcUg/7EsqFftSpW4toZl5XUnVNsHC9bQ pPvX93ARWJRD+DkcQgAcI4avP6WuRBYIdx2hQ2PMjv1KR6wOyaX2k8M4ntwawmISWVQx v/9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JHNexG3mBtUPQd992q3SH0cxgNhq4KEn5pbZs6slYQI=; b=owL2WrgQfWUOvrYGDrVxnetj/Mx0Qt12VJVX1BFpfUs9pBt/88JAK3y+AKUbBi7GJ7 i+0LV9cF4ZJJ/dz22Qo1oGy/Y/QABz02ZDL3cN4yP2aDriXSCyKReGSkkPhtk+htW/bw bYHFiOnLwMd1e5DSzs2ofPUFLp8rDgT0jkLGBMbDRQFUrCB6ANWI/vY4sA63iMNSwms3 GWbBCl+wYp4z5uWrBEQ9xxCfDAjKCWVt3atjDCcCKnbkmy9LAMYybwMEEKzwn/RQG53I qNLE8Gb8sBfBay3yJLQI6A+QpixU7XbEfgO+S4bHuZOJXu8032UkqQ2+SFMy2TFgJ+cN RMKw== X-Gm-Message-State: AOAM533QTdPMm/5MpX3XQ1QcD3+MIcPEu8/1ngxqf3+NYyJ7hS4CLmTh YsbzesNK1onL6pTCxeFSuoCmwLaicmo= X-Received: by 2002:a05:6512:c01:b0:448:6aec:65c5 with SMTP id z1-20020a0565120c0100b004486aec65c5mr8157379lfu.193.1648217519997; Fri, 25 Mar 2022 07:11:59 -0700 (PDT) Received: from localhost.localdomain (deedock.humlab.lu.se. [130.235.135.183]) by smtp.gmail.com with ESMTPSA id a12-20020a2eb16c000000b0024805905f1bsm702126ljm.98.2022.03.25.07.11.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Mar 2022 07:11:59 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Mar 2022 15:10:27 +0100 Message-Id: <20220325141041.1748-9-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20220325141041.1748-1-dcnieho@gmail.com> References: <20220325141041.1748-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 08/22] 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: kArrXqq85jET This reverts commit 4f49ca7bbc75a9db4cdf93f27f95a668c751f160. The next few patches clean up the API and implement this capability for avdevice/dshow. Bumping avformat and avdevice version. Signed-off-by: Diederick Niehorster --- libavdevice/avdevice.c | 71 ++++++++++++++++++++++++++++++++++++++---- libavdevice/avdevice.h | 5 --- libavdevice/version.h | 4 +-- libavformat/avformat.h | 21 +++++++++++++ libavformat/version.h | 2 +- 5 files changed, 89 insertions(+), 14 deletions(-) diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c index 617c28d725..2000e63bb2 100644 --- a/libavdevice/avdevice.c +++ b/libavdevice/avdevice.c @@ -28,11 +28,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) { @@ -81,18 +109,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 74e9518a8e..9724e7edf5 100644 --- a/libavdevice/avdevice.h +++ b/libavdevice/avdevice.h @@ -347,7 +347,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). @@ -443,7 +442,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[]; /** @@ -463,7 +461,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); @@ -473,9 +470,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/libavdevice/version.h b/libavdevice/version.h index feb15ba9c8..2c25804784 100644 --- a/libavdevice/version.h +++ b/libavdevice/version.h @@ -30,8 +30,8 @@ #include "version_major.h" -#define LIBAVDEVICE_VERSION_MINOR 8 -#define LIBAVDEVICE_VERSION_MICRO 101 +#define LIBAVDEVICE_VERSION_MINOR 9 +#define LIBAVDEVICE_VERSION_MICRO 100 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ LIBAVDEVICE_VERSION_MINOR, \ diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 06db024559..027a914e13 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -617,6 +617,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 @@ -797,6 +807,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; /** * @} diff --git a/libavformat/version.h b/libavformat/version.h index af5e2c496c..1ab39022c2 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ #include "version_major.h" -#define LIBAVFORMAT_VERSION_MINOR 22 +#define LIBAVFORMAT_VERSION_MINOR 23 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \