From d9abc6fd2951898c353a313933ae6f579c24417e Mon Sep 17 00:00:00 2001 From: ling990 Date: Wed, 21 Sep 2022 15:40:27 +0800 Subject: [PATCH] modify testcases Signed-off-by: ling990 Signed-off-by: ling990 --- multimedia/BUILD.gn | 1 + multimedia/media/media_cpp_standard/BUILD.gn | 10 ++++++++-- multimedia/media/media_cpp_standard/Test.json | 2 +- .../src/ActsAudioDecEncNdkTest.cpp | 20 +++++++++++++++++-- 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/multimedia/BUILD.gn b/multimedia/BUILD.gn index 497b74487..495fd62a5 100644 --- a/multimedia/BUILD.gn +++ b/multimedia/BUILD.gn @@ -39,6 +39,7 @@ group("multimedia") { "image/image_js_standard/imageWebp:image_webp_js_hap", "image/image_js_standard/imageYUV:image_yuv_js_hap", "image/image_js_standard/image_ndk_test:image_pixelmap_ndk_hap", + "media/media_cpp_standard:ActsAvcodecNdkTest", "media/media_js_standard/audioPlayer:audio_player_js_hap", "media/media_js_standard/audioRecorder:audio_recorder_js_hap", "media/media_js_standard/recorderFormat:recorder_format_js_hap", diff --git a/multimedia/media/media_cpp_standard/BUILD.gn b/multimedia/media/media_cpp_standard/BUILD.gn index 995d2e74d..c683804bd 100644 --- a/multimedia/media/media_cpp_standard/BUILD.gn +++ b/multimedia/media/media_cpp_standard/BUILD.gn @@ -28,9 +28,13 @@ ohos_moduletest_suite("ActsAvcodecNdkTest") { "audioDecEncNdk/include", "videoDecEncNdk/include", "//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include", + "//foundation/multimedia/player_framework/interfaces/inner_api/native", "//foundation/multimedia/player_framework/interfaces/kits/c", + "//foundation/multimedia/player_framework/frameworks/native/capi/common", "//utils/native/base/include", - "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", + "//graphic/graphic_2d/interfaces/kits/surface", + "//graphic/graphic_2d/interfaces/inner_api/surface", + "//foundation/graphic/graphic_2d/frameworks/surface/include", ] cflags = [ @@ -52,6 +56,7 @@ ohos_moduletest_suite("ActsAvcodecNdkTest") { ] deps = [ + "//foundation/graphic/graphic_2d:libsurface", "//foundation/graphic/graphic_2d/frameworks/surface:surface", "//foundation/multimedia/player_framework/interfaces/kits/c:native_media_adec", "//foundation/multimedia/player_framework/interfaces/kits/c:native_media_aenc", @@ -61,7 +66,8 @@ ohos_moduletest_suite("ActsAvcodecNdkTest") { "//foundation/multimedia/player_framework/interfaces/kits/c:native_media_venc", "//utils/native/base:utils", ] + external_deps = [ "hiviewdfx_hilog_native:libhilog" ] - subsystem_name = "multimedia" part_name = "multimedia_player_framework" + subsystem_name = "multimedia" } diff --git a/multimedia/media/media_cpp_standard/Test.json b/multimedia/media/media_cpp_standard/Test.json index 644c2171d..26be214d8 100644 --- a/multimedia/media/media_cpp_standard/Test.json +++ b/multimedia/media/media_cpp_standard/Test.json @@ -2,7 +2,7 @@ "description": "Config for avcodec ndk test cases", "driver": { "module-name": "ActsAvcodecNdkTest", - "native-test-timeout": "30000", + "native-test-timeout": "300000", "native-test-device-path": "/data/local/tmp", "runtime-hint": "1s", "type": "CppTest" diff --git a/multimedia/media/media_cpp_standard/audioDecEncNdk/src/ActsAudioDecEncNdkTest.cpp b/multimedia/media/media_cpp_standard/audioDecEncNdk/src/ActsAudioDecEncNdkTest.cpp index bfb1fccea..5ff9818d6 100644 --- a/multimedia/media/media_cpp_standard/audioDecEncNdk/src/ActsAudioDecEncNdkTest.cpp +++ b/multimedia/media/media_cpp_standard/audioDecEncNdk/src/ActsAudioDecEncNdkTest.cpp @@ -244,11 +244,19 @@ HWTEST_F(ActsAudioDecEncNdkTest, SUB_MULTIMEDIA_MEDIA_AUDIO_DEC_ENC_FUNCTION_040 ASSERT_EQ(AV_ERR_OK, aDecEncSample->PrepareEnc()); aDecEncSample->SetReadPath(READPATH, ES_AAC_48000_32_1, ES_AAC_48000_32_1_Length); aDecEncSample->SetSavePath("/data/media/AAC_48000_32_1_out4.aac"); + aDecEncSample->SetEosState(false); ASSERT_EQ(AV_ERR_OK, aDecEncSample->StartEnc()); ASSERT_EQ(AV_ERR_OK, aDecEncSample->StartDec()); - while (aDecEncSample->GetFrameCount() < 100) {}; + while (aDecEncSample->GetFrameCount() < 50) {}; ASSERT_EQ(AV_ERR_OK, aDecEncSample->FlushDec()); + ASSERT_EQ(AV_ERR_OK, aDecEncSample->FlushEnc()); + aDecEncSample->ReRead(); + aDecEncSample->ResetDecParam(); + aDecEncSample->ResetEncParam(); + aDecEncSample->SetSavePath("/data/media/AAC_48000_32_1_out4_2.aac"); + aDecEncSample->SetEosState(true); + ASSERT_EQ(AV_ERR_OK, aDecEncSample->StartEnc()); ASSERT_EQ(AV_ERR_OK, aDecEncSample->StartDec()); while (!aDecEncSample->GetEncEosState()) {}; @@ -341,11 +349,19 @@ HWTEST_F(ActsAudioDecEncNdkTest, SUB_MULTIMEDIA_MEDIA_AUDIO_DEC_ENC_FUNCTION_060 ASSERT_EQ(AV_ERR_OK, aDecEncSample->PrepareEnc()); aDecEncSample->SetReadPath(READPATH, ES_AAC_48000_32_1, ES_AAC_48000_32_1_Length); aDecEncSample->SetSavePath("/data/media/AAC_48000_32_1_out6.aac"); + aDecEncSample->SetEosState(false); ASSERT_EQ(AV_ERR_OK, aDecEncSample->StartEnc()); ASSERT_EQ(AV_ERR_OK, aDecEncSample->StartDec()); - while (aDecEncSample->GetFrameCount() < 100) {}; + while (aDecEncSample->GetFrameCount() < 50) {}; ASSERT_EQ(AV_ERR_OK, aDecEncSample->StopDec()); + ASSERT_EQ(AV_ERR_OK, aDecEncSample->StopEnc()); + aDecEncSample->ReRead(); + aDecEncSample->ResetDecParam(); + aDecEncSample->ResetEncParam(); + aDecEncSample->SetSavePath("/data/media/AAC_48000_32_1_out6_2.aac"); + aDecEncSample->SetEosState(true); + ASSERT_EQ(AV_ERR_OK, aDecEncSample->StartEnc()); ASSERT_EQ(AV_ERR_OK, aDecEncSample->StartDec()); ASSERT_EQ(AV_ERR_OK, aDecEncSample->CalcuError()); -- GitLab