Merge remote-tracking branch 'origin/4.0.0-preview' into 4.0.0-preview

Author: xianing

Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/ProcessRawData.java

@@ -27,6 +27,7 @@
 import io.agora.api.example.annotation.Example;
 import io.agora.api.example.common.BaseFragment;
 import io.agora.api.example.utils.CommonUtil;
+import io.agora.api.example.utils.YUVUtils;
 import io.agora.base.VideoFrame;
 import io.agora.rtc2.*;
 import io.agora.rtc2.video.*;
@@ -260,21 +261,47 @@ public boolean onCaptureVideoFrame(VideoFrame videoFrame) {
                 isSnapshot = false;
 
                 // get image bitmap
-                VideoFrame.I420Buffer buffer = videoFrame.getBuffer().toI420();
-                ByteBuffer ib = ByteBuffer.allocate(videoFrame.getBuffer().getHeight() * videoFrame.getBuffer().getWidth() * 2);
-                ib.put(buffer.getDataY());
-                ib.put(buffer.getDataU());
-                ib.put(buffer.getDataV());
-                YuvImage yuvImage = new YuvImage(ib.array(),
-                        ImageFormat.NV21, videoFrame.getBuffer().getWidth(), videoFrame.getBuffer().getHeight(), null);
-                ByteArrayOutputStream out = new ByteArrayOutputStream();
-                yuvImage.compressToJpeg(new Rect(0, 0,
-                        videoFrame.getBuffer().getWidth(), videoFrame.getBuffer().getHeight()), 50, out);
-                byte[] imageBytes = out.toByteArray();
-                Bitmap bm = BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.length);
-
+//                VideoFrame.I420Buffer buffer = videoFrame.getBuffer().toI420();
+//                ByteBuffer ib = ByteBuffer.allocate(videoFrame.getBuffer().getHeight() * videoFrame.getBuffer().getWidth() * 2);
+//                ib.put(buffer.getDataY());
+//                ib.put(buffer.getDataU());
+//                ib.put(buffer.getDataV());
+//                YuvImage yuvImage = new YuvImage(ib.array(),
+//                        ImageFormat.NV21, videoFrame.getBuffer().getWidth(), videoFrame.getBuffer().getHeight(), null);
+//                ByteArrayOutputStream out = new ByteArrayOutputStream();
+//                yuvImage.compressToJpeg(new Rect(0, 0,
+//                        videoFrame.getBuffer().getWidth(), videoFrame.getBuffer().getHeight()), 50, out);
+//                byte[] imageBytes = out.toByteArray();
+//                Bitmap bm = BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.length);
+
+                VideoFrame.Buffer buffer = videoFrame.getBuffer();
+
+                VideoFrame.I420Buffer i420Buffer = buffer.toI420();
+                int width = i420Buffer.getWidth();
+                int height = i420Buffer.getHeight();
+
+                ByteBuffer bufferY = i420Buffer.getDataY();
+                ByteBuffer bufferU = i420Buffer.getDataU();
+                ByteBuffer bufferV = i420Buffer.getDataV();
+
+                byte[] i420 = YUVUtils.toWrappedI420(bufferY, bufferU, bufferV, width, height);
+
+                Bitmap bitmap = YUVUtils.NV21ToBitmap(getContext(),
+                        YUVUtils.I420ToNV21(i420, width, height),
+                        width,
+                        height);
+
+                Matrix matrix = new Matrix();
+                matrix.setRotate(270);
+                // 围绕原地进行旋转
+                Bitmap newBitmap = Bitmap.createBitmap(bitmap, 0, 0, width, height, matrix, false);
                 // save to file
-                saveBitmap2Gallery(bm);
+                saveBitmap2Gallery(newBitmap);
+
+                bitmap.recycle();
+                //别忘了释放
+                i420Buffer.release();
+
             }
             return false;
         }

Android/APIExample/app/src/main/java/io/agora/api/example/utils/YUVUtils.java

@@ -1,5 +1,9 @@
 package io.agora.api.example.utils;
 
+import static android.renderscript.Element.RGBA_8888;
+import static android.renderscript.Element.U8;
+import static android.renderscript.Element.U8_4;
+
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -8,12 +12,14 @@
 import android.graphics.Rect;
 import android.graphics.YuvImage;
 import android.renderscript.Allocation;
-import android.renderscript.Element;
+import android.renderscript.Type.Builder;
 import android.renderscript.RenderScript;
 import android.renderscript.ScriptIntrinsicBlur;
+import android.renderscript.ScriptIntrinsicYuvToRGB;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.nio.ByteBuffer;
 
 public class YUVUtils {
 
@@ -124,7 +130,7 @@ public static Bitmap blur(Context context, Bitmap image, float radius) {
         Bitmap outputBitmap = Bitmap.createBitmap(image.getWidth(), image.getHeight(), Bitmap.Config.ARGB_8888);
         Allocation in = Allocation.createFromBitmap(rs, image);
         Allocation out = Allocation.createFromBitmap(rs, outputBitmap);
-        ScriptIntrinsicBlur intrinsicBlur = ScriptIntrinsicBlur.create(rs, Element.U8_4(rs));
+        ScriptIntrinsicBlur intrinsicBlur = ScriptIntrinsicBlur.create(rs, U8_4(rs));
         intrinsicBlur.setRadius(radius);
         intrinsicBlur.setInput(in);
         intrinsicBlur.forEach(out);
@@ -145,4 +151,70 @@ public static byte[] bitmapToI420(int inputWidth, int inputHeight, Bitmap scaled
         return yuv;
     }
 
+    public static byte[] toWrappedI420(ByteBuffer bufferY,
+                                       ByteBuffer bufferU,
+                                       ByteBuffer bufferV,
+                                       int width,
+                                       int height) {
+        int chromaWidth = (width + 1) / 2;
+        int chromaHeight = (height + 1) / 2;
+        int lengthY = width * height;
+        int lengthU = chromaWidth * chromaHeight;
+        int lengthV = lengthU;
+
+
+        int size = lengthY + lengthU + lengthV;
+
+        byte[] out = new byte[size];
+        for (int i = 0; i < size; i++) {
+            if (i < lengthY) {
+                out[i] = bufferY.get(i);
+            } else if (i < lengthY + lengthU) {
+                int j = (i - lengthY) / chromaWidth;
+                int k = (i - lengthY) % chromaWidth;
+                out[i] = bufferU.get(j * width + k);
+            } else {
+                int j = (i - lengthY - lengthU) / chromaWidth;
+                int k = (i - lengthY - lengthU) % chromaWidth;
+                out[i] = bufferV.get(j * width + k);
+            }
+        }
+
+        return out;
+    }
+    /**
+     * I420转nv21
+     */
+    public static byte[] I420ToNV21(byte[] data, int width, int height) {
+        byte[] ret = new byte[data.length];
+        int total = width * height;
+
+        ByteBuffer bufferY = ByteBuffer.wrap(ret, 0, total);
+        ByteBuffer bufferVU = ByteBuffer.wrap(ret, total, total / 2);
+
+        bufferY.put(data, 0, total);
+        for (int i = 0; i < total / 4; i += 1) {
+            bufferVU.put(data[i + total + total / 4]);
+            bufferVU.put(data[total + i]);
+        }
+
+        return ret;
+    }
+
+    public static Bitmap NV21ToBitmap(Context context, byte[] nv21, int width, int height) {
+        RenderScript rs = RenderScript.create(context);
+        ScriptIntrinsicYuvToRGB yuvToRgbIntrinsic = ScriptIntrinsicYuvToRGB.create(rs, U8_4(rs));
+        Builder yuvType = null;
+        yuvType = (new Builder(rs, U8(rs))).setX(nv21.length);
+        Allocation in = Allocation.createTyped(rs, yuvType.create(), 1);
+        Builder rgbaType = (new Builder(rs, RGBA_8888(rs))).setX(width).setY(height);
+        Allocation out = Allocation.createTyped(rs, rgbaType.create(), 1);
+        in.copyFrom(nv21);
+        yuvToRgbIntrinsic.setInput(in);
+        yuvToRgbIntrinsic.forEach(out);
+        Bitmap bmpout = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        out.copyTo(bmpout);
+        return bmpout;
+    }
+
 }