diff --git a/multimedia/media/media_js_standard/audioDecoder/src/main/js/test/AudioDecoderEnumTest.test.js b/multimedia/media/media_js_standard/audioDecoder/src/main/js/test/AudioDecoderEnumTest.test.js index 5a4a48f318984dd7344ac994cf1ae6ec6bd32997..4b04c73a09de53e61e7fea1ec8173304dd2be401 100644 --- a/multimedia/media/media_js_standard/audioDecoder/src/main/js/test/AudioDecoderEnumTest.test.js +++ b/multimedia/media/media_js_standard/audioDecoder/src/main/js/test/AudioDecoderEnumTest.test.js @@ -28,7 +28,6 @@ describe('AudioDecoderEnum', function () { afterEach(function() { console.info('afterEach case'); - wait(2000); }) afterAll(function() { diff --git a/multimedia/media/media_js_standard/audioDecoder/src/main/js/test/AudioDecoderReliabilityCallbackTest.test.js b/multimedia/media/media_js_standard/audioDecoder/src/main/js/test/AudioDecoderReliabilityCallbackTest.test.js index e4e3f7335636a849b58f2b348e6d87de8b07af4c..8364daa5f51a3ef7f17a3d591089d3bfef77cd77 100644 --- a/multimedia/media/media_js_standard/audioDecoder/src/main/js/test/AudioDecoderReliabilityCallbackTest.test.js +++ b/multimedia/media/media_js_standard/audioDecoder/src/main/js/test/AudioDecoderReliabilityCallbackTest.test.js @@ -538,8 +538,7 @@ describe('AudioDecoderReliabilityCallback', function () { } } else{ - writeFile(savepath, outputobject.data, outputobject.length); - console.info("write to file success"); + console.info("not last frame, continue"); } audioDecodeProcessor.freeOutputBuffer(outputobject, () => { console.info('release output success'); diff --git a/multimedia/media/media_js_standard/audioDecoder/src/main/js/test/AudioDecoderReliabilityPromiseTest.test.js b/multimedia/media/media_js_standard/audioDecoder/src/main/js/test/AudioDecoderReliabilityPromiseTest.test.js index 6e3027aae10b4d861bec67d28791041f5ecf16c9..83f32598936817f271348df5f3902fc9a13599cc 100644 --- a/multimedia/media/media_js_standard/audioDecoder/src/main/js/test/AudioDecoderReliabilityPromiseTest.test.js +++ b/multimedia/media/media_js_standard/audioDecoder/src/main/js/test/AudioDecoderReliabilityPromiseTest.test.js @@ -541,8 +541,7 @@ describe('AudioDecoderReliabilityPromise', function () { } } else{ - writeFile(savapath, outputobject.data, outputobject.length); - console.info("write to file success"); + console.info("not last frame, continue"); } audioDecodeProcessor.freeOutputBuffer(outputobject).then(() => { console.info('release output success'); diff --git a/multimedia/media/media_js_standard/audioEncoder/Test.json b/multimedia/media/media_js_standard/audioEncoder/Test.json index 62300221edec1a5541149a57498ef4bc2797b78f..c3eecbbbfeeae448175937755be68eac99886613 100644 --- a/multimedia/media/media_js_standard/audioEncoder/Test.json +++ b/multimedia/media/media_js_standard/audioEncoder/Test.json @@ -1,5 +1,5 @@ { - "description": "Configuration for audioPlayer Tests", + "description": "Configuration for audioEncoder Tests", "driver": { "type": "JSUnitTest", "test-timeout": "2000000", @@ -19,8 +19,7 @@ "pre-push": [ ], "push": [ - "./resource/audio/audioEncode/S32LE.pcm ->/data/accounts/account_0/appdata/ohos.acts.multimedia.audio.audioencoder/", - "./resource/audio/audioEncode/S32LE_2.pcm ->/data/accounts/account_0/appdata/ohos.acts.multimedia.audio.audioencoder/" + "./resource/audio/audioEncode/S16LE.pcm ->/data/accounts/account_0/appdata/ohos.acts.multimedia.audio.audioencoder/" ] }, { diff --git a/multimedia/media/media_js_standard/audioEncoder/src/main/js/test/AudioEncoderFuncCallbackTest.test.js b/multimedia/media/media_js_standard/audioEncoder/src/main/js/test/AudioEncoderFuncCallbackTest.test.js index e753a2628cdad5b70ad8e4f63c7b6cc303b5b612..63fbf83affe8933bb51d6e8328ec39d98005aa22 100644 --- a/multimedia/media/media_js_standard/audioEncoder/src/main/js/test/AudioEncoderFuncCallbackTest.test.js +++ b/multimedia/media/media_js_standard/audioEncoder/src/main/js/test/AudioEncoderFuncCallbackTest.test.js @@ -19,8 +19,7 @@ import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from ' describe('AudioEncoderFuncCallback', function () { const RESOURCEPATH = '/data/accounts/account_0/appdata/ohos.acts.multimedia.audio.audioencoder/' - const AUDIOPATH = RESOURCEPATH + 'S32LE.pcm'; - const AUDIOPATH2 = RESOURCEPATH + 'S32LE_2.pcm'; + const AUDIOPATH = RESOURCEPATH + 'S16LE.pcm'; const BASIC_PATH = RESOURCEPATH + 'results/encode_func_callback_'; let audioEncodeProcessor; let readStreamSync; @@ -61,7 +60,7 @@ describe('AudioEncoderFuncCallback', function () { sawOutputEOS = false; inputQueue = []; outputQueue = []; - ES_LENGTH = 2000; + ES_LENGTH = 1500; }) afterEach(async function() { @@ -139,8 +138,8 @@ describe('AudioEncoderFuncCallback', function () { console.info("start add ADTS to Packet"); let packetLen = len + 7; // 7: head length let profile = 2; // 2: AAC LC - let freqIdx = 3; // 3: 48000HZ - let chanCfg = 1; // 1: 1 channel + let freqIdx = 4; // 4: 44100HZ + let chanCfg = 2; // 2: 2 channel view[0] = 0xFF; view[1] = 0xF9; view[2] = ((profile - 1) << 6) + (freqIdx << 2) + (chanCfg >> 2); @@ -163,7 +162,11 @@ describe('AudioEncoderFuncCallback', function () { expect(err).assertUndefined(); console.info("case reset success"); if (needrelease) { - audioEncodeProcessor = null + audioEncodeProcessor.release((err) => { + expect(err).assertUndefined(); + console.info("case release success"); + audioEncodeProcessor = null; + }) } }) } @@ -299,14 +302,14 @@ describe('AudioEncoderFuncCallback', function () { let events = require('events'); let eventEmitter = new events.EventEmitter(); let mediaDescription = { - "channel_count": 1, - "sample_rate": 48000, - "audio_sample_format": 3, + "channel_count": 2, + "sample_rate": 44100, + "audio_sample_format": 1, } let mediaDescription2 = { "codec_mime": 'audio/mp4a-latm', } - let savepath = BASIC_PATH + 'callback0000.es'; + let savepath = BASIC_PATH + '0000.aac'; needGetMediaDes = true; workdoneAtEOS = true; eventEmitter.on('getAudioEncoderCaps', () => { @@ -382,11 +385,11 @@ describe('AudioEncoderFuncCallback', function () { let events = require('events'); let eventEmitter = new events.EventEmitter(); let mediaDescription = { - "channel_count": 1, - "sample_rate": 48000, - "audio_sample_format": 3, + "channel_count": 2, + "sample_rate": 44100, + "audio_sample_format": 1, } - let savepath = BASIC_PATH + 'callback0100.es'; + let savepath = BASIC_PATH + '0100.aac'; eosframenum = 500; workdoneAtEOS = true; eventEmitter.on('getAudioEncoderCaps', () => { @@ -440,11 +443,11 @@ describe('AudioEncoderFuncCallback', function () { let events = require('events'); let eventEmitter = new events.EventEmitter(); let mediaDescription = { - "channel_count": 1, - "sample_rate": 48000, - "audio_sample_format": 3, + "channel_count": 2, + "sample_rate": 44100, + "audio_sample_format": 1, } - let savepath = BASIC_PATH + 'callback0200.es'; + let savepath = BASIC_PATH + '0200.aac'; workdoneAtEOS = true; eventEmitter.on('getAudioEncoderCaps', () => { audioEncodeProcessor.getAudioEncoderCaps((err, Audiocaps) => { @@ -506,11 +509,11 @@ describe('AudioEncoderFuncCallback', function () { let events = require('events'); let eventEmitter = new events.EventEmitter(); let mediaDescription = { - "channel_count": 1, - "sample_rate": 48000, - "audio_sample_format": 3, + "channel_count": 2, + "sample_rate": 44100, + "audio_sample_format": 1, } - let savepath = BASIC_PATH + 'callback0300.es'; + let savepath = BASIC_PATH + '0300.aac'; eosframenum = 500; flushAtEOS = true; eventEmitter.on('getAudioEncoderCaps', () => { @@ -564,11 +567,11 @@ describe('AudioEncoderFuncCallback', function () { let events = require('events'); let eventEmitter = new events.EventEmitter(); let mediaDescription = { - "channel_count": 1, - "sample_rate": 48000, - "audio_sample_format": 3, + "channel_count": 2, + "sample_rate": 44100, + "audio_sample_format": 1, } - let savepath = BASIC_PATH + 'callback0400.es'; + let savepath = BASIC_PATH + '0400.aac'; eventEmitter.on('getAudioEncoderCaps', () => { audioEncodeProcessor.getAudioEncoderCaps((err, Audiocaps) => { expect(err).assertUndefined(); @@ -646,11 +649,11 @@ describe('AudioEncoderFuncCallback', function () { let events = require('events'); let eventEmitter = new events.EventEmitter(); let mediaDescription = { - "channel_count": 1, - "sample_rate": 48000, - "audio_sample_format": 3, + "channel_count": 2, + "sample_rate": 44100, + "audio_sample_format": 1, } - let savepath = BASIC_PATH + 'callback0500.es'; + let savepath = BASIC_PATH + '0500.aac'; eosframenum = 100; eventEmitter.on('getAudioEncoderCaps', () => { audioEncodeProcessor.getAudioEncoderCaps((err, Audiocaps) => { @@ -725,17 +728,17 @@ describe('AudioEncoderFuncCallback', function () { let events = require('events'); let eventEmitter = new events.EventEmitter(); let mediaDescription = { - "channel_count": 1, - "sample_rate": 48000, - "audio_sample_format": 3, + "channel_count": 2, + "sample_rate": 44100, + "audio_sample_format": 1, } - let savepath = BASIC_PATH + 'callback0600.es'; + let savepath = BASIC_PATH + '0600.aac'; eosframenum = 100; resetAtEOS = true; let mediaDescription2 = { - "channel_count": 1, - "sample_rate": 48000, - "audio_sample_format": 3, + "channel_count": 2, + "sample_rate": 44100, + "audio_sample_format": 1, } let hasreconfigured = false; eventEmitter.on('getAudioEncoderCaps', () => { @@ -777,8 +780,8 @@ describe('AudioEncoderFuncCallback', function () { expect(err).assertUndefined(); console.info(`case configure 2`); resetParam(); - readFile(AUDIOPATH2) - savepath = BASIC_PATH + 'callback0601.es'; + readFile(AUDIOPATH) + savepath = BASIC_PATH + '0601.aac'; workdoneAtEOS = true; hasreconfigured = true; eventEmitter.emit('prepare'); diff --git a/multimedia/media/media_js_standard/audioEncoder/src/main/js/test/AudioEncoderFuncPromiseTest.test.js b/multimedia/media/media_js_standard/audioEncoder/src/main/js/test/AudioEncoderFuncPromiseTest.test.js index e47d8deb645d7d1261b96845aaec3baaff657184..80fae451b2b657b69fbb13115af9bfd2c1a56e37 100644 --- a/multimedia/media/media_js_standard/audioEncoder/src/main/js/test/AudioEncoderFuncPromiseTest.test.js +++ b/multimedia/media/media_js_standard/audioEncoder/src/main/js/test/AudioEncoderFuncPromiseTest.test.js @@ -19,8 +19,7 @@ import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from ' describe('AudioEncoderFuncPromise', function () { const RESOURCEPATH = '/data/accounts/account_0/appdata/ohos.acts.multimedia.audio.audioencoder/' - const AUDIOPATH = RESOURCEPATH + 'S32LE.pcm'; - const AUDIOPATH2 = RESOURCEPATH + 'S32LE_2.pcm'; + const AUDIOPATH = RESOURCEPATH + 'S16LE.pcm'; const BASIC_PATH = RESOURCEPATH + 'results/encode_func_promise_'; let audioEncodeProcessor; let readStreamSync; @@ -38,7 +37,7 @@ describe('AudioEncoderFuncPromise', function () { let inputQueue = []; let outputQueue = []; const ES = [0, 4096]; - let ES_LENGTH = 2000; + let ES_LENGTH = 1500; beforeAll(function() { console.info('beforeAll case'); @@ -61,7 +60,7 @@ describe('AudioEncoderFuncPromise', function () { sawOutputEOS = false; inputQueue = []; outputQueue = []; - ES_LENGTH = 2000; + ES_LENGTH = 1500; }) afterEach(async function() { @@ -150,8 +149,8 @@ describe('AudioEncoderFuncPromise', function () { console.info("start add ADTS to Packet"); let packetLen = len + 7; // 7: head length let profile = 2; // 2: AAC LC - let freqIdx = 3; // 3: 48000HZ - let chanCfg = 1; // 1: 1 channel + let freqIdx = 4; // 4: 44100HZ + let chanCfg = 2; // 2: 2 channel view[0] = 0xFF; view[1] = 0xF9; view[2] = ((profile - 1) << 6) + (freqIdx << 2) + (chanCfg >> 2); @@ -169,9 +168,12 @@ describe('AudioEncoderFuncPromise', function () { async function resetWork() { resetParam(); - await audioEncodeProcessor.reset().then(() => { + await audioEncodeProcessor.reset().then(async() => { console.info("case reset success"); if (needrelease) { + await audioEncodeProcessor.release().then(() => { + console.info("case release success"); + }, failCallback).catch(failCatch); audioEncodeProcessor = null; } }, failCallback).catch(failCatch); @@ -202,7 +204,6 @@ describe('AudioEncoderFuncPromise', function () { audioEncodeProcessor = null; } - function sleep(time) { return new Promise((resolve) => setTimeout(resolve, time)); } @@ -304,14 +305,14 @@ describe('AudioEncoderFuncPromise', function () { it('SUB_MEDIA_AUDIO_ENCODER_FUNCTION_PROMISE_00_0100', 0, async function (done) { console.info("case test set EOS after last frame and reset"); let mediaDescription = { - "channel_count": 1, - "sample_rate": 48000, - "audio_sample_format": 3, + "channel_count": 2, + "sample_rate": 44100, + "audio_sample_format": 1, } let mediaDescription2 = { "codec_mime": 'audio/mp4a-latm', } - let savepath = BASIC_PATH + '0000.es'; + let savepath = BASIC_PATH + '0000.aac'; needgetMediaDes = true; workdoneAtEOS = true; await media.getMediaCapability().then((mediaCaps) => { @@ -369,11 +370,11 @@ describe('AudioEncoderFuncPromise', function () { it('SUB_MEDIA_AUDIO_ENCODER_FUNCTION_PROMISE_01_0100', 0, async function (done) { console.info("case test set EOS manually before last frame and reset"); let mediaDescription = { - "channel_count": 1, - "sample_rate": 48000, - "audio_sample_format": 3, + "channel_count": 2, + "sample_rate": 44100, + "audio_sample_format": 1, } - let savepath = BASIC_PATH + '0100.es'; + let savepath = BASIC_PATH + '0100.aac'; eosframenum = 500; workdoneAtEOS = true; await media.createAudioEncoderByMime('audio/mp4a-latm').then((processor) => { @@ -408,11 +409,11 @@ describe('AudioEncoderFuncPromise', function () { it('SUB_MEDIA_AUDIO_ENCODER_FUNCTION_PROMISE_01_0200', 0, async function (done) { console.info("case test flush at running state"); let mediaDescription = { - "channel_count": 1, - "sample_rate": 48000, - "audio_sample_format": 3, + "channel_count": 2, + "sample_rate": 44100, + "audio_sample_format": 1, } - let savepath = BASIC_PATH + '0200.es'; + let savepath = BASIC_PATH + '0200.aac'; workdoneAtEOS = true; await media.createAudioEncoderByMime('audio/mp4a-latm').then((processor) => { console.info("case create createAudioEncoder success"); @@ -453,11 +454,11 @@ describe('AudioEncoderFuncPromise', function () { it('SUB_MEDIA_AUDIO_ENCODER_FUNCTION_PROMISE_01_0300', 0, async function (done) { console.info("case test flush at EOS state"); let mediaDescription = { - "channel_count": 1, - "sample_rate": 48000, - "audio_sample_format": 3, + "channel_count": 2, + "sample_rate": 44100, + "audio_sample_format": 1, } - let savepath = BASIC_PATH + '0300.es'; + let savepath = BASIC_PATH + '0300.aac'; eosframenum = 500; flushAtEOS = true; await media.createAudioEncoderByMime('audio/mp4a-latm').then((processor) => { @@ -492,11 +493,11 @@ describe('AudioEncoderFuncPromise', function () { it('SUB_MEDIA_AUDIO_ENCODER_FUNCTION_PROMISE_01_0400', 0, async function (done) { console.info("case test stop at running state and reset"); let mediaDescription = { - "channel_count": 1, - "sample_rate": 48000, - "audio_sample_format": 3, + "channel_count": 2, + "sample_rate": 44100, + "audio_sample_format": 1, } - let savepath = BASIC_PATH + '0400.es'; + let savepath = BASIC_PATH + '0400.aac'; await media.createAudioEncoderByMime('audio/mp4a-latm').then((processor) => { console.info("case create createAudioEncoder success"); audioEncodeProcessor = processor; @@ -542,11 +543,11 @@ describe('AudioEncoderFuncPromise', function () { it('SUB_MEDIA_AUDIO_ENCODER_FUNCTION_PROMISE_01_0500', 0, async function (done) { console.info("case test stop and restart"); let mediaDescription = { - "channel_count": 1, - "sample_rate": 48000, - "audio_sample_format": 3, + "channel_count": 2, + "sample_rate": 44100, + "audio_sample_format": 1, } - let savepath = BASIC_PATH + '0500.es'; + let savepath = BASIC_PATH + '0500.aac'; eosframenum = 100; await media.createAudioEncoderByMime('audio/mp4a-latm').then((processor) => { console.info("case create createAudioEncoder success"); @@ -596,11 +597,11 @@ describe('AudioEncoderFuncPromise', function () { it('SUB_MEDIA_AUDIO_ENCODER_FUNCTION_PROMISE_01_0600', 0, async function (done) { console.info("case test reconfigure for new file with the same format"); let mediaDescription = { - "channel_count": 1, - "sample_rate": 48000, - "audio_sample_format": 3, + "channel_count": 2, + "sample_rate": 44100, + "audio_sample_format": 1, } - let savepath = BASIC_PATH + '0600.es'; + let savepath = BASIC_PATH + '0600.aac'; eosframenum = 100; resetAtEOS = true; await media.createAudioEncoderByMime('audio/mp4a-latm').then((processor) => { @@ -623,9 +624,9 @@ describe('AudioEncoderFuncPromise', function () { console.info("case start success"); }, failCallback).catch(failCatch); let mediaDescription2 = { - "channel_count": 1, - "sample_rate": 48000, - "audio_sample_format": 3, + "channel_count": 2, + "sample_rate": 44100, + "audio_sample_format": 1, } await sleep(10000).then(() => { console.info("start configure 2"); @@ -633,9 +634,9 @@ describe('AudioEncoderFuncPromise', function () { await audioEncodeProcessor.configure(mediaDescription2).then(() => { console.info("configure 2 success"); resetParam(); - readFile(AUDIOPATH2); + readFile(AUDIOPATH); }, failCallback).catch(failCatch); - let savepath2 = BASIC_PATH + '0601.es'; + let savepath2 = BASIC_PATH + '0601.aac'; workdoneAtEOS = true; setCallback(savepath2, done); await audioEncodeProcessor.prepare().then(() => { diff --git a/multimedia/media/media_js_standard/audioEncoder/src/main/js/test/AudioEncoderMultiInstancesTest.test.js b/multimedia/media/media_js_standard/audioEncoder/src/main/js/test/AudioEncoderMultiInstancesTest.test.js index 9ad976b9b8fba72f4832be24d3f1ead67e2ab40d..3a110986a0f10500865b3dce46e0b68731e78ac7 100644 --- a/multimedia/media/media_js_standard/audioEncoder/src/main/js/test/AudioEncoderMultiInstancesTest.test.js +++ b/multimedia/media/media_js_standard/audioEncoder/src/main/js/test/AudioEncoderMultiInstancesTest.test.js @@ -19,7 +19,7 @@ import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from ' describe('AudioEncoderFuncPromise', function () { const RESOURCEPATH = '/data/accounts/account_0/appdata/ohos.acts.multimedia.audio.audioencoder/' - const AUDIOPATH = RESOURCEPATH + 'S32LE.pcm'; + const AUDIOPATH = RESOURCEPATH + 'S16LE.pcm'; let readStreamSync; let eosframenum = 0; let stopAtEOS = false; @@ -35,7 +35,7 @@ describe('AudioEncoderFuncPromise', function () { let inputQueue = []; let outputQueue = []; const ES = [0, 4096]; - let ES_LENGTH = 2000; + let ES_LENGTH = 1500; beforeAll(function() { console.info('beforeAll case'); @@ -57,7 +57,7 @@ describe('AudioEncoderFuncPromise', function () { sawOutputEOS = false; inputQueue = []; outputQueue = []; - ES_LENGTH = 2000; + ES_LENGTH = 1500; }) afterEach(function() { @@ -140,8 +140,8 @@ describe('AudioEncoderFuncPromise', function () { console.info("start add ADTS to Packet"); let packetLen = len + 7; // 7: head length let profile = 2; // 2: AAC LC - let freqIdx = 3; // 3: 48000HZ - let chanCfg = 1; // 1: 1 channel + let freqIdx = 4; // 4: 44100HZ + let chanCfg = 2; // 2: 2 channel view[0] = 0xFF; view[1] = 0xF9; view[2] = ((profile - 1) << 6) + (freqIdx << 2) + (chanCfg >> 2); @@ -159,9 +159,12 @@ describe('AudioEncoderFuncPromise', function () { async function resetWork(audioEncodeProcessor) { resetParam(); - await audioEncodeProcessor.reset().then(() => { + await audioEncodeProcessor.reset().then(async() => { console.info("case reset success"); if (needrelease) { + await audioEncodeProcessor.release().then(() => { + console.info("case release success"); + }, failCallback).catch(failCatch); audioEncodeProcessor = null; } }, failCallback).catch(failCatch); @@ -309,8 +312,8 @@ describe('AudioEncoderFuncPromise', function () { }, failCallback).catch(failCatch); await array[j].release().then(() => { console.info("case release success"); - array[j] = null; }, failCallback).catch(failCatch); + array[j] = null; } done(); }) diff --git a/multimedia/media/media_js_standard/audioEncoder/src/main/js/test/AudioEncoderReliabilityCallbackTest.test.js b/multimedia/media/media_js_standard/audioEncoder/src/main/js/test/AudioEncoderReliabilityCallbackTest.test.js index 9c3d8eb55b6eae68a5a22b57ab804a6cbe1645c4..d57b46afb6f155e521f6d147459e71e2d607a30a 100644 --- a/multimedia/media/media_js_standard/audioEncoder/src/main/js/test/AudioEncoderReliabilityCallbackTest.test.js +++ b/multimedia/media/media_js_standard/audioEncoder/src/main/js/test/AudioEncoderReliabilityCallbackTest.test.js @@ -17,9 +17,9 @@ import media from '@ohos.multimedia.media' import Fileio from '@ohos.fileio' import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' -describe('AudioEncoderSTTCallback', function () { +describe('AudioEncoderReliabilityCallback', function () { const RESOURCEPATH = '/data/accounts/account_0/appdata/ohos.acts.multimedia.audio.audioencoder/' - const AUDIOPATH = RESOURCEPATH + 'S32LE.pcm'; + const AUDIOPATH = RESOURCEPATH + 'S16LE.pcm'; const BASIC_PATH = RESOURCEPATH + 'results/encode_reliability_callback_'; const END = 0; const CONFIGURE = 1; @@ -54,9 +54,9 @@ describe('AudioEncoderSTTCallback', function () { let ES_LENGTH = 200; let mime = 'audio/mp4a-latm'; let mediaDescription = { - "channel_count": 1, - "sample_rate": 48000, - "audio_sample_format": 3, + "channel_count": 2, + "sample_rate": 44100, + "audio_sample_format": 1, }; beforeAll(function() { @@ -86,8 +86,8 @@ describe('AudioEncoderSTTCallback', function () { if (audioEncodeProcessor != null) { await audioEncodeProcessor.release().then(() => { console.info('audioEncodeProcessor release success'); - audioEncodeProcessor = null; }, failCallback).catch(failCatch); + audioEncodeProcessor = null; } }) @@ -165,8 +165,8 @@ describe('AudioEncoderSTTCallback', function () { console.info("start add ADTS to Packet"); let packetLen = len + 7; // 7: head length let profile = 2; // 2: AAC LC - let freqIdx = 3; // 3: 48000HZ - let chanCfg = 1; // 1: 1 channel + let freqIdx = 4; // 4: 44100HZ + let chanCfg = 2; // 2: 2 channel view[0] = 0xFF; view[1] = 0xF9; view[2] = ((profile - 1) << 6) + (freqIdx << 2) + (chanCfg >> 2); @@ -386,9 +386,7 @@ describe('AudioEncoderSTTCallback', function () { } } else{ - writeHead(savepath, outputobject.length); - writeFile(savepath, outputobject.data, outputobject.length); - console.info("write to file success"); + console.info("not last frame, continue"); } audioEncodeProcessor.freeOutputBuffer(outputobject, () => { console.info('release output success'); diff --git a/multimedia/media/media_js_standard/audioEncoder/src/main/js/test/AudioEncoderReliabilityPromiseTest.test.js b/multimedia/media/media_js_standard/audioEncoder/src/main/js/test/AudioEncoderReliabilityPromiseTest.test.js index b9d3cade53dcbeeb72953a7949397a9eb3ffc114..fc584e3a8cf948295d674ed170ba25e34487c240 100644 --- a/multimedia/media/media_js_standard/audioEncoder/src/main/js/test/AudioEncoderReliabilityPromiseTest.test.js +++ b/multimedia/media/media_js_standard/audioEncoder/src/main/js/test/AudioEncoderReliabilityPromiseTest.test.js @@ -17,9 +17,9 @@ import media from '@ohos.multimedia.media' import Fileio from '@ohos.fileio' import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' -describe('AudioEncoderSTTPromise', function () { +describe('AudioEncoderReliabilityPromise', function () { const RESOURCEPATH = '/data/accounts/account_0/appdata/ohos.acts.multimedia.audio.audioencoder/' - const AUDIOPATH = RESOURCEPATH + 'S32LE.pcm'; + const AUDIOPATH = RESOURCEPATH + 'S16LE.pcm'; const BASIC_PATH = RESOURCEPATH + 'results/encode_reliability_promise_'; const END = 0; const CONFIGURE = 1; @@ -54,9 +54,9 @@ describe('AudioEncoderSTTPromise', function () { let ES_LENGTH = 200; let mime = 'audio/mp4a-latm'; let mediaDescription = { - "channel_count": 1, - "sample_rate": 48000, - "audio_sample_format": 3, + "channel_count": 2, + "sample_rate": 44100, + "audio_sample_format": 1, }; let expectError = false; @@ -88,8 +88,8 @@ describe('AudioEncoderSTTPromise', function () { if (audioEncodeProcessor != null) { await audioEncodeProcessor.release().then(() => { console.info('audioEncodeProcessor release success'); - audioEncodeProcessor = null; }, failCallback).catch(failCatch); + audioEncodeProcessor = null; } }) @@ -183,8 +183,8 @@ describe('AudioEncoderSTTPromise', function () { console.info("start add ADTS to Packet"); let packetLen = len + 7; // 7: head length let profile = 2; // 2: AAC LC - let freqIdx = 3; // 3: 48000HZ - let chanCfg = 1; // 1: 1 channel + let freqIdx = 4; // 4: 44100HZ + let chanCfg = 2; // 2: 2 channel view[0] = 0xFF; view[1] = 0xF9; view[2] = ((profile - 1) << 6) + (freqIdx << 2) + (chanCfg >> 2); @@ -391,9 +391,7 @@ describe('AudioEncoderSTTPromise', function () { } } else{ - writeHead(savepath, outputobject.length); - writeFile(savepath, outputobject.data, outputobject.length); - console.info("write to file success"); + console.info("not last frame, continue"); } audioEncodeProcessor.freeOutputBuffer(outputobject).then(() => { console.info('release output success'); 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 75dbb360e1ec75aff75e46feea6371f5db339081..0781c5ca6c3b3396bc1f7aed7fb352197fe1be87 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 @@ -136,57 +136,50 @@ describe('VideoDecoderEnum', function () { } /* push inputbuffers into codec */ - async function enqueueInputs(){ + async function enqueueInputs(inputObject) { console.info('in case: enqueueInputs in'); - while (inputQueue.length > 0 && !inputEosFlag) { - let inputObject = inputQueue.shift(); - console.log('in case: inputObject.index: ' + inputObject.index); - if (frameCountIn < ES_FRAME_SIZE.length) { - getContent(inputObject.data, ES_FRAME_SIZE[frameCountIn]); - inputObject.timeMs = timestamp; - inputObject.offset = 0; - inputObject.length = ES_FRAME_SIZE[frameCountIn]; - console.info('in case: frameCountIn ' + frameCountIn); - frameCountIn++; - timestamp += 16.67; - } - if (isCodecData) { - inputObject.flags = 8; - isCodecData = false; - timestamp = 0; - } else if (frameCountIn >= ES_FRAME_SIZE.length - 1) { - inputObject.flags = 1; - inputEosFlag = true; - } else { - inputObject.flags = 4; - } - if (frameCountIn == ES_FRAME_SIZE.length / 2) { - videoDecodeProcessor.setParameter({ - 'bitrate': 6400, - }).then(() => { - console.info('in case: setParameter success '); - }, failCallback).catch(failCatch); - } - videoDecodeProcessor.pushInputData(inputObject).then(() => { - console.info('in case: queueInput success '); + console.log('in case: inputObject.index: ' + inputObject.index); + if (frameCountIn < ES_FRAME_SIZE.length) { + getContent(inputObject.data, ES_FRAME_SIZE[frameCountIn]); + inputObject.timeMs = timestamp; + inputObject.offset = 0; + inputObject.length = ES_FRAME_SIZE[frameCountIn]; + console.info('in case: frameCountIn ' + frameCountIn); + frameCountIn++; + timestamp += 16.67; + } + if (isCodecData) { + inputObject.flags = 8; + isCodecData = false; + timestamp = 0; + } else if (frameCountIn >= ES_FRAME_SIZE.length - 1) { + inputObject.flags = 1; + inputEosFlag = true; + } else { + inputObject.flags = 4; + } + if (frameCountIn == ES_FRAME_SIZE.length / 2) { + videoDecodeProcessor.setParameter({ + 'bitrate': 6400, + }).then(() => { + console.info('in case: setParameter success '); }, failCallback).catch(failCatch); } + videoDecodeProcessor.pushInputData(inputObject).then(() => { + console.info('in case: queueInput success '); + }, failCallback).catch(failCatch); } /* get outputbuffers from codec */ - async function dequeueOutputs(nextStep){ - console.log('outputQueue.length:' + outputQueue.length); - while (outputQueue.length > 0){ - let outputObject = outputQueue.shift(); - if (outputObject.flags == 1) { - nextStep(); - return; - } - frameCountOut++; - await videoDecodeProcessor.freeOutputBuffer(outputObject).then(() => { - console.log('in case: release output count:' + frameCountOut); - }, failCallback).catch(failCatch); + async function dequeueOutputs(nextStep, outputObject){ + if (outputObject.flags == 1) { + nextStep(); + return; } + frameCountOut++; + await videoDecodeProcessor.freeOutputBuffer(outputObject).then(() => { + console.log('in case: release output count:' + frameCountOut); + }, failCallback).catch(failCatch); } function setCallback(nextStep){ @@ -204,8 +197,7 @@ describe('VideoDecoderEnum', function () { console.info('in case: inputBufferAvailable inBuffer.flags: '+ inBuffer.flags); expect(inBuffer.timeMs !== undefined).assertTrue(); console.info('in case: inputBufferAvailable inBuffer.timeMs: '+ inBuffer.timeMs); - inputQueue.push(inBuffer); - await enqueueInputs(); + enqueueInputs(inBuffer); }); videoDecodeProcessor.on('newOutputData', async (outBuffer) => { @@ -213,8 +205,7 @@ describe('VideoDecoderEnum', function () { videoDecodeProcessor.getOutputMediaDescription().then((MediaDescription) => { console.info('get outputMediaDescription : ' + MediaDescription); }, failCallback).catch(failCatch); - outputQueue.push(outBuffer); - await dequeueOutputs(nextStep); + dequeueOutputs(nextStep, outBuffer); }); videoDecodeProcessor.on('error',(err) => { diff --git a/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderFuncCallbackTest.test.js b/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderFuncCallbackTest.test.js index 3ad753e550772026f4a08c71cf523f4e367bb81a..ba22c5bb79a36e899a987167810767a23d59c827 100644 --- a/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderFuncCallbackTest.test.js +++ b/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderFuncCallbackTest.test.js @@ -177,74 +177,65 @@ describe('VideoDecoderFuncCallbackTest', function () { } /* push inputbuffers into codec */ - async function enqueueInputs(){ - console.info('in case: enqueueInputs in'); - while (inputQueue.length > 0 && !inputEosFlag) { - let inputObject = inputQueue.shift(); - console.log('in case: inputObject.index: ' + inputObject.index); - if (frameCountIn < ES_FRAME_SIZE.length) { - getContent(inputObject.data, ES_FRAME_SIZE[frameCountIn]); - inputObject.timeMs = timestamp; - inputObject.offset = 0; - inputObject.length = ES_FRAME_SIZE[frameCountIn]; - console.info('in case: frameCountIn ' + frameCountIn); - frameCountIn++; - timestamp += 16.67; - } - if (isCodecData) { - inputObject.flags = 8; - isCodecData = false; - timestamp = 0; - } else if (frameCountIn >= ES_FRAME_SIZE.length - 1) { - inputObject.flags = 1; - inputEosFlag = true; + async function enqueueInputs(inputObject) { + console.log('in case: inputObject.index: ' + inputObject.index); + if (frameCountIn < ES_FRAME_SIZE.length) { + getContent(inputObject.data, ES_FRAME_SIZE[frameCountIn]); + inputObject.timeMs = timestamp; + inputObject.offset = 0; + inputObject.length = ES_FRAME_SIZE[frameCountIn]; + console.info('in case: frameCountIn ' + frameCountIn); + frameCountIn++; + timestamp += 16.67; + } + if (isCodecData) { + inputObject.flags = 8; + isCodecData = false; + timestamp = 0; + } else if (frameCountIn >= ES_FRAME_SIZE.length - 1) { + inputObject.flags = 1; + inputEosFlag = true; + } else { + inputObject.flags = 4; + } + if (frameCountIn == ES_FRAME_SIZE.length / 2) { + videoDecodeProcessor.setParameter({ + 'bitrate': 6400, + }, (err) => { + expect(err).assertUndefined(); + console.info('in case: setParameter success '); + }); + } + videoDecodeProcessor.pushInputData(inputObject, (err) => { + if (typeof (err) == 'undefined') { + console.info('in case: queueInput success '); } else { - inputObject.flags = 4; + console.info(`in case queueInput err called,errMessage is ${error.message}`); } - if (frameCountIn == ES_FRAME_SIZE.length / 2) { - videoDecodeProcessor.setParameter({ - 'bitrate': 6400, - }, (err) => { - expect(err).assertUndefined(); - console.info('in case: setParameter success '); - }); - } - videoDecodeProcessor.pushInputData(inputObject, (err) => { - if (typeof (err) == 'undefined') { - console.info('in case: queueInput success '); - } else { - console.info(`in case queueInput err called,errMessage is ${error.message}`); - } - }) - } + }) } /* get outputbuffers from codec */ - async function dequeueOutputs(nextStep){ - console.log('outputQueue.length:' + outputQueue.length); - while (outputQueue.length > 0){ - let outputObject = outputQueue.shift(); - if (outputObject.flags == 1 ) { - nextStep(); - return; - } - frameCountOut++; - videoDecodeProcessor.renderOutputData(outputObject, (err) => { - if (typeof (err) == 'undefined') { - console.log('in case: release output count:' + frameCountOut); - } else { - console.info(`in case releaseOutput error called,errMessage is ${error.message}`); - } - }) + async function dequeueOutputs(nextStep, outputObject){ + if (outputObject.flags == 1 ) { + nextStep(); + return; } + frameCountOut++; + videoDecodeProcessor.freeOutputBuffer(outputObject, (err) => { + if (typeof (err) == 'undefined') { + console.log('in case: release output count:' + frameCountOut); + } else { + console.info(`in case releaseOutput error called,errMessage is ${error.message}`); + } + }) } function setCallback(nextStep){ console.info('in case: setCallback in'); videoDecodeProcessor.on('needInputData', async (inBuffer) => { console.info('in case: inputBufferAvailable inBuffer.index: '+ inBuffer.index); - inputQueue.push(inBuffer); - enqueueInputs(); + enqueueInputs(inBuffer); }); videoDecodeProcessor.on('newOutputData', async (outBuffer) => { @@ -253,8 +244,7 @@ describe('VideoDecoderFuncCallbackTest', function () { expect(err).assertUndefined(); console.info('get outputMediaDescription : ' + MediaDescription); }); - outputQueue.push(outBuffer); - dequeueOutputs(nextStep); + dequeueOutputs(nextStep, outBuffer); }); videoDecodeProcessor.on('error',(err) => { 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 855cc2cc844c87cc079f3395bb018a99eed782cc..625f4a8be225804eb5a62e6ff6390f3d5cd67856 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 @@ -188,65 +188,56 @@ describe('VideoDecoderFuncPromiseTest', function () { } /* push inputbuffers into codec */ - async function enqueueInputs(){ - console.info('in case: enqueueInputs in'); - while (inputQueue.length > 0 && !inputEosFlag) { - let inputObject = inputQueue.shift(); - console.log('in case: inputObject.index: ' + inputObject.index); - if (frameCountIn < ES_FRAME_SIZE.length) { - getContent(inputObject.data, ES_FRAME_SIZE[frameCountIn]); - inputObject.timeMs = timestamp; - inputObject.offset = 0; - inputObject.length = ES_FRAME_SIZE[frameCountIn]; - console.info('in case: frameCountIn ' + frameCountIn); - frameCountIn++; - timestamp += 16.67; - } - if (isCodecData) { - inputObject.flags = 8; - isCodecData = false; - timestamp = 0; - } else if (frameCountIn >= ES_FRAME_SIZE.length - 1) { - inputObject.flags = 1; - inputEosFlag = true; - } else { - inputObject.flags = 4; - } - if (frameCountIn == ES_FRAME_SIZE.length / 2) { - videoDecodeProcessor.setParameter({ - 'bitrate': 6400, - }).then(() => { - console.info('in case: setParameter success '); - }, failCallback).catch(failCatch); - } - videoDecodeProcessor.pushInputData(inputObject).then(() => { - console.info('in case: queueInput success '); + async function enqueueInputs(inputObject) { + console.log('in case: inputObject.index: ' + inputObject.index); + if (frameCountIn < ES_FRAME_SIZE.length) { + getContent(inputObject.data, ES_FRAME_SIZE[frameCountIn]); + inputObject.timeMs = timestamp; + inputObject.offset = 0; + inputObject.length = ES_FRAME_SIZE[frameCountIn]; + console.info('in case: frameCountIn ' + frameCountIn); + frameCountIn++; + timestamp += 16.67; + } + if (isCodecData) { + inputObject.flags = 8; + isCodecData = false; + timestamp = 0; + } else if (frameCountIn >= ES_FRAME_SIZE.length - 1) { + inputObject.flags = 1; + inputEosFlag = true; + } else { + inputObject.flags = 4; + } + if (frameCountIn == ES_FRAME_SIZE.length / 2) { + videoDecodeProcessor.setParameter({ + 'bitrate': 6400, + }).then(() => { + console.info('in case: setParameter success '); }, failCallback).catch(failCatch); } + videoDecodeProcessor.pushInputData(inputObject).then(() => { + console.info('in case: queueInput success '); + }, failCallback).catch(failCatch); } /* get outputbuffers from codec */ - async function dequeueOutputs(nextStep){ - console.log('outputQueue.length:' + outputQueue.length); - while (outputQueue.length > 0){ - let outputObject = outputQueue.shift(); - if (outputObject.flags == 1) { - nextStep(); - return; - } - frameCountOut++; - await videoDecodeProcessor.renderOutputData(outputObject).then(() => { - console.log('in case: release output count:' + frameCountOut); - }, failCallback).catch(failCatch); + async function dequeueOutputs(nextStep, outputObject) { + if (outputObject.flags == 1) { + nextStep(); + return; } + frameCountOut++; + await videoDecodeProcessor.freeOutputBuffer(outputObject).then(() => { + console.log('in case: release output count:' + frameCountOut); + }, failCallback).catch(failCatch); } function setCallback(nextStep){ console.info('in case: setCallback in'); videoDecodeProcessor.on('needInputData', async (inBuffer) => { console.info('in case: inputBufferAvailable inBuffer.index: '+ inBuffer.index); - inputQueue.push(inBuffer); - await enqueueInputs(); + enqueueInputs(inBuffer); }); videoDecodeProcessor.on('newOutputData', async (outBuffer) => { @@ -254,8 +245,7 @@ describe('VideoDecoderFuncPromiseTest', function () { videoDecodeProcessor.getOutputMediaDescription().then((MediaDescription) => { console.info('get outputMediaDescription : ' + MediaDescription); }, failCallback).catch(failCatch); - outputQueue.push(outBuffer); - await dequeueOutputs(nextStep); + dequeueOutputs(nextStep, outBuffer); }); videoDecodeProcessor.on('error',(err) => { diff --git a/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderReliCallbackTest.test.js b/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderReliCallbackTest.test.js index 9d48c158cdf56dc2a8fee428c3f4f5c13ab96a83..3acec6a91b2aff17af40ccb0d7cbcd51bcc0af79 100644 --- a/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderReliCallbackTest.test.js +++ b/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderReliCallbackTest.test.js @@ -172,53 +172,45 @@ describe('VideoDecoderReliCallbackTest', function () { } /* push inputbuffers into codec */ - async function enqueueInputs() { - console.info('in case: enqueueInputs in'); - while (inputQueue.length > 0 && !inputEosFlag) { - let inputObject = inputQueue.shift(); - console.log('in case: inputObject.index: ' + inputObject.index); - if (frameCountIn < ES_FRAME_SIZE.length) { - getContent(inputObject.data, position, ES_FRAME_SIZE[frameCountIn]); - inputObject.timeMs = timestamp; - inputObject.offset = 0; - inputObject.length = ES_FRAME_SIZE[frameCountIn]; - position = position + ES_FRAME_SIZE[frameCountIn]; - console.info('in case: frameCountIn ' + frameCountIn); - frameCountIn++; - timestamp += 1000 / mediaDescription.frame_rate; - } - if (isCodecData) { - inputObject.flags = 8; - isCodecData = false; - timestamp = 0; - } else if (frameCountIn >= ES_FRAME_SIZE.length || frameCountIn == eosFrameId) { - inputObject.flags = 1; - inputEosFlag = true; - } else { - inputObject.flags = 4; - } - videoDecodeProcessor.pushInputData(inputObject, (err) => { - console.info('in case: queueInput success '); - }) + async function enqueueInputs(inputObject) { + console.log('in case: inputObject.index: ' + inputObject.index); + if (frameCountIn < ES_FRAME_SIZE.length) { + getContent(inputObject.data, position, ES_FRAME_SIZE[frameCountIn]); + inputObject.timeMs = timestamp; + inputObject.offset = 0; + inputObject.length = ES_FRAME_SIZE[frameCountIn]; + position = position + ES_FRAME_SIZE[frameCountIn]; + console.info('in case: frameCountIn ' + frameCountIn); + frameCountIn++; + timestamp += 1000 / mediaDescription.frame_rate; + } + if (isCodecData) { + inputObject.flags = 8; + isCodecData = false; + timestamp = 0; + } else if (frameCountIn >= ES_FRAME_SIZE.length || frameCountIn == eosFrameId) { + inputObject.flags = 1; + inputEosFlag = true; + } else { + inputObject.flags = 4; } + videoDecodeProcessor.pushInputData(inputObject, (err) => { + console.info('in case: queueInput success '); + }) } /* get outputbuffers from codec */ - async function dequeueOutputs(nextStep) { - console.log('outputQueue.length:' + outputQueue.length); - while (outputQueue.length > 0){ - let outputObject = outputQueue.shift(); - if (outputObject.flags == 1 ) { - if (workdoneAtEOS) { - doneWork(nextStep); - } - return; + async function dequeueOutputs(nextStep, outputObject) { + if (outputObject.flags == 1 ) { + if (workdoneAtEOS) { + doneWork(nextStep); } - frameCountOut++; - videoDecodeProcessor.renderOutputData(outputObject, () => { - console.log('in case: release output count:' + frameCountOut); - }) + return; } + frameCountOut++; + videoDecodeProcessor.freeOutputBuffer(outputObject, () => { + console.log('in case: release output count:' + frameCountOut); + }) } function toConfigure(mySteps, done, expectFail) { @@ -399,14 +391,12 @@ describe('VideoDecoderReliCallbackTest', function () { function setCallback(nextStep){ videoDecodeProcessor.on('needInputData', async (inBuffer) => { console.info('in case: inputBufferAvailable inBuffer.index: '+ inBuffer.index); - inputQueue.push(inBuffer); - await enqueueInputs(); + enqueueInputs(inBuffer); }); videoDecodeProcessor.on('newOutputData', async (outBuffer) => { console.info('in case: outputBufferAvailable outBuffer.index: '+ outBuffer.index); - outputQueue.push(outBuffer); - await dequeueOutputs(nextStep); + dequeueOutputs(nextStep, outBuffer); }); videoDecodeProcessor.on('error',(err) => { diff --git a/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderReliPromiseTest.test.js b/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderReliPromiseTest.test.js index 72336909cbbce00674ca2f725bea44b0cec8de28..8fa0d2eebbae0170066302ae961dda82d88a492b 100644 --- a/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderReliPromiseTest.test.js +++ b/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderReliPromiseTest.test.js @@ -177,55 +177,47 @@ describe('VideoDecoderReliPromiseTest', function () { } } /* push inputbuffers into codec */ - async function enqueueInputs() { - console.info('in case: enqueueInputs in'); - while (inputQueue.length > 0 && !inputEosFlag) { - let inputObject = inputQueue.shift(); - console.log('in case: inputObject.index: ' + inputObject.index); - if (frameCountIn < ES_FRAME_SIZE.length) { - getContent(inputObject.data, position, ES_FRAME_SIZE[frameCountIn]); - inputObject.timeMs = timestamp; - inputObject.offset = 0; - inputObject.length = ES_FRAME_SIZE[frameCountIn]; - position = position + ES_FRAME_SIZE[frameCountIn]; - console.info('in case: frameCountIn ' + frameCountIn); - frameCountIn++; - timestamp += 1000 / mediaDescription.frame_rate; - } - if (isCodecData) { - inputObject.flags = 8; - isCodecData = false; - timestamp = 0; - } else if (frameCountIn >= ES_FRAME_SIZE.length || frameCountIn == eosFrameId) { - inputObject.flags = 1; - inputEosFlag = true; - } else { - inputObject.flags = 4; - } - videoDecodeProcessor.pushInputData(inputObject).then(() => { - console.info('in case: queueInput success '); - }, caseCallback).catch(failCatch); + async function enqueueInputs(inputObject) { + console.log('in case: inputObject.index: ' + inputObject.index); + if (frameCountIn < ES_FRAME_SIZE.length) { + getContent(inputObject.data, position, ES_FRAME_SIZE[frameCountIn]); + inputObject.timeMs = timestamp; + inputObject.offset = 0; + inputObject.length = ES_FRAME_SIZE[frameCountIn]; + position = position + ES_FRAME_SIZE[frameCountIn]; + console.info('in case: frameCountIn ' + frameCountIn); + frameCountIn++; + timestamp += 1000 / mediaDescription.frame_rate; } + if (isCodecData) { + inputObject.flags = 8; + isCodecData = false; + timestamp = 0; + } else if (frameCountIn >= ES_FRAME_SIZE.length || frameCountIn == eosFrameId) { + inputObject.flags = 1; + inputEosFlag = true; + } else { + inputObject.flags = 4; + } + videoDecodeProcessor.pushInputData(inputObject).then(() => { + console.info('in case: queueInput success '); + }, caseCallback).catch(failCatch); } /* get outputbuffers from codec */ - async function dequeueOutputs(nextStep) { - console.log('outputQueue.length:' + outputQueue.length); - while (outputQueue.length > 0){ - let outputObject = outputQueue.shift(); - if (outputObject.flags == 1 ) { - if (workdoneAtEOS) { - await doneWork(); - nextStep(); - } - return; + async function dequeueOutputs(nextStep, outputObject) { + if (outputObject.flags == 1 ) { + if (workdoneAtEOS) { + await doneWork(); + nextStep(); } - frameCountOut++; - videoDecodeProcessor.renderOutputData(outputObject).then(() => { - console.info('in case: release output success'); - console.log('in case: release output count:' + frameCountOut); - }, caseCallback).catch(failCatch); + return; } + frameCountOut++; + videoDecodeProcessor.freeOutputBuffer(outputObject).then(() => { + console.info('in case: release output success'); + console.log('in case: release output count:' + frameCountOut); + }, caseCallback).catch(failCatch); } function toConfigure(mySteps, done, failureCallback, catchCallback) { @@ -396,14 +388,12 @@ describe('VideoDecoderReliPromiseTest', function () { function setCallback(nextStep){ videoDecodeProcessor.on('needInputData', async (inBuffer) => { console.info('in case: inputBufferAvailable inBuffer.index: '+ inBuffer.index); - inputQueue.push(inBuffer); - await enqueueInputs(); + enqueueInputs(inBuffer); }); videoDecodeProcessor.on('newOutputData', async (outBuffer) => { console.info('in case: outputBufferAvailable outBuffer.index: '+ outBuffer.index); - outputQueue.push(outBuffer); - await dequeueOutputs(nextStep); + dequeueOutputs(nextStep, outBuffer); }); videoDecodeProcessor.on('error',(err) => { diff --git a/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderSoftwareFuncCallbackTest.test.js b/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderSoftwareFuncCallbackTest.test.js index 9dd52372dd8439b0b3b885ee712ff0527469d5ba..56e16842d8eba256a77c0482d8ed00cd3b4f9771 100644 --- a/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderSoftwareFuncCallbackTest.test.js +++ b/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderSoftwareFuncCallbackTest.test.js @@ -189,73 +189,63 @@ describe('VideoDecoderFuncCallbackTest', function () { } /* push inputbuffers into codec */ - async function enqueueInputs(){ - console.info('in case: enqueueInputs in'); - while (inputQueue.length > 0 && !inputEosFlag) { - let inputObject = inputQueue.shift(); - console.log('in case: inputObject.index: ' + inputObject.index); - if (frameCountIn < ES_FRAME_SIZE.length) { - getContent(inputObject.data, ES_FRAME_SIZE[frameCountIn]); - inputObject.timeMs = timestamp; - inputObject.offset = 0; - inputObject.length = ES_FRAME_SIZE[frameCountIn]; - console.info('in case: frameCountIn ' + frameCountIn); - frameCountIn++; - timestamp += 16.67; - } - if (isCodecData) { - inputObject.flags = 8; - isCodecData = false; - timestamp = 0; - } else if (frameCountIn >= ES_FRAME_SIZE.length - 1) { - inputObject.flags = 1; - inputEosFlag = true; + async function enqueueInputs(inputObject) { + console.log('in case: inputObject.index: ' + inputObject.index); + if (frameCountIn < ES_FRAME_SIZE.length) { + getContent(inputObject.data, ES_FRAME_SIZE[frameCountIn]); + inputObject.timeMs = timestamp; + inputObject.offset = 0; + inputObject.length = ES_FRAME_SIZE[frameCountIn]; + console.info('in case: frameCountIn ' + frameCountIn); + frameCountIn++; + timestamp += 16.67; + } + if (isCodecData) { + inputObject.flags = 8; + isCodecData = false; + timestamp = 0; + } else if (frameCountIn >= ES_FRAME_SIZE.length - 1) { + inputObject.flags = 1; + inputEosFlag = true; + } else { + inputObject.flags = 4; + } + videoDecodeProcessor.pushInputData(inputObject, (err) => { + if (typeof (err) == 'undefined') { + console.info('in case: queueInput success '); + } else { - inputObject.flags = 4; + console.info(`in case queueInput err called,errMessage is ${error.message}`); } - videoDecodeProcessor.pushInputData(inputObject, (err) => { - if (typeof (err) == 'undefined') { - console.info('in case: queueInput success '); - - } else { - console.info(`in case queueInput err called,errMessage is ${error.message}`); - } - }) - } + }) } /* get outputbuffers from codec */ - async function dequeueOutputs(nextStep){ - console.log('outputQueue.length:' + outputQueue.length); - while (outputQueue.length > 0){ - let outputObject = outputQueue.shift(); - if (outputObject.flags == 1 ) { - nextStep(); - return; - } - frameCountOut++; - videoDecodeProcessor.renderOutputData(outputObject, (err) => { - if (typeof (err) == 'undefined') { - console.log('in case: release output count:' + frameCountOut); - } else { - console.info(`in case releaseOutput error called,errMessage is ${error.message}`); - } - }) + async function dequeueOutputs(nextStep, outputObject) { + if (outputObject.flags == 1 ) { + nextStep(); + return; } + frameCountOut++; + videoDecodeProcessor.freeOutputBuffer(outputObject, (err) => { + if (typeof (err) == 'undefined') { + console.log('in case: release output count:' + frameCountOut); + } else { + console.info(`in case releaseOutput error called,errMessage is ${error.message}`); + } + }) } function setCallback(nextStep){ console.info('in case: setCallback in'); videoDecodeProcessor.on('needInputData', async (inBuffer) => { console.info('in case: inputBufferAvailable inBuffer.index: '+ inBuffer.index); - inputQueue.push(inBuffer); - enqueueInputs(); + enqueueInputs(inBuffer); }); videoDecodeProcessor.on('newOutputData', async (outBuffer) => { console.info('in case: outputBufferAvailable outBuffer.index: '+ outBuffer.index); - outputQueue.push(outBuffer); - dequeueOutputs(nextStep); + dequeueOutputs(nextStep, outBuffer); }); videoDecodeProcessor.on('error',(err) => { diff --git a/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderSoftwareFuncPromiseTest.test.js b/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderSoftwareFuncPromiseTest.test.js index 1a2f651a134a5049680158e50aaddc30b128a896..91649e34d605c70abd8ce0e86d79531b6190e092 100644 --- a/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderSoftwareFuncPromiseTest.test.js +++ b/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderSoftwareFuncPromiseTest.test.js @@ -191,64 +191,54 @@ describe('VideoDecoderFuncPromiseTest', function () { } /* push inputbuffers into codec */ - async function enqueueInputs(){ - console.info('in case: enqueueInputs in'); - while (inputQueue.length > 0 && !inputEosFlag) { - let inputObject = inputQueue.shift(); - console.log('in case: inputObject.index: ' + inputObject.index); - if (frameCountIn < ES_FRAME_SIZE.length) { - getContent(inputObject.data, ES_FRAME_SIZE[frameCountIn]); - inputObject.timeMs = timestamp; - inputObject.offset = 0; - inputObject.length = ES_FRAME_SIZE[frameCountIn]; - console.info('in case: frameCountIn ' + frameCountIn); - frameCountIn++; - timestamp += 16.67; - } - if (isCodecData) { - inputObject.flags = 8; - isCodecData = false; - timestamp = 0; - } else if (frameCountIn >= ES_FRAME_SIZE.length - 1) { - inputObject.flags = 1; - inputEosFlag = true; - } else { - inputObject.flags = 4; - } - videoDecodeProcessor.pushInputData(inputObject).then(() => { - console.info('in case: queueInput success '); - }, failCallback).catch(failCatch); + async function enqueueInputs(inputObject) { + console.log('in case: inputObject.index: ' + inputObject.index); + if (frameCountIn < ES_FRAME_SIZE.length) { + getContent(inputObject.data, ES_FRAME_SIZE[frameCountIn]); + inputObject.timeMs = timestamp; + inputObject.offset = 0; + inputObject.length = ES_FRAME_SIZE[frameCountIn]; + console.info('in case: frameCountIn ' + frameCountIn); + frameCountIn++; + timestamp += 16.67; + } + if (isCodecData) { + inputObject.flags = 8; + isCodecData = false; + timestamp = 0; + } else if (frameCountIn >= ES_FRAME_SIZE.length - 1) { + inputObject.flags = 1; + inputEosFlag = true; + } else { + inputObject.flags = 4; } + videoDecodeProcessor.pushInputData(inputObject).then(() => { + console.info('in case: queueInput success '); + }, failCallback).catch(failCatch); } /* get outputbuffers from codec */ - async function dequeueOutputs(nextStep){ - console.log('outputQueue.length:' + outputQueue.length); - while (outputQueue.length > 0){ - let outputObject = outputQueue.shift(); - if (outputObject.flags == 1) { - nextStep(); - return; - } - frameCountOut++; - await videoDecodeProcessor.renderOutputData(outputObject).then(() => { - console.log('in case: release output count:' + frameCountOut); - }, failCallback).catch(failCatch); + async function dequeueOutputs(nextStep, outputObject) { + if (outputObject.flags == 1) { + nextStep(); + return; } + frameCountOut++; + await videoDecodeProcessor.freeOutputBuffer(outputObject).then(() => { + console.log('in case: release output count:' + frameCountOut); + }, failCallback).catch(failCatch); } function setCallback(nextStep){ console.info('in case: setCallback in'); videoDecodeProcessor.on('needInputData', async (inBuffer) => { console.info('in case: inputBufferAvailable inBuffer.index: '+ inBuffer.index); - inputQueue.push(inBuffer); - await enqueueInputs(); + enqueueInputs(inBuffer); }); videoDecodeProcessor.on('newOutputData', async (outBuffer) => { console.info('in case: outputBufferAvailable outBuffer.index: '+ outBuffer.index); - outputQueue.push(outBuffer); - await dequeueOutputs(nextStep); + dequeueOutputs(nextStep, outBuffer); }); videoDecodeProcessor.on('error',(err) => { diff --git a/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderSoftwareReliCallbackTest.test.js b/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderSoftwareReliCallbackTest.test.js index 7ad1caf9be468689cfeb4be52dd66bb78dbfbc83..a17198490915bc5267e6b01f5ace750adf9465bb 100644 --- a/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderSoftwareReliCallbackTest.test.js +++ b/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderSoftwareReliCallbackTest.test.js @@ -172,53 +172,45 @@ describe('VideoDecoderSoftwareReliCallbackTest', function () { } /* push inputbuffers into codec */ - async function enqueueInputs() { - console.info('in case: enqueueInputs in'); - while (inputQueue.length > 0 && !inputEosFlag) { - let inputObject = inputQueue.shift(); - console.log('in case: inputObject.index: ' + inputObject.index); - if (frameCountIn < ES_FRAME_SIZE.length) { - getContent(inputObject.data, position, ES_FRAME_SIZE[frameCountIn]); - inputObject.timeMs = timestamp; - inputObject.offset = 0; - inputObject.length = ES_FRAME_SIZE[frameCountIn]; - position = position + ES_FRAME_SIZE[frameCountIn]; - console.info('in case: frameCountIn ' + frameCountIn); - frameCountIn++; - timestamp += 1000 / mediaDescription.frame_rate; - } - if (isCodecData) { - inputObject.flags = 8; - isCodecData = false; - timestamp = 0; - } else if (frameCountIn >= ES_FRAME_SIZE.length || frameCountIn == eosFrameId) { - inputObject.flags = 1; - inputEosFlag = true; - } else { - inputObject.flags = 4; - } - videoDecodeProcessor.pushInputData(inputObject, (err) => { - console.info('in case: queueInput success '); - }) + async function enqueueInputs(inputObject) { + console.log('in case: inputObject.index: ' + inputObject.index); + if (frameCountIn < ES_FRAME_SIZE.length) { + getContent(inputObject.data, position, ES_FRAME_SIZE[frameCountIn]); + inputObject.timeMs = timestamp; + inputObject.offset = 0; + inputObject.length = ES_FRAME_SIZE[frameCountIn]; + position = position + ES_FRAME_SIZE[frameCountIn]; + console.info('in case: frameCountIn ' + frameCountIn); + frameCountIn++; + timestamp += 1000 / mediaDescription.frame_rate; + } + if (isCodecData) { + inputObject.flags = 8; + isCodecData = false; + timestamp = 0; + } else if (frameCountIn >= ES_FRAME_SIZE.length || frameCountIn == eosFrameId) { + inputObject.flags = 1; + inputEosFlag = true; + } else { + inputObject.flags = 4; } + videoDecodeProcessor.pushInputData(inputObject, (err) => { + console.info('in case: queueInput success '); + }) } /* get outputbuffers from codec */ - async function dequeueOutputs(nextStep) { - console.log('outputQueue.length:' + outputQueue.length); - while (outputQueue.length > 0){ - let outputObject = outputQueue.shift(); - if (outputObject.flags == 1 ) { - if (workdoneAtEOS) { - doneWork(nextStep); - } - return; + async function dequeueOutputs(nextStep, outputObject) { + if (outputObject.flags == 1 ) { + if (workdoneAtEOS) { + doneWork(nextStep); } - frameCountOut++; - videoDecodeProcessor.renderOutputData(outputObject, () => { - console.log('in case: release output count:' + frameCountOut); - }) + return; } + frameCountOut++; + videoDecodeProcessor.freeOutputBuffer(outputObject, () => { + console.log('in case: release output count:' + frameCountOut); + }) } function toConfigure(mySteps, done, expectFail) { @@ -400,14 +392,12 @@ describe('VideoDecoderSoftwareReliCallbackTest', function () { function setCallback(nextStep){ videoDecodeProcessor.on('needInputData', async (inBuffer) => { console.info('in case: inputBufferAvailable inBuffer.index: '+ inBuffer.index); - inputQueue.push(inBuffer); - await enqueueInputs(); + enqueueInputs(inBuffer); }); videoDecodeProcessor.on('newOutputData', async (outBuffer) => { console.info('in case: outputBufferAvailable outBuffer.index: '+ outBuffer.index); - outputQueue.push(outBuffer); - await dequeueOutputs(nextStep); + dequeueOutputs(nextStep, outBuffer); }); videoDecodeProcessor.on('error',(err) => { diff --git a/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderSoftwareReliPromiseTest.test.js b/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderSoftwareReliPromiseTest.test.js index a186f706378885be11a74b1bc36dc166f022a1fa..bddb11fc0d291beb838e809e2acd3e5b8cb514dd 100644 --- a/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderSoftwareReliPromiseTest.test.js +++ b/multimedia/media/media_js_standard/videoDecoder/src/main/js/test/VideoDecoderSoftwareReliPromiseTest.test.js @@ -179,55 +179,47 @@ describe('VideoDecoderSoftwareReliPromiseTest', function () { } /* push inputbuffers into codec */ - async function enqueueInputs() { - console.info('in case: enqueueInputs in'); - while (inputQueue.length > 0 && !inputEosFlag) { - let inputObject = inputQueue.shift(); - console.log('in case: inputObject.index: ' + inputObject.index); - if (frameCountIn < ES_FRAME_SIZE.length) { - getContent(inputObject.data, position, ES_FRAME_SIZE[frameCountIn]); - inputObject.timeMs = timestamp; - inputObject.offset = 0; - inputObject.length = ES_FRAME_SIZE[frameCountIn]; - position = position + ES_FRAME_SIZE[frameCountIn]; - console.info('in case: frameCountIn ' + frameCountIn); - frameCountIn++; - timestamp += 1000 / mediaDescription.frame_rate; - } - if (isCodecData) { - inputObject.flags = 8; - isCodecData = false; - timestamp = 0; - } else if (frameCountIn >= ES_FRAME_SIZE.length || frameCountIn == eosFrameId) { - inputObject.flags = 1; - inputEosFlag = true; - } else { - inputObject.flags = 4; - } - videoDecodeProcessor.pushInputData(inputObject).then(() => { - console.info('in case: queueInput success '); - }, caseCallback).catch(failCatch); + async function enqueueInputs(inputObject) { + console.log('in case: inputObject.index: ' + inputObject.index); + if (frameCountIn < ES_FRAME_SIZE.length) { + getContent(inputObject.data, position, ES_FRAME_SIZE[frameCountIn]); + inputObject.timeMs = timestamp; + inputObject.offset = 0; + inputObject.length = ES_FRAME_SIZE[frameCountIn]; + position = position + ES_FRAME_SIZE[frameCountIn]; + console.info('in case: frameCountIn ' + frameCountIn); + frameCountIn++; + timestamp += 1000 / mediaDescription.frame_rate; } + if (isCodecData) { + inputObject.flags = 8; + isCodecData = false; + timestamp = 0; + } else if (frameCountIn >= ES_FRAME_SIZE.length || frameCountIn == eosFrameId) { + inputObject.flags = 1; + inputEosFlag = true; + } else { + inputObject.flags = 4; + } + videoDecodeProcessor.pushInputData(inputObject).then(() => { + console.info('in case: queueInput success '); + }, caseCallback).catch(failCatch); } /* get outputbuffers from codec */ - async function dequeueOutputs(nextStep) { - console.log('outputQueue.length:' + outputQueue.length); - while (outputQueue.length > 0){ - let outputObject = outputQueue.shift(); - if (outputObject.flags == 1 ) { - if (workdoneAtEOS) { - await doneWork(); - nextStep(); - } - return; + async function dequeueOutputs(nextStep, outputObject) { + if (outputObject.flags == 1 ) { + if (workdoneAtEOS) { + await doneWork(); + nextStep(); } - frameCountOut++; - videoDecodeProcessor.renderOutputData(outputObject).then(() => { - console.info('in case: release output success'); - console.log('in case: release output count:' + frameCountOut); - }, caseCallback).catch(failCatch); + return; } + frameCountOut++; + videoDecodeProcessor.freeOutputBuffer(outputObject).then(() => { + console.info('in case: release output success'); + console.log('in case: release output count:' + frameCountOut); + }, caseCallback).catch(failCatch); } function toConfigure(mySteps, done, failureCallback, catchCallback) { @@ -399,14 +391,12 @@ describe('VideoDecoderSoftwareReliPromiseTest', function () { function setCallback(nextStep){ videoDecodeProcessor.on('needInputData', async (inBuffer) => { console.info('in case: inputBufferAvailable inBuffer.index: '+ inBuffer.index); - inputQueue.push(inBuffer); - await enqueueInputs(); + enqueueInputs(inBuffer); }); videoDecodeProcessor.on('newOutputData', async (outBuffer) => { console.info('in case: outputBufferAvailable outBuffer.index: '+ outBuffer.index); - outputQueue.push(outBuffer); - await dequeueOutputs(nextStep); + dequeueOutputs(nextStep, outBuffer); }); videoDecodeProcessor.on('error',(err) => { diff --git a/multimedia/media/media_js_standard/videoEncoder/Test.json b/multimedia/media/media_js_standard/videoEncoder/Test.json index 15a97d2650435f1296b8e8e0cdcde4834bda4b87..6a35730452782d44b6d9d058c73e896ea6cf0974 100644 --- a/multimedia/media/media_js_standard/videoEncoder/Test.json +++ b/multimedia/media/media_js_standard/videoEncoder/Test.json @@ -1,5 +1,5 @@ { - "description": "Configuration for videoPlayer Tests", + "description": "Configuration for videoEncoder Tests", "driver": { "type": "JSUnitTest", "test-timeout": "2000000", 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 38350041825a2db37e486595f6fb760085d32311..744177491995920222c7ab8d13439a0ad9e26a0d 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 @@ -56,12 +56,6 @@ describe('videoEncoderSoftwareMultiInstances', function () { afterEach(async function() { console.info('afterEach case'); - if (videoEncodeProcessor != null){ - await videoEncodeProcessor.release().then(() => { - console.info("case release success"); - videoEncodeProcessor = null; - }, failCallback).catch(failCatch); - } }) afterAll(function() { @@ -255,8 +249,8 @@ describe('videoEncoderSoftwareMultiInstances', function () { async function toRelease() { await videoEncodeProcessor.release().then(() => { console.info("case release success"); - videoEncodeProcessor = null; }, failCallback).catch(failCatch); + videoEncodeProcessor = null; } @@ -287,10 +281,10 @@ describe('videoEncoderSoftwareMultiInstances', function () { for (let j = 1; j < 3; j++) { await array[j].release().then(() => { console.info("case release encoder " + j); - array[j] = null; }, failCallback).catch(failCatch); + array[j] = null; } - console.info('release 16 encoders success'); + console.info('release encoders success'); done(); }); async function runCase() { diff --git a/multimedia/media/media_js_standard/videoEncoder/src/main/js/test/VideoEncoderSoftwareFuncCallbackTest.test.js b/multimedia/media/media_js_standard/videoEncoder/src/main/js/test/VideoEncoderSoftwareFuncCallbackTest.test.js index 1d4d12af690eb36116830e77d2e28e8fb37ba258..b7a67b1b6c3559b503a3346c7c69580ad6b4cde1 100644 --- a/multimedia/media/media_js_standard/videoEncoder/src/main/js/test/VideoEncoderSoftwareFuncCallbackTest.test.js +++ b/multimedia/media/media_js_standard/videoEncoder/src/main/js/test/VideoEncoderSoftwareFuncCallbackTest.test.js @@ -38,8 +38,10 @@ describe('VideoEncoderSoftwareFuncCallbackTest', function () { console.info('beforeAll case'); }) - beforeEach(function() { + beforeEach(async function() { console.info('beforeEach case'); + await msleep(1000).then(() => { + }, failCallback).catch(failCatch); videoEncodeProcessor = null; mediaTest = null; surfaceID = ''; @@ -74,6 +76,10 @@ describe('VideoEncoderSoftwareFuncCallbackTest', function () { expect(err == undefined).assertTrue(); } + function msleep(ms) { + return new Promise((resolve) => setTimeout(resolve, ms)); + } + function writeFile(path, buf, len){ try { let writestream = Fileio.createStreamSync(path, 'ab+'); diff --git a/multimedia/media/media_js_standard/videoEncoder/src/main/js/test/VideoEncoderSoftwareFuncPromiseTest.test.js b/multimedia/media/media_js_standard/videoEncoder/src/main/js/test/VideoEncoderSoftwareFuncPromiseTest.test.js index 0403589fc289429332beefa3a40c3c6fc99c47e3..9337df2ac7336d8cae40e0b8795041f6dd1e7d33 100644 --- a/multimedia/media/media_js_standard/videoEncoder/src/main/js/test/VideoEncoderSoftwareFuncPromiseTest.test.js +++ b/multimedia/media/media_js_standard/videoEncoder/src/main/js/test/VideoEncoderSoftwareFuncPromiseTest.test.js @@ -37,8 +37,10 @@ describe('videoSoftwareEncoderFuncPromise', function () { console.info('beforeAll case'); }) - beforeEach(function() { + beforeEach(async function() { console.info('beforeEach case'); + await msleep(1000).then(() => { + }, failCallback).catch(failCatch); videoEncodeProcessor = null; mediaTest = null; surfaceID = ''; @@ -76,6 +78,10 @@ describe('videoSoftwareEncoderFuncPromise', function () { expect(err).assertUndefined(); } + function msleep(ms) { + return new Promise((resolve) => setTimeout(resolve, ms)); + } + function resetParam() { outputQueue = []; outputCnt = 0; diff --git a/multimedia/media/media_js_standard/videoEncoder/src/main/js/test/VideoEncoderSoftwareReliabilityCallbackTest.test.js b/multimedia/media/media_js_standard/videoEncoder/src/main/js/test/VideoEncoderSoftwareReliabilityCallbackTest.test.js index 932c357bcf9f5447e9c509d4c7367751c333e43c..8921b8da96671e8fd5baf41e11a0b6638cf6984f 100644 --- a/multimedia/media/media_js_standard/videoEncoder/src/main/js/test/VideoEncoderSoftwareReliabilityCallbackTest.test.js +++ b/multimedia/media/media_js_standard/videoEncoder/src/main/js/test/VideoEncoderSoftwareReliabilityCallbackTest.test.js @@ -64,6 +64,8 @@ describe('VideoEncoderSoftwareReliCallbackTest', function () { beforeEach(async function() { console.info('beforeEach case'); + await msleep(1000).then(() => { + }, failCallback).catch(failCatch); videoEncodeProcessor = null; mediaTest = null; surfaceID = ''; @@ -98,6 +100,11 @@ describe('VideoEncoderSoftwareReliCallbackTest', function () { console.error(`in case error failCatch called,errMessage is ${err.message}`); expect(err == undefined).assertTrue(); } + + function msleep(ms) { + return new Promise((resolve) => setTimeout(resolve, ms)); + } + function printError(err, expectFail) { expect((err != undefined) == expectFail).assertTrue(); if (expectFail == false && err != undefined) { @@ -105,6 +112,7 @@ describe('VideoEncoderSoftwareReliCallbackTest', function () { console.error(`in case error failCatch called,errMessage is ${err.message}`); } } + function writeFile(path, buf, len){ try { let writestream = Fileio.createStreamSync(path, 'ab+'); diff --git a/multimedia/media/media_js_standard/videoEncoder/src/main/js/test/VideoEncoderSoftwareReliabilityPromiseTest.test.js b/multimedia/media/media_js_standard/videoEncoder/src/main/js/test/VideoEncoderSoftwareReliabilityPromiseTest.test.js index 0626e4ee4d752034f94b4fc341230cf5670bb0ab..00555114c5f2aeada6f391d3182070e7ba8ea1d3 100644 --- a/multimedia/media/media_js_standard/videoEncoder/src/main/js/test/VideoEncoderSoftwareReliabilityPromiseTest.test.js +++ b/multimedia/media/media_js_standard/videoEncoder/src/main/js/test/VideoEncoderSoftwareReliabilityPromiseTest.test.js @@ -65,8 +65,10 @@ describe('videoEncoderReliabilityPromise', function () { console.info('beforeAll case'); }) - beforeEach(function() { + beforeEach(async function() { console.info('beforeEach case'); + await msleep(1000).then(() => { + }, failCallback).catch(failCatch); videoEncodeProcessor = null; surfaceID = ''; outputQueue = []; @@ -86,8 +88,8 @@ describe('videoEncoderReliabilityPromise', function () { if (videoEncodeProcessor != null) { await videoEncodeProcessor.release().then(() => { console.info(`case release 1`); - videoEncodeProcessor = null; }, failCallback).catch(failCatch); + videoEncodeProcessor = null; } }) @@ -111,6 +113,10 @@ describe('videoEncoderReliabilityPromise', function () { expect(err).assertUndefined(); } + function msleep(ms) { + return new Promise((resolve) => setTimeout(resolve, ms)); + } + function resetParam() { outputQueue = []; outputCnt = 0; @@ -1353,7 +1359,7 @@ describe('videoEncoderReliabilityPromise', function () { it('SUB_MEDIA_VIDEO_SOFTWARE_ENCODER_API_EOS_PROMISE_0500', 0, async function (done) { let savepath = BASIC_PATH + 'eos_0500.es'; let mySteps = new Array(CONFIGURE, GETSURFACE, SETSTREAMPARAM, PREPARE, START, STARTSTREAM, HOLDON, - JUDGE_EOS, STOP, START, STOP, STOPSTREAM, END); + JUDGE_EOS, STOP, START, STOP, STOPSTREAM, RELEASE, END); frameTotal = 2; createVideoEncoder(savepath, mySteps, done); })