[webrtc] Add new category and items

'resource acquisition' category is added.

New items are updated as below.
 - 'video encoded format support' is added to categories for media source.
 - 'audio sink element' and 'video sink element' are added to [rendering sink].
 - 'camera', 'video encoder', 'video decoder' and 'video overlay' are added to
   [resource acquisition]

[Version] 0.3.6
[Issue Type] Add

Change-Id: I2ef6b72d9d6af8ff8c39dfae1ea1695a598946a4
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/media-config-simulator/hal/etc/multimedia/mmfw_webrtc.ini b/media-config-simulator/hal/etc/multimedia/mmfw_webrtc.ini
index 917ab5505b56bfa226f945445538fd0dcdbc046a..d5f842a001494d1463fdd8d244906d216d592602 100644 (file)
--- a/media-config-simulator/hal/etc/multimedia/mmfw_webrtc.ini
+++ b/media-config-simulator/hal/etc/multimedia/mmfw_webrtc.ini
@@ -27,6 +27,7 @@ video height = 240
 video framerate = 30
 video codec = vp8
 video hw encoder element =
+video encoded format support = no
 video drc support = no
 ; default values for audio source pipeline (e.g, audiotest, mic)
 audio raw format = S16LE
@@ -45,6 +46,7 @@ source element = v4l2src
 ;video framerate =
 ;video codec =
 ;video hw encoder element =
+;video encoded format support =
 video drc support = yes
 
 
@@ -57,6 +59,7 @@ source element = videotestsrc
 ;video framerate =
 ;video codec =
 ;video hw encoder element =
+;video encoded format support =
 ;video drc support =
 
 
@@ -69,6 +72,7 @@ source element = waylandsrc
 ;video framerate =
 ;video codec =
 ;video hw encoder element =
+;video encoded format support =
 ;video drc support =
 
 
@@ -93,11 +97,21 @@ source element = pulsesrc
 
 
 [rendering sink]
+audio sink element = pulsesink
+video sink element = tizenwlsink
+
 ; comma separated list of elements, it should be one by one per codec type
 audio hw decoder elements =
 video hw decoder elements =
 
 
+[resource acquisition]
+camera = no
+video encoder = no
+video decoder = no
+video overlay = no
+
+
 [vpxenc params]
 ;threads =
 ;end usage =

diff --git a/media-config-target-artik10/hal/etc/multimedia/mmfw_webrtc.ini b/media-config-target-artik10/hal/etc/multimedia/mmfw_webrtc.ini
index c7eb8f9abe8fcb58b213c094e3e399842e1d8829..afb3d6a82c15272ddad11b9654f83f87592e20f6 100644 (file)
--- a/media-config-target-artik10/hal/etc/multimedia/mmfw_webrtc.ini
+++ b/media-config-target-artik10/hal/etc/multimedia/mmfw_webrtc.ini
@@ -27,6 +27,7 @@ video height = 240
 video framerate = 30
 video codec = vp8
 video hw encoder element =
+video encoded format support = no
 video drc support = no
 ; default values for audio source pipeline (e.g, audiotest, mic)
 audio raw format = S16LE
@@ -45,6 +46,7 @@ source element = videotestsrc
 ;video framerate =
 ;video codec =
 ;video hw encoder element =
+;video encoded format support =
 video drc support = yes
 
 
@@ -57,6 +59,7 @@ source element = v4l2src
 ;video framerate =
 ;video codec =
 ;video hw encoder element =
+;video encoded format support =
 ;video drc support =
 
 
@@ -69,6 +72,7 @@ source element = waylandsrc
 ;video framerate =
 ;video codec =
 ;video hw encoder element =
+;video encoded format support =
 ;video drc support =
 
 
@@ -93,11 +97,21 @@ source element = pulsesrc
 
 
 [rendering sink]
+audio sink element = pulsesink
+video sink element = tizenwlsink
+
 ; comma separated list of elements, it should be one by one per codec type
 audio hw decoder elements =
 video hw decoder elements =
 
 
+[resource acquisition]
+camera = no
+video encoder = no
+video decoder = no
+video overlay = no
+
+
 [vpxenc params]
 ;threads =
 ;end usage =

diff --git a/media-config-target-rb5/hal/etc/multimedia/mmfw_webrtc.ini b/media-config-target-rb5/hal/etc/multimedia/mmfw_webrtc.ini
index c7eb8f9abe8fcb58b213c094e3e399842e1d8829..b2e748da4d60e7f72ca4b787ff2109011d590c3c 100644 (file)
--- a/media-config-target-rb5/hal/etc/multimedia/mmfw_webrtc.ini
+++ b/media-config-target-rb5/hal/etc/multimedia/mmfw_webrtc.ini
@@ -27,6 +27,7 @@ video height = 240
 video framerate = 30
 video codec = vp8
 video hw encoder element =
