steve
/
factor-work
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

flac wip

master
Steve Ayerhart 2023-06-16 21:35:43 -04:00
parent 13439f6e24
commit e3e24c5c4b
No known key found for this signature in database
GPG Key ID: 4CB33EB9BB156C97
4 changed files with 135 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
flac/decoder/decoder.factor
View File

@ -12,8 +12,8 @@ SYMBOL: current-flac-output
{ [ 0b0000 = ] [ drop reserved-block-size ] } { [ 0b0000 = ] [ drop reserved-block-size ] }
{ [ 0b0001 = ] [ drop 192 ] } { [ 0b0001 = ] [ drop 192 ] }
{ [ 0b0010 0b0101 between? ] [ 2 - 2^ 567 * ] } { [ 0b0010 0b0101 between? ] [ 2 - 2^ 567 * ] }
{ [ 0b0110 = ] [ drop 8 flac-read 1 + ] } { [ 0b0110 = ] [ drop 8 flac-read-uint 1 + ] }
{ [ 0b0111 = ] [ drop 16 flac-read 1 + ] } { [ 0b0111 = ] [ drop 16 flac-read-uint 1 + ] }
{ [ 0b1000 0b1111 between? ] [ 8 - 2^ 256 * ] } { [ 0b1000 0b1111 between? ] [ 8 - 2^ 256 * ] }
} cond-case ; } cond-case ;
@ -31,20 +31,20 @@ SYMBOL: current-flac-output
{ 0b1001 [ 44100 ] } { 0b1001 [ 44100 ] }
{ 0b1010 [ 48000 ] } { 0b1010 [ 48000 ] }
{ 0b1011 [ 96000 ] } { 0b1011 [ 96000 ] }
{ 0b1100 [ 8 flac-read 1000 * ] } ! sample rate in kHz { 0b1100 [ 8 flac-read-uint 1000 * ] } ! sample rate in kHz
{ 0b1101 [ 16 flac-read ] } ! sample rate in Hz { 0b1101 [ 16 flac-read-uint ] } ! sample rate in Hz
{ 0b1110 [ 16 flac-read 10 * ] } ! sample rate in tens of Hz { 0b1110 [ 16 flac-read-uint 10 * ] } ! sample rate in tens of Hz
{ 0b1111 [ invalid-sample-rate ] } { 0b1111 [ invalid-sample-rate ] }
} case ; } case ;
: decode-channel-assignment ( n -- channel-assignment ) : decode-channel-correlation ( n -- channel-correlation )
{ {
{ [ 0b0000 0b0111 between? ] [ 0 ] } { [ 0b0000 0b0111 between? ] [ 0 ] }
{ [ 0b1000 = ] [ 1 ] } { [ 0b1000 = ] [ 1 ] }
{ [ 0b1001 = ] [ 2 ] } { [ 0b1001 = ] [ 2 ] }
{ [ 0b1010 = ] [ 3 ] } { [ 0b1010 = ] [ 3 ] }
[ reserved-channel-assignment ] [ reserved-channel-assignment ]
} cond-case <flac-channel-assignment> ; } cond-case <flac-channel-correlation> ;
: decode-bits-per-sample ( stream-info n -- n ) : decode-bits-per-sample ( stream-info n -- n )
{ {
@ -60,18 +60,18 @@ SYMBOL: current-flac-output
dup 0 = [ drop bits-per-sample>> ] [ nip ] if ; dup 0 = [ drop bits-per-sample>> ] [ nip ] if ;
: read/assert-frame-sync-code ( -- ) : read/assert-frame-sync-code ( -- )
15 flac-read 0b111111111111100 = [ sync-code-error ] unless ; 15 flac-read-uint 0b111111111111100 = [ sync-code-error ] unless ;
: read-flac-frame-header ( stream-info -- frame-header ) : read-flac-frame-header ( stream-info -- frame-header )
[ [
read/assert-frame-sync-code read/assert-frame-sync-code
1 flac-read <flac-frame-blocking-strategy> 1 flac-read-uint <flac-frame-blocking-strategy>
4 flac-read ! blocksize code 4 flac-read-uint ! blocksize code
4 flac-read ! sample rate code 4 flac-read-uint ! sample rate code
4 flac-read decode-channel-assignment 4 flac-read-uint [ <flac-channel-assignment> ] [ decode-channel-correlation ] bi
] dip ] dip
3 flac-read decode-bits-per-sample 3 flac-read-uint decode-bits-per-sample
1 flac-read drop ! ignore magic sync for now 1 flac-read-uint drop ! ignore magic sync for now
flac-read-coded-number flac-read-coded-number
! decoding blocksize/samplerate potentially reads from end of header ! decoding blocksize/samplerate potentially reads from end of header
[ decode-block-size ] 4dip [ decode-block-size ] 4dip
@ -80,7 +80,7 @@ SYMBOL: current-flac-output
flac-frame-header boa ; flac-frame-header boa ;
: read-flac-subframe-wasted-bits ( -- k ) : read-flac-subframe-wasted-bits ( -- k )
1 flac-read 1 = [ 0 [ 1 + 1 flac-read 0 = ] loop ] [ 0 ] if ; 1 flac-read-uint 1 = [ 0 [ 1 + 1 flac-read-uint 0 = ] loop ] [ 0 ] if ;
: read-flac-subframe-constant ( blocksize bps -- samples ) : read-flac-subframe-constant ( blocksize bps -- samples )
flac-read-int <repetition> [ ] map ; flac-read-int <repetition> [ ] map ;

21
flac/format/format.factor
View File

@ -38,10 +38,23 @@ ENUM: flac-frame-number-type
frame-number-type-sample ; frame-number-type-sample ;
ENUM: flac-channel-assignment ENUM: flac-channel-assignment
channel-assignment-independent channel-assignment-mono
channel-assignment-left channel-assignment-left,right
channel-assignment-right channel-assignment-left,right,center
channel-assignment-mid ; channel-assignment-front-left,front-right,back-left,back-right
channel-assignment-front-left,front-right,front-center,back/surround-left,back/surround-right
channel-assignment-front-left,front-right,front-center,LFE,back/surround-left,back/surround-right
channel-assignment-front-left,front-right,front-center,LFE,back-center,side-left,side-right
channel-assignment-front-left,front-right,front-center,LFE,back-left,back-right,side-left,side-right
channel-assignment-left/side-stereo
channel-assignment-right/side-stereo
channel-assignment-mid/side-stereo ;
ENUM: flac-channel-correlation
channel-correlation-independent
channel-correlation-left
channel-correlation-right
channel-correlation-mid ;
TUPLE: flac-frame-header TUPLE: flac-frame-header
{ blocking-strategy maybe{ fixed-blocksize variable-blocksize } } { blocking-strategy maybe{ fixed-blocksize variable-blocksize } }

71
flac/metadata/metadata.factor
View File

@ -10,29 +10,29 @@ IN: flac.metadata
ERROR: cuesheet-index-reserved-must-be-zero ; ERROR: cuesheet-index-reserved-must-be-zero ;
: read-metadata-block-header ( -- header ) : read-metadata-block-header ( -- header )
1 flac-read 1 = 1 flac-read-uint 1 =
7 flac-read <metadata-type> 7 flac-read-uint <metadata-type>
24 flac-read 24 flac-read-uint
metadata-block-header boa ; metadata-block-header boa ;
: read-metadata-block-stream-info ( -- stream-info ) : read-metadata-block-stream-info ( -- stream-info )
16 flac-read 16 flac-read-uint
16 flac-read 16 flac-read-uint
24 flac-read 24 flac-read-uint
24 flac-read 24 flac-read-uint
20 flac-read 20 flac-read-uint
3 flac-read 1 + 3 flac-read-uint 1 +
5 flac-read 1 + 5 flac-read-uint 1 +
36 flac-read 36 flac-read-uint
128 flac-read 16 >be bytes>hex-string 128 flac-read-uint 16 >be bytes>hex-string
stream-info boa ; stream-info boa ;
: read-metadata-block-seek-table ( length -- seek-table ) : read-metadata-block-seek-table ( length -- seek-table )
18 / <iota> [ 18 / <iota> [
drop drop
64 flac-read 64 flac-read-uint
64 flac-read 64 flac-read-uint
16 flac-read 16 flac-read-uint
seek-point boa seek-point boa
] map ] map
seek-table boa ; seek-table boa ;
@ -40,11 +40,11 @@ ERROR: cuesheet-index-reserved-must-be-zero ;
: read-metadata-block-vorbis-comment ( length -- vorbis-comment ) : read-metadata-block-vorbis-comment ( length -- vorbis-comment )
! vorbis comments are in little endian... ! vorbis comments are in little endian...
drop drop
32 flac-read 4 >le be> dup 8 * flac-read swap >n-byte-array reverse utf8 decode 32 flac-read-uint 4 >le be> dup 8 * flac-read-uint swap >n-byte-array utf8 decode
32 flac-read 4 >le be> <iota> 32 flac-read-uint 4 >le be> <iota>
[ [
drop drop
32 flac-read 4 >le be> dup 8 * flac-read swap >n-byte-array reverse utf8 decode 32 flac-read-uint 4 >le be> dup 8 * flac-read-uint swap >n-byte-array utf8 decode
"=" split "=" split
] map ] map
>alist vorbis-comment boa ; >alist vorbis-comment boa ;
@ -68,13 +68,13 @@ ERROR: cuesheet-index-reserved-must-be-zero ;
length>> <byte-array> ; length>> <byte-array> ;
: read-metadata-block-padding ( length -- padding ) : read-metadata-block-padding ( length -- padding )
dup 8 * flac-read drop flac-padding boa ; dup 8 * flac-read-uint drop flac-padding boa ;
: read-metadata-block-application ( length -- application ) : read-metadata-block-application ( length -- application )
8 * flac-read drop application new ; 8 * flac-read-uint drop application new ;
: read-metadata-block-cuesheet ( length -- cuesheet ) : read-metadata-block-cuesheet ( length -- cuesheet )
dup [ 8 * flac-read ] dip >be dup [ 8 * flac-read-uint ] dip >be
binary binary
[ [
128 io:read ascii decode 128 io:read ascii decode
@ -99,15 +99,14 @@ ERROR: cuesheet-index-reserved-must-be-zero ;
: read-metadata-block-picture ( length -- picture ) : read-metadata-block-picture ( length -- picture )
drop drop
32 flac-read <picture-type> 32 flac-read-uint <picture-type>
32 flac-read dup 8 * flac-read swap >n-byte-array reverse utf8 decode 32 flac-read-uint dup 8 * flac-read-uint swap >n-byte-array utf8 decode
32 flac-read dup 8 * flac-read swap >n-byte-array reverse utf8 decode 32 flac-read-uint dup 8 * flac-read-uint swap >n-byte-array utf8 decode
32 flac-read 32 flac-read-uint
32 flac-read 32 flac-read-uint
32 flac-read 32 flac-read-uint
32 flac-read 32 flac-read-uint
32 flac-read dup 8 * 32 flac-read-uint dup 8 * flac-read-uint swap >n-byte-array reverse
32 flac-read dup 8 * flac-read swap >n-byte-array reverse
picture boa ; picture boa ;
: append-picture ( metadata picture -- metadata ) : append-picture ( metadata picture -- metadata )
@ -137,16 +136,16 @@ PRIVATE>
[ read-metadata-block ] dip [ read-metadata-block ] dip
] loop ; ] loop ;
: read-stream-info/seek-data ( -- stream-info ) ! : read-stream-info/seek-data ( -- stream-info )
read/assert-flac-magic ! read/assert-flac-magic
32 flac-read drop ! 32 flac-read-uint drop
read-metadata-block-stream-info ! read-metadata-block-stream-info
[ read-metadata-block-header [ length>> 8 * flac-seek ] [ last?>> not ] bi ] loop ; ! [ read-metadata-block-header [ length>> 8 * flac-seek ] [ last?>> not ] bi ] loop ;
: <flac-stream-info> ( filename -- stream-info ) : <flac-stream-info> ( filename -- stream-info )
[ [
read/assert-flac-magic read/assert-flac-magic
32 flac-read drop 32 flac-read-uint drop
read-metadata-block-stream-info read-metadata-block-stream-info
] with-flac-file-reader ; ] with-flac-file-reader ;

96
flac/stream/stream.factor
View File

@ -7,45 +7,85 @@ IN: flac.stream
SYMBOL: flac-input-stream SYMBOL: flac-input-stream
CONSTANT: default-bitreader-capacity 6553600 TUPLE: flac-stream-reader stream buffer buffer-length ;
TUPLE: flac-stream-reader stream bitstream ;
M: flac-stream-reader dispose stream>> dispose ; M: flac-stream-reader dispose stream>> dispose ;
: flac-input-stream> ( -- flac-input-stream )
flac-input-stream get ;
: flac-input-stream-stream> ( -- stream )
flac-input-stream> stream>> ;
: flac-input-stream-buffer> ( -- buffer )
flac-input-stream> buffer>> ;
: flac-input-stream-buffer-length> ( -- buffer-length )
flac-input-stream> buffer-length>> ;
: <flac-stream-reader> ( stream -- flac-stream-reader ) : <flac-stream-reader> ( stream -- flac-stream-reader )
B{ } bitstreams:<msb0-bit-reader> flac-stream-reader boa ; 0 0 flac-stream-reader boa ;
: flac-read ( n -- m ) :: flac-read-uint ( num-bits -- uint )
[ dup flac-input-stream get bitstream>> bitstreams:enough-bits? not ] flac-input-stream>
[ buffer-length>> num-bits < ]
[ [
flac-input-stream get flac-input-stream>
[ stream>> default-bitreader-capacity swap io:stream-read ] [ bitstream>> ] bi flac-input-stream-stream> io:stream-read1
dup bytes>> swap [ prepend ] dip swap >>bytes drop flac-input-stream-buffer> 8 shift bitor
] while flac-input-stream get bitstream>> bitstreams:read ; >>buffer
: flac-seek ( n -- ) flac-input-stream-buffer-length> 8 +
[ dup flac-input-stream get bitstream>> bitstreams:enough-bits? not ] >>buffer-length
] while
flac-input-stream>
flac-input-stream-buffer-length> num-bits -
>>buffer-length
flac-input-stream-buffer> flac-input-stream-buffer-length> neg shift
1 num-bits shift 1 - bitand
[ [
flac-input-stream get flac-input-stream-buffer>
[ stream>> default-bitreader-capacity swap io:stream-read ] [ bitstream>> ] bi 1 flac-input-stream-buffer-length> shift 1 - bitand
dup bytes>> swap [ prepend ] dip swap >>bytes drop >>buffer drop
] while flac-input-stream get bitstream>> bitstreams:seek ; ] dip ;
: flac-align-to-byte ( -- ) : flac-read-sint ( num-bits -- sint )
8 flac-input-stream get bitstream>> bitstreams:align ; dup flac-read-uint swap >signed ;
: flac-read-int ( n -- m ) ! flac-input-stream> buffer-length>> n - >>buffer-length
dup flac-read swap >signed ; ! flac-input-stream> buffer>> flac-input-stream buffer-length>> neg
! 1 n shift 1 -
! [ flac-input-stream> buffer>> 1 flac-input-stream buffer-length>> shift 1 - bitand ] keep ;
: flac-read-rice-signed-int ( param -- n ) ! : flac-read ( n -- m )
[ 0 [ 1 flac-read 0 = ] [ 1 + ] while ] dip ! [ dup flac-input-stream get bitstream>> bitstreams:enough-bits? not ]
[ shift ] keep flac-read bitor ! [
[ -1 shift ] [ 1 bitand -1 * ] bi bitxor ; ! flac-input-stream get
! [ stream>> default-bitreader-capacity swap io:stream-read ] [ bitstream>> ] bi
! dup bytes>> swap [ prepend ] dip swap >>bytes drop
! ] while flac-input-stream get bitstream>> bitstreams:read ;
: flac-read-coded-number ( -- n ) ! : flac-seek ( n -- )
8 flac-read ! [ dup flac-input-stream get bitstream>> bitstreams:enough-bits? not ]
[ dup 0b11000000 >= ] [ 8 flac-read drop 2^ 0xff bitand ] while ; ! [
! flac-input-stream get
! [ stream>> default-bitreader-capacity swap io:stream-read ] [ bitstream>> ] bi
! dup bytes>> swap [ prepend ] dip swap >>bytes drop
! ] while flac-input-stream get bitstream>> bitstreams:seek ;
!
! : flac-align-to-byte ( -- )
! 8 flac-input-stream get bitstream>> bitstreams:align ;
!
! : flac-read-int ( n -- m )
! dup flac-read swap >signed ;
!
! : flac-read-rice-signed-int ( param -- n )
! [ 0 [ 1 flac-read 0 = ] [ 1 + ] while ] dip
! [ shift ] keep flac-read bitor
! [ -1 shift ] [ 1 bitand -1 * ] bi bitxor ;
!
! : flac-read-coded-number ( -- n )
! 8 flac-read
! [ dup 0b11000000 >= ] [ 8 flac-read drop 2^ 0xff bitand ] while ;
: (with-flac-stream-reader) ( stream quot -- ) : (with-flac-stream-reader) ( stream quot -- )
flac-input-stream swap with-variable ; inline flac-input-stream swap with-variable ; inline
@ -57,4 +97,4 @@ M: flac-stream-reader dispose stream>> dispose ;
[ binary <file-reader> ] dip with-flac-stream-reader ; inline [ binary <file-reader> ] dip with-flac-stream-reader ; inline
: read/assert-flac-magic ( -- ) : read/assert-flac-magic ( -- )
32 flac-read FLAC-MAGIC = [ not-a-flac-stream ] unless ; 32 flac-read-uint FLAC-MAGIC = [ not-a-flac-stream ] unless ;