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 095817f9d3bb2c68c7b188657f351d77ee1d4a4c..4c4d8c754ddab1247f68640727aade11b45b7832 100644 --- a/test/nativedemo/audio_demo/avcodec_audio_aac_encoder_demo.cpp +++ b/test/nativedemo/audio_demo/avcodec_audio_aac_encoder_demo.cpp @@ -32,14 +32,14 @@ using namespace std; namespace { constexpr uint32_t CHANNEL_COUNT = 2; constexpr uint32_t SAMPLE_RATE = 44100; -constexpr uint32_t BITS_RATE = 112000; +constexpr uint32_t BITS_RATE = 199000; constexpr uint32_t BITS_PER_CODED_RATE = 16; constexpr uint32_t FRAME_DURATION_US = 33000; constexpr uint32_t CHANNEL_LAYOUT = 3; constexpr int32_t SAMPLE_FORMAT = 8; constexpr int32_t INPUT_FRAME_BYTES = 2 * 1024 * 4; -constexpr string_view INPUT_FILE_PATH = "/data/test/media/test_fltp.pcm"; +constexpr string_view INPUT_FILE_PATH = "/data/test/media/aac_2c_44100hz_199k.pcm"; constexpr string_view OUTPUT_FILE_PATH = "/data/test/media/encode2.aac"; } // namespace diff --git a/test/nativedemo/audio_demo/avcodec_audio_decoder_demo.cpp b/test/nativedemo/audio_demo/avcodec_audio_decoder_demo.cpp index 9268554ecd29df8f84349c390f67ed6531594467..a0480e26d8403335743a195f3a26ec9e3d7f15ea 100644 --- a/test/nativedemo/audio_demo/avcodec_audio_decoder_demo.cpp +++ b/test/nativedemo/audio_demo/avcodec_audio_decoder_demo.cpp @@ -35,15 +35,15 @@ constexpr uint32_t SAMPLE_RATE = 44100; constexpr uint32_t BITS_PER_SAMPLE = 16; constexpr uint32_t BITS_PER_CODED_RATE = 4; constexpr uint32_t DEFAULT_AAC_TYPE = 1; -constexpr int64_t BITS_RETE[TYPE_MAX] = {197000, 543000, 128000, 160000}; -constexpr string_view INPUT_AAC_FILE_PATH = "/data/test/media/aac_2c_44100hz_197k.dat"; -constexpr string_view OUTPUT_AAC_PCM_FILE_PATH = "/data/test/media/aac_2c_44100hz_197k.pcm"; -constexpr string_view INPUT_FLAC_FILE_PATH = "/data/test/media/flac_2c_44100hz_543k.dat"; -constexpr string_view OUTPUT_FLAC_PCM_FILE_PATH = "/data/test/media/flac_2c_44100hz_543k.pcm"; -constexpr string_view INPUT_MP3_FILE_PATH = "/data/test/media/mp3_2c_44100hz_128k.dat"; -constexpr string_view OUTPUT_MP3_PCM_FILE_PATH = "/data/test/media/mp3_2c_44100hz_128k.pcm"; -constexpr string_view INPUT_VORBIS_FILE_PATH = "/data/test/media/vorbis_2c_44100hz_160k.dat"; -constexpr string_view OUTPUT_VORBIS_PCM_FILE_PATH = "/data/test/media/vorbis_2c_44100hz_160k.pcm"; +constexpr int64_t BITS_RETE[TYPE_MAX] = {199000, 261000, 60000, 320000}; +constexpr string_view INPUT_AAC_FILE_PATH = "/data/test/media/aac_2c_44100hz_199k.dat"; +constexpr string_view OUTPUT_AAC_PCM_FILE_PATH = "/data/test/media/aac_2c_44100hz_199k.pcm"; +constexpr string_view INPUT_FLAC_FILE_PATH = "/data/test/media/flac_2c_44100hz_261k.dat"; +constexpr string_view OUTPUT_FLAC_PCM_FILE_PATH = "/data/test/media/flac_2c_44100hz_261k.pcm"; +constexpr string_view INPUT_MP3_FILE_PATH = "/data/test/media/mp3_2c_44100hz_60k.dat"; +constexpr string_view OUTPUT_MP3_PCM_FILE_PATH = "/data/test/media/mp3_2c_44100hz_60k.pcm"; +constexpr string_view INPUT_VORBIS_FILE_PATH = "/data/test/media/vorbis_2c_44100hz_320k.dat"; +constexpr string_view OUTPUT_VORBIS_PCM_FILE_PATH = "/data/test/media/vorbis_2c_44100hz_320k.pcm"; } // namespace static void OnError(OH_AVCodec *codec, int32_t errorCode, void *userData) diff --git a/test/nativedemo/audio_demo/avcodec_audio_decoder_inner_demo.cpp b/test/nativedemo/audio_demo/avcodec_audio_decoder_inner_demo.cpp index 495101b5bc700eb954c163a65f8a752b9c9f9507..d140fb31474c359dad4b9b56a0cf5fe95ce71d70 100644 --- a/test/nativedemo/audio_demo/avcodec_audio_decoder_inner_demo.cpp +++ b/test/nativedemo/audio_demo/avcodec_audio_decoder_inner_demo.cpp @@ -31,9 +31,9 @@ using namespace std; namespace { constexpr uint32_t CHANNEL_COUNT = 2; constexpr uint32_t SAMPLE_RATE = 44100; -constexpr uint32_t BITS_RATE = 112000; +constexpr uint32_t BITS_RATE = 320000; constexpr uint32_t BITS_PER_CODED_RATE = 4; -constexpr string_view INPUT_FILE_PATH = "/data/test/media/vorbis_2c_44100hz_112k.dat"; +constexpr string_view INPUT_FILE_PATH = "/data/test/media/vorbis_2c_44100hz_320k.dat"; constexpr string_view OUTPUT_FILE_PATH = "/data/test/media/decode_ogg.pcm"; constexpr uint32_t TMP_BUFFER_SIZE = 4096; } // namespace diff --git a/test/nativedemo/audio_demo/avcodec_audio_encoder_inner_demo.cpp b/test/nativedemo/audio_demo/avcodec_audio_encoder_inner_demo.cpp index 478e7cff4ec688a6b64ca1243677e8186f8ad1fa..ffb9c45286c66e23389535162cf5c1f4b0bcbeec 100644 --- a/test/nativedemo/audio_demo/avcodec_audio_encoder_inner_demo.cpp +++ b/test/nativedemo/audio_demo/avcodec_audio_encoder_inner_demo.cpp @@ -39,7 +39,7 @@ using namespace std; namespace { constexpr uint32_t CHANNEL_COUNT = 2; constexpr uint32_t SAMPLE_RATE = 44100; -constexpr uint32_t BITS_RATE = 112000; // for aac encoding +constexpr uint32_t BITS_RATE = 199000; // for aac encoding constexpr uint32_t BITS_PER_CODED_RATE = 4; constexpr uint32_t DEFAULT_SAMPLE_FORMATE_VALE = 8; constexpr uint32_t DEFAULT_CHANNEL_LAYOUT_COUNT = 3; @@ -140,7 +140,7 @@ int32_t AEnInnerDemo::Release() void AEnInnerDemo::InputFunc() { - const char *filePath = "/data/test/media/test_fltp.pcm"; + const char *filePath = "/data/test/media/aac_2c_44100hz_199k.pcm"; int frameBytes = 2 * 1024 * 4; std::ifstream inputFile(filePath, std::ios::binary); if (!inputFile.is_open()) { 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 ea72180da31182ab3808768ad7d429b83246ed42..021e2e70360fb97c2543f7c27644098606f688e0 100644 --- a/test/nativedemo/audio_demo/avcodec_audio_flac_encoder_demo.cpp +++ b/test/nativedemo/audio_demo/avcodec_audio_flac_encoder_demo.cpp @@ -32,7 +32,7 @@ using namespace std; namespace { constexpr uint32_t CHANNEL_COUNT = 2; constexpr uint32_t SAMPLE_RATE = 44100; -constexpr uint32_t BITS_RATE = 169000; +constexpr uint32_t BITS_RATE = 261000; constexpr uint32_t BITS_PER_CODED_SAMPLE = 16; constexpr uint32_t FRAME_DURATION_US = 33000; constexpr uint32_t CHANNEL_LAYOUT = 3; @@ -40,7 +40,7 @@ constexpr int32_t SAMPLE_FORMAT = 1; constexpr uint32_t FRAME_BYTES = 18432; constexpr int32_t COMPLIANCE_LEVEL = -2; -constexpr string_view INPUT_FILE_PATH = "/data/test/media/flac_test.pcm"; +constexpr string_view INPUT_FILE_PATH = "/data/test/media/flac_2c_44100hz_261k.pcm"; constexpr string_view OUTPUT_FILE_PATH = "/data/test/media/flac_encoder_test.flac"; } // namespace diff --git a/test/nativedemo/resources/aac_2c_44100hz_197k.dat b/test/nativedemo/resources/aac_2c_44100hz_197k.dat deleted file mode 100644 index 947d1825c428f08104704bd51ef6ecd9e4596b0b..0000000000000000000000000000000000000000 Binary files a/test/nativedemo/resources/aac_2c_44100hz_197k.dat and /dev/null differ diff --git a/test/nativedemo/resources/flac_2c_44100hz_543k.dat b/test/nativedemo/resources/flac_2c_44100hz_543k.dat deleted file mode 100644 index f47c3e6c2d1f0f8cb6623345805d737aecacecbf..0000000000000000000000000000000000000000 Binary files a/test/nativedemo/resources/flac_2c_44100hz_543k.dat and /dev/null differ diff --git a/test/nativedemo/resources/mp3_2c_44100hz_128k.dat b/test/nativedemo/resources/mp3_2c_44100hz_128k.dat deleted file mode 100644 index 682c06ab277019de38beb089544f27b6f824ac2c..0000000000000000000000000000000000000000 Binary files a/test/nativedemo/resources/mp3_2c_44100hz_128k.dat and /dev/null differ diff --git a/test/nativedemo/resources/vorbis_2c_44100hz_112k.dat b/test/nativedemo/resources/vorbis_2c_44100hz_112k.dat deleted file mode 100755 index d61bcc67d4d78bcd5bb68d8e0c9f17fb180b5fb7..0000000000000000000000000000000000000000 Binary files a/test/nativedemo/resources/vorbis_2c_44100hz_112k.dat and /dev/null differ diff --git a/test/nativedemo/resources/vorbis_2c_44100hz_160k.dat b/test/nativedemo/resources/vorbis_2c_44100hz_160k.dat deleted file mode 100644 index 283ad9e2b9e13fa47fe354c3de2787f26c8a4f32..0000000000000000000000000000000000000000 Binary files a/test/nativedemo/resources/vorbis_2c_44100hz_160k.dat and /dev/null differ 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 34adf5f5f1a405fa0c0ddd7300b0cdcabd3d5de3..8a3b24fca1da7f8282a6c012ea4716657345cc34 100644 --- a/test/unittest/audio_test/audio_encoder_capi_unit_test.cpp +++ b/test/unittest/audio_test/audio_encoder_capi_unit_test.cpp @@ -41,7 +41,7 @@ const string CODEC_FLAC_NAME = std::string(AVCodecCodecName::AUDIO_ENCODER_FLAC_ const string CODEC_AAC_NAME = std::string(AVCodecCodecName::AUDIO_ENCODER_AAC_NAME); constexpr uint32_t CHANNEL_COUNT = 2; constexpr uint32_t SAMPLE_RATE = 44100; -constexpr uint32_t BITS_RATE = 169000; +constexpr uint32_t BITS_RATE = 261000; constexpr uint32_t BITS_PER_CODED_SAMPLE = 16; constexpr uint32_t FRAME_DURATION_US = 33000; constexpr uint32_t CHANNEL_LAYOUT = 3; @@ -49,7 +49,7 @@ constexpr int32_t SAMPLE_FORMAT = 1; constexpr uint32_t FRAME_BYTES = 18432; constexpr int32_t COMPLIANCE_LEVEL = -2; -constexpr string_view INPUT_FILE_PATH = "/data/test/media/encoderTest.pcm"; +constexpr string_view INPUT_FILE_PATH = "/data/test/media/flac_2c_44100hz_261k.pcm"; constexpr string_view OUTPUT_FILE_PATH = "/data/test/media/encoderTest.flac"; } // namespace diff --git a/test/unittest/resources/audio_res/aac_2c_44100hz_199k.dat b/test/unittest/resources/audio_res/aac_2c_44100hz_199k.dat new file mode 100644 index 0000000000000000000000000000000000000000..6338a9c8adc2c7211ce24eb1d4512a9d2aa62255 Binary files /dev/null and b/test/unittest/resources/audio_res/aac_2c_44100hz_199k.dat differ diff --git a/test/unittest/resources/audio_res/aac_2c_44100hz_199k.pcm b/test/unittest/resources/audio_res/aac_2c_44100hz_199k.pcm new file mode 100644 index 0000000000000000000000000000000000000000..3dd2ef86fac83e8f7360b2aa9094daa82a3449f2 Binary files /dev/null and b/test/unittest/resources/audio_res/aac_2c_44100hz_199k.pcm differ diff --git a/test/unittest/resources/audio_res/flac_2c_44100hz_261k.dat b/test/unittest/resources/audio_res/flac_2c_44100hz_261k.dat new file mode 100644 index 0000000000000000000000000000000000000000..a3b7503fd0189848b36c9b9af8f507aadcc1cd92 Binary files /dev/null and b/test/unittest/resources/audio_res/flac_2c_44100hz_261k.dat differ diff --git a/test/unittest/resources/audio_res/flac_2c_44100hz_261k.pcm b/test/unittest/resources/audio_res/flac_2c_44100hz_261k.pcm new file mode 100644 index 0000000000000000000000000000000000000000..813f444b673bd531ad013a33a628d38f3694e9d5 Binary files /dev/null and b/test/unittest/resources/audio_res/flac_2c_44100hz_261k.pcm differ diff --git a/test/unittest/resources/audio_res/mp3_2c_44100hz_60k.dat b/test/unittest/resources/audio_res/mp3_2c_44100hz_60k.dat new file mode 100644 index 0000000000000000000000000000000000000000..a4d71c4f35055d736e99e9bbbc6b810d9f56f2dc Binary files /dev/null and b/test/unittest/resources/audio_res/mp3_2c_44100hz_60k.dat differ diff --git a/test/unittest/resources/audio_res/vorbis_2c_44100hz_320k.dat b/test/unittest/resources/audio_res/vorbis_2c_44100hz_320k.dat new file mode 100644 index 0000000000000000000000000000000000000000..f580be2bae7e4ab8965d608002b19a107b080e28 Binary files /dev/null and b/test/unittest/resources/audio_res/vorbis_2c_44100hz_320k.dat differ diff --git a/test/unittest/resources/ohos_test.xml b/test/unittest/resources/ohos_test.xml index 7aacb268cb3c08f29a6a35b1dc6f11ab9373ab9b..63976c8b17de48e1fd60c62fdd328b9c6eef31ff 100644 --- a/test/unittest/resources/ohos_test.xml +++ b/test/unittest/resources/ohos_test.xml @@ -36,5 +36,43 @@