From patchwork Mon Jun 7 23:04:06 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: 28139 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp3886934iof; Mon, 7 Jun 2021 16:06:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzYfcLfpoLPlRDFKXgM00zU3Q43GJ7eDy7NDyVumnVKveHpBH7/mqLsLzY05lELAkG2f3vK X-Received: by 2002:a17:906:7188:: with SMTP id h8mr20218862ejk.529.1623107188141; Mon, 07 Jun 2021 16:06:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623107188; cv=none; d=google.com; s=arc-20160816; b=uNBF9TQjZQIBvHqZRCMiFv6CigH96KfnmWR5bE7xb5GLUtoAvlcmkU59SUyi+hKUSf 7AyoGFT6jCeFAqymk6VYNDpasG1DSea5ktc5bOEWT2/hf7k+y6+bAcQsP9m0DNbql7Lv Rn29qengs6oMyFN66mJOBOWlgMf5wlPqZcIcn04nQ8H4gT8oSo0lgLJbPy6Y/c9U1Os9 o+/pIIRZ284S0XK3TBz+umN+7GOz746jLNISpcqIMG1CGVoMWcKXsRpZRSSfIGOXLBNs kixsSGaZAjISZYAMtKfaDru0v4H6ET3nYc7CYs5anF3xtZGl52WMk0400CrbL2mqm4WA caaA== 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=28DKf0SkX6TmVKV32nJkRdMd/xcpmzbp9urseHXSqLw=; b=DTC2N2HUG6aJro0oVsn32itzeKm4V7cktaYb+Bn/aVNyehv00c2ZClODDeRGy874nF OQVfFmj1Qq5B5smHwLWRlWBTMGBq6RJVR2/iR6jZgloEi8Ga74+eiz0z+25AGtuUT+a9 Ni3GC600C35vqKVtVDDP81vuEaCgMYFR1rvb2HkdCLCriMXAOxVm5fGB88sOE3kIXpxj OwN9MXo1BAzC7TEu3aB5CYWszE4I2UI6Pg4GIDszRG3+DiPhrzJ3wf152n9ce3XjrdW+ i++h7qoJpbAc4nkYp5wzIJ399JYNUb5BzBmlI4MnbFiACbm7I4xiUPMohpcyoqk+ZJPU HsfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="cR5eD/04"; 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 k13si13162061ejb.687.2021.06.07.16.06.27; Mon, 07 Jun 2021 16:06:28 -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="cR5eD/04"; 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 E7FD56818DB; Tue, 8 Jun 2021 02:04:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C4EF5680987 for ; Tue, 8 Jun 2021 02:04:52 +0300 (EEST) Received: by mail-lf1-f46.google.com with SMTP id v8so28962108lft.8 for ; Mon, 07 Jun 2021 16:04:52 -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=n/iFnDWu/ZfLORjT+xFjFuTdgPvhmLVKzk87w7dbAH0=; b=cR5eD/04rNBfYb7b7WzKHQMFoHHDp2B1eTOtck+EZ0XXqTo/6E5jIbBwI3WCt0Eu9g YhiSQA/TJOuZHJVARCekpYqq1V9LCJFsaRUwjM3WcH6ErxE4aGeI4GFpeei3g5/r98uT 6AwWIfMCOB9cVhi0l73tNf1yniLYyrxYgRjm1UuSLEtyeDulhI/Ls5+eqL74T32Xs2up ZbNxfSj5MLkKuapwKlBoamwkY0hHa9ATvFkCoO8fWCT5sa6nrLb5Sib3+DS7Mjwp1L9+ rwZPjLV7+sxBDegI6wCM9Msyy0AO7SaJpg3Kll6fkCUWdEWU0O9/77ZGUuhebHNcsVEe IKjA== 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=n/iFnDWu/ZfLORjT+xFjFuTdgPvhmLVKzk87w7dbAH0=; b=SVZmuhGW4ipiSEc/Mv6k+mEdZ+UMgxSlaVaBv9mxEyUOCCKO28j0vP7aUmHK7gpNw+ UycdFncvxN507HlFWYuKHkU63JcP4KOOcWVC2bPVZ4uiv5W75Iz7XF0EUwQJexmf6/ZD naozpnhjhogX4FEhmkmvrh0yMJryk2zSw1KlSUOAn2p03aauO9w/Hxy9N7HC09IkZafk zliFta/HpnyI/IholPdc0mZPSx2oyh0Z1++NRhot172q6wns9gv5e26H+mvRlbUnv/Dq YisWu1esE4W1jDMVEX1cTU5wyu2piRXNDXy+t3RZ6v4V0EVmMBjuYjH9ntPOyMhSKLWe gqmg== X-Gm-Message-State: AOAM532NuqsaIgj3npFLgU2M9IETAdfOmOl9yA00qPqMLPsJXYHK5Vpy Y2k6nZDl8RuhMYUKTjUoqWtYp5dAbVI5Aw== X-Received: by 2002:a19:441a:: with SMTP id r26mr13717413lfa.104.1623107091915; Mon, 07 Jun 2021 16:04:51 -0700 (PDT) Received: from localhost.localdomain (84-217-56-54.customers.ownit.se. [84.217.56.54]) by smtp.gmail.com with ESMTPSA id v9sm1999563ljv.131.2021.06.07.16.04.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 16:04:51 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Jun 2021 01:04:06 +0200 Message-Id: <20210607230414.612-28-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20210607230414.612-1-dcnieho@gmail.com> References: <20210607230414.612-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 27/35] 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: opGLGqFAopux 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 252db47351..004b4e6154 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -56,6 +56,26 @@ static enum AVPixelFormat dshow_pixfmt(DWORD biCompression, WORD biBitCount) return avpriv_find_pix_fmt(avpriv_get_raw_pix_fmt_tags(), 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(DXVA_ExtendedFormat* fmt_info) { switch (fmt_info->NominalRange) @@ -1610,26 +1630,6 @@ static int dshow_control_message(AVFormatContext *avctx, int type, void *data, s return 0; } -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)