From nobody Sat May 10 08:42:53 2025 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1606216114; cv=none; d=zohomail.com; s=zohoarc; b=MlEPQ+yJRG4IQ3UaXAAmLPxjX/xlQByeVh8zSU3AfA9++jUF14MI3/4RZSyTmCxkgyk6UEtKJ8KRRHR3BOFS6KKmZntquwcD2Tr36ctKuRAVReUXoCb4/AV2pkcN85nyDTieJoRCoJOXSIu5mrCYnDlg42DcURyKffwwdgveJBs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606216114; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0K3W79eAnuJKdx4Rdlx5rfsE95dijEy6bQWreAGxKZc=; b=EStSMevJ2xW8TObF1GgXfNuDa3L2jCYXOj3wxm6MO2HSUIqsp0OiyE56rsr6nesAYxjzPbt/rKfvghBR/Eh7JK2HLIdpWVMks9joGT1jH0bUfH8TbY+hGA7XVEUEzAz6yd8JKl1eXYJTQ0Lj565KP+LBfZ23zSAMnYHnMLGQ4lk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1606216114161593.1632394481387; Tue, 24 Nov 2020 03:08:34 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732552AbgKXLIG (ORCPT ); Tue, 24 Nov 2020 06:08:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:33788 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732396AbgKXLGe (ORCPT ); Tue, 24 Nov 2020 06:06:34 -0500 Received: from mail.kernel.org (ip5f5ad5c3.dynamic.kabel-deutschland.de [95.90.213.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D86CF2087D; Tue, 24 Nov 2020 11:06:30 +0000 (UTC) Received: from mchehab by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1khW9U-000FZW-Md; Tue, 24 Nov 2020 12:06:28 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1606215991; bh=LPkeR/qG2W2eIVXvr9zXEat7TJyfsb0x7hepNAhfTaw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UScstHOwwtThWTYv7kUNKTZRNcFgRmFygdzFbkjsnSR3L4BQHv3Fuv0T+I/C2shTS Wr3AoM/BVnzcc0imRGPSwDQ/qFNtIYIq8F1WRS7noWt6QIgCryP1TjflcJZIrj/vGO 2YQBwspPAzTax77sM9odjEeXGkg860qmrHVxzlf0= From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , "Daniel W. S. Almeida" , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 05/31] media: vidtv: fix the tone generator logic Date: Tue, 24 Nov 2020 12:06:01 +0100 Message-Id: <4421cda35fe8d3d80687f27030108b9dcdc924d1.1606215584.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The tone generator logic were repeating the song after the first silent. There's also a wrong logic at the note offset calculus, which may create some noise. Fix it. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/test-drivers/vidtv/vidtv_s302m.c | 14 ++++---------- drivers/media/test-drivers/vidtv/vidtv_s302m.h | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/media/test-drivers/vidtv/vidtv_s302m.c b/drivers/media= /test-drivers/vidtv/vidtv_s302m.c index cbf89530aafe..fdb3d649c516 100644 --- a/drivers/media/test-drivers/vidtv/vidtv_s302m.c +++ b/drivers/media/test-drivers/vidtv/vidtv_s302m.c @@ -253,18 +253,12 @@ static u16 vidtv_s302m_get_sample(struct vidtv_encode= r *e) ctx->last_duration--; } =20 - /* Handle silent */ - if (!ctx->last_tone) { - e->src_buf_offset =3D 0; + /* Handle pause notes */ + if (!ctx->last_tone) return 0x8000; - } =20 - pos =3D (2 * PI * ctx->note_offset * ctx->last_tone / S302M_SAMPLING_RAT= E_HZ); - - if (pos =3D=3D 360) - ctx->note_offset =3D 0; - else - ctx->note_offset++; + pos =3D (2 * PI * ctx->note_offset * ctx->last_tone) / S302M_SAMPLING_RA= TE_HZ; + ctx->note_offset++; =20 return (fixp_sin32(pos % (2 * PI)) >> 16) + 0x8000; } diff --git a/drivers/media/test-drivers/vidtv/vidtv_s302m.h b/drivers/media= /test-drivers/vidtv/vidtv_s302m.h index a0101734e758..e990b755bb20 100644 --- a/drivers/media/test-drivers/vidtv/vidtv_s302m.h +++ b/drivers/media/test-drivers/vidtv/vidtv_s302m.h @@ -39,7 +39,7 @@ struct vidtv_s302m_ctx { u32 frame_index; u32 au_count; int last_duration; - int note_offset; + unsigned int note_offset; enum musical_notes last_tone; }; =20 --=20 2.28.0