From 28981ad7f61c712e12a3da36454cdfa199b18191 Mon Sep 17 00:00:00 2001
From: Seungbae Shin <seungbae.shin@samsung.com>
Date: Thu, 17 Jun 2021 17:29:05 +0900
Subject: [PATCH] [rb5] Update audio configuration

[Version] 0.3.5
[Issue Type] Update

Change-Id: I4e4ca6ed0b16cac48bb1c82553cea799d277e2dc
---
 media-config-target-rb5/hal/etc/asound.conf      |  9 ++-------
 .../hal/etc/pulse/device-map.json                | 16 +++++++++++++---
 .../hal/etc/pulse/stream-map.json                |  8 ++++----
 packaging/media-config.spec                      |  2 +-
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/media-config-target-rb5/hal/etc/asound.conf b/media-config-target-rb5/hal/etc/asound.conf
index dc87ead..68f1d29 100644
--- a/media-config-target-rb5/hal/etc/asound.conf
+++ b/media-config-target-rb5/hal/etc/asound.conf
@@ -2,15 +2,10 @@
 
 pcm. !default {
 	type hw
-	card ALSA
+	card konaiotsndcard
 }
 
 ctl. !default {
 	type hw
-	card ALSA
-}
-
-ctl. bcm2835 {
-	type hw
-	card ALSA
+	card konaiotsndcard
 }
diff --git a/media-config-target-rb5/hal/etc/pulse/device-map.json b/media-config-target-rb5/hal/etc/pulse/device-map.json
index fe3f3a4..f5ef3c4 100644
--- a/media-config-target-rb5/hal/etc/pulse/device-map.json
+++ b/media-config-target-rb5/hal/etc/pulse/device-map.json
@@ -2,14 +2,24 @@
 	"device-types":[
 		{
 			"device-type":"builtin-speaker",
-			"playback-devices":{"normal":"alsa:ALSA,0"}
+			"playback-devices":{"normal":"tizen:konaiotsndcard,9"}
+		},
+		{
+			"device-type":"builtin-mic",
+			"capture-devices":{"normal":"tizen:konaiotsndcard,0"}
 		}
 	],
 	"device-files":{
 		"playback-devices":[
 			{
-				"device-string":"alsa:ALSA,0",
-				"role":{"normal":"mmap=0 tsched=0 rate=44100"}
+				"device-string":"tizen:konaiotsndcard,9",
+				"role":{"normal":"rate=48000 fragment_size=4800 fragments=4"}
+			}
+		],
+		"capture-devices":[
+			{
+				"device-string":"tizen:konaiotsndcard,0",
+				"role":{"normal":"rate=48000 channels=2 fragment_size=4800 fragments=4"}
 			}
 		]
 	}
diff --git a/media-config-target-rb5/hal/etc/pulse/stream-map.json b/media-config-target-rb5/hal/etc/pulse/stream-map.json
index e06d929..0a754f9 100644
--- a/media-config-target-rb5/hal/etc/pulse/stream-map.json
+++ b/media-config-target-rb5/hal/etc/pulse/stream-map.json
@@ -93,7 +93,7 @@
 			"priority" : 3,
 			"route-type" : "auto",
 			"volume-types":{"in":"none","out":"media"},
-			"avail-in-devices":["usb-audio","network"],
+			"avail-in-devices":["builtin-mic","usb-audio","network"],
 			"avail-out-devices":["bt-a2dp","usb-audio","network","builtin-speaker"],
 			"avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"]
 		},
@@ -147,7 +147,7 @@
 			"priority" : 3,
 			"route-type" : "auto",
 			"volume-types":{"in":"none","out":"none"},
-			"avail-in-devices":["usb-audio"],
+			"avail-in-devices":["builtin-mic","usb-audio"],
 			"avail-out-devices":["none"],
 			"avail-frameworks":["audio-io"]
 		},
@@ -156,7 +156,7 @@
 			"priority" : 3,
 			"route-type" : "auto",
 			"volume-types":{"in":"none","out":"none"},
-			"avail-in-devices":["usb-audio"],
+			"avail-in-devices":["builtin-mic","usb-audio"],
 			"avail-out-devices":["none"],
 			"avail-frameworks":["audio-io"]
 		},
@@ -174,7 +174,7 @@
 			"priority" : 5,
 			"route-type" : "manual",
 			"volume-types":{"in":"none","out":"voip"},
-			"avail-in-devices":["usb-audio"],
+			"avail-in-devices":["builtin-mic","usb-audio"],
 			"avail-out-devices":["builtin-speaker","usb-audio"],
 			"avail-frameworks":["audio-io","tone-player","sound-manager"]
 		},
diff --git a/packaging/media-config.spec b/packaging/media-config.spec
index 4bcf2bf..eaeed91 100644
--- a/packaging/media-config.spec
+++ b/packaging/media-config.spec
@@ -1,6 +1,6 @@
 Name:       media-config
 Summary:    Multimedia Framework system configuration package
-Version:    0.3.4
+Version:    0.3.5
 Release:    0
 Group:      Multimedia/Configuration
 License:    LGPL-2.1 and Apache-2.0
-- 
2.34.1