From patchwork Fri Mar 25 14:10:29 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: 34972 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:ab0:5fda:0:0:0:0:0 with SMTP id g26csp1376815uaj; Fri, 25 Mar 2022 07:13:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzUxKsNdS/QLLnTUuQGMlM9ZRi/AZnw2fuW9Thu7KnU0lXkvDEUDWDXln9XdCTDrCwJ/+XC X-Received: by 2002:a05:6402:4305:b0:419:2aeb:2a9b with SMTP id m5-20020a056402430500b004192aeb2a9bmr13456348edc.346.1648217592864; Fri, 25 Mar 2022 07:13:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648217592; cv=none; d=google.com; s=arc-20160816; b=di2odGmTaq5LBCMrVle2kaBgEZ1TplXxXo2Pn748Pz/iEcxeXRwGz5YrpJ0IdLW1QO Tmcu+LcsID+nQEoyDLpxKWD8Jz7tKGywZTxIwMuLB1LF0nVLdnuUonaA0YHIcjaT4x8l JqbB7Y+lDXj0mXgwu+zfyPQbalhjDV7wf9KnZzqU00N4qbaoiOUKAxemsCk16TBzh7Sh bsyNFaYD4PaBU/90cuwd/CmqEqmtmcGuo6qk/uYnG3p6D/D0hxWLFiLEToAjPetXJChN OryVZF3X6nfd9DRFCmhkksiKd3EXPCjAWjgiMlqJn6qoaztMyfskMPYceWWRxsSsokQw G1YA== 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=wzQ9fkyMbYf4Gv3yrjz+cQB8X5dNDIOAkB8JHM8lQns=; b=VzNp9jKwLyE9yEvFwOyLm/ybKlDkhieZzQgTlsdPNjc+HMQOiayihm5ASpdILyf/WC Ki58sCUrVhpDQhP2fQPpUw/JuTDHv08FCIIvXu2tXf719kFWJlW7mrvreHgn/TAFlKRs rO0Rmibl8rCPe70YzzbvIGlj7QNKeqTK7F1sD9hdaWxasvRrKwsL3GCaT94xoyMMJ0KZ nIxet/SMgx87+tUYuz336V6A081Cz7HQ2ndJ6dS4Z+gwM1VFRgJ10bm05Z1n8HTcOEDr xPUOqUdvOcrFG9zCsuEJf8VQzb//ZcmHAYy3pNjcmg37yX43MwTaxnz9oykYL6sPLYKN V5aQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=l6a9MUY1; 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 s4-20020aa7d784000000b00418c2b5be2dsi2677389edq.271.2022.03.25.07.13.12; Fri, 25 Mar 2022 07:13:12 -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=l6a9MUY1; 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 D487F68B23B; Fri, 25 Mar 2022 16:12:15 +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 03C0568B23B for ; Fri, 25 Mar 2022 16:12:13 +0200 (EET) Received: by mail-lf1-f42.google.com with SMTP id e16so13550584lfc.13 for ; Fri, 25 Mar 2022 07:12:13 -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=C09XOhsNrXRvWLli6r3wbDdHapT6vS58Dy8xRNcf5Bc=; b=l6a9MUY1lUInR7JIpqHI/LFfX5NRA+sR/UEKohcj5OJU5twKoaYccO4lEN8/bC/Vt8 lznBPN3a1FuaJDNGMq8IHtIC5eAWx68myfbcr8rIIfVHIGXILxbY6A74oHe+N11lZIlN jrDWla9H96882rAybVAneXPOd82mcQ2/MDU5QOblWjahYzyKP5hHKrue3UBGzEACkDRc cC3lpXhPNN9Wd3Q2szpWKlxyjzRRWLyWEzygI8Du42R2OGEkkmcmLT/+pUUcAis2Ntxf 0LUMtUp82CRU9UmjdQU5kztFsV4WLG5lGUnF1+kCEXicHM5DyqgoVAkqZQt29767D3pz 06rw== 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=C09XOhsNrXRvWLli6r3wbDdHapT6vS58Dy8xRNcf5Bc=; b=TWK9kj2P6tKNehxSBeMHvAYrEHOhufgbpsOhswC/m04ikZ9rwa4D7L923RP6NEPaKe VQrmkpT33s67k0FF1ZohFuZe1emFbOE8VfYI/fUcc1KpqvPnX7Js+MaavMcefgINoOD7 l1RJ5wVGH3twvN64bPWlNVdZvr9ud5RwPgS7CYk7vLGAauR8mPHuTxNbreXRawruttO4 ASiHv7PQp9SvckLIJ2Pwy0P6DlajE2QKNykruVROcSdYmg6UZ4eHW6Hdg5x3Oe98dpnb l5PUpN0c/yCSsMrQmGBH6DRlgbSoK5aEpvN7v219/ZoQrp+yKu7tUFMuKKSlv+nqFMy8 6SwQ== X-Gm-Message-State: AOAM530Wipmbz5MZNZu0XaCSAxCf+2BSqKwRcgZ5d/WyWRTkMmeQC986 QPDqbX82+oKTewcnQETPvOCFAleNKeY= X-Received: by 2002:a05:6512:3718:b0:448:4bea:5409 with SMTP id z24-20020a056512371800b004484bea5409mr7867933lfr.639.1648217533069; Fri, 25 Mar 2022 07:12:13 -0700 (PDT) Received: from localhost.localdomain (deedock.humlab.lu.se. [130.235.135.183]) by smtp.gmail.com with ESMTPSA id n17-20020a19ef11000000b0044a37ab9754sm718889lfh.39.2022.03.25.07.12.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Mar 2022 07:12:12 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Mar 2022 15:10:29 +0100 Message-Id: <20220325141041.1748-11-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 10/22] avdevice: capabilities API details no longer public 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: CcbfaRn3cg3Z Bumping avdevice major version (API removed, even if it cannot have been used by anyone) Signed-off-by: Diederick Niehorster --- libavdevice/avdevice.c | 2 +- libavdevice/avdevice.h | 28 +--------------------------- libavdevice/internal.h | 33 +++++++++++++++++++++++++++++++++ libavdevice/version.h | 2 +- libavdevice/version_major.h | 2 +- 5 files changed, 37 insertions(+), 30 deletions(-) diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c index 24e14b84c9..db412985b2 100644 --- a/libavdevice/avdevice.c +++ b/libavdevice/avdevice.c @@ -34,7 +34,7 @@ const char av_device_ffversion[] = "FFmpeg version " FFMPEG_VERSION; #define V AV_OPT_FLAG_VIDEO_PARAM #define OFFSET(x) offsetof(AVDeviceCapabilitiesQuery, x) -const AVOption av_device_capabilities[] = { +const AVOption ff_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, diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h index 9724e7edf5..6d45c74616 100644 --- a/libavdevice/avdevice.h +++ b/libavdevice/avdevice.h @@ -416,33 +416,7 @@ int avdevice_dev_to_app_control_message(struct AVFormatContext *s, * avformat_free_context(oc); * @endcode */ - -/** - * Structure describes device capabilities. - * - * It is used by devices in conjunction with av_device_capabilities AVOption table - * to implement capabilities probing API based on AVOption API. Should not be used directly. - */ -typedef struct AVDeviceCapabilitiesQuery { - const AVClass *av_class; - AVFormatContext *device_context; - enum AVCodecID codec; - enum AVSampleFormat sample_format; - enum AVPixelFormat pixel_format; - int sample_rate; - int channels; - int64_t channel_layout; - int window_width; - int window_height; - int frame_width; - int frame_height; - AVRational fps; -} AVDeviceCapabilitiesQuery; - -/** - * AVOption table used by devices to implement device capabilities API. Should not be used by a user. - */ -extern const AVOption av_device_capabilities[]; +typedef struct AVDeviceCapabilitiesQuery AVDeviceCapabilitiesQuery; /** * Initialize capabilities probing API based on AVOption API. diff --git a/libavdevice/internal.h b/libavdevice/internal.h index 67c90e1f87..bef3a4bd2d 100644 --- a/libavdevice/internal.h +++ b/libavdevice/internal.h @@ -19,10 +19,43 @@ #ifndef AVDEVICE_INTERNAL_H #define AVDEVICE_INTERNAL_H +#include "libavutil/log.h" +#include "libavutil/opt.h" +#include "libavutil/pixfmt.h" +#include "libavutil/rational.h" +#include "libavutil/samplefmt.h" +#include "libavcodec/codec_id.h" #include "libavformat/avformat.h" av_warn_unused_result int ff_alloc_input_device_context(struct AVFormatContext **avctx, const AVInputFormat *iformat, const char *format); +/** + * Structure describes device capabilities. + * + * It is used by devices in conjunction with ff_device_capabilities AVOption table + * to implement capabilities probing API based on AVOption API. + */ +struct AVDeviceCapabilitiesQuery { + const AVClass *av_class; + AVFormatContext *device_context; + enum AVCodecID codec; + enum AVSampleFormat sample_format; + enum AVPixelFormat pixel_format; + int sample_rate; + int channels; + int64_t channel_layout; + int window_width; + int window_height; + int frame_width; + int frame_height; + AVRational fps; +}; + +/** + * AVOption table used by devices to implement device capabilities API. + */ +extern const AVOption ff_device_capabilities[]; + #endif diff --git a/libavdevice/version.h b/libavdevice/version.h index 2c25804784..d789b3fd7b 100644 --- a/libavdevice/version.h +++ b/libavdevice/version.h @@ -30,7 +30,7 @@ #include "version_major.h" -#define LIBAVDEVICE_VERSION_MINOR 9 +#define LIBAVDEVICE_VERSION_MINOR 1 #define LIBAVDEVICE_VERSION_MICRO 100 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ diff --git a/libavdevice/version_major.h b/libavdevice/version_major.h index d255ff6992..b32de7325d 100644 --- a/libavdevice/version_major.h +++ b/libavdevice/version_major.h @@ -25,7 +25,7 @@ * Libavdevice version macros */ -#define LIBAVDEVICE_VERSION_MAJOR 59 +#define LIBAVDEVICE_VERSION_MAJOR 60 /** * FF_API_* defines may be placed below to indicate public API that will be