From 382a8b19b660868176c68c098e8bef340a9b2887 Mon Sep 17 00:00:00 2001 From: lin-jianwu Date: Wed, 20 Jul 2022 19:27:34 +0800 Subject: [PATCH 1/3] add part media mock Signed-off-by: lin-jianwu Change-Id: I2fb9242345134fda200b50f7a020abfed989ca40 --- .../napi/ohos_multimedia_media.js | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/runtime/main/extend/systemplugin/napi/ohos_multimedia_media.js b/runtime/main/extend/systemplugin/napi/ohos_multimedia_media.js index e7ca398f..8b92503a 100644 --- a/runtime/main/extend/systemplugin/napi/ohos_multimedia_media.js +++ b/runtime/main/extend/systemplugin/napi/ohos_multimedia_media.js @@ -58,7 +58,9 @@ export function mockMultimediaMedia() { } }, src: '[PC Preview] unknow src', + fdSrc: '[PC Preview] unknow fdSrc', loop: '[PC Preview] unknow loop', + audioInterruptMode: '[PC Preview] unknow audioInterruptMode', currentTime: '[PC Preview] unknow currentTime', duration: '[PC Preview] unknow duration', state: '[PC Preview] unknow state', @@ -221,12 +223,15 @@ export function mockMultimediaMedia() { } const videoPlayerMock = { url: '[PC Preview] unknow url', + fdSrc: '[PC Preview] unknow fdSrc', loop: '[PC Preview] unknow loop', currentTime: '[PC Preview] unknow currentTime', duration: '[PC Preview] unknow duration', state: '[PC Preview] unknow state', width: '[PC Preview] unknow width', height: '[PC Preview] unknow height', + audioInterruptMode: '[PC Preview] unknow audioInterruptMode', + videoScaleType: '[PC Preview] unknow videoScaleType', setDisplaySurface: function (...args) { console.warn("VideoPlayer.setDisplaySurface interface mocked in the Previewer. How this interface works on the Previewer" + " may be different from that on a real device.") @@ -359,11 +364,28 @@ export function mockMultimediaMedia() { }); } }, + selectBitrate: function (...args) { + console.warn("VideoPlayer.selectBitrate interface mocked in the Previewer. How this interface works on the Previewer" + + " may be different from that on a real device.") + const len = args.length; + if (typeof args[len - 1] === 'function') { + args[len - 1].call(this, paramMock.paramNumberMock, paramMock.paramNumberMock); + } else { + return new Promise((resolve) => { + resolve(); + }); + } + }, on: function (...args) { console.warn("VideoPlayer.on interface mocked in the Previewer. How this interface works on the Previewer" + " may be different from that on a real device.") }, } + const avfileDescriptorMock = { + fd: '[PC Preview] unknow fd', + offset: '[PC Preview] unknow audioChannels', + length: '[PC Preview] unknow audioCodec', + } const videoRecorderProfileMock = { audioBitrate: '[PC Preview] unknow audioBitrate', audioChannels: '[PC Preview] unknow audioChannels', @@ -387,7 +409,7 @@ export function mockMultimediaMedia() { const mediaDescriptionMock = { key: '[PC Preview] unknow key', } - const multimediaMediaMock = { + const mediaMock = { MediaErrorCode : { MSERR_OK: 0, MSERR_NO_MEMORY: 1, @@ -437,6 +459,10 @@ export function mockMultimediaMedia() { SPEED_FORWARD_1_75_X: 3, SPEED_FORWARD_2_00_X: 4, }, + VideoScaleType : { + VIDEO_SCALE_TYPE_FIT: 0, + VIDEO_SCALE_TYPE_FIT_CROP: 1, + }, ContainerFormatType : { CFT_MPEG_4: "mp4", CFT_MPEG_4A: "m4a", @@ -507,5 +533,5 @@ export function mockMultimediaMedia() { } }, } - return multimediaMediaMock; + return mediaMock; } From ad54bfe09230c723ad7c37fa042c4b00b1ffae81 Mon Sep 17 00:00:00 2001 From: lin-jianwu Date: Thu, 21 Jul 2022 09:48:38 +0800 Subject: [PATCH 2/3] fix review Signed-off-by: lin-jianwu Change-Id: I49ee2c492961a675fe20c7be77edb01d58332a54 --- .../napi/ohos_multimedia_media.js | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/runtime/main/extend/systemplugin/napi/ohos_multimedia_media.js b/runtime/main/extend/systemplugin/napi/ohos_multimedia_media.js index 8b92503a..78c3e6f2 100644 --- a/runtime/main/extend/systemplugin/napi/ohos_multimedia_media.js +++ b/runtime/main/extend/systemplugin/napi/ohos_multimedia_media.js @@ -58,9 +58,9 @@ export function mockMultimediaMedia() { } }, src: '[PC Preview] unknow src', - fdSrc: '[PC Preview] unknow fdSrc', + fdSrc: AVFileDescriptor, loop: '[PC Preview] unknow loop', - audioInterruptMode: '[PC Preview] unknow audioInterruptMode', + audioInterruptMode: InterruptMode, currentTime: '[PC Preview] unknow currentTime', duration: '[PC Preview] unknow duration', state: '[PC Preview] unknow state', @@ -223,15 +223,15 @@ export function mockMultimediaMedia() { } const videoPlayerMock = { url: '[PC Preview] unknow url', - fdSrc: '[PC Preview] unknow fdSrc', + fdSrc: AVFileDescriptor, loop: '[PC Preview] unknow loop', currentTime: '[PC Preview] unknow currentTime', duration: '[PC Preview] unknow duration', state: '[PC Preview] unknow state', width: '[PC Preview] unknow width', height: '[PC Preview] unknow height', - audioInterruptMode: '[PC Preview] unknow audioInterruptMode', - videoScaleType: '[PC Preview] unknow videoScaleType', + audioInterruptMode: InterruptMode, + videoScaleType: VideoScaleType, setDisplaySurface: function (...args) { console.warn("VideoPlayer.setDisplaySurface interface mocked in the Previewer. How this interface works on the Previewer" + " may be different from that on a real device.") @@ -372,7 +372,7 @@ export function mockMultimediaMedia() { args[len - 1].call(this, paramMock.paramNumberMock, paramMock.paramNumberMock); } else { return new Promise((resolve) => { - resolve(); + resolve(paramMock.paramNumberMock); }); } }, @@ -381,7 +381,7 @@ export function mockMultimediaMedia() { " may be different from that on a real device.") }, } - const avfileDescriptorMock = { + const AVFileDescriptorMock = { fd: '[PC Preview] unknow fd', offset: '[PC Preview] unknow audioChannels', length: '[PC Preview] unknow audioCodec', @@ -407,7 +407,11 @@ export function mockMultimediaMedia() { location: locationMock, } const mediaDescriptionMock = { - key: '[PC Preview] unknow key', + "key": 'paramMock.paramObjectMock', + } + const InterruptModeMock = { + SHARE_MODE: 0, + INDEPENDENT_MODE: 1 } const mediaMock = { MediaErrorCode : { From bf2955c3de8e28440105fc7bc3cdf5edd9067025 Mon Sep 17 00:00:00 2001 From: lin-jianwu Date: Thu, 21 Jul 2022 11:20:16 +0800 Subject: [PATCH 3/3] fix review Signed-off-by: lin-jianwu Change-Id: Idc36b47e30754fd2cb97ef8334218028a070fba3 --- runtime/main/extend/systemplugin/napi/ohos_multimedia_media.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/main/extend/systemplugin/napi/ohos_multimedia_media.js b/runtime/main/extend/systemplugin/napi/ohos_multimedia_media.js index 78c3e6f2..5517e7d7 100644 --- a/runtime/main/extend/systemplugin/napi/ohos_multimedia_media.js +++ b/runtime/main/extend/systemplugin/napi/ohos_multimedia_media.js @@ -231,7 +231,7 @@ export function mockMultimediaMedia() { width: '[PC Preview] unknow width', height: '[PC Preview] unknow height', audioInterruptMode: InterruptMode, - videoScaleType: VideoScaleType, + videoScaleType: mediaMock.VideoScaleType, setDisplaySurface: function (...args) { console.warn("VideoPlayer.setDisplaySurface interface mocked in the Previewer. How this interface works on the Previewer" + " may be different from that on a real device.")