From a7d4a04ac2546afec49476829aa2ae4467ca9359 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Fri, 20 Nov 2015 18:57:23 -0800 Subject: [PATCH] Missed the SPS replay code when fixing the Annex B escape sequence issues --- .../limelight/binding/video/MediaCodecDecoderRenderer.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java b/app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java index 14011535..008493d0 100644 --- a/app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java +++ b/app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java @@ -628,8 +628,10 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer { // Patch the SPS constraint flags doProfileSpecificSpsPatching(savedSps); - // Write the SPS data - savedSps.write(inputBuffer); + // The H264Utils.writeSPS function safely handles + // Annex B NALUs (including NALUs with escape sequences) + ByteBuffer escapedNalu = H264Utils.writeSPS(savedSps, 128); + inputBuffer.put(escapedNalu); // No need for the SPS anymore savedSps = null;