license: remove FSF postal address from boiler plate license text

[libsigrokdecode.git] / decoders / spdif / pd.py

diff --git a/decoders/spdif/pd.py b/decoders/spdif/pd.py
index 964638655b4c12fcdb05235a21673cb99cc1d4eb..1f1ed705b0dff5c95606a367a21d8ef51db48060 100644 (file)
--- a/decoders/spdif/pd.py
+++ b/decoders/spdif/pd.py
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+## along with this program; if not, see <http://www.gnu.org/licenses/>.
 ##
 
 import sigrokdecode as srd
@@ -24,7 +23,7 @@ class SamplerateError(Exception):
     pass
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'spdif'
     name = 'S/PDIF'
     longname = 'Sony/Philips Digital Interface Format'
@@ -58,11 +57,11 @@ class Decoder(srd.Decoder):
     def puty(self, data):
         self.put(self.ss_edge, self.samplenum, self.out_ann, data)
 
-    def __init__(self, **kwargs):
+    def __init__(self):
         self.state = 'GET FIRST PULSE WIDTH'
-        self.olddata = None
         self.ss_edge = None
         self.first_edge = True
+        self.samplenum_prev_edge = 0
         self.pulse_width = 0
 
         self.clocks = []
@@ -80,6 +79,9 @@ class Decoder(srd.Decoder):
     def start(self):
         self.out_ann = self.register(srd.OUTPUT_ANN)
 
+        # Assume that the initial pin state is logic 0.
+        self.initial_pins = [0]
+
     def metadata(self, key, value):
         if key == srd.SRD_CONF_SAMPLERATE:
             self.samplerate = value
@@ -210,7 +212,7 @@ class Decoder(srd.Decoder):
             elif self.preamble == [2, 1, 1, 2]:
                 self.puty([1, ['Preamble B', 'B']])
             else:
-                self.puty([1, ['Unknown Preamble', 'Unkown Prea.', 'U']])
+                self.puty([1, ['Unknown Preamble', 'Unknown Prea.', 'U']])
             self.preamble = []
             self.seen_preamble = True
             self.bitcount = 0
@@ -218,40 +220,26 @@ class Decoder(srd.Decoder):
 
         self.last_preamble = self.samplenum
 
-    def decode(self, ss, es, data):
+    def decode(self):
         if not self.samplerate:
             raise SamplerateError('Cannot decode without samplerate.')
 
-        for (self.samplenum, pins) in data:
-            data = pins[0]
-
-            # Initialize self.olddata with the first sample value.
-            if self.olddata == None:
-                self.olddata = data
-                continue
-
-            # First we need to recover the clock.
-            if self.olddata == data:
-                self.pulse_width += 1
-                continue
-
-            # Found rising or falling edge.
-            if self.first_edge:
-                # Throw away first detected edge as it might be mangled data.
-                self.first_edge = False
-                self.pulse_width = 0
-            else:
-                if self.state == 'GET FIRST PULSE WIDTH':
-                    self.find_first_pulse_width()
-                elif self.state == 'GET SECOND PULSE WIDTH':
-                    self.find_second_pulse_width()
-                elif self.state == 'GET THIRD PULSE WIDTH':
-                    self.find_third_pulse_width()
-                elif self.state == 'DECODE STREAM':
-                    self.decode_stream()
-                elif self.state == 'DECODE PREAMBLE':
-                    self.decode_preamble()
-
-            self.pulse_width = 0
-
-            self.olddata = data
+        # Throw away first detected edge as it might be mangled data.
+        self.wait({0: 'e'})
+
+        while True:
+            # Wait for any edge (rising or falling).
+            (data,) = self.wait({0: 'e'})
+            self.pulse_width = self.samplenum - self.samplenum_prev_edge - 1
+            self.samplenum_prev_edge = self.samplenum
+
+            if self.state == 'GET FIRST PULSE WIDTH':
+                self.find_first_pulse_width()
+            elif self.state == 'GET SECOND PULSE WIDTH':
+                self.find_second_pulse_width()
+            elif self.state == 'GET THIRD PULSE WIDTH':
+                self.find_third_pulse_width()
+            elif self.state == 'DECODE STREAM':
+                self.decode_stream()
+            elif self.state == 'DECODE PREAMBLE':
+                self.decode_preamble()