From 89c488f0905ece40cd5b829b5d746eff9c5a2ca7 Mon Sep 17 00:00:00 2001 From: Seungbae Shin Date: Mon, 2 Jan 2023 17:00:46 +0900 Subject: [PATCH] [c4][audio] update json configurtion for HDMI changes Add hdmi device to stream-map.json Remove builtin-speaker device from stream-map.json Remove builtin-speaker device from device-map.json [Version] 0.3.69 [Issue type] Update Change-Id: I3cf1cb8a8ea1d76e48294745c924d41b1cd659a5 --- .../hal/etc/pulse/device-map.json | 10 ---------- .../hal/etc/pulse/stream-map.json | 18 +++++++++--------- packaging/media-config.spec | 2 +- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/media-config-target-c4/hal/etc/pulse/device-map.json b/media-config-target-c4/hal/etc/pulse/device-map.json index f2e5bf6..9f44999 100644 --- a/media-config-target-c4/hal/etc/pulse/device-map.json +++ b/media-config-target-c4/hal/etc/pulse/device-map.json @@ -1,16 +1,6 @@ { "device-types":[ - { - "device-type":"builtin-speaker", - "playback-devices":{"normal":"tizen:ODROIDHDMI,0"} - } ], "device-files":{ - "playback-devices":[ - { - "device-string":"tizen:ODROIDHDMI,0", - "role":{"normal":"rate=48000 fragment_size=4800 fragments=4"} - } - ] } } diff --git a/media-config-target-c4/hal/etc/pulse/stream-map.json b/media-config-target-c4/hal/etc/pulse/stream-map.json index 164e49c..9ec5577 100644 --- a/media-config-target-c4/hal/etc/pulse/stream-map.json +++ b/media-config-target-c4/hal/etc/pulse/stream-map.json @@ -94,7 +94,7 @@ "route-type" : "auto", "volume-types":{"in":"none","out":"media"}, "avail-in-devices":["usb-audio","network"], - "avail-out-devices":["bt-a2dp","usb-audio","network","builtin-speaker"], + "avail-out-devices":["bt-a2dp","usb-audio","network","hdmi"], "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder","webrtc"] }, { @@ -103,7 +103,7 @@ "route-type" : "auto", "volume-types":{"in":"none","out":"system"}, "avail-in-devices":["none"], - "avail-out-devices":["bt-a2dp","usb-audio","builtin-speaker"], + "avail-out-devices":["bt-a2dp","usb-audio","hdmi"], "avail-frameworks":["player","wav-player","tone-player","audio-io"] }, { @@ -112,7 +112,7 @@ "route-type" : "auto-all", "volume-types":{"in":"none","out":"alarm"}, "avail-in-devices":["none"], - "avail-out-devices":["builtin-speaker","bt-a2dp","usb-audio"], + "avail-out-devices":["bt-a2dp","usb-audio","hdmi"], "avail-frameworks":["player","wav-player","tone-player","audio-io"] }, { @@ -121,7 +121,7 @@ "route-type" : "auto-all", "volume-types":{"in":"none","out":"notification"}, "avail-in-devices":["none"], - "avail-out-devices":["builtin-speaker","bt-a2dp","usb-audio"], + "avail-out-devices":["bt-a2dp","usb-audio","hdmi"], "avail-frameworks":["player","wav-player","tone-player","audio-io"] }, { @@ -130,7 +130,7 @@ "route-type" : "auto", "volume-types":{"in":"none","out":"none"}, "avail-in-devices":["none"], - "avail-out-devices":["builtin-speaker"], + "avail-out-devices":["hdmi"], "avail-frameworks":["player","wav-player","tone-player","audio-io"] }, { @@ -139,7 +139,7 @@ "route-type" : "auto", "volume-types":{"in":"none","out":"voice"}, "avail-in-devices":["none"], - "avail-out-devices":["bt-a2dp","usb-audio","builtin-speaker"], + "avail-out-devices":["bt-a2dp","usb-audio","hdmi"], "avail-frameworks":["player","wav-player","tone-player","audio-io"] }, { @@ -166,7 +166,7 @@ "route-type" : "auto-all", "volume-types":{"in":"none","out":"ringtone"}, "avail-in-devices":["none"], - "avail-out-devices":["bt-a2dp","builtin-speaker","usb-audio"], + "avail-out-devices":["bt-a2dp","usb-audio","hdmi"], "avail-frameworks":["player","wav-player","tone-player","audio-io","sound-manager"] }, { @@ -175,7 +175,7 @@ "route-type" : "manual", "volume-types":{"in":"none","out":"voip"}, "avail-in-devices":["usb-audio"], - "avail-out-devices":["builtin-speaker","usb-audio"], + "avail-out-devices":["usb-audio","hdmi"], "avail-frameworks":["audio-io","tone-player","sound-manager","webrtc"] }, { @@ -184,7 +184,7 @@ "route-type" : "manual-ext", "volume-types":{"in":"none","out":"media"}, "avail-in-devices":["usb-audio","network"], - "avail-out-devices":["bt-a2dp","usb-audio","network"], + "avail-out-devices":["bt-a2dp","usb-audio","network","hdmi"], "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder","webrtc"] }, ] diff --git a/packaging/media-config.spec b/packaging/media-config.spec index 7aeccfe..f37b53b 100644 --- a/packaging/media-config.spec +++ b/packaging/media-config.spec @@ -2,7 +2,7 @@ Name: media-config Summary: Multimedia Framework system configuration package -Version: 0.3.68 +Version: 0.3.69 Release: 0 Group: Multimedia/Configuration License: LGPL-2.1 and Apache-2.0 -- 2.34.1