From patchwork Tue Jul 6 09:20:07 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: 28807 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp4921673ios; Tue, 6 Jul 2021 02:25:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSkgkuh8HhaB6LS1DVMDiyowjjwayLYgtltl68/wnrsy1Wj5sdsrUvrTSzYrazA1RSGjnK X-Received: by 2002:a17:907:c21:: with SMTP id ga33mr12656610ejc.297.1625563509198; Tue, 06 Jul 2021 02:25:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625563509; cv=none; d=google.com; s=arc-20160816; b=kBC1L+GPN8KzXuZhge/Wa69mJ1VZ1nP67OaKtZeXCP1zsTFv9JQLJAg9ZydJj7Zdeb 8fvCZOOjMZBcJPGNatwqB+8C1raX3NN6q7baw6dGUEA0Gn/B9ZmdCB7/kxRwMP0PwmRQ yovd1d2RE039yxqK40ziIKv6MtqzISZPmrT9Hrvz0Gpq4JEPPpbQG+Rgd0J37nR3Ym+q dTxaKV8R6f6bl1+i4rQx2Kzv4qKwh6Du0JL3ptTK3p2uhCVDvGlXI+T9dVdQmzk7zgG8 qRxOoqA7Rq8TrsfOqq7zSSq3ZHfxB89+VyERDuCXjRxhkFFDcIRMLOdeXZUTJi7aV1Rd dqyQ== 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=FUoAmnxFQzTsrkH2PB09/s6A98fXF4jA2IQeSJ4mMmY=; b=tYmiOtLkNW8BB8cCXS0A5otHY0UiOlNiDYpOV6GlnbmKOIUwwxphD1KJS8tXDU+J1o OG3ntmWw2/ZqQduN8mPHurT0cuq1E3w/aVjSruk8wPKI5Ak75yo/ohUwgVL678O3o8OE ejdqV1NN8ya2/2GOmdQrMNbrWtTjQ6oDYqm0Gb9YOhccFJvhjVPFz7Iua2l2rziKiSVG y5uLdqpLKYg1qjwinusNYcWmu8+qnumOG8Hf/mvDaFmt3ubcgfG7nby7oex7AYRTO4iX Eg0/pNbGpWKOIPXyQDaVjDfSnZLYtqMpCfjyf+BYPI+9cFfADo9AZb+EN8FMFjDRgpPa mjuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=eAA9FfmO; 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 go34si10572288ejc.272.2021.07.06.02.25.08; Tue, 06 Jul 2021 02:25:09 -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=eAA9FfmO; 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 4E78568A83B; Tue, 6 Jul 2021 12:24:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E70168A7BF for ; Tue, 6 Jul 2021 12:24:57 +0300 (EEST) Received: by mail-lf1-f50.google.com with SMTP id p21so15428329lfj.13 for ; Tue, 06 Jul 2021 02:24:57 -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=USVkzv8CoIATlRpFZPVTBODGxFeRpL0omO0SIYb1L5s=; b=eAA9FfmOyKsfzgxNzAc8HYn/0DhubSG0kkxkcirMV0iG9LTXjE5KjfK905TU6RGujS PXW8fSjC3kQSbBKzcVkai8CpWj4M3c12ejEYXytLwP5IHOmGTu1UIuA3UXjFvCT5W8qQ ktssAnigWEHa765Z/vFhoFbQrn7b8Y2gZklvAKJuYDH4+oa94Ht2ow29bAFQtfmM+nYe IJURACi9NVRYOc2tZzemTsrtOq/+vqTbXknjpZ96NFna3jXRyWAoepg4Sg5YGtJrE7Lx lm676mSOmqZt5Ml6k54Q9Wc2PrWnzBo2EKkhPXEU7Td03HOpoTBsKNMQDvphdsYUtFny Ov9w== 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=USVkzv8CoIATlRpFZPVTBODGxFeRpL0omO0SIYb1L5s=; b=Vr9DjvDtkraZXpP7N1CYX7VOVY8YnGs+tShZj1/ImwyTZm6GRKMAYfG43zN5DagQeg FJUg74NRdB9Y/Y3IbYqQwuI2InEs1U1GqTCzkZ7OTbadM0owbhTDykdIdrNqPx1dACca uC0I/Q/MPHKsE0WZbxiFNUExEODIqMN9UhQAaHDE2BwBTGcWz4ryXdixtOD3Ld5j4XJa 29mC3LTN9gchQL2/sIdHgPwzXb7dmfsOlICkLAHUXWcFcZ6VPK/WBoPkM6geCw+/a6Iy BFiQhXxSSIOde9x5tkI27BJM0H7R0T6SVZ61OuyYaoYep7MAdQAhe4q7rIfpQfhWBieY w4iw== X-Gm-Message-State: AOAM530GCNzN7sRulaNFr1WdbfksG0deQPBODUOIE2m4Qnhf4YUhx7av j4fMj2UWo3jwlXtNM2dd2Mhw4qPjbE8= X-Received: by 2002:ac2:5c0d:: with SMTP id r13mr13571390lfp.438.1625563496331; Tue, 06 Jul 2021 02:24:56 -0700 (PDT) Received: from localhost.localdomain (deedock.humlab.lu.se. [130.235.135.183]) by smtp.gmail.com with ESMTPSA id b2sm1337566lfj.11.2021.07.06.02.24.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 02:24:55 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Jul 2021 11:20:07 +0200 Message-Id: <20210706092020.1057-22-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 21/34] 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: 0CPiEcVHkbQQ 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..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 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, \