From patchwork Wed Mar 30 12:17:59 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: 35056 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp774508pzb; Wed, 30 Mar 2022 05:20:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyihUO+ANUZlqbVHfj0xjl0N/IFjMP/pt//ITWLN46TNGazOoVdFFeAGsbkimcKbjBU/HZe X-Received: by 2002:a17:907:3d01:b0:6e0:c63b:1992 with SMTP id gm1-20020a1709073d0100b006e0c63b1992mr27033782ejc.422.1648642848388; Wed, 30 Mar 2022 05:20:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648642848; cv=none; d=google.com; s=arc-20160816; b=XqXpuu22XUllhEklkwH8ZbJwhdP50CEQAKFur2m5TBNZn3irLF34XvTMwotUXqCIdZ 2uG0ejmvOP1fy+c3t5RoLr1CpfTZ0uHtjCyUpTGb2Nu7vrApcJq/0BpohyBs74hqxY+D izPNZKs5k+Odh1knz5izseGcIkVQ5VIL2V14L84psBjY6FocDnRgtoVVoVWNkEf/HNlG ro9pze/PZ8IYTIAYCb5CIz6vLAVEaq/fAAm1GwTC1Fm+MpRCWAHbeDOaFqZqZc2UwGvL 98jhABAywh30alh/SSQyMJti7Oe89ax7ctbPbR7laRY3Ukn7YgMMxnImv+FJs1ALSEuO CiRQ== 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=uRSCCBbVVwFm0Dd1iSZrN71AaeMG46GNnEk/XslofhNhFH9tP+jSjael5Ll5dXfySH LKlwaKO34IashpQqHE2toZI0Hkc+CcOleZ0Nai2AJqsBQO3EzO/G+QBlT/9lq/AZlgxD PaRpaxLprO7rd7LoKG85E3sbyktN4uugeqXutygUkvmbCfAsqws+OS3OGW0wHybYt6eZ pi4MZ8ZdXBOXf6fmtCLZNX5Gah7gWijNie0xN6UC+cJV3MoEBbLoNFSfax4rypHcEZ5e lXHcgO+aF5GgYXb4j/YhsmvgKQa9AkhJu9QuQa9Bl+p/I0B3RkmNY7rdfxXIXKxwlkCa Ak9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="Ypz/uDZ2"; 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 go11-20020a1709070d8b00b006e08c4b10fesi28776662ejc.772.2022.03.30.05.20.48; Wed, 30 Mar 2022 05:20:48 -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="Ypz/uDZ2"; 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 1FB3968B21F; Wed, 30 Mar 2022 15:20:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 19E8468B1EB for ; Wed, 30 Mar 2022 15:19:53 +0300 (EEST) Received: by mail-lf1-f45.google.com with SMTP id h7so35493789lfl.2 for ; Wed, 30 Mar 2022 05:19:53 -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=Ypz/uDZ2E9xpezKplFNTDuIq5JlAfEdKY4l6VAQyGarenxjY8c81rc3rhlHr6EroYW rPCMNC2Sl66BOGEsNYxo1sgEeuWvGC7CnPLteHvMY0nziQRUAO+KRzsHjG5KFBVJvwEZ ksm9wRf1TEpW40d2QeWON9WVlRA/7ifCV1u9H3wBa9it3yodVuECsw1kM5YtZZABhXu/ HwCbc92QjdF7jJKIzAQH2y12+5vd0q9ljbk9AkTYfQlZcVMzNxnGavg2StgSD6y3rj1w +DScg5aDi6l8/yMl/JqbsyXvApnhnPYvDx3ipvUuAenjUxz+6szL+iLQyA3wwOmQUnqa RGyg== 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=Hl1CAZnmHQuOtgeuqRR3QxFZl+sm6UmdOHQ3CdXoSN2If6slTkOqxI9xv6yHw53idw M0hL+vtVONKGEgPKUj2WelFgsMH/DuOFPuv9+fgjNMaJZbUgLGlr9/lx84u5DaLgL4QL NC1Hdz2Q/rPRKgVLwJWL9ZsG/popYoFQRcHZFEGtLpNDytVVYyziflfo6/hmDWCFMfTH lQ8nwNk7o7t+ZR1ZJW8Ge9dTKdSyBesQtCaDGj4xOR91nQX6xbPMw4FAn/5jiX3iAy08 pvzGYf82o1ZWiqF5t7JQUX+RF5l9OMlvBbJXMdsKepi0SYmNmj8srzF0AqxvO9RT+REg VPEw== X-Gm-Message-State: AOAM533h9oRAWnzdlrbQ4GAhcZJO8BzpBU7PEEfmwPQpf5iLLrPiCCFq dPqMhKkqqwTdN+tky1iogaxIZ+1CJr8= X-Received: by 2002:a05:6512:3f0a:b0:44a:e3f:2862 with SMTP id y10-20020a0565123f0a00b0044a0e3f2862mr6597721lfa.397.1648642792273; Wed, 30 Mar 2022 05:19:52 -0700 (PDT) Received: from localhost.localdomain (deedock.humlab.lu.se. [130.235.135.183]) by smtp.gmail.com with ESMTPSA id r20-20020a2e5754000000b002480655267dsm2283128ljd.67.2022.03.30.05.19.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Mar 2022 05:19:51 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Wed, 30 Mar 2022 14:17:59 +0200 Message-Id: <20220330121806.822-15-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20220330121806.822-1-dcnieho@gmail.com> References: <20220330121806.822-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 14/21] 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: g9XS0Pl2cbJM 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)