From: Simon Ser <simon.ser@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: martin.peres@intel.com
Subject: [igt-dev] [PATCH i-g-t v3 10/10] tests/kms_chamelium: add audio channel alignment test
Date: Mon, 27 May 2019 17:34:18 +0300 [thread overview]
Message-ID: <20190527143418.7925-11-simon.ser@intel.com> (raw)
In-Reply-To: <20190527143418.7925-1-simon.ser@intel.com>
The previous pulse test only checked the signal amplitude.
This commit adds a new check to the flatline test: channel alignment. This check
makes sure there is no time shift between each channel.
This is achieved by first sending a positive signal and then a falling edge.
Edges in each channel should be aligned.
The index of each channel's falling edge is stored in number of samples. I
chose not to implement a per-page test because the edge could be right between
two pages.
Signed-off-by: Simon Ser <simon.ser@intel.com>
Reviewed-by: Martin Peres <martin.peres@linux.intel.com>
---
tests/kms_chamelium.c | 100 ++++++++++++++++++++++++++++++++++++------
1 file changed, 86 insertions(+), 14 deletions(-)
diff --git a/tests/kms_chamelium.c b/tests/kms_chamelium.c
index 451a616f1a2e..49c3de0b7beb 100644
--- a/tests/kms_chamelium.c
+++ b/tests/kms_chamelium.c
@@ -773,7 +773,8 @@ test_display_frame_dump(data_t *data, struct chamelium_port *port)
#define MIN_STREAK 3
#define FLATLINE_AMPLITUDE 0.9 /* normalized, ie. in [0, 1] */
-#define FLATLINE_ACCURACY 0.001 /* ± 0.1% of the full amplitude */
+#define FLATLINE_AMPLITUDE_ACCURACY 0.001 /* ± 0.1 % of the full amplitude */
+#define FLATLINE_ALIGN_ACCURACY 0 /* number of samples */
/* TODO: enable >48KHz rates, these are not reliable */
static int test_sampling_rates[] = {
@@ -828,7 +829,7 @@ struct audio_state {
} playback, capture;
char *name;
- struct audio_signal *signal;
+ struct audio_signal *signal; /* for frequencies test only */
int channel_mapping[CHAMELIUM_MAX_AUDIO_CHANNELS];
size_t recv_pages;
@@ -839,6 +840,7 @@ struct audio_state {
pthread_t thread;
atomic_bool run;
+ atomic_bool positive; /* for pulse test only */
};
static void audio_state_init(struct audio_state *state, data_t *data,
@@ -1151,16 +1153,16 @@ static int audio_output_flatline_callback(void *data, void *buffer,
len = samples * state->playback.channels;
tmp = malloc(len * sizeof(double));
for (i = 0; i < len; i++)
- tmp[i] = FLATLINE_AMPLITUDE;
+ tmp[i] = (state->positive ? 1 : -1) * FLATLINE_AMPLITUDE;
audio_convert_to(buffer, tmp, len, state->playback.format);
free(tmp);
return state->run ? 0 : -1;
}
-static bool detect_flatline_amplitude(double *buf, size_t buf_len)
+static bool detect_flatline_amplitude(double *buf, size_t buf_len, bool pos)
{
- double min, max;
+ double expected, min, max;
size_t i;
bool ok;
@@ -1172,34 +1174,63 @@ static bool detect_flatline_amplitude(double *buf, size_t buf_len)
max = buf[i];
}
- ok = (min >= FLATLINE_AMPLITUDE - FLATLINE_ACCURACY &&
- max <= FLATLINE_AMPLITUDE + FLATLINE_ACCURACY);
+ expected = (pos ? 1 : -1) * FLATLINE_AMPLITUDE;
+ ok = (min >= expected - FLATLINE_AMPLITUDE_ACCURACY &&
+ max <= expected + FLATLINE_AMPLITUDE_ACCURACY);
if (ok)
- igt_debug("Flatline detected\n");
+ igt_debug("Flatline wave amplitude detected\n");
else
- igt_debug("Flatline not detected (min=%f, max=%f)\n",
+ igt_debug("Flatline amplitude not detected (min=%f, max=%f)\n",
min, max);
return ok;
}
+static ssize_t detect_falling_edge(double *buf, size_t buf_len)
+{
+ size_t i;
+
+ for (i = 0; i < buf_len; i++) {
+ if (buf[i] < 0)
+ return i;
+ }
+
+ return -1;
+}
+
+/** test_audio_flatline:
+ *
+ * Send a constant value (one positive, then a negative one) and check that:
+ *
+ * - The amplitude of the flatline is correct
+ * - All channels switch from a positive signal to a negative one at the same
+ * time (ie. all channels are aligned)
+ */
static bool test_audio_flatline(struct audio_state *state)
{
- bool success;
+ bool success, amp_success, align_success;
int32_t *recv;
size_t recv_len, i, channel_len;
+ ssize_t j;
int streak, capture_chan;
double *channel;
+ int falling_edges[CHAMELIUM_MAX_AUDIO_CHANNELS];
alsa_register_output_callback(state->alsa,
audio_output_flatline_callback, state,
PLAYBACK_SAMPLES);
+ /* Start by sending a positive signal */
+ state->positive = true;
+
audio_state_start(state, "flatline");
+ for (i = 0; i < state->playback.channels; i++)
+ falling_edges[i] = -1;
+
recv = NULL;
recv_len = 0;
- success = false;
- while (!success && state->msec < AUDIO_TIMEOUT) {
+ amp_success = false;
+ while (!amp_success && state->msec < AUDIO_TIMEOUT) {
audio_state_receive(state, &recv, &recv_len);
igt_debug("Detecting audio signal, t=%d msec\n", state->msec);
@@ -1220,17 +1251,58 @@ static bool test_audio_flatline(struct audio_state *state)
state->capture.channels,
capture_chan);
- if (detect_flatline_amplitude(channel, channel_len))
+ /* Check whether the amplitude is fine */
+ if (detect_flatline_amplitude(channel, channel_len,
+ state->positive))
streak++;
else
streak = 0;
+ /* If we're now sending a negative signal, detect the
+ * falling edge */
+ j = detect_falling_edge(channel, channel_len);
+ if (!state->positive && j >= 0) {
+ falling_edges[i] = recv_len * state->recv_pages
+ + j;
+ }
+
free(channel);
}
- success = streak == MIN_STREAK * state->playback.channels;
+ amp_success = streak == MIN_STREAK * state->playback.channels;
+
+ if (amp_success && state->positive) {
+ /* Switch to a negative signal after we've detected the
+ * positive one. */
+ state->positive = false;
+ amp_success = false;
+ streak = 0;
+ igt_debug("Switching to negative square wave\n");
+ }
+ }
+
+ /* Check alignment between all channels by comparing the index of the
+ * falling edge. */
+ align_success = true;
+ for (i = 0; i < state->playback.channels; i++) {
+ if (falling_edges[i] < 0) {
+ igt_debug("Falling edge not detected for channel %zu\n",
+ i);
+ align_success = false;
+ continue;
+ }
+
+ if (abs(falling_edges[0] - falling_edges[i]) >
+ FLATLINE_ALIGN_ACCURACY) {
+ igt_debug("Channel alignment mismatch: "
+ "channel 0 has a falling edge at index %d "
+ "while channel %zu has index %d\n",
+ falling_edges[0], i, falling_edges[i]);
+ align_success = false;
+ }
}
+ success = amp_success && align_success;
audio_state_stop(state, success);
free(recv);
--
2.21.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2019-05-27 14:35 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-27 14:34 [igt-dev] [PATCH i-g-t v3 00/10] tests/kms_chamelium: add pulse test Simon Ser
2019-05-27 14:34 ` [igt-dev] [PATCH i-g-t v3 01/10] lib/igt_chamelium: introduce CHAMELIUM_MAX_AUDIO_CHANNELS Simon Ser
2019-05-27 14:41 ` Peres, Martin
2019-05-27 14:34 ` [igt-dev] [PATCH i-g-t v3 02/10] tests/kms_chamelium: refactor audio test Simon Ser
2019-05-27 14:34 ` [igt-dev] [PATCH i-g-t v3 03/10] tests/kms_chamelium: introduce audio_state_receive Simon Ser
2019-05-27 14:34 ` [igt-dev] [PATCH i-g-t v3 04/10] tests/kms_chamelium: rename do_test_display_audio and test_audio_configuration Simon Ser
2019-05-27 14:34 ` [igt-dev] [PATCH i-g-t v3 05/10] tests/kms_chamelium: explain why 8-channel tests aren't performed Simon Ser
2019-05-27 14:34 ` [igt-dev] [PATCH i-g-t v3 06/10] lib/igt_audio: introduce audio_convert_to Simon Ser
2019-05-27 14:34 ` [igt-dev] [PATCH i-g-t v3 07/10] tests/kms_chamelium: add name parameter to audio_state_start Simon Ser
2019-05-27 14:34 ` [igt-dev] [PATCH i-g-t v3 08/10] lib/igt_audio: make audio_extract_channel_s32_le support a NULL dst Simon Ser
2019-05-27 14:34 ` [igt-dev] [PATCH i-g-t v3 09/10] tests/kms_chamelium: add a flatline audio test Simon Ser
2019-06-04 8:38 ` Tvrtko Ursulin
2019-06-04 11:22 ` Ser, Simon
2019-06-04 12:26 ` Peres, Martin
2019-06-04 12:59 ` Tvrtko Ursulin
2019-06-04 14:06 ` Ser, Simon
2019-06-05 10:51 ` Tvrtko Ursulin
2019-06-05 13:04 ` Ser, Simon
2019-06-05 13:30 ` Tvrtko Ursulin
2019-06-04 14:11 ` Ser, Simon
2019-05-27 14:34 ` Simon Ser [this message]
2019-05-27 16:03 ` [igt-dev] ✓ Fi.CI.BAT: success for tests/kms_chamelium: add pulse test (rev3) Patchwork
2019-05-28 4:48 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190527143418.7925-11-simon.ser@intel.com \
--to=simon.ser@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=martin.peres@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox