[meego-commits] 9379: Changes to Trunk:Testing/pulseaudio

[Vivian Zhang]

Hi,
I have made the following changes to pulseaudio in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Vivian Zhang

[This message was auto-generated]

---

Request #9379:

  submit:   devel:multimedia/pulseaudio(r8) -> Trunk:Testing/pulseaudio


Message:
    Set the BURST_MODE configuration by default for voice module (BMC9885)

State:   new          2010-11-10T17:34:25 vivian
Comment: None



changes files:
--------------
--- pulseaudio.changes
+++ pulseaudio.changes
@@ -0,0 +1,3 @@
+* Tu Nov 09 2010 Maël Pouessel <mael.pouesse at intel.com> - 0.9.21
+ Set the BURST_MODE configuration by default for voice module (BMC9885) 
+

new:
----
  0001-Set-BURST_MODE-configuration-in-default-mode.patch

spec files:
-----------
--- pulseaudio.spec
+++ pulseaudio.spec
@@ -43,6 +43,7 @@
 Patch20:     0008-Remove-UMG-contributions-to-config-files.patch
 Patch21:     0009-Align-cs-protocol.h-with-cmt_speech-driver.patch
 Patch22:     0010-Add-Pulseaudio-configuration-files-for-Medfield-EB-h.patch
+Patch23:     0001-Set-BURST_MODE-configuration-in-default-mode.patch
 Requires:   udev >= 145-3
 Requires:   rtkit
 Requires(post): /sbin/ldconfig
@@ -161,6 +162,8 @@
 %patch21 -p1
 # 0010-Add-Pulseaudio-configuration-files-for-Medfield-EB-h.patch
 %patch22 -p1
+# 0001-Set-BURST_MODE-configuration-in-default-mode.patch
+%patch23 -p1
 # >> setup
 # << setup
 

other changes:
--------------

++++++ 0001-Set-BURST_MODE-configuration-in-default-mode.patch (new)
--- 0001-Set-BURST_MODE-configuration-in-default-mode.patch
+++ 0001-Set-BURST_MODE-configuration-in-default-mode.patch
+From a293fb6885291023191a04b1479264ba57725831 Mon Sep 17 00:00:00 2001
+From: Mael Pouessel <mael.pouessel at intel.com>
+Date: Wed, 10 Nov 2010 03:44:25 +0100
+Subject: [PATCH] Set BURST_MODE configuration in default mode
+
+Signed-off-by: Mael Pouessel <mael.pouessel at intel.com>
+---
+ src/modules/module-voice.c |    9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/modules/module-voice.c b/src/modules/module-voice.c
+index 48008b4..eb5c447 100644
+--- a/src/modules/module-voice.c
++++ b/src/modules/module-voice.c
+@@ -112,6 +112,7 @@ PA_MODULE_USAGE(
+ #define BURSTEMODE_ENVVAR "BURST_MODE"
+ #define BURSTEMODE_96KHZ "96"
+ #define BURSTEMODE_48KHZ "48"
++#define FULLDUPLEXMODE   "0"
+ 
+ #define SOURCE_FRAME_SIZE_MS 20ULL
+ #define SINK_FRAME_SIZE_MS 20ULL
+@@ -1216,8 +1217,8 @@ static int pa_cs_voice_get_pcm_mode(struct userdata *u) {
+     u->ssp_iface.env_burst_mode = getenv(BURSTEMODE_ENVVAR);
+ 
+     if (NULL == u->ssp_iface.env_burst_mode){
+-	pa_log("Full duplex\n");
+-        u->ssp_iface.burst_mode = 0;
++	pa_log("Burst Mode 96\n");
++        u->ssp_iface.burst_mode = 1;
+     }
+     else if (!strcmp(BURSTEMODE_96KHZ, u->ssp_iface.env_burst_mode)){
+ 	pa_log("Burst Mode 96\n");
+@@ -1227,6 +1228,10 @@ static int pa_cs_voice_get_pcm_mode(struct userdata *u) {
+ 	pa_log("Burst Mode 48\n");
+         u->ssp_iface.burst_mode = 1;
+     }
++    else if (!strcmp(FULLDUPLEXMODE, u->ssp_iface.env_burst_mode)){
++        pa_log("Full duplex mode\n");
++        u->ssp_iface.burst_mode = 0;
++    }
+     else{
+ 	pa_log("incorrectly set => Burst Mode 96\n");
+         u->ssp_iface.burst_mode = 1;
+-- 
+1.7.2.3
+