SGVideoDecoder: Padding frames.

libobjc · libobjc · commit ca4fe2aa13b6 · 2019-11-18T11:25:50.000+08:00
diff --git a/SGPlayer/Classes/Core/SGDecoder/SGVideoDecoder.m b/SGPlayer/Classes/Core/SGDecoder/SGVideoDecoder.m
@@ -91,7 +91,7 @@ - (void)flush
     SGCodecDescriptor *cd = packet.codecDescriptor;
     NSAssert(cd, @"Invalid Codec Descriptor.");
     if (![cd isEqualCodecContextToDescriptor:self->_codecDescriptor]) {
-        NSArray<SGFrame *> *objs = [self processPacket:nil];
+        NSArray<SGFrame *> *objs = [self finish];
         for (SGFrame *obj in objs) {
             [ret addObject:obj];
         }
@@ -108,9 +108,9 @@ - (void)flush
             [ret addObject:obj];
         }
     }
-    if (ret.firstObject) {
+    if (ret.lastObject) {
         [self->_lastOutputFrame unlock];
-        self->_lastOutputFrame = ret.firstObject;
+        self->_lastOutputFrame = ret.lastObject;
         [self->_lastOutputFrame lock];
     }
     self->_flags.outputCount += ret.count;

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ - (void)flush`
`91`	`91`	`SGCodecDescriptor *cd = packet.codecDescriptor;`
`92`	`92`	`NSAssert(cd, @"Invalid Codec Descriptor.");`
`93`	`93`	`if (![cd isEqualCodecContextToDescriptor:self->_codecDescriptor]) {`
`94`		`- NSArray<SGFrame > objs = [self processPacket:nil];`
	`94`	`+ NSArray<SGFrame > objs = [self finish];`
`95`	`95`	`for (SGFrame *obj in objs) {`
`96`	`96`	`[ret addObject:obj];`
`97`	`97`	`}`
`@@ -108,9 +108,9 @@ - (void)flush`
`108`	`108`	`[ret addObject:obj];`
`109`	`109`	`}`
`110`	`110`	`}`
`111`		`- if (ret.firstObject) {`
	`111`	`+ if (ret.lastObject) {`
`112`	`112`	`[self->_lastOutputFrame unlock];`
`113`		`- self->_lastOutputFrame = ret.firstObject;`
	`113`	`+ self->_lastOutputFrame = ret.lastObject;`
`114`	`114`	`[self->_lastOutputFrame lock];`
`115`	`115`	`}`
`116`	`116`	`self->_flags.outputCount += ret.count;`