wip

extra/flac/bitstream/bitstream.factor

@@ -0,0 +1,6 @@
+! Copyright (C) 2009 Daniel Ehrenberg
+! See http://factorcode.org/license.txt for BSD license.
+USING: kernel ;
+
+IN: flac.bitstream
+

extra/flac/decoder/decoder.factor

@@ -16,10 +16,10 @@ ERROR: sync-code-error ;
 ERROR: invalid-channel-assignment ;
 ERROR: reserved-block-size ;
 ERROR: invalid-sample-rate ;
-ERROR: invalid-subframe-type ;
+ERROR: reserved-subframe-type ;
 ERROR: invalid-subframe-sync ;
 
-: 0xxxxxxx? ( n -- ? ) 0x80 mask? = not ;
+: 0xxxxxxx? ( n -- ? ) 0x80 mask? not ;
 : 110xxxxx? ( n -- ? ) [ 0xc0 mask? ] [ 0x20 mask? not ] bi and ;
 : 1110xxxx? ( n -- ? ) [ 0xe0 mask? ] [ 0x10 mask? not ] bi and ;
 : 11110xxx? ( n -- ? ) [ 0xf0 mask? ] [ 0x08 mask? not ] bi and ;
@@ -50,10 +50,7 @@ ERROR: invalid-subframe-sync ;
      1 read dup
      be> 0xxxxxxx?
      [ be> ]
-     [
+     [ dup be> remaining-bytes read B{ } append-as be> ] if ;
-         dup be> remaining-bytes read
-         B{ } append-as be>
-     ] if ;
 
 : decode-block-size ( n -- n )
     dup
@@ -130,26 +127,31 @@ ERROR: invalid-subframe-sync ;
     ] with-big-endian
     flac-frame-header boa ;
 
-:: decode-subframe-type ( n -- type )
+: decode-subframe-type ( n -- order type )
+    dup
     {
-        { [ n 0 = ] [ 0 ] }
+        { [ 0 = ] [ drop f 0 ] }
-        { [ n 1 = ] [ 1 ] }
+        { [ 1 = ] [ drop f 1 ] }
-        { [ n 8 >= n 12 <= and ] [ 2 ] }
+        { [ 8 12 between? ] [ -1 shift 7 bitand 2 ] }
-        { [ n 32 >= ] [ 3 ] }
+        { [ 32 63 between? ] [ -1 shift 31 bitand 3 ] }
-        [ invalid-subframe-type ]
+        [ drop reserved-subframe-type ]
-    } cond <flac-subframe-type> ;
+    } cond-case <flac-subframe-type> swap ;
 
+: read-residual ( order -- residual )
+    
 
-: read-constant-subframe ( subframe-header frame-header -- data )
+: read-constant-subframe ( frame-header subframe-header -- constant-subframe )
-    >>bits-per-sample 8 / read swap drop ;
+    drop bits-per-sample>> 8 / read be> flac-subframe-constant boa ;
 
-: read-fixed-subframe ( predictive-order -- subframe )
+: read-fixed-subframe ( fame-header subframe-header -- fixed-subframe )
+    order>> swap bits-per-sample>> <repetition> [
+        8 / read be>
+    ] map flac-subframe-fixed new swap >>warmup dup . ;
+
+: read-lpc-subframe ( predictive-order -- lpc-subframe )
     drop 9 ;
 
-: read-lpc-subframe ( predictive-order -- subframe )
+:: decode-subframe-header ( bitstream -- subframe-header )
-    drop 9 ;
-
-:: decode-subframe-header ( bitstream -- subframe )
     1 bitstream read-bit 1 = [ invalid-subframe-sync ] when
     6 bitstream read-bit decode-subframe-type
     1 bitstream read-bit ! TODO: wasted-bits: 0 for now..
@@ -158,20 +160,17 @@ ERROR: invalid-subframe-sync ;
 ! TODO: actually decode based on subframe type
 ! TODO: handle wasted bits assuming 1 byte for now :/
 : read-subframe ( frame-header -- subframe )
