Commit aa9ab25

committed

fixed flushing buffered frames from the decoder

1 parent de0a2a1 commit aa9ab25Copy full SHA for aa9ab25

File tree

+41

-11

lines changed

+41

-11

lines changed

Lines changed: 10 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -177,17 +177,16 @@ cdef class Stream(object):`
`177`	`177`	`# These codecs should have a CODEC CAP_DELAY capability set.`
`178`	`178`	`# This sends a special packet with data set to NULL and size set to 0`
`179`	`179`	`# This tells the Packet Object that its the last packet`
`180`		`- if frames:`
`181`		`- while True:`
`182`		`- # Create a new NULL packet for every frame we try to pull out.`
`183`		`- packet = Packet()`
`184`		`- frame = self._decode_one(&packet.struct, &data_consumed)`
`185`		`- if frame:`
`186`		`- if isinstance(frame, Frame):`
`187`		`- self._setup_frame(frame)`
`188`		`- frames.append(frame)`
`189`		`- else:`
`190`		`- break`
	`180`	`+ while True:`
	`181`	`+ # Create a new NULL packet for every frame we try to pull out.`
	`182`	`+ packet = Packet()`
	`183`	`+ frame = self._decode_one(&packet.struct, &data_consumed)`
	`184`	`+ if frame:`
	`185`	`+ if isinstance(frame, Frame):`
	`186`	`+ self._setup_frame(frame)`
	`187`	`+ frames.append(frame)`
	`188`	`+ else:`
	`189`	`+ break`
`191`	`190`
`192`	`191`	`return frames`
`193`	`192`

Lines changed: 31 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,31 @@`
	`1`	`+from .common import *`
	`2`	`+`
	`3`	`+`
	`4`	`+class TestDecode(TestCase):`
	`5`	`+ def test_decoded_video_frame_count(self):`
	`6`	`+`
	`7`	`+ container = av.open(asset('320x240x4.mov'))`
	`8`	`+ video_stream = next(s for s in container.streams if s.type == 'video')`
	`9`	`+`
	`10`	`+ frame_count = 0`
	`11`	`+`
	`12`	`+ for packet in container.demux(video_stream):`
	`13`	`+ for frame in packet.decode():`
	`14`	`+ frame_count += 1`
	`15`	`+`
	`16`	`+ self.assertEqual(frame_count, video_stream.frames)`
	`17`	`+`
	`18`	`+ def test_decode_audio_sample_count(self):`
	`19`	`+ container = av.open(asset('1KHz.wav'))`
	`20`	`+ audio_stream = next(s for s in container.streams if s.type == 'audio')`
	`21`	`+`
	`22`	`+`
	`23`	`+ sample_count = 0`
	`24`	`+`
	`25`	`+ print audio_stream.frames`
	`26`	`+ for packet in container.demux(audio_stream):`
	`27`	`+ for frame in packet.decode():`
	`28`	`+ sample_count += frame.samples`
	`29`	`+`
	`30`	`+ total_samples = (audio_stream.duration * audio_stream.rate.numerator) / audio_stream.time_base.denominator`
	`31`	`+ self.assertEqual(sample_count, total_samples)`

Comments

(0)