+video encoded format support = no
 video drc support = no
 ; default values for audio source pipeline (e.g, audiotest, mic)
 audio raw format = S16LE
@@ -45,6 +46,7 @@ source element = videotestsrc
 ;video framerate =
 ;video codec =
 ;video hw encoder element =
+;video encoded format support =
 video drc support = yes
 
 
@@ -57,6 +59,7 @@ source element = v4l2src
 ;video framerate =
 ;video codec =
 ;video hw encoder element =
+;video encoded format support =
 ;video drc support =
 
 
@@ -69,6 +72,7 @@ source element = waylandsrc
 ;video framerate =
 ;video codec =
 ;video hw encoder element =
+;video encoded format support =
 ;video drc support =
 
 
@@ -93,11 +97,21 @@ source element = pulsesrc
 
 
 [rendering sink]
+audio sink element = pulsesink
+video sink element = tizenwlsink
+
 ; comma separated list of elements, it should be one by one per codec type
 audio hw decoder elements =
 video hw decoder elements =
 
 
+[resource acquisition]
+camera = yes
+video encoder = no
+video decoder = no
+video overlay = no
+
+
 [vpxenc params]
 ;threads =
 ;end usage =

diff --git a/media-config-target-rpi3-spk/hal/etc/multimedia/mmfw_webrtc.ini b/media-config-target-rpi3-spk/hal/etc/multimedia/mmfw_webrtc.ini
index c7eb8f9abe8fcb58b213c094e3e399842e1d8829..b2e748da4d60e7f72ca4b787ff2109011d590c3c 100644 (file)
--- a/media-config-target-rpi3-spk/hal/etc/multimedia/mmfw_webrtc.ini
+++ b/media-config-target-rpi3-spk/hal/etc/multimedia/mmfw_webrtc.ini
@@ -27,6 +27,7 @@ video height = 240
 video framerate = 30
 video codec = vp8
 video hw encoder element =
+video encoded format support = no
 video drc support = no
 ; default values for audio source pipeline (e.g, audiotest, mic)
 audio raw format = S16LE
@@ -45,6 +46,7 @@ source element = videotestsrc
 ;video framerate =
 ;video codec =
 ;video hw encoder element =
+;video encoded format support =
 video drc support = yes
 
 
@@ -57,6 +59,7 @@ source element = v4l2src
 ;video framerate =
 ;video codec =
 ;video hw encoder element =
+;video encoded format support =
 ;video drc support =
 
 
@@ -69,6 +72,7 @@ source element = waylandsrc
 ;video framerate =
 ;video codec =
 ;video hw encoder element =
+;video encoded format support =
 ;video drc support =
 
 
@@ -93,11 +97,21 @@ source element = pulsesrc
 
 
 [rendering sink]
+audio sink element = pulsesink
+video sink element = tizenwlsink
+
 ; comma separated list of elements, it should be one by one per codec type
 audio hw decoder elements =
 video hw decoder elements =
 
 
+[resource acquisition]
+camera = yes
+video encoder = no
+video decoder = no
+video overlay = no
+
+
 [vpxenc params]
 ;threads =
 ;end usage =

diff --git a/media-config-target-rpi3/hal/etc/multimedia/mmfw_webrtc.ini b/media-config-target-rpi3/hal/etc/multimedia/mmfw_webrtc.ini
index c7eb8f9abe8fcb58b213c094e3e399842e1d8829..b2e748da4d60e7f72ca4b787ff2109011d590c3c 100644 (file)
--- a/media-config-target-rpi3/hal/etc/multimedia/mmfw_webrtc.ini
+++ b/media-config-target-rpi3/hal/etc/multimedia/mmfw_webrtc.ini
@@ -27,6 +27,7 @@ video height = 240
 video framerate = 30
 video codec = vp8
 video hw encoder element =
+video encoded format support = no
 video drc support = no
 ; default values for audio source pipeline (e.g, audiotest, mic)
 audio raw format = S16LE
@@ -45,6 +46,7 @@ source element = videotestsrc
 ;video framerate =
 ;video codec =
 ;video hw encoder element =
+;video encoded format support =
 video drc support = yes
 
 
@@ -57,6 +59,7 @@ source element = v4l2src
 ;video framerate =
 ;video codec =
 ;video hw encoder element =
+;video encoded format support =
 ;video drc support =
 
 
@@ -69,6 +72,7 @@ source element = waylandsrc
 ;video framerate =
 ;video codec =
 ;video hw encoder element =
+;video encoded format support =
 ;video drc support =
 
 
@@ -93,11 +97,21 @@ source element = pulsesrc
 
 
 [rendering sink]
+audio sink element = pulsesink
+video sink element = tizenwlsink
+
 ; comma separated list of elements, it should be one by one per codec type
 audio hw decoder elements =
 video hw decoder elements =
 
 
+[resource acquisition]
+camera = yes
+video encoder = no
+video decoder = no
+video overlay = no
+
+
 [vpxenc params]
 ;threads =
 ;end usage =

diff --git a/media-config-target-tm1/hal/etc/multimedia/mmfw_webrtc.ini b/media-config-target-tm1/hal/etc/multimedia/mmfw_webrtc.ini
index e8608d8bd6c0b823d7add592e122708ede1401f7..ab8777f40e69afd799ee1ad8c44c654896139fd8 100644 (file)
--- a/media-config-target-tm1/hal/etc/multimedia/mmfw_webrtc.ini
+++ b/media-config-target-tm1/hal/etc/multimedia/mmfw_webrtc.ini
@@ -27,6 +27,7 @@ video height = 240
 video framerate = 30
 video codec = vp8
 video hw encoder element =
+video encoded format support = no
 video drc support = no
 ; default values for audio source pipeline (e.g, audiotest, mic)
 audio raw format = S16LE
@@ -45,6 +46,7 @@ source element = videotestsrc
 ;video framerate =
 ;video codec =
 ;video hw encoder element =
+;video encoded format support =
 video drc support = yes
 
 
@@ -57,6 +59,7 @@ video height = 480
 video framerate = 30
 video codec = h264
 video hw encoder element = sprdenc_h264
+;video encoded format support =
 ;video drc support =
 
 
@@ -69,6 +72,7 @@ source element = waylandsrc
 ;video framerate =
 ;video codec =
 ;video hw encoder element =
+;video encoded format support =
 ;video drc support =
 
 
@@ -93,11 +97,21 @@ source element = pulsesrc
 
 
 [rendering sink]
+audio sink element = pulsesink
+video sink element = tizenwlsink
+
 ; comma separated list of elements, it should be one by one per codec type
 audio hw decoder elements =
 video hw decoder elements =
 
 
+[resource acquisition]
+camera = yes
+video encoder = yes
+video decoder = no
+video overlay = no
+
+
 [vpxenc params]
 ;threads =
 ;end usage =

diff --git a/media-config-target-tw3/hal/etc/multimedia/mmfw_webrtc.ini b/media-config-target-tw3/hal/etc/multimedia/mmfw_webrtc.ini
index 819ac8d4f7bbf95262c4eb43326c2c33578a22f2..fd6b7fcd9ffc59e1eb6240c8a6584b7d77510016 100644 (file)
--- a/media-config-target-tw3/hal/etc/multimedia/mmfw_webrtc.ini
+++ b/media-config-target-tw3/hal/etc/multimedia/mmfw_webrtc.ini
@@ -27,6 +27,7 @@ video height = 240
 video framerate = 30
 video codec = vp8
 video hw encoder element =
+video encoded format support = no
 video drc support = no
 ; default values for audio source pipeline (e.g, audiotest, mic)
 audio raw format = S16LE
@@ -45,6 +46,7 @@ source element = videotestsrc
 ;video framerate =
 ;video codec =
 ;video hw encoder element =
+;video encoded format support =
 video drc support = yes
 
 
@@ -57,6 +59,7 @@ source element = videotestsrc
 ;video framerate =
 ;video codec =
 ;video hw encoder element =
+;video encoded format support =
 ;video drc support =
 
 
@@ -69,6 +72,7 @@ source element = waylandsrc
 ;video framerate =
 ;video codec =
 ;video hw encoder element =
+;video encoded format support =
 ;video drc support =
 
 
@@ -93,11 +97,21 @@ source element = pulsesrc
 
 
 [rendering sink]
+audio sink element = pulsesink
+video sink element = tizenwlsink
+
 ; comma separated list of elements, it should be one by one per codec type
 audio hw decoder elements =
 video hw decoder elements =
 
 
+[resource acquisition]
+camera = no
+video encoder = no
+video decoder = no
+video overlay = no
+
+
 [vpxenc params]
 ;threads =
 ;end usage =

diff --git a/packaging/media-config.spec b/packaging/media-config.spec
index eaeed91b9fce9ab56079262e95407cfcd0124e3d..b040935dc8cb5d0ebc5bfb0d59a23abc84f30a43 100644 (file)
--- 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.5
+Version:    0.3.6
 Release:    0
 Group:      Multimedia/Configuration
 License:    LGPL-2.1 and Apache-2.0