Merge branch 'fulup-dev'

Change-Id: I7dc6859767ac5919cf383e33bd2cf3a98698d9b4

4 files changed, 238 insertions, 0 deletions

diff --git a/conf.d/project/alsa.d/asoundrc.sample b/conf.d/project/alsa.d/asoundrc.sample
new file mode 100644
index 0000000..b208a09
--- /dev/null
+++ b/conf.d/project/alsa.d/asoundrc.sample
@@ -0,0 +1,146 @@
+# 
+# Author: Fulup Ar Foll
+# Object: PCM hook type 
+#
+# Test  :  Note: Jabra_USB=hw:v1340
+#  Check SoundCard  speaker-test -Dhw:v1340 -c2 -twav
+#  Check MixerPCM   speaker-test -DMyMixerPCM -c2 -twav 
+#  Check HookPCM    speaker-test -DMyNavigationHook -c2 -twav 
+#  Check NavPCM     speaker-test -DMyNavPCM -c2 -twav
+#  MultiMedia aplay -DDMyNavPCM /usr/share/sounds/alsa/test.wav
+#
+# Bug/Feature: when softvol control is initialised from plugin and not
+#    from AGL binding. At 1st run ctl has invalid TLV and cannot be
+#    use. Bypass Solution: 
+#     * start audio-binder before playing sound (binding create control before softvol plugin)
+#     * run a dummy aplay -DMyNavPCM "" to get a clean control
+#
+# References: https://www.spinics.net/lists/alsa-devel/msg54235.html
+# --------------------------------------------------------------------
+
+# Mixer PCM allow to play multiple stream simultaneously
+# ------------------------------------------------------
+pcm.MyMixerPCM { 
+    type dmix 
+    ipc_key 1024
+    ipc_key_add_uid false
+    ipc_perm 0666   # mixing for all users
+
+    # Define target effective sound card (cannot be a plugin)
+    slave { 
+        pcm "hw:v1340"  #Jabra Solmate 
+        period_time 0 
+        period_size 1024 
+        buffer_size 8192
+        rate 44100
+    }
+
+    # DMIX can only map two channels
+    bindings { 
+        0 0 
+        1 1 
+    } 
+} 
+
+# Define a Hook_type with a private sharelib
+# -------------------------------------------
+pcm_hook_type.MyHookPlugin {
+    install "AlsaInstallHook" 
+    lib "/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/build/Alsa-Plugin/Alsa-Policy-Hook/policy_hook_cb.so"
+}
+
+
+# Define a HookedPCM that point to Hook_type sharelib
+# ----------------------------------------------------
+pcm.MyNavigationHook {
+    type hooks
+    slave.pcm "MyMixerPCM"
+    # Defined used hook sharelib and provide arguments/config to install func
+    hooks.0 {
+        type "MyHookPlugin"
+        hook_args {
+            verbose true # print few log messages (default false);
+
+            # Every Call should return OK in order PCM to open (default timeout 100ms)
+            uri   "ws://localhost:1234/api?token='audio-agent-token'"
+            request {
+                # Request autorisation to write on navigation 
+                RequestNavigation {
+                    api    "control"
+                    verb   "dispatch"
+	            query  "{'target':'navigation', 'args':{'device':'Jabra SOLEMATE v1.34.0'}}"
+                } 
+            }
+            # map event reception to self generated signal
+            event {
+                pause  30
+                resume 31
+                stop   3
+            }
+        }
+    }
+}
+
+# If hardware does not support mixer emulate it with softvol
+# -----------------------------------------------------------
+pcm.MyMultimediaPCM {
+    type        softvol
+
+    # Point Slave on HOOK for policies control
+    slave.pcm   "MyNavigationHook"
+
+    # resolution=HAL(valMax+1) (default=256)
+    resolution 256
+
+    # name should match with HAL but do not set card=xx
+    control.name    "Playback Navigation"
+
+    # Make this plugin visible from aplay -L
+    hint {
+      show on
+      description "Navigation SolftVol PCM"
+    }    
+}
+
+# If hardware does not support mixer emulate it with softvol
+# -----------------------------------------------------------
+pcm.MyNavPCM {
+    type        softvol
+
+    # Point Slave on HOOK for policies control
+    slave.pcm   "MyNavigationHook"
+
+    # resolution=HAL(valMax+1) (default=256)
+    resolution 256
+
+    # name should match with HAL but do not set card=xx
+    control.name    "Playback Navigation"
+
+    # Make this plugin visible from aplay -L
+    hint {
+      show on
+      description "Navigation SolftVol PCM"
+    }    
+}
+
+# If hardware does not support mixer emulate it with softvol
+# -----------------------------------------------------------
+pcm.MyAlarmPCM {
+    type        softvol
+
+    # Point Slave on HOOK for policies control
+    slave.pcm   "MyNavigationHook"
+
+    # resolution=HAL(valMax+1) (default=256)
+    resolution 256
+
+    # name should match with HAL but do not set card=xx
+    control.name    "Playback Navigation"
+
+    # Make this plugin visible from aplay -L
+    hint {
+      show on
+      description "Navigation SolftVol PCM"
+    }    
+}
+
diff --git a/conf.d/project/alsa.d/ucm.sample/HDA Intel PCH.conf b/conf.d/project/alsa.d/ucm.sample/HDA Intel PCH.conf
new file mode 100644
index 0000000..f6608a0
--- /dev/null
+++ b/conf.d/project/alsa.d/ucm.sample/HDA Intel PCH.conf
@@ -0,0 +1,6 @@
+Comment "Leon internal card"
+
+SectionUseCase."HiFi" {
+	File "HiFi.conf"
+	Comment "Default"
+}
diff --git a/conf.d/project/alsa.d/ucm.sample/HiFi.conf b/conf.d/project/alsa.d/ucm.sample/HiFi.conf
new file mode 100644
index 0000000..9a53c8c
--- /dev/null
+++ b/conf.d/project/alsa.d/ucm.sample/HiFi.conf
@@ -0,0 +1,84 @@
+SectionVerb {
+	EnableSequence [
+		cdev "hw:PCH"
+
+		cset "name='Master Playback Switch' on"
+		cset "name='Headphone Playback Switch' off"
+		cset "name='Speaker Playback Switch' on"
+
+		cset "name='Capture Switch' on"
+		cset "name='Capture Volume' 39"
+		cset "name='Mic Boost Volume' 2"
+		cset "name='Internal Mic Boost Volume' 0"
+		#cset "name='Capture Source' 0"
+	]
+	DisableSequence [
+	]
+	Value {
+                TQ "Music"
+		OutputDspName "speaker_eq"
+                PlaybackPCM "hw:PCH,0"
+	}
+}
+
+SectionDevice."Headphone".0 {
+	Value {
+		JackName "Headphone Jack"
+		OutputDspName "Jheadphone"
+	}
+	EnableSequence [
+		cdev "hw:PCH"
+
+		cset "name='Speaker Playback Switch' off"
+		cset "name='Headphone Playback Switch' on"
+	]
+	DisableSequence [
+		cdev "hw:PCH"
+
+		cset "name='Headphone Playback Switch' off"
+		cset "name='Speaker Playback Switch' on"
+	]
+}
+
+SectionDevice."Mic".0 {
+	Value {
+		JackName "Mic Jack"
+	}
+	EnableSequence [
+		cdev "hw:PCH"
+
+		#cset "name='Capture Source' 1"
+	]
+	DisableSequence [
+		cdev "hw:PCH"
+
+		cset "name='Capture Source' 0"
+	]
+}
+
+SectionModifier."RecordMedia".0 {
+        SupportedDevice [
+                "Headphone"
+        ]
+        EnableSequence [
+                cdev "hw:PCH"
+        ]
+
+        DisableSequence [
+                cdev "hw:PCH"
+        ]
+
+        TransitionSequence."ToModifierName" [
+                cdev "hw:PCH"
+        ]
+
+        # Optional TQ and ALSA PCMs
+        Value {
+                TQ Voice
+                CapturePCM "hw:1"
+                PlaybackVolume "name='Master Playback Volume',index=2"
+                PlaybackSwitch "name='Master Playback Switch',index=2"
+        }
+
+}
+
diff --git a/conf.d/project/alsa.d/ucm.sample/README b/conf.d/project/alsa.d/ucm.sample/README
new file mode 100644
index 0000000..e7f08ae
--- /dev/null
+++ b/conf.d/project/alsa.d/ucm.sample/README
@@ -0,0 +1,2 @@
+Should match sound card name ex: "HDA Intel PCH"
+cp -r . /usr/share/alsa/ucm