[pulseaudio] 01/01: Fix lfe-filter-test build failure on i386

[David Henningsson]

This is an automated email from the git hooks/post-receive script.

diwic-guest pushed a commit to branch ubuntu
in repository pulseaudio.

commit 8f7f330a617ba89364444479290d036959e0f48c
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Mon May 25 14:46:27 2015 +0200

    Fix lfe-filter-test build failure on i386
    
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>
---
 debian/changelog                                   |  7 +++
 ...olerant-variation-for-comparing-the-rewin.patch | 53 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 61 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2bbb4fe..d6e7e38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pulseaudio (1:6.0-0ubuntu8) wily; urgency=medium
+
+  * 0311-tests-add-tolerant-variation-for-comparing-the-rewin.patch:
+    Fix build failure on i386
+
+ -- David Henningsson <david.henningsson at canonical.com>  Mon, 25 May 2015 14:45:41 +0200
+
 pulseaudio (1:6.0-0ubuntu7) wily; urgency=medium
 
   * debian/patches/0300-lfe-filter-Import-code-from-the-Chrome-OS-audio-serv.patch
diff --git a/debian/patches/0311-tests-add-tolerant-variation-for-comparing-the-rewin.patch b/debian/patches/0311-tests-add-tolerant-variation-for-comparing-the-rewin.patch
new file mode 100644
index 0000000..8ceafec
--- /dev/null
+++ b/debian/patches/0311-tests-add-tolerant-variation-for-comparing-the-rewin.patch
@@ -0,0 +1,53 @@
+From a7d41ef0439fe86466c96428af689145b513b913 Mon Sep 17 00:00:00 2001
+From: Hui Wang <hui.wang at canonical.com>
+Date: Mon, 25 May 2015 20:05:30 +0800
+Subject: [PATCH] tests: add tolerant variation for comparing the rewind result
+
+On 32bits OS, this test case fails. The reason is when rewinding to
+the middle of a block, some of float parameters in the saved_state
+are stored in the memory from FPU registers, and those parameters will
+be used for next time to process data with lfe. Here if FPU register
+is over 32bits, the storing from FPU register to memory will introduce
+some variation, and this small variation will introduce small
+variation to the rewinding result.
+
+So adding the tolerant variation for comparing the rewind result, make
+this test case can work on both 64bits OS and 32bits OS.
+
+Signed-off-by: Hui Wang <hui.wang at canonical.com>
+---
+ src/tests/lfe-filter-test.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/src/tests/lfe-filter-test.c b/src/tests/lfe-filter-test.c
+index 2c6d597..ea8108c 100644
+--- a/src/tests/lfe-filter-test.c
++++ b/src/tests/lfe-filter-test.c
+@@ -37,6 +37,7 @@ static uint8_t *ori_sample_ptr;
+ 
+ #define ONE_BLOCK_SAMPLES 4096
+ #define TOTAL_SAMPLES 8192
++#define TOLERANT_VARIATION 1
+ 
+ static void save_data_block(struct lfe_filter_test *lft, void *d, pa_memblock *blk) {
+     uint8_t *dst = d, *src;
+@@ -63,11 +64,12 @@ static pa_memblock* generate_data_block(struct lfe_filter_test *lft, int start)
+ static int compare_data_block(struct lfe_filter_test *lft, void *a, void *b) {
+     int ret = 0;
+     uint32_t i;
+-    uint32_t fz = pa_frame_size(lft->ss);
+-    uint8_t *r = a, *u = b;
++    uint16_t *r = a, *u = b;
++
++    pa_assert(lft->ss->format == PA_SAMPLE_S16NE);
+ 
+-    for (i = 0; i < ONE_BLOCK_SAMPLES * fz; i++) {
+-        if (*r++ != *u++) {
++    for (i = 0; i < ONE_BLOCK_SAMPLES; i++) {
++        if (abs(*r++ - *u++) > TOLERANT_VARIATION) {
+             pa_log_error("lfe-filter-test: test failed, the output data in the position 0x%x of a block does not equal!\n", i);
+             ret = -1;
+             break;
+-- 
+1.9.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 72fbb61..373b53c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -29,3 +29,4 @@
 0308-daemon-conf-enable-the-lfe-remixing-by-default.patch
 0309-resampler-Allow-disabling-the-LFE-filter-by-setting-.patch
 0310-resampler-Rename-lfe_filter_required-to-lfe_remixed.patch
+0311-tests-add-tolerant-variation-for-comparing-the-rewin.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git