moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-21 03:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix video corruption caused by the first packet in the IDR frame getting chained multiple times, resulting in the reference count of other packets in the I-frame returning to zero prematurely

Browse Source
This commit is contained in:
Cameron Gutman 2015-10-31 15:29:52 -07:00
parent df59c99f80
commit fc1c26b5d7
1 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,20 +194,16 @@ public class VideoDepacketizer {
} }
private void chainPacketToCurrentFrame(VideoPacket packet) { private void chainPacketToCurrentFrame(VideoPacket packet) {
// It's possible to get more than one NAL from a packet but we can cheaply packet.referencePacket();
// check for this condition because all duplicates must be contiguous packet.nextPacket = null;
if (backingPacketTail != packet) {
packet.referencePacket();
packet.nextPacket = null;
// Chain the packet // Chain the packet
if (backingPacketTail != null) { if (backingPacketTail != null) {
backingPacketTail.nextPacket = packet; backingPacketTail.nextPacket = packet;
backingPacketTail = packet; backingPacketTail = packet;
} }
else { else {
backingPacketHead = backingPacketTail = packet; backingPacketHead = backingPacketTail = packet;
}
} }
} }
@ -289,11 +285,27 @@ public class VideoDepacketizer {
if (isDecodingH264 && decodingFrame) if (isDecodingH264 && decodingFrame)
{ {
// Chain this packet to the current frame // The slow path may result in multiple decode units per packet.
chainPacketToCurrentFrame(packet); // The VideoPacket objects only support being in 1 DU list, so we'll
// copy this data into a new array rather than reference the packet, if
// this NALU ends before the end of the frame. Only copying if this doesn't
// go to the end of the frame means we'll be only copying the SPS and PPS which
// are quite small, while the actual I-frame data is referenced via the packet.
if (location.length != 0) {
// Copy the packet data into a new array
byte[] dataCopy = new byte[location.offset-start];
System.arraycopy(location.data, start, dataCopy, 0, dataCopy.length);
// Add a buffer descriptor describing the NAL data in this packet // Chain a descriptor referencing the copied data
chainBufferToCurrentFrame(new ByteBufferDescriptor(location.data, start, location.offset-start)); chainBufferToCurrentFrame(new ByteBufferDescriptor(dataCopy, 0, dataCopy.length));
}
else {
// Chain this packet to the current frame
chainPacketToCurrentFrame(packet);
// Add a buffer descriptor describing the NAL data in this packet
chainBufferToCurrentFrame(new ByteBufferDescriptor(location.data, start, location.offset-start));
}
} }
} }
} }