Revert of AppRTCDemo: Render each video in a separate SurfaceView

talk/app/webrtc/java/src/org/webrtc/VideoRenderer.java

 /*
  * libjingle
  * Copyright 2013 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 24 matching lines @@
  * class also provides a createGui() method for creating a GUI-rendering window
  * on various platforms.
  */
 public class VideoRenderer {
 
   /** Java version of cricket::VideoFrame. */
   public static class I420Frame {
     public final int width;
     public final int height;
     public final int[] yuvStrides;
-    public ByteBuffer[] yuvPlanes;
+    public final ByteBuffer[] yuvPlanes;
     public final boolean yuvFrame;
     public Object textureObject;
     public int textureId;
-    // If |nativeFramePointer| is non-zero, the memory is allocated on the C++ side.
-    private long nativeFramePointer;
 
     // rotationDegree is the degree that the frame must be rotated clockwisely
     // to be rendered correctly.
     public int rotationDegree;
 
     /**
      * Construct a frame of the given dimensions with the specified planar
      * data.  If |yuvPlanes| is null, new planes of the appropriate sizes are
      * allocated.
      */
     public I420Frame(
         int width, int height, int rotationDegree,
-        int[] yuvStrides, ByteBuffer[] yuvPlanes, long nativeFramePointer) {
+        int[] yuvStrides, ByteBuffer[] yuvPlanes) {
       this.width = width;
       this.height = height;
       this.yuvStrides = yuvStrides;
       if (yuvPlanes == null) {
         yuvPlanes = new ByteBuffer[3];
         yuvPlanes[0] = ByteBuffer.allocateDirect(yuvStrides[0] * height);
         yuvPlanes[1] = ByteBuffer.allocateDirect(yuvStrides[1] * height / 2);
         yuvPlanes[2] = ByteBuffer.allocateDirect(yuvStrides[2] * height / 2);
       }
       this.yuvPlanes = yuvPlanes;
       this.yuvFrame = true;
       this.rotationDegree = rotationDegree;
-      this.nativeFramePointer = nativeFramePointer;
       if (rotationDegree % 90 != 0) {
         throw new IllegalArgumentException("Rotation degree not multiple of 90: " + rotationDegree);
       }
     }
 
     /**
      * Construct a texture frame of the given dimensions with data in SurfaceTexture
      */
     public I420Frame(
         int width, int height, int rotationDegree,
-        Object textureObject, int textureId, long nativeFramePointer) {
+        Object textureObject, int textureId) {
       this.width = width;
       this.height = height;
       this.yuvStrides = null;
       this.yuvPlanes = null;
       this.textureObject = textureObject;
       this.textureId = textureId;
       this.yuvFrame = false;
       this.rotationDegree = rotationDegree;
-      this.nativeFramePointer = nativeFramePointer;
       if (rotationDegree % 90 != 0) {
         throw new IllegalArgumentException("Rotation degree not multiple of 90: " + rotationDegree);
       }
     }
 
     public int rotatedWidth() {
       return (rotationDegree % 180 == 0) ? width : height;
     }
 
     public int rotatedHeight() {
@@ skipping 54 matching lines @@
     }
 
     @Override
     public String toString() {
       return width + "x" + height + ":" + yuvStrides[0] + ":" + yuvStrides[1] +
           ":" + yuvStrides[2];
     }
   }
 
   // Helper native function to do a video frame plane copying.
-  public static native void nativeCopyPlane(ByteBuffer src, int width,
+  private static native void nativeCopyPlane(ByteBuffer src, int width,
       int height, int srcStride, ByteBuffer dst, int dstStride);
 
   /** The real meat of VideoRendererInterface. */
   public static interface Callbacks {
     // |frame| might have pending rotation and implementation of Callbacks
-    // should handle that by applying rotation during rendering. The callee
-    // is responsible for signaling when it is done with |frame| by calling
-    // renderFrameDone(frame).
+    // should handle that by applying rotation during rendering.
     public void renderFrame(I420Frame frame);
     // TODO(guoweis): Remove this once chrome code base is updated.
     public boolean canApplyRotation();
   }
 
-  /**
-   * This must be called after every renderFrame() to release the frame.
-   */
-  public static void renderFrameDone(I420Frame frame) {
-    frame.yuvPlanes = null;
-    frame.textureObject = null;
-    frame.textureId = 0;
-    if (frame.nativeFramePointer != 0) {
-      releaseNativeFrame(frame.nativeFramePointer);
-      frame.nativeFramePointer = 0;
-    }
-  }
-
   // |this| either wraps a native (GUI) renderer or a client-supplied Callbacks
   // (Java) implementation; so exactly one of these will be non-0/null.
   final long nativeVideoRenderer;
   private final Callbacks callbacks;
 
   public static VideoRenderer createGui(int x, int y) {
     long nativeVideoRenderer = nativeCreateGuiVideoRenderer(x, y);
     if (nativeVideoRenderer == 0) {
       return null;
     }
@@ skipping 16 matching lines @@
     } else {
       freeWrappedVideoRenderer(nativeVideoRenderer);
     }
   }
 
   private static native long nativeCreateGuiVideoRenderer(int x, int y);
   private static native long nativeWrapVideoRenderer(Callbacks callbacks);
 
   private static native void freeGuiVideoRenderer(long nativeVideoRenderer);
   private static native void freeWrappedVideoRenderer(long nativeVideoRenderer);
-
-  private static native void releaseNativeFrame(long nativeFramePointer);
 }