summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9dc73c8)
raw | patch | inline | side by side (parent: 9dc73c8)
author | Hongmei Gou <h-gou@ti.com> | |
Mon, 4 Apr 2016 18:00:13 +0000 (14:00 -0400) | ||
committer | Hongmei Gou <h-gou@ti.com> | |
Mon, 4 Apr 2016 18:00:13 +0000 (14:00 -0400) |
* When HDMI is disconnected for AM57xx IDK, there is no audio port to play
audio. In this scenario, exit AACDec demo and use fakesink as the audio
sink for IvahdH264Dec demo
Signed-off-by: Hongmei Gou <h-gou@ti.com>
audio. In this scenario, exit AACDec demo and use fakesink as the audio
sink for IvahdH264Dec demo
Signed-off-by: Hongmei Gou <h-gou@ti.com>
multimedia_apps/arm_multimedia_aacdec/runAACDec.sh | patch | blob | history | |
multimedia_apps/ivahd_multimedia_h264dec/runIvahdH264Dec.sh | patch | blob | history |
diff --git a/multimedia_apps/arm_multimedia_aacdec/runAACDec.sh b/multimedia_apps/arm_multimedia_aacdec/runAACDec.sh
index c5d18964a3473106ff43abfa452ffff0913bd50d..75aff42e70e39d173855f78ba81be4924f6df585 100644 (file)
amixer cset name='PCM Playback Volume' 127
elif [ "$machine_type" = "am57xx-evm" ]; then
amixer cset name='PCM Playback Volume' 127
- # Define HDMI audio sink for AM5 GP EVM
- if ! cat /proc/device-tree/model | grep "IDK"
+ # Exit for AM5 IDK when HDMI is disconnected
+ if cat /proc/device-tree/model | grep "IDK"
then
+ if modetest | grep "HDMI" | grep "disconnected" > /dev/null
+ then
+ echo "Exit as there is no audio port"
+ exit 1
+ fi
+ else # Define HDMI audio sink for AM5 GP EVM
if modetest | grep "HDMI"
then
# HDMI enabled
diff --git a/multimedia_apps/ivahd_multimedia_h264dec/runIvahdH264Dec.sh b/multimedia_apps/ivahd_multimedia_h264dec/runIvahdH264Dec.sh
index 9393304d6c19c3c60934bbb610e017f999931d76..330b0d756b69cd5093f19acf003f57272412962d 100644 (file)
AUDIO_SINK="alsasink"
-if modetest | grep "HDMI"
+if cat /proc/device-tree/model | grep "IDK"
then
- # HDMI enabled
- if ! modetest | grep "HDMI" | grep "disconnected" > /dev/null
+ if modetest | grep "HDMI" | grep "disconnected" > /dev/null
then
- # HDMI connected, use audio over HDMI
- AUDIO_SINK="$AUDIO_SINK device=hw:1,0"
+ # Use audio fakesink for IDK when HDMI is disconnected
+ AUDIO_SINK="fakesink"
+ fi
+else
+ if modetest | grep "HDMI"
+ then
+ # HDMI enabled
+ if ! modetest | grep "HDMI" | grep "disconnected" > /dev/null
+ then
+ # HDMI connected, use audio over HDMI
+ AUDIO_SINK="$AUDIO_SINK device=hw:1,0"
+ fi
fi
-fi
-
-if cat /proc/device-tree/model | grep "IDK"
-then
- # Use alsasink for IDK which has one audio port (HDMI) only
- AUDIO_SINK="alsasink"
fi
if [ ! -f $filename ]; then