From cb49faceed3834fa483de6cdb6fcf43d1cb9ebc8 Mon Sep 17 00:00:00 2001 From: Eunhae Choi Date: Mon, 1 Oct 2018 14:01:33 +0900 Subject: [PATCH] [0.2.134][player] add audio codec and unsupported codec info - remove unused info - add audio codec info - add unsupported codec info Change-Id: I707d94f60193426b8094d07dfe7f53e6874b0d8f --- .../etc/multimedia/mmfw_player.ini | 26 +++++++++---------- .../etc/multimedia/mmfw_player.ini | 19 +++----------- .../etc/multimedia/mmfw_player.ini | 18 +++---------- .../etc/multimedia/mmfw_player.ini | 18 +++---------- .../etc/multimedia/mmfw_player.ini | 19 +++----------- .../etc/multimedia/mmfw_player.ini | 18 +++---------- .../etc/multimedia/mmfw_player.ini | 18 +++---------- .../etc/multimedia/mmfw_player.ini | 19 +++----------- .../etc/multimedia/mmfw_player.ini | 19 +++----------- packaging/mmfw-sysconf.spec | 2 +- 10 files changed, 46 insertions(+), 130 deletions(-) diff --git a/mmfw-sysconf-simulator/etc/multimedia/mmfw_player.ini b/mmfw-sysconf-simulator/etc/multimedia/mmfw_player.ini index 5ce1c5d..33b1f5f 100644 --- a/mmfw-sysconf-simulator/etc/multimedia/mmfw_player.ini +++ b/mmfw-sysconf-simulator/etc/multimedia/mmfw_player.ini @@ -1,10 +1,5 @@ [general] -; if disabled typefind element will used directely -use decodebin = no ; async state change problem exist - -use sink handler = yes - disable segtrap = yes ; same effect with --gst-disable-segtrap ; set default videosink element according to video surface type(X, EVAS, NULL) @@ -12,14 +7,13 @@ videosink element overlay = tizenwlsink videosink element fake = fakesink video converter element = ffmpegcolorspace -; video decoder element keyword for resource management. +; decoder element keyword for resource management. video codec element hw = video codec element sw = avdec,maru +audio codec element sw = avdec audiosink element = pulsesink -drmsrc element = filesrc - ; if yes. gstreamer will not update registry skip rescan = yes delay before repeat = 50 ; msec @@ -27,22 +21,28 @@ delay before repeat = 50 ; msec ; comma separated list of tocken which elemnts has it in it's name will not be used element exclude keyword = ffdec_, omx_, v4l2 -async start = yes +; comma separated list of tocken +unsupported codec keyword = divx -multiple codec supported = yes +async start = yes ; parameters for initializing gstreamer -gstparam1 = +; DEFAULT SET (--gst-debug=*:2) +gstparam1 = --gst-debug=*:2 gstparam2 = gstparam3 = gstparam4 = gstparam5 = ; generating dot file representing pipeline state +; DEFAULT MUST BE 'no'. If 'yes', mmplayer will set env-variable for it's session as "export GST_DEBUG_DUMP_DOT_DIR=/tmp/" generate dot = no -; parameter for clock provide in audiosink -provide clock = yes +; parameter is for only video to be determined +; which clock will be used +; if yes, system clock will be used +; apart from this, audiosink is clock provider for audio +use system clock = yes ; allowed timeout for changing pipeline state live state change timeout = 30 ; sec diff --git a/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_player.ini b/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_player.ini index 0f3f5f6..509b26a 100644 --- a/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_player.ini +++ b/mmfw-sysconf-target-artik10/etc/multimedia/mmfw_player.ini @@ -7,15 +7,13 @@ videosink element overlay = tizenwlsink videosink element fake = fakesink video converter element = -; video decoder element keyword for resource management. +; decoder element keyword for resource management. video codec element hw = nxvideodec video codec element sw = avdec +audio codec element sw = avdec audiosink element = pulsesink - -drmsrc element = filesrc - ; if yes. gstreamer will not update registry skip rescan = yes delay before repeat = 50 ; msec @@ -23,17 +21,11 @@ delay before repeat = 50 ; msec ; comma separated list of tocken which elemnts has it in it's name will not be used element exclude keyword = v4l2,omx -; ignore resume play just for debugging -ignore first skip request = no - -;audio/video decode type(0:DEFAULT, 1:HW, 2:SW, 3:DISABLE) -video decoder type = 0 -audio decoder type = 0 +; comma separated list of tocken +unsupported codec keyword = divx async start = yes -multiple codec supported = yes - ; parameters for initializing gstreamer ; DEFAULT SET (--gst-debug=*:2) gstparam1 = --gst-debug=*:2 @@ -59,9 +51,6 @@ localplayback state change timeout = 10 ; sec ; delay in msec for sending EOS eos delay = 0 ; msec -; for asm function enable = yes, disable = no -enable asm = yes - ; extracted pcm buffer size pcm buffer size = 51200 ; 50Kbytes diff --git a/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_player.ini b/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_player.ini index 39f076b..0794a99 100644 --- a/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_player.ini +++ b/mmfw-sysconf-target-hawkp/etc/multimedia/mmfw_player.ini @@ -7,14 +7,13 @@ videosink element overlay = tizenwlsink videosink element fake = fakesink video converter element = -; video decoder element keyword for resource management. +; decoder element keyword for resource management. video codec element hw = omx video codec element sw = avdec +audio codec element sw = avdec audiosink element = pulsesink -drmsrc element = filesrc - ; if yes. gstreamer will not update registry skip rescan = yes delay before repeat = 50 ; msec @@ -22,17 +21,11 @@ delay before repeat = 50 ; msec ; comma separated list of tocken which elemnts has it in it's name will not be used element exclude keyword = v4l2,omx -; ignore resume play just for debugging -ignore first skip request = no - -;audio/video decode type(0:DEFAULT, 1:HW, 2:SW, 3:DISABLE) -video decoder type = 0 -audio decoder type = 0 +; comma separated list of tocken +unsupported codec keyword = divx async start = yes -multiple codec supported = yes - ; parameters for initializing gstreamer ; DEFAULT SET (--gst-debug=*:2) gstparam1 = --gst-debug=*:2 @@ -58,9 +51,6 @@ localplayback state change timeout = 10 ; sec ; delay in msec for sending EOS eos delay = 0 ; msec -; for asm function enable = yes, disable = no -enable asm = yes - ; extracted pcm buffer size pcm buffer size = 51200 ; 50Kbytes diff --git a/mmfw-sysconf-target-n4/etc/multimedia/mmfw_player.ini b/mmfw-sysconf-target-n4/etc/multimedia/mmfw_player.ini index 48e22fe..390afbf 100644 --- a/mmfw-sysconf-target-n4/etc/multimedia/mmfw_player.ini +++ b/mmfw-sysconf-target-n4/etc/multimedia/mmfw_player.ini @@ -7,14 +7,13 @@ videosink element overlay = tizenwlsink videosink element fake = fakesink video converter element = -; video decoder element keyword for resource management. +; decoder element keyword for resource management. video codec element hw = omx video codec element sw = avdec +audio codec element sw = avdec audiosink element = pulsesink -drmsrc element = filesrc - ; if yes. gstreamer will not update registry skip rescan = yes delay before repeat = 50 ; msec @@ -22,17 +21,11 @@ delay before repeat = 50 ; msec ; comma separated list of tocken which elemnts has it in it's name will not be used element exclude keyword = v4l2 -; ignore resume play just for debugging -ignore first skip request = no - -;audio/video decode type(0:DEFAULT, 1:HW, 2:SW, 3:DISABLE) -video decoder type = 0 -audio decoder type = 0 +; comma separated list of tocken +unsupported codec keyword = divx async start = yes -multiple codec supported = yes - ; parameters for initializing gstreamer ; DEFAULT SET (--gst-debug=*:2) gstparam1 = --gst-debug=*:2 @@ -58,9 +51,6 @@ localplayback state change timeout = 10 ; sec ; delay in msec for sending EOS eos delay = 0 ; msec -; for asm function enable = yes, disable = no -enable asm = yes - ; extracted pcm buffer size pcm buffer size = 51200 ; 50Kbytes diff --git a/mmfw-sysconf-target-rpi3/etc/multimedia/mmfw_player.ini b/mmfw-sysconf-target-rpi3/etc/multimedia/mmfw_player.ini index 251e137..390afbf 100644 --- a/mmfw-sysconf-target-rpi3/etc/multimedia/mmfw_player.ini +++ b/mmfw-sysconf-target-rpi3/etc/multimedia/mmfw_player.ini @@ -7,15 +7,13 @@ videosink element overlay = tizenwlsink videosink element fake = fakesink video converter element = -; video decoder element keyword for resource management. +; decoder element keyword for resource management. video codec element hw = omx video codec element sw = avdec +audio codec element sw = avdec audiosink element = pulsesink - -drmsrc element = filesrc - ; if yes. gstreamer will not update registry skip rescan = yes delay before repeat = 50 ; msec @@ -23,17 +21,11 @@ delay before repeat = 50 ; msec ; comma separated list of tocken which elemnts has it in it's name will not be used element exclude keyword = v4l2 -; ignore resume play just for debugging -ignore first skip request = no - -;audio/video decode type(0:DEFAULT, 1:HW, 2:SW, 3:DISABLE) -video decoder type = 0 -audio decoder type = 0 +; comma separated list of tocken +unsupported codec keyword = divx async start = yes -multiple codec supported = yes - ; parameters for initializing gstreamer ; DEFAULT SET (--gst-debug=*:2) gstparam1 = --gst-debug=*:2 @@ -59,9 +51,6 @@ localplayback state change timeout = 10 ; sec ; delay in msec for sending EOS eos delay = 0 ; msec -; for asm function enable = yes, disable = no -enable asm = yes - ; extracted pcm buffer size pcm buffer size = 51200 ; 50Kbytes diff --git a/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_player.ini b/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_player.ini index 265a62b..cafc210 100644 --- a/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_player.ini +++ b/mmfw-sysconf-target-tm1/etc/multimedia/mmfw_player.ini @@ -7,14 +7,13 @@ videosink element overlay = tizenwlsink videosink element fake = fakesink video converter element = -; video decoder element keyword for resource management. +; decoder element keyword for resource management. video codec element hw = sprd video codec element sw = avdec +audio codec element sw = avdec audiosink element = pulsesink -drmsrc element = filesrc - ; if yes. gstreamer will not update registry skip rescan = yes delay before repeat = 50 ; msec @@ -22,17 +21,11 @@ delay before repeat = 50 ; msec ; comma separated list of tocken which elemnts has it in it's name will not be used element exclude keyword = v4l2 -; ignore resume play just for debugging -ignore first skip request = no - -;audio/video decode type(0:DEFAULT, 1:HW, 2:SW, 3:DISABLE) -video decoder type = 0 -audio decoder type = 0 +; comma separated list of tocken +unsupported codec keyword = divx async start = yes -multiple codec supported = yes - ; parameters for initializing gstreamer ; DEFAULT SET (--gst-debug=*:2) gstparam1 = --gst-debug=*:2 @@ -58,9 +51,6 @@ localplayback state change timeout = 10 ; sec ; delay in msec for sending EOS eos delay = 0 ; msec -; for asm function enable = yes, disable = no -enable asm = yes - ; extracted pcm buffer size pcm buffer size = 51200 ; 50Kbytes diff --git a/mmfw-sysconf-target-tw1/etc/multimedia/mmfw_player.ini b/mmfw-sysconf-target-tw1/etc/multimedia/mmfw_player.ini index 48e22fe..390afbf 100644 --- a/mmfw-sysconf-target-tw1/etc/multimedia/mmfw_player.ini +++ b/mmfw-sysconf-target-tw1/etc/multimedia/mmfw_player.ini @@ -7,14 +7,13 @@ videosink element overlay = tizenwlsink videosink element fake = fakesink video converter element = -; video decoder element keyword for resource management. +; decoder element keyword for resource management. video codec element hw = omx video codec element sw = avdec +audio codec element sw = avdec audiosink element = pulsesink -drmsrc element = filesrc - ; if yes. gstreamer will not update registry skip rescan = yes delay before repeat = 50 ; msec @@ -22,17 +21,11 @@ delay before repeat = 50 ; msec ; comma separated list of tocken which elemnts has it in it's name will not be used element exclude keyword = v4l2 -; ignore resume play just for debugging -ignore first skip request = no - -;audio/video decode type(0:DEFAULT, 1:HW, 2:SW, 3:DISABLE) -video decoder type = 0 -audio decoder type = 0 +; comma separated list of tocken +unsupported codec keyword = divx async start = yes -multiple codec supported = yes - ; parameters for initializing gstreamer ; DEFAULT SET (--gst-debug=*:2) gstparam1 = --gst-debug=*:2 @@ -58,9 +51,6 @@ localplayback state change timeout = 10 ; sec ; delay in msec for sending EOS eos delay = 0 ; msec -; for asm function enable = yes, disable = no -enable asm = yes - ; extracted pcm buffer size pcm buffer size = 51200 ; 50Kbytes diff --git a/mmfw-sysconf-target-tw2/etc/multimedia/mmfw_player.ini b/mmfw-sysconf-target-tw2/etc/multimedia/mmfw_player.ini index 251e137..390afbf 100644 --- a/mmfw-sysconf-target-tw2/etc/multimedia/mmfw_player.ini +++ b/mmfw-sysconf-target-tw2/etc/multimedia/mmfw_player.ini @@ -7,15 +7,13 @@ videosink element overlay = tizenwlsink videosink element fake = fakesink video converter element = -; video decoder element keyword for resource management. +; decoder element keyword for resource management. video codec element hw = omx video codec element sw = avdec +audio codec element sw = avdec audiosink element = pulsesink - -drmsrc element = filesrc - ; if yes. gstreamer will not update registry skip rescan = yes delay before repeat = 50 ; msec @@ -23,17 +21,11 @@ delay before repeat = 50 ; msec ; comma separated list of tocken which elemnts has it in it's name will not be used element exclude keyword = v4l2 -; ignore resume play just for debugging -ignore first skip request = no - -;audio/video decode type(0:DEFAULT, 1:HW, 2:SW, 3:DISABLE) -video decoder type = 0 -audio decoder type = 0 +; comma separated list of tocken +unsupported codec keyword = divx async start = yes -multiple codec supported = yes - ; parameters for initializing gstreamer ; DEFAULT SET (--gst-debug=*:2) gstparam1 = --gst-debug=*:2 @@ -59,9 +51,6 @@ localplayback state change timeout = 10 ; sec ; delay in msec for sending EOS eos delay = 0 ; msec -; for asm function enable = yes, disable = no -enable asm = yes - ; extracted pcm buffer size pcm buffer size = 51200 ; 50Kbytes diff --git a/mmfw-sysconf-target-u3/etc/multimedia/mmfw_player.ini b/mmfw-sysconf-target-u3/etc/multimedia/mmfw_player.ini index a31cf62..0794a99 100644 --- a/mmfw-sysconf-target-u3/etc/multimedia/mmfw_player.ini +++ b/mmfw-sysconf-target-u3/etc/multimedia/mmfw_player.ini @@ -7,15 +7,13 @@ videosink element overlay = tizenwlsink videosink element fake = fakesink video converter element = -; video decoder element keyword for resource management. +; decoder element keyword for resource management. video codec element hw = omx video codec element sw = avdec +audio codec element sw = avdec audiosink element = pulsesink - -drmsrc element = filesrc - ; if yes. gstreamer will not update registry skip rescan = yes delay before repeat = 50 ; msec @@ -23,17 +21,11 @@ delay before repeat = 50 ; msec ; comma separated list of tocken which elemnts has it in it's name will not be used element exclude keyword = v4l2,omx -; ignore resume play just for debugging -ignore first skip request = no - -;audio/video decode type(0:DEFAULT, 1:HW, 2:SW, 3:DISABLE) -video decoder type = 0 -audio decoder type = 0 +; comma separated list of tocken +unsupported codec keyword = divx async start = yes -multiple codec supported = yes - ; parameters for initializing gstreamer ; DEFAULT SET (--gst-debug=*:2) gstparam1 = --gst-debug=*:2 @@ -59,9 +51,6 @@ localplayback state change timeout = 10 ; sec ; delay in msec for sending EOS eos delay = 0 ; msec -; for asm function enable = yes, disable = no -enable asm = yes - ; extracted pcm buffer size pcm buffer size = 51200 ; 50Kbytes diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec index bb138f2..4471ee0 100644 --- a/packaging/mmfw-sysconf.spec +++ b/packaging/mmfw-sysconf.spec @@ -1,6 +1,6 @@ Name: mmfw-sysconf Summary: Multimedia Framework system configuration package -Version: 0.2.133 +Version: 0.2.134 Release: 0 Group: Multimedia/Configuration License: LGPL-2.1 and Apache-2.0 -- 2.34.1