diff --git a/Live/src/main/java/com/frank/live/camera/Camera2Helper.java b/Live/src/main/java/com/frank/live/camera/Camera2Helper.java
index 20fdfbe..8221224 100644
--- a/Live/src/main/java/com/frank/live/camera/Camera2Helper.java
+++ b/Live/src/main/java/com/frank/live/camera/Camera2Helper.java
@@ -595,7 +595,7 @@ public class Camera2Helper {
                     }
                     // front camera need to flip
                     if (CAMERA_ID_FRONT.equals(mCameraId)) {
-                        YUVUtil.flipYUV(dstData, width, height, rotation == 90, rotation == 180);
+                        YUVUtil.flipYUV(dstData, yuvData, width, height);
                     }
                     if (camera2Listener != null) {
                         camera2Listener.onPreviewFrame(dstData);
diff --git a/Live/src/main/java/com/frank/live/util/YUVUtil.java b/Live/src/main/java/com/frank/live/util/YUVUtil.java
index 0f9591f..3b6063a 100644
--- a/Live/src/main/java/com/frank/live/util/YUVUtil.java
+++ b/Live/src/main/java/com/frank/live/util/YUVUtil.java
@@ -126,27 +126,29 @@ public class YUVUtil {
         }
     }
 
-    private static void swap(byte[] a, int i, int j) {
-        byte temp = a[i];
-        a[i] = a[j];
-        a[j] = temp;
-    }
-
-    public static void flipYUV(byte[] dst, int width, int height, boolean flipX, boolean flipY) {
+    public static void flipYUV(byte[] dst, byte[] src, int width, int height) {
         if (dst == null || width <= 0 || height <= 0)
             return;
-        if (flipY) {
-            for (int i=0; i<height; i++) {
-                for (int j=0; j<width/2; j++) {
-                    swap(dst, j, width - j - 1);
-                }
+
+        int idx = 0;
+        // Y
+        for (int i = 0; i < width; i++) {
+            for (int j = 0; j < height; j++) {
+					dst[idx++] = src[width - i + (height - j) * width];
             }
         }
-        if (flipX) {
-            for (int i=0; i<width; i++) {
-                for (int j=0; j<height/2; j++) {
-                    swap(dst, j, height - j - 1);
-                }
+        // U
+        int offset = width * height;
+        for (int i = 0; i < width / 2; i++) {
+            for (int j = 0; j < height / 2; j++) {
+                dst[idx++] = src[offset + width - i + (height / 2 - j) * width / 2];
+            }
+        }
+        // V
+        offset += width * height / 4;
+        for (int i = 0; i < width / 2; i++) {
+            for (int j = 0; j < height / 2; j++) {
+                dst[idx++] = src[offset + width - i + (height / 2 - j) * width / 2];
             }
         }
     }