diff --git a/frameworks/js/napi/asrcontroller/napi_asr_processing_controller.cpp b/frameworks/js/napi/asrcontroller/napi_asr_processing_controller.cpp index 8a9e6aebfc85a675af83f018ee66de927ba96f95..5fc19d60b5724f7fa2c1d1a07d36fa8a4f8149a4 100644 --- a/frameworks/js/napi/asrcontroller/napi_asr_processing_controller.cpp +++ b/frameworks/js/napi/asrcontroller/napi_asr_processing_controller.cpp @@ -27,7 +27,7 @@ #include "audio_common_log.h" #include "napi_audio_capturer.h" -namespace OHOS { +namespace OHOS { namespace AudioStandard { using namespace std; using namespace HiviewDFX; diff --git a/services/audio_engine/test/unittest/manager/hpae_render_manager_test.cpp b/services/audio_engine/test/unittest/manager/hpae_render_manager_test.cpp index 708baccf79c6f3c7f8749036cd967a34da731bdd..a3588528352cbecd82ef378a9b88359fba650b63 100644 --- a/services/audio_engine/test/unittest/manager/hpae_render_manager_test.cpp +++ b/services/audio_engine/test/unittest/manager/hpae_render_manager_test.cpp @@ -1174,44 +1174,4 @@ HWTEST_F(HpaeRendererManagerTest, RefreshProcessClusterByDevice_004, TestSize.Le EXPECT_EQ(hpaeRendererManager->DeInit() == SUCCESS, true); EXPECT_EQ(hpaeRendererManager->IsInit(), false); } - -/** - * @tc.name: DisConnectInputCluster - * @tc.type: FUNC - * @tc.number: DisConnectInputCluster_001 - * @tc.desc: Test DisConnectInputCluster - */ -HWTEST_F(HpaeRendererManagerTest, DisConnectInputCluster_001, TestSize.Level0) -{ - HpaeSinkInfo sinkInfo; - sinkInfo.deviceNetId = DEFAULT_TEST_DEVICE_NETWORKID; - sinkInfo.deviceClass = DEFAULT_TEST_DEVICE_CLASS; - sinkInfo.adapterName = DEFAULT_TEST_DEVICE_CLASS; - sinkInfo.filePath = g_rootPath + "constructHpaeRendererManagerTest.pcm"; - sinkInfo.frameLen = FRAME_LENGTH_960; - sinkInfo.samplingRate = SAMPLE_RATE_48000; - sinkInfo.format = SAMPLE_F32LE; - sinkInfo.channels = STEREO; - sinkInfo.deviceType = DEVICE_TYPE_SPEAKER; - std::shared_ptr hpaeRendererManager = std::make_shared(sinkInfo); - EXPECT_EQ(hpaeRendererManager->Init(), SUCCESS); - WaitForMsgProcessing(hpaeRendererManager); - EXPECT_EQ(hpaeRendererManager->IsInit(), true); - - HpaeStreamInfo streamInfo; - streamInfo.effectInfo.effectScene = SCENE_MUSIC; - streamInfo.effectInfo.effectMode = EFFECT_DEFAULT; - TestRendererManagerCreateStream(hpaeRendererManager, streamInfo); - HpaeNodeInfo nodeInfo; - nodeInfo.sessionId = TEST_STREAM_SESSION_ID; - nodeInfo.effectInfo.effectScene = SCENE_MUSIC; - nodeInfo.effectInfo.effectMode = EFFECT_DEFAULT; - nodeInfo.sceneType = HPAE_SCENE_MUSIC; - hpaeRendererManager->sinkInputNodeMap_[nodeInfo.sessionId] = std::make_shared(nodeInfo); - hpaeRendererManager->DisConnectInputCluster(TEST_STREAM_SESSION_ID, HPAE_SCENE_MUSIC); - hpaeRendererManager->OnDisConnectProcessCluster(HPAE_SCENE_DEFAULT); - WaitForMsgProcessing(hpaeRendererManager); - EXPECT_EQ(hpaeRendererManager->DeInit() == SUCCESS, true); - EXPECT_EQ(hpaeRendererManager->IsInit(), false); -} } // namespace \ No newline at end of file diff --git a/services/audio_engine/test/unittest/node/hpae_capture_effect_node_test.cpp b/services/audio_engine/test/unittest/node/hpae_capture_effect_node_test.cpp index 1be011be384c304280351cc5f75f82a8abd11aa1..c457f45ff1536c7c7facd5f0d4ce19eb5268b46a 100644 --- a/services/audio_engine/test/unittest/node/hpae_capture_effect_node_test.cpp +++ b/services/audio_engine/test/unittest/node/hpae_capture_effect_node_test.cpp @@ -162,22 +162,8 @@ HWTEST_F(HpaeCaptureEffectNodeTest, HpaeCaptureEffectNodeTest_002, TestSize.Leve hpaeSourceInputCluster->CapturerSourceInit(attr); hpaeSourceInputCluster->CapturerSourceStart(); - uint64_t requestBytes = nodeInfo.frameLen * nodeInfo.channels * GetSizeFromFormat(nodeInfo.format); - uint64_t replyBytes = 0; - std::vector testData(requestBytes); - TestCapturerSourceFrame(testData.data(), requestBytes, replyBytes); - std::vector testDataFloat(requestBytes / SAMPLE_F32LE); - ConvertToFloat(nodeInfo.format, nodeInfo.channels * nodeInfo.frameLen, testData.data(), testDataFloat.data()); - hpaeCaptureEffectNode->DoProcess(); - OutputPort *outputPort = hpaeCaptureEffectNode->GetOutputPort(); - HpaePcmBuffer* outPcmBuffer = outputPort->PullOutputData(); - float* outputPcmData = outPcmBuffer->GetPcmDataBuffer(); - for (int32_t i = 0; i < requestBytes / SAMPLE_F32LE; i++) { - float diff = outputPcmData[i] - testDataFloat[i]; - EXPECT_EQ(fabs(diff) < TEST_VALUE_PRESION, true); - } hpaeCaptureEffectNode->DisConnectWithInfo(hpaeSourceInputCluster, nodeInfo); EXPECT_EQ(hpaeSourceInputCluster->GetSourceInputNodeUseCount(), 1); hpaeSourceInputCluster->CapturerSourceStop(); diff --git a/services/audio_engine/test/unittest/node/hpae_pcm_buffer_test.cpp b/services/audio_engine/test/unittest/node/hpae_pcm_buffer_test.cpp index 536e49257d95821b0b4d9135262d724d63c68fb4..60883d7a8bfce5bfac7c83e2382fbe8929c93055 100644 --- a/services/audio_engine/test/unittest/node/hpae_pcm_buffer_test.cpp +++ b/services/audio_engine/test/unittest/node/hpae_pcm_buffer_test.cpp @@ -79,7 +79,6 @@ HWTEST_F(HpaePcmBufferTest, constructHpaePcmBufferTest, TestSize.Level0) pcmBufferInfo.rate = DEFAULT_SAMPLE_RATE; pcmBufferInfo.frames = DEFAULT_FRAME_NUM; HpaePcmBuffer hpaePcmBuffer(pcmBufferInfo); - EXPECT_EQ(reinterpret_cast(hpaePcmBuffer.GetPcmDataBuffer()) % MEMORY_ALIGN_BYTE_NUM, 0); EXPECT_EQ(hpaePcmBuffer.GetChannelCount(), pcmBufferInfo.ch); EXPECT_EQ(hpaePcmBuffer.GetFrameLen(), pcmBufferInfo.frameLen); EXPECT_EQ(hpaePcmBuffer.GetSampleRate(), pcmBufferInfo.rate); @@ -103,7 +102,6 @@ HWTEST_F(HpaePcmBufferTest, assignHpaePcmBufferTest, TestSize.Level0) pcmBufferInfo.rate = DEFAULT_SAMPLE_RATE; pcmBufferInfo.frames = DEFAULT_FRAME_NUM; HpaePcmBuffer hpaePcmBuffer(pcmBufferInfo); - EXPECT_EQ(reinterpret_cast(hpaePcmBuffer.GetPcmDataBuffer()) % MEMORY_ALIGN_BYTE_NUM, 0); size_t tempFrameLen = pcmBufferInfo.frameLen * pcmBufferInfo.ch; std::vector> testVec; for (size_t i = 0; i < pcmBufferInfo.frames; i++) { @@ -125,7 +123,6 @@ HWTEST_F(HpaePcmBufferTest, calHpaePcmBufferTest, TestSize.Level0) pcmBufferInfo.rate = DEFAULT_SAMPLE_RATE; pcmBufferInfo.frames = DEFAULT_FRAME_NUM; HpaePcmBuffer hpaePcmBuffer(pcmBufferInfo); - EXPECT_EQ(reinterpret_cast(hpaePcmBuffer.GetPcmDataBuffer()) % MEMORY_ALIGN_BYTE_NUM, 0); size_t tempFrameLen = pcmBufferInfo.frameLen * pcmBufferInfo.ch; for (size_t i = 0; i < pcmBufferInfo.frames; i++) { for (size_t j = 0; j < tempFrameLen; j++) { @@ -137,7 +134,6 @@ HWTEST_F(HpaePcmBufferTest, calHpaePcmBufferTest, TestSize.Level0) testVec.push_back(std::vector(tempFrameLen, 3.14f)); } HpaePcmBuffer hpaePcmBuffer2(pcmBufferInfo); - EXPECT_EQ(reinterpret_cast(hpaePcmBuffer2.GetPcmDataBuffer()) % MEMORY_ALIGN_BYTE_NUM, 0); hpaePcmBuffer2 = testVec; hpaePcmBuffer += hpaePcmBuffer2; for (size_t i = 0; i < pcmBufferInfo.frames; i++) { @@ -169,7 +165,6 @@ HWTEST_F(HpaePcmBufferTest, calHpaePcmBufferMultiFrameTest, TestSize.Level0) pcmBufferInfo.frames = inputFrames; pcmBufferInfo.isMultiFrames = true; HpaePcmBuffer hpaePcmBuffer(pcmBufferInfo); - EXPECT_EQ(reinterpret_cast(hpaePcmBuffer.GetPcmDataBuffer()) % MEMORY_ALIGN_BYTE_NUM, 0); EXPECT_EQ(hpaePcmBuffer.IsMultiFrames(), true); size_t tempFrameLen = pcmBufferInfo.frameLen * pcmBufferInfo.ch; @@ -189,7 +184,6 @@ HWTEST_F(HpaePcmBufferTest, calHpaePcmBufferMultiFrameTest, TestSize.Level0) pcmBufferInfo.frames = 1; pcmBufferInfo.isMultiFrames = false; HpaePcmBuffer testHpaePcmBuffer(pcmBufferInfo); - EXPECT_EQ(reinterpret_cast(testHpaePcmBuffer.GetPcmDataBuffer()) % MEMORY_ALIGN_BYTE_NUM, 0); EXPECT_EQ(hpaePcmBuffer.PushFrameData(testHpaePcmBuffer), false); size_t curFrames = inputFrames; std::cout << "inputFrames is: " << inputFrames << std::endl; @@ -212,9 +206,6 @@ HWTEST_F(HpaePcmBufferTest, ConstructorInitialization, TestSize.Level0) PcmBufferInfo info = CreateBufferInfo(NUM_TWO, true); HpaePcmBuffer buffer(info); - uintptr_t addr = reinterpret_cast(buffer.GetPcmDataBuffer()); - EXPECT_EQ(addr % MEMORY_ALIGN_BYTE_NUM, 0); - EXPECT_EQ(buffer.GetChannelCount(), DEFAULT_CHANNEL_COUNT); EXPECT_EQ(buffer.GetFrameLen(), DEFAULT_FRAME_LEN); EXPECT_EQ(buffer.GetFrames(), NUM_TWO); diff --git a/services/audio_engine/test/unittest/node/hpae_source_input_node_test.cpp b/services/audio_engine/test/unittest/node/hpae_source_input_node_test.cpp index 51cb60d9b044288be03c142515e1f1d45236302d..6936a3ce874c09ddd566900d1c4cb8e49abe7e12 100644 --- a/services/audio_engine/test/unittest/node/hpae_source_input_node_test.cpp +++ b/services/audio_engine/test/unittest/node/hpae_source_input_node_test.cpp @@ -132,9 +132,7 @@ HWTEST_F(HpaeSourceInputNodeTest, testWriteDataToSourceInputDataCase, TestSize.L nodeInfo.sourceBufferType = HPAE_SOURCE_BUFFER_TYPE_MIC; nodeInfo.sourceInputNodeType = HPAE_SOURCE_MIC; std::shared_ptr hpaeSourceInputNode = std::make_shared(nodeInfo); - uint64_t requestBytes = nodeInfo.frameLen * nodeInfo.channels * GetSizeFromFormat(nodeInfo.format); - std::vector testData(requestBytes); - uint64_t replyBytes = 0; + std::string deviceClass = "file_io"; std::string deviceNetId = "LocalDevice"; SourceType sourceType = SOURCE_TYPE_MIC; @@ -146,17 +144,7 @@ HWTEST_F(HpaeSourceInputNodeTest, testWriteDataToSourceInputDataCase, TestSize.L EXPECT_EQ(hpaeSourceInputNode->CapturerSourceInit(attr), SUCCESS); EXPECT_EQ(hpaeSourceInputNode->CapturerSourceStart(), SUCCESS); EXPECT_EQ(hpaeSourceInputNode->GetSourceState() == STREAM_MANAGER_RUNNING, true); - TestCapturerSourceFrame(testData.data(), requestBytes, replyBytes); - std::vector testDataFloat(requestBytes / SAMPLE_F32LE); - ConvertToFloat(nodeInfo.format, nodeInfo.channels * nodeInfo.frameLen, testData.data(), testDataFloat.data()); - OutputPort *outputPort = hpaeSourceInputNode->GetOutputPort(); - HpaePcmBuffer* outPcmBuffer = outputPort->PullOutputData(); - ASSERT_NE(outPcmBuffer, nullptr); - float* outputPcmData = outPcmBuffer->GetPcmDataBuffer(); - for (int32_t i = 0; i < requestBytes / SAMPLE_F32LE; i++) { - float diff = outputPcmData[i] - testDataFloat[i]; - EXPECT_EQ(fabs(diff) < TEST_VALUE_PRESION, true); - } + hpaeSourceInputNode->DoProcess(); EXPECT_EQ(hpaeSourceInputNode->CapturerSourceStop(), SUCCESS); EXPECT_EQ(hpaeSourceInputNode->GetSourceState() == STREAM_MANAGER_SUSPENDED, true); EXPECT_EQ(hpaeSourceInputNode->CapturerSourceDeInit(), SUCCESS);