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

Fix incorrect usage of SeqParameterSet.read() by feeding it possibly escaped Annex B NALUs

Browse Source
This commit is contained in:
Cameron Gutman 2015-10-23 14:46:03 -07:00
parent ad10413714
commit f09fbf4ba6
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java
View File

@ -4,6 +4,7 @@ import java.nio.ByteBuffer;
import java.util.Locale; import java.util.Locale;
import java.util.concurrent.locks.LockSupport; import java.util.concurrent.locks.LockSupport;
import org.jcodec.codecs.h264.H264Utils;
import org.jcodec.codecs.h264.io.model.SeqParameterSet; import org.jcodec.codecs.h264.io.model.SeqParameterSet;
import org.jcodec.codecs.h264.io.model.VUIParameters; import org.jcodec.codecs.h264.io.model.VUIParameters;
@ -490,7 +491,9 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
// Skip to the start of the NALU data // Skip to the start of the NALU data
spsBuf.position(header.offset+5); spsBuf.position(header.offset+5);
SeqParameterSet sps = SeqParameterSet.read(spsBuf); // The H264Utils.readSPS function safely handles
// Annex B NALUs (including NALUs with escape sequences)
SeqParameterSet sps = H264Utils.readSPS(spsBuf);
// Some decoders rely on H264 level to decide how many buffers are needed // Some decoders rely on H264 level to decide how many buffers are needed
// Since we only need one frame buffered, we'll set the level as low as we can // Since we only need one frame buffered, we'll set the level as low as we can
@ -571,8 +574,10 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
// Write the annex B header // Write the annex B header
buf.put(header.data, header.offset, 5); buf.put(header.data, header.offset, 5);
// Write the modified SPS to the input buffer // The H264Utils.writeSPS function safely handles
sps.write(buf); // Annex B NALUs (including NALUs with escape sequences)
ByteBuffer escapedNalu = H264Utils.writeSPS(sps, header.length);
buf.put(escapedNalu);
queueInputBuffer(inputBufferIndex, queueInputBuffer(inputBufferIndex,
0, buf.position(), 0, buf.position(),