From patchwork Fri Mar 25 14:10:34 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: 34976 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:ab0:5fda:0:0:0:0:0 with SMTP id g26csp1376993uaj; Fri, 25 Mar 2022 07:14:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwSDaQSiBx6YPuWr93n/DgD1N5w9lcX7wfeQzYwdizFU+PL/THzzLK0/n06IiXwUkbXyPZd X-Received: by 2002:a17:907:94cd:b0:6d9:89e1:3036 with SMTP id dn13-20020a17090794cd00b006d989e13036mr11755785ejc.231.1648217651620; Fri, 25 Mar 2022 07:14:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648217651; cv=none; d=google.com; s=arc-20160816; b=r4vNtmSJ4+aSHI+u9Q/4Nj8Cv1JUof6dFTTfzNoW7+ueVvh1qezUzzqjjjdxBt1uxt EPsd7TC1owwi5EBkBxrU2uoE8zxcYwXAY4ofx7yKWArBzl5J1oNYKOjHlxt4YzSKtqYf k9EEnKVfGUXyDI0/c4F/qetVYDKpfE42qwS4HjyLnsmp2/CwHeLZSzbcFyNajX8ClPMh CX2Fy/xtnB+NOOBGAwZdNSc3fFXxFCBw0t3FaEW/7YnZG50/s3Z+x+boO3GLTHWdDmm+ PG/RydyfjASzGWLhenbxLhoB0Ydl5aLo1P4bh/HvSe3WFa7NVzHSfghSDNUBQceUUfJP Wy2g== 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=oJwKKqTxhp5hCx8kUXi8h9mEgSTCo7lslq3HjbT7OCA=; b=vhgPLTzAP5gEBoTtYYMHWNyh89vAbwbdTOzYdCONKkaJCEay/OSFZUQ6QfJ0Brimwn xTXPcfz1Pn70ybgWlpTb70eu7VGHUozsOZaWg/Mimpyysv4iA+Akt7AcO7ayfWXjcrfQ OmeYYGDBCk3tKLrAYia2EwU0EFGYDgRgG8/ILNft8Mye95Uz79srBSsGWTq193TXx3g7 6xVYnYlk+eLZljXQMOyJjJlydzUFJU8HM9ZQjhIY/qlakv3nycQyQIt7d7ItkMuw9LFS MwZIeNsy65mWH8qgNMyDFIqnDNIUk4D1wEVGu2Gixc2fAszd/IVbkFAZEy0SaMvU0z88 ZJHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=eTMTcElO; 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 r22-20020a170906351600b006df76385e31si2426405eja.721.2022.03.25.07.14.11; Fri, 25 Mar 2022 07:14:11 -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=eTMTcElO; 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 DFE1768B2A8; Fri, 25 Mar 2022 16:12:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E65568B2A4 for ; Fri, 25 Mar 2022 16:12:48 +0200 (EET) Received: by mail-lf1-f48.google.com with SMTP id 5so13621264lfp.1 for ; Fri, 25 Mar 2022 07:12:48 -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=X9tilHYFSR8oj/oR0fxEXcXNQjGVqHXRBOg/E6sKVkg=; b=eTMTcElOiYO7EjHUkJEaoSOb6dkH7dZj+AhNR0UR+CrpzfKA0fF29PEDa693eSQfZY VZs0zQnIW5hPf/YXgBvmSNqL+0iqg6h0R+GDhU6jK6EoHMWjugCHmyoFRk/+BFYKIXNW yf4SBaGUiKdZ/MefQHtwzezg5hhTWa0ozA7x/hWSmO9+zA2rStE91DrhZIAwbI3RFEU/ xAB0jx/upqfED150bxV3o2pzYkGeJUr4X+EAusJIgGY0rwhQQaOgZ/udBfQ8GqknJ2Bc 7M9dO4zOF4A4qrx6YJrWxH2Gg6kj90edNJMpzrvGA1OnrGxsTjeyvJuC5feSvqTFOvLg 78gg== 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=X9tilHYFSR8oj/oR0fxEXcXNQjGVqHXRBOg/E6sKVkg=; b=ovCtCq50SR6fqmynH2Lvqo3GOLcGI0m0jMCZVoOwmx1a6Cp0ZQY4ZxVF5IntFfToNd eyNX8fsuNmrFoG5wm3ZrxMWpEXCC2LkxODcgCTgzOclFVLRgI4ftZ7oF7ExqnR4ngyKI obwtS59B0z0ewqqTOM64U+NwTFIcUbFt5HQilEs1L19OdvPLaj4xcVV29yvpHMdvJGsD UvgUvdXGSy0p6Pj3xWbTQtpvGYl6h/14Xi6erMmK/P7tuqVYnERz/QLJ2RPgHaJi5qK2 r4/5oTu6Bq72MI8N0WA5MFeaH6jUf6QF8jPVrUFqn8KW6eSD//zMPv0QcQcdF6E3SpIw Xjmw== X-Gm-Message-State: AOAM530zMtiMyi71jrPwOKQu+mU5tXi04Axnl/aDO9NcBT/eMxYIju/8 zFJrpnoYRbUyGgM2oQBvQ5OGNCN6OWk= X-Received: by 2002:a05:6512:4014:b0:44a:2b77:bed6 with SMTP id br20-20020a056512401400b0044a2b77bed6mr7645998lfb.381.1648217567464; Fri, 25 Mar 2022 07:12:47 -0700 (PDT) Received: from localhost.localdomain (deedock.humlab.lu.se. [130.235.135.183]) by smtp.gmail.com with ESMTPSA id w7-20020a194907000000b0044828c52479sm718758lfa.198.2022.03.25.07.12.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Mar 2022 07:12:46 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Mar 2022 15:10:34 +0100 Message-Id: <20220325141041.1748-16-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 15/22] avdevice/dshow: move audio format helpers 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: eSPh/miW6nuo Needs to be moved up in file for upcoming implementation of avdevice_capabilities_create. Signed-off-by: Diederick Niehorster --- libavdevice/dshow.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index a780351170..d35224beb5 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -79,6 +79,26 @@ static enum AVPixelFormat dshow_pixfmt(DWORD biCompression, WORD biBitCount) return avpriv_pix_fmt_find(PIX_FMT_LIST_RAW, biCompression); // all others } +static enum AVCodecID waveform_codec_id(enum AVSampleFormat sample_fmt) +{ + switch (sample_fmt) { + case AV_SAMPLE_FMT_U8: return AV_CODEC_ID_PCM_U8; + case AV_SAMPLE_FMT_S16: return AV_CODEC_ID_PCM_S16LE; + case AV_SAMPLE_FMT_S32: return AV_CODEC_ID_PCM_S32LE; + default: return AV_CODEC_ID_NONE; /* Should never happen. */ + } +} + +static enum AVSampleFormat sample_fmt_bits_per_sample(int bits) +{ + switch (bits) { + case 8: return AV_SAMPLE_FMT_U8; + case 16: return AV_SAMPLE_FMT_S16; + case 32: return AV_SAMPLE_FMT_S32; + default: return AV_SAMPLE_FMT_NONE; /* Should never happen. */ + } +} + static enum AVColorRange dshow_color_range(DXVA2_ExtendedFormat *fmt_info) { switch (fmt_info->NominalRange) @@ -1610,26 +1630,6 @@ static int dshow_control_message(AVFormatContext *avctx, int type, void *data, s return ret; } -static enum AVCodecID waveform_codec_id(enum AVSampleFormat sample_fmt) -{ - switch (sample_fmt) { - case AV_SAMPLE_FMT_U8: return AV_CODEC_ID_PCM_U8; - case AV_SAMPLE_FMT_S16: return AV_CODEC_ID_PCM_S16LE; - case AV_SAMPLE_FMT_S32: return AV_CODEC_ID_PCM_S32LE; - default: return AV_CODEC_ID_NONE; /* Should never happen. */ - } -} - -static enum AVSampleFormat sample_fmt_bits_per_sample(int bits) -{ - switch (bits) { - case 8: return AV_SAMPLE_FMT_U8; - case 16: return AV_SAMPLE_FMT_S16; - case 32: return AV_SAMPLE_FMT_S32; - default: return AV_SAMPLE_FMT_NONE; /* Should never happen. */ - } -} - static int dshow_add_device(AVFormatContext *avctx, enum dshowDeviceType devtype)