Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Xts Acts
提交
f5cf1c29
X
Xts Acts
项目概览
OpenHarmony
/
Xts Acts
1 年多 前同步成功
通知
9
Star
22
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
X
Xts Acts
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
f5cf1c29
编写于
11月 01, 2022
作者:
Y
yygxr
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix xts case error for musl
Signed-off-by:
N
yygxr
<
wuhao30@huawei.com
>
上级
401a1ca9
变更
9
展开全部
隐藏空白更改
内联
并排
Showing
9 changed file
with
679 addition
and
657 deletion
+679
-657
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraInputTest.test.ets
...rd/src/main/ets/MainAbility/test/CameraInputTest.test.ets
+17
-15
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraJSUnitOutput.test.ets
...src/main/ets/MainAbility/test/CameraJSUnitOutput.test.ets
+22
-0
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraManagerTest.test.ets
.../src/main/ets/MainAbility/test/CameraManagerTest.test.ets
+243
-258
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionBaseTest.test.ets
.../main/ets/MainAbility/test/CameraSessionBaseTest.test.ets
+63
-50
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionExposureTest.test.ets
...n/ets/MainAbility/test/CameraSessionExposureTest.test.ets
+63
-53
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionFlashTest.test.ets
...main/ets/MainAbility/test/CameraSessionFlashTest.test.ets
+67
-57
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionFocusTest.test.ets
...main/ets/MainAbility/test/CameraSessionFocusTest.test.ets
+68
-58
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionVideoStabilizationTest.test.ets
...Ability/test/CameraSessionVideoStabilizationTest.test.ets
+77
-117
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionZoomRatioTest.test.ets
.../ets/MainAbility/test/CameraSessionZoomRatioTest.test.ets
+59
-49
未找到文件。
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraInputTest.test.ets
浏览文件 @
f5cf1c29
...
@@ -557,34 +557,34 @@ export default function CameraInputTest(surfaceId) {
...
@@ -557,34 +557,34 @@ export default function CameraInputTest(surfaceId) {
expect
(
isEmpty
(
cameraInput
))
.
assertFalse
();
expect
(
isEmpty
(
cameraInput
))
.
assertFalse
();
await
cameraInput
.
open
(
async
(
err
)
=>
{
await
cameraInput
.
open
(
async
(
err
)
=>
{
if
(
!
err
)
{
if
(
!
err
)
{
console
.
info
(
TAG
+
"PASSED open with CameraID :"
+
camerasArray
[
i
]
.
cameraId
);
console
.
info
(
TAG
+
"
PASSED open with CameraID :"
+
camerasArray
[
i
]
.
cameraId
);
}
else
{
}
else
{
successFlag
=
false
;
successFlag
=
false
;
console
.
info
(
TAG
+
"open FAILED: "
+
err
.
message
);
console
.
info
(
TAG
+
"
open FAILED: "
+
err
.
message
);
}
}
});
});
await
sleep
(
400
);
await
sleep
(
400
);
await
cameraInput
.
close
(
async
(
err
)
=>
{
await
cameraInput
.
close
(
async
(
err
)
=>
{
if
(
!
err
)
{
if
(
!
err
)
{
console
.
info
(
TAG
+
"PASSED close with CameraID :"
+
camerasArray
[
i
]
.
cameraId
);
console
.
info
(
TAG
+
"
PASSED close with CameraID :"
+
camerasArray
[
i
]
.
cameraId
);
}
else
{
}
else
{
successFlag
=
false
;
successFlag
=
false
;
console
.
info
(
TAG
+
"close FAILED: "
+
err
.
message
);
console
.
info
(
TAG
+
"
close FAILED: "
+
err
.
message
);
}
}
});
});
await
sleep
(
100
);
await
sleep
(
100
);
await
cameraInput
.
release
(
async
(
err
)
=>
{
await
cameraInput
.
release
(
async
(
err
)
=>
{
if
(
!
err
)
{
if
(
!
err
)
{
console
.
info
(
TAG
+
"PASSED release with CameraID :"
+
camerasArray
[
i
]
.
cameraId
);
console
.
info
(
TAG
+
"
PASSED release with CameraID :"
+
camerasArray
[
i
]
.
cameraId
);
}
else
{
}
else
{
successFlag
=
false
;
successFlag
=
false
;
console
.
info
(
TAG
+
"release FAILED: "
+
err
.
message
);
console
.
info
(
TAG
+
"
release FAILED: "
+
err
.
message
);
}
}
});
});
expect
(
successFlag
)
.
assertEqual
(
true
);
expect
(
successFlag
)
.
assertEqual
(
true
);
})
.
catch
((
err
)
=>
{
})
.
catch
((
err
)
=>
{
expect
()
.
assertFail
();
expect
()
.
assertFail
();
console
.
info
(
TAG
+
"Failed To create cameraInput cameraId: "
+
camerasArray
[
i
]
.
cameraId
+
+
JSON
.
stringify
(
err
));
console
.
info
(
TAG
+
"
Failed To create cameraInput cameraId: "
+
camerasArray
[
i
]
.
cameraId
+
+
JSON
.
stringify
(
err
));
});
});
}
}
}
}
...
@@ -617,24 +617,24 @@ export default function CameraInputTest(surfaceId) {
...
@@ -617,24 +617,24 @@ export default function CameraInputTest(surfaceId) {
expect
(
isEmpty
(
cameraInput
))
.
assertFalse
();
expect
(
isEmpty
(
cameraInput
))
.
assertFalse
();
console
.
info
(
TAG
+
functionTag
+
"Entering cameraInput open with camera: "
+
camerasArray
[
i
]
.
cameraId
);
console
.
info
(
TAG
+
functionTag
+
"Entering cameraInput open with camera: "
+
camerasArray
[
i
]
.
cameraId
);
await
cameraInput
.
open
()
.
then
(
async
()
=>
{
await
cameraInput
.
open
()
.
then
(
async
()
=>
{
console
.
info
(
TAG
+
functionTag
+
"PASSED open with CameraID :"
+
camerasArray
[
i
]
.
cameraId
);
console
.
info
(
TAG
+
functionTag
+
"
PASSED open with CameraID :"
+
camerasArray
[
i
]
.
cameraId
);
})
.
catch
((
err
)
=>
{
})
.
catch
((
err
)
=>
{
successFlag
=
false
;
successFlag
=
false
;
console
.
info
(
TAG
+
functionTag
+
"open FAILED: "
+
err
.
message
);
console
.
info
(
TAG
+
functionTag
+
"
open FAILED: "
+
err
.
message
);
});
;
});
await
sleep
(
400
);
await
sleep
(
400
);
await
cameraInput
.
close
()
.
then
(
async
()
=>
{
await
cameraInput
.
close
()
.
then
(
async
()
=>
{
console
.
info
(
TAG
+
functionTag
+
"PASSED close with CameraID :"
+
camerasArray
[
i
]
.
cameraId
);
console
.
info
(
TAG
+
functionTag
+
"
PASSED close with CameraID :"
+
camerasArray
[
i
]
.
cameraId
);
})
.
catch
((
err
)
=>
{
})
.
catch
((
err
)
=>
{
successFlag
=
false
;
successFlag
=
false
;
console
.
info
(
TAG
+
functionTag
+
"close FAILED: "
+
err
.
message
);
console
.
info
(
TAG
+
functionTag
+
"
close FAILED: "
+
err
.
message
);
});
});
await
sleep
(
100
);
await
sleep
(
100
);
await
cameraInput
.
release
()
.
then
(
async
()
=>
{
await
cameraInput
.
release
()
.
then
(
async
()
=>
{
console
.
info
(
TAG
+
functionTag
+
"PASSED release with CameraID :"
+
camerasArray
[
i
]
.
cameraId
);
console
.
info
(
TAG
+
functionTag
+
"
PASSED release with CameraID :"
+
camerasArray
[
i
]
.
cameraId
);
})
.
catch
((
err
)
=>
{
})
.
catch
((
err
)
=>
{
successFlag
=
false
;
successFlag
=
false
;
console
.
info
(
TAG
+
functionTag
+
"release FAILED: "
+
err
.
message
);
console
.
info
(
TAG
+
functionTag
+
"
release FAILED: "
+
err
.
message
);
});
});
expect
(
successFlag
)
.
assertEqual
(
true
);
expect
(
successFlag
)
.
assertEqual
(
true
);
}
else
{
}
else
{
...
@@ -642,8 +642,10 @@ export default function CameraInputTest(surfaceId) {
...
@@ -642,8 +642,10 @@ export default function CameraInputTest(surfaceId) {
console
.
info
(
TAG
+
functionTag
+
" FAILED: "
+
err
.
message
);
console
.
info
(
TAG
+
functionTag
+
" FAILED: "
+
err
.
message
);
}
}
});
});
await
sleep
(
600
);
}
}
await
sleep
(
400
*
camerasArray
.
length
);
//
await sleep(400 * camerasArray.length);
}
}
console
.
info
(
TAG
+
functionTag
+
"Entering SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_OPEN_CLOSE_RELEASE_PROMISE_0100 ends here"
);
console
.
info
(
TAG
+
functionTag
+
"Entering SUB_MULTIMEDIA_CAMERA_CAMERA_INPUT_OPEN_CLOSE_RELEASE_PROMISE_0100 ends here"
);
done
();
done
();
...
...
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraJSUnitOutput.test.ets
浏览文件 @
f5cf1c29
...
@@ -22,7 +22,17 @@ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from
...
@@ -22,7 +22,17 @@ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from
const
TAG
=
"CameraUnitTest: "
;
const
TAG
=
"CameraUnitTest: "
;
let
captureLocation
=
{
latitude
:
0
,
longitude
:
0
,
altitude
:
0
,
}
let
captureSetting
=
{
let
captureSetting
=
{
quality
:
cameraObj
.
QualityLevel
.
QUALITY_LEVEL_LOW
,
rotation
:
cameraObj
.
ImageRotation
.
ROTATION_0
,
location
:
captureLocation
,
mirror
:
false
}
}
// 创建视频录制的参数
// 创建视频录制的参数
...
@@ -1092,6 +1102,7 @@ export default function cameraJSUnitOutput(surfaceId: any) {
...
@@ -1092,6 +1102,7 @@ export default function cameraJSUnitOutput(surfaceId: any) {
expect
()
.
assertFail
();
expect
()
.
assertFail
();
});
});
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_GET_METADATA_BOUNDING_BOX_PROMISE_0100 success, boundingBox : "
+
boundingBox
.
width
+
"x"
+
boundingBox
.
height
);
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_GET_METADATA_BOUNDING_BOX_PROMISE_0100 success, boundingBox : "
+
boundingBox
.
width
+
"x"
+
boundingBox
.
height
);
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_GET_METADATA_BOUNDING_BOX_PROMISE_0100 success, boundingBox : "
+
boundingBox
.
topLeftX
+
"x"
+
boundingBox
.
topLeftY
);
}
}
await
sleep
(
1000
);
await
sleep
(
1000
);
done
();
done
();
...
@@ -1478,6 +1489,13 @@ export default function cameraJSUnitOutput(surfaceId: any) {
...
@@ -1478,6 +1489,13 @@ export default function cameraJSUnitOutput(surfaceId: any) {
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CAPTURE_SETTING_PROMISE_0100 photoOutput == null || undefined"
)
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CAPTURE_SETTING_PROMISE_0100 photoOutput == null || undefined"
)
expect
()
.
assertFail
();
expect
()
.
assertFail
();
}
else
{
}
else
{
console
.
info
(
'SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CAPTURE_SETTING_PROMISE_0100 captureSetting.quality = '
+
captureSetting
.
quality
);
console
.
info
(
'SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CAPTURE_SETTING_PROMISE_0100 captureSetting.rotation = '
+
captureSetting
.
rotation
);
console
.
info
(
'SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CAPTURE_SETTING_PROMISE_0100 captureSetting.location.latitude = '
+
captureSetting
.
location
.
latitude
);
console
.
info
(
'SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CAPTURE_SETTING_PROMISE_0100 captureSetting.location.longitude = '
+
captureSetting
.
location
.
longitude
);
console
.
info
(
'SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CAPTURE_SETTING_PROMISE_0100 captureSetting.location.altitude = '
+
captureSetting
.
location
.
altitude
);
console
.
info
(
'SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CAPTURE_SETTING_PROMISE_0100 captureSetting.mirror = '
+
captureSetting
.
mirror
);
await
photoOutput
.
capture
(
captureSetting
)
.
then
((
result
)
=>
{
await
photoOutput
.
capture
(
captureSetting
)
.
then
((
result
)
=>
{
console
.
info
(
'SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CAPTURE_SETTING_PROMISE_0100 success :'
+
result
);
console
.
info
(
'SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CAPTURE_SETTING_PROMISE_0100 success :'
+
result
);
})
.
catch
((
err
)
=>
{
})
.
catch
((
err
)
=>
{
...
@@ -1575,6 +1593,8 @@ export default function cameraJSUnitOutput(surfaceId: any) {
...
@@ -1575,6 +1593,8 @@ export default function cameraJSUnitOutput(surfaceId: any) {
if
(
!
err
)
{
if
(
!
err
)
{
expect
(
true
)
.
assertTrue
();
expect
(
true
)
.
assertTrue
();
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_FRAME_SHUTTER_0100 success"
);
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_FRAME_SHUTTER_0100 success"
);
console
.
info
(
TAG
+
"SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_FRAME_SHUTTER_0100, captureId = "
+
data
.
captureId
);
console
.
info
(
TAG
+
"SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_FRAME_SHUTTER_0100, timestamp = "
+
data
.
timestamp
);
}
else
{
}
else
{
expect
()
.
assertFail
();
expect
()
.
assertFail
();
console
.
info
(
TAG
+
"Error in SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_FRAME_SHUTTER_0100 FAILED: "
+
err
.
message
);
console
.
info
(
TAG
+
"Error in SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_FRAME_SHUTTER_0100 FAILED: "
+
err
.
message
);
...
@@ -1608,6 +1628,8 @@ export default function cameraJSUnitOutput(surfaceId: any) {
...
@@ -1608,6 +1628,8 @@ export default function cameraJSUnitOutput(surfaceId: any) {
if
(
!
err
)
{
if
(
!
err
)
{
expect
(
true
)
.
assertTrue
();
expect
(
true
)
.
assertTrue
();
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_END_0100 success"
);
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_END_0100 success"
);
console
.
info
(
TAG
+
"SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_END_0100, captureId = "
+
data
.
captureId
);
console
.
info
(
TAG
+
"SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_END_0100, frameCount = "
+
data
.
frameCount
);
}
else
{
}
else
{
expect
()
.
assertFail
();
expect
()
.
assertFail
();
console
.
info
(
TAG
+
"Error in SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_END_0100 FAILED: "
+
err
.
message
);
console
.
info
(
TAG
+
"Error in SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_END_0100 FAILED: "
+
err
.
message
);
...
...
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraManagerTest.test.ets
浏览文件 @
f5cf1c29
此差异已折叠。
点击以展开。
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionBaseTest.test.ets
浏览文件 @
f5cf1c29
...
@@ -392,61 +392,71 @@ export default function cameraSessionTest(surfaceId: any) {
...
@@ -392,61 +392,71 @@ export default function cameraSessionTest(surfaceId: any) {
async
function
createOutput
(
idx
:
any
)
{
async
function
createOutput
(
idx
:
any
)
{
console
.
info
(
'Enter createOutput'
);
console
.
info
(
'Enter createOutput'
);
let
cameraOutputCap
=
await
mCameraManager
.
getSupportedOutputCapability
(
mCameraDevicesArray
[
idx
]);
let
cameraOutputCap
=
null
;
if
(
!
isEmpty
(
cameraOutputCap
.
previewProfiles
))
{
await
mCameraManager
.
getSupportedOutputCapability
(
mCameraDevicesArray
[
idx
])
.
then
((
result
)
=>
{
console
.
info
(
TAG
+
"cameraOutputCap.previewProfiles.length: "
+
cameraOutputCap
.
previewProfiles
.
length
);
console
.
info
(
'getSupportedOutputCapability success'
);
for
(
let
i
=
0
;
i
<
cameraOutputCap
.
previewProfiles
.
length
;
i
++
)
{
cameraOutputCap
=
result
;
mPreviewOutput
=
await
mCameraManager
.
createPreviewOutput
(
cameraOutputCap
.
previewProfiles
[
i
],
surfaceId
);
})
.
catch
((
err
)
=>
{
if
(
!
isEmpty
(
mPreviewOutput
))
{
console
.
info
(
'getSupportedOutputCapability failed, err = '
+
err
.
message
);
break
;
});
if
(
!
isEmpty
(
cameraOutputCap
))
{
if
(
!
isEmpty
(
cameraOutputCap
.
previewProfiles
))
{
console
.
info
(
TAG
+
"cameraOutputCap.previewProfiles.length: "
+
cameraOutputCap
.
previewProfiles
.
length
);
for
(
let
i
=
0
;
i
<
cameraOutputCap
.
previewProfiles
.
length
;
i
++
)
{
mPreviewOutput
=
await
mCameraManager
.
createPreviewOutput
(
cameraOutputCap
.
previewProfiles
[
i
],
surfaceId
);
if
(
!
isEmpty
(
mPreviewOutput
))
{
break
;
}
}
}
}
if
(
isEmpty
(
mPreviewOutput
))
{
if
(
isEmpty
(
mPreviewOutput
))
{
console
.
info
(
TAG
+
"createPreviewOutput FAILED"
);
console
.
info
(
TAG
+
"createPreviewOutput FAILED"
);
}
console
.
info
(
TAG
+
"createPreviewOutput: "
+
mPreviewOutput
);
}
if
(
!
isEmpty
(
cameraOutputCap
.
photoProfiles
))
{
console
.
info
(
TAG
+
"cameraOutputCap.photoProfiles.length: "
+
cameraOutputCap
.
photoProfiles
.
length
);
for
(
let
i
=
0
;
i
<
cameraOutputCap
.
photoProfiles
.
length
;
i
++
)
{
mPhotoOutput
=
await
mCameraManager
.
createPhotoOutput
(
cameraOutputCap
.
photoProfiles
[
i
],
mPhotoSurface
);
if
(
!
isEmpty
(
mPhotoOutput
))
{
break
;
}
}
console
.
info
(
TAG
+
"createPreviewOutput: "
+
mPreviewOutput
);
}
}
if
(
isEmpty
(
mPhotoOutput
))
{
if
(
!
isEmpty
(
cameraOutputCap
.
photoProfiles
))
{
console
.
info
(
TAG
+
"createPhotoOutput FAILED"
);
console
.
info
(
TAG
+
"cameraOutputCap.photoProfiles.length: "
+
cameraOutputCap
.
photoProfiles
.
length
);
}
for
(
let
i
=
0
;
i
<
cameraOutputCap
.
photoProfiles
.
length
;
i
++
)
{
console
.
info
(
TAG
+
"createPhotoOutput: "
+
mPhotoOutput
);
mPhotoOutput
=
await
mCameraManager
.
createPhotoOutput
(
cameraOutputCap
.
photoProfiles
[
i
],
mPhotoSurface
);
}
if
(
!
isEmpty
(
mPhotoOutput
))
{
/*
if (!isEmpty(cameraOutputCap.videoProfiles)) {
console.info(TAG + "cameraOutputCap.videoProfiles.length: " + cameraOutputCap.videoProfiles.length);
for (let i = 0; i < cameraOutputCap.videoProfiles.length; i++) {
try {
mVideoOutput = await mCameraManager.createVideoOutput(cameraOutputCap.videoProfiles[i], mVideoSurface);
if (!isEmpty(mVideoOutput)) {
break
;
break
;
}
}
}
}
catch {
console.info(TAG + "createVideoOutput FAILED");
if
(
isEmpty
(
mPhotoOutput
))
{
console
.
info
(
TAG
+
"createPhotoOutput FAILED"
);
}
}
console
.
info
(
TAG
+
"createPhotoOutput: "
+
mPhotoOutput
);
}
}
/*
if (isEmpty(mVideoOutput)) {
if (!isEmpty(cameraOutputCap.videoProfiles)) {
console.info(TAG + "createVideoOutput FAILED");
console.info(TAG + "cameraOutputCap.videoProfiles.length: " + cameraOutputCap.videoProfiles.length);
for (let i = 0; i < cameraOutputCap.videoProfiles.length; i++) {
try {
mVideoOutput = await mCameraManager.createVideoOutput(cameraOutputCap.videoProfiles[i], mVideoSurface);
if (!isEmpty(mVideoOutput)) {
break;
}
}
catch {
console.info(TAG + "createVideoOutput FAILED");
}
}
if (isEmpty(mVideoOutput)) {
console.info(TAG + "createVideoOutput FAILED");
}
console.info(TAG + "createVideoOutput: " + mVideoOutput);
}
}
*/
console.info(TAG + "createVideoOutput: " + mVideoOutput);
}
}
*/
console
.
info
(
'Exit createOutputs'
);
console
.
info
(
'Exit createOutputs'
);
return
true
;
return
true
;
...
@@ -518,7 +528,7 @@ export default function cameraSessionTest(surfaceId: any) {
...
@@ -518,7 +528,7 @@ export default function cameraSessionTest(surfaceId: any) {
}
}
})
})
await sleep(100
0
);
await sleep(100);
*/
*/
console
.
info
(
TAG
+
"Exit startCameraSession"
);
console
.
info
(
TAG
+
"Exit startCameraSession"
);
...
@@ -537,7 +547,7 @@ export default function cameraSessionTest(surfaceId: any) {
...
@@ -537,7 +547,7 @@ export default function cameraSessionTest(surfaceId: any) {
}
}
})
})
await sleep(100
0
);
await sleep(100);
*/
*/
if
(
!
isEmpty
(
mCameraInput
))
{
if
(
!
isEmpty
(
mCameraInput
))
{
...
@@ -1553,7 +1563,7 @@ export default function cameraSessionTest(surfaceId: any) {
...
@@ -1553,7 +1563,7 @@ export default function cameraSessionTest(surfaceId: any) {
await
commitCameraSessionConfig
();
await
commitCameraSessionConfig
();
await
sleep
(
100
0
);
await
sleep
(
100
);
await
beginCameraSessionConfig
();
await
beginCameraSessionConfig
();
...
@@ -1561,7 +1571,7 @@ export default function cameraSessionTest(surfaceId: any) {
...
@@ -1561,7 +1571,7 @@ export default function cameraSessionTest(surfaceId: any) {
await
commitCameraSessionConfig
();
await
commitCameraSessionConfig
();
await
sleep
(
100
0
);
await
sleep
(
100
);
if
(
nfyFlag
==
false
)
{
if
(
nfyFlag
==
false
)
{
//expect().assertFail();
//expect().assertFail();
...
@@ -1616,14 +1626,17 @@ export default function cameraSessionTest(surfaceId: any) {
...
@@ -1616,14 +1626,17 @@ export default function cameraSessionTest(surfaceId: any) {
}
}
await
sleep
(
1
);
await
sleep
(
1
);
})
})
await
mCameraSession
.
start
();
await
sleep
(
30
00
);
await
sleep
(
4
00
);
if
(
nfyFlag
==
false
)
{
if
(
nfyFlag
==
false
)
{
//expect().assertFail();
//expect().assertFail();
//console.info(TAG + "SUB_MULTIMEDIA_CAMERA_SESSION_STATUS_CALLBACK_0101 FAILED without any nofity!");
//console.info(TAG + "SUB_MULTIMEDIA_CAMERA_SESSION_STATUS_CALLBACK_0101 FAILED without any nofity!");
}
}
await
mCameraSession
.
stop
();
await
beginCameraSessionConfig
();
await
beginCameraSessionConfig
();
await
stopCameraSession
();
await
stopCameraSession
();
...
...
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionExposureTest.test.ets
浏览文件 @
f5cf1c29
...
@@ -452,61 +452,71 @@ export default function cameraSessionExposureTest(surfaceId: any) {
...
@@ -452,61 +452,71 @@ export default function cameraSessionExposureTest(surfaceId: any) {
async
function
createOutput
(
idx
:
any
)
{
async
function
createOutput
(
idx
:
any
)
{
console
.
info
(
'Enter createOutput'
);
console
.
info
(
'Enter createOutput'
);
let
cameraOutputCap
=
await
mCameraManager
.
getSupportedOutputCapability
(
mCameraDevicesArray
[
idx
]);
let
cameraOutputCap
=
null
;
if
(
!
isEmpty
(
cameraOutputCap
.
previewProfiles
))
{
await
mCameraManager
.
getSupportedOutputCapability
(
mCameraDevicesArray
[
idx
])
.
then
((
result
)
=>
{
console
.
info
(
TAG
+
"cameraOutputCap.previewProfiles.length: "
+
cameraOutputCap
.
previewProfiles
.
length
);
console
.
info
(
'getSupportedOutputCapability success'
);
for
(
let
i
=
0
;
i
<
cameraOutputCap
.
previewProfiles
.
length
;
i
++
)
{
cameraOutputCap
=
result
;
mPreviewOutput
=
await
mCameraManager
.
createPreviewOutput
(
cameraOutputCap
.
previewProfiles
[
i
],
surfaceId
);
})
.
catch
((
err
)
=>
{
if
(
!
isEmpty
(
mPreviewOutput
))
{
console
.
info
(
'getSupportedOutputCapability failed, err = '
+
err
.
message
);
break
;
});
if
(
!
isEmpty
(
cameraOutputCap
))
{
if
(
!
isEmpty
(
cameraOutputCap
.
previewProfiles
))
{
console
.
info
(
TAG
+
"cameraOutputCap.previewProfiles.length: "
+
cameraOutputCap
.
previewProfiles
.
length
);
for
(
let
i
=
0
;
i
<
cameraOutputCap
.
previewProfiles
.
length
;
i
++
)
{
mPreviewOutput
=
await
mCameraManager
.
createPreviewOutput
(
cameraOutputCap
.
previewProfiles
[
i
],
surfaceId
);
if
(
!
isEmpty
(
mPreviewOutput
))
{
break
;
}
}
}
}
if
(
isEmpty
(
mPreviewOutput
))
{
if
(
isEmpty
(
mPreviewOutput
))
{
console
.
info
(
TAG
+
"createPreviewOutput FAILED"
);
console
.
info
(
TAG
+
"createPreviewOutput FAILED"
);
}
console
.
info
(
TAG
+
"createPreviewOutput: "
+
mPreviewOutput
);
}
if
(
!
isEmpty
(
cameraOutputCap
.
photoProfiles
))
{
console
.
info
(
TAG
+
"cameraOutputCap.photoProfiles.length: "
+
cameraOutputCap
.
photoProfiles
.
length
);
for
(
let
i
=
0
;
i
<
cameraOutputCap
.
photoProfiles
.
length
;
i
++
)
{
mPhotoOutput
=
await
mCameraManager
.
createPhotoOutput
(
cameraOutputCap
.
photoProfiles
[
i
],
mPhotoSurface
);
if
(
!
isEmpty
(
mPhotoOutput
))
{
break
;
}
}
console
.
info
(
TAG
+
"createPreviewOutput: "
+
mPreviewOutput
);
}
}
if
(
isEmpty
(
mPhotoOutput
))
{
if
(
!
isEmpty
(
cameraOutputCap
.
photoProfiles
))
{
console
.
info
(
TAG
+
"createPhotoOutput FAILED"
);
console
.
info
(
TAG
+
"cameraOutputCap.photoProfiles.length: "
+
cameraOutputCap
.
photoProfiles
.
length
);
}
for
(
let
i
=
0
;
i
<
cameraOutputCap
.
photoProfiles
.
length
;
i
++
)
{
console
.
info
(
TAG
+
"createPhotoOutput: "
+
mPhotoOutput
);
mPhotoOutput
=
await
mCameraManager
.
createPhotoOutput
(
cameraOutputCap
.
photoProfiles
[
i
],
mPhotoSurface
);
}
if
(
!
isEmpty
(
mPhotoOutput
))
{
/*
if (!isEmpty(cameraOutputCap.videoProfiles)) {
console.info(TAG + "cameraOutputCap.videoProfiles.length: " + cameraOutputCap.videoProfiles.length);
for (let i = 0; i < cameraOutputCap.videoProfiles.length; i++) {
try {
mVideoOutput = await mCameraManager.createVideoOutput(cameraOutputCap.videoProfiles[i], mVideoSurface);
if (!isEmpty(mVideoOutput)) {
break
;
break
;
}
}
}
}
catch {
console.info(TAG + "createVideoOutput FAILED");
if
(
isEmpty
(
mPhotoOutput
))
{
console
.
info
(
TAG
+
"createPhotoOutput FAILED"
);
}
}
console
.
info
(
TAG
+
"createPhotoOutput: "
+
mPhotoOutput
);
}
}
/*
if (isEmpty(mVideoOutput)) {
if (!isEmpty(cameraOutputCap.videoProfiles)) {
console.info(TAG + "createVideoOutput FAILED");
console.info(TAG + "cameraOutputCap.videoProfiles.length: " + cameraOutputCap.videoProfiles.length);
for (let i = 0; i < cameraOutputCap.videoProfiles.length; i++) {
try {
mVideoOutput = await mCameraManager.createVideoOutput(cameraOutputCap.videoProfiles[i], mVideoSurface);
if (!isEmpty(mVideoOutput)) {
break;
}
}
catch {
console.info(TAG + "createVideoOutput FAILED");
}
}
if (isEmpty(mVideoOutput)) {
console.info(TAG + "createVideoOutput FAILED");
}
console.info(TAG + "createVideoOutput: " + mVideoOutput);
}
}
*/
console.info(TAG + "createVideoOutput: " + mVideoOutput);
}
}
*/
console
.
info
(
'Exit createOutputs'
);
console
.
info
(
'Exit createOutputs'
);
return
true
;
return
true
;
...
@@ -577,7 +587,7 @@ export default function cameraSessionExposureTest(surfaceId: any) {
...
@@ -577,7 +587,7 @@ export default function cameraSessionExposureTest(surfaceId: any) {
}
}
})
})
await sleep(100
0
);
await sleep(100);
*/
*/
console
.
info
(
TAG
+
"Exit startCameraSession"
);
console
.
info
(
TAG
+
"Exit startCameraSession"
);
...
@@ -596,7 +606,7 @@ export default function cameraSessionExposureTest(surfaceId: any) {
...
@@ -596,7 +606,7 @@ export default function cameraSessionExposureTest(surfaceId: any) {
}
}
})
})
await sleep(100
0
);
await sleep(100);
*/
*/
if
(
!
isEmpty
(
mCameraInput
))
{
if
(
!
isEmpty
(
mCameraInput
))
{
...
@@ -698,7 +708,7 @@ export default function cameraSessionExposureTest(surfaceId: any) {
...
@@ -698,7 +708,7 @@ export default function cameraSessionExposureTest(surfaceId: any) {
expect
()
.
assertFail
();
expect
()
.
assertFail
();
}
}
})
})
await
sleep
(
100
0
);
await
sleep
(
100
);
await
stopCameraSession
();
await
stopCameraSession
();
...
@@ -740,7 +750,7 @@ export default function cameraSessionExposureTest(surfaceId: any) {
...
@@ -740,7 +750,7 @@ export default function cameraSessionExposureTest(surfaceId: any) {
expect
()
.
assertFail
();
expect
()
.
assertFail
();
}
}
await
sleep
(
100
0
);
await
sleep
(
100
);
await
stopCameraSession
();
await
stopCameraSession
();
...
@@ -902,7 +912,7 @@ export default function cameraSessionExposureTest(surfaceId: any) {
...
@@ -902,7 +912,7 @@ export default function cameraSessionExposureTest(surfaceId: any) {
expect
()
.
assertFail
();
expect
()
.
assertFail
();
}
}
})
})
await
sleep
(
100
0
);
await
sleep
(
100
);
await
stopCameraSession
();
await
stopCameraSession
();
...
@@ -944,7 +954,7 @@ export default function cameraSessionExposureTest(surfaceId: any) {
...
@@ -944,7 +954,7 @@ export default function cameraSessionExposureTest(surfaceId: any) {
expect
()
.
assertFail
();
expect
()
.
assertFail
();
}
}
await
sleep
(
100
0
);
await
sleep
(
100
);
await
stopCameraSession
();
await
stopCameraSession
();
...
@@ -1106,7 +1116,7 @@ export default function cameraSessionExposureTest(surfaceId: any) {
...
@@ -1106,7 +1116,7 @@ export default function cameraSessionExposureTest(surfaceId: any) {
expect
()
.
assertFail
();
expect
()
.
assertFail
();
}
}
})
})
await
sleep
(
100
0
);
await
sleep
(
100
);
await
stopCameraSession
();
await
stopCameraSession
();
...
@@ -1148,7 +1158,7 @@ export default function cameraSessionExposureTest(surfaceId: any) {
...
@@ -1148,7 +1158,7 @@ export default function cameraSessionExposureTest(surfaceId: any) {
expect
()
.
assertFail
();
expect
()
.
assertFail
();
}
}
await
sleep
(
100
0
);
await
sleep
(
100
);
await
stopCameraSession
();
await
stopCameraSession
();
...
...
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionFlashTest.test.ets
浏览文件 @
f5cf1c29
...
@@ -403,61 +403,71 @@ export default function cameraSessionFlashTest(surfaceId: any) {
...
@@ -403,61 +403,71 @@ export default function cameraSessionFlashTest(surfaceId: any) {
async
function
createOutput
(
idx
:
any
)
{
async
function
createOutput
(
idx
:
any
)
{
console
.
info
(
'Enter createOutput'
);
console
.
info
(
'Enter createOutput'
);
let
cameraOutputCap
=
await
mCameraManager
.
getSupportedOutputCapability
(
mCameraDevicesArray
[
idx
]);
let
cameraOutputCap
=
null
;
if
(
!
isEmpty
(
cameraOutputCap
.
previewProfiles
))
{
await
mCameraManager
.
getSupportedOutputCapability
(
mCameraDevicesArray
[
idx
])
.
then
((
result
)
=>
{
console
.
info
(
TAG
+
"cameraOutputCap.previewProfiles.length: "
+
cameraOutputCap
.
previewProfiles
.
length
);
console
.
info
(
'getSupportedOutputCapability success'
);
for
(
let
i
=
0
;
i
<
cameraOutputCap
.
previewProfiles
.
length
;
i
++
)
{
cameraOutputCap
=
result
;
mPreviewOutput
=
await
mCameraManager
.
createPreviewOutput
(
cameraOutputCap
.
previewProfiles
[
i
],
surfaceId
);
})
.
catch
((
err
)
=>
{
if
(
!
isEmpty
(
mPreviewOutput
))
{
console
.
info
(
'getSupportedOutputCapability failed, err = '
+
err
.
message
);
break
;
});
if
(
!
isEmpty
(
cameraOutputCap
))
{
if
(
!
isEmpty
(
cameraOutputCap
.
previewProfiles
))
{
console
.
info
(
TAG
+
"cameraOutputCap.previewProfiles.length: "
+
cameraOutputCap
.
previewProfiles
.
length
);
for
(
let
i
=
0
;
i
<
cameraOutputCap
.
previewProfiles
.
length
;
i
++
)
{
mPreviewOutput
=
await
mCameraManager
.
createPreviewOutput
(
cameraOutputCap
.
previewProfiles
[
i
],
surfaceId
);
if
(
!
isEmpty
(
mPreviewOutput
))
{
break
;
}
}
}
}
if
(
isEmpty
(
mPreviewOutput
))
{
if
(
isEmpty
(
mPreviewOutput
))
{
console
.
info
(
TAG
+
"createPreviewOutput FAILED"
);
console
.
info
(
TAG
+
"createPreviewOutput FAILED"
);
}
console
.
info
(
TAG
+
"createPreviewOutput: "
+
mPreviewOutput
);
}
if
(
!
isEmpty
(
cameraOutputCap
.
photoProfiles
))
{
console
.
info
(
TAG
+
"cameraOutputCap.photoProfiles.length: "
+
cameraOutputCap
.
photoProfiles
.
length
);
for
(
let
i
=
0
;
i
<
cameraOutputCap
.
photoProfiles
.
length
;
i
++
)
{
mPhotoOutput
=
await
mCameraManager
.
createPhotoOutput
(
cameraOutputCap
.
photoProfiles
[
i
],
mPhotoSurface
);
if
(
!
isEmpty
(
mPhotoOutput
))
{
break
;
}
}
console
.
info
(
TAG
+
"createPreviewOutput: "
+
mPreviewOutput
);
}
}
if
(
isEmpty
(
mPhotoOutput
))
{
if
(
!
isEmpty
(
cameraOutputCap
.
photoProfiles
))
{
console
.
info
(
TAG
+
"createPhotoOutput FAILED"
);
console
.
info
(
TAG
+
"cameraOutputCap.photoProfiles.length: "
+
cameraOutputCap
.
photoProfiles
.
length
);
}
for
(
let
i
=
0
;
i
<
cameraOutputCap
.
photoProfiles
.
length
;
i
++
)
{
console
.
info
(
TAG
+
"createPhotoOutput: "
+
mPhotoOutput
);
mPhotoOutput
=
await
mCameraManager
.
createPhotoOutput
(
cameraOutputCap
.
photoProfiles
[
i
],
mPhotoSurface
);
}
if
(
!
isEmpty
(
mPhotoOutput
))
{
/*
if (!isEmpty(cameraOutputCap.videoProfiles)) {
console.info(TAG + "cameraOutputCap.videoProfiles.length: " + cameraOutputCap.videoProfiles.length);
for (let i = 0; i < cameraOutputCap.videoProfiles.length; i++) {
try {
mVideoOutput = await mCameraManager.createVideoOutput(cameraOutputCap.videoProfiles[i], mVideoSurface);
if (!isEmpty(mVideoOutput)) {
break
;
break
;
}
}
}
}
catch {
console.info(TAG + "createVideoOutput FAILED");
if
(
isEmpty
(
mPhotoOutput
))
{
console
.
info
(
TAG
+
"createPhotoOutput FAILED"
);
}
}
console
.
info
(
TAG
+
"createPhotoOutput: "
+
mPhotoOutput
);
}
}
/*
if (isEmpty(mVideoOutput)) {
if (!isEmpty(cameraOutputCap.videoProfiles)) {
console.info(TAG + "createVideoOutput FAILED");
console.info(TAG + "cameraOutputCap.videoProfiles.length: " + cameraOutputCap.videoProfiles.length);
for (let i = 0; i < cameraOutputCap.videoProfiles.length; i++) {
try {
mVideoOutput = await mCameraManager.createVideoOutput(cameraOutputCap.videoProfiles[i], mVideoSurface);
if (!isEmpty(mVideoOutput)) {
break;
}
}
catch {
console.info(TAG + "createVideoOutput FAILED");
}
}
if (isEmpty(mVideoOutput)) {
console.info(TAG + "createVideoOutput FAILED");
}
console.info(TAG + "createVideoOutput: " + mVideoOutput);
}
}
*/
console.info(TAG + "createVideoOutput: " + mVideoOutput);
}
}
*/
console
.
info
(
'Exit createOutputs'
);
console
.
info
(
'Exit createOutputs'
);
return
true
;
return
true
;
...
@@ -528,7 +538,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
...
@@ -528,7 +538,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
}
}
})
})
await sleep(100
0
);
await sleep(100);
*/
*/
console
.
info
(
TAG
+
"Exit startCameraSession"
);
console
.
info
(
TAG
+
"Exit startCameraSession"
);
...
@@ -547,7 +557,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
...
@@ -547,7 +557,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
}
}
})
})
await sleep(100
0
);
await sleep(100);
*/
*/
if
(
!
isEmpty
(
mCameraInput
))
{
if
(
!
isEmpty
(
mCameraInput
))
{
...
@@ -649,7 +659,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
...
@@ -649,7 +659,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
expect
()
.
assertFail
();
expect
()
.
assertFail
();
}
}
})
})
await
sleep
(
100
0
);
await
sleep
(
100
);
await
stopCameraSession
();
await
stopCameraSession
();
...
@@ -691,7 +701,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
...
@@ -691,7 +701,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_HAS_FLASH_PROMISE_0100 FAILED with hasFlash is: "
+
hasFlashPromise
);
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_HAS_FLASH_PROMISE_0100 FAILED with hasFlash is: "
+
hasFlashPromise
);
expect
()
.
assertFail
();
expect
()
.
assertFail
();
}
}
await
sleep
(
100
0
);
await
sleep
(
100
);
await
stopCameraSession
();
await
stopCameraSession
();
...
@@ -742,7 +752,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
...
@@ -742,7 +752,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
expect
()
.
assertFail
();
expect
()
.
assertFail
();
}
}
})
})
await
sleep
(
100
0
);
await
sleep
(
100
);
}
else
{
}
else
{
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_IS_FLASH_MODE_SUPPORT_CALLBACK_0100 not support"
);
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_IS_FLASH_MODE_SUPPORT_CALLBACK_0100 not support"
);
}
}
...
@@ -788,7 +798,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
...
@@ -788,7 +798,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
expect
()
.
assertFail
();
expect
()
.
assertFail
();
}
}
await
sleep
(
100
0
);
await
sleep
(
100
);
}
else
{
}
else
{
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_IS_FLASH_MODE_SUPPORT_PROMISE_0100 not support"
);
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_IS_FLASH_MODE_SUPPORT_PROMISE_0100 not support"
);
}
}
...
@@ -955,7 +965,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
...
@@ -955,7 +965,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
expect
()
.
assertFail
();
expect
()
.
assertFail
();
}
}
})
})
await
sleep
(
100
0
);
await
sleep
(
100
);
}
else
{
}
else
{
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_IS_FLASH_MODE_SUPPORT_CALLBACK_0101 not support"
);
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_IS_FLASH_MODE_SUPPORT_CALLBACK_0101 not support"
);
}
}
...
@@ -1001,7 +1011,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
...
@@ -1001,7 +1011,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
expect
()
.
assertFail
();
expect
()
.
assertFail
();
}
}
await
sleep
(
100
0
);
await
sleep
(
100
);
}
else
{
}
else
{
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_IS_FLASH_MODE_SUPPORT_PROMISE_0101 not support"
);
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_IS_FLASH_MODE_SUPPORT_PROMISE_0101 not support"
);
}
}
...
@@ -1167,7 +1177,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
...
@@ -1167,7 +1177,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
expect
()
.
assertFail
();
expect
()
.
assertFail
();
}
}
})
})
await
sleep
(
100
0
);
await
sleep
(
100
);
}
else
{
}
else
{
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_IS_FLASH_MODE_SUPPORT_CALLBACK_0102 not support"
);
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_IS_FLASH_MODE_SUPPORT_CALLBACK_0102 not support"
);
}
}
...
@@ -1213,7 +1223,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
...
@@ -1213,7 +1223,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
expect
()
.
assertFail
();
expect
()
.
assertFail
();
}
}
await
sleep
(
100
0
);
await
sleep
(
100
);
}
else
{
}
else
{
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_IS_FLASH_MODE_SUPPORT_PROMISE_0102 not support"
);
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_IS_FLASH_MODE_SUPPORT_PROMISE_0102 not support"
);
}
}
...
@@ -1379,7 +1389,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
...
@@ -1379,7 +1389,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
expect
()
.
assertFail
();
expect
()
.
assertFail
();
}
}
})
})
await
sleep
(
100
0
);
await
sleep
(
100
);
}
else
{
}
else
{
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_IS_FLASH_MODE_SUPPORT_CALLBACK_0103 not support"
);
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_IS_FLASH_MODE_SUPPORT_CALLBACK_0103 not support"
);
}
}
...
@@ -1425,7 +1435,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
...
@@ -1425,7 +1435,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
expect
()
.
assertFail
();
expect
()
.
assertFail
();
}
}
await
sleep
(
100
0
);
await
sleep
(
100
);
}
else
{
}
else
{
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_IS_FLASH_MODE_SUPPORT_PROMISE_0103 not support"
);
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_IS_FLASH_MODE_SUPPORT_PROMISE_0103 not support"
);
}
}
...
...
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionFocusTest.test.ets
浏览文件 @
f5cf1c29
...
@@ -448,61 +448,71 @@ export default function cameraSessionFocusTest(surfaceId: any) {
...
@@ -448,61 +448,71 @@ export default function cameraSessionFocusTest(surfaceId: any) {
async
function
createOutput
(
idx
:
any
)
{
async
function
createOutput
(
idx
:
any
)
{
console
.
info
(
'Enter createOutput'
);
console
.
info
(
'Enter createOutput'
);
let
cameraOutputCap
=
await
mCameraManager
.
getSupportedOutputCapability
(
mCameraDevicesArray
[
idx
]);
let
cameraOutputCap
=
null
;
if
(
!
isEmpty
(
cameraOutputCap
.
previewProfiles
))
{
await
mCameraManager
.
getSupportedOutputCapability
(
mCameraDevicesArray
[
idx
])
.
then
((
result
)
=>
{
console
.
info
(
TAG
+
"cameraOutputCap.previewProfiles.length: "
+
cameraOutputCap
.
previewProfiles
.
length
);
console
.
info
(
'getSupportedOutputCapability success'
);
for
(
let
i
=
0
;
i
<
cameraOutputCap
.
previewProfiles
.
length
;
i
++
)
{
cameraOutputCap
=
result
;
mPreviewOutput
=
await
mCameraManager
.
createPreviewOutput
(
cameraOutputCap
.
previewProfiles
[
i
],
surfaceId
);
})
.
catch
((
err
)
=>
{
if
(
!
isEmpty
(
mPreviewOutput
))
{
console
.
info
(
'getSupportedOutputCapability failed, err = '
+
err
.
message
);
break
;
});
if
(
!
isEmpty
(
cameraOutputCap
))
{
if
(
!
isEmpty
(
cameraOutputCap
.
previewProfiles
))
{
console
.
info
(
TAG
+
"cameraOutputCap.previewProfiles.length: "
+
cameraOutputCap
.
previewProfiles
.
length
);
for
(
let
i
=
0
;
i
<
cameraOutputCap
.
previewProfiles
.
length
;
i
++
)
{
mPreviewOutput
=
await
mCameraManager
.
createPreviewOutput
(
cameraOutputCap
.
previewProfiles
[
i
],
surfaceId
);
if
(
!
isEmpty
(
mPreviewOutput
))
{
break
;
}
}
}
}
if
(
isEmpty
(
mPreviewOutput
))
{
if
(
isEmpty
(
mPreviewOutput
))
{
console
.
info
(
TAG
+
"createPreviewOutput FAILED"
);
console
.
info
(
TAG
+
"createPreviewOutput FAILED"
);
}
console
.
info
(
TAG
+
"createPreviewOutput: "
+
mPreviewOutput
);
}
if
(
!
isEmpty
(
cameraOutputCap
.
photoProfiles
))
{
console
.
info
(
TAG
+
"cameraOutputCap.photoProfiles.length: "
+
cameraOutputCap
.
photoProfiles
.
length
);
for
(
let
i
=
0
;
i
<
cameraOutputCap
.
photoProfiles
.
length
;
i
++
)
{
mPhotoOutput
=
await
mCameraManager
.
createPhotoOutput
(
cameraOutputCap
.
photoProfiles
[
i
],
mPhotoSurface
);
if
(
!
isEmpty
(
mPhotoOutput
))
{
break
;
}
}
console
.
info
(
TAG
+
"createPreviewOutput: "
+
mPreviewOutput
);
}
}
if
(
isEmpty
(
mPhotoOutput
))
{
if
(
!
isEmpty
(
cameraOutputCap
.
photoProfiles
))
{
console
.
info
(
TAG
+
"createPhotoOutput FAILED"
);
console
.
info
(
TAG
+
"cameraOutputCap.photoProfiles.length: "
+
cameraOutputCap
.
photoProfiles
.
length
);
}
for
(
let
i
=
0
;
i
<
cameraOutputCap
.
photoProfiles
.
length
;
i
++
)
{
console
.
info
(
TAG
+
"createPhotoOutput: "
+
mPhotoOutput
);
mPhotoOutput
=
await
mCameraManager
.
createPhotoOutput
(
cameraOutputCap
.
photoProfiles
[
i
],
mPhotoSurface
);
}
if
(
!
isEmpty
(
mPhotoOutput
))
{
/*
if (!isEmpty(cameraOutputCap.videoProfiles)) {
console.info(TAG + "cameraOutputCap.videoProfiles.length: " + cameraOutputCap.videoProfiles.length);
for (let i = 0; i < cameraOutputCap.videoProfiles.length; i++) {
try {
mVideoOutput = await mCameraManager.createVideoOutput(cameraOutputCap.videoProfiles[i], mVideoSurface);
if (!isEmpty(mVideoOutput)) {
break
;
break
;
}
}
}
}
catch {
console.info(TAG + "createVideoOutput FAILED");
if
(
isEmpty
(
mPhotoOutput
))
{
console
.
info
(
TAG
+
"createPhotoOutput FAILED"
);
}
}
console
.
info
(
TAG
+
"createPhotoOutput: "
+
mPhotoOutput
);
}
}
/*
if (isEmpty(mVideoOutput)) {
if (!isEmpty(cameraOutputCap.videoProfiles)) {
console.info(TAG + "createVideoOutput FAILED");
console.info(TAG + "cameraOutputCap.videoProfiles.length: " + cameraOutputCap.videoProfiles.length);
for (let i = 0; i < cameraOutputCap.videoProfiles.length; i++) {
try {
mVideoOutput = await mCameraManager.createVideoOutput(cameraOutputCap.videoProfiles[i], mVideoSurface);
if (!isEmpty(mVideoOutput)) {
break;
}
}
catch {
console.info(TAG + "createVideoOutput FAILED");
}
}
if (isEmpty(mVideoOutput)) {
console.info(TAG + "createVideoOutput FAILED");
}
console.info(TAG + "createVideoOutput: " + mVideoOutput);
}
}
*/
console.info(TAG + "createVideoOutput: " + mVideoOutput);
}
}
*/
console
.
info
(
'Exit createOutputs'
);
console
.
info
(
'Exit createOutputs'
);
return
true
;
return
true
;
...
@@ -573,7 +583,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
...
@@ -573,7 +583,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
}
}
})
})
await sleep(100
0
);
await sleep(100);
*/
*/
console
.
info
(
TAG
+
"Exit startCameraSession"
);
console
.
info
(
TAG
+
"Exit startCameraSession"
);
...
@@ -592,7 +602,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
...
@@ -592,7 +602,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
}
}
})
})
await sleep(100
0
);
await sleep(100);
*/
*/
if
(
!
isEmpty
(
mCameraInput
))
{
if
(
!
isEmpty
(
mCameraInput
))
{
...
@@ -694,7 +704,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
...
@@ -694,7 +704,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
expect
()
.
assertFail
();
expect
()
.
assertFail
();
}
}
})
})
await
sleep
(
100
0
);
await
sleep
(
100
);
await
stopCameraSession
();
await
stopCameraSession
();
...
@@ -736,7 +746,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
...
@@ -736,7 +746,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
expect
()
.
assertFail
();
expect
()
.
assertFail
();
}
}
await
sleep
(
100
0
);
await
sleep
(
100
);
await
stopCameraSession
();
await
stopCameraSession
();
...
@@ -898,7 +908,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
...
@@ -898,7 +908,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
expect
()
.
assertFail
();
expect
()
.
assertFail
();
}
}
})
})
await
sleep
(
100
0
);
await
sleep
(
100
);
await
stopCameraSession
();
await
stopCameraSession
();
...
@@ -940,7 +950,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
...
@@ -940,7 +950,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
expect
()
.
assertFail
();
expect
()
.
assertFail
();
}
}
await
sleep
(
100
0
);
await
sleep
(
100
);
await
stopCameraSession
();
await
stopCameraSession
();
...
@@ -1102,7 +1112,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
...
@@ -1102,7 +1112,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
expect
()
.
assertFail
();
expect
()
.
assertFail
();
}
}
})
})
await
sleep
(
100
0
);
await
sleep
(
100
);
await
stopCameraSession
();
await
stopCameraSession
();
...
@@ -1144,7 +1154,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
...
@@ -1144,7 +1154,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
expect
()
.
assertFail
();
expect
()
.
assertFail
();
}
}
await
sleep
(
100
0
);
await
sleep
(
100
);
await
stopCameraSession
();
await
stopCameraSession
();
...
@@ -1306,7 +1316,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
...
@@ -1306,7 +1316,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
expect
()
.
assertFail
();
expect
()
.
assertFail
();
}
}
})
})
await
sleep
(
100
0
);
await
sleep
(
100
);
await
stopCameraSession
();
await
stopCameraSession
();
...
@@ -1348,7 +1358,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
...
@@ -1348,7 +1358,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
expect
()
.
assertFail
();
expect
()
.
assertFail
();
}
}
await
sleep
(
100
0
);
await
sleep
(
100
);
await
stopCameraSession
();
await
stopCameraSession
();
...
@@ -1457,7 +1467,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
...
@@ -1457,7 +1467,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_FOCUS_MODE_PROMISE_0103 FAILED with FocusMode is: "
+
focusMode
);
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_FOCUS_MODE_PROMISE_0103 FAILED with FocusMode is: "
+
focusMode
);
expect
()
.
assertFail
();
expect
()
.
assertFail
();
}
}
await
sleep
(
100
0
);
await
sleep
(
100
);
}
else
{
}
else
{
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_FOCUS_MODE_PROMISE_0103 not support"
);
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_FOCUS_MODE_PROMISE_0103 not support"
);
}
}
...
@@ -2438,7 +2448,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
...
@@ -2438,7 +2448,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
expect
()
.
assertFail
();
expect
()
.
assertFail
();
}
}
})
})
await
sleep
(
100
0
);
await
sleep
(
100
);
await
stopCameraSession
();
await
stopCameraSession
();
...
@@ -2475,7 +2485,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
...
@@ -2475,7 +2485,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_GET_FOCAL_LENGTH_PROMISE_0100 finish"
);
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_GET_FOCAL_LENGTH_PROMISE_0100 finish"
);
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_GET_FOCAL_LENGTH_PROMISE_0100 PASSED with FocalLength is: "
+
focalLength
);
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_GET_FOCAL_LENGTH_PROMISE_0100 PASSED with FocalLength is: "
+
focalLength
);
await
sleep
(
100
0
);
await
sleep
(
100
);
await
stopCameraSession
();
await
stopCameraSession
();
...
...
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionVideoStabilizationTest.test.ets
浏览文件 @
f5cf1c29
此差异已折叠。
点击以展开。
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionZoomRatioTest.test.ets
浏览文件 @
f5cf1c29
...
@@ -405,61 +405,71 @@ export default function cameraSessionZoomRatioTest(surfaceId: any) {
...
@@ -405,61 +405,71 @@ export default function cameraSessionZoomRatioTest(surfaceId: any) {
async
function
createOutput
(
idx
:
any
)
{
async
function
createOutput
(
idx
:
any
)
{
console
.
info
(
'Enter createOutput'
);
console
.
info
(
'Enter createOutput'
);
let
cameraOutputCap
=
await
mCameraManager
.
getSupportedOutputCapability
(
mCameraDevicesArray
[
idx
]);
let
cameraOutputCap
=
null
;
if
(
!
isEmpty
(
cameraOutputCap
.
previewProfiles
))
{
await
mCameraManager
.
getSupportedOutputCapability
(
mCameraDevicesArray
[
idx
])
.
then
((
result
)
=>
{
console
.
info
(
TAG
+
"cameraOutputCap.previewProfiles.length: "
+
cameraOutputCap
.
previewProfiles
.
length
);
console
.
info
(
'getSupportedOutputCapability success'
);
for
(
let
i
=
0
;
i
<
cameraOutputCap
.
previewProfiles
.
length
;
i
++
)
{
cameraOutputCap
=
result
;
mPreviewOutput
=
await
mCameraManager
.
createPreviewOutput
(
cameraOutputCap
.
previewProfiles
[
i
],
surfaceId
);
})
.
catch
((
err
)
=>
{
if
(
!
isEmpty
(
mPreviewOutput
))
{
console
.
info
(
'getSupportedOutputCapability failed, err = '
+
err
.
message
);
break
;
});
if
(
!
isEmpty
(
cameraOutputCap
))
{
if
(
!
isEmpty
(
cameraOutputCap
.
previewProfiles
))
{
console
.
info
(
TAG
+
"cameraOutputCap.previewProfiles.length: "
+
cameraOutputCap
.
previewProfiles
.
length
);
for
(
let
i
=
0
;
i
<
cameraOutputCap
.
previewProfiles
.
length
;
i
++
)
{
mPreviewOutput
=
await
mCameraManager
.
createPreviewOutput
(
cameraOutputCap
.
previewProfiles
[
i
],
surfaceId
);
if
(
!
isEmpty
(
mPreviewOutput
))
{
break
;
}
}
}
}
if
(
isEmpty
(
mPreviewOutput
))
{
if
(
isEmpty
(
mPreviewOutput
))
{
console
.
info
(
TAG
+
"createPreviewOutput FAILED"
);
console
.
info
(
TAG
+
"createPreviewOutput FAILED"
);
}
console
.
info
(
TAG
+
"createPreviewOutput: "
+
mPreviewOutput
);
}
if
(
!
isEmpty
(
cameraOutputCap
.
photoProfiles
))
{
console
.
info
(
TAG
+
"cameraOutputCap.photoProfiles.length: "
+
cameraOutputCap
.
photoProfiles
.
length
);
for
(
let
i
=
0
;
i
<
cameraOutputCap
.
photoProfiles
.
length
;
i
++
)
{
mPhotoOutput
=
await
mCameraManager
.
createPhotoOutput
(
cameraOutputCap
.
photoProfiles
[
i
],
mPhotoSurface
);
if
(
!
isEmpty
(
mPhotoOutput
))
{
break
;
}
}
console
.
info
(
TAG
+
"createPreviewOutput: "
+
mPreviewOutput
);
}
}
if
(
isEmpty
(
mPhotoOutput
))
{
if
(
!
isEmpty
(
cameraOutputCap
.
photoProfiles
))
{
console
.
info
(
TAG
+
"createPhotoOutput FAILED"
);
console
.
info
(
TAG
+
"cameraOutputCap.photoProfiles.length: "
+
cameraOutputCap
.
photoProfiles
.
length
);
}
for
(
let
i
=
0
;
i
<
cameraOutputCap
.
photoProfiles
.
length
;
i
++
)
{
console
.
info
(
TAG
+
"createPhotoOutput: "
+
mPhotoOutput
);
mPhotoOutput
=
await
mCameraManager
.
createPhotoOutput
(
cameraOutputCap
.
photoProfiles
[
i
],
mPhotoSurface
);
}
if
(
!
isEmpty
(
mPhotoOutput
))
{
/*
if (!isEmpty(cameraOutputCap.videoProfiles)) {
console.info(TAG + "cameraOutputCap.videoProfiles.length: " + cameraOutputCap.videoProfiles.length);
for (let i = 0; i < cameraOutputCap.videoProfiles.length; i++) {
try {
mVideoOutput = await mCameraManager.createVideoOutput(cameraOutputCap.videoProfiles[i], mVideoSurface);
if (!isEmpty(mVideoOutput)) {
break
;
break
;
}
}
}
}
catch {
console.info(TAG + "createVideoOutput FAILED");
if
(
isEmpty
(
mPhotoOutput
))
{
console
.
info
(
TAG
+
"createPhotoOutput FAILED"
);
}
}
console
.
info
(
TAG
+
"createPhotoOutput: "
+
mPhotoOutput
);
}
}
/*
if (isEmpty(mVideoOutput)) {
if (!isEmpty(cameraOutputCap.videoProfiles)) {
console.info(TAG + "createVideoOutput FAILED");
console.info(TAG + "cameraOutputCap.videoProfiles.length: " + cameraOutputCap.videoProfiles.length);
for (let i = 0; i < cameraOutputCap.videoProfiles.length; i++) {
try {
mVideoOutput = await mCameraManager.createVideoOutput(cameraOutputCap.videoProfiles[i], mVideoSurface);
if (!isEmpty(mVideoOutput)) {
break;
}
}
catch {
console.info(TAG + "createVideoOutput FAILED");
}
}
if (isEmpty(mVideoOutput)) {
console.info(TAG + "createVideoOutput FAILED");
}
console.info(TAG + "createVideoOutput: " + mVideoOutput);
}
}
*/
console.info(TAG + "createVideoOutput: " + mVideoOutput);
}
}
*/
console
.
info
(
'Exit createOutputs'
);
console
.
info
(
'Exit createOutputs'
);
return
true
;
return
true
;
...
@@ -530,7 +540,7 @@ export default function cameraSessionZoomRatioTest(surfaceId: any) {
...
@@ -530,7 +540,7 @@ export default function cameraSessionZoomRatioTest(surfaceId: any) {
}
}
})
})
await sleep(100
0
);
await sleep(100);
*/
*/
console
.
info
(
TAG
+
"Exit startCameraSession"
);
console
.
info
(
TAG
+
"Exit startCameraSession"
);
...
@@ -549,7 +559,7 @@ export default function cameraSessionZoomRatioTest(surfaceId: any) {
...
@@ -549,7 +559,7 @@ export default function cameraSessionZoomRatioTest(surfaceId: any) {
}
}
})
})
await sleep(100
0
);
await sleep(100);
*/
*/
if
(
!
isEmpty
(
mCameraInput
))
{
if
(
!
isEmpty
(
mCameraInput
))
{
...
@@ -662,7 +672,7 @@ export default function cameraSessionZoomRatioTest(surfaceId: any) {
...
@@ -662,7 +672,7 @@ export default function cameraSessionZoomRatioTest(surfaceId: any) {
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_GET_ZOOM_RATIO_RANGE_CALLBACK_0100 PASSED : "
+
err
.
message
);
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_GET_ZOOM_RATIO_RANGE_CALLBACK_0100 PASSED : "
+
err
.
message
);
}
}
})
})
await
sleep
(
100
0
);
await
sleep
(
100
);
await
stopCameraSession
();
await
stopCameraSession
();
...
@@ -713,7 +723,7 @@ export default function cameraSessionZoomRatioTest(surfaceId: any) {
...
@@ -713,7 +723,7 @@ export default function cameraSessionZoomRatioTest(surfaceId: any) {
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_GET_ZOOM_RATIO_RANGE_CALLBACK_0100 PASSED"
);
console
.
info
(
TAG
+
"Entering SUB_MULTIMEDIA_CAMERA_SESSION_GET_ZOOM_RATIO_RANGE_CALLBACK_0100 PASSED"
);
}
}
await
sleep
(
100
0
);
await
sleep
(
100
);
await
stopCameraSession
();
await
stopCameraSession
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录