fixed blue and red were swapped on Pixel 5a.

shogo4405 · Jan 4, 2024 · 0c11305 · 0c11305
1 parent 68d2632
commit 0c11305
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/haishinkit/src/main/java/com/haishinkit/media/Camera2Source.kt b/haishinkit/src/main/java/com/haishinkit/media/Camera2Source.kt
@@ -263,8 +263,7 @@ class Camera2Source(
     }
 
     companion object {
-        private const val IMAGE_FORMAT = ImageFormat.YUV_420_888
-
+        private const val IMAGE_FORMAT = 0x00000022 // AIMAGE_FORMAT_PRIVATE
         private const val DEFAULT_CAMERA_ID = "0"
         private val TAG = Camera2Source::class.java.simpleName
     }

diff --git a/vulkan/src/main/cpp/Graphics/ImageReader.cpp b/vulkan/src/main/cpp/Graphics/ImageReader.cpp
@@ -13,16 +13,19 @@ void ImageReader::SetUp(int32_t width, int32_t height, int32_t format) {
     buffers.resize(maxImages);
     images.resize(maxImages);
 
-    AImageReader_newWithUsage(
+    auto result = AImageReader_newWithUsage(
             width,
             height,
             format,
-            AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE |
-            AHARDWAREBUFFER_USAGE_CPU_READ_RARELY,
+            AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE,
             maxImages + 2,
             &reader);
 
-    AImageReader_getWindow(reader, &window);
+    if (result == AMEDIA_OK) {
+        AImageReader_getWindow(reader, &window);
+    } else {
+        LOGE("Failed to AImageReader_newWithUsage error: %d", result);
+    }
 }
 
 void ImageReader::TearDown() {
@@ -38,6 +41,9 @@ ANativeWindow *ImageReader::GetWindow() {
 }
 
 AHardwareBuffer *ImageReader::GetLatestBuffer() {
+    if (reader == nullptr) {
+        return nullptr;
+    }
     if (cursor == buffers.size()) {
         cursor = 0;
     }

diff --git a/vulkan/src/main/java/com/haishinkit/vulkan/VkPixelTransform.kt b/vulkan/src/main/java/com/haishinkit/vulkan/VkPixelTransform.kt
@@ -148,7 +148,7 @@ class VkPixelTransform : PixelTransform {
         format: Int,
         lambda: (surface: Surface) -> Unit
     ) {
-        lambda(nativeCreateInputSurface(width, height, format))
+        nativeCreateInputSurface(width, height, format)?.let { lambda(it) }
     }
 
     override fun dispose() {
@@ -163,7 +163,7 @@ class VkPixelTransform : PixelTransform {
     private external fun nativeSetVideoGravity(videoGravity: Int)
     private external fun nativeSetImageExtent(width: Int, height: Int)
     private external fun nativeSetAssetManager(assetManager: AssetManager?)
-    private external fun nativeCreateInputSurface(width: Int, height: Int, format: Int): Surface
+    private external fun nativeCreateInputSurface(width: Int, height: Int, format: Int): Surface?
     private external fun nativeSetRotatesWithContent(expectedOrientationSynchronize: Boolean)
     private external fun nativeSetFrameRate(frameRate: Int)
     private external fun nativeSetVideoEffect(videoEffect: VideoEffect)