From patchwork Mon Nov 23 19:37:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24010 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id A8F1144B44C for ; Mon, 23 Nov 2020 21:41:57 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 01F7D68BC85; Mon, 23 Nov 2020 21:38:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A2F3968BB73 for ; Mon, 23 Nov 2020 21:38:31 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id m6so19782158wrg.7 for ; Mon, 23 Nov 2020 11:38:31 -0800 (PST) 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:reply-to :mime-version:content-transfer-encoding; bh=UytiSE94algv3KgfQNDWCTavyVne2LWrjeqmf5VStjg=; b=i0l6eRrkmiyNR0v1la6yfKD1VJ9ljt3h2tCnxBHe2OsBtg8FezWvrFH80Sn+cWrY4U yrEYsENo6Omn0SyuZ3EIcjlVcP7wV418f8S10UIQ6DohU87C4jLxKM+c4+9tRzy9Me// HumYwCbbzw8l6a1OG63sfqLIC9Tou5kMr6SSV76TUm7UgpZZZgZjLJxG3lhMAI7rUSVh z/rrtQQbZ9Whq54Gu3c3bvELB1BlLTzSe493NRY28v5BTMStQDpHWuB2dgjQOsS+nRjQ nL5GLjzqjKR8Cj+N13zR6JLBNUALk5U6Z/l5eLDLLWnHRfXAnHL2GSuJUoKowv488EYu SbEg== 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:reply-to:mime-version:content-transfer-encoding; bh=UytiSE94algv3KgfQNDWCTavyVne2LWrjeqmf5VStjg=; b=Tiwq74N6+VpYeQmyhZdxpNPXHLUW8dAMUZSZaoBMRDSnlElf6IianCuIyWc1YMy0bA 4yXb707UthhaJ4SitLVctB5F579w33+plQBFb4lIACxvsTfwdtgOPBzsyCINjivw2oEh 26lzkOxgSjRNDr5DQeg/LoggzRP6bcoiUCMvO1ZXuWwVFXJI/V+tqVoEOKpPkuvWDV3K edLyRGcZD3ljKMJfCd+g1xAbFaGs+kCvBDbctFIOWm/kOimxhwh4yXoUGIhwA+YQSvF/ uAAnHTU/12lT1BzrXXbmzUQjT2o8MXtqmIM+7SUqxLVPhWy4iYpZM3vS+G/FAsdhw0bt +yJg== X-Gm-Message-State: AOAM533jrOQtU4KDXq0hLkE1di2zXE03J7+UJweGTQBNr2FJRZv2qT9J 5afqaNevhDNmoIrQdIs9DFhIkCmq4I/THA== X-Google-Smtp-Source: ABdhPJy3YZD5AVDEnR1jOSxIM4hJwDIx+Y2thdWPgSxiunFRuJyzga53kfD6coDVNZnV2N04EJ1IaA== X-Received: by 2002:adf:eacb:: with SMTP id o11mr1339479wrn.208.1606160310770; Mon, 23 Nov 2020 11:38:30 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id e6sm564086wme.27.2020.11.23.11.38.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 11:38:30 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Nov 2020 20:37:36 +0100 Message-Id: <20201123193739.1249300-26-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> References: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 188/191] avcodec/dsddec: Inline constant X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/dsddec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/dsddec.c b/libavcodec/dsddec.c index 375e49341f..9814c9eb82 100644 --- a/libavcodec/dsddec.c +++ b/libavcodec/dsddec.c @@ -27,11 +27,11 @@ */ #include "libavcodec/internal.h" -#include "libavcodec/mathops.h" #include "avcodec.h" #include "dsd.h" #define DSD_SILENCE 0x69 +#define DSD_SILENCE_REVERSED 0x96 /* 0x69 = 01101001 * This pattern "on repeat" makes a low energy 352.8 kHz tone * and a high energy 1.0584 MHz tone which should be filtered @@ -53,7 +53,7 @@ static av_cold int decode_init(AVCodecContext *avctx) if (!s) return AVERROR(ENOMEM); - silence = avctx->codec_id == AV_CODEC_ID_DSD_LSBF || avctx->codec_id == AV_CODEC_ID_DSD_LSBF_PLANAR ? ff_reverse[DSD_SILENCE] : DSD_SILENCE; + silence = avctx->codec_id == AV_CODEC_ID_DSD_LSBF || avctx->codec_id == AV_CODEC_ID_DSD_LSBF_PLANAR ? DSD_SILENCE_REVERSED : DSD_SILENCE; for (i = 0; i < avctx->channels; i++) { s[i].pos = 0; memset(s[i].buf, silence, sizeof(s[i].buf));