Add JavaI420Buffer to the API.

This renames I420BufferImpl to JavaI420Buffer and moves it as part of
the API.

Bug: webrtc:7749
Change-Id: I70726f248ba4601b4922996712bdfdafbfa4a1e1
Reviewed-on: https://webrtc-review.googlesource.com/5381
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20145}

sdk/android/src/java/org/webrtc/HardwareVideoDecoder.java

@@ -535,7 +535,7 @@ class HardwareVideoDecoder
     final int vPos = uPos + uvStride * sliceHeight / 2;
     final int vEnd = vPos + uvStride * (sliceHeight / 2);
 
-    VideoFrame.I420Buffer frameBuffer = I420BufferImpl.allocate(width, height);
+    VideoFrame.I420Buffer frameBuffer = JavaI420Buffer.allocate(width, height);
 
     ByteBuffer dataY = frameBuffer.getDataY();
     dataY.position(0); // Ensure we are in the beginning.
@@ -605,7 +605,7 @@ class HardwareVideoDecoder
     buffer.limit(vEnd);
     ByteBuffer dataV = buffer.slice();
 
-    return new I420BufferImpl(
+    return JavaI420Buffer.wrap(
         width, height, dataY, stride, dataU, uvStride, dataV, uvStride, releaseCallback);
   }
 

sdk/android/src/java/org/webrtc/I420BufferImpl.java

@@ -1,143 +0,0 @@
-/*
- *  Copyright 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-package org.webrtc;
-
-import java.nio.ByteBuffer;
-import org.webrtc.VideoFrame.I420Buffer;
-
-/** Implementation of an I420 VideoFrame buffer. */
-class I420BufferImpl implements VideoFrame.I420Buffer {
-  private final int width;
-  private final int height;
-  private final ByteBuffer dataY;
-  private final ByteBuffer dataU;
-  private final ByteBuffer dataV;
-  private final int strideY;
-  private final int strideU;
-  private final int strideV;
-  private final Runnable releaseCallback;
-  private final Object refCountLock = new Object();
-
-  private int refCount;
-
-  /** Constructs an I420Buffer backed by existing data. */
-  I420BufferImpl(int width, int height, ByteBuffer dataY, int strideY, ByteBuffer dataU,
-      int strideU, ByteBuffer dataV, int strideV, Runnable releaseCallback) {
-    this.width = width;
-    this.height = height;
-    this.dataY = dataY;
-    this.dataU = dataU;
-    this.dataV = dataV;
-    this.strideY = strideY;
-    this.strideU = strideU;
-    this.strideV = strideV;
-    this.releaseCallback = releaseCallback;
-
-    this.refCount = 1;
-  }
-
-  /** Allocates an empty I420Buffer suitable for an image of the given dimensions. */
-  static I420BufferImpl allocate(int width, int height) {
-    int chromaHeight = (height + 1) / 2;
-    int strideUV = (width + 1) / 2;
-    int yPos = 0;
-    int uPos = yPos + width * height;
-    int vPos = uPos + strideUV * chromaHeight;
-
-    ByteBuffer buffer = ByteBuffer.allocateDirect(width * height + 2 * strideUV * chromaHeight);
-
-    buffer.position(yPos);
-    buffer.limit(uPos);
-    ByteBuffer dataY = buffer.slice();
-
-    buffer.position(uPos);
-    buffer.limit(vPos);
-    ByteBuffer dataU = buffer.slice();
-
-    buffer.position(vPos);
-    buffer.limit(vPos + strideUV * chromaHeight);
-    ByteBuffer dataV = buffer.slice();
-
-    return new I420BufferImpl(width, height, dataY, width, dataU, strideUV, dataV, strideUV, null);
-  }
-
-  @Override
-  public int getWidth() {
-    return width;
-  }
-
-  @Override
-  public int getHeight() {
-    return height;
-  }
-
-  @Override
-  public ByteBuffer getDataY() {
-    // Return a slice to prevent relative reads from changing the position.
-    return dataY.slice();
-  }
-
-  @Override
-  public ByteBuffer getDataU() {
-    // Return a slice to prevent relative reads from changing the position.
-    return dataU.slice();
-  }
-
-  @Override
-  public ByteBuffer getDataV() {
-    // Return a slice to prevent relative reads from changing the position.
-    return dataV.slice();
-  }
-
-  @Override
-  public int getStrideY() {
-    return strideY;
-  }
-
-  @Override
-  public int getStrideU() {
-    return strideU;
-  }
-
-  @Override
-  public int getStrideV() {
-    return strideV;
-  }
-
-  @Override
-  public I420Buffer toI420() {
-    retain();
-    return this;
-  }
-
-  @Override
-  public void retain() {
-    synchronized (refCountLock) {
-      ++refCount;
-    }
-  }
-
-  @Override
-  public void release() {
-    synchronized (refCountLock) {
-      if (--refCount == 0 && releaseCallback != null) {
-        releaseCallback.run();
-      }
-    }
-  }
-
-  @Override
-  public VideoFrame.Buffer cropAndScale(
-      int cropX, int cropY, int cropWidth, int cropHeight, int scaleWidth, int scaleHeight) {
-    return VideoFrame.cropAndScaleI420(
-        this, cropX, cropY, cropWidth, cropHeight, scaleWidth, scaleHeight);
-  }
-}

sdk/android/src/java/org/webrtc/NV12Buffer.java

@@ -69,7 +69,7 @@ public class NV12Buffer implements VideoFrame.Buffer {
   @Override
   public VideoFrame.Buffer cropAndScale(
       int cropX, int cropY, int cropWidth, int cropHeight, int scaleWidth, int scaleHeight) {
-    I420BufferImpl newBuffer = I420BufferImpl.allocate(scaleWidth, scaleHeight);
+    JavaI420Buffer newBuffer = JavaI420Buffer.allocate(scaleWidth, scaleHeight);
     nativeCropAndScale(cropX, cropY, cropWidth, cropHeight, scaleWidth, scaleHeight, buffer, width,
         height, stride, sliceHeight, newBuffer.getDataY(), newBuffer.getStrideY(),
         newBuffer.getDataU(), newBuffer.getStrideU(), newBuffer.getDataV(), newBuffer.getStrideV());

sdk/android/src/java/org/webrtc/NV21Buffer.java

@@ -64,7 +64,7 @@ public class NV21Buffer implements VideoFrame.Buffer {
   @Override
   public VideoFrame.Buffer cropAndScale(
       int cropX, int cropY, int cropWidth, int cropHeight, int scaleWidth, int scaleHeight) {
-    I420BufferImpl newBuffer = I420BufferImpl.allocate(scaleWidth, scaleHeight);
+    JavaI420Buffer newBuffer = JavaI420Buffer.allocate(scaleWidth, scaleHeight);
     nativeCropAndScale(cropX, cropY, cropWidth, cropHeight, scaleWidth, scaleHeight, data, width,
         height, newBuffer.getDataY(), newBuffer.getStrideY(), newBuffer.getDataU(),
         newBuffer.getStrideU(), newBuffer.getDataV(), newBuffer.getStrideV());

sdk/android/src/java/org/webrtc/TextureBufferImpl.java

@@ -101,7 +101,7 @@ class TextureBufferImpl implements VideoFrame.TextureBuffer {
     ByteBuffer dataV = buffer.slice();
 
     // SurfaceTextureHelper uses the same stride for Y, U, and V data.
-    return new I420BufferImpl(width, height, dataY, stride, dataU, stride, dataV, stride, null);
+    return JavaI420Buffer.wrap(width, height, dataY, stride, dataU, stride, dataV, stride, null);
   }
 
   @Override