commit 9bbeca903f769421ea5b65f60eaeef258b66d5a9
author Dichen Zhang <dichenzhang@google.com> Wed Apr 05 12:24:28 2023 -0700
committer Dichen Zhang <dichenzhang@google.com> Thu Apr 06 17:55:28 2023 +0000
tree 37d001012747942a0bfccd31ff094c1f7f3c7c4a
parent d881181529be32e6b8fe29b2a2ff8429e2d41302

JPEG/R Optimization: Remove memcpy for the HDR input

Bug: 264715926
Test: manual test with camera / display app
Change-Id: Ibec6a88b7678e4ce432417bb0e2b7f5d0c274c3f

services/camera/libcameraservice/api2/JpegRCompositeStream.cpp

diff --git a/services/camera/libcameraservice/api2/JpegRCompositeStream.cpp b/services/camera/libcameraservice/api2/JpegRCompositeStream.cpp
index 5794747..400f6a8 100644
--- a/services/camera/libcameraservice/api2/JpegRCompositeStream.cpp
+++ b/services/camera/libcameraservice/api2/JpegRCompositeStream.cpp
@@ -299,14 +299,8 @@
     p010.height = inputFrame.p010Buffer.height;
     p010.width = inputFrame.p010Buffer.width;
     p010.colorGamut = jpegrecoverymap::jpegr_color_gamut::JPEGR_COLORGAMUT_BT2100;
-    size_t yChannelSizeInByte = p010.width * p010.height * 2;
-    size_t uvChannelSizeInByte = p010.width * p010.height;
-    p010.data = new uint8_t[yChannelSizeInByte + uvChannelSizeInByte];
-    std::unique_ptr<uint8_t[]> p010_data;
-    p010_data.reset(reinterpret_cast<uint8_t*>(p010.data));
-    memcpy((uint8_t*)p010.data, inputFrame.p010Buffer.data, yChannelSizeInByte);
-    memcpy((uint8_t*)p010.data + yChannelSizeInByte, inputFrame.p010Buffer.dataCb,
-           uvChannelSizeInByte);
+    p010.data = inputFrame.p010Buffer.data;
+    p010.chroma_data = inputFrame.p010Buffer.dataCb;
 
     jpegR.data = dstBuffer;
     jpegR.maxLength = maxJpegRBufferSize;
@@ -367,7 +361,6 @@
     }
 
     actualJpegRSize = jpegR.length;
-    p010_data.release();
 
     size_t finalJpegRSize = actualJpegRSize + sizeof(CameraBlob);
     if (finalJpegRSize > maxJpegRBufferSize) {