moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-20 11:33:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Also use the slow path for the last packet in each frame because it may be padded

Browse Source
This commit is contained in:
Cameron Gutman 2014-11-10 23:59:23 -08:00
parent 7bc325fa08
commit 1531629fcd
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
moonlight-common/src/com/limelight/nvstream/av/video/VideoDepacketizer.java
View File

@ -129,9 +129,11 @@ public class VideoDepacketizer {
} }
} }
private void addInputDataSlow(VideoPacket packet, ByteBufferDescriptor location) private void addInputDataSlow(VideoPacket packet, ByteBufferDescriptor location,
boolean atFrameStart, boolean hasIntraNalPadding)
{ {
boolean isDecodingH264 = false; // If we're at frame start, we aren't yet decoding.
boolean isDecodingH264 = !atFrameStart;
while (location.length != 0) while (location.length != 0)
{ {
@ -156,6 +158,7 @@ public class VideoDepacketizer {
reassembleAvcFrame(packet.getFrameIndex()); reassembleAvcFrame(packet.getFrameIndex());
// Setup state for the new NAL // Setup state for the new NAL
frameStartTime = System.currentTimeMillis();
avcFrameDataChain = new LinkedList<ByteBufferDescriptor>(); avcFrameDataChain = new LinkedList<ByteBufferDescriptor>();
avcFrameDataLength = 0; avcFrameDataLength = 0;
packetSet = new HashSet<VideoPacket>(); packetSet = new HashSet<VideoPacket>();
@ -198,10 +201,17 @@ public class VideoDepacketizer {
{ {
// Only stop if we're decoding something or this // Only stop if we're decoding something or this
// isn't padding // isn't padding
if (isDecodingH264 || !NAL.isPadding(cachedSpecialDesc)) boolean isPadding = NAL.isPadding(cachedSpecialDesc);
if (isDecodingH264 || !isPadding)
{ {
break; break;
} }
else if (!hasIntraNalPadding && isPadding)
{
// There's nothing more after this
location.length = 0;
break;
}
} }
} }
@ -212,6 +222,15 @@ public class VideoDepacketizer {
if (isDecodingH264 && avcFrameDataChain != null) if (isDecodingH264 && avcFrameDataChain != null)
{ {
// HACK: It's possible that the last location in the packet could be zero-padded
// but not with enough zeros to be an invalid AVC sequence. In this case, we're going to
// just guess that 2 zeros in a row at the end are probably padding.
if (!hasIntraNalPadding && location.length == 0 &&
location.data[location.offset-2] == 0 &&
location.data[location.offset-1] == 0) {
location.offset -= 2;
}
ByteBufferDescriptor data = new ByteBufferDescriptor(location.data, start, location.offset-start); ByteBufferDescriptor data = new ByteBufferDescriptor(location.data, start, location.offset-start);
if (packetSet.add(packet)) { if (packetSet.add(packet)) {
@ -355,13 +374,18 @@ public class VideoDepacketizer {
} }
lastPacketInStream = streamPacketIndex; lastPacketInStream = streamPacketIndex;
if (firstPacket if ((flags & VideoPacket.FLAG_EOF) != 0)
{
// The last video packet can also have zero padding which we must strip using the slow path.
addInputDataSlow(packet, cachedReassemblyDesc, (flags & VideoPacket.FLAG_SOF) != 0, false);
}
else if (firstPacket
&& NAL.getSpecialSequenceDescriptor(cachedReassemblyDesc, cachedSpecialDesc) && NAL.getSpecialSequenceDescriptor(cachedReassemblyDesc, cachedSpecialDesc)
&& NAL.isAvcFrameStart(cachedSpecialDesc) && NAL.isAvcFrameStart(cachedSpecialDesc)
&& cachedSpecialDesc.data[cachedSpecialDesc.offset+cachedSpecialDesc.length] == 0x67) && cachedSpecialDesc.data[cachedSpecialDesc.offset+cachedSpecialDesc.length] == 0x67)
{ {
// SPS and PPS prefix is padded between NALs, so we must decode it with the slow path // SPS and PPS prefix is padded between NALs, so we must decode it with the slow path.
addInputDataSlow(packet, cachedReassemblyDesc); addInputDataSlow(packet, cachedReassemblyDesc, true, true);
} }
else else
{ {