diff --git a/multimedia/media/media_js_standard/audioDecoder/Test.json b/multimedia/media/media_js_standard/audioDecoder/Test.json index e25486fa9ec9c78b674479dcfb4fc8ef8d201493..cedb3b5ec0230c70770278febb34a65d8c720c67 100644 --- a/multimedia/media/media_js_standard/audioDecoder/Test.json +++ b/multimedia/media/media_js_standard/audioDecoder/Test.json @@ -4,9 +4,16 @@ "type": "JSUnitTest", "test-timeout": "2000000", "package": "ohos.acts.multimedia.audio.audiodecoder", - "shell-timeout": "60000" + "shell-timeout": "60000" }, "kits": [ + { + "test-file-name": [ + "ActsAudioDecoderJsTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + }, { "type": "PushKit", "pre-push": [ @@ -19,7 +26,7 @@ "./resource/audio/audioDecode/vorbis.es ->/data/accounts/account_0/appdata/ohos.acts.multimedia.audio.audiodecoder/" ] }, - { + { "type": "ShellKit", "run-command": [ "rm -R /data/accounts/account_0/appdata/ohos.acts.multimedia.audio.audiodecoder/results", @@ -29,13 +36,6 @@ ], "teardown-command":[ ] - }, - { - "test-file-name": [ - "ActsAudioDecoderJsTest.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true } ] -} +} \ No newline at end of file diff --git a/multimedia/media/media_js_standard/audioEncoder/Test.json b/multimedia/media/media_js_standard/audioEncoder/Test.json index dea08584c4e4fffff1fc9a42a2b0f4a4439d4e72..62300221edec1a5541149a57498ef4bc2797b78f 100644 --- a/multimedia/media/media_js_standard/audioEncoder/Test.json +++ b/multimedia/media/media_js_standard/audioEncoder/Test.json @@ -4,9 +4,16 @@ "type": "JSUnitTest", "test-timeout": "2000000", "package": "ohos.acts.multimedia.audio.audioencoder", - "shell-timeout": "60000" + "shell-timeout": "60000" }, "kits": [ + { + "test-file-name": [ + "ActsAudioEncoderJsTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + }, { "type": "PushKit", "pre-push": [ @@ -16,7 +23,7 @@ "./resource/audio/audioEncode/S32LE_2.pcm ->/data/accounts/account_0/appdata/ohos.acts.multimedia.audio.audioencoder/" ] }, - { + { "type": "ShellKit", "run-command": [ "rm -R /data/accounts/account_0/appdata/ohos.acts.multimedia.audio.audioencoder/results", @@ -26,13 +33,6 @@ ], "teardown-command":[ ] - }, - { - "test-file-name": [ - "ActsAudioEncoderJsTest.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true } ] -} +} \ No newline at end of file diff --git a/multimedia/media/media_js_standard/audioPlayer/BUILD.gn b/multimedia/media/media_js_standard/audioPlayer/BUILD.gn index 5b1d783ea81cf4d8864630a92dbd233d608cac42..9bad2266c231f6eeaa907b53225551208e22a528 100644 --- a/multimedia/media/media_js_standard/audioPlayer/BUILD.gn +++ b/multimedia/media/media_js_standard/audioPlayer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021-2022 Huawei Device Co., Ltd. +# Copyright (C) 2021 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 diff --git a/multimedia/media/media_js_standard/audioPlayer/Test.json b/multimedia/media/media_js_standard/audioPlayer/Test.json index ddb68ab0978381fd8d182cbb1804c48d4d2977e5..8d705ef062a1f50e917474387d1415222f66a863 100644 --- a/multimedia/media/media_js_standard/audioPlayer/Test.json +++ b/multimedia/media/media_js_standard/audioPlayer/Test.json @@ -2,11 +2,18 @@ "description": "Configuration for audioPlayer Tests", "driver": { "type": "JSUnitTest", - "test-timeout": "120000", + "test-timeout": "2000000", "package": "ohos.acts.multimedia.audio.audioplayer", "shell-timeout": "60000" }, "kits": [ + { + "test-file-name": [ + "ActsAudioPlayerJsTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + }, { "type": "PushKit", "pre-push": [ @@ -44,13 +51,6 @@ ], "teardown-command":[ ] - }, - { - "test-file-name": [ - "ActsAudioPlayerJsTest.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true } ] } diff --git a/multimedia/media/media_js_standard/audioPlayer/src/main/java/ohos/acts/multimedia/audio/audioplayer/MainAbility.java b/multimedia/media/media_js_standard/audioPlayer/src/main/java/ohos/acts/multimedia/audio/audioplayer/MainAbility.java index c3adacfc7a7e0e86651b857ee2f6e857d5c173be..84cb3efd1dba0d92d906a3624192afd6b887499a 100644 --- a/multimedia/media/media_js_standard/audioPlayer/src/main/java/ohos/acts/multimedia/audio/audioplayer/MainAbility.java +++ b/multimedia/media/media_js_standard/audioPlayer/src/main/java/ohos/acts/multimedia/audio/audioplayer/MainAbility.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2021 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 diff --git a/multimedia/media/media_js_standard/audioPlayer/src/main/java/ohos/acts/multimedia/audio/audioplayer/MyApplication.java b/multimedia/media/media_js_standard/audioPlayer/src/main/java/ohos/acts/multimedia/audio/audioplayer/MyApplication.java index 956bc88979f54b82cf83932c34081ad9f26e8588..a735d0a33e16bdb4ae0194d12fb865e64207b88e 100644 --- a/multimedia/media/media_js_standard/audioPlayer/src/main/java/ohos/acts/multimedia/audio/audioplayer/MyApplication.java +++ b/multimedia/media/media_js_standard/audioPlayer/src/main/java/ohos/acts/multimedia/audio/audioplayer/MyApplication.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2021 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 diff --git a/multimedia/media/media_js_standard/audioPlayer/src/main/js/default/app.js b/multimedia/media/media_js_standard/audioPlayer/src/main/js/default/app.js index dab1e8146b5f31325a3aaed0c1fbb9a6c73b39d3..e423f4bce4698ec1d7dc86c3eea3990a5e7b1085 100644 --- a/multimedia/media/media_js_standard/audioPlayer/src/main/js/default/app.js +++ b/multimedia/media/media_js_standard/audioPlayer/src/main/js/default/app.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Huawei Device Co., Ltd. + * Copyright (C) 2021 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 diff --git a/multimedia/media/media_js_standard/audioPlayer/src/main/js/default/pages/index/index.css b/multimedia/media/media_js_standard/audioPlayer/src/main/js/default/pages/index/index.css index 9fbc8868aac904db047906f6407339108a857414..5bd7567028568bd522193b2519d545ca6dcf397d 100644 --- a/multimedia/media/media_js_standard/audioPlayer/src/main/js/default/pages/index/index.css +++ b/multimedia/media/media_js_standard/audioPlayer/src/main/js/default/pages/index/index.css @@ -1,18 +1,3 @@ -/* - * Copyright (C) 2021-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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - .container { flex-direction: column; justify-content: center; diff --git a/multimedia/media/media_js_standard/audioPlayer/src/main/js/default/pages/index/index.hml b/multimedia/media/media_js_standard/audioPlayer/src/main/js/default/pages/index/index.hml index e886a71e3b847d80047843e600b38e9c4164b116..f64b040a5ae394dbaa5e185e1ecd4f4556b92184 100644 --- a/multimedia/media/media_js_standard/audioPlayer/src/main/js/default/pages/index/index.hml +++ b/multimedia/media/media_js_standard/audioPlayer/src/main/js/default/pages/index/index.hml @@ -1,18 +1,3 @@ - -
{{ $t('strings.hello') }} {{ title }} diff --git a/multimedia/media/media_js_standard/audioPlayer/src/main/js/default/pages/index/index.js b/multimedia/media/media_js_standard/audioPlayer/src/main/js/default/pages/index/index.js index fe1249a61c8e9e35c04a6292b40ab0cd02ac9a66..a0719cee588ac4b0f56efbf784b19647bc6645de 100644 --- a/multimedia/media/media_js_standard/audioPlayer/src/main/js/default/pages/index/index.js +++ b/multimedia/media/media_js_standard/audioPlayer/src/main/js/default/pages/index/index.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Huawei Device Co., Ltd. + * Copyright (C) 2021 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 diff --git a/multimedia/media/media_js_standard/audioPlayer/src/main/js/test/List.test.js b/multimedia/media/media_js_standard/audioPlayer/src/main/js/test/List.test.js index e5393d50d3f615b14680a5b7dd433259e3977c48..7ac6af3fe49e7bbfaf3f510f8894599cead42251 100644 --- a/multimedia/media/media_js_standard/audioPlayer/src/main/js/test/List.test.js +++ b/multimedia/media/media_js_standard/audioPlayer/src/main/js/test/List.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Huawei Device Co., Ltd. + * Copyright (C) 2021 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 diff --git a/multimedia/media/media_js_standard/audioPlayer/src/main/js/test/PlayerLocalTestAudioAPI.test.js b/multimedia/media/media_js_standard/audioPlayer/src/main/js/test/PlayerLocalTestAudioAPI.test.js index 8c430d985412dc75c2e75147bbca35e67f1a023e..859f90b139bc8577df881b9e94405a0526458a55 100644 --- a/multimedia/media/media_js_standard/audioPlayer/src/main/js/test/PlayerLocalTestAudioAPI.test.js +++ b/multimedia/media/media_js_standard/audioPlayer/src/main/js/test/PlayerLocalTestAudioAPI.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Huawei Device Co., Ltd. + * Copyright (C) 2021 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 diff --git a/multimedia/media/media_js_standard/audioPlayer/src/main/js/test/PlayerLocalTestAudioFUNC.test.js b/multimedia/media/media_js_standard/audioPlayer/src/main/js/test/PlayerLocalTestAudioFUNC.test.js index f689bd12899a9b1792623c1cc88b3e82cc970fcb..801d08eb4d1400e83f5230bee098d55994cc34fe 100644 --- a/multimedia/media/media_js_standard/audioPlayer/src/main/js/test/PlayerLocalTestAudioFUNC.test.js +++ b/multimedia/media/media_js_standard/audioPlayer/src/main/js/test/PlayerLocalTestAudioFUNC.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Huawei Device Co., Ltd. + * Copyright (C) 2021 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 diff --git a/multimedia/media/media_js_standard/audioPlayer/src/main/js/test/PlayerLocalTestAudioFormat.test.js b/multimedia/media/media_js_standard/audioPlayer/src/main/js/test/PlayerLocalTestAudioFormat.test.js index 02074a01721be4935e75b154b5aef299eb77f0e0..1582a5c86ad979d9afafe37cf2e85ee746ca5c67 100644 --- a/multimedia/media/media_js_standard/audioPlayer/src/main/js/test/PlayerLocalTestAudioFormat.test.js +++ b/multimedia/media/media_js_standard/audioPlayer/src/main/js/test/PlayerLocalTestAudioFormat.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Huawei Device Co., Ltd. + * Copyright (C) 2021 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 diff --git a/multimedia/media/media_js_standard/audioRecorder/BUILD.gn b/multimedia/media/media_js_standard/audioRecorder/BUILD.gn index b641f9f7ed7f6655167d398653abb13127126dc5..a91e5e187679606dfa492f8fccb693accbf14dd1 100644 --- a/multimedia/media/media_js_standard/audioRecorder/BUILD.gn +++ b/multimedia/media/media_js_standard/audioRecorder/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021-2022 Huawei Device Co., Ltd. +# Copyright (C) 2021 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 diff --git a/multimedia/media/media_js_standard/audioRecorder/src/main/java/ohos/acts/multimedia/audio/audioplayer/MainAbility.java b/multimedia/media/media_js_standard/audioRecorder/src/main/java/ohos/acts/multimedia/audio/audioplayer/MainAbility.java index c3adacfc7a7e0e86651b857ee2f6e857d5c173be..84cb3efd1dba0d92d906a3624192afd6b887499a 100644 --- a/multimedia/media/media_js_standard/audioRecorder/src/main/java/ohos/acts/multimedia/audio/audioplayer/MainAbility.java +++ b/multimedia/media/media_js_standard/audioRecorder/src/main/java/ohos/acts/multimedia/audio/audioplayer/MainAbility.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2021 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 diff --git a/multimedia/media/media_js_standard/audioRecorder/src/main/java/ohos/acts/multimedia/audio/audioplayer/MyApplication.java b/multimedia/media/media_js_standard/audioRecorder/src/main/java/ohos/acts/multimedia/audio/audioplayer/MyApplication.java index 956bc88979f54b82cf83932c34081ad9f26e8588..a735d0a33e16bdb4ae0194d12fb865e64207b88e 100644 --- a/multimedia/media/media_js_standard/audioRecorder/src/main/java/ohos/acts/multimedia/audio/audioplayer/MyApplication.java +++ b/multimedia/media/media_js_standard/audioRecorder/src/main/java/ohos/acts/multimedia/audio/audioplayer/MyApplication.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2021 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 diff --git a/multimedia/media/media_js_standard/audioRecorder/src/main/js/default/app.js b/multimedia/media/media_js_standard/audioRecorder/src/main/js/default/app.js index dab1e8146b5f31325a3aaed0c1fbb9a6c73b39d3..e423f4bce4698ec1d7dc86c3eea3990a5e7b1085 100644 --- a/multimedia/media/media_js_standard/audioRecorder/src/main/js/default/app.js +++ b/multimedia/media/media_js_standard/audioRecorder/src/main/js/default/app.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Huawei Device Co., Ltd. + * Copyright (C) 2021 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 diff --git a/multimedia/media/media_js_standard/audioRecorder/src/main/js/default/pages/index/index.css b/multimedia/media/media_js_standard/audioRecorder/src/main/js/default/pages/index/index.css index 9fbc8868aac904db047906f6407339108a857414..5bd7567028568bd522193b2519d545ca6dcf397d 100644 --- a/multimedia/media/media_js_standard/audioRecorder/src/main/js/default/pages/index/index.css +++ b/multimedia/media/media_js_standard/audioRecorder/src/main/js/default/pages/index/index.css @@ -1,18 +1,3 @@ -/* - * Copyright (C) 2021-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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - .container { flex-direction: column; justify-content: center; diff --git a/multimedia/media/media_js_standard/audioRecorder/src/main/js/default/pages/index/index.hml b/multimedia/media/media_js_standard/audioRecorder/src/main/js/default/pages/index/index.hml index e886a71e3b847d80047843e600b38e9c4164b116..f64b040a5ae394dbaa5e185e1ecd4f4556b92184 100644 --- a/multimedia/media/media_js_standard/audioRecorder/src/main/js/default/pages/index/index.hml +++ b/multimedia/media/media_js_standard/audioRecorder/src/main/js/default/pages/index/index.hml @@ -1,18 +1,3 @@ - -
{{ $t('strings.hello') }} {{ title }} diff --git a/multimedia/media/media_js_standard/audioRecorder/src/main/js/default/pages/index/index.js b/multimedia/media/media_js_standard/audioRecorder/src/main/js/default/pages/index/index.js index fe1249a61c8e9e35c04a6292b40ab0cd02ac9a66..a0719cee588ac4b0f56efbf784b19647bc6645de 100644 --- a/multimedia/media/media_js_standard/audioRecorder/src/main/js/default/pages/index/index.js +++ b/multimedia/media/media_js_standard/audioRecorder/src/main/js/default/pages/index/index.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Huawei Device Co., Ltd. + * Copyright (C) 2021 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 diff --git a/multimedia/media/media_js_standard/audioRecorder/src/main/js/test/AudioRecorderEnumTest.test.js b/multimedia/media/media_js_standard/audioRecorder/src/main/js/test/AudioRecorderEnumTest.test.js index 25073b11e603ac7d224c3de8d770b8372000f4e3..6b6f59b9674d6ace7248b46f8dff3d622223651e 100644 --- a/multimedia/media/media_js_standard/audioRecorder/src/main/js/test/AudioRecorderEnumTest.test.js +++ b/multimedia/media/media_js_standard/audioRecorder/src/main/js/test/AudioRecorderEnumTest.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2021 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 diff --git a/multimedia/media/media_js_standard/audioRecorder/src/main/js/test/List.test.js b/multimedia/media/media_js_standard/audioRecorder/src/main/js/test/List.test.js index fcb3354f0954336f401b5bee469fec62114663ce..12ac9395c2d6c4995b88034cad7b35f26e2824a3 100644 --- a/multimedia/media/media_js_standard/audioRecorder/src/main/js/test/List.test.js +++ b/multimedia/media/media_js_standard/audioRecorder/src/main/js/test/List.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Huawei Device Co., Ltd. + * Copyright (C) 2021 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 diff --git a/multimedia/media/media_js_standard/audioRecorder/src/main/js/test/RecorderLocalTestAudioAPI.test.js b/multimedia/media/media_js_standard/audioRecorder/src/main/js/test/RecorderLocalTestAudioAPI.test.js index 712f1feaa4375c98b4fe025a5594916bb0763cf7..0d624cf3016a4f1a61a712546cdb7a029f574aba 100644 --- a/multimedia/media/media_js_standard/audioRecorder/src/main/js/test/RecorderLocalTestAudioAPI.test.js +++ b/multimedia/media/media_js_standard/audioRecorder/src/main/js/test/RecorderLocalTestAudioAPI.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Huawei Device Co., Ltd. + * Copyright (C) 2021 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 @@ -216,9 +216,7 @@ describe('RecorderLocalTestAudioAPI', function () { * @tc.level : Level2 */ it('SUB_MEDIA_RECORDER_createAudioRecorder_API_0100', 0, async function (done) { - audioConfig.uri = fdPath; - let testAudioRecorder; - expect(testAudioRecorder).assertNull(); + let testAudioRecorder = undefined; testAudioRecorder= media.createAudioRecorder(); expect(testAudioRecorder != undefined).assertTrue(); done(); @@ -233,6 +231,7 @@ describe('RecorderLocalTestAudioAPI', function () { * @tc.level : Level2 */ it('SUB_MEDIA_RECORDER_AudioRecorder_Prepare_API_0100', 0, async function (done) { + audioConfig.uri = fdPath; let testAudioRecorder= media.createAudioRecorder(); expect(testAudioRecorder != null).assertTrue(); testAudioRecorder.prepare(audioConfig); diff --git a/multimedia/media/media_js_standard/audioRecorder/src/main/js/test/RecorderLocalTestAudioFUNC.test.js b/multimedia/media/media_js_standard/audioRecorder/src/main/js/test/RecorderLocalTestAudioFUNC.test.js index e88bfb7f11c0eb23aabee2c167e46a1046954b0c..01c91211913ddd3c39733777807a3ebd84c6930a 100644 --- a/multimedia/media/media_js_standard/audioRecorder/src/main/js/test/RecorderLocalTestAudioFUNC.test.js +++ b/multimedia/media/media_js_standard/audioRecorder/src/main/js/test/RecorderLocalTestAudioFUNC.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Huawei Device Co., Ltd. + * Copyright (C) 2021 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 diff --git a/multimedia/media/media_js_standard/videoDecoder/Test.json b/multimedia/media/media_js_standard/videoDecoder/Test.json index 1597d451ac2c51b5244e919e17a92e5e8c6e6010..38d998cd630d1e6e25709ac72398a951d99e14de 100644 --- a/multimedia/media/media_js_standard/videoDecoder/Test.json +++ b/multimedia/media/media_js_standard/videoDecoder/Test.json @@ -4,9 +4,16 @@ "type": "JSUnitTest", "test-timeout": "2000000", "package": "ohos.acts.multimedia.video.videodecoder", - "shell-timeout": "60000" + "shell-timeout": "60000" }, "kits": [ + { + "test-file-name": [ + "ActsVideoDecoderJsTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + }, { "type": "PushKit", "pre-push": [ @@ -19,20 +26,13 @@ "./resource/media/es/out_320_240_10s.h264 ->/data/accounts/account_0/appdata/ohos.acts.multimedia.video.videodecoder/shared/" ] }, - { + { "type": "ShellKit", "run-command": [ "mkdir -p /data/accounts/account_0/appdata/ohos.acts.multimedia.video.videodecoder/shared/" ], "teardown-command":[ ] - }, - { - "test-file-name": [ - "ActsVideoDecoderJsTest.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true } ] -} +} \ No newline at end of file diff --git a/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderEnumTest.test.js b/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderEnumTest.test.js index 5537ee327d4de51e1b29f0e1f22fba6a9758150f..b04ed42ac844e1fb073b73707537da28be1bcf02 100644 --- a/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderEnumTest.test.js +++ b/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderEnumTest.test.js @@ -183,7 +183,7 @@ describe('VideoDecoderEnum', function () { return; } frameCountOut++; - await videoDecodeProcessor.renderOutputData(outputObject).then(() => { + await videoDecodeProcessor.freeOutputBuffer(outputObject).then(() => { console.log('in case: release output count:' + frameCountOut); }, failCallback).catch(failCatch); } diff --git a/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderFuncPromiseTest.test.js b/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderFuncPromiseTest.test.js index 8c96c5b4929c236a63c16bf247414f59d486c398..1d38876b60a99bb0c75abab2aa2cb4a45442069d 100644 --- a/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderFuncPromiseTest.test.js +++ b/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderFuncPromiseTest.test.js @@ -437,8 +437,8 @@ describe('VideoDecoderFuncPromiseTest', function () { /* * * @tc.number : SUB_MEDIA_VIDEO_DECODER_MULTIINSTANCE_PROMISE_0100 - * @tc.name : 001.creat 16 video decoder - * @tc.desc : creat 16 video decoder + * @tc.name : 001.creat multiple video decoders + * @tc.desc : creat multiple video decoders * @tc.size : MediumTest * @tc.type : Function test * @tc.level : Level0 @@ -458,7 +458,7 @@ describe('VideoDecoderFuncPromiseTest', function () { } let array = new Array(); eventEmitter.on('releaseAllDecoder', async () => { - for (let j = 0; j < 15; j++) { + for (let j = 0; j < 3; j++) { await array[j].release().then(() => { array[j] = null; }, failCallback).catch(failCatch); @@ -469,11 +469,11 @@ describe('VideoDecoderFuncPromiseTest', function () { videoDecodeProcessor = null; done(); }) - for (let i = 0; i < 16; i++) { + for (let i = 0; i < 3; i++) { await media.createVideoDecoderByMime('video/avc').then((processor) => { if (typeof (processor) != 'undefined') { console.info('in case : createVideoDecoderByMime success'); - if (i == 15) { + if (i == 2) { videoDecodeProcessor = processor; } else { array[i] = processor; diff --git a/multimedia/media/media_js_standard/videoEncoder/Test.json b/multimedia/media/media_js_standard/videoEncoder/Test.json index 205dd92efbeac607087a427bcbdd664f2b78ae60..15a97d2650435f1296b8e8e0cdcde4834bda4b87 100644 --- a/multimedia/media/media_js_standard/videoEncoder/Test.json +++ b/multimedia/media/media_js_standard/videoEncoder/Test.json @@ -4,9 +4,16 @@ "type": "JSUnitTest", "test-timeout": "2000000", "package": "ohos.acts.multimedia.video.videoencoder", - "shell-timeout": "60000" + "shell-timeout": "60000" }, "kits": [ + { + "test-file-name": [ + "ActsVideoEncoderJsTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + }, { "type": "PushKit", "pre-push": [ @@ -14,7 +21,7 @@ "push": [ ] }, - { + { "type": "ShellKit", "run-command": [ "rm -R /data/accounts/account_0/appdata/ohos.acts.multimedia.video.videoencoder/results", @@ -24,13 +31,6 @@ ], "teardown-command":[ ] - }, - { - "test-file-name": [ - "ActsVideoEncoderJsTest.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true } ] -} +} \ No newline at end of file diff --git a/multimedia/media/media_js_standard/videoEncoder/src/main/js/test/VideoEncoderMultiInstancesTest.test.js b/multimedia/media/media_js_standard/videoEncoder/src/main/js/test/VideoEncoderMultiInstancesTest.test.js index 6623b1e9345734cf361fe410a27bf706e12f41e1..38350041825a2db37e486595f6fb760085d32311 100644 --- a/multimedia/media/media_js_standard/videoEncoder/src/main/js/test/VideoEncoderMultiInstancesTest.test.js +++ b/multimedia/media/media_js_standard/videoEncoder/src/main/js/test/VideoEncoderMultiInstancesTest.test.js @@ -262,7 +262,7 @@ describe('videoEncoderSoftwareMultiInstances', function () { /* * * @tc.number : SUB_MEDIA_VIDEO_SOFTWARE_ENCODER_MULTIINSTANCE_0100 - * @tc.name : 001.create 16 encoder + * @tc.name : 001.create multiple encoders * @tc.desc : basic encode function * @tc.size : MediumTest * @tc.type : Function test @@ -284,7 +284,7 @@ describe('videoEncoderSoftwareMultiInstances', function () { let array = new Array(); eventEmitter.once('nextStep', async () => { - for (let j = 1; j < 16; j++) { + for (let j = 1; j < 3; j++) { await array[j].release().then(() => { console.info("case release encoder " + j); array[j] = null; @@ -303,11 +303,11 @@ describe('videoEncoderSoftwareMultiInstances', function () { toStartStream(); await toStart(); } - for (let i = 1; i <= 16; i += 1) { + for (let i = 1; i <= 3; i += 1) { await media.createVideoEncoderByMime(mime).then((processor) => { if (typeof(processor) != 'undefined') { console.info("case create createVideoEncoder success: " + i); - if (i == 16) { + if (i == 3) { videoEncodeProcessor = processor; runCase(); } else { diff --git a/multimedia/media/media_js_standard/videoPlayer/BUILD.gn b/multimedia/media/media_js_standard/videoPlayer/BUILD.gn index 2798964f112d856d337086251d06a611cb532034..95e552cd258b3924fd639505fb4101a7f0e82c64 100644 --- a/multimedia/media/media_js_standard/videoPlayer/BUILD.gn +++ b/multimedia/media/media_js_standard/videoPlayer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2022 Huawei Device Co., Ltd. +# Copyright (C) 2021 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 @@ -26,7 +26,7 @@ ohos_js_hap_suite("video_player_js_hap") { # "//third_party/libpng:libpng", # ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "VideoPlayerJsTest" + hap_name = "ActsVideoPlayerJsTest" # part_name = "prebuilt_hap" # subsystem_name = "xts" diff --git a/multimedia/media/media_js_standard/videoPlayer/Test.json b/multimedia/media/media_js_standard/videoPlayer/Test.json index 38a50cf8af9bff0b9d6e71a0df80837d2cee2bac..093ca77fba50c168c25df46e2b802fa6f79b1c11 100644 --- a/multimedia/media/media_js_standard/videoPlayer/Test.json +++ b/multimedia/media/media_js_standard/videoPlayer/Test.json @@ -7,6 +7,13 @@ "shell-timeout": "60000" }, "kits": [ + { + "test-file-name": [ + "ActsVideoPlayerJsTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + }, { "type": "PushKit", "pre-push": [ @@ -15,19 +22,12 @@ "./resource/audio/H264_AAC.mp4 ->/data/accounts/account_0/appdata/ohos.acts.multimedia.video.videoplayer/" ] }, - { + { "type": "ShellKit", "run-command": [ ], "teardown-command":[ ] - }, - { - "test-file-name": [ - "VideoPlayerJsTest.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true } ] } diff --git a/multimedia/media/media_js_standard/videoPlayer/src/main/js/default/app.js b/multimedia/media/media_js_standard/videoPlayer/src/main/js/default/app.js index 830070d196d86b127cea947d168bfd116f446205..e423f4bce4698ec1d7dc86c3eea3990a5e7b1085 100644 --- a/multimedia/media/media_js_standard/videoPlayer/src/main/js/default/app.js +++ b/multimedia/media/media_js_standard/videoPlayer/src/main/js/default/app.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2021 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 diff --git a/multimedia/media/media_js_standard/videoPlayer/src/main/js/default/pages/index/index.css b/multimedia/media/media_js_standard/videoPlayer/src/main/js/default/pages/index/index.css index c9195944a956c0d5628c701b7a3d9d2ed525cd2d..5bd7567028568bd522193b2519d545ca6dcf397d 100644 --- a/multimedia/media/media_js_standard/videoPlayer/src/main/js/default/pages/index/index.css +++ b/multimedia/media/media_js_standard/videoPlayer/src/main/js/default/pages/index/index.css @@ -1,18 +1,3 @@ -/* - * 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - .container { flex-direction: column; justify-content: center; diff --git a/multimedia/media/media_js_standard/videoPlayer/src/main/js/default/pages/index/index.hml b/multimedia/media/media_js_standard/videoPlayer/src/main/js/default/pages/index/index.hml index 2f5e3fb8abcfb8ab867384ce3bb3f7e5e51cf0b6..72f3c770a73984065efff437c147e907694a536f 100644 --- a/multimedia/media/media_js_standard/videoPlayer/src/main/js/default/pages/index/index.hml +++ b/multimedia/media/media_js_standard/videoPlayer/src/main/js/default/pages/index/index.hml @@ -1,18 +1,3 @@ - -
{{ $t('strings.hello') }} {{ title }} diff --git a/multimedia/media/media_js_standard/videoPlayer/src/main/js/default/pages/index/index.js b/multimedia/media/media_js_standard/videoPlayer/src/main/js/default/pages/index/index.js index 592512fd26805933b92a56ed3b50f7ab8a065226..94aded985271b85ad43586be3dde56fac3fbd3a9 100644 --- a/multimedia/media/media_js_standard/videoPlayer/src/main/js/default/pages/index/index.js +++ b/multimedia/media/media_js_standard/videoPlayer/src/main/js/default/pages/index/index.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2021 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 diff --git a/multimedia/media/media_js_standard/videoPlayer/src/main/js/test/List.test.js b/multimedia/media/media_js_standard/videoPlayer/src/main/js/test/List.test.js index cae717499517589076015af33115a3db41d70026..322b7acdb9d754cd8af5be58d82063229ab7de40 100644 --- a/multimedia/media/media_js_standard/videoPlayer/src/main/js/test/List.test.js +++ b/multimedia/media/media_js_standard/videoPlayer/src/main/js/test/List.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2021 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 diff --git a/multimedia/media/media_js_standard/videoPlayer/src/main/js/test/VideoPlayerAPICallbackTest.test.js b/multimedia/media/media_js_standard/videoPlayer/src/main/js/test/VideoPlayerAPICallbackTest.test.js index a86b723ee3b2ded97836d20601d1e9a2e6a055e3..54786070f9f7ffc1ab6527d695b9499e216bd6b7 100644 --- a/multimedia/media/media_js_standard/videoPlayer/src/main/js/test/VideoPlayerAPICallbackTest.test.js +++ b/multimedia/media/media_js_standard/videoPlayer/src/main/js/test/VideoPlayerAPICallbackTest.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2021 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 diff --git a/multimedia/media/media_js_standard/videoPlayer/src/main/js/test/VideoPlayerEnumTest.test.js b/multimedia/media/media_js_standard/videoPlayer/src/main/js/test/VideoPlayerEnumTest.test.js index 41d2c346912fe28e356d650ea441db04bf5e2f25..3ae970e2bac4ef58dcee4a944187adc76b4a6b74 100644 --- a/multimedia/media/media_js_standard/videoPlayer/src/main/js/test/VideoPlayerEnumTest.test.js +++ b/multimedia/media/media_js_standard/videoPlayer/src/main/js/test/VideoPlayerEnumTest.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2021 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 diff --git a/multimedia/media/media_js_standard/videoPlayer/src/main/js/test/VideoPlayerFuncCallbackTest.test.js b/multimedia/media/media_js_standard/videoPlayer/src/main/js/test/VideoPlayerFuncCallbackTest.test.js index e21d92d3cf4ec7af29396d04e366f73a2bcf8be1..7d1da3e15f5886b8fd2fcce88cb6001ecf186c33 100644 --- a/multimedia/media/media_js_standard/videoPlayer/src/main/js/test/VideoPlayerFuncCallbackTest.test.js +++ b/multimedia/media/media_js_standard/videoPlayer/src/main/js/test/VideoPlayerFuncCallbackTest.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2021 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 diff --git a/multimedia/media/media_js_standard/videoPlayer/src/main/js/test/VideoPlayerFuncPromiseTest.test.js b/multimedia/media/media_js_standard/videoPlayer/src/main/js/test/VideoPlayerFuncPromiseTest.test.js index 1161dffe57bae880ce9f26ce3adc8d3aea28d475..178a4d1506fa0f01ec803c2fb955e1ef93afc065 100644 --- a/multimedia/media/media_js_standard/videoPlayer/src/main/js/test/VideoPlayerFuncPromiseTest.test.js +++ b/multimedia/media/media_js_standard/videoPlayer/src/main/js/test/VideoPlayerFuncPromiseTest.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2021 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 diff --git a/multimedia/media/media_js_standard/videoRecorder/BUILD.gn b/multimedia/media/media_js_standard/videoRecorder/BUILD.gn index ffa1ae7e2a45a36a2c98bd5497e2368244f8de25..4c0c226998958413ea7301ec2e170aa4b3a75acb 100644 --- a/multimedia/media/media_js_standard/videoRecorder/BUILD.gn +++ b/multimedia/media/media_js_standard/videoRecorder/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2022 Huawei Device Co., Ltd. +# Copyright (C) 2021 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 @@ -24,7 +24,7 @@ ohos_js_hap_suite("video_recorder_js_hap") { # "//third_party/libpng:libpng", # ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "VideoRecorderJsTest" + hap_name = "ActsVideoRecorderJsTest" # part_name = "prebuilt_hap" # subsystem_name = "xts" diff --git a/multimedia/media/media_js_standard/videoRecorder/Test.json b/multimedia/media/media_js_standard/videoRecorder/Test.json index f8008548a863d063356c4d7cb90a33e8036acb83..c8c2aac4fd94fce8f3d04d39e8e1e0c815f4a478 100644 --- a/multimedia/media/media_js_standard/videoRecorder/Test.json +++ b/multimedia/media/media_js_standard/videoRecorder/Test.json @@ -2,7 +2,7 @@ "description": "Configuration for videoRecorder Tests", "driver": { "type": "JSUnitTest", - "test-timeout": "1000000", + "test-timeout": "2000000", "package": "ohos.acts.multimedia.video.videorecorder", "shell-timeout": "60000" }, @@ -16,7 +16,7 @@ }, { "test-file-name": [ - "VideoRecorderJsTest.hap" + "ActsVideoRecorderJsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/multimedia/media/media_js_standard/videoRecorder/src/main/js/default/app.js b/multimedia/media/media_js_standard/videoRecorder/src/main/js/default/app.js index 830070d196d86b127cea947d168bfd116f446205..e423f4bce4698ec1d7dc86c3eea3990a5e7b1085 100644 --- a/multimedia/media/media_js_standard/videoRecorder/src/main/js/default/app.js +++ b/multimedia/media/media_js_standard/videoRecorder/src/main/js/default/app.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2021 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 diff --git a/multimedia/media/media_js_standard/videoRecorder/src/main/js/default/pages/index/index.css b/multimedia/media/media_js_standard/videoRecorder/src/main/js/default/pages/index/index.css index df9cfd9f99a4ccebb48d316a717eed3ef5bfb644..5bd7567028568bd522193b2519d545ca6dcf397d 100644 --- a/multimedia/media/media_js_standard/videoRecorder/src/main/js/default/pages/index/index.css +++ b/multimedia/media/media_js_standard/videoRecorder/src/main/js/default/pages/index/index.css @@ -1,18 +1,3 @@ -/* - * 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - .container { flex-direction: column; justify-content: center; diff --git a/multimedia/media/media_js_standard/videoRecorder/src/main/js/default/pages/index/index.hml b/multimedia/media/media_js_standard/videoRecorder/src/main/js/default/pages/index/index.hml index 6892123992c660d987c2b58eb133e13504ab2072..f64b040a5ae394dbaa5e185e1ecd4f4556b92184 100644 --- a/multimedia/media/media_js_standard/videoRecorder/src/main/js/default/pages/index/index.hml +++ b/multimedia/media/media_js_standard/videoRecorder/src/main/js/default/pages/index/index.hml @@ -1,18 +1,3 @@ - -
{{ $t('strings.hello') }} {{ title }} diff --git a/multimedia/media/media_js_standard/videoRecorder/src/main/js/default/pages/index/index.js b/multimedia/media/media_js_standard/videoRecorder/src/main/js/default/pages/index/index.js index 67f8b8567ccc4932331b7a18a6b947340d84fb40..a0719cee588ac4b0f56efbf784b19647bc6645de 100644 --- a/multimedia/media/media_js_standard/videoRecorder/src/main/js/default/pages/index/index.js +++ b/multimedia/media/media_js_standard/videoRecorder/src/main/js/default/pages/index/index.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2021 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 diff --git a/multimedia/media/media_js_standard/videoRecorder/src/main/js/test/List.test.js b/multimedia/media/media_js_standard/videoRecorder/src/main/js/test/List.test.js index 9f6a6e773a7777bad58414117d2450acb2e98941..b894eaf3c4c64b6e10712d20013a9e1832a82c33 100644 --- a/multimedia/media/media_js_standard/videoRecorder/src/main/js/test/List.test.js +++ b/multimedia/media/media_js_standard/videoRecorder/src/main/js/test/List.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2021 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 diff --git a/multimedia/media/media_js_standard/videoRecorder/src/main/js/test/VideoRecorderAPICallbackTest.test.js b/multimedia/media/media_js_standard/videoRecorder/src/main/js/test/VideoRecorderAPICallbackTest.test.js index cb16d1e41a989422c70adcf81a517f589b23964f..31020098e88eed3267aa34d15be2f72bc694d678 100644 --- a/multimedia/media/media_js_standard/videoRecorder/src/main/js/test/VideoRecorderAPICallbackTest.test.js +++ b/multimedia/media/media_js_standard/videoRecorder/src/main/js/test/VideoRecorderAPICallbackTest.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2021 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 diff --git a/multimedia/media/media_js_standard/videoRecorder/src/main/js/test/VideoRecorderFuncCallbackTest.test.js b/multimedia/media/media_js_standard/videoRecorder/src/main/js/test/VideoRecorderFuncCallbackTest.test.js index eb0e015b21270154dde12077e9184d0517cfdebf..790e3d5800d1e29dff96c293debdfbadd1472995 100644 --- a/multimedia/media/media_js_standard/videoRecorder/src/main/js/test/VideoRecorderFuncCallbackTest.test.js +++ b/multimedia/media/media_js_standard/videoRecorder/src/main/js/test/VideoRecorderFuncCallbackTest.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2021 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 @@ -55,13 +55,13 @@ describe('VideoRecorderFuncCallbackTest', function () { videoFrameHeight : 480, videoFrameRate : 10 } - // orientationHint 0, 90, 180, 270 + // rotation 0, 90, 180, 270 let videoConfig = { audioSourceType : 1, videoSourceType : 0, profile : configFile, url : 'file:///data/media/01.mp4', - orientationHint : 0, + rotation : 0, location : { latitude : 30, longitude : 130 }, maxSize : 100, maxDuration : 500 @@ -81,7 +81,7 @@ describe('VideoRecorderFuncCallbackTest', function () { videoSourceType : 0, profile : onlyVideoProfile, url : 'file:///data/media/01.mp4', - orientationHint : 0, + rotation : 0, location : { latitude : 30, longitude : 130 }, maxSize : 100, maxDuration : 500 @@ -728,7 +728,7 @@ describe('VideoRecorderFuncCallbackTest', function () { /* * * @tc.number : SUB_MEDIA_VIDEO_RECORDER_FUNCTION_CALLBACK_1900 - * @tc.name : 19.orientationHint 90 (callback) + * @tc.name : 19.rotation 90 (callback) * @tc.desc : Audio recordr control test * @tc.size : MediumTest * @tc.type : Function @@ -737,7 +737,7 @@ describe('VideoRecorderFuncCallbackTest', function () { it('SUB_MEDIA_VIDEO_RECORDER_FUNCTION_CALLBACK_1900', 0, async function (done) { await getFd('37.mp4'); videoConfig.url = fdPath; - videoConfig.orientationHint = 90; + videoConfig.rotation = 90; let videoRecorder = null; let mySteps = new Array(CREATE_EVENT, PREPARE_EVENT, GETSURFACE_EVENT, START_EVENT, RELEASE_EVENT, END_EVENT); @@ -746,7 +746,7 @@ describe('VideoRecorderFuncCallbackTest', function () { /* * * @tc.number : SUB_MEDIA_VIDEO_RECORDER_FUNCTION_CALLBACK_2000 - * @tc.name : 20.orientationHint 180 (callback) + * @tc.name : 20.rotation 180 (callback) * @tc.desc : Audio recordr control test * @tc.size : MediumTest * @tc.type : Function @@ -755,7 +755,7 @@ describe('VideoRecorderFuncCallbackTest', function () { it('SUB_MEDIA_VIDEO_RECORDER_FUNCTION_CALLBACK_2000', 0, async function (done) { await getFd('38.mp4'); videoConfig.url = fdPath; - videoConfig.orientationHint = 180; + videoConfig.rotation = 180; let videoRecorder = null; let mySteps = new Array(CREATE_EVENT, PREPARE_EVENT, GETSURFACE_EVENT, START_EVENT, RELEASE_EVENT, END_EVENT); eventEmitter.emit(mySteps[0], videoRecorder, mySteps, done); @@ -763,7 +763,7 @@ describe('VideoRecorderFuncCallbackTest', function () { /* * * @tc.number : SUB_MEDIA_VIDEO_RECORDER_FUNCTION_CALLBACK_2100 - * @tc.name : 21.orientationHint 270 (callback) + * @tc.name : 21.rotation 270 (callback) * @tc.desc : Audio recordr control test * @tc.size : MediumTest * @tc.type : Function @@ -772,7 +772,7 @@ describe('VideoRecorderFuncCallbackTest', function () { it('SUB_MEDIA_VIDEO_RECORDER_FUNCTION_CALLBACK_2100', 0, async function (done) { await getFd('39.mp4'); videoConfig.url = fdPath; - videoConfig.orientationHint = 270; + videoConfig.rotation = 270; let videoRecorder = null; let mySteps = new Array(CREATE_EVENT, PREPARE_EVENT, GETSURFACE_EVENT, START_EVENT, RELEASE_EVENT, END_EVENT); eventEmitter.emit(mySteps[0], videoRecorder, mySteps, done); diff --git a/multimedia/media/media_js_standard/videoRecorder/src/main/js/test/VideoRecorderFuncPromiseTest.test.js b/multimedia/media/media_js_standard/videoRecorder/src/main/js/test/VideoRecorderFuncPromiseTest.test.js index 62ab246181c1811f714327bb50db1663bd7391b2..c6c98e99b030ca7d59738cf1ec574b910aa6c496 100644 --- a/multimedia/media/media_js_standard/videoRecorder/src/main/js/test/VideoRecorderFuncPromiseTest.test.js +++ b/multimedia/media/media_js_standard/videoRecorder/src/main/js/test/VideoRecorderFuncPromiseTest.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2021 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 @@ -46,7 +46,7 @@ describe('VideoRecorderFuncPromiseTest', function () { videoSourceType : 0, profile : configFile, url : 'file:///data/media/01.mp4', - orientationHint : 0, + rotation : 0, location : { latitude : 30, longitude : 130 }, maxSize : 100, maxDuration : 500 @@ -66,7 +66,7 @@ describe('VideoRecorderFuncPromiseTest', function () { videoSourceType : 0, profile : onlyVideoProfile, url : 'file:///data/media/01.mp4', - orientationHint : 0, + rotation : 0, location : { latitude : 30, longitude : 130 }, maxSize : 100, maxDuration : 500 @@ -1263,7 +1263,7 @@ describe('VideoRecorderFuncPromiseTest', function () { /* * * @tc.number : SUB_MEDIA_VIDEO_RECORDER_FUNCTION_PROMISE_1900 - * @tc.name : 19.orientationHint 90 (promise) + * @tc.name : 19.rotation 90 (promise) * @tc.desc : Audio recordr control test * @tc.size : MediumTest * @tc.type : Function @@ -1275,7 +1275,7 @@ describe('VideoRecorderFuncPromiseTest', function () { let videoOutput; await getFd('40.mp4'); videoConfig.url = fdPath; - videoConfig.orientationHint = 90; + videoConfig.rotation = 90; await media.createVideoRecorder().then((recorder) => { console.info('case createVideoRecorder called'); if (typeof (recorder) != 'undefined') { @@ -1312,7 +1312,7 @@ describe('VideoRecorderFuncPromiseTest', function () { /* * * @tc.number : SUB_MEDIA_VIDEO_RECORDER_FUNCTION_PROMISE_2000 - * @tc.name : 20.orientationHint 180 (promise) + * @tc.name : 20.rotation 180 (promise) * @tc.desc : Audio recordr control test * @tc.size : MediumTest * @tc.type : Function @@ -1324,7 +1324,7 @@ describe('VideoRecorderFuncPromiseTest', function () { let videoOutput; await getFd('41.mp4'); videoConfig.url = fdPath; - videoConfig.orientationHint = 180; + videoConfig.rotation = 180; await media.createVideoRecorder().then((recorder) => { console.info('case createVideoRecorder called'); if (typeof (recorder) != 'undefined') { @@ -1361,7 +1361,7 @@ describe('VideoRecorderFuncPromiseTest', function () { /* * * @tc.number : SUB_MEDIA_VIDEO_RECORDER_FUNCTION_PROMISE_2100 - * @tc.name : 21.orientationHint 270 (promise) + * @tc.name : 21.rotation 270 (promise) * @tc.desc : Audio recordr control test * @tc.size : MediumTest * @tc.type : Function @@ -1373,7 +1373,7 @@ describe('VideoRecorderFuncPromiseTest', function () { let videoOutput; await getFd('42.mp4'); videoConfig.url = fdPath; - videoConfig.orientationHint = 270; + videoConfig.rotation = 270; await media.createVideoRecorder().then((recorder) => { console.info('case createVideoRecorder called'); if (typeof (recorder) != 'undefined') {