made some changes in hopes that the video stream will work better

AndroidManifest.xml

@@ -10,6 +10,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <application
         android:allowBackup="true"

gen/com/limelight/R.java

@@ -113,7 +113,7 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
 
           <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
 or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
-          @attr name android:buttonBarButtonStyle
+          @attr name com.limelight:buttonBarButtonStyle
         */
         public static final int ButtonBarContainerTheme_buttonBarButtonStyle = 1;
         /**
@@ -123,7 +123,7 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
 
           <p>Must be a reference to another resource, in the form "<code>@[+][<i>package</i>:]<i>type</i>:<i>name</i></code>"
 or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>".
-          @attr name android:buttonBarStyle
+          @attr name com.limelight:buttonBarStyle
         */
         public static final int ButtonBarContainerTheme_buttonBarStyle = 0;
     };

src/com/limelight/Connection.java

@@ -14,7 +14,7 @@ public class Connection extends Activity {
 	private TextView hostText;
 	private SharedPreferences prefs;
 	
-	private static final String DEFAULT_HOST = "141.213.191.238";
+	private static final String DEFAULT_HOST = "35.0.113.120";
 	public static final String HOST_KEY = "hostText";
 	
 

src/com/limelight/Game.java

@@ -46,7 +46,6 @@ public class Game extends Activity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		
 		getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
 		requestWindowFeature(Window.FEATURE_NO_TITLE);
 		
@@ -64,7 +63,7 @@ public class Game extends Activity {
 		
 		switch (keyCode) {
 		case OuyaController.BUTTON_MENU:
-			inputMap |= NvInputPacket.BACK_FLAG;
+			inputMap |= NvInputPacket.PLAY_FLAG;
 			break;
 		case OuyaController.BUTTON_DPAD_LEFT:
 			inputMap |= NvInputPacket.LEFT_FLAG;
@@ -113,7 +112,7 @@ public class Game extends Activity {
 	public boolean onKeyUp(int keyCode, KeyEvent event) {
 		switch (keyCode) {
 		case OuyaController.BUTTON_MENU:
-			inputMap &= ~NvInputPacket.BACK_FLAG;
+			inputMap &= ~NvInputPacket.PLAY_FLAG;
 			break;
 		case OuyaController.BUTTON_DPAD_LEFT:
 			inputMap &= ~NvInputPacket.LEFT_FLAG;

src/com/limelight/nvstream/NvVideoStream.java

@@ -1,5 +1,9 @@
 package com.limelight.nvstream;
 
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.DatagramSocket;
@@ -23,7 +27,12 @@ public class NvVideoStream implements RTPAppIntf {
 	public static final int RTCP_PORT = 47999;
 	public static final int FIRST_FRAME_PORT = 47996;
 	
-	private MediaCodec codec;
+	private static final int FRAME_RATE = 60;
+	private ByteBuffer[] decoderInputBuffers = null;
+	private MediaCodec decoder;
+	private BufferedOutputStream output;
+	
+	private int frameIndex = 0;
 	
 	private InputStream getFirstFrame(String host) throws UnknownHostException, IOException
 	{
@@ -31,6 +40,11 @@ public class NvVideoStream implements RTPAppIntf {
 		return s.getInputStream();
 	}
 	
+	private void openFile(String file) throws FileNotFoundException
+	{
+		output = new BufferedOutputStream(new FileOutputStream(new File(file)));
+	}
+	
 	public void startVideoStream(final String host, final Surface surface)
 	{		
 		new Thread(new Runnable() {
@@ -69,24 +83,26 @@ public class NvVideoStream implements RTPAppIntf {
 					return;
 				}
 
-				codec = MediaCodec.createDecoderByType("video/avc");
+				decoder = MediaCodec.createDecoderByType("video/avc");
 				MediaFormat mediaFormat = MediaFormat.createVideoFormat("video/avc", 1280, 720);
-				codec.configure(mediaFormat, surface, null, 0);
-				codec.setVideoScalingMode(MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT);
-				codec.start();
 		
+				decoder.configure(mediaFormat, surface, null, 0);
+				decoder.setVideoScalingMode(MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT);
+				decoder.start();
+				decoderInputBuffers = decoder.getInputBuffers();
 
-				int inputIndex = codec.dequeueInputBuffer(-1);
+				int inputIndex = decoder.dequeueInputBuffer(-1);
 				if (inputIndex >= 0)
 				{
-					ByteBuffer buf = codec.getInputBuffers()[inputIndex];
+					ByteBuffer buf = decoderInputBuffers[inputIndex];
 					
 					buf.clear();
 					buf.put(firstFrame);
 					
-					codec.queueInputBuffer(inputIndex,
+					decoder.queueInputBuffer(inputIndex,
 							0, firstFrame.length,
-							100, MediaCodec.BUFFER_FLAG_CODEC_CONFIG);
+							0, 0);
+					frameIndex++;
 				}
 				
 				RTPSession session = new RTPSession(rtp, rtcp);
@@ -95,25 +111,32 @@ public class NvVideoStream implements RTPAppIntf {
 				
 				for (;;)
 				{
+					System.out.println("in background infinite loop");
 					BufferInfo info = new BufferInfo();
-					int outIndex = codec.dequeueOutputBuffer(info, -1);
+					System.out.println("dequeuing outputbuffer");
+					int outIndex = decoder.dequeueOutputBuffer(info, -1);
+					System.out.println("done dequeuing output buffer");
 				    switch (outIndex) {
 				    case MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED:
 				    	System.out.println("Output buffers changed");
 					    break;
 				    case MediaCodec.INFO_OUTPUT_FORMAT_CHANGED:
 				    	System.out.println("Output format changed");
+				    	//decoderOutputFormat = decoder.getOutputFormat();
+				    	System.out.println("New output Format: " + decoder.getOutputFormat());
 				    	break;
 				    case MediaCodec.INFO_TRY_AGAIN_LATER:
 				    	System.out.println("Try again later");
 				    	break;
 				    default:
-				    	if (outIndex >= 0)
-				    	{
-				    		codec.releaseOutputBuffer(outIndex, true);
-				    	}
 				      break;
 				    }
+				    if (outIndex >= 0) {
+				    	System.out.println("releasing output buffer");
+				    	decoder.releaseOutputBuffer(outIndex, true);
+				    	System.out.println("output buffer released");
+				    }
+			    	
 				}
 			}
 		}).start();
@@ -121,15 +144,14 @@ public class NvVideoStream implements RTPAppIntf {
 
 	@Override
 	public void receiveData(DataFrame frame, Participant participant) {
-		
+		System.out.println("in receiveData");
-		ByteBuffer[] codecInputBuffers = codec.getInputBuffers();
+		int inputIndex = decoder.dequeueInputBuffer(-1);
-
-		int inputIndex = codec.dequeueInputBuffer(-1);
 		if (inputIndex >= 0)
 		{
-			ByteBuffer buf = codecInputBuffers[inputIndex];
+			ByteBuffer buf = decoderInputBuffers[inputIndex];
 			
 			buf.clear();
+			
 			buf.put(frame.getConcatenatedData());
 			
 			if (buf.position() != 1024)
@@ -137,10 +159,28 @@ public class NvVideoStream implements RTPAppIntf {
 				System.out.println("Data length: "+buf.position());
 				System.out.println(buf.get()+" "+buf.get()+" "+buf.get());
 			}
-
+			
-			codec.queueInputBuffer(inputIndex,
+			byte[] nvHeader = new byte[32];
-					0, buf.position(),
+			byte[] oldBuffer = buf.array();
-					10000000, 0);
+			byte[] newBuffer = new byte[oldBuffer.length - nvHeader.length];
+			System.out.println("removing crap from buffer");
+			for (int i = 0; i < oldBuffer.length; i++) {
+				if (i < nvHeader.length) {
+					nvHeader[i] = oldBuffer[i];
+				} else {
+					newBuffer[i - nvHeader.length] = oldBuffer[i];
+				}
+			}
+			System.out.println("nvHeader: " + nvHeader.length + "oldBuffer: " + oldBuffer.length +
+					"newBuffer: " + newBuffer.length);
+			buf.clear();
+			buf.put(newBuffer);
+			if (oldBuffer.length == 0xc803) {
+				decoder.queueInputBuffer(inputIndex,
+						0, buf.position(),
+						0, 0);
+				frameIndex++;
+			}
 		}
 	}
 
@@ -152,4 +192,11 @@ public class NvVideoStream implements RTPAppIntf {
 	public int frameSize(int payloadType) {
 		return 1;
 	}
+	
+    /**
+     * Generates the presentation time for frame N, in microseconds.
+     */
+    private static long computePresentationTime(int frameIndex) {
+        return 132 + frameIndex * 1000000 / FRAME_RATE;
+    }
 }