From 941794e11185af8a9e9ce2cbcf71f61e7cac21d2 Mon Sep 17 00:00:00 2001 From: yangpeng Date: Sat, 27 May 2023 11:52:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=E3=80=91=E9=9F=B3=E9=A2=91=E4=BB=A3=E7=A0=81=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangpeng --- test/nativedemo/audio_demo/avcodec_audio_aac_encoder_demo.cpp | 2 ++ test/nativedemo/audio_demo/avcodec_audio_flac_encoder_demo.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/test/nativedemo/audio_demo/avcodec_audio_aac_encoder_demo.cpp b/test/nativedemo/audio_demo/avcodec_audio_aac_encoder_demo.cpp index 88ea11ba6..067934520 100644 --- a/test/nativedemo/audio_demo/avcodec_audio_aac_encoder_demo.cpp +++ b/test/nativedemo/audio_demo/avcodec_audio_aac_encoder_demo.cpp @@ -116,6 +116,8 @@ void AEncAacDemo::RunCase() AEncAacDemo::AEncAacDemo() { + signal_ = nullptr; + audioEnc_ = nullptr; frameCount_ = 0; isRunning_ = false; inputFile_ = std::make_unique(inputFilePath, std::ios::binary); diff --git a/test/nativedemo/audio_demo/avcodec_audio_flac_encoder_demo.cpp b/test/nativedemo/audio_demo/avcodec_audio_flac_encoder_demo.cpp index 36f76720b..db21d547f 100644 --- a/test/nativedemo/audio_demo/avcodec_audio_flac_encoder_demo.cpp +++ b/test/nativedemo/audio_demo/avcodec_audio_flac_encoder_demo.cpp @@ -118,6 +118,8 @@ void AEncFlacDemo::RunCase() AEncFlacDemo::AEncFlacDemo() { + signal_ = nullptr; + audioEnc_ = nullptr; frameCount_ = 0; isRunning_ = false; inputFile_ = std::make_unique(INPUT_FILE_PATH, std::ios::binary); -- Gitee From c25c31ee57105935cb3482578a92dfec078c3f81 Mon Sep 17 00:00:00 2001 From: yangpeng Date: Sat, 27 May 2023 18:38:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=E3=80=91=E4=BF=AE=E6=94=B9constexpr=E5=90=8E=E7=9A=84?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangpeng --- .../avcodec_audio_aac_encoder_demo.cpp | 18 +++++++++--------- .../audio_demo/avcodec_audio_decoder_demo.cpp | 2 +- .../avcodec_audio_flac_encoder_demo.cpp | 8 ++++---- .../audio_decoder_capi_unit_test.cpp | 6 +++--- .../audio_encoder_capi_unit_test.cpp | 8 ++++---- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/test/nativedemo/audio_demo/avcodec_audio_aac_encoder_demo.cpp b/test/nativedemo/audio_demo/avcodec_audio_aac_encoder_demo.cpp index 067934520..84f1e0706 100644 --- a/test/nativedemo/audio_demo/avcodec_audio_aac_encoder_demo.cpp +++ b/test/nativedemo/audio_demo/avcodec_audio_aac_encoder_demo.cpp @@ -39,8 +39,8 @@ constexpr uint32_t CHANNEL_LAYOUT = 3; constexpr int32_t SAMPLE_FORMAT = 8; constexpr int32_t INPUT_FRAME_BYTES = 2 * 1024 * 4; -constexpr string_view inputFilePath = "/data/media/test_fltp.pcm"; -constexpr string_view outputFilePath = "/data/media/encode2.aac"; +constexpr string_view INPUT_FILE_PATH = "/data/media/test_fltp.pcm"; +constexpr string_view OUTPUT_FILE_PATH = "/data/media/encode2.aac"; } // namespace static void OnError(OH_AVCodec *codec, int32_t errorCode, void *userData) @@ -115,12 +115,12 @@ void AEncAacDemo::RunCase() } AEncAacDemo::AEncAacDemo() + : isRunning_(false), + audioEnc_(nullptr), + signal_(nullptr), + frameCount_(0) { - signal_ = nullptr; - audioEnc_ = nullptr; - frameCount_ = 0; - isRunning_ = false; - inputFile_ = std::make_unique(inputFilePath, std::ios::binary); + inputFile_ = std::make_unique(INPUT_FILE_PATH, std::ios::binary); } AEncAacDemo::~AEncAacDemo() @@ -265,9 +265,9 @@ void AEncAacDemo::InputFunc() void AEncAacDemo::OutputFunc() { std::ofstream outputFile; - outputFile.open(outputFilePath.data(), std::ios::out | std::ios::binary); + outputFile.open(OUTPUT_FILE_PATH.data(), std::ios::out | std::ios::binary); if (!outputFile.is_open()) { - std::cout << "open " << outputFilePath << " failed!" << std::endl; + std::cout << "open " << OUTPUT_FILE_PATH << " failed!" << std::endl; } while (true) { diff --git a/test/nativedemo/audio_demo/avcodec_audio_decoder_demo.cpp b/test/nativedemo/audio_demo/avcodec_audio_decoder_demo.cpp index 15b93738d..13aed7c68 100644 --- a/test/nativedemo/audio_demo/avcodec_audio_decoder_demo.cpp +++ b/test/nativedemo/audio_demo/avcodec_audio_decoder_demo.cpp @@ -155,7 +155,7 @@ void ADecDemo::RunCase(AudioFormatType audioType) DEMO_CHECK_AND_RETURN_LOG(Release() == AVCS_ERR_OK, "Fatal: Release fail"); } -ADecDemo::ADecDemo() : audioDec_(nullptr), signal_(nullptr) {} +ADecDemo::ADecDemo() : audioDec_(nullptr), signal_(nullptr), audioType_(TYPE_AAC) {} ADecDemo::~ADecDemo() { diff --git a/test/nativedemo/audio_demo/avcodec_audio_flac_encoder_demo.cpp b/test/nativedemo/audio_demo/avcodec_audio_flac_encoder_demo.cpp index db21d547f..bb4ad3c30 100644 --- a/test/nativedemo/audio_demo/avcodec_audio_flac_encoder_demo.cpp +++ b/test/nativedemo/audio_demo/avcodec_audio_flac_encoder_demo.cpp @@ -117,11 +117,11 @@ void AEncFlacDemo::RunCase() } AEncFlacDemo::AEncFlacDemo() + : isRunning_(false), + audioEnc_(nullptr), + signal_(nullptr), + frameCount_(0) { - signal_ = nullptr; - audioEnc_ = nullptr; - frameCount_ = 0; - isRunning_ = false; inputFile_ = std::make_unique(INPUT_FILE_PATH, std::ios::binary); } diff --git a/test/unittest/audio_test/audio_decoder_capi_unit_test.cpp b/test/unittest/audio_test/audio_decoder_capi_unit_test.cpp index eb7287fc8..be7e6e69d 100644 --- a/test/unittest/audio_test/audio_decoder_capi_unit_test.cpp +++ b/test/unittest/audio_test/audio_decoder_capi_unit_test.cpp @@ -59,7 +59,7 @@ constexpr uint32_t DEFAULT_BITRATE = 134000; constexpr uint32_t DEFAULT_BITS_PER_CODED_RATE = 16; constexpr uint32_t FRAME_DURATION_US = 33000; constexpr string_view inputFilePath = "/data/test441_2_noid3.mp3"; -constexpr string_view outputFilePath = "/data/audioOut.pcm"; +constexpr string_view OUTPUT_FILE_PATH = "/data/audioOut.pcm"; } // namespace namespace OHOS { @@ -244,9 +244,9 @@ void AudioCodeCapiDecoderUnitTest::InputFunc() void AudioCodeCapiDecoderUnitTest::OutputFunc() { std::ofstream pcmFile; - pcmFile.open(outputFilePath.data(), std::ios::out | std::ios::binary); + pcmFile.open(OUTPUT_FILE_PATH.data(), std::ios::out | std::ios::binary); if (!pcmFile.is_open()) { - std::cout << "open " << outputFilePath << " failed!" << std::endl; + std::cout << "open " << OUTPUT_FILE_PATH << " failed!" << std::endl; } while (true) { if (!isRunning_.load()) { diff --git a/test/unittest/audio_test/audio_encoder_capi_unit_test.cpp b/test/unittest/audio_test/audio_encoder_capi_unit_test.cpp index 5c816cd20..278a2085d 100644 --- a/test/unittest/audio_test/audio_encoder_capi_unit_test.cpp +++ b/test/unittest/audio_test/audio_encoder_capi_unit_test.cpp @@ -49,8 +49,8 @@ constexpr int32_t SAMPLE_FORMAT = 1; constexpr uint32_t FRAME_BYTES = 18432; constexpr int32_t COMPLIANCE_LEVEL = -2; -constexpr string_view inputFilePath = "/data/encoderTest.pcm"; -constexpr string_view outputFilePath = "/data/encoderTest.flac"; +constexpr string_view INPUT_FILE_PATH = "/data/encoderTest.pcm"; +constexpr string_view OUTPUT_FILE_PATH = "/data/encoderTest.flac"; } // namespace namespace OHOS { @@ -133,7 +133,7 @@ public: protected: std::atomic isRunning_ = false; - std::unique_ptr inputFile_ = std::make_unique(inputFilePath, std::ios::binary); + std::unique_ptr inputFile_ = std::make_unique(INPUT_FILE_PATH, std::ios::binary); std::unique_ptr inputLoop_; std::unique_ptr outputLoop_; int32_t index_; @@ -222,7 +222,7 @@ void AudioCodeCapiEncoderUnitTest::InputFunc() void AudioCodeCapiEncoderUnitTest::OutputFunc() { std::ofstream outputFile; - outputFile.open(outputFilePath.data(), std::ios::out | std::ios::binary); + outputFile.open(OUTPUT_FILE_PATH.data(), std::ios::out | std::ios::binary); while (true) { if (!isRunning_.load()) { -- Gitee