From nobody Sat May 10 05:27:52 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=1606216111; cv=none; d=zohomail.com; s=zohoarc; b=GfbfQYnUZgP9Dyupxn/nBrsE+gwQV7B823SxZEZKz4QEJSE+AU1YvgELwSmyROciRZZprbJQPNfs8KWaVqanWBa/yjT0ccDrKhhbBj9l4oSF8N+fvyb9A2TL5+QfqEDLH6WFraSrCvpmv0BzoszGk6VnpMc5xxQOmLUt5nXVtlc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606216111; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bco2WqLESL2crERQ3ayRDSbCPnGPdhe3kSA2g2QrNnE=; b=lB7C0PfAk81glkqB6ixBn+X45Oc8urUvTurlnEMfbvP1srDrGNUzLuSfEZhsYsROQ4OavAIQSa3FfhzkYaeZbPUb4ghfsb2us9UP1Rdc48RwRuPRjPuB0qjNkjqE9JVEqc8J+vuaD/krRpRT6r2ia+wwAgBRSPP/uVn6+I8zXvQ= 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 1606216111567624.2003366045194; Tue, 24 Nov 2020 03:08:31 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732746AbgKXLHf (ORCPT ); Tue, 24 Nov 2020 06:07:35 -0500 Received: from mail.kernel.org ([198.145.29.99]:33784 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732256AbgKXLGf (ORCPT ); Tue, 24 Nov 2020 06:06:35 -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 D498A20866; 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-000FZT-Lo; 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=zJ7FMVeTSgK/rMUfd3h8Ux7PgJe3tKDQtxM+uNJAv7w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OH3UM8Z1VDRx8tsYE5CWrlaR+NIMzlXSMFprAScFsfWeleMJ+uGbKLCfchC5R4e9O NIEKktNIGW773jIiXdLABF8Q2HFS3hpN1iJnPPVYPt57tnRUdvXnsABocImnGW+G91 rWBQG8I1FybU8mo+aKFY6gvToTT/XhLWPfUS6P4Q= 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 04/31] media: vidtv: fix the name of the program Date: Tue, 24 Nov 2020 12:06:00 +0100 Message-Id: <03e3c6b73a23aa27f5f602ef235df835c25d8b23.1606215584.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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) While the original plan was to use the first movement of the 5th Symphony, it was opted to use the F=C3=BCr Elise song, instead. Fix it. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/test-drivers/vidtv/vidtv_channel.c | 2 +- drivers/media/test-drivers/vidtv/vidtv_s302m.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/media/test-drivers/vidtv/vidtv_channel.c b/drivers/med= ia/test-drivers/vidtv/vidtv_channel.c index b2d44d7e78b6..d80b1a56c90c 100644 --- a/drivers/media/test-drivers/vidtv/vidtv_channel.c +++ b/drivers/media/test-drivers/vidtv/vidtv_channel.c @@ -61,7 +61,7 @@ struct vidtv_channel char *provider =3D ENCODING_ISO8859_15 "LinuxTV.org"; char *iso_language_code =3D ENCODING_ISO8859_15 "eng"; char *event_name =3D ENCODING_ISO8859_15 "Beethoven Music"; - char *event_text =3D ENCODING_ISO8859_15 "Beethoven's 5th Symphony"; + char *event_text =3D ENCODING_ISO8859_15 "Beethoven's F=C3=BCr Elise"; const u16 s302m_beethoven_event_id =3D 1; struct vidtv_channel *s302m; struct vidtv_s302m_encoder_init_args encoder_args =3D {}; diff --git a/drivers/media/test-drivers/vidtv/vidtv_s302m.c b/drivers/media= /test-drivers/vidtv/vidtv_s302m.c index 146e4e9d361b..cbf89530aafe 100644 --- a/drivers/media/test-drivers/vidtv/vidtv_s302m.c +++ b/drivers/media/test-drivers/vidtv/vidtv_s302m.c @@ -79,7 +79,7 @@ struct tone_duration { }; =20 #define COMPASS 120 /* beats per minute (Allegro) */ -static const struct tone_duration beethoven_5th_symphony[] =3D { +static const struct tone_duration beethoven_fur_elise[] =3D { { NOTE_E_6, 128}, { NOTE_DS_6, 128}, { NOTE_E_6, 128}, { NOTE_DS_6, 128}, { NOTE_E_6, 128}, { NOTE_B_5, 128}, { NOTE_D_6, 128}, { NOTE_C_6, 128}, { NOTE_A_3, 128}, @@ -238,14 +238,14 @@ static u16 vidtv_s302m_get_sample(struct vidtv_encode= r *e) if (!e->src_buf) { /* * Simple tone generator: play the tones at the - * beethoven_5th_symphony array. + * beethoven_fur_elise array. */ if (ctx->last_duration <=3D 0) { - if (e->src_buf_offset >=3D ARRAY_SIZE(beethoven_5th_symphony)) + if (e->src_buf_offset >=3D ARRAY_SIZE(beethoven_fur_elise)) e->src_buf_offset =3D 0; =20 - ctx->last_tone =3D beethoven_5th_symphony[e->src_buf_offset].note; - ctx->last_duration =3D beethoven_5th_symphony[e->src_buf_offset].durati= on * + ctx->last_tone =3D beethoven_fur_elise[e->src_buf_offset].note; + ctx->last_duration =3D beethoven_fur_elise[e->src_buf_offset].duration * S302M_SAMPLING_RATE_HZ / COMPASS / 5; e->src_buf_offset++; ctx->note_offset =3D 0; --=20 2.28.0