From 596a7564d738a34553ff81f19e139f6235d82008 Mon Sep 17 00:00:00 2001 From: Dichen Zhang Date: Wed, 12 Oct 2022 14:57:05 -0700 Subject: Minor changes Changed data input/output types (add compressed/uncompressed struct). Fixed typos in some places (jpeg_g to jpeg_r). Bug: b/252835416 Change-Id: Ibc9d4c24108417a528052bda64c718e365421e28 --- libs/jpegrecoverymap/recoverymap.cpp | 51 +++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 21 deletions(-) (limited to 'libs/jpegrecoverymap/recoverymap.cpp') diff --git a/libs/jpegrecoverymap/recoverymap.cpp b/libs/jpegrecoverymap/recoverymap.cpp index 3e95a31871..bd92652368 100644 --- a/libs/jpegrecoverymap/recoverymap.cpp +++ b/libs/jpegrecoverymap/recoverymap.cpp @@ -18,46 +18,54 @@ namespace android::recoverymap { -void* RecoveryMap::decodeRecoveryMap(void* compressed_recovery_map) { - if (compressed_recovery_map == nullptr) { - return nullptr; +bool RecoveryMap::decodeRecoveryMap(j_r_compressed_ptr compressed_recovery_map, + j_r_uncompressed_ptr dest) { + if (compressed_recovery_map == nullptr || dest == nullptr) { + return false; } // TBD - return nullptr; + return true; } -void* RecoveryMap::encodeRecoveryMap(void* uncompressed_recovery_map) { - if (uncompressed_recovery_map == nullptr) { - return nullptr; +bool RecoveryMap::encodeRecoveryMap(j_r_uncompressed_ptr uncompressed_recovery_map, + j_r_compressed_ptr dest) { + if (uncompressed_recovery_map == nullptr || dest == nullptr) { + return false; } // TBD - return nullptr; + return true; } -void* RecoveryMap::generateRecoveryMap( - void* uncompressed_yuv_420_image, void* uncompressed_p010_image) { - if (uncompressed_yuv_420_image == nullptr || uncompressed_p010_image == nullptr) { - return nullptr; +bool RecoveryMap::generateRecoveryMap(j_r_uncompressed_ptr uncompressed_yuv_420_image, + j_r_uncompressed_ptr uncompressed_p010_image, + j_r_uncompressed_ptr dest) { + if (uncompressed_yuv_420_image == nullptr + || uncompressed_p010_image == nullptr + || dest == nullptr) { + return false; } // TBD - return nullptr; + return true; } -void* RecoveryMap::applyRecoveryMap( - void* uncompressed_yuv_420_image, void* uncompressed_recovery_map) { - if (uncompressed_yuv_420_image == nullptr || uncompressed_recovery_map == nullptr) { - return nullptr; +bool RecoveryMap::applyRecoveryMap(j_r_uncompressed_ptr uncompressed_yuv_420_image, + j_r_uncompressed_ptr uncompressed_recovery_map, + j_r_uncompressed_ptr dest) { + if (uncompressed_yuv_420_image == nullptr + || uncompressed_recovery_map == nullptr + || dest == nullptr) { + return false; } // TBD - return nullptr; + return true; } -void* RecoveryMap::extractRecoveryMap(void* compressed_jpeg_g_image) { - if (compressed_jpeg_g_image == nullptr) { +j_r_compressed_ptr RecoveryMap::extractRecoveryMap(void* compressed_jpeg_r_image) { + if (compressed_jpeg_r_image == nullptr) { return nullptr; } @@ -65,7 +73,8 @@ void* RecoveryMap::extractRecoveryMap(void* compressed_jpeg_g_image) { return nullptr; } -void* RecoveryMap::appendRecoveryMap(void* compressed_jpeg_image, void* compressed_recovery_map) { +void* RecoveryMap::appendRecoveryMap(void* compressed_jpeg_image, + j_r_compressed_ptr compressed_recovery_map) { if (compressed_jpeg_image == nullptr || compressed_recovery_map == nullptr) { return nullptr; } -- cgit v1.2.3-59-g8ed1b