thefoxon/joy4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix setSampleIndex search chunkGroup bug

Browse Source
This commit is contained in:
nareix 2016-04-21 19:13:48 +08:00
parent 7d1af58451
commit 2364b70034
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
demuxer.go
View File

@ -105,6 +105,10 @@ func (self *Stream) setSampleIndex(index int) (err error) {
self.chunkGroupIndex = 0 self.chunkGroupIndex = 0
for self.chunkIndex = range self.sample.ChunkOffset.Entries { for self.chunkIndex = range self.sample.ChunkOffset.Entries {
if self.chunkGroupIndex+1 < len(self.sample.SampleToChunk.Entries) &&
self.chunkIndex+1 == self.sample.SampleToChunk.Entries[self.chunkGroupIndex+1].FirstChunk {
self.chunkGroupIndex++
}
n := self.sample.SampleToChunk.Entries[self.chunkGroupIndex].SamplesPerChunk n := self.sample.SampleToChunk.Entries[self.chunkGroupIndex].SamplesPerChunk
if index >= start && index < start+n { if index >= start && index < start+n {
found = true found = true
@ -112,10 +116,6 @@ func (self *Stream) setSampleIndex(index int) (err error) {
break break
} }
start += n start += n
if self.chunkGroupIndex+1 < len(self.sample.SampleToChunk.Entries) &&
self.chunkIndex+1 == self.sample.SampleToChunk.Entries[self.chunkGroupIndex+1].FirstChunk {
self.chunkGroupIndex++
}
} }
if !found { if !found {
err = fmt.Errorf("stream[%d]: cannot locate sample index in chunk", self.idx) err = fmt.Errorf("stream[%d]: cannot locate sample index in chunk", self.idx)
@ -187,6 +187,11 @@ func (self *Stream) setSampleIndex(index int) (err error) {
} }
} }
if false {
fmt.Printf("stream[%d]: setSampleIndex chunkGroupIndex=%d chunkIndex=%d sampleOffsetInChunk=%d\n",
self.idx, self.chunkGroupIndex, self.chunkIndex, self.sampleOffsetInChunk)
}
self.sampleIndex = index self.sampleIndex = index
return return
} }
@ -220,6 +225,10 @@ func (self *Stream) isSampleValid() bool {
} }
func (self *Stream) incSampleIndex() (duration int64) { func (self *Stream) incSampleIndex() (duration int64) {
if false {
fmt.Printf("incSampleIndex sampleIndex=%d sampleOffsetInChunk=%d sampleIndexInChunk=%d chunkGroupIndex=%d chunkIndex=%d\n",
self.sampleIndex, self.sampleOffsetInChunk, self.sampleIndexInChunk, self.chunkGroupIndex, self.chunkIndex)
}
self.sampleIndexInChunk++ self.sampleIndexInChunk++
if self.sampleIndexInChunk == self.sample.SampleToChunk.Entries[self.chunkGroupIndex].SamplesPerChunk { if self.sampleIndexInChunk == self.sample.SampleToChunk.Entries[self.chunkGroupIndex].SamplesPerChunk {
self.chunkIndex++ self.chunkIndex++