wader/fq
1
1
Fork 0
mirror of https://github.com/wader/fq.git synced 2024-11-26 21:55:57 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #776 from wader/avi-sample-size

Browse Source 
avi: Handle stream sample size
This commit is contained in:
Mattias Wadman 2023-10-07 17:12:24 +02:00 committed by GitHub
commit aa00c8f67c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
format/riff/avi.go
View File

@ -1,7 +1,7 @@
package riff package riff
// TODO: // TODO:
// mp3 mappig, seem there can be many frames in one sample and they span samples? // mp3 mappig, samples can span?
// hevc mapping? // hevc mapping?
// DV handler https://learn.microsoft.com/en-us/windows/win32/directshow/dv-data-in-the-avi-file-format // DV handler https://learn.microsoft.com/en-us/windows/win32/directshow/dv-data-in-the-avi-file-format
// palette change // palette change
@ -120,6 +120,7 @@ type aviStream struct {
hasFormat bool hasFormat bool
format *decode.Group format *decode.Group
formatInArg any formatInArg any
sampleSize uint64
indexes []ranges.Range indexes []ranges.Range
ixSamples []ranges.Range ixSamples []ranges.Range
} }
@ -327,7 +328,7 @@ func aviDecode(d *decode.D) any {
d.FieldU32("length") d.FieldU32("length")
d.FieldU32("suggested_buffer_size") d.FieldU32("suggested_buffer_size")
d.FieldU32("quality") d.FieldU32("quality")
d.FieldU32("sample_size") sampleSize := d.FieldU32("sample_size")
d.FieldStruct("frame", func(d *decode.D) { d.FieldStruct("frame", func(d *decode.D) {
d.FieldU16("left") d.FieldU16("left")
d.FieldU16("top") d.FieldU16("top")
@ -338,6 +339,7 @@ func aviDecode(d *decode.D) any {
if stream, ok := path.topData().(*aviStream); ok { if stream, ok := path.topData().(*aviStream); ok {
stream.typ = typ stream.typ = typ
stream.handler = handler stream.handler = handler
stream.sampleSize = sampleSize
} }
return false, nil return false, nil
@ -557,14 +559,28 @@ func aviDecode(d *decode.D) any {
}) })
} }
// TODO: handle zero length samples differently?
// TODO: palette change // TODO: palette change
decodeSample := func(d *decode.D, sr ranges.Range) { decodeSample := func(d *decode.D, sr ranges.Range) {
d.RangeFn(sr.Start, sr.Len, func(d *decode.D) { d.RangeFn(sr.Start, sr.Len, func(d *decode.D) {
if sr.Len > 0 && ai.DecodeSamples && stream.hasFormat { if sr.Len == 0 {
d.FieldFormat("sample", stream.format, stream.formatInArg)
} else {
d.FieldRawLen("sample", d.BitsLeft()) d.FieldRawLen("sample", d.BitsLeft())
return
}
subSampleSize := int64(stream.sampleSize) * 8
// TODO: <= 4*8 heuristics to not create separate pcm samples
if subSampleSize == 0 || subSampleSize <= 4*8 {
subSampleSize = sr.Len
}
for d.BitsLeft() > 0 {
d.FramedFn(subSampleSize, func(d *decode.D) {
if ai.DecodeSamples && stream.hasFormat {
d.FieldFormat("sample", stream.format, stream.formatInArg)
} else {
d.FieldRawLen("sample", d.BitsLeft())
}
})
} }
}) })
} }