Changed .ini file according to modified node creation logic

Change-Id: Ib68ac1c92c1253f289a9b8f348a56bf896b16cf8
Signed-off-by: Vyacheslav Valkovoy <v.valkovoy@samsung.com>

diff --git a/mmfw-sysconf-simulator/etc/multimedia/mmfw_media_streamer.ini b/mmfw-sysconf-simulator/etc/multimedia/mmfw_media_streamer.ini
index 458ad4eaf6104e803051487b1a6d2eb26e1db330..552aea5c5f8a06ea18ef5efa8af17675a0b6e169 100644 (file)
--- a/mmfw-sysconf-simulator/etc/multimedia/mmfw_media_streamer.ini
+++ b/mmfw-sysconf-simulator/etc/multimedia/mmfw_media_streamer.ini
@@ -14,37 +14,106 @@ exclude elements = v4l2video,omx,sprd
 ; that will pass to gst_init
 gstreamer arguments = --gst-debug=2
 
-[sources]
 
-audio_source = pulsesrc
-camera_source = v4l2src
-video_source = ximagesrc
-udp_source = udpsrc
+;MEDIA_STREAMER_NODE_TYPE_SRC
+[node type 1]
+audio capture = pulsesrc
+video capture = ximagesrc
+camera = camerasrc
 
+;MEDIA_STREAMER_NODE_TYPE_SINK
+[node type 2]
+audio = pulsesink
+overlay = waylandsink
+evas = evaspixmapsink
 
-[sinks]
-audio_sink = pulsesink
-video_sink = waylandsink
-evas_sink = evaspixmapsink
-udp_sink = udpsink
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_ENCODER
+[node type 3]
+video/x-h264 = x264enc
+video/x-h263 = avenc_h263
 
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_DECODER
+[node type 4]
+video/x-h264 = avdec_h264
+video/x-h263 = avdec_h263
 
-[h263]
-encoder = avenc_h263
-decoder = avdec_h263
-rtppay = rtph263pay
-rtpdepay = rtph263depay
-parser = h263parse
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_ENCODER
+[node type 5]
+audio/AMR = amrnbenc
 
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_DECODER
+[node type 6]
+audio/AMR = amrnbdec
 
-[h264]
-encoder = avenc_h264
-decoder = avdec_h264
-rtppay = rtph264pay
-rtpdepay = rtph264depay
-parser = h264parse
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_CONVERTER
+[node type 7]
 
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_CONVERTER
+[node type 8]
+
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_RESAMPLE
+[node type 9]
+
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_PAY
+[node type 10]
+video/x-h263 = rtph263pay
+
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_PAY
+[node type 11]
+
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_DEPAY
+[node type 12]
+video/x-h263 = rtph263depay
+video/x-h264 = rtph264depay
+
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_DEPAY
+[node type 13]
+
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_RATE
+[node type 14]
+
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_SCALE
+[node type 15]
+
+;MEDIA_STREAMER_NODE_TYPE_TEXT_OVERLAY
+[node type 16]
+text/x-raw = textoverlay
+
+;MEDIA_STREAMER_NODE_TYPE_PARSER
+[node type 17]
+video/x-h263 = h263parse
+video/x-h264 = h264parse
+
+;MEDIA_STREAMER_NODE_TYPE_FILTER
+[node type 18]
+
+;MEDIA_STREAMER_NODE_TYPE_TEE
+[node type 19]
+
+;MEDIA_STREAMER_NODE_TYPE_QUEUE
+[node type 20]
+
+;MEDIA_STREAMER_NODE_TYPE_MQUEUE
+[node type 21]
+
+;MEDIA_STREAMER_NODE_TYPE_MUXER
+[node type 22]
+
+;MEDIA_STREAMER_NODE_TYPE_DEMUXER
+[node type 23]
+
+;MEDIA_STREAMER_NODE_TYPE_RTP
+[node type 24]
+
+;MEDIA_STREAMER_NODE_TYPE_INPUT_SELECTOR
+[node type 25]
+
+;MEDIA_STREAMER_NODE_TYPE_OUTPUT_SELECTOR
+[node type 26]
+
+;MEDIA_STREAMER_NODE_TYPE_INTERLEAVE
+[node type 27]
+
+;MEDIA_STREAMER_NODE_TYPE_DEINTERLEAVE
+[node type 28]
 
