diff --git a/frameworks/native/ohaudio/OHAudioStreamBuilder.cpp b/frameworks/native/ohaudio/OHAudioStreamBuilder.cpp index 61af1b392c038f668b606bd7affcc4bef9ba9aef..651c23b3b9a2e0d5a2653406ea3e25cedfa4991b 100644 --- a/frameworks/native/ohaudio/OHAudioStreamBuilder.cpp +++ b/frameworks/native/ohaudio/OHAudioStreamBuilder.cpp @@ -107,7 +107,7 @@ OH_AudioStream_Result OH_AudioStreamBuilder_SetCapturerInfo(OH_AudioStreamBuilde OH_AudioStream_Result OH_AudioStreamBuilder_Create(OH_AudioStreamBuilder** builder, OH_AudioStream_Type type) { - int32_t streamType = type == AUDIOSTREAM_TYPE_RERNDERER ? RENDERER_TYPE : CAPTURER_TYPE; + int32_t streamType = type == AUDIOSTREAM_TYPE_RENDERER ? RENDERER_TYPE : CAPTURER_TYPE; OHAudioStreamBuilder *streamBuilder = new OHAudioStreamBuilder(streamType); *builder = (OH_AudioStreamBuilder*)streamBuilder; diff --git a/frameworks/native/ohaudio/test/example/oh_audio_renderer_test.cpp b/frameworks/native/ohaudio/test/example/oh_audio_renderer_test.cpp index f4609ae13e3b5d4fb8c271457b7101ebd379dd1f..5188f936f213ab7e1b76f7da44852de972bfe2fa 100644 --- a/frameworks/native/ohaudio/test/example/oh_audio_renderer_test.cpp +++ b/frameworks/native/ohaudio/test/example/oh_audio_renderer_test.cpp @@ -62,7 +62,7 @@ void PlayerTest(char *argv[]) // 1. create builder OH_AudioStreamBuilder* builder; - OH_AudioStream_Type type = AUDIOSTREAM_TYPE_RERNDERER; + OH_AudioStream_Type type = AUDIOSTREAM_TYPE_RENDERER; ret = OH_AudioStreamBuilder_Create(&builder, type); printf("createcallback ret: %d \n", ret); diff --git a/frameworks/native/ohaudio/test/unittest/oh_audio_capture_test/src/oh_audio_capture_unit_test.cpp b/frameworks/native/ohaudio/test/unittest/oh_audio_capture_test/src/oh_audio_capture_unit_test.cpp index 61b728c09ab534ff31fb85d58697066dfd735449..b8b3197eba6b883392a5f63cb4c130d123befe91 100644 --- a/frameworks/native/ohaudio/test/unittest/oh_audio_capture_test/src/oh_audio_capture_unit_test.cpp +++ b/frameworks/native/ohaudio/test/unittest/oh_audio_capture_test/src/oh_audio_capture_unit_test.cpp @@ -55,12 +55,12 @@ HWTEST(OHAudioCaptureUnitTest, OH_Audio_Capture_Generate_001, TestSize.Level0) * @tc.name : Test OH_AudioStreamBuilder_GenerateCapturer API via illegal OH_AudioStream_Type. * @tc.number: OH_Audio_Capture_Generate_002 * @tc.desc : Test OH_AudioStreamBuilder_GenerateCapturer interface. Returns error code, if the stream type is -* AUDIOSTREAM_TYPE_RERNDERER. +* AUDIOSTREAM_TYPE_RENDERER. */ HWTEST(OHAudioCaptureUnitTest, OH_Audio_Capture_Generate_002, TestSize.Level0) { OH_AudioStreamBuilder* builder; - OH_AudioStream_Type type = AUDIOSTREAM_TYPE_RERNDERER; + OH_AudioStream_Type type = AUDIOSTREAM_TYPE_RENDERER; OH_AudioStream_Result result = OH_AudioStreamBuilder_Create(&builder, type); EXPECT_TRUE(result == AUDIOSTREAM_SUCCESS); diff --git a/frameworks/native/ohaudio/test/unittest/oh_audio_render_test/src/oh_audio_render_unit_test.cpp b/frameworks/native/ohaudio/test/unittest/oh_audio_render_test/src/oh_audio_render_unit_test.cpp index 25187ab902f6a0a8620cb64d1795b4a033592680..ba4a69afc2459e339875effa5450649b82e22a22 100644 --- a/frameworks/native/ohaudio/test/unittest/oh_audio_render_test/src/oh_audio_render_unit_test.cpp +++ b/frameworks/native/ohaudio/test/unittest/oh_audio_render_test/src/oh_audio_render_unit_test.cpp @@ -31,7 +31,7 @@ void OHAudioRenderUnitTest::TearDown(void) { } OH_AudioStreamBuilder* OHAudioRenderUnitTest::CreateRenderBuilder() { OH_AudioStreamBuilder* builder; - OH_AudioStream_Type type = AUDIOSTREAM_TYPE_RERNDERER; + OH_AudioStream_Type type = AUDIOSTREAM_TYPE_RENDERER; OH_AudioStreamBuilder_Create(&builder, type); return builder; } diff --git a/frameworks/native/ohaudio/test/unittest/oh_audio_stream_builder_test/src/oh_audio_stream_builder_unit_test.cpp b/frameworks/native/ohaudio/test/unittest/oh_audio_stream_builder_test/src/oh_audio_stream_builder_unit_test.cpp index 5b4fbb5dea125fd786ffeb0181311716bc3908df..9cd12eaa030d428142090b68da7763fd059bd95b 100644 --- a/frameworks/native/ohaudio/test/unittest/oh_audio_stream_builder_test/src/oh_audio_stream_builder_unit_test.cpp +++ b/frameworks/native/ohaudio/test/unittest/oh_audio_stream_builder_test/src/oh_audio_stream_builder_unit_test.cpp @@ -70,14 +70,14 @@ void OHAudioStreamBuilderUnitTest::SetUp(void) { } void OHAudioStreamBuilderUnitTest::TearDown(void) { } /** -* @tc.name : Test OH_AudioStreamBuilder_Create API via legal state, AUDIOSTREAM_TYPE_RERNDERER. +* @tc.name : Test OH_AudioStreamBuilder_Create API via legal state, AUDIOSTREAM_TYPE_RENDERER. * @tc.number: OH_AudioStreamBuilder_Create_001 * @tc.desc : Test OH_AudioStreamBuilder_Create interface. Returns true if result is successful. */ HWTEST(OHAudioStreamBuilderUnitTest, OH_AudioStreamBuilder_Create_001, TestSize.Level0) { OH_AudioStreamBuilder* builder = nullptr; - OH_AudioStream_Type type = AUDIOSTREAM_TYPE_RERNDERER; + OH_AudioStream_Type type = AUDIOSTREAM_TYPE_RENDERER; OH_AudioStream_Result result = OH_AudioStreamBuilder_Create(&builder, type); EXPECT_EQ(result, AUDIOSTREAM_SUCCESS); @@ -284,7 +284,7 @@ HWTEST(OHAudioStreamBuilderUnitTest, OH_AudioStreamBuilder_SetParameter_008, Tes HWTEST(OHAudioStreamBuilderUnitTest, OH_AudioStreamBuilder_SetParameter_009, TestSize.Level0) { OH_AudioStreamBuilder* builder; - OH_AudioStream_Type type = AUDIOSTREAM_TYPE_RERNDERER; + OH_AudioStream_Type type = AUDIOSTREAM_TYPE_RENDERER; OH_AudioStream_Result result = OH_AudioStreamBuilder_Create(&builder, type); EXPECT_EQ(result, AUDIOSTREAM_SUCCESS); @@ -327,7 +327,7 @@ HWTEST(OHAudioStreamBuilderUnitTest, OH_AudioStreamBuilder_SetParameter_010, Tes HWTEST(OHAudioStreamBuilderUnitTest, OH_AudioStreamBuilder_SetParameter_011, TestSize.Level0) { OH_AudioStreamBuilder* builder; - OH_AudioStream_Type type = AUDIOSTREAM_TYPE_RERNDERER; + OH_AudioStream_Type type = AUDIOSTREAM_TYPE_RENDERER; OH_AudioStream_Result result = OH_AudioStreamBuilder_Create(&builder, type); EXPECT_EQ(result, AUDIOSTREAM_SUCCESS); @@ -408,12 +408,12 @@ HWTEST(OHAudioStreamBuilderUnitTest, OH_AudioStreamBuilder_SetParameter_014, Tes * @tc.name : Test OH_AudioStreamBuilder_SetCapturerInfo API via illegal state. * @tc.number: OH_AudioStreamBuilder_SetParameter_015 * @tc.desc : Test OH_AudioStreamBuilder_SetCapturerInfo interface. Returns error code, if the builder type is -* AUDIOSTREAM_TYPE_RERNDERER. +* AUDIOSTREAM_TYPE_RENDERER. */ HWTEST(OHAudioStreamBuilderUnitTest, OH_AudioStreamBuilder_SetParameter_015, TestSize.Level0) { OH_AudioStreamBuilder* builder; - OH_AudioStream_Type type = AUDIOSTREAM_TYPE_RERNDERER; + OH_AudioStream_Type type = AUDIOSTREAM_TYPE_RENDERER; OH_AudioStream_Result result = OH_AudioStreamBuilder_Create(&builder, type); EXPECT_EQ(result, AUDIOSTREAM_SUCCESS); @@ -450,12 +450,12 @@ HWTEST(OHAudioStreamBuilderUnitTest, OH_AudioStreamBuilder_SetParameter_016, Tes * @tc.name : Test OH_AudioStreamBuilder_SetCapturerCallback API via illegal state. * @tc.number: OH_AudioStreamBuilder_SetParameter_017 * @tc.desc : Test OH_AudioStreamBuilder_SetCapturerCallback interface. Returns error code, if the builder type is -* AUDIOSTREAM_TYPE_RERNDERER. +* AUDIOSTREAM_TYPE_RENDERER. */ HWTEST(OHAudioStreamBuilderUnitTest, OH_AudioStreamBuilder_SetParameter_017, TestSize.Level0) { OH_AudioStreamBuilder* builder; - OH_AudioStream_Type type = AUDIOSTREAM_TYPE_RERNDERER; + OH_AudioStream_Type type = AUDIOSTREAM_TYPE_RENDERER; OH_AudioStream_Result result = OH_AudioStreamBuilder_Create(&builder, type); EXPECT_EQ(result, AUDIOSTREAM_SUCCESS); @@ -640,7 +640,7 @@ HWTEST(OHAudioStreamBuilderUnitTest, OH_AudioStreamBuilder_SetCapturerInfo_002, HWTEST(OHAudioStreamBuilderUnitTest, OH_AudioStreamBuilder_SetRendererInfo_001, TestSize.Level0) { OH_AudioStreamBuilder* builder; - OH_AudioStream_Type type = AUDIOSTREAM_TYPE_RERNDERER; + OH_AudioStream_Type type = AUDIOSTREAM_TYPE_RENDERER; OH_AudioStream_Result result = OH_AudioStreamBuilder_Create(&builder, type); EXPECT_EQ(result, AUDIOSTREAM_SUCCESS); @@ -662,7 +662,7 @@ HWTEST(OHAudioStreamBuilderUnitTest, OH_AudioStreamBuilder_SetRendererInfo_001, HWTEST(OHAudioStreamBuilderUnitTest, OH_AudioStreamBuilder_SetRendererInfo_002, TestSize.Level0) { OH_AudioStreamBuilder* builder; - OH_AudioStream_Type type = AUDIOSTREAM_TYPE_RERNDERER; + OH_AudioStream_Type type = AUDIOSTREAM_TYPE_RENDERER; OH_AudioStream_Result result = OH_AudioStreamBuilder_Create(&builder, type); EXPECT_EQ(result, AUDIOSTREAM_SUCCESS); @@ -683,7 +683,7 @@ HWTEST(OHAudioStreamBuilderUnitTest, OH_AudioStreamBuilder_SetRendererInfo_002, HWTEST(OHAudioStreamBuilderUnitTest, OH_AudioStreamBuilder_SetRendererInfo_003, TestSize.Level0) { OH_AudioStreamBuilder* builder; - OH_AudioStream_Type type = AUDIOSTREAM_TYPE_RERNDERER; + OH_AudioStream_Type type = AUDIOSTREAM_TYPE_RENDERER; OH_AudioStream_Result result = OH_AudioStreamBuilder_Create(&builder, type); EXPECT_EQ(result, AUDIOSTREAM_SUCCESS); diff --git a/interfaces/kits/c/common/native_audiostream_base.h b/interfaces/kits/c/common/native_audiostream_base.h index 11b29c805a5d15e35aafd167ad8bd2dd062edaf5..49ed115176b5beae71cf432bd5814abe1221d2bc 100644 --- a/interfaces/kits/c/common/native_audiostream_base.h +++ b/interfaces/kits/c/common/native_audiostream_base.h @@ -58,7 +58,7 @@ typedef enum { /** * The type for audio stream is renderer. */ - AUDIOSTREAM_TYPE_RERNDERER = 1, + AUDIOSTREAM_TYPE_RENDERER = 1, /** * The type for audio stream is capturer. diff --git a/interfaces/kits/c/common/native_audiostreambuilder.h b/interfaces/kits/c/common/native_audiostreambuilder.h index 22fa520b382090a24ef98115e525a2e845eeddc8..6a66bf075f60de20e6fe1f810614faee2f2353d1 100644 --- a/interfaces/kits/c/common/native_audiostreambuilder.h +++ b/interfaces/kits/c/common/native_audiostreambuilder.h @@ -30,7 +30,7 @@ extern "C" { * @since 10 * * @param builder The builder reference to the created result. - * @param type The stream type to be created. {@link #AUDIOSTREAM_TYPE_RERNDERER} or {@link #AUDIOSTREAM_TYPE_CAPTURER} + * @param type The stream type to be created. {@link #AUDIOSTREAM_TYPE_RENDERER} or {@link #AUDIOSTREAM_TYPE_CAPTURER} * @return {@link #AUDIOSTREAM_SUCCESS} or an undesired error. */ OH_AudioStream_Result OH_AudioStreamBuilder_Create(OH_AudioStreamBuilder** builder, OH_AudioStream_Type type);