+    1 read bitstreams:<msb0-bit-reader> decode-subframe-header dup dup
     [
-        1 read bitstreams:<msb0-bit-reader> decode-subframe-header dup
+        subframe-type>>
-    ] dip swap
+        {
-    subframe-type>>
+            { subframe-type-constant [ read-constant-subframe ] }
-    {
+            { subframe-type-fixed [ read-fixed-subframe ] }
-        { subframe-type-constant [ "1" ] }
+        } case
-        { subframe-type-verbatim [ drop drop B{ } ] }
+    ] dip swap flac-subframe boa ;
-        { subframe-type-fixed [ drop drop B{ } ] }
-        { subframe-type-lpc [ drop drop B{ } ] }
-    } case
-    flac-subframe boa ;
 
 : read-subframes ( frame-header -- seq )
-    dup channels>> swap <repetition> [ read-subframe ] map ;
+    dup channels>> swap <repetition> [ dup . read-subframe ] map ;
 
 : read-frame-header ( -- frame-header )
     4 read bitstreams:<msb0-bit-reader> decode-header ;
@@ -180,8 +179,8 @@ ERROR: invalid-subframe-sync ;
     2 read be> flac-frame-footer boa ;
 
 : read-frame ( -- frame )
-    read-frame-header
+    read-frame-header dup
-    dup read-subframes
+    read-subframes
     read-frame-footer
     flac-frame boa ;
 
@@ -192,5 +191,5 @@ ERROR: invalid-subframe-sync ;
         read-stream-info .
         skip-metadata
 !        51448296 seek-absolute seek-input
-        3 <iota> [ drop read-frame ] map
+        4 <iota> [ drop read-frame ] map
     ] with-file-reader ;

extra/flac/format/format.factor

@@ -62,40 +62,58 @@ ENUM: flac-subframe-type
     subframe-type-fixed
     subframe-type-lpc ;
 
+ENUM: flac-entropy-coding-method-type
+    entropy-coding-partioned-rice
+    entropy-coding-partioned-rice2 ;
+
 TUPLE: flac-subframe-header
     { subframe-type maybe{ subframe-type-constant
                            subframe-type-verbatim
                            subframe-type-fixed
                            subframe-type-lpc } }
+    { order maybe{ integer } }
     { wasted-bits integer } ;
 
+TUPLE: flac-entropy-coding-method-partioned-rice-contents
+    { parameters integer }
+    { raw-bits integer }
+    { capacity-by-order integer } ;
+
+TUPLE: flac-entropy-coding-method-partioned-rice
+    { order integer }
+    { contents flac-entropy-coding-method-partioned-rice-contents } ;
+
+TUPLE: flac-entropy-coding-method
+    { type maybe{ entropy-coding-partioned-rice
+                  entropy-coding-partioned-rice2 } }
+    { data flac-entropy-coding-method-partioned-rice } ;
+
+TUPLE: flac-subframe-constant
+    { value integer } ;
+
+TUPLE: flac-subframe-verbatim
+    { data byte-array } ;
+
+TUPLE: flac-subframe-fixed
+    { entropy-coding-method flac-entropy-coding-method }
+    { warmup sequence }
+    residual ;
+
+TUPLE: flac-subframe-lpc
+    { entropy-coding-method maybe{ entropy-coding-partioned-rice
+                                   entropy-coding-partioned-rice2 } }
+    { qlp-coeff-precision integer }
+    { quantization-level integer }
+    { qlp-coeff integer }
+    { warmup integer }
+    residual ;
+
 TUPLE: flac-subframe
     { subframe-header flac-subframe-header }
-    { data byte-array } ;
+    { data maybe{ flac-subframe-constant
-
+                  flac-subframe-verbatim
-ENUM: flac-entropy-coding-method
+                  flac-subframe-fixed
-    entropy-coding-partioned-rice
+                  flac-subframe-lpc } } ;
-    entropy-coding-partioned-rice2 ;
-
-TUPLE: partition
-    { encoding-parameter integer }
-    { partitions sequence } ;
-
-TUPLE: residual
-    method
-    { partition partition }
-
-TUPLE: subframe-constant
-    { value integer } ;
-
-TUPLE: subframe-verbatim
-    { data byte-array } ;
-
-TUPLE: subframe-fixed
-     entropy-coding-method
-    { order integer }
-    { warmup integer }
-    residual ;
 
 TUPLE: flac-frame-footer
     { crc integer } ;