Skip to content

Commit

Permalink
flac: Make md5_calculated be a buffer
Browse files Browse the repository at this point in the history
  • Loading branch information
@wader
wader committed Nov 24, 2021
1 parent 4f8d037 commit 4f0bf92
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 8 deletions.
4 changes: 3 additions & 1 deletion format/flac/flac.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"github.com/wader/fq/format"
"github.com/wader/fq/format/registry"
"github.com/wader/fq/internal/num"
"github.com/wader/fq/pkg/bitio"
"github.com/wader/fq/pkg/decode"
)

Expand Down Expand Up @@ -78,7 +79,8 @@ func flacDecode(d *decode.D, in interface{}) interface{} {
}
})

d.FieldValueRaw("md5_calculated", md5Samples.Sum(nil), d.ValidateBitBuf(streamInfo.MD5), d.RawHex)
md5CalcValue := d.FieldRootBitBuf("md5_calculated", bitio.NewBufferFromBytes(md5Samples.Sum(nil), -1))
_ = md5CalcValue.TryScalarFn(d.ValidateBitBuf(streamInfo.MD5), d.RawHex)
d.FieldValueU("decoded_samples", framesNDecodedSamples)

return nil
Expand Down
2 changes: 1 addition & 1 deletion format/flac/testdata/mono16.fqtest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -629,5 +629,5 @@ $ fq -d flac verbose /mono16.flac
* |until 0x8595.7 (3050) | |
| | | byte_align: 0 (valid) 0x8596-NA (0)
0x8590| ce 60| | .`| | footer_crc: "ce60" (raw bits) (valid) 0x8596-0x8597.7 (2)
| | | md5_calculated: "29cf8eb622e9be01808ecafe817d17a6" (raw bits) (valid) 0x8598-NA (0)
0x000|29 cf 8e b6 22 e9 be 01 80 8e ca fe 81 7d 17 a6|)..."........}..| md5_calculated: "29cf8eb622e9be01808ecafe817d17a6" (raw bits) (valid) 0x0-0xf.7 (16)
| | | decoded_samples: 22050 0x8598-NA (0)
2 changes: 1 addition & 1 deletion format/flac/testdata/mono24.fqtest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -731,5 +731,5 @@ $ fq -d flac verbose /mono24.flac
* |until 0xbcc8 (4620) | |
0xbcc0| 80 | . | byte_align: 0 (valid) 0xbcc8.1-0xbcc8.7 (0.7)
0xbcc0| 0a ac| | ..| | footer_crc: "0aac" (raw bits) (valid) 0xbcc9-0xbcca.7 (2)
| | | md5_calculated: "732eb03653c4c7d237fda4f06a16db0e" (raw bits) (valid) 0xbccb-NA (0)
0x000|73 2e b0 36 53 c4 c7 d2 37 fd a4 f0 6a 16 db 0e|s..6S...7...j...| md5_calculated: "732eb03653c4c7d237fda4f06a16db0e" (raw bits) (valid) 0x0-0xf.7 (16)
| | | decoded_samples: 22050 0xbccb-NA (0)
2 changes: 1 addition & 1 deletion format/flac/testdata/mono8.fqtest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -543,5 +543,5 @@ $ fq -d flac verbose /mono8.flac
* |until 0x4ced.5 (1480) | |
0x4ce0| b4 | . | byte_align: 0 (valid) 0x4ced.6-0x4ced.7 (0.2)
0x4ce0| e8 b7| ..| footer_crc: "e8b7" (raw bits) (valid) 0x4cee-0x4cef.7 (2)
| | | md5_calculated: "1b43073d6a826942bca82cfd2ea155f2" (raw bits) (valid) 0x4cf0-NA (0)
0x000|1b 43 07 3d 6a 82 69 42 bc a8 2c fd 2e a1 55 f2|.C.=j.iB..,...U.| md5_calculated: "1b43073d6a826942bca82cfd2ea155f2" (raw bits) (valid) 0x0-0xf.7 (16)
| | | decoded_samples: 22050 0x4cf0-NA (0)
2 changes: 1 addition & 1 deletion format/flac/testdata/picture_seek_gain.fqtest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,5 +259,5 @@ $ fq -d flac verbose /picture_seek_gain.flac
* |until 0x225d.2 (467) | |
0x2250| 20 | | byte_align: 0 (valid) 0x225d.3-0x225d.7 (0.5)
0x2250| 7f ab| ..| footer_crc: "7fab" (raw bits) (valid) 0x225e-0x225f.7 (2)
| | | md5_calculated: "89887b80f810285b45f6c4ecc72c977e" (raw bits) (valid) 0x2260-NA (0)
0x000|89 88 7b 80 f8 10 28 5b 45 f6 c4 ec c7 2c 97 7e|..{...([E....,.~| md5_calculated: "89887b80f810285b45f6c4ecc72c977e" (raw bits) (valid) 0x0-0xf.7 (16)
| | | decoded_samples: 441 0x2260-NA (0)
2 changes: 1 addition & 1 deletion format/flac/testdata/stereo16.fqtest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -822,5 +822,5 @@ $ fq -d flac verbose /stereo16.flac
* |until 0xc549.1 (451) | |
0xc540| 80 | . | byte_align: 0 (valid) 0xc549.2-0xc549.7 (0.6)
0xc540| 06 d3| | ..| | footer_crc: "06d3" (raw bits) (valid) 0xc54a-0xc54b.7 (2)
| | | md5_calculated: "5a00c873b80b8f6294d14fe75b14a7d3" (raw bits) (valid) 0xc54c-NA (0)
0x000|5a 00 c8 73 b8 0b 8f 62 94 d1 4f e7 5b 14 a7 d3|Z..s...b..O.[...| md5_calculated: "5a00c873b80b8f6294d14fe75b14a7d3" (raw bits) (valid) 0x0-0xf.7 (16)
| | | decoded_samples: 22050 0xc54c-NA (0)
2 changes: 1 addition & 1 deletion format/flac/testdata/stereo24.fqtest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1396,5 +1396,5 @@ $ fq -d flac verbose /stereo24.flac
* |until 0x11bc9.1 (451) | |
0x11bc0| 80 | . | byte_align: 0 (valid) 0x11bc9.2-0x11bc9.7 (0.6)
0x11bc0| fa 69| | .i| | footer_crc: "fa69" (raw bits) (valid) 0x11bca-0x11bcb.7 (2)
| | | md5_calculated: "bddd75b3c03e05528cc71f65a0774828" (raw bits) (valid) 0x11bcc-NA (0)
0x0000|bd dd 75 b3 c0 3e 05 52 8c c7 1f 65 a0 77 48 28|..u..>.R...e.wH(| md5_calculated: "bddd75b3c03e05528cc71f65a0774828" (raw bits) (valid) 0x0-0xf.7 (16)
| | | decoded_samples: 22050 0x11bcc-NA (0)
2 changes: 1 addition & 1 deletion format/flac/testdata/stereo8.fqtest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -928,5 +928,5 @@ $ fq -d flac verbose /stereo8.flac
* |until 0x6d5a.2 (395) | |
0x6d50| 40 | @ | byte_align: 0 (valid) 0x6d5a.3-0x6d5a.7 (0.5)
0x6d50| ee 38| | .8| | footer_crc: "ee38" (raw bits) (valid) 0x6d5b-0x6d5c.7 (2)
| | | md5_calculated: "ef79009cce3bd79ef4b5668ebb98d113" (raw bits) (valid) 0x6d5d-NA (0)
0x000|ef 79 00 9c ce 3b d7 9e f4 b5 66 8e bb 98 d1 13|.y...;....f.....| md5_calculated: "ef79009cce3bd79ef4b5668ebb98d113" (raw bits) (valid) 0x0-0xf.7 (16)
| | | decoded_samples: 22050 0x6d5d-NA (0)

0 comments on commit 4f0bf92

Please sign in to comment.