From patchwork Tue Jul 6 09:20:12 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: 28808 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp4922354ios; Tue, 6 Jul 2021 02:26:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwGYtilez3f0iIfPEPbNPzTnxeFmW3vZ7ZCZW8mFbtjgJU4Hr5QPx4DlTOuqVUOJeiAIdBP X-Received: by 2002:a05:6402:d4a:: with SMTP id ec10mr3705496edb.104.1625563565403; Tue, 06 Jul 2021 02:26:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625563565; cv=none; d=google.com; s=arc-20160816; b=s9yk64X7XUwPoISNW9WoeoZ31pxu81iXLaFZGbwQANzqNs3YGhAnnSpnCmhweUix8K 2FF/y+KtkX3gJ4xW0KPVnwnPH7b3keorOvjZZ0FheneeMxUgFPmsPtQaq1P0Q3Lko5nm iNsbJl2aEVgxv8mGc5hAJAEbyM9wGJ9g0R/38swUiJwfYvxnSa06LqftriaQfwvJtTa5 W2jteGQWOry6JYERWauxjS1agtLoiGVvLIqBgI+UGyb4MBy63rLRRvw8nDgoEnUTD+1J zYaiiFfaFddnuvxaUBrsCmHMQn+CIXO8TPj5lM4rNpicmW80lhJcNfK8tl1VqS8YPXZb P7cw== 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=26b+l0uiGi3g2EY99v4JTeu6pcwxAkH0QkV1mNKql+c=; b=gCIHEUW5sbJGHnfSt3X3zPAtdhE2Wurv/CryUEHcxJdRKqkvTM8ofW96iMH/bH3CYN zoLA2Yk22dWLYtpCmKmuvvNpVTTvDGC6p6Zj0bS+NkY3Sgfawx98gtrkQxJS39m0ykqc eGc7spl7CzzUp668xT+wson2/GVznvl68K1+0IlbVXaTsL1RXJU3QiFbKxMuRlk0ZGAa DmjZ1rTbZRtipuGEsdh3HWlktTQz9K3Q5jNyh2oH7XvYLAwQMJTKH7s+NektDX/VAwVm qmZ/oSDkfi4Og1RVlFvDvFp93YD8+pkBmk39Yi7Hcob4tovN8zzjGlB9vmADbobGLo3G g98A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="n/iAMM9B"; 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 cf28si6366767edb.137.2021.07.06.02.26.05; Tue, 06 Jul 2021 02:26:05 -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="n/iAMM9B"; 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 5C86968A654; Tue, 6 Jul 2021 12:25:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9AEC868A88B for ; Tue, 6 Jul 2021 12:25:54 +0300 (EEST) Received: by mail-lf1-f54.google.com with SMTP id p16so9715224lfc.5 for ; Tue, 06 Jul 2021 02:25:54 -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=xAqHskn3QndmsV6c7v0UizVEfsfEJ8gymPJtCdK1HLg=; b=n/iAMM9BnDySAMn+a9Dz+baoqOy6e8GHbARn3YSIOr4iO4QaLm5+gcYeZNbnYrQEe9 E76R8LdyLdvUtpLeFFe5zWZXg3y+rsXjtBRrIf/+Q8ywV43DbKWG9rfJda5j4A1719AV ycU6jkkyQpCiGs6ufDegrK9jY0VIzbKiKl93LOkPSV9rObPy2prqInYCu41Sc94DH4VS wxlsTyeLLv4yHOYB0gwiyxmOT8rL0VsK4SK98kh/7qB5bFaVSr5V6V6rCimGGuBpujn0 Ym2sg1gMSVuQLkvBZsg/RM719THZEI7+i/EHTJK5yzSu/K2cZ1f+yr8Oayn2tPvuKZOI BfIw== 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=xAqHskn3QndmsV6c7v0UizVEfsfEJ8gymPJtCdK1HLg=; b=TAiJcepdbyLO2uShUBxm5ptHu/zRC3+dSUKnCAo62qMKjPMYngiOURh1oZskIyuk4S ztnUc1ufB+/t+KAROTGFlMl1Fl/V1w22oOA6+sN0i+FlyifaMvv1EmQLxJDjAaHN5gU8 aJXsrO6Ewl7cTbiI47Oy7UpXXsdL2eXcQ06EMaFPtuPARON08ulVIkajIicoGdrKMtGR t2se8jhXG5LJZyyXmRmyhiFX6nIrmjr2k9Yivs3pUuzuMpGtDCyYIRs8PYM+VO0V8YGf opWdFQIIOVAGmlP8nxxD9FubLG/YYDfFfIUZYs7vo0ENEYutJ0vuhbObgtSIjifbkkNC QAQg== X-Gm-Message-State: AOAM531mOp/89EvF/P0+TTxoZu+xNAN5aMtepNdMBhK02MRYpZ7YFS5a aDX1g9fz1MNcidWLnh7tDujP48Nheas= X-Received: by 2002:ac2:4e98:: with SMTP id o24mr13830970lfr.604.1625563553756; Tue, 06 Jul 2021 02:25:53 -0700 (PDT) Received: from localhost.localdomain (deedock.humlab.lu.se. [130.235.135.183]) by smtp.gmail.com with ESMTPSA id d6sm1335617lfc.183.2021.07.06.02.25.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 02:25:53 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Jul 2021 11:20:12 +0200 Message-Id: <20210706092020.1057-27-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 26/34] 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: uMuelUMGfFWu 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 5b9f61926b..bc3cc2caa2 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -80,6 +80,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(DXVA2_ExtendedFormat *fmt_info) { switch (fmt_info->NominalRange) @@ -1632,26 +1652,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)