diff --git a/multimedia/media/media_cpp_standard/audioDecEncNdk/include/ADecEncNdkSample.h b/multimedia/media/media_cpp_standard/audioDecEncNdk/include/ADecEncNdkSample.h index 233a7c51850b6bc70ce80451856bb5ab23697882..ea8bc106c1b3657d19d0530f6e9471ac18d3218f 100644 --- a/multimedia/media/media_cpp_standard/audioDecEncNdk/include/ADecEncNdkSample.h +++ b/multimedia/media/media_cpp_standard/audioDecEncNdk/include/ADecEncNdkSample.h @@ -32,7 +32,6 @@ #include "nocopyable.h" #include "ndktest_log.h" - namespace OHOS { namespace Media { class ADecEncSignal { diff --git a/multimedia/media/media_cpp_standard/audioDecEncNdk/include/ActsAudioDecEncNdkTest.h b/multimedia/media/media_cpp_standard/audioDecEncNdk/include/ActsAudioDecEncNdkTest.h index e6ae60ff8083c4e3e31f0b20e4013d359476cfc6..149dd75b950a717bcc8dac247177ca0d779be968 100644 --- a/multimedia/media/media_cpp_standard/audioDecEncNdk/include/ActsAudioDecEncNdkTest.h +++ b/multimedia/media/media_cpp_standard/audioDecEncNdk/include/ActsAudioDecEncNdkTest.h @@ -46,4 +46,4 @@ public: }; } } -#endif \ No newline at end of file +#endif // ACTSAUDIODECODER_NDK_FUNC_TEST_H \ No newline at end of file diff --git a/multimedia/media/media_cpp_standard/audioDecEncNdk/src/ADecEncNdkSample.cpp b/multimedia/media/media_cpp_standard/audioDecEncNdk/src/ADecEncNdkSample.cpp index e2bdf4d31a5a6082d63c6389f9b5a4c57b62be28..9b542b4ac87b604ba8befc7d7c309c37d054b472 100644 --- a/multimedia/media/media_cpp_standard/audioDecEncNdk/src/ADecEncNdkSample.cpp +++ b/multimedia/media/media_cpp_standard/audioDecEncNdk/src/ADecEncNdkSample.cpp @@ -378,7 +378,7 @@ void ADecEncNdkSample::InputFuncDec() cout << "Fatal: OH_AudioDecoder_PushInputData fail" << endl; acodecSignal_->errorNum_ += 1; } else { - decInCnt_ ++; + decInCnt_++; } timeStampDec_ += SAMPLE_DURATION_US; PopInqueueDec(); @@ -618,7 +618,7 @@ void ADecEncNdkSample::InputFuncEnc() cout << "Fatal error, exit" << endl; acodecSignal_->errorNum_ += 1; } else { - encInCnt_ ++; + encInCnt_++; } timeStampEnc_ += SAMPLE_DURATION_US; PopOutqueueDec(); @@ -685,7 +685,7 @@ void ADecEncNdkSample::OutputFuncEnc() acodecSignal_->errorNum_ += 1; } else { encOutCnt_ += 1; - cout << "ENC output cnt: "<< encOutCnt_ << endl; + cout << "ENC output cnt: " << encOutCnt_ << endl; } } PopOutqueueEnc(); @@ -703,7 +703,7 @@ void ADecEncNdkSample::ReRead() { if (testFile_ != nullptr) { testFile_->close(); - cout << "ReRead close before file success "<< endl; + cout << "ReRead close before file success " << endl; } cout << "ReRead INP_FILE is " << INP_FILE << endl; testFile_->open(INP_FILE, std::ios::in | std::ios::binary); diff --git a/multimedia/media/media_cpp_standard/include/ndktest_log.h b/multimedia/media/media_cpp_standard/include/ndktest_log.h index 14ed99e84c1565f11d555a579a757f2d51dd1d5f..a2ae49b37cbdf918036ba386a01d5c548425d9fa 100644 --- a/multimedia/media/media_cpp_standard/include/ndktest_log.h +++ b/multimedia/media/media_cpp_standard/include/ndktest_log.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -53,4 +53,4 @@ if (!(cond)) { \ (void)printf("%s\n", fmt, ##__VA_ARGS__); \ } -#endif // NDK_LOG_H \ No newline at end of file +#endif // NDKTEST_LOG_H \ No newline at end of file