Skip to content

L
linux
Commit c5d83ba2 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files
Options

media: vidtv: Add a music instead of playing a single tone 

Keep playing a single tone is not too nice, and prevents
checking some weird things.

So, instead, implement a simple tone generator, changing
the code to play a public domain song (5th Symphony of
Beethoven), using sinusoidal waves.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent c2a9baf9
Hide whitespace changes
Inline Side-by-side
Showing with 165 additions and 9 deletions
drivers/media/test-drivers/vidtv/vidtv_encoder.h
View file @ c5d83ba2
...@@ -28,6 +28,73 @@ struct vidtv_access_unit { ...@@ -28,6 +28,73 @@ struct vidtv_access_unit {
struct vidtv_access_unit *next; struct vidtv_access_unit *next;
}; };
/* Some musical notes, used by a tone generator */
enum musical_notes {
NOTE_SILENT = 0,
NOTE_C_2 = 65,
NOTE_CS_2 = 69,
NOTE_D_2 = 73,
NOTE_DS_2 = 78,
NOTE_E_2 = 82,
NOTE_F_2 = 87,
NOTE_FS_2 = 93,
NOTE_G_2 = 98,
NOTE_GS_2 = 104,
NOTE_A_2 = 110,
NOTE_AS_2 = 117,
NOTE_B_2 = 123,
NOTE_C_3 = 131,
NOTE_CS_3 = 139,
NOTE_D_3 = 147,
NOTE_DS_3 = 156,
NOTE_E_3 = 165,
NOTE_F_3 = 175,
NOTE_FS_3 = 185,
NOTE_G_3 = 196,
NOTE_GS_3 = 208,
NOTE_A_3 = 220,
NOTE_AS_3 = 233,
NOTE_B_3 = 247,
NOTE_C_4 = 262,
NOTE_CS_4 = 277,
NOTE_D_4 = 294,
NOTE_DS_4 = 311,
NOTE_E_4 = 330,
NOTE_F_4 = 349,
NOTE_FS_4 = 370,
NOTE_G_4 = 392,
NOTE_GS_4 = 415,
NOTE_A_4 = 440,
NOTE_AS_4 = 466,
NOTE_B_4 = 494,
NOTE_C_5 = 523,
NOTE_CS_5 = 554,
NOTE_D_5 = 587,
NOTE_DS_5 = 622,
NOTE_E_5 = 659,
NOTE_F_5 = 698,
NOTE_FS_5 = 740,
NOTE_G_5 = 784,
NOTE_GS_5 = 831,
NOTE_A_5 = 880,
NOTE_AS_5 = 932,
NOTE_B_5 = 988,
NOTE_C_6 = 1047,
NOTE_CS_6 = 1109,
NOTE_D_6 = 1175,
NOTE_DS_6 = 1245,
NOTE_E_6 = 1319,
NOTE_F_6 = 1397,
NOTE_FS_6 = 1480,
NOTE_G_6 = 1568,
NOTE_GS_6 = 1661,
NOTE_A_6 = 1760,
NOTE_AS_6 = 1865,
NOTE_B_6 = 1976,
NOTE_C_7 = 2093
};
/** /**
* struct vidtv_encoder - A generic encoder type. * struct vidtv_encoder - A generic encoder type.
* @id: So we can cast to a concrete implementation when needed. * @id: So we can cast to a concrete implementation when needed.
...@@ -64,6 +131,9 @@ struct vidtv_encoder { ...@@ -64,6 +131,9 @@ struct vidtv_encoder {
u32 encoder_buf_offset; u32 encoder_buf_offset;
u64 sample_count; u64 sample_count;
int last_duration;
int note_offset;
enum musical_notes last_tone;
struct vidtv_access_unit *access_units; struct vidtv_access_unit *access_units;
......
drivers/media/test-drivers/vidtv/vidtv_s302m.c
View file @ c5d83ba2
...@@ -40,6 +40,9 @@ ...@@ -40,6 +40,9 @@
#define S302M_BLOCK_SZ 192 #define S302M_BLOCK_SZ 192
#define S302M_SIN_LUT_NUM_ELEM 1024 #define S302M_SIN_LUT_NUM_ELEM 1024
/* Used by the tone generator: number of samples for PI */
#define PI 180
static const u8 reverse[256] = { static const u8 reverse[256] = {
/* from ffmpeg */ /* from ffmpeg */
0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0, 0x10, 0x90, 0x50, 0xD0, 0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0, 0x10, 0x90, 0x50, 0xD0,
...@@ -66,10 +69,74 @@ static const u8 reverse[256] = { ...@@ -66,10 +69,74 @@ static const u8 reverse[256] = {
0x3F, 0xBF, 0x7F, 0xFF, 0x3F, 0xBF, 0x7F, 0xFF,
}; };
/* Used by the tone generator */ struct tone_duration {
#define SAMPLE_RATE 48000 enum musical_notes note;
#define PI 180 int duration;
#define NOTE_A4 440 };
#define COMPASS 120 /* beats per minute (Allegro) */
static const struct tone_duration beethoven_5th_symphony[] = {
{ 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},
{ NOTE_E_4, 128}, { NOTE_A_4, 128}, { NOTE_C_5, 128},
{ NOTE_E_5, 128}, { NOTE_A_5, 128}, { NOTE_E_3, 128},
{ NOTE_E_4, 128}, { NOTE_GS_4, 128}, { NOTE_E_5, 128},
{ NOTE_GS_5, 128}, { NOTE_B_5, 128}, { NOTE_A_3, 128},
{ NOTE_E_4, 128}, { NOTE_A_4, 128}, { NOTE_E_5, 128},
{ 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},
{ NOTE_E_4, 128}, { NOTE_A_4, 128}, { NOTE_C_5, 128},
{ NOTE_E_5, 128}, { NOTE_A_5, 128}, { NOTE_E_3, 128},
{ NOTE_E_4, 128}, { NOTE_GS_4, 128}, { NOTE_E_5, 128},
{ NOTE_C_6, 128}, { NOTE_B_5, 128}, { NOTE_A_3, 128},
{ NOTE_E_4, 128}, { NOTE_A_4, 128}, { NOTE_SILENT, 128},
{ 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},
{ NOTE_E_4, 128}, { NOTE_A_4, 128}, { NOTE_C_5, 128},
{ NOTE_E_5, 128}, { NOTE_A_5, 128}, { NOTE_E_3, 128},
{ NOTE_E_4, 128}, { NOTE_GS_4, 128}, { NOTE_E_5, 128},
{ NOTE_GS_5, 128}, { NOTE_B_5, 128}, { NOTE_A_3, 128},
{ NOTE_E_4, 128}, { NOTE_A_4, 128}, { NOTE_E_5, 128},
{ 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},
{ NOTE_E_4, 128}, { NOTE_A_4, 128}, { NOTE_C_5, 128},
{ NOTE_E_5, 128}, { NOTE_A_5, 128}, { NOTE_E_3, 128},
{ NOTE_E_4, 128}, { NOTE_GS_4, 128}, { NOTE_E_5, 128},
{ NOTE_C_6, 128}, { NOTE_B_5, 128}, { NOTE_A_3, 128},
{ NOTE_E_4, 128}, { NOTE_A_4, 128}, { NOTE_B_4, 128},
{ NOTE_C_5, 128}, { NOTE_D_5, 128}, { NOTE_C_4, 128},
{ NOTE_G_4, 128}, { NOTE_C_5, 128}, { NOTE_G_4, 128},
{ NOTE_F_5, 128}, { NOTE_E_5, 128}, { NOTE_G_3, 128},
{ NOTE_G_4, 128}, { NOTE_B_3, 128}, { NOTE_F_4, 128},
{ NOTE_E_5, 128}, { NOTE_D_5, 128}, { NOTE_A_3, 128},
{ NOTE_E_4, 128}, { NOTE_A_4, 128}, { NOTE_E_4, 128},
{ NOTE_D_5, 128}, { NOTE_C_5, 128}, { NOTE_E_3, 128},
{ NOTE_E_4, 128}, { NOTE_E_5, 255}, { NOTE_E_6, 128},
{ NOTE_E_5, 128}, { NOTE_E_6, 128}, { NOTE_E_5, 255},
{ NOTE_DS_5, 128}, { NOTE_E_5, 128}, { NOTE_DS_6, 128},
{ NOTE_E_6, 128}, { NOTE_DS_5, 128}, { NOTE_E_5, 128},
{ NOTE_DS_6, 128}, { 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}, { NOTE_E_4, 128}, { NOTE_A_4, 128},
{ NOTE_C_5, 128}, { NOTE_E_5, 128}, { NOTE_A_5, 128},
{ NOTE_E_3, 128}, { NOTE_E_4, 128}, { NOTE_GS_4, 128},
{ NOTE_E_5, 128}, { NOTE_GS_5, 128}, { NOTE_B_5, 128},
{ NOTE_A_3, 128}, { NOTE_E_4, 128}, { NOTE_A_4, 128},
{ NOTE_E_5, 128}, { 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}, { NOTE_E_4, 128}, { NOTE_A_4, 128},
{ NOTE_C_5, 128}, { NOTE_E_5, 128}, { NOTE_A_5, 128},
{ NOTE_E_3, 128}, { NOTE_E_4, 128}, { NOTE_GS_4, 128},
{ NOTE_E_5, 128}, { NOTE_C_6, 128}, { NOTE_B_5, 128},
{ NOTE_C_5, 255}, { NOTE_C_5, 255}, { NOTE_SILENT, 512},
};
static struct vidtv_access_unit *vidtv_s302m_access_unit_init(struct vidtv_access_unit *head) static struct vidtv_access_unit *vidtv_s302m_access_unit_init(struct vidtv_access_unit *head)
{ {
...@@ -187,15 +254,33 @@ static u16 vidtv_s302m_get_sample(struct vidtv_encoder *e) ...@@ -187,15 +254,33 @@ static u16 vidtv_s302m_get_sample(struct vidtv_encoder *e)
if (!e->src_buf) { if (!e->src_buf) {
/* /*
* Simple tone generator. For now, just generates a 440 Hz * Simple tone generator: play the tones at the
* sinusoidal wave. * beethoven_5th_symphony array.
*/ */
pos = (2 * PI * e->src_buf_offset * NOTE_A4 / SAMPLE_RATE); if (e->last_duration <= 0) {
if (e->src_buf_offset >= ARRAY_SIZE(beethoven_5th_symphony))
e->src_buf_offset = 0;
if (pos == 360) e->last_tone = beethoven_5th_symphony[e->src_buf_offset].note;
e->last_duration = beethoven_5th_symphony[e->src_buf_offset].duration * S302M_SAMPLING_RATE_HZ / COMPASS / 5;
e->src_buf_offset++;
e->note_offset = 0;
} else {
e->last_duration--;
}
/* Handle silent */
if (!e->last_tone) {
e->src_buf_offset = 0; e->src_buf_offset = 0;
return 0x8000;
}
pos = (2 * PI * e->note_offset * e->last_tone / S302M_SAMPLING_RATE_HZ);
if (pos == 360)
e->note_offset = 0;
else else
e->src_buf_offset++; e->note_offset++;
return (fixp_sin32(pos % (2 * PI)) >> 16) + 0x8000; return (fixp_sin32(pos % (2 * PI)) >> 16) + 0x8000;
} }
...@@ -388,6 +473,7 @@ struct vidtv_encoder ...@@ -388,6 +473,7 @@ struct vidtv_encoder
e->encoder_buf_offset = 0; e->encoder_buf_offset = 0;
e->sample_count = 0; e->sample_count = 0;
e->last_duration = 0;
e->src_buf = (args.src_buf) ? args.src_buf : NULL; e->src_buf = (args.src_buf) ? args.src_buf : NULL;
e->src_buf_sz = (args.src_buf) ? args.src_buf_sz : 0; e->src_buf_sz = (args.src_buf) ? args.src_buf_sz : 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7