X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fi2s%2Fpd.py;h=054d69e11a36f2cf5966d976f06d38e1a32555b6;hb=01416b9810ceb759e3088bad174d89621704a210;hp=eeeea2012d6e80211711faca7db7792498ba602a;hpb=2824e81140d3a8e37464f758cf67f50f2f7afca7;p=libsigrokdecode.git
diff --git a/decoders/i2s/pd.py b/decoders/i2s/pd.py
index eeeea20..054d69e 100644
--- a/decoders/i2s/pd.py
+++ b/decoders/i2s/pd.py
@@ -14,11 +14,11 @@
## 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 .
##
import sigrokdecode as srd
+import struct
'''
OUTPUT_PYTHON format:
@@ -33,11 +33,8 @@ Packet:
: integer
'''
-class SamplerateError(Exception):
- pass
-
class Decoder(srd.Decoder):
- api_version = 2
+ api_version = 3
id = 'i2s'
name = 'I²S'
longname = 'Integrated Interchip Sound'
@@ -45,6 +42,7 @@ class Decoder(srd.Decoder):
license = 'gplv2+'
inputs = ['logic']
outputs = ['i2s']
+ tags = ['Audio', 'PC']
channels = (
{'id': 'sck', 'name': 'SCK', 'desc': 'Bit clock line'},
{'id': 'ws', 'name': 'WS', 'desc': 'Word select line'},
@@ -59,9 +57,11 @@ class Decoder(srd.Decoder):
('wav', 'WAV file'),
)
- def __init__(self, **kwargs):
+ def __init__(self):
+ self.reset()
+
+ def reset(self):
self.samplerate = None
- self.oldsck = 1
self.oldws = 1
self.bitcount = 0
self.data = 0
@@ -73,7 +73,7 @@ class Decoder(srd.Decoder):
def start(self):
self.out_python = self.register(srd.OUTPUT_PYTHON)
- self.out_bin = self.register(srd.OUTPUT_BINARY)
+ self.out_binary = self.register(srd.OUTPUT_BINARY)
self.out_ann = self.register(srd.OUTPUT_ANN)
def metadata(self, key, value):
@@ -84,18 +84,18 @@ class Decoder(srd.Decoder):
self.put(self.ss_block, self.samplenum, self.out_python, data)
def putbin(self, data):
- self.put(self.ss_block, self.samplenum, self.out_bin, data)
+ self.put(self.ss_block, self.samplenum, self.out_binary, data)
def putb(self, data):
self.put(self.ss_block, self.samplenum, self.out_ann, data)
def report(self):
-
# Calculate the sample rate.
samplerate = '?'
if self.ss_block is not None and \
self.first_sample is not None and \
- self.ss_block > self.first_sample:
+ self.ss_block > self.first_sample and \
+ self.samplerate:
samplerate = '%d' % (self.samplesreceived *
self.samplerate / (self.ss_block -
self.first_sample))
@@ -114,34 +114,21 @@ class Decoder(srd.Decoder):
h += b'\x01\x00' # Audio format (0x0001 == PCM)
h += b'\x02\x00' # Number of channels (2)
h += b'\x80\x3e\x00\x00' # Samplerate (16000)
- h += b'\x00\x7d\x00\x00' # Byterate (32000)
+ h += b'\x00\xfa\x00\x00' # Byterate (64000)
h += b'\x04\x00' # Blockalign (4)
- h += b'\x10\x00' # Bits per sample (16)
+ h += b'\x20\x00' # Bits per sample (32)
# Data subchunk
h += b'data'
- h += b'\xff\xff\x00\x00' # Subchunk size (65535 bytes) TODO
+ h += b'\xff\xff\xff\xff' # Subchunk size (4G bytes) TODO
return h
def wav_sample(self, sample):
- # TODO: This currently assumes U32 samples, and converts to S16.
- s = sample >> 16
- if s >= 0x8000:
- s -= 0x10000
- lo, hi = s & 0xff, (s >> 8) & 0xff
- return bytes([lo, hi])
-
- def decode(self, ss, es, data):
- if not self.samplerate:
- raise SamplerateError('Cannot decode without samplerate.')
- for self.samplenum, (sck, ws, sd) in data:
-
- # Ignore sample if the bit clock hasn't changed.
- if sck == self.oldsck:
- continue
+ return struct.pack('