From da7ff17363ea13e65ca82b7d78346e33641688f6 Mon Sep 17 00:00:00 2001 From: maoqian Date: Wed, 29 Dec 2021 09:09:14 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=E9=9D=99=E6=80=81=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20Signed-off-by:=20maoqian=20=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ai/asr/keyword_spotting/audio_cache.h | 1 - ai/asr/keyword_spotting/kws_manager.h | 6 +++--- ai/cv/image_classification/camera_manager.h | 4 ++-- ai/cv/image_classification/picture_utils.cpp | 4 ++-- ai/cv/image_classification/picture_utils.h | 10 +++++----- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/ai/asr/keyword_spotting/audio_cache.h b/ai/asr/keyword_spotting/audio_cache.h index 6e4f1a6..c651b75 100644 --- a/ai/asr/keyword_spotting/audio_cache.h +++ b/ai/asr/keyword_spotting/audio_cache.h @@ -16,7 +16,6 @@ #ifndef AUDIO_CACHE_H #define AUDIO_CACHE_H -#include #include namespace KWS { diff --git a/ai/asr/keyword_spotting/kws_manager.h b/ai/asr/keyword_spotting/kws_manager.h index 17c9b89..f77d2b9 100644 --- a/ai/asr/keyword_spotting/kws_manager.h +++ b/ai/asr/keyword_spotting/kws_manager.h @@ -31,8 +31,8 @@ #include "media_info.h" namespace KWS { -const int32_t AUDIO_SAMPLE_RATE = 16000; // 16kHz -const int32_t AUDIO_CODEC_BITRATE = 32000; // 32kHz +constexpr int32_t AUDIO_SAMPLE_RATE = 16000; // 16kHz +constexpr int32_t AUDIO_CODEC_BITRATE = 32000; // 32kHz const std::vector WORD_CONTENT = { "Hi Xiaowen", @@ -40,7 +40,7 @@ const std::vector WORD_CONTENT = { "Unknown" }; -enum KwsStatus { +enum KwsStatus : int { IDLE = 1000, PREPARED, RUNNING, diff --git a/ai/cv/image_classification/camera_manager.h b/ai/cv/image_classification/camera_manager.h index 664a716..37dc8e5 100644 --- a/ai/cv/image_classification/camera_manager.h +++ b/ai/cv/image_classification/camera_manager.h @@ -40,8 +40,8 @@ namespace IC { // Settings of camera -const int32_t CAMERA_PIC_WIDTH = 1920; -const int32_t CAMERA_PIC_HEIGHT = 1080; +constexpr int32_t CAMERA_PIC_WIDTH = 1920; +constexpr int32_t CAMERA_PIC_HEIGHT = 1080; const std::string CAMERA_SAVE_PATH = "/storage/Capture.jpg"; // condition_variable for camera diff --git a/ai/cv/image_classification/picture_utils.cpp b/ai/cv/image_classification/picture_utils.cpp index c6b222c..36af8d0 100644 --- a/ai/cv/image_classification/picture_utils.cpp +++ b/ai/cv/image_classification/picture_utils.cpp @@ -59,7 +59,7 @@ int WriteJpegFile(const string &filename, int quality, } jpeg_finish_compress(&cinfo); - fclose(outfile); + (void)fclose(outfile); jpeg_destroy_compress(&cinfo); return IC_RETCODE_SUCCESS; } @@ -135,7 +135,7 @@ uint8_t *ReadJpegFile(const string &filename, int &srcWidth, int &srcHeight) (void)jpeg_finish_decompress(&cinfo); jpeg_destroy_decompress(&cinfo); - fclose(infile); + (void)fclose(infile); return buffer; } diff --git a/ai/cv/image_classification/picture_utils.h b/ai/cv/image_classification/picture_utils.h index dad7381..00b4046 100644 --- a/ai/cv/image_classification/picture_utils.h +++ b/ai/cv/image_classification/picture_utils.h @@ -32,14 +32,14 @@ struct MyErrorMgr { using MyErrorPtr = MyErrorMgr *; // The index order of BGR format -enum BgrIndex { +enum BgrIndex : int { BGR_BLUE = 0, BGR_GREEN, BGR_RED, }; // The index order of RGB format -enum RgbIndex { +enum RgbIndex : int { RGB_RED = 0, RGB_GREEN, RGB_BLUE, @@ -55,9 +55,9 @@ struct PicInfo { // Change this to your own settings const std::string JPEG_SRC_PATH = "/storage/data/image_classification_demo.jpg"; -const int WIDTH_DEST = 224; -const int HEIGHT_DEST = 224; -const int NUM_CHANNELS = 3; +constexpr int WIDTH_DEST = 224; +constexpr int HEIGHT_DEST = 224; +constexpr int NUM_CHANNELS = 3; int WriteJpegFile(const std::string &filename, int quality, uint8_t *srcBuffer, int srcWidth, int srcHeight); int WriteBgrFile(const std::string &filename, uint8_t *dataBuffer, int bufferSize); -- Gitee From 79adb030578114aac1a75d6e463e941c5d9ef67b Mon Sep 17 00:00:00 2001 From: maoqian Date: Thu, 30 Dec 2021 02:24:31 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=99=E6=80=81?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=20Signed-off-by:=20maoqian=20=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ai/asr/keyword_spotting/audio_cache.h | 2 -- ai/cv/image_classification/picture_utils.h | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ai/asr/keyword_spotting/audio_cache.h b/ai/asr/keyword_spotting/audio_cache.h index c651b75..9665663 100644 --- a/ai/asr/keyword_spotting/audio_cache.h +++ b/ai/asr/keyword_spotting/audio_cache.h @@ -16,8 +16,6 @@ #ifndef AUDIO_CACHE_H #define AUDIO_CACHE_H -#include - namespace KWS { class AudioCache { public: diff --git a/ai/cv/image_classification/picture_utils.h b/ai/cv/image_classification/picture_utils.h index 00b4046..d3f0a77 100644 --- a/ai/cv/image_classification/picture_utils.h +++ b/ai/cv/image_classification/picture_utils.h @@ -55,9 +55,9 @@ struct PicInfo { // Change this to your own settings const std::string JPEG_SRC_PATH = "/storage/data/image_classification_demo.jpg"; -constexpr int WIDTH_DEST = 224; -constexpr int HEIGHT_DEST = 224; -constexpr int NUM_CHANNELS = 3; +static constexpr int WIDTH_DEST = 224; +static constexpr int HEIGHT_DEST = 224; +static constexpr int NUM_CHANNELS = 3; int WriteJpegFile(const std::string &filename, int quality, uint8_t *srcBuffer, int srcWidth, int srcHeight); int WriteBgrFile(const std::string &filename, uint8_t *dataBuffer, int bufferSize); -- Gitee From 02a8f5c6bd2db090534bee1015dc973a37e7faae Mon Sep 17 00:00:00 2001 From: maoqian Date: Thu, 30 Dec 2021 02:49:53 +0000 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=99=E6=80=81?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=97=AE=E9=A2=98=20Signed-off-by:=20maoqian?= =?UTF-8?q?=20=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ai/cv/image_classification/image_classification_sample.cpp | 4 ++++ ai/cv/image_classification/picture_utils.cpp | 2 ++ ai/cv/image_classification/picture_utils.h | 3 --- ai/cv/image_classification/resize_computer.cpp | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ai/cv/image_classification/image_classification_sample.cpp b/ai/cv/image_classification/image_classification_sample.cpp index d24097e..20054ca 100644 --- a/ai/cv/image_classification/image_classification_sample.cpp +++ b/ai/cv/image_classification/image_classification_sample.cpp @@ -27,6 +27,10 @@ using namespace OHOS::AI; using namespace OHOS::Media; namespace { +const int WIDTH_DEST = 224; +const int HEIGHT_DEST = 224; +const int NUM_CHANNELS = 3; + const auto DELETE_PIC_BUFFER = [](uint8_t *&buffer) { if (buffer != nullptr) { delete[] buffer; diff --git a/ai/cv/image_classification/picture_utils.cpp b/ai/cv/image_classification/picture_utils.cpp index 36af8d0..e504ebd 100644 --- a/ai/cv/image_classification/picture_utils.cpp +++ b/ai/cv/image_classification/picture_utils.cpp @@ -25,6 +25,8 @@ using namespace std; namespace IC { +const int NUM_CHANNELS = 3; + int WriteJpegFile(const string &filename, int quality, uint8_t *srcBuffer, int srcWidth, int srcHeight) { diff --git a/ai/cv/image_classification/picture_utils.h b/ai/cv/image_classification/picture_utils.h index d3f0a77..c0c7369 100644 --- a/ai/cv/image_classification/picture_utils.h +++ b/ai/cv/image_classification/picture_utils.h @@ -55,9 +55,6 @@ struct PicInfo { // Change this to your own settings const std::string JPEG_SRC_PATH = "/storage/data/image_classification_demo.jpg"; -static constexpr int WIDTH_DEST = 224; -static constexpr int HEIGHT_DEST = 224; -static constexpr int NUM_CHANNELS = 3; int WriteJpegFile(const std::string &filename, int quality, uint8_t *srcBuffer, int srcWidth, int srcHeight); int WriteBgrFile(const std::string &filename, uint8_t *dataBuffer, int bufferSize); diff --git a/ai/cv/image_classification/resize_computer.cpp b/ai/cv/image_classification/resize_computer.cpp index c119b5c..1d712b8 100644 --- a/ai/cv/image_classification/resize_computer.cpp +++ b/ai/cv/image_classification/resize_computer.cpp @@ -18,6 +18,7 @@ namespace IC { const int RESIZE_CONSTANT = 2; +const int NUM_CHANNELS = 3; ResizeComputer::ResizeComputer(const PicInfo &pInfo) { -- Gitee