fix alsa-git.patch
This commit is contained in:
Jaroslav Kysela
parent
4a1704a953
commit
f1d50d1ffd
185
alsa-git.patch
185
alsa-git.patch
@ -47,191 +47,6 @@ index b07f3440..1b6bd212 100644
|
||||
2.13.6
|
||||
|
||||
|
||||
From 6852f88e80e442ba5d7f2044cf0fbbe72d46fefa Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Kysela <perex@perex.cz>
|
||||
Date: Tue, 23 Oct 2018 10:03:17 +0200
|
||||
Subject: [PATCH 2/6] test/latecy: fix typo in tstamp compare
|
||||
|
||||
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||
---
|
||||
test/latency.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/test/latency.c b/test/latency.c
|
||||
index f3590b3f..e926856b 100644
|
||||
--- a/test/latency.c
|
||||
+++ b/test/latency.c
|
||||
@@ -673,7 +673,7 @@ int main(int argc, char *argv[])
|
||||
printf("Capture:\n");
|
||||
showstat(chandle, frames_in);
|
||||
showinmax(in_max);
|
||||
- if (p_tstamp.tv_sec == p_tstamp.tv_sec &&
|
||||
+ if (p_tstamp.tv_sec == c_tstamp.tv_sec &&
|
||||
p_tstamp.tv_usec == c_tstamp.tv_usec)
|
||||
printf("Hardware sync\n");
|
||||
snd_pcm_drop(chandle);
|
||||
--
|
||||
2.13.6
|
||||
|
||||
|
||||
From 82ae026f49e6e22f4775ae23e33324535025a5c6 Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Kysela <perex@perex.cz>
|
||||
Date: Tue, 23 Oct 2018 10:17:12 +0200
|
||||
Subject: [PATCH 3/6] test/code: make it work again
|
||||
|
||||
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||
---
|
||||
test/code.c | 40 +++++++++++++++++++++-------------------
|
||||
1 file changed, 21 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/test/code.c b/test/code.c
|
||||
index e2032de5..3706243e 100644
|
||||
--- a/test/code.c
|
||||
+++ b/test/code.c
|
||||
@@ -3,11 +3,7 @@
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <sched.h>
|
||||
-#include <sys/time.h>
|
||||
-
|
||||
-#ifndef __builtin_expect
|
||||
-#include <linux/compiler.h>
|
||||
-#endif
|
||||
+#include <time.h>
|
||||
|
||||
#define rdtscll(val) \
|
||||
__asm__ __volatile__("rdtsc" : "=A" (val))
|
||||
@@ -72,21 +68,21 @@ static inline void atomic_add(volatile int *dst, int v)
|
||||
|
||||
static double detect_cpu_clock()
|
||||
{
|
||||
- struct timeval tm_begin, tm_end;
|
||||
+ struct timespec tm_begin, tm_end;
|
||||
unsigned long long tsc_begin, tsc_end;
|
||||
|
||||
/* Warm cache */
|
||||
- gettimeofday(&tm_begin, 0);
|
||||
+ clock_gettime(CLOCK_MONOTONIC, &tm_begin);
|
||||
|
||||
rdtscll(tsc_begin);
|
||||
- gettimeofday(&tm_begin, 0);
|
||||
+ clock_gettime(CLOCK_MONOTONIC, &tm_begin);
|
||||
|
||||
usleep(1000000);
|
||||
|
||||
rdtscll(tsc_end);
|
||||
- gettimeofday(&tm_end, 0);
|
||||
+ clock_gettime(CLOCK_MONOTONIC, &tm_end);
|
||||
|
||||
- return (tsc_end - tsc_begin) / (tm_end.tv_sec - tm_begin.tv_sec + (tm_end.tv_usec - tm_begin.tv_usec) / 1e6);
|
||||
+ return (tsc_end - tsc_begin) / (tm_end.tv_sec - tm_begin.tv_sec + (tm_end.tv_nsec - tm_begin.tv_nsec) / 1e9);
|
||||
}
|
||||
|
||||
void mix_areas_srv(unsigned int size,
|
||||
@@ -146,11 +142,17 @@ void mix_areas0(unsigned int size,
|
||||
}
|
||||
}
|
||||
|
||||
-#define MIX_AREAS1 mix_areas1
|
||||
-#define MIX_AREAS1_MMX mix_areas1_mmx
|
||||
+#define MIX_AREAS_16 mix_areas1
|
||||
+#define MIX_AREAS_16_MMX mix_areas1_mmx
|
||||
+#define MIX_AREAS_32 mix_areas1_32
|
||||
+#define MIX_AREAS_24 mix_areas1_24
|
||||
+#define MIX_AREAS_24_CMOV mix_areas1_24_cmov
|
||||
+#define XADD "addl"
|
||||
+#define XSUB "subl"
|
||||
#include "../src/pcm/pcm_dmix_i386.h"
|
||||
-#undef MIX_AREAS1
|
||||
-#undef MIX_AREAS1_MMX
|
||||
+static void *ptr_mix_areas1_32 __attribute__((unused)) = &mix_areas1_32;
|
||||
+static void *ptr_mix_areas1_24 __attribute__((unused)) = &mix_areas1_24;
|
||||
+static void *ptr_mix_areas1_24_cmov __attribute__((unused)) = &mix_areas1_24_cmov;
|
||||
|
||||
void mix_areas2(unsigned int size,
|
||||
volatile s16 *dst, const s16 *src,
|
||||
@@ -319,11 +321,11 @@ int main(int argc, char **argv)
|
||||
|
||||
printf(" \r");
|
||||
printf("Summary (the best times):\n");
|
||||
- printf("mix_areas_srv : %lld %f%%\n", diffS, 100*2*44100.0*diffS/(size*n*cpu_clock));
|
||||
- printf("mix_areas0 : %lld %f%%\n", diff0, 100*2*44100.0*diff0/(size*n*cpu_clock));
|
||||
- printf("mix_areas1 : %lld %f%%\n", diff1, 100*2*44100.0*diff1/(size*n*cpu_clock));
|
||||
- printf("mix_areas1_mmx: %lld %f%%\n", diff1_mmx, 100*2*44100.0*diff1_mmx/(size*n*cpu_clock));
|
||||
- printf("mix_areas2 : %lld %f%%\n", diff2, 100*2*44100.0*diff2/(size*n*cpu_clock));
|
||||
+ printf("mix_areas_srv : %8lld %f%%\n", diffS, 100*2*44100.0*diffS/(size*n*cpu_clock));
|
||||
+ printf("mix_areas0 : %8lld %f%%\n", diff0, 100*2*44100.0*diff0/(size*n*cpu_clock));
|
||||
+ printf("mix_areas1 : %8lld %f%%\n", diff1, 100*2*44100.0*diff1/(size*n*cpu_clock));
|
||||
+ printf("mix_areas1_mmx : %8lld %f%%\n", diff1_mmx, 100*2*44100.0*diff1_mmx/(size*n*cpu_clock));
|
||||
+ printf("mix_areas2 : %8lld %f%%\n", diff2, 100*2*44100.0*diff2/(size*n*cpu_clock));
|
||||
|
||||
printf("\n");
|
||||
printf("areas1/srv ratio : %f\n", (double)diff1 / diffS);
|
||||
--
|
||||
2.13.6
|
||||
|
||||
|
||||
From 956bc152e7f77714a3be58dccf91ef8542c34556 Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Kysela <perex@perex.cz>
|
||||
Date: Tue, 23 Oct 2018 10:18:24 +0200
|
||||
Subject: [PATCH 4/6] test: rename code to more approriate mixtest
|
||||
|
||||
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||
---
|
||||
test/Makefile.am | 2 +-
|
||||
test/{code.c => mixtest.c} | 0
|
||||
2 files changed, 1 insertion(+), 1 deletion(-)
|
||||
rename test/{code.c => mixtest.c} (100%)
|
||||
|
||||
diff --git a/test/Makefile.am b/test/Makefile.am
|
||||
index 5f35159a..99c2c4ff 100644
|
||||
--- a/test/Makefile.am
|
||||
+++ b/test/Makefile.am
|
||||
@@ -20,7 +20,7 @@ oldapi_LDADD=../src/libasound.la
|
||||
queue_timer_LDADD=../src/libasound.la
|
||||
namehint_LDADD=../src/libasound.la
|
||||
client_event_filter_LDADD=../src/libasound.la
|
||||
-code_CFLAGS=-Wall -pipe -g -O2
|
||||
+mixtest_CFLAGS=-Wall -pipe -g -O2
|
||||
chmap_LDADD=../src/libasound.la
|
||||
audio_time_LDADD=../src/libasound.la
|
||||
pcm_multi_thread_LDADD=../src/libasound.la
|
||||
diff --git a/test/code.c b/test/mixtest.c
|
||||
similarity index 100%
|
||||
rename from test/code.c
|
||||
rename to test/mixtest.c
|
||||
--
|
||||
2.13.6
|
||||
|
||||
|
||||
From 92172adb0b733de5a52f1671a279b3079cf0a657 Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Kysela <perex@perex.cz>
|
||||
Date: Tue, 23 Oct 2018 10:20:20 +0200
|
||||
Subject: [PATCH 5/6] test/audio_time: remove unused variables
|
||||
|
||||
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||
---
|
||||
test/audio_time.c | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/test/audio_time.c b/test/audio_time.c
|
||||
index a54c10dc..530922d9 100644
|
||||
--- a/test/audio_time.c
|
||||
+++ b/test/audio_time.c
|
||||
@@ -115,9 +115,7 @@ int main(int argc, char *argv[])
|
||||
snd_pcm_sw_params_t *swparams_p;
|
||||
snd_pcm_sw_params_t *swparams_c;
|
||||
|
||||
- snd_pcm_uframes_t curr_count_c;
|
||||
snd_pcm_uframes_t frame_count_c = 0;
|
||||
- snd_pcm_uframes_t curr_count_p;
|
||||
snd_pcm_uframes_t frame_count_p = 0;
|
||||
|
||||
snd_pcm_sframes_t delay_p, delay_c;
|
||||
--
|
||||
2.13.6
|
||||
|
||||
|
||||
From b420056604f06117c967b65d43d01536c5ffcbc9 Mon Sep 17 00:00:00 2001
|
||||
From: Timo Wischer <twischer@de.adit-jv.com>
|
||||
Date: Thu, 18 Oct 2018 13:33:24 +0200
|
||||
|
||||
Loading…
Reference in New Issue
Block a user