Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Xts Acts
提交
b275bddf
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看板
未验证
提交
b275bddf
编写于
10月 20, 2022
作者:
O
openharmony_ci
提交者:
Gitee
10月 20, 2022
浏览文件
操作
浏览文件
下载
差异文件
!5958 Modify xts cases for camere session
Merge pull request !5958 from wuhao/master
上级
69f97f65
0a5512fb
变更
9
展开全部
隐藏空白更改
内联
并排
Showing
9 changed file
with
3341 addition
and
3006 deletion
+3341
-3006
multimedia/camera/camera_js_standard/src/main/config.json
multimedia/camera/camera_js_standard/src/main/config.json
+6
-2
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraJSUnitOutput.test.ets
...src/main/ets/MainAbility/test/CameraJSUnitOutput.test.ets
+27
-15
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraManagerTest.test.ets
.../src/main/ets/MainAbility/test/CameraManagerTest.test.ets
+43
-31
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionBaseTest.test.ets
.../main/ets/MainAbility/test/CameraSessionBaseTest.test.ets
+458
-265
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionExposureTest.test.ets
...n/ets/MainAbility/test/CameraSessionExposureTest.test.ets
+710
-682
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionFlashTest.test.ets
...main/ets/MainAbility/test/CameraSessionFlashTest.test.ets
+495
-467
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionFocusTest.test.ets
...main/ets/MainAbility/test/CameraSessionFocusTest.test.ets
+643
-615
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionVideoStabilizationTest.test.ets
...Ability/test/CameraSessionVideoStabilizationTest.test.ets
+439
-461
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionZoomRatioTest.test.ets
.../ets/MainAbility/test/CameraSessionZoomRatioTest.test.ets
+520
-468
未找到文件。
multimedia/camera/camera_js_standard/src/main/config.json
100644 → 100755
浏览文件 @
b275bddf
...
@@ -78,8 +78,12 @@
...
@@ -78,8 +78,12 @@
"reason"
:
"use ohos.permission.READ_MEDIA"
"reason"
:
"use ohos.permission.READ_MEDIA"
},
},
{
{
"name"
:
"ohos.permission.START_ABILITIES_FROM_BACKGROUND"
,
"name"
:
"ohos.permission.WRITE_MEDIA"
,
"reason"
:
"use ohos.permission.START_ABILITIES_FROM_BACKGROUND"
"reason"
:
"use ohos.permission.WRITE_MEDIA"
},
{
"name"
:
"ohos.permission.START_ABILIIES_FROM_BACKGROUND"
,
"reason"
:
"use ohos.permission.START_ABILIIES_FROM_BACKGROUND"
},
},
{
{
"name"
:
"ohos.permission.START_INVISIBLE_ABILITY"
,
"name"
:
"ohos.permission.START_INVISIBLE_ABILITY"
,
...
...
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraJSUnitOutput.test.ets
浏览文件 @
b275bddf
...
@@ -113,23 +113,35 @@ export default function cameraJSUnitOutput(surfaceId: any) {
...
@@ -113,23 +113,35 @@ export default function cameraJSUnitOutput(surfaceId: any) {
}
}
}
}
async
function
getvideosurface
()
{
async
function
getvideosurface
()
{
await
getFd
(
'CameraOutput.mp4'
);
await
getFd
(
'CameraOutput.mp4'
);
videoConfig
.
url
=
fdPath
;
videoConfig
.
url
=
fdPath
;
media
.
createVideoRecorder
((
err
,
recorder
)
=>
{
media
.
createVideoRecorder
((
err
,
recorder
)
=>
{
console
.
info
(
TAG
+
'createVideoRecorder called'
)
if
(
!
err
)
{
videoRecorder
=
recorder
console
.
info
(
TAG
+
'createVideoRecorder called'
)
console
.
info
(
TAG
+
'videoRecorder is :'
+
JSON
.
stringify
(
videoRecorder
))
videoRecorder
=
recorder
console
.
info
(
TAG
+
'videoRecorder.prepare called.'
)
console
.
info
(
TAG
+
'videoRecorder is :'
+
JSON
.
stringify
(
videoRecorder
))
videoRecorder
.
prepare
(
videoConfig
,
(
err
)
=>
{
console
.
info
(
TAG
+
'videoRecorder.prepare called.'
)
console
.
info
(
TAG
+
'videoRecorder.prepare success.'
)
videoRecorder
.
prepare
(
videoConfig
,
(
err
)
=>
{
})
if
(
!
err
)
{
videoRecorder
.
getInputSurface
((
err
,
id
)
=>
{
console
.
info
(
TAG
+
'videoRecorder.prepare success.'
)
console
.
info
(
TAG
+
'getInputSurface called'
)
videoRecorder
.
getInputSurface
((
err
,
id
)
=>
{
videoSurfaceId
=
id
console
.
info
(
TAG
+
'getInputSurface called'
)
console
.
info
(
TAG
+
'getInputSurface surfaceId: '
+
JSON
.
stringify
(
videoSurfaceId
))
if
(
!
err
)
{
})
videoSurfaceId
=
id
console
.
info
(
TAG
+
'getInputSurface surfaceId: '
+
JSON
.
stringify
(
videoSurfaceId
))
}
else
{
console
.
info
(
TAG
+
'getInputSurface FAILED'
)
}
})
}
else
{
console
.
info
(
TAG
+
'prepare FAILED'
)
}
})
}
else
{
console
.
info
(
TAG
+
'createVideoRecorder FAILED'
)
}
})
})
}
}
...
@@ -164,7 +176,7 @@ export default function cameraJSUnitOutput(surfaceId: any) {
...
@@ -164,7 +176,7 @@ export default function cameraJSUnitOutput(surfaceId: any) {
let
permissionName3
=
'ohos.permission.MEDIA_LOCATION'
;
let
permissionName3
=
'ohos.permission.MEDIA_LOCATION'
;
let
permissionName4
=
'ohos.permission.READ_MEDIA'
;
let
permissionName4
=
'ohos.permission.READ_MEDIA'
;
let
permissionName5
=
'ohos.permission.WRITE_MEDIA'
;
let
permissionName5
=
'ohos.permission.WRITE_MEDIA'
;
let
permissionName6
=
'ohos.permission.START_ABILI
T
IES_FROM_BACKGROUND'
;
let
permissionName6
=
'ohos.permission.START_ABILIIES_FROM_BACKGROUND'
;
let
permissionName7
=
'ohos.permission.START_INVISIBLE_ABILITY'
;
let
permissionName7
=
'ohos.permission.START_INVISIBLE_ABILITY'
;
let
permissionName8
=
'ohos.permission.ABILITY_BACKGROUND_COMMUNICATION'
;
let
permissionName8
=
'ohos.permission.ABILITY_BACKGROUND_COMMUNICATION'
;
await
atManager
.
grantUserGrantedPermission
(
tokenID
,
permissionName1
,
1
)
.
then
((
result
)
=>
{
await
atManager
.
grantUserGrantedPermission
(
tokenID
,
permissionName1
,
1
)
.
then
((
result
)
=>
{
...
...
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraManagerTest.test.ets
浏览文件 @
b275bddf
...
@@ -82,47 +82,59 @@ export default function cameraManagerTest(surfaceId: any) {
...
@@ -82,47 +82,59 @@ export default function cameraManagerTest(surfaceId: any) {
let
publicPath
=
await
mediaTest
.
getPublicDirectory
(
mediaLibrary
.
DirectoryType
.
DIR_VIDEO
);
let
publicPath
=
await
mediaTest
.
getPublicDirectory
(
mediaLibrary
.
DirectoryType
.
DIR_VIDEO
);
let
dataUri
=
await
mediaTest
.
createAsset
(
mediaType
,
displayName
,
publicPath
);
let
dataUri
=
await
mediaTest
.
createAsset
(
mediaType
,
displayName
,
publicPath
);
if
(
dataUri
!=
undefined
)
{
if
(
dataUri
!=
undefined
)
{
let
args
=
dataUri
.
id
.
toString
();
let
args
=
dataUri
.
id
.
toString
();
let
fetchOp
=
{
let
fetchOp
=
{
selections
:
fileKeyObj
.
ID
+
"=?"
,
selections
:
fileKeyObj
.
ID
+
"=?"
,
selectionArgs
:
[
args
],
selectionArgs
:
[
args
],
}
}
let
fetchFileResult
=
await
mediaTest
.
getFileAssets
(
fetchOp
);
let
fetchFileResult
=
await
mediaTest
.
getFileAssets
(
fetchOp
);
mFileAsset
=
await
fetchFileResult
.
getAllObject
();
mFileAsset
=
await
fetchFileResult
.
getAllObject
();
mFdNumber
=
await
mFileAsset
[
0
]
.
open
(
'Rw'
);
mFdNumber
=
await
mFileAsset
[
0
]
.
open
(
'Rw'
);
mFdPath
=
"fd://"
+
mFdNumber
.
toString
();
mFdPath
=
"fd://"
+
mFdNumber
.
toString
();
}
}
}
}
async
function
closeFd
()
{
async
function
closeFd
()
{
if
(
mFileAsset
!=
null
)
{
if
(
mFileAsset
!=
null
)
{
await
mFileAsset
[
0
]
.
close
(
mFdNumber
)
.
then
(()
=>
{
await
mFileAsset
[
0
]
.
close
(
mFdNumber
)
.
then
(()
=>
{
console
.
info
(
'[mediaLibrary] case close fd success'
);
console
.
info
(
'[mediaLibrary] case close fd success'
);
})
.
catch
((
err
)
=>
{
})
.
catch
((
err
)
=>
{
console
.
info
(
'[mediaLibrary] case close fd failed'
);
console
.
info
(
'[mediaLibrary] case close fd failed'
);
});
});
}
else
{
}
else
{
console
.
info
(
'[mediaLibrary] case fileAsset is null'
);
console
.
info
(
'[mediaLibrary] case fileAsset is null'
);
}
}
}
}
async
function
getVideoReceiveSurface
()
{
async
function
getVideoReceiveSurface
()
{
console
.
log
(
TAG
+
'Entering getVideoReceiveSurface'
)
console
.
log
(
TAG
+
'Entering getVideoReceiveSurface'
)
await
getFd
(
'CameraManager.mp4'
);
await
getFd
(
'CameraManager.mp4'
);
mVideoConfig
.
url
=
mFdPath
;
mVideoConfig
.
url
=
mFdPath
;
media
.
createVideoRecorder
((
err
,
recorder
)
=>
{
media
.
createVideoRecorder
((
err
,
recorder
)
=>
{
console
.
info
(
TAG
+
'Entering create video receiver'
)
if
(
!
err
)
{
mVideoRecorder
=
recorder
console
.
info
(
TAG
+
'Entering create video receiver'
)
console
.
info
(
TAG
+
'videoRecorder is :'
+
JSON
.
stringify
(
mVideoRecorder
))
mVideoRecorder
=
recorder
console
.
info
(
TAG
+
'videoRecorder.prepare called.'
)
console
.
info
(
TAG
+
'videoRecorder is :'
+
JSON
.
stringify
(
mVideoRecorder
))
mVideoRecorder
.
prepare
(
mVideoConfig
,
(
err
)
=>
{
console
.
info
(
TAG
+
'videoRecorder.prepare called.'
)
console
.
info
(
TAG
+
'videoRecorder.prepare success.'
)
mVideoRecorder
.
prepare
(
mVideoConfig
,
(
err
)
=>
{
mVideoRecorder
.
getInputSurface
((
err
,
id
)
=>
{
if
(
!
err
)
{
console
.
info
(
TAG
+
'getInputSurface called'
)
console
.
info
(
TAG
+
'videoRecorder.prepare success.'
)
mVideoSurface
=
id
mVideoRecorder
.
getInputSurface
((
err
,
id
)
=>
{
console
.
info
(
TAG
+
'getInputSurface surfaceId: '
+
JSON
.
stringify
(
mVideoSurface
))
console
.
info
(
TAG
+
'getInputSurface called'
)
if
(
!
err
)
{
mVideoSurface
=
id
console
.
info
(
TAG
+
'getInputSurface surfaceId: '
+
JSON
.
stringify
(
mVideoSurface
))
}
else
{
console
.
info
(
TAG
+
'getInputSurface FAILED'
)
}
})
}
else
{
console
.
info
(
TAG
+
'prepare FAILED'
)
}
})
})
})
}
else
{
console
.
info
(
TAG
+
'createVideoRecorder FAILED'
)
}
})
})
console
.
log
(
TAG
+
'Exit getVideoReceiveSurface'
)
console
.
log
(
TAG
+
'Exit getVideoReceiveSurface'
)
}
}
...
@@ -218,7 +230,7 @@ export default function cameraManagerTest(surfaceId: any) {
...
@@ -218,7 +230,7 @@ export default function cameraManagerTest(surfaceId: any) {
let
permissionName3
=
'ohos.permission.MEDIA_LOCATION'
;
let
permissionName3
=
'ohos.permission.MEDIA_LOCATION'
;
let
permissionName4
=
'ohos.permission.READ_MEDIA'
;
let
permissionName4
=
'ohos.permission.READ_MEDIA'
;
let
permissionName5
=
'ohos.permission.WRITE_MEDIA'
;
let
permissionName5
=
'ohos.permission.WRITE_MEDIA'
;
let
permissionName6
=
'ohos.permission.START_ABILI
T
IES_FROM_BACKGROUND'
;
let
permissionName6
=
'ohos.permission.START_ABILIIES_FROM_BACKGROUND'
;
let
permissionName7
=
'ohos.permission.START_INVISIBLE_ABILITY'
;
let
permissionName7
=
'ohos.permission.START_INVISIBLE_ABILITY'
;
let
permissionName8
=
'ohos.permission.ABILITY_BACKGROUND_COMMUNICATION'
;
let
permissionName8
=
'ohos.permission.ABILITY_BACKGROUND_COMMUNICATION'
;
await
atManager
.
grantUserGrantedPermission
(
tokenID
,
permissionName1
,
1
)
.
then
((
result
)
=>
{
await
atManager
.
grantUserGrantedPermission
(
tokenID
,
permissionName1
,
1
)
.
then
((
result
)
=>
{
...
...
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionBaseTest.test.ets
浏览文件 @
b275bddf
此差异已折叠。
点击以展开。
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionExposureTest.test.ets
浏览文件 @
b275bddf
此差异已折叠。
点击以展开。
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionFlashTest.test.ets
浏览文件 @
b275bddf
此差异已折叠。
点击以展开。
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionFocusTest.test.ets
浏览文件 @
b275bddf
此差异已折叠。
点击以展开。
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionVideoStabilizationTest.test.ets
浏览文件 @
b275bddf
此差异已折叠。
点击以展开。
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionZoomRatioTest.test.ets
浏览文件 @
b275bddf
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录