-[audio-raw]
-rtppay = rtpL16pay
-rtpdepay = rtpL16depay

diff --git a/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_media_streamer.ini b/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_media_streamer.ini
index 957a63f54e0d20596a38f28abfcda9a60379596b..552aea5c5f8a06ea18ef5efa8af17675a0b6e169 100644 (file)
--- a/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_media_streamer.ini
+++ b/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_media_streamer.ini
@@ -14,37 +14,106 @@ exclude elements = v4l2video,omx,sprd
 ; that will pass to gst_init
 gstreamer arguments = --gst-debug=2
 
-[sources]
 
-audio_source = pulsesrc
-camera_source = camerasrc
-video_source = ximagesrc
-udp_source = udpsrc
+;MEDIA_STREAMER_NODE_TYPE_SRC
+[node type 1]
+audio capture = pulsesrc
+video capture = ximagesrc
+camera = camerasrc
 
+;MEDIA_STREAMER_NODE_TYPE_SINK
+[node type 2]
+audio = pulsesink
+overlay = waylandsink
+evas = evaspixmapsink
 
-[sinks]
-audio_sink = pulsesink
-video_sink = waylandsink
-evas_sink = evaspixmapsink
-udp_sink = udpsink
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_ENCODER
+[node type 3]
+video/x-h264 = x264enc
+video/x-h263 = avenc_h263
 
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_DECODER
+[node type 4]
+video/x-h264 = avdec_h264
+video/x-h263 = avdec_h263
 
-[h263]
-encoder = avenc_h263
-decoder = avdec_h263
-rtppay = rtph263pay
-rtpdepay = rtph263depay
-parser = h263parse
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_ENCODER
+[node type 5]
+audio/AMR = amrnbenc
 
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_DECODER
+[node type 6]
+audio/AMR = amrnbdec
 
-[h264]
-encoder = avenc_h264
-decoder = avdec_h264
-rtppay = rtph264pay
-rtpdepay = rtph264depay
-parser = h264parse
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_CONVERTER
+[node type 7]
 
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_CONVERTER
+[node type 8]
+
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_RESAMPLE
+[node type 9]
+
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_PAY
+[node type 10]
+video/x-h263 = rtph263pay
+
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_PAY
+[node type 11]
+
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_DEPAY
+[node type 12]
+video/x-h263 = rtph263depay
+video/x-h264 = rtph264depay
+
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_DEPAY
+[node type 13]
+
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_RATE
+[node type 14]
+
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_SCALE
+[node type 15]
+
+;MEDIA_STREAMER_NODE_TYPE_TEXT_OVERLAY
+[node type 16]
+text/x-raw = textoverlay
+
+;MEDIA_STREAMER_NODE_TYPE_PARSER
+[node type 17]
+video/x-h263 = h263parse
+video/x-h264 = h264parse
+
+;MEDIA_STREAMER_NODE_TYPE_FILTER
+[node type 18]
+
+;MEDIA_STREAMER_NODE_TYPE_TEE
+[node type 19]
+
+;MEDIA_STREAMER_NODE_TYPE_QUEUE
+[node type 20]
+
+;MEDIA_STREAMER_NODE_TYPE_MQUEUE
+[node type 21]
+
+;MEDIA_STREAMER_NODE_TYPE_MUXER
+[node type 22]
+
+;MEDIA_STREAMER_NODE_TYPE_DEMUXER
+[node type 23]
+
+;MEDIA_STREAMER_NODE_TYPE_RTP
+[node type 24]
+
+;MEDIA_STREAMER_NODE_TYPE_INPUT_SELECTOR
+[node type 25]
+
+;MEDIA_STREAMER_NODE_TYPE_OUTPUT_SELECTOR
+[node type 26]
+
+;MEDIA_STREAMER_NODE_TYPE_INTERLEAVE
+[node type 27]
+
+;MEDIA_STREAMER_NODE_TYPE_DEINTERLEAVE
+[node type 28]
 
-[audio-raw]
-rtppay = rtpL16pay
-rtpdepay = rtpL16depay

diff --git a/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_media_streamer.ini b/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_media_streamer.ini
index 957a63f54e0d20596a38f28abfcda9a60379596b..552aea5c5f8a06ea18ef5efa8af17675a0b6e169 100644 (file)
--- a/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_media_streamer.ini
+++ b/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_media_streamer.ini
@@ -14,37 +14,106 @@ exclude elements = v4l2video,omx,sprd
 ; that will pass to gst_init
 gstreamer arguments = --gst-debug=2
 
-[sources]
 
-audio_source = pulsesrc
-camera_source = camerasrc
-video_source = ximagesrc
-udp_source = udpsrc
+;MEDIA_STREAMER_NODE_TYPE_SRC
+[node type 1]
+audio capture = pulsesrc
+video capture = ximagesrc
+camera = camerasrc
 
+;MEDIA_STREAMER_NODE_TYPE_SINK
+[node type 2]
+audio = pulsesink
+overlay = waylandsink
+evas = evaspixmapsink
 
-[sinks]
-audio_sink = pulsesink
-video_sink = waylandsink
-evas_sink = evaspixmapsink
-udp_sink = udpsink
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_ENCODER
+[node type 3]
+video/x-h264 = x264enc
+video/x-h263 = avenc_h263
 
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_DECODER
+[node type 4]
+video/x-h264 = avdec_h264
+video/x-h263 = avdec_h263
 
-[h263]
-encoder = avenc_h263
-decoder = avdec_h263
-rtppay = rtph263pay
-rtpdepay = rtph263depay
-parser = h263parse
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_ENCODER
+[node type 5]
+audio/AMR = amrnbenc
 
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_DECODER
+[node type 6]
+audio/AMR = amrnbdec
 
-[h264]
-encoder = avenc_h264
-decoder = avdec_h264
-rtppay = rtph264pay
-rtpdepay = rtph264depay
-parser = h264parse
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_CONVERTER
+[node type 7]
 
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_CONVERTER
+[node type 8]
+
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_RESAMPLE
+[node type 9]
+
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_PAY
+[node type 10]
+video/x-h263 = rtph263pay
+
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_PAY
+[node type 11]
+
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_DEPAY
+[node type 12]
+video/x-h263 = rtph263depay
+video/x-h264 = rtph264depay
+
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_DEPAY
+[node type 13]
+
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_RATE
+[node type 14]
+
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_SCALE
+[node type 15]
+
+;MEDIA_STREAMER_NODE_TYPE_TEXT_OVERLAY
+[node type 16]
+text/x-raw = textoverlay
+
+;MEDIA_STREAMER_NODE_TYPE_PARSER
+[node type 17]
+video/x-h263 = h263parse
+video/x-h264 = h264parse
+
+;MEDIA_STREAMER_NODE_TYPE_FILTER
+[node type 18]
+
+;MEDIA_STREAMER_NODE_TYPE_TEE
+[node type 19]
+
+;MEDIA_STREAMER_NODE_TYPE_QUEUE
+[node type 20]
+
+;MEDIA_STREAMER_NODE_TYPE_MQUEUE
+[node type 21]
+
+;MEDIA_STREAMER_NODE_TYPE_MUXER
+[node type 22]
+
+;MEDIA_STREAMER_NODE_TYPE_DEMUXER
+[node type 23]
+
+;MEDIA_STREAMER_NODE_TYPE_RTP
+[node type 24]
+
+;MEDIA_STREAMER_NODE_TYPE_INPUT_SELECTOR
+[node type 25]
+
+;MEDIA_STREAMER_NODE_TYPE_OUTPUT_SELECTOR
+[node type 26]
+
+;MEDIA_STREAMER_NODE_TYPE_INTERLEAVE
+[node type 27]
+
+;MEDIA_STREAMER_NODE_TYPE_DEINTERLEAVE
+[node type 28]
 
-[audio-raw]
-rtppay = rtpL16pay
-rtpdepay = rtpL16depay

