arm_multimedia: add kmssink support
PATCH 1/1 arm_multimedia: add kmssink support
- use kmssink as video sink for AM4 and AM6 SoCs
- cleanup indentations
--- .../arm_multimedia_h264dec/runH264Dec.sh | 15 ++++++- .../arm_multimedia_mpeg4aacdec/runMpeg4AacDec.sh | 52 +++++++++++++--------- .../arm_multimedia_mpeg4dec/runMpeg4Dec.sh | 13 +++++- 3 files changed, 55 insertions(+), 25 deletions(-)
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +13 -2
@@ -1,7 +1,9 @@ #!/bin/sh machine_type="`cat /etc/hostname`" +VIDEO_SINK="kmssink" if [ "$machine_type" = "am335x-evm" ] || [ "$machine_type" = "am335x-hs-evm" ]; then + VIDEO_SINK="fbdevsink" resolution="`fbset | awk '/geometry/ {print $2"x"$3}'`" if [ "$resolution" = "480x272" ]; then filename="/usr/share/ti/video/TearOfSteel-Short-400x240.264"
@@ -25,7 +27,8 @@ then fi elif [ "$machine_type" = "am65xx-evm" ] then - filename="/usr/share/ti/video/TearOfSteel-Short-1280x540.h264" + VIDEO_SINK="kmssink_am6" + filename="/usr/share/ti/video/TearOfSteel-Short-720x406.264" else default_display="`cat /sys/devices/platform/omapdss/manager0/display`" if [ "$default_display" = "dvi" ]; then
@@ -50,4 +53,12 @@ echo "" echo "Launch GStreamer pipeline" echo "" echo "Length of video clip: 21 seconds" -gst-launch-1.0 filesrc location=$filename ! queue ! h264parse ! avdec_h264 ! videoconvert ! fbdevsink device=/dev/fb0 +if [ "$VIDEO_SINK" = "fbdevsink" ] +then + gst-launch-1.0 filesrc location=$filename ! queue ! h264parse ! avdec_h264 ! videoconvert ! fbdevsink device=/dev/fb0 +elif [ "$VIDEO_SINK" = "kmssink_am6" ] +then + gst-launch-1.0 filesrc location=$filename ! queue ! h264parse ! avdec_h264 ! videoconvert ! 'video/x-raw, format=(string)BGRA' ! kmssink +else + gst-launch-1.0 filesrc location=$filename ! queue ! h264parse ! avdec_h264 ! videoconvert ! kmssink +fi
multimedia_apps/arm_multimedia_mpeg4aacdec/runMpeg4AacDec.sh +31 -21
78 lines not on this page · raw message
multimedia_apps/arm_multimedia_mpeg4dec/runMpeg4Dec.sh +11 -2
@@ -1,7 +1,9 @@ #!/bin/sh machine_type="`cat /etc/hostname`" +VIDEO_SINK="kmssink" if [ "$machine_type" = "am335x-evm" ] || [ "$machine_type" = "am335x-hs-evm" ]; then + VIDEO_SINK="fbdevsink" resolution="`fbset | awk '/geometry/ {print $2"x"$3}'`" if [ "$resolution" = "480x272" ]; then filename="/usr/share/ti/video/TearOfSteel-Short-400x240.m4v"
@@ -25,7 +27,8 @@ then fi elif [ "$machine_type" = "am65xx-evm" ] then - filename="/usr/share/ti/video/TearOfSteel-Short-1280x540.m4v" + VIDEO_SINK="kmssink_am6" + filename="/usr/share/ti/video/TearOfSteel-Short-720x406.m4v" else default_display="`cat /sys/devices/platform/omapdss/manager0/display`" if [ "$default_display" = "dvi" ]; then
@@ -46,4 +49,10 @@ if [ ! -f $filename ]; then echo "Video clip not found" exit 1 fi -gst-launch-1.0 playbin uri=file://$filename video-sink=fbdevsink audio-sink=fakesink +if [ "$VIDEO_SINK" = "fbdevsink" ]; then + gst-launch-1.0 playbin uri=file://$filename video-sink=fbdevsink audio-sink=fakesink +elif [ "$VIDEO_SINK" = "kmssink_am6" ]; then + gst-launch-1.0 filesrc location=$filename ! queue ! qtdemux name=demux demux.video_0 ! queue ! avdec_mpeg4 ! videoconvert ! 'video/x-raw, format=(string)BGRA' ! kmssink +else + gst-launch-1.0 filesrc location=$filename ! queue ! qtdemux name=demux demux.video_0 ! queue ! avdec_mpeg4 ! videoconvert ! kmssink +fi
Signature · 1 line
1.9.1
Quoted 37 lines
-----Original Message-----
From: [email protected] [mailto:meta-arago- [email protected]] On Behalf Of Ruei, Eric
Sent: Wednesday, February 20, 2019 10:41 AM
To: [email protected]
Subject: [EXTERNAL] [meta-arago] [matrix-gui-v2-apps][PATCH]arm_multimedia: add kmssink support- use kmssink as video sink for AM4 and AM6 SoCs
- cleanup indentationsSigned-off-by Eric Ruei <[email protected]>--- .../arm_multimedia_h264dec/runH264Dec.sh | 15 ++++++- .../arm_multimedia_mpeg4aacdec/runMpeg4AacDec.sh | 52 +++++++++++++--------- .../arm_multimedia_mpeg4dec/runMpeg4Dec.sh | 13 +++++- 3 files changed, 55 insertions(+), 25 deletions(-)multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +1
-0@@ -1,7 +1,9 @@ #!/bin/sh machine_type="`cat /etc/hostname`" +VIDEO_SINK="kmssink" if [ "$machine_type" = "am335x-evm" ] || [ "$machine_type" = "am335x-hs-evm" ]; then
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +1
-0+ VIDEO_SINK="fbdevsink" resolution="`fbset | awk '/geometry/ {print $2"x"$3}'`" if [ "$resolution" = "480x272" ]; then filename="/usr/share/ti/video/TearOfSteel-Short-400x240.264"
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh then · line 30
Quoted 5 lines
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +1
-1@@ -25,7 +27,8 @@ then fi elif [ "$machine_type" = "am65xx-evm" ] then - filename="/usr/share/ti/video/TearOfSteel-Short-1280x540.h264" + VIDEO_SINK="kmssink_am6"
Setting VIDEO_SINK as kmssink_am6 may cause confusion. According to the pipelines used below, am6 is using kmssink also, but requires a different video format for the display.
Quoted 192 lines
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +1
-0+ filename="/usr/share/ti/video/TearOfSteel-Short-720x406.264" else default_display="`cat/sys/devices/platform/omapdss/manager0/display`"
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +0
-1if [ "$default_display" = "dvi" ]; then@@ -50,4 +53,12 @@ echo "" echo "Launch GStreamer pipeline" echo "" echo "Length of video clip: 21 seconds" -gst-launch-1.0 filesrc location=$filename ! queue ! h264parse ! avdec_h264 !videoconvert ! fbdevsink device=/dev/fb0
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +3
-0+if [ "$VIDEO_SINK" = "fbdevsink" ] +then + gst-launch-1.0 filesrc location=$filename ! queue ! h264parse !
avdec_h264! videoconvert ! fbdevsink device=/dev/fb0multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +3
-0+elif [ "$VIDEO_SINK" = "kmssink_am6" ] +then + gst-launch-1.0 filesrc location=$filename ! queue ! h264parse !
avdec_h264! videoconvert ! 'video/x-raw, format=(string)BGRA' ! kmssinkmultimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +2
-0+else + gst-launch-1.0 filesrc location=$filename ! queue ! h264parse !
avdec_h264! videoconvert ! kmssink
+fi
\ No newline at end of file
diff --gita/multimedia_apps/arm_multimedia_mpeg4aacdec/runMpeg4AacDec.shb/multimedia_apps/arm_multimedia_mpeg4aacdec/runMpeg4AacDec.shindex 18ee0ea..d968435 100644
---a/multimedia_apps/arm_multimedia_mpeg4aacdec/runMpeg4AacDec.sh
+++b/multimedia_apps/arm_multimedia_mpeg4aacdec/runMpeg4AacDec.shmultimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +1
-0@@ -8,28 +8,34 @@ elif grep -q "no soundcards" /proc/asound/cards; then echo "No sound devices found!" else machine_type="`cat /etc/hostname`" + VIDEO_SINK="kmssink" if [ "$machine_type" = "am335x-evm" ] || [ "$machine_type" ="am335x-hs-evm" ]; then
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +2
-1+ VIDEO_SINK="fbdevsink" resolution="`fbset | awk '/geometry/ {print $2"x"$3}'`" - if [ "$resolution" = "480x272" ]; then + if [ "$resolution" = "480x272" ]; then filename="/usr/share/ti/video/TearOfSteel-AV-Short-400x240.mp4"
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +0
-0else # Use WVGA for all other resolutions filename="/usr/share/ti/video/TearOfSteel-AV-Short-720x420.mp4"
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +0
-4- fi - elif [ "$machine_type" = "dra7xx-evm" ] - then - filename="/usr/share/ti/video/TearOfSteel-AV-Short-720x420.mp4"
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +0
-4- elif [ "$machine_type" = "omap5-evm" ] - then - filename="/usr/share/ti/video/TearOfSteel-AV-Short-720x406.mp4" - elif [ "$machine_type" = "am437x-evm" ] || [ "$machine_type" ="am437x-hs-evm" ] || [ "$machine_type" = "am438x-epos-evm" ]|| [ "$machine_type" = "am65xx-evm" ]
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +0
-4- then - resolution="`fbset | awk '/geometry/ {print $2"x"$3}'`" - if [ "$resolution" = "480x272" ]; then - filename="/usr/share/ti/video/TearOfSteel-AV-Short-400x240.mp4"
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +0
-2- else - filename="/usr/share/ti/video/TearOfSteel-AV-Short-720x406.mp4"
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +4
-1- fi + fi + elif [ "$machine_type" = "dra7xx-evm" ] + then + filename="/usr/share/ti/video/TearOfSteel-AV-Short-720x420.mp4"
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +3
-0+ elif [ "$machine_type" = "omap5-evm" ] + then + filename="/usr/share/ti/video/TearOfSteel-AV-Short-720x406.mp4"
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +4
-0+ elif [ "$machine_type" = "am65xx-evm" ] + then + VIDEO_SINK="kmssink_am6" + filename="/usr/share/ti/video/TearOfSteel-AV-Short-720x406.mp4"
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +1
-0+ elif [ "$machine_type" = "am437x-evm" ] || [ "$machine_type" ="am437x-hs-evm" ] || [ "$machine_type" = "am438x-epos-evm" ]
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +4
-0+ then + resolution="`fbset | awk '/geometry/ {print $2"x"$3}'`" + if [ "$resolution" = "480x272" ]; then + filename="/usr/share/ti/video/TearOfSteel-AV-Short-400x240.mp4"
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +2
-0+ else + filename="/usr/share/ti/video/TearOfSteel-AV-Short-720x406.mp4"
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +1
-0+ fi else default_display="`cat/sys/devices/platform/omapdss/manager0/display`"
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +0
-0if [ "$default_display" = "dvi" ]; then@@ -52,14 +58,12 @@ else amixer -c 0 set Headset 1+ unmute elif [ "$machine_type" = "am335x-evm" ] || [ "$machine_type" ="am335x-hs-evm" ]; then
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +1
-2amixer cset name='PCM Playback Volume' 127 - elif [ "$machine_type" = "omap5-evm" ]; then + elif [ "$machine_type" = "omap5-evm" ]; then amixer cset name='PCM Playback Volume' 127 - elif [ "$machine_type" = "am437x-evm" ] || [ "$machine_type" ="am437x-hs-evm" ] || [ "$machine_type" = "am438x-epos-evm" ]; then
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +1
-1- + elif [ "$machine_type" = "am437x-evm" ] || [ "$machine_type" ="am437x-hs-evm" ] || [ "$machine_type" = "am438x-epos-evm" ]; then
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +0
-2# EPOS uses a different configuration so check if # we are running on that board model_name=`cat /proc/device-tree/model | grep -i epos` - if [ "$?" = '0' ]; then amixer cset name='DAC Playback Volume' 127 amixer cset name='HP Analog Playback Volume' 66@@ -72,5 +76,11 @@ else amixer cset name='PCM Playback Volume' 127 fi fi - gst-launch-1.0 filesrc location=$filename ! queue ! qtdemuxname=demux demux.audio_0 ! queue ! faad ! alsasink demux.video_0 ! queue !
avdec_mpeg4! videoconvert ! fbdevsink device=/dev/fb0multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +2
-0+ if [ "$VIDEO_SINK" = "fbdevsink" ]; then + gst-launch-1.0 filesrc location=$filename ! queue ! qtdemuxname=demux demux.audio_0 ! queue ! faad ! alsasink demux.video_0 ! queue !
avdec_mpeg4! videoconvert ! fbdevsink device=/dev/fb0multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +2
-0+ elif [ "$VIDEO_SINK" = "kmssink_am6" ]; then + gst-launch-1.0 filesrc location=$filename ! queue ! qtdemuxname=demux demux.audio_0 ! queue ! faad ! alsasink demux.video_0 ! queue !
avdec_mpeg4! videoconvert ! 'video/x-raw, format=(string)BGRA' ! kmssinkmultimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +2
-0+ else + gst-launch-1.0 filesrc location=$filename ! queue ! qtdemuxname=demux demux.audio_0 ! queue ! faad ! alsasink demux.video_0 ! queue !
avdec_mpeg4! videoconvert ! kmssinkmultimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +1
-0+ fi fimultimedia_apps/arm_multimedia_mpeg4dec/runMpeg4Dec.sh +1
-0@@ -1,7 +1,9 @@ #!/bin/sh machine_type="`cat /etc/hostname`" +VIDEO_SINK="kmssink" if [ "$machine_type" = "am335x-evm" ] || [ "$machine_type" = "am335x-hs-evm" ]; then
multimedia_apps/arm_multimedia_mpeg4dec/runMpeg4Dec.sh +1
-0+ VIDEO_SINK="fbdevsink" resolution="`fbset | awk '/geometry/ {print $2"x"$3}'`" if [ "$resolution" = "480x272" ]; then filename="/usr/share/ti/video/TearOfSteel-Short-400x240.m4v"
multimedia_apps/arm_multimedia_mpeg4dec/runMpeg4Dec.sh +2
-1@@ -25,7 +27,8 @@ then fi elif [ "$machine_type" = "am65xx-evm" ] then - filename="/usr/share/ti/video/TearOfSteel-Short-1280x540.m4v" + VIDEO_SINK="kmssink_am6" + filename="/usr/share/ti/video/TearOfSteel-Short-720x406.m4v" else default_display="`cat/sys/devices/platform/omapdss/manager0/display`"
multimedia_apps/arm_multimedia_mpeg4dec/runMpeg4Dec.sh +0
-1if [ "$default_display" = "dvi" ]; then@@ -46,4 +49,10 @@ if [ ! -f $filename ]; then echo "Video clip not found" exit 1 fi -gst-launch-1.0 playbin uri=file://$filename video-sink=fbdevsink audio-sink=fakesink
multimedia_apps/arm_multimedia_mpeg4dec/runMpeg4Dec.sh +2
-0+if [ "$VIDEO_SINK" = "fbdevsink" ]; then + gst-launch-1.0 playbin uri=file://$filename video-sink=fbdevsinkaudio-sink=fakesink
multimedia_apps/arm_multimedia_mpeg4dec/runMpeg4Dec.sh +2
-0+elif [ "$VIDEO_SINK" = "kmssink_am6" ]; then + gst-launch-1.0 filesrc location=$filename ! queue ! qtdemuxname=demux demux.video_0 ! queue !
avdec_mpeg4! videoconvert ! 'video/x-raw, format=(string)BGRA' ! kmssinkmultimedia_apps/arm_multimedia_mpeg4dec/runMpeg4Dec.sh +2
-0+else + gst-launch-1.0 filesrc location=$filename ! queue ! qtdemuxname=demux demux.video_0 ! queue !
avdec_mpeg4! videoconvert ! kmssink
+fi
--
1.9.1_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
Any suggest of better variable name?
Best regards,
Eric
-----Original Message-----
From: Gou, Hongmei
Sent: Monday, February 25, 2019 10:13 AM
To: Ruei, Eric; [email protected]
Subject: RE: [EXTERNAL] [meta-arago] [matrix-gui-v2-apps][PATCH] arm_multimedia: add kmssink support
Quoted 37 lines
-----Original Message-----
From: [email protected] [mailto:meta-arago- [email protected]] On Behalf Of Ruei, Eric
Sent: Wednesday, February 20, 2019 10:41 AM
To: [email protected]
Subject: [EXTERNAL] [meta-arago] [matrix-gui-v2-apps][PATCH]arm_multimedia: add kmssink support- use kmssink as video sink for AM4 and AM6 SoCs
- cleanup indentationsSigned-off-by Eric Ruei <[email protected]>--- .../arm_multimedia_h264dec/runH264Dec.sh | 15 ++++++- .../arm_multimedia_mpeg4aacdec/runMpeg4AacDec.sh | 52 +++++++++++++--------- .../arm_multimedia_mpeg4dec/runMpeg4Dec.sh | 13 +++++- 3 files changed, 55 insertions(+), 25 deletions(-)multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +1
-0@@ -1,7 +1,9 @@ #!/bin/sh machine_type="`cat /etc/hostname`" +VIDEO_SINK="kmssink" if [ "$machine_type" = "am335x-evm" ] || [ "$machine_type" = "am335x-hs-evm" ]; then
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +1
-0+ VIDEO_SINK="fbdevsink" resolution="`fbset | awk '/geometry/ {print $2"x"$3}'`" if [ "$resolution" = "480x272" ]; then filename="/usr/share/ti/video/TearOfSteel-Short-400x240.264"
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh then · line 30
Quoted 5 lines
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +1
-1@@ -25,7 +27,8 @@ then fi elif [ "$machine_type" = "am65xx-evm" ] then - filename="/usr/share/ti/video/TearOfSteel-Short-1280x540.h264" + VIDEO_SINK="kmssink_am6"
Setting VIDEO_SINK as kmssink_am6 may cause confusion. According to the pipelines used below, am6 is using kmssink also, but requires a different video format for the display.
Quoted 192 lines
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +1
-0+ filename="/usr/share/ti/video/TearOfSteel-Short-720x406.264" else default_display="`cat/sys/devices/platform/omapdss/manager0/display`"
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +0
-1if [ "$default_display" = "dvi" ]; then@@ -50,4 +53,12 @@ echo "" echo "Launch GStreamer pipeline" echo "" echo "Length of video clip: 21 seconds" -gst-launch-1.0 filesrc location=$filename ! queue ! h264parse ! avdec_h264 !videoconvert ! fbdevsink device=/dev/fb0
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +3
-0+if [ "$VIDEO_SINK" = "fbdevsink" ] +then + gst-launch-1.0 filesrc location=$filename ! queue ! h264parse !
avdec_h264! videoconvert ! fbdevsink device=/dev/fb0multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +3
-0+elif [ "$VIDEO_SINK" = "kmssink_am6" ] +then + gst-launch-1.0 filesrc location=$filename ! queue ! h264parse !
avdec_h264! videoconvert ! 'video/x-raw, format=(string)BGRA' ! kmssinkmultimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +2
-0+else + gst-launch-1.0 filesrc location=$filename ! queue ! h264parse !
avdec_h264! videoconvert ! kmssink
+fi
\ No newline at end of file
diff --gita/multimedia_apps/arm_multimedia_mpeg4aacdec/runMpeg4AacDec.shb/multimedia_apps/arm_multimedia_mpeg4aacdec/runMpeg4AacDec.shindex 18ee0ea..d968435 100644
---a/multimedia_apps/arm_multimedia_mpeg4aacdec/runMpeg4AacDec.sh
+++b/multimedia_apps/arm_multimedia_mpeg4aacdec/runMpeg4AacDec.shmultimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +1
-0@@ -8,28 +8,34 @@ elif grep -q "no soundcards" /proc/asound/cards; then echo "No sound devices found!" else machine_type="`cat /etc/hostname`" + VIDEO_SINK="kmssink" if [ "$machine_type" = "am335x-evm" ] || [ "$machine_type" ="am335x-hs-evm" ]; then
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +2
-1+ VIDEO_SINK="fbdevsink" resolution="`fbset | awk '/geometry/ {print $2"x"$3}'`" - if [ "$resolution" = "480x272" ]; then + if [ "$resolution" = "480x272" ]; then filename="/usr/share/ti/video/TearOfSteel-AV-Short-400x240.mp4"
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +0
-0else # Use WVGA for all other resolutions filename="/usr/share/ti/video/TearOfSteel-AV-Short-720x420.mp4"
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +0
-4- fi - elif [ "$machine_type" = "dra7xx-evm" ] - then - filename="/usr/share/ti/video/TearOfSteel-AV-Short-720x420.mp4"
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +0
-4- elif [ "$machine_type" = "omap5-evm" ] - then - filename="/usr/share/ti/video/TearOfSteel-AV-Short-720x406.mp4" - elif [ "$machine_type" = "am437x-evm" ] || [ "$machine_type" ="am437x-hs-evm" ] || [ "$machine_type" = "am438x-epos-evm" ]|| [ "$machine_type" = "am65xx-evm" ]
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +0
-4- then - resolution="`fbset | awk '/geometry/ {print $2"x"$3}'`" - if [ "$resolution" = "480x272" ]; then - filename="/usr/share/ti/video/TearOfSteel-AV-Short-400x240.mp4"
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +0
-2- else - filename="/usr/share/ti/video/TearOfSteel-AV-Short-720x406.mp4"
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +4
-1- fi + fi + elif [ "$machine_type" = "dra7xx-evm" ] + then + filename="/usr/share/ti/video/TearOfSteel-AV-Short-720x420.mp4"
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +3
-0+ elif [ "$machine_type" = "omap5-evm" ] + then + filename="/usr/share/ti/video/TearOfSteel-AV-Short-720x406.mp4"
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +4
-0+ elif [ "$machine_type" = "am65xx-evm" ] + then + VIDEO_SINK="kmssink_am6" + filename="/usr/share/ti/video/TearOfSteel-AV-Short-720x406.mp4"
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +1
-0+ elif [ "$machine_type" = "am437x-evm" ] || [ "$machine_type" ="am437x-hs-evm" ] || [ "$machine_type" = "am438x-epos-evm" ]
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +4
-0+ then + resolution="`fbset | awk '/geometry/ {print $2"x"$3}'`" + if [ "$resolution" = "480x272" ]; then + filename="/usr/share/ti/video/TearOfSteel-AV-Short-400x240.mp4"
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +2
-0+ else + filename="/usr/share/ti/video/TearOfSteel-AV-Short-720x406.mp4"
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +1
-0+ fi else default_display="`cat/sys/devices/platform/omapdss/manager0/display`"
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +0
-0if [ "$default_display" = "dvi" ]; then@@ -52,14 +58,12 @@ else amixer -c 0 set Headset 1+ unmute elif [ "$machine_type" = "am335x-evm" ] || [ "$machine_type" ="am335x-hs-evm" ]; then
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +1
-2amixer cset name='PCM Playback Volume' 127 - elif [ "$machine_type" = "omap5-evm" ]; then + elif [ "$machine_type" = "omap5-evm" ]; then amixer cset name='PCM Playback Volume' 127 - elif [ "$machine_type" = "am437x-evm" ] || [ "$machine_type" ="am437x-hs-evm" ] || [ "$machine_type" = "am438x-epos-evm" ]; then
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +1
-1- + elif [ "$machine_type" = "am437x-evm" ] || [ "$machine_type" ="am437x-hs-evm" ] || [ "$machine_type" = "am438x-epos-evm" ]; then
multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +0
-2# EPOS uses a different configuration so check if # we are running on that board model_name=`cat /proc/device-tree/model | grep -i epos` - if [ "$?" = '0' ]; then amixer cset name='DAC Playback Volume' 127 amixer cset name='HP Analog Playback Volume' 66@@ -72,5 +76,11 @@ else amixer cset name='PCM Playback Volume' 127 fi fi - gst-launch-1.0 filesrc location=$filename ! queue ! qtdemuxname=demux demux.audio_0 ! queue ! faad ! alsasink demux.video_0 ! queue !
avdec_mpeg4! videoconvert ! fbdevsink device=/dev/fb0multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +2
-0+ if [ "$VIDEO_SINK" = "fbdevsink" ]; then + gst-launch-1.0 filesrc location=$filename ! queue ! qtdemuxname=demux demux.audio_0 ! queue ! faad ! alsasink demux.video_0 ! queue !
avdec_mpeg4! videoconvert ! fbdevsink device=/dev/fb0multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +2
-0+ elif [ "$VIDEO_SINK" = "kmssink_am6" ]; then + gst-launch-1.0 filesrc location=$filename ! queue ! qtdemuxname=demux demux.audio_0 ! queue ! faad ! alsasink demux.video_0 ! queue !
avdec_mpeg4! videoconvert ! 'video/x-raw, format=(string)BGRA' ! kmssinkmultimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +2
-0+ else + gst-launch-1.0 filesrc location=$filename ! queue ! qtdemuxname=demux demux.audio_0 ! queue ! faad ! alsasink demux.video_0 ! queue !
avdec_mpeg4! videoconvert ! kmssinkmultimedia_apps/arm_multimedia_h264dec/runH264Dec.sh +1
-0+ fi fimultimedia_apps/arm_multimedia_mpeg4dec/runMpeg4Dec.sh +1
-0@@ -1,7 +1,9 @@ #!/bin/sh machine_type="`cat /etc/hostname`" +VIDEO_SINK="kmssink" if [ "$machine_type" = "am335x-evm" ] || [ "$machine_type" = "am335x-hs-evm" ]; then
multimedia_apps/arm_multimedia_mpeg4dec/runMpeg4Dec.sh +1
-0+ VIDEO_SINK="fbdevsink" resolution="`fbset | awk '/geometry/ {print $2"x"$3}'`" if [ "$resolution" = "480x272" ]; then filename="/usr/share/ti/video/TearOfSteel-Short-400x240.m4v"
multimedia_apps/arm_multimedia_mpeg4dec/runMpeg4Dec.sh +2
-1@@ -25,7 +27,8 @@ then fi elif [ "$machine_type" = "am65xx-evm" ] then - filename="/usr/share/ti/video/TearOfSteel-Short-1280x540.m4v" + VIDEO_SINK="kmssink_am6" + filename="/usr/share/ti/video/TearOfSteel-Short-720x406.m4v" else default_display="`cat/sys/devices/platform/omapdss/manager0/display`"
multimedia_apps/arm_multimedia_mpeg4dec/runMpeg4Dec.sh +0
-1if [ "$default_display" = "dvi" ]; then@@ -46,4 +49,10 @@ if [ ! -f $filename ]; then echo "Video clip not found" exit 1 fi -gst-launch-1.0 playbin uri=file://$filename video-sink=fbdevsink audio-sink=fakesink
multimedia_apps/arm_multimedia_mpeg4dec/runMpeg4Dec.sh +2
-0+if [ "$VIDEO_SINK" = "fbdevsink" ]; then + gst-launch-1.0 playbin uri=file://$filename video-sink=fbdevsinkaudio-sink=fakesink
multimedia_apps/arm_multimedia_mpeg4dec/runMpeg4Dec.sh +2
-0+elif [ "$VIDEO_SINK" = "kmssink_am6" ]; then + gst-launch-1.0 filesrc location=$filename ! queue ! qtdemuxname=demux demux.video_0 ! queue !
avdec_mpeg4! videoconvert ! 'video/x-raw, format=(string)BGRA' ! kmssinkmultimedia_apps/arm_multimedia_mpeg4dec/runMpeg4Dec.sh +2
-0+else + gst-launch-1.0 filesrc location=$filename ! queue ! qtdemuxname=demux demux.video_0 ! queue !
avdec_mpeg4! videoconvert ! kmssink
+fi
--
1.9.1_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago