Eric Ruei
2018-12-10 15:52:58 UTC
AM654x EVM: play 1280x540 video image on 1280x800 LCD
Signed-off-by: Eric Ruei <e-***@ti.com>
---
.../arm_multimedia_h264dec/runH264Dec.sh | 5 ++-
.../arm_multimedia_mpeg4aacdec/runMpeg4AacDec.sh | 37 ++++++++++++----------
.../arm_multimedia_mpeg4dec/runMpeg4Dec.sh | 5 ++-
3 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh b/multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh
index be8b2dc..f1ea7dd 100644
--- a/multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh
+++ b/multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh
@@ -15,7 +15,7 @@ then
elif [ "$machine_type" = "omap5-evm" ]
then
filename="/usr/share/ti/video/TearOfSteel-Short-720x406.264"
-elif [ "$machine_type" = "am437x-evm" ] || [ "$machine_type" = "am437x-hs-evm" ] || [ "$machine_type" = "am438x-epos-evm" ] || [ "$machine_type" = "am65xx-evm" ]
+elif [ "$machine_type" = "am437x-evm" ] || [ "$machine_type" = "am437x-hs-evm" ] || [ "$machine_type" = "am438x-epos-evm" ]
then
resolution="`fbset | awk '/geometry/ {print $2"x"$3}'`"
if [ "$resolution" = "480x272" ]; then
@@ -23,6 +23,9 @@ then
else
filename="/usr/share/ti/video/TearOfSteel-Short-720x406.264"
fi
+elif [ "$machine_type" = "am65xx-evm" ]
+then
+ filename="/usr/share/ti/video/TearOfSteel-Short-1280x540.h264"
else
default_display="`cat /sys/devices/platform/omapdss/manager0/display`"
if [ "$default_display" = "dvi" ]; then
diff --git a/multimedia_apps/arm_multimedia_mpeg4aacdec/runMpeg4AacDec.sh b/multimedia_apps/arm_multimedia_mpeg4aacdec/runMpeg4AacDec.sh
index 18ee0ea..93e6eae 100644
--- a/multimedia_apps/arm_multimedia_mpeg4aacdec/runMpeg4AacDec.sh
+++ b/multimedia_apps/arm_multimedia_mpeg4aacdec/runMpeg4AacDec.sh
@@ -15,21 +15,24 @@ else
else
# Use WVGA for all other resolutions
filename="/usr/share/ti/video/TearOfSteel-AV-Short-720x420.mp4"
- fi
- elif [ "$machine_type" = "dra7xx-evm" ]
- then
- filename="/usr/share/ti/video/TearOfSteel-AV-Short-720x420.mp4"
- 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" ]
- then
- resolution="`fbset | awk '/geometry/ {print $2"x"$3}'`"
- if [ "$resolution" = "480x272" ]; then
- filename="/usr/share/ti/video/TearOfSteel-AV-Short-400x240.mp4"
- else
- filename="/usr/share/ti/video/TearOfSteel-AV-Short-720x406.mp4"
- fi
+ fi
+ elif [ "$machine_type" = "dra7xx-evm" ]
+ then
+ filename="/usr/share/ti/video/TearOfSteel-AV-Short-720x420.mp4"
+ 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" ]
+ then
+ resolution="`fbset | awk '/geometry/ {print $2"x"$3}'`"
+ if [ "$resolution" = "480x272" ]; then
+ filename="/usr/share/ti/video/TearOfSteel-AV-Short-400x240.mp4"
+ else
+ filename="/usr/share/ti/video/TearOfSteel-AV-Short-720x406.mp4"
+ fi
+ elif [ "$machine_type" = "am65xx-evm" ]
+ then
+ filename="/usr/share/ti/video/TearOfSteel-Short-1280x540.m4v"
else
default_display="`cat /sys/devices/platform/omapdss/manager0/display`"
if [ "$default_display" = "dvi" ]; then
@@ -52,9 +55,9 @@ else
amixer -c 0 set Headset 1+ unmute
elif [ "$machine_type" = "am335x-evm" ] || [ "$machine_type" = "am335x-hs-evm" ]; then
amixer 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
+ elif [ "$machine_type" = "am437x-evm" ] || [ "$machine_type" = "am437x-hs-evm" ] || [ "$machine_type" = "am438x-epos-evm" ]; then
# EPOS uses a different configuration so check if
# we are running on that board
diff --git a/multimedia_apps/arm_multimedia_mpeg4dec/runMpeg4Dec.sh b/multimedia_apps/arm_multimedia_mpeg4dec/runMpeg4Dec.sh
index 410d8ea..82fcb2c 100644
--- a/multimedia_apps/arm_multimedia_mpeg4dec/runMpeg4Dec.sh
+++ b/multimedia_apps/arm_multimedia_mpeg4dec/runMpeg4Dec.sh
@@ -15,7 +15,7 @@ then
elif [ "$machine_type" = "omap5-evm" ]
then
filename="/usr/share/ti/video/TearOfSteel-Short-720x406.m4v"
-elif [ "$machine_type" = "am437x-evm" ] || [ "$machine_type" = "am437x-hs-evm" ] || [ "$machine_type" = "am438x-epos-evm" ] || [ "$machine_type" = "am65xx-evm" ]
+elif [ "$machine_type" = "am437x-evm" ] || [ "$machine_type" = "am437x-hs-evm" ] || [ "$machine_type" = "am438x-epos-evm" ]
then
resolution="`fbset | awk '/geometry/ {print $2"x"$3}'`"
if [ "$resolution" = "480x272" ]; then
@@ -23,6 +23,9 @@ then
else
filename="/usr/share/ti/video/TearOfSteel-Short-720x406.m4v"
fi
+elif [ "$machine_type" = "am65xx-evm" ]
+then
+ filename="/usr/share/ti/video/TearOfSteel-Short-1280x540.m4v"
else
default_display="`cat /sys/devices/platform/omapdss/manager0/display`"
if [ "$default_display" = "dvi" ]; then
Signed-off-by: Eric Ruei <e-***@ti.com>
---
.../arm_multimedia_h264dec/runH264Dec.sh | 5 ++-
.../arm_multimedia_mpeg4aacdec/runMpeg4AacDec.sh | 37 ++++++++++++----------
.../arm_multimedia_mpeg4dec/runMpeg4Dec.sh | 5 ++-
3 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh b/multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh
index be8b2dc..f1ea7dd 100644
--- a/multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh
+++ b/multimedia_apps/arm_multimedia_h264dec/runH264Dec.sh
@@ -15,7 +15,7 @@ then
elif [ "$machine_type" = "omap5-evm" ]
then
filename="/usr/share/ti/video/TearOfSteel-Short-720x406.264"
-elif [ "$machine_type" = "am437x-evm" ] || [ "$machine_type" = "am437x-hs-evm" ] || [ "$machine_type" = "am438x-epos-evm" ] || [ "$machine_type" = "am65xx-evm" ]
+elif [ "$machine_type" = "am437x-evm" ] || [ "$machine_type" = "am437x-hs-evm" ] || [ "$machine_type" = "am438x-epos-evm" ]
then
resolution="`fbset | awk '/geometry/ {print $2"x"$3}'`"
if [ "$resolution" = "480x272" ]; then
@@ -23,6 +23,9 @@ then
else
filename="/usr/share/ti/video/TearOfSteel-Short-720x406.264"
fi
+elif [ "$machine_type" = "am65xx-evm" ]
+then
+ filename="/usr/share/ti/video/TearOfSteel-Short-1280x540.h264"
else
default_display="`cat /sys/devices/platform/omapdss/manager0/display`"
if [ "$default_display" = "dvi" ]; then
diff --git a/multimedia_apps/arm_multimedia_mpeg4aacdec/runMpeg4AacDec.sh b/multimedia_apps/arm_multimedia_mpeg4aacdec/runMpeg4AacDec.sh
index 18ee0ea..93e6eae 100644
--- a/multimedia_apps/arm_multimedia_mpeg4aacdec/runMpeg4AacDec.sh
+++ b/multimedia_apps/arm_multimedia_mpeg4aacdec/runMpeg4AacDec.sh
@@ -15,21 +15,24 @@ else
else
# Use WVGA for all other resolutions
filename="/usr/share/ti/video/TearOfSteel-AV-Short-720x420.mp4"
- fi
- elif [ "$machine_type" = "dra7xx-evm" ]
- then
- filename="/usr/share/ti/video/TearOfSteel-AV-Short-720x420.mp4"
- 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" ]
- then
- resolution="`fbset | awk '/geometry/ {print $2"x"$3}'`"
- if [ "$resolution" = "480x272" ]; then
- filename="/usr/share/ti/video/TearOfSteel-AV-Short-400x240.mp4"
- else
- filename="/usr/share/ti/video/TearOfSteel-AV-Short-720x406.mp4"
- fi
+ fi
+ elif [ "$machine_type" = "dra7xx-evm" ]
+ then
+ filename="/usr/share/ti/video/TearOfSteel-AV-Short-720x420.mp4"
+ 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" ]
+ then
+ resolution="`fbset | awk '/geometry/ {print $2"x"$3}'`"
+ if [ "$resolution" = "480x272" ]; then
+ filename="/usr/share/ti/video/TearOfSteel-AV-Short-400x240.mp4"
+ else
+ filename="/usr/share/ti/video/TearOfSteel-AV-Short-720x406.mp4"
+ fi
+ elif [ "$machine_type" = "am65xx-evm" ]
+ then
+ filename="/usr/share/ti/video/TearOfSteel-Short-1280x540.m4v"
else
default_display="`cat /sys/devices/platform/omapdss/manager0/display`"
if [ "$default_display" = "dvi" ]; then
@@ -52,9 +55,9 @@ else
amixer -c 0 set Headset 1+ unmute
elif [ "$machine_type" = "am335x-evm" ] || [ "$machine_type" = "am335x-hs-evm" ]; then
amixer 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
+ elif [ "$machine_type" = "am437x-evm" ] || [ "$machine_type" = "am437x-hs-evm" ] || [ "$machine_type" = "am438x-epos-evm" ]; then
# EPOS uses a different configuration so check if
# we are running on that board
diff --git a/multimedia_apps/arm_multimedia_mpeg4dec/runMpeg4Dec.sh b/multimedia_apps/arm_multimedia_mpeg4dec/runMpeg4Dec.sh
index 410d8ea..82fcb2c 100644
--- a/multimedia_apps/arm_multimedia_mpeg4dec/runMpeg4Dec.sh
+++ b/multimedia_apps/arm_multimedia_mpeg4dec/runMpeg4Dec.sh
@@ -15,7 +15,7 @@ then
elif [ "$machine_type" = "omap5-evm" ]
then
filename="/usr/share/ti/video/TearOfSteel-Short-720x406.m4v"
-elif [ "$machine_type" = "am437x-evm" ] || [ "$machine_type" = "am437x-hs-evm" ] || [ "$machine_type" = "am438x-epos-evm" ] || [ "$machine_type" = "am65xx-evm" ]
+elif [ "$machine_type" = "am437x-evm" ] || [ "$machine_type" = "am437x-hs-evm" ] || [ "$machine_type" = "am438x-epos-evm" ]
then
resolution="`fbset | awk '/geometry/ {print $2"x"$3}'`"
if [ "$resolution" = "480x272" ]; then
@@ -23,6 +23,9 @@ then
else
filename="/usr/share/ti/video/TearOfSteel-Short-720x406.m4v"
fi
+elif [ "$machine_type" = "am65xx-evm" ]
+then
+ filename="/usr/share/ti/video/TearOfSteel-Short-1280x540.m4v"
else
default_display="`cat /sys/devices/platform/omapdss/manager0/display`"
if [ "$default_display" = "dvi" ]; then
--
1.9.1
1.9.1