From patchwork Fri Jun 11 20:30:52 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: 28229 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp765729iol; Fri, 11 Jun 2021 13:37:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxQrefZc2xnPV8TCG4heI6WebVdDBaQmtMjZYlYNJjNoWRPcNNQ+8a27PMIx1ileAzrt2jl X-Received: by 2002:a17:906:c1d2:: with SMTP id bw18mr5194810ejb.123.1623443870576; Fri, 11 Jun 2021 13:37:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623443870; cv=none; d=google.com; s=arc-20160816; b=Xrw+HD8X9kEkiLyCly4JhaEAszmkQm+r/MfeuaalDDOqKy0G9NDl8A9sjqQ1TLGZke ucHVvxtOWsDaeaSYYaRUrSHi2ROwf+MJ5pUrit4SlKVXXXXG8iQfxECd+et6IxPUCCOs 7zbjYUipeypNanoIppGih28kjzFIJ+xKVjhcdjO84uf7onPXc/WKotZiN3hIsy6Dki/N CNSE9tv5m73s+eY0DqxgDk5hv1dWdEFf/ZWqdyol/f/9yW5yDDPUMWE50mFiezVsfmOf Wp4gYSDzFh3JVj7HxjFstyxrbEQXmz/2XcNhrxxqEaUAf4mORtMk8sVObVH9VJYdQJfs F7+A== 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=YlSTOPXLyhOZIYdaJBIwYauJhjf0J8qEzMi/oB8L8NI=; b=mOBeDxObTwwbIJY7fLxDc4fOkUI5Y9vomTCkH4EuZ/8uuN7qVCoekZoR5/cIxv/qKC 2uEPS3fhwOUseZdFPnW63628txmNE9FjGuAENfEiE8jRwu27cJdl1N3FK6uhDzDqr8ai EVmdDyWix1hSobgi6kGxSbg/nY9a2L0hJeNSNFQBdxqBl3jxa+XhHGfObbFmE6OHwjdl UUY2ZlovN/6oylfWKN5plmk1y80eq2jo/iMDDUVgrGTxw88k9Sa11wUtVyjjhmVF/BrT 5/jdbX6hc8e2HxTSrFd5ZajJQ4wT/1tYiip9qMwfFtUzD2dHZuhYMdfg7hr9B9cJbPLb +ylw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=TpAIB0Uv; 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 b10si1620577ede.515.2021.06.11.13.37.50; Fri, 11 Jun 2021 13:37: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=TpAIB0Uv; 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 7B6B2689A1E; Fri, 11 Jun 2021 23:37:41 +0300 (EEST) 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 2A19F689815 for ; Fri, 11 Jun 2021 23:37:35 +0300 (EEST) Received: by mail-lf1-f42.google.com with SMTP id x24so4749163lfr.10 for ; Fri, 11 Jun 2021 13:37:35 -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=GU+kKVsguBIJ4ET4yU+2x2SC9Cwposawz5Z3d4qxKDk=; b=TpAIB0UvkviTNawjuIbazH2Qjzm8rJmKATEd9Qp0NsOmtBNSUMuhqFH818sabLKHjQ 682/4l1VuTCIgEEKkyWZFyg3bzr6ciw1sfxX68tgytSVgHIIInhxfZbDc00U6DkK6iMA N06eeglMQ9r8lO6E7oMwCv4DTDT/ZwseeJ4++SGvY6TcnQ+wZx0to40Y9d7yP5oBQ7Uz keKLWaguko6geuxmW1evLkH12B5Un+fCeqqmPv+fy2oU567Vhz+v4WHV1CcaM/q0xDDH pOMneQRmkaUFtqyduGierCDslt/SImiUID6NFT7bn9RYej6NyphOcYVwWFV4dTW58uWp jMiA== 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=GU+kKVsguBIJ4ET4yU+2x2SC9Cwposawz5Z3d4qxKDk=; b=WAHUpU+q4E8OnVQvYQgsq34ZTVMbyn9Dac8YQjBDubFrlpej1aJQ18qQUVXehTj83h Ha7L8Q1JnGxnHtrWhYIHNSpDqpMegvFpMwcnzehYbXz19SZS8INBFF35ZPmc7lQQpLBj dXNHZ65Out0sl4H8M8oaXS1r0jEuqW2Nd1zBHwmvj0CibEl7DuH/d+qqf41AcpuckGYr owd8fXDg8Vm0lJLPYftYoV7nn2x5hooChY8QiRdJRBPa2oN4VTXlz7C+nm95NG1Y6gRa gE0hbr+BGcKQIs3cRT7A1e8ANt/SKWuhurncbA+4zKeJLS+PRY/dRayDVeQ/ebmzzyqD 5voA== X-Gm-Message-State: AOAM533T9wLo5Whf3+XHzQQQeydlmb+aSKfv/RLZiLz3nvhOX1mJsQmW DfgMS2eqlCVR+WwHhxOuOQpdzoeocMx08g== X-Received: by 2002:a19:ad44:: with SMTP id s4mr3701596lfd.563.1623443854352; Fri, 11 Jun 2021 13:37:34 -0700 (PDT) Received: from localhost.localdomain ([196.196.203.214]) by smtp.gmail.com with ESMTPSA id z15sm687273lfs.207.2021.06.11.13.37.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jun 2021 13:37:33 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Jun 2021 22:30:52 +0200 Message-Id: <20210611203104.1692-22-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20210611203104.1692-1-dcnieho@gmail.com> References: <20210611203104.1692-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 21/33] 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: qsvpM5ehILXl Signed-off-by: Diederick Niehorster --- libavdevice/avdevice.c | 2 +- libavdevice/avdevice.h | 28 +--------------------------- libavdevice/internal.h | 33 +++++++++++++++++++++++++++++++++ libavdevice/version.h | 2 +- 4 files changed, 36 insertions(+), 29 deletions(-) diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c index e66906e91b..cb139e6d4a 100644 --- a/libavdevice/avdevice.c +++ b/libavdevice/avdevice.c @@ -33,7 +33,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 6443f865d5..44c4f185a2 100644 --- a/libavdevice/avdevice.h +++ b/libavdevice/avdevice.h @@ -400,33 +400,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..e7a72d008d 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. + */ +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. + */ +extern const AVOption ff_device_capabilities[]; + #endif diff --git a/libavdevice/version.h b/libavdevice/version.h index 0381d6cd0d..53af6fa0d0 100644 --- a/libavdevice/version.h +++ b/libavdevice/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVDEVICE_VERSION_MAJOR 59 -#define LIBAVDEVICE_VERSION_MINOR 2 +#define LIBAVDEVICE_VERSION_MINOR 3 #define LIBAVDEVICE_VERSION_MICRO 100 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \