From eabbd8a1426873036d19124712d46c3176ecef96 Mon Sep 17 00:00:00 2001 From: wangchaole Date: Thu, 9 Jun 2022 10:53:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?codex=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangchaole --- camera_hdf/hdi_impl/src/utils/dcamera.cpp | 36 +++++++++++++---------- common/src/utils/dcamera_utils_tools.cpp | 36 +++++++++++++---------- 2 files changed, 42 insertions(+), 30 deletions(-) diff --git a/camera_hdf/hdi_impl/src/utils/dcamera.cpp b/camera_hdf/hdi_impl/src/utils/dcamera.cpp index bd57277..7d3859f 100644 --- a/camera_hdf/hdi_impl/src/utils/dcamera.cpp +++ b/camera_hdf/hdi_impl/src/utils/dcamera.cpp @@ -18,9 +18,15 @@ namespace OHOS { namespace DistributedHardware { -const int OFFSET2 = 2; -const int OFFSET4 = 4; -const int OFFSET6 = 6; +const uint32_t OFFSET2 = 2; +const uint32_t OFFSET4 = 4; +const uint32_t OFFSET6 = 6; +const uint8_t PARAM_FC = 0xfc; +const uint8_t PARAM_03 = 0x03; +const uint8_t PARAM_F0 = 0xf0: +const uint8_t PARAM_0F = 0x0f; +const uint8_t PARAM_C0 = 0xc0; +const uint8_t PARAM_3F = 0x3f; const int INDEX_FIRST = 0; const int INDEX_SECOND = 1; const int INDEX_THIRD = 2; @@ -103,12 +109,12 @@ std::string Base64Encode(const unsigned char *toEncode, unsigned int len) while (len--) { charArray3[i++] = *(toEncode++); if (i == sizeof(charArray3)) { - charArray4[INDEX_FIRST] = (charArray3[INDEX_FIRST] & 0xfc) >> OFFSET2; - charArray4[INDEX_SECOND] = ((charArray3[INDEX_FIRST] & 0x03) << OFFSET4) + - ((charArray3[INDEX_SECOND] & 0xf0) >> OFFSET4); - charArray4[INDEX_THIRD] = ((charArray3[INDEX_SECOND] & 0x0f) << OFFSET2) + - ((charArray3[INDEX_THIRD] & 0xc0) >> OFFSET6); - charArray4[INDEX_FORTH] = charArray3[INDEX_THIRD] & 0x3f; + charArray4[INDEX_FIRST] = (charArray3[INDEX_FIRST] & PARAM_FC) >> OFFSET2; + charArray4[INDEX_SECOND] = ((charArray3[INDEX_FIRST] & PARAM_03 << OFFSET4) + + ((charArray3[INDEX_SECOND] & PARAM_F0) >> OFFSET4); + charArray4[INDEX_THIRD] = ((charArray3[INDEX_SECOND] & PARAM_0F) << OFFSET2) + + ((charArray3[INDEX_THIRD] & PARAM_C0) >> OFFSET6); + charArray4[INDEX_FORTH] = charArray3[INDEX_THIRD] & PARAM_3F; for (i = 0; i < sizeof(charArray4); i++) { ret += BASE_64_CHARS[charArray4[i]]; } @@ -121,12 +127,12 @@ std::string Base64Encode(const unsigned char *toEncode, unsigned int len) for (j = i; j < sizeof(charArray3); j++) { charArray3[j] = '\0'; } - charArray4[INDEX_FIRST] = (charArray3[INDEX_FIRST] & 0xfc) >> OFFSET2; - charArray4[INDEX_SECOND] = ((charArray3[INDEX_FIRST] & 0x03) << OFFSET4) + - ((charArray3[INDEX_SECOND] & 0xf0) >> OFFSET4); - charArray4[INDEX_THIRD] = ((charArray3[INDEX_SECOND] & 0x0f) << OFFSET2) + - ((charArray3[INDEX_THIRD] & 0xc0) >> OFFSET6); - charArray4[INDEX_FORTH] = charArray3[INDEX_THIRD] & 0x3f; + charArray4[INDEX_FIRST] = (charArray3[INDEX_FIRST] & PARAM_FC) >> OFFSET2; + charArray4[INDEX_SECOND] = ((charArray3[INDEX_FIRST] & PARAM_03) << OFFSET4) + + ((charArray3[INDEX_SECOND] & PARAM_F0) >> OFFSET4); + charArray4[INDEX_THIRD] = ((charArray3[INDEX_SECOND] & PARAM_0F) << OFFSET2) + + ((charArray3[INDEX_THIRD] & PARAM_C0) >> OFFSET6); + charArray4[INDEX_FORTH] = charArray3[INDEX_THIRD] & PARAM_3F; for (j = 0; j < i + 1; j++) { ret += BASE_64_CHARS[charArray4[j]]; } diff --git a/common/src/utils/dcamera_utils_tools.cpp b/common/src/utils/dcamera_utils_tools.cpp index ae03d8f..abee175 100644 --- a/common/src/utils/dcamera_utils_tools.cpp +++ b/common/src/utils/dcamera_utils_tools.cpp @@ -23,9 +23,15 @@ namespace OHOS { namespace DistributedHardware { -const int OFFSET2 = 2; -const int OFFSET4 = 4; -const int OFFSET6 = 6; +const uint32_t OFFSET2 = 2; +const uint32_t OFFSET4 = 4; +const uint32_t OFFSET6 = 6; +const uint8_t PARAM_FC = 0xfc; +const uint8_t PARAM_03 = 0x03; +const uint8_t PARAM_F0 = 0xf0; +const uint8_t PARAM_0F = 0x0f; +const uint8_t PARAM_C0 = 0xc0; +const uint8_t PARAM_3F = 0x3f; const int INDEX_FIRST = 0; const int INDEX_SECOND = 1; const int INDEX_THIRD = 2; @@ -77,12 +83,12 @@ std::string Base64Encode(const unsigned char *toEncode, unsigned int len) while (len--) { charArray3[i++] = *(toEncode++); if (i == sizeof(charArray3)) { - charArray4[INDEX_FIRST] = (charArray3[INDEX_FIRST] & 0xfc) >> OFFSET2; - charArray4[INDEX_SECOND] = ((charArray3[INDEX_FIRST] & 0x03) << OFFSET4) + - ((charArray3[INDEX_SECOND] & 0xf0) >> OFFSET4); - charArray4[INDEX_THIRD] = ((charArray3[INDEX_SECOND] & 0x0f) << OFFSET2) + - ((charArray3[INDEX_THIRD] & 0xc0) >> OFFSET6); - charArray4[INDEX_FORTH] = charArray3[INDEX_THIRD] & 0x3f; + charArray4[INDEX_FIRST] = (charArray3[INDEX_FIRST] & PARAM_FC) >> OFFSET2; + charArray4[INDEX_SECOND] = ((charArray3[INDEX_FIRST] & PARAM_03) << OFFSET4) + + ((charArray3[INDEX_SECOND] & PARAM_F0) >> OFFSET4); + charArray4[INDEX_THIRD] = ((charArray3[INDEX_SECOND] & PARAM_0F) << OFFSET2) + + ((charArray3[INDEX_THIRD] & PARAM_C0) >> OFFSET6); + charArray4[INDEX_FORTH] = charArray3[INDEX_THIRD] & PARAM_3F; for (i = 0; i < sizeof(charArray4); i++) { ret += BASE_64_CHARS[charArray4[i]]; } @@ -95,12 +101,12 @@ std::string Base64Encode(const unsigned char *toEncode, unsigned int len) for (j = i; j < sizeof(charArray3); j++) { charArray3[j] = '\0'; } - charArray4[INDEX_FIRST] = (charArray3[INDEX_FIRST] & 0xfc) >> OFFSET2; - charArray4[INDEX_SECOND] = ((charArray3[INDEX_FIRST] & 0x03) << OFFSET4) + - ((charArray3[INDEX_SECOND] & 0xf0) >> OFFSET4); - charArray4[INDEX_THIRD] = ((charArray3[INDEX_SECOND] & 0x0f) << OFFSET2) + - ((charArray3[INDEX_THIRD] & 0xc0) >> OFFSET6); - charArray4[INDEX_FORTH] = charArray3[INDEX_THIRD] & 0x3f; + charArray4[INDEX_FIRST] = (charArray3[INDEX_FIRST] & PARAM_FC) >> OFFSET2; + charArray4[INDEX_SECOND] = ((charArray3[INDEX_FIRST] & PARAM_03) << OFFSET4) + + ((charArray3[INDEX_SECOND] & PARAM_F0) >> OFFSET4); + charArray4[INDEX_THIRD] = ((charArray3[INDEX_SECOND] & PARAM_0F) << OFFSET2) + + ((charArray3[INDEX_THIRD] & PARAM_C0) >> OFFSET6); + charArray4[INDEX_FORTH] = charArray3[INDEX_THIRD] & PARAM_3F; for (j = 0; j < i + 1; j++) { ret += BASE_64_CHARS[charArray4[j]]; } From 13cc11b18c31935785f9b6b9cf3a54ded3514d3b Mon Sep 17 00:00:00 2001 From: wangchaole Date: Thu, 9 Jun 2022 11:10:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?codex=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangchaole --- camera_hdf/hdi_impl/src/utils/dcamera.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camera_hdf/hdi_impl/src/utils/dcamera.cpp b/camera_hdf/hdi_impl/src/utils/dcamera.cpp index 7d3859f..96183ec 100644 --- a/camera_hdf/hdi_impl/src/utils/dcamera.cpp +++ b/camera_hdf/hdi_impl/src/utils/dcamera.cpp @@ -23,7 +23,7 @@ const uint32_t OFFSET4 = 4; const uint32_t OFFSET6 = 6; const uint8_t PARAM_FC = 0xfc; const uint8_t PARAM_03 = 0x03; -const uint8_t PARAM_F0 = 0xf0: +const uint8_t PARAM_F0 = 0xf0; const uint8_t PARAM_0F = 0x0f; const uint8_t PARAM_C0 = 0xc0; const uint8_t PARAM_3F = 0x3f; From a0812d0380ccdd14652e0723aa6546ce6075037c Mon Sep 17 00:00:00 2001 From: wangchaole Date: Thu, 9 Jun 2022 11:25:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?codex=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangchaole --- camera_hdf/hdi_impl/src/utils/dcamera.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camera_hdf/hdi_impl/src/utils/dcamera.cpp b/camera_hdf/hdi_impl/src/utils/dcamera.cpp index 96183ec..b8e31f6 100644 --- a/camera_hdf/hdi_impl/src/utils/dcamera.cpp +++ b/camera_hdf/hdi_impl/src/utils/dcamera.cpp @@ -110,7 +110,7 @@ std::string Base64Encode(const unsigned char *toEncode, unsigned int len) charArray3[i++] = *(toEncode++); if (i == sizeof(charArray3)) { charArray4[INDEX_FIRST] = (charArray3[INDEX_FIRST] & PARAM_FC) >> OFFSET2; - charArray4[INDEX_SECOND] = ((charArray3[INDEX_FIRST] & PARAM_03 << OFFSET4) + + charArray4[INDEX_SECOND] = ((charArray3[INDEX_FIRST] & PARAM_03) << OFFSET4) + ((charArray3[INDEX_SECOND] & PARAM_F0) >> OFFSET4); charArray4[INDEX_THIRD] = ((charArray3[INDEX_SECOND] & PARAM_0F) << OFFSET2) + ((charArray3[INDEX_THIRD] & PARAM_C0) >> OFFSET6);