diff --git a/mmfw-sysconf-target-n4/etc/multimedia/mmfw_media_streamer.ini b/mmfw-sysconf-target-n4/etc/multimedia/mmfw_media_streamer.ini
index 957a63f54e0d20596a38f28abfcda9a60379596b..552aea5c5f8a06ea18ef5efa8af17675a0b6e169 100644 (file)
--- a/mmfw-sysconf-target-n4/etc/multimedia/mmfw_media_streamer.ini
+++ b/mmfw-sysconf-target-n4/etc/multimedia/mmfw_media_streamer.ini
@@ -14,37 +14,106 @@ exclude elements = v4l2video,omx,sprd
 ; that will pass to gst_init
 gstreamer arguments = --gst-debug=2
 
-[sources]
 
-audio_source = pulsesrc
-camera_source = camerasrc
-video_source = ximagesrc
-udp_source = udpsrc
+;MEDIA_STREAMER_NODE_TYPE_SRC
+[node type 1]
+audio capture = pulsesrc
+video capture = ximagesrc
+camera = camerasrc
 
+;MEDIA_STREAMER_NODE_TYPE_SINK
+[node type 2]
+audio = pulsesink
+overlay = waylandsink
+evas = evaspixmapsink
 
-[sinks]
-audio_sink = pulsesink
-video_sink = waylandsink
-evas_sink = evaspixmapsink
-udp_sink = udpsink
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_ENCODER
+[node type 3]
+video/x-h264 = x264enc
+video/x-h263 = avenc_h263
 
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_DECODER
+[node type 4]
+video/x-h264 = avdec_h264
+video/x-h263 = avdec_h263
 
-[h263]
-encoder = avenc_h263
-decoder = avdec_h263
-rtppay = rtph263pay
-rtpdepay = rtph263depay
-parser = h263parse
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_ENCODER
+[node type 5]
+audio/AMR = amrnbenc
 
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_DECODER
+[node type 6]
+audio/AMR = amrnbdec
 
-[h264]
-encoder = avenc_h264
-decoder = avdec_h264
-rtppay = rtph264pay
-rtpdepay = rtph264depay
-parser = h264parse
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_CONVERTER
+[node type 7]
 
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_CONVERTER
+[node type 8]
+
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_RESAMPLE
+[node type 9]
+
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_PAY
+[node type 10]
+video/x-h263 = rtph263pay
+
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_PAY
+[node type 11]
+
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_DEPAY
+[node type 12]
+video/x-h263 = rtph263depay
+video/x-h264 = rtph264depay
+
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_DEPAY
+[node type 13]
+
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_RATE
+[node type 14]
+
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_SCALE
+[node type 15]
+
+;MEDIA_STREAMER_NODE_TYPE_TEXT_OVERLAY
+[node type 16]
+text/x-raw = textoverlay
+
+;MEDIA_STREAMER_NODE_TYPE_PARSER
+[node type 17]
+video/x-h263 = h263parse
+video/x-h264 = h264parse
+
+;MEDIA_STREAMER_NODE_TYPE_FILTER
+[node type 18]
+
+;MEDIA_STREAMER_NODE_TYPE_TEE
+[node type 19]
+
+;MEDIA_STREAMER_NODE_TYPE_QUEUE
+[node type 20]
+
+;MEDIA_STREAMER_NODE_TYPE_MQUEUE
+[node type 21]
+
+;MEDIA_STREAMER_NODE_TYPE_MUXER
+[node type 22]
+
+;MEDIA_STREAMER_NODE_TYPE_DEMUXER
+[node type 23]
+
+;MEDIA_STREAMER_NODE_TYPE_RTP
+[node type 24]
+
+;MEDIA_STREAMER_NODE_TYPE_INPUT_SELECTOR
+[node type 25]
+
+;MEDIA_STREAMER_NODE_TYPE_OUTPUT_SELECTOR
+[node type 26]
+
+;MEDIA_STREAMER_NODE_TYPE_INTERLEAVE
+[node type 27]
+
+;MEDIA_STREAMER_NODE_TYPE_DEINTERLEAVE
+[node type 28]
 
-[audio-raw]
-rtppay = rtpL16pay
-rtpdepay = rtpL16depay

diff --git a/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_media_streamer.ini b/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_media_streamer.ini
index 61b9fe6b91e4bbbe0aa05fc74d7ba086ff9db47f..552aea5c5f8a06ea18ef5efa8af17675a0b6e169 100644 (file)
--- a/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_media_streamer.ini
+++ b/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_media_streamer.ini
@@ -8,43 +8,112 @@ use decodebin = yes
 
 ; comma separated list of element names which
 ; will not be used in autoplug mode
-exclude elements = v4l2video,omx
+exclude elements = v4l2video,omx,sprd
 
 ; comma separated list of arguments
 ; that will pass to gst_init
 gstreamer arguments = --gst-debug=2
 
-[sources]
 
-audio_source = pulsesrc
-camera_source = camerasrc
-video_source = ximagesrc
-udp_source = udpsrc
+;MEDIA_STREAMER_NODE_TYPE_SRC
+[node type 1]
+audio capture = pulsesrc
+video capture = ximagesrc
+camera = camerasrc
 
+;MEDIA_STREAMER_NODE_TYPE_SINK
+[node type 2]
+audio = pulsesink
+overlay = waylandsink
+evas = evaspixmapsink
 
-[sinks]
-audio_sink = pulsesink
-video_sink = waylandsink
-evas_sink = evaspixmapsink
-udp_sink = udpsink
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_ENCODER
+[node type 3]
+video/x-h264 = x264enc
+video/x-h263 = avenc_h263
 
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_DECODER
+[node type 4]
+video/x-h264 = avdec_h264
+video/x-h263 = avdec_h263
 
-[h263]
-encoder = avenc_h263
-decoder = avdec_h263
-rtppay = rtph263pay
-rtpdepay = rtph263depay
-parser = h263parse
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_ENCODER
+[node type 5]
+audio/AMR = amrnbenc
 
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_DECODER
+[node type 6]
+audio/AMR = amrnbdec
 
-[h264]
-encoder = avenc_h264
-decoder = avdec_h264
-rtppay = rtph264pay
-rtpdepay = rtph264depay
-parser = h264parse
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_CONVERTER
+[node type 7]
 
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_CONVERTER
+[node type 8]
+
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_RESAMPLE
+[node type 9]
+
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_PAY
+[node type 10]
+video/x-h263 = rtph263pay
+
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_PAY
+[node type 11]
+
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_DEPAY
+[node type 12]
+video/x-h263 = rtph263depay
+video/x-h264 = rtph264depay
+
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_DEPAY
+[node type 13]
+
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_RATE
+[node type 14]
+
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_SCALE
+[node type 15]
+
+;MEDIA_STREAMER_NODE_TYPE_TEXT_OVERLAY
+[node type 16]
+text/x-raw = textoverlay
+
+;MEDIA_STREAMER_NODE_TYPE_PARSER
+[node type 17]
+video/x-h263 = h263parse
+video/x-h264 = h264parse
+
+;MEDIA_STREAMER_NODE_TYPE_FILTER
+[node type 18]
+
+;MEDIA_STREAMER_NODE_TYPE_TEE
+[node type 19]
+
+;MEDIA_STREAMER_NODE_TYPE_QUEUE
+[node type 20]
+
+;MEDIA_STREAMER_NODE_TYPE_MQUEUE
+[node type 21]
+
+;MEDIA_STREAMER_NODE_TYPE_MUXER
+[node type 22]
+
+;MEDIA_STREAMER_NODE_TYPE_DEMUXER
+[node type 23]
+
+;MEDIA_STREAMER_NODE_TYPE_RTP
+[node type 24]
+
+;MEDIA_STREAMER_NODE_TYPE_INPUT_SELECTOR
+[node type 25]
+
+;MEDIA_STREAMER_NODE_TYPE_OUTPUT_SELECTOR
+[node type 26]
+
+;MEDIA_STREAMER_NODE_TYPE_INTERLEAVE
+[node type 27]
+
+;MEDIA_STREAMER_NODE_TYPE_DEINTERLEAVE
+[node type 28]
 
-[audio-raw]
-rtppay = rtpL16pay
-rtpdepay = rtpL16depay

diff --git a/mmfw-sysconf-target-tw1/etc/multimedia/mmfw_media_streamer.ini b/mmfw-sysconf-target-tw1/etc/multimedia/mmfw_media_streamer.ini
index 957a63f54e0d20596a38f28abfcda9a60379596b..552aea5c5f8a06ea18ef5efa8af17675a0b6e169 100644 (file)
--- a/mmfw-sysconf-target-tw1/etc/multimedia/mmfw_media_streamer.ini
+++ b/mmfw-sysconf-target-tw1/etc/multimedia/mmfw_media_streamer.ini
@@ -14,37 +14,106 @@ exclude elements = v4l2video,omx,sprd
 ; that will pass to gst_init
 gstreamer arguments = --gst-debug=2
 
-[sources]
 
-audio_source = pulsesrc
-camera_source = camerasrc
-video_source = ximagesrc
-udp_source = udpsrc
+;MEDIA_STREAMER_NODE_TYPE_SRC
+[node type 1]
+audio capture = pulsesrc
+video capture = ximagesrc
+camera = camerasrc
 
+;MEDIA_STREAMER_NODE_TYPE_SINK
+[node type 2]
+audio = pulsesink
+overlay = waylandsink
+evas = evaspixmapsink
 
-[sinks]
-audio_sink = pulsesink
-video_sink = waylandsink
-evas_sink = evaspixmapsink
-udp_sink = udpsink
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_ENCODER
+[node type 3]
+video/x-h264 = x264enc
+video/x-h263 = avenc_h263
 
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_DECODER
+[node type 4]
+video/x-h264 = avdec_h264
+video/x-h263 = avdec_h263
 
-[h263]
-encoder = avenc_h263
-decoder = avdec_h263
-rtppay = rtph263pay
-rtpdepay = rtph263depay
-parser = h263parse
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_ENCODER
+[node type 5]
+audio/AMR = amrnbenc
 
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_DECODER
+[node type 6]
+audio/AMR = amrnbdec
 
-[h264]
-encoder = avenc_h264
-decoder = avdec_h264
-rtppay = rtph264pay
-rtpdepay = rtph264depay
-parser = h264parse
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_CONVERTER
+[node type 7]
 
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_CONVERTER
+[node type 8]
+
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_RESAMPLE
+[node type 9]
+
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_PAY
+[node type 10]
+video/x-h263 = rtph263pay
+
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_PAY
+[node type 11]
+
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_DEPAY
+[node type 12]
+video/x-h263 = rtph263depay
+video/x-h264 = rtph264depay
+
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_DEPAY
+[node type 13]
+
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_RATE
+[node type 14]
+
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_SCALE
+[node type 15]
+
+;MEDIA_STREAMER_NODE_TYPE_TEXT_OVERLAY
+[node type 16]
+text/x-raw = textoverlay
+
+;MEDIA_STREAMER_NODE_TYPE_PARSER
+[node type 17]
+video/x-h263 = h263parse
+video/x-h264 = h264parse
+
+;MEDIA_STREAMER_NODE_TYPE_FILTER
+[node type 18]
+
+;MEDIA_STREAMER_NODE_TYPE_TEE
+[node type 19]
+
+;MEDIA_STREAMER_NODE_TYPE_QUEUE
+[node type 20]
+
+;MEDIA_STREAMER_NODE_TYPE_MQUEUE
+[node type 21]
+
+;MEDIA_STREAMER_NODE_TYPE_MUXER
+[node type 22]
+
+;MEDIA_STREAMER_NODE_TYPE_DEMUXER
+[node type 23]
+
+;MEDIA_STREAMER_NODE_TYPE_RTP
+[node type 24]
+
+;MEDIA_STREAMER_NODE_TYPE_INPUT_SELECTOR
+[node type 25]
+
+;MEDIA_STREAMER_NODE_TYPE_OUTPUT_SELECTOR
+[node type 26]
+
+;MEDIA_STREAMER_NODE_TYPE_INTERLEAVE
+[node type 27]
+
+;MEDIA_STREAMER_NODE_TYPE_DEINTERLEAVE
+[node type 28]
 
-[audio-raw]
-rtppay = rtpL16pay
-rtpdepay = rtpL16depay

diff --git a/mmfw-sysconf-target-u3/etc/multimedia/mmfw_media_streamer.ini b/mmfw-sysconf-target-u3/etc/multimedia/mmfw_media_streamer.ini
index 957a63f54e0d20596a38f28abfcda9a60379596b..552aea5c5f8a06ea18ef5efa8af17675a0b6e169 100644 (file)
--- a/mmfw-sysconf-target-u3/etc/multimedia/mmfw_media_streamer.ini
+++ b/mmfw-sysconf-target-u3/etc/multimedia/mmfw_media_streamer.ini
@@ -14,37 +14,106 @@ exclude elements = v4l2video,omx,sprd
 ; that will pass to gst_init
 gstreamer arguments = --gst-debug=2
 
-[sources]
 
-audio_source = pulsesrc
-camera_source = camerasrc
-video_source = ximagesrc
-udp_source = udpsrc
+;MEDIA_STREAMER_NODE_TYPE_SRC
+[node type 1]
+audio capture = pulsesrc
+video capture = ximagesrc
+camera = camerasrc
 
+;MEDIA_STREAMER_NODE_TYPE_SINK
+[node type 2]
+audio = pulsesink
+overlay = waylandsink
+evas = evaspixmapsink
 
-[sinks]
-audio_sink = pulsesink
-video_sink = waylandsink
-evas_sink = evaspixmapsink
-udp_sink = udpsink
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_ENCODER
+[node type 3]
+video/x-h264 = x264enc
+video/x-h263 = avenc_h263
 
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_DECODER
+[node type 4]
+video/x-h264 = avdec_h264
+video/x-h263 = avdec_h263
 
-[h263]
-encoder = avenc_h263
-decoder = avdec_h263
-rtppay = rtph263pay
-rtpdepay = rtph263depay
-parser = h263parse
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_ENCODER
+[node type 5]
+audio/AMR = amrnbenc
 
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_DECODER
+[node type 6]
+audio/AMR = amrnbdec
 
-[h264]
-encoder = avenc_h264
-decoder = avdec_h264
-rtppay = rtph264pay
-rtpdepay = rtph264depay
-parser = h264parse
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_CONVERTER
+[node type 7]
 
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_CONVERTER
+[node type 8]
+
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_RESAMPLE
+[node type 9]
+
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_PAY
+[node type 10]
+video/x-h263 = rtph263pay
+
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_PAY
+[node type 11]
+
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_DEPAY
+[node type 12]
+video/x-h263 = rtph263depay
+video/x-h264 = rtph264depay
+
+;MEDIA_STREAMER_NODE_TYPE_AUDIO_DEPAY
+[node type 13]
+
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_RATE
+[node type 14]
+
+;MEDIA_STREAMER_NODE_TYPE_VIDEO_SCALE
+[node type 15]
+
+;MEDIA_STREAMER_NODE_TYPE_TEXT_OVERLAY
+[node type 16]
+text/x-raw = textoverlay
+
+;MEDIA_STREAMER_NODE_TYPE_PARSER
+[node type 17]
+video/x-h263 = h263parse
+video/x-h264 = h264parse
+
+;MEDIA_STREAMER_NODE_TYPE_FILTER
+[node type 18]
+
+;MEDIA_STREAMER_NODE_TYPE_TEE
+[node type 19]
+
+;MEDIA_STREAMER_NODE_TYPE_QUEUE
+[node type 20]
+
+;MEDIA_STREAMER_NODE_TYPE_MQUEUE
+[node type 21]
+
+;MEDIA_STREAMER_NODE_TYPE_MUXER
+[node type 22]
+
+;MEDIA_STREAMER_NODE_TYPE_DEMUXER
+[node type 23]
+
+;MEDIA_STREAMER_NODE_TYPE_RTP
+[node type 24]
+
+;MEDIA_STREAMER_NODE_TYPE_INPUT_SELECTOR
+[node type 25]
+
+;MEDIA_STREAMER_NODE_TYPE_OUTPUT_SELECTOR
+[node type 26]
+
+;MEDIA_STREAMER_NODE_TYPE_INTERLEAVE
+[node type 27]
+
+;MEDIA_STREAMER_NODE_TYPE_DEINTERLEAVE
+[node type 28]
 
-[audio-raw]
-rtppay = rtpL16pay
-rtpdepay = rtpL16depay