Attachment 882036 Details for Bug 1045307 – audio.py patch checking for HDMI device number, and adding it to the play command

[patch] audio.py patch checking for HDMI device number, and adding it to the play command

audio.patch (text/plain), 2.53 KB, created by Greg Nichols on 2014-04-03 00:29:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2014-04-03 00:29:42 UTC

Size: 2.53 KB

patch

obsolete

>diff --git a/tests/audio/audio.py b/tests/audio/audio.py
>index 6d3c7dc..53137fa 100644
>--- a/tests/audio/audio.py
>+++ b/tests/audio/audio.py
>@@ -49,10 +49,30 @@ class AudioTest(Test):
>                     print infopath
>                     Command("cat %s" % infopath).echo()
>                     print ""
>+                self.getDeviceNumber()
>                 return True
>         # otherwise
>         return False
> 
>+    def getDeviceNumber(self):
>+        self.deviceNumber = -1
>+        for eldpath in glob.glob("/proc/asound/card%s/eld*" % self.cardNumber):
>+            # self.deviceNumber = eldpath.split('.')[1]
>+            file = open(eldpath)
>+            lines = file.read(8192).splitlines()
>+            file.close()
>+            present = 0
>+            eldValid = 0
>+            for line in lines:
>+                if line.startswith('monitor_present'):
>+                    present = int(line.split('\t')[-1])
>+                if line.startswith('eld_valid'):
>+                    eldValid = int(line.split('\t')[-1])
>+            # catch first output with connected monitor
>+            if not present or not eldValid:
>+                continue
>+            self.deviceNumber = eldpath.split('.')[1]
>+
>     def run(self):
>         FAILED = 1
>         PASSED = 0
>@@ -85,7 +105,11 @@ class AudioTest(Test):
> 
>         for waveFile in waveFiles:
>             if os.path.exists(waveFile):
>-                if os.system("aplay %s -D plughw:%s" % (waveFile, self.cardNumber)) != 0:
>+                playCommand = "aplay %s -D plughw:%s" % (waveFile, self.cardNumber)
>+                if self.deviceNumber >= 0:
>+                    playCommand = "aplay %s -D plug:hdmi:%s,%s" % (waveFile, self.cardNumber, self.deviceNumber)
>+                print playCommand
>+                if os.system(playCommand) != 0:
>                     print "Error: aplay command failed"
>                     self.result = Constants.FAIL
>                     return FAILED
>@@ -96,7 +120,11 @@ class AudioTest(Test):
>             return FAILED
> 
>         print "playing recorded sound"
>-        if os.system("aplay %s -D plughw:%s " % (recordedWaveFile, self.cardNumber)) != 0:
>+        playCommand = "aplay %s -D plughw:%s" % (recordedWaveFile, self.cardNumber)
>+        if self.deviceNumber >= 0:
>+            playCommand = "aplay %s -D plug:hdmi:%s,%s" % (recordedWaveFile, self.cardNumber, self.deviceNumber)
>+        print playCommand
>+        if os.system(playCommand) != 0:
>             print "Error: aplay command failed"
>             self.result = Constants.FAIL
>             return FAILED

Actions: View | Diff

Attachments on bug 1045307: 839386 | 849102 | 870213 | 877083 | 877084 | 877912 | 877913 | 882036 | 882227 | 882502 | 882667 | 883814 | 885464 | 885895 | 886040 | 886041