Skip to content

X
Xts Acts

OpenHarmony / Xts Acts
1 年多 前同步成功

通知 9
Star 22
Fork 0
X
Xts Acts
未验证 提交 cde60290 编写于 作者: O openharmony_ci 提交者： Gitee
浏览文件
操作

!6185 Add xts case for metadata output 

Merge pull request !6185 from wuhao/master
上级 978b0d12 f38c73e5
展开全部 隐藏空白更改
内联 并排
Showing with 2256 addition and 971 deletion
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionExposureTest.test.ets
浏览文件 @ cde60290
......@@ -32,7 +32,7 @@ let mCameraManager;
let mCameraDevicesArray;
let mCameraSession;
let mPhoteSurface;
let mPhotoSurface;
let mVideoRecorder;
let mVideoSurface;
let mFileAsset;
......@@ -238,8 +238,8 @@ export default function cameraSessionExposureTest(surfaceId: any) {
console.log(TAG + 'before receiver check')
if (receiver !== undefined) {
console.log(TAG + 'Photo receiver is created successfully')
mPhoteSurface = await receiver.getReceivingSurfaceId()
console.log(TAG + 'Photo received id: ' + JSON.stringify(mPhoteSurface))
mPhotoSurface = await receiver.getReceivingSurfaceId()
console.log(TAG + 'Photo received id: ' + JSON.stringify(mPhotoSurface))
} else {
console.log(TAG + 'Photo receiver is created failed')
}
......@@ -412,7 +412,14 @@ export default function cameraSessionExposureTest(surfaceId: any) {
return false;
}
mCameraInput = await mCameraManager.createCameraInput(mCameraDevicesArray[idx]);
mCameraInput = null;
await mCameraManager.createCameraInput(mCameraDevicesArray[idx]).then((result) => {
console.info('createCameraInput success');
mCameraInput = result;
}).catch((err) => {
console.info('createCameraInput failed, err = ' + err.message);
});
if (isEmpty(mCameraInput)) {
console.info(TAG + "createCameraInput FAILED");
return false;
......@@ -452,68 +459,80 @@ export default function cameraSessionExposureTest(surfaceId: any) {
async function createOutput(idx:any) {
console.info('Enter createOutput');
let cameraOutputCap = await mCameraManager.getSupportedOutputCapability(mCameraDevicesArray[idx]);
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;
let cameraOutputCap = null;
await mCameraManager.getSupportedOutputCapability(mCameraDevicesArray[idx]).then((result) => {
console.info('getSupportedOutputCapability success');
cameraOutputCap = result;
}).catch((err) => {
console.info('getSupportedOutputCapability failed, err = ' + err.message);
mPreviewOutput = null;
mPhotoOutput = null;
});
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)) {
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], mPhoteSurface);
if (!isEmpty(mPhotoOutput)) {
break;
if (isEmpty(mPreviewOutput)) {
console.info(TAG + "createPreviewOutput FAILED");
}
console.info(TAG + "createPreviewOutput: " + mPreviewOutput);
}
if (isEmpty(mPhotoOutput)) {
console.info(TAG + "createPhotoOutput FAILED");
}
console.info(TAG + "createPhotoOutput: " + 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)) {
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;
}
}
catch {
console.info(TAG + "createVideoOutput FAILED");
if (isEmpty(mPhotoOutput)) {
console.info(TAG + "createPhotoOutput FAILED");
}
console.info(TAG + "createPhotoOutput: " + mPhotoOutput);
}
if (isEmpty(mVideoOutput)) {
console.info(TAG + "createVideoOutput FAILED");
/*
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;
}
}
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');
return true;
}
async function releaseOutput() {
console.info('Enter createOutput');
console.info('Enter releaseOutput');
if (!isEmpty(mPreviewOutput)) {
await mPreviewOutput.stop();
......@@ -529,7 +548,7 @@ export default function cameraSessionExposureTest(surfaceId: any) {
await mVideoOutput.release();
}
*/
console.info('Exit createOutput');
console.info('Exit releaseOutput');
return true;
}
......@@ -577,7 +596,7 @@ export default function cameraSessionExposureTest(surfaceId: any) {
}
})
await sleep(1000);
await sleep(100);
*/
console.info(TAG + "Exit startCameraSession");
......@@ -596,7 +615,7 @@ export default function cameraSessionExposureTest(surfaceId: any) {
}
})
await sleep(1000);
await sleep(100);
*/
if (!isEmpty(mCameraInput)) {
......@@ -698,7 +717,7 @@ export default function cameraSessionExposureTest(surfaceId: any) {
expect().assertFail();
}
})
await sleep(1000);
await sleep(100);
await stopCameraSession();
......@@ -740,7 +759,7 @@ export default function cameraSessionExposureTest(surfaceId: any) {
expect().assertFail();
}
await sleep(1000);
await sleep(100);
await stopCameraSession();
......@@ -902,7 +921,7 @@ export default function cameraSessionExposureTest(surfaceId: any) {
expect().assertFail();
}
})
await sleep(1000);
await sleep(100);
await stopCameraSession();
......@@ -944,7 +963,7 @@ export default function cameraSessionExposureTest(surfaceId: any) {
expect().assertFail();
}
await sleep(1000);
await sleep(100);
await stopCameraSession();
......@@ -1106,7 +1125,7 @@ export default function cameraSessionExposureTest(surfaceId: any) {
expect().assertFail();
}
})
await sleep(1000);
await sleep(100);
await stopCameraSession();
......@@ -1126,11 +1145,11 @@ export default function cameraSessionExposureTest(surfaceId: any) {
* @tc.type : Function
* @tc.level : Level 2
*/
it('SUB_MULTIMEDIA_CAMERA_SESSION_IS_EXPOSURE_MODE_SUPPORT_PROMISE_0102', 2, async function (done) {
it('SUB_MULTIMEDIA_CAMERA_SESSION_IS_EXPOSURE_MODE_SUPPORT_PROMISE_0101', 2, async function (done) {
console.info("--------------SUB_MULTIMEDIA_CAMERA_SESSION_IS_EXPOSURE_MODE_SUPPORT_PROMISE_0102--------------");
if (mCameraNum == 0) {
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_IS_EXPOSURE_MODE_SUPPORT_PROMISE_0102 FAILED with NoCamera");
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_IS_EXPOSURE_MODE_SUPPORT_PROMISE_0101 FAILED with NoCamera");
expect().assertFail();
done();
} else {
......@@ -1148,7 +1167,7 @@ export default function cameraSessionExposureTest(surfaceId: any) {
expect().assertFail();
}
await sleep(1000);
await sleep(100);
await stopCameraSession();
......
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionFlashTest.test.ets
浏览文件 @ cde60290
......@@ -32,7 +32,7 @@ let mCameraManager;
let mCameraDevicesArray;
let mCameraSession;
let mPhoteSurface;
let mPhotoSurface;
let mVideoRecorder;
let mVideoSurface;
let mFileAsset;
......@@ -189,8 +189,8 @@ export default function cameraSessionFlashTest(surfaceId: any) {
console.log(TAG + 'before receiver check')
if (receiver !== undefined) {
console.log(TAG + 'Photo receiver is created successfully')
mPhoteSurface = await receiver.getReceivingSurfaceId()
console.log(TAG + 'Photo received id: ' + JSON.stringify(mPhoteSurface))
mPhotoSurface = await receiver.getReceivingSurfaceId()
console.log(TAG + 'Photo received id: ' + JSON.stringify(mPhotoSurface))
} else {
console.log(TAG + 'Photo receiver is created failed')
}
......@@ -363,7 +363,14 @@ export default function cameraSessionFlashTest(surfaceId: any) {
return false;
}
mCameraInput = await mCameraManager.createCameraInput(mCameraDevicesArray[idx]);
mCameraInput = null;
await mCameraManager.createCameraInput(mCameraDevicesArray[idx]).then((result) => {
console.info('createCameraInput success');
mCameraInput = result;
}).catch((err) => {
console.info('createCameraInput failed, err = ' + err.message);
});
if (isEmpty(mCameraInput)) {
console.info(TAG + "createCameraInput FAILED");
return false;
......@@ -403,68 +410,80 @@ export default function cameraSessionFlashTest(surfaceId: any) {
async function createOutput(idx:any) {
console.info('Enter createOutput');
let cameraOutputCap = await mCameraManager.getSupportedOutputCapability(mCameraDevicesArray[idx]);
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;
let cameraOutputCap = null;
await mCameraManager.getSupportedOutputCapability(mCameraDevicesArray[idx]).then((result) => {
console.info('getSupportedOutputCapability success');
cameraOutputCap = result;
}).catch((err) => {
console.info('getSupportedOutputCapability failed, err = ' + err.message);
mPreviewOutput = null;
mPhotoOutput = null;
});
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)) {
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], mPhoteSurface);
if (!isEmpty(mPhotoOutput)) {
break;
if (isEmpty(mPreviewOutput)) {
console.info(TAG + "createPreviewOutput FAILED");
}
console.info(TAG + "createPreviewOutput: " + mPreviewOutput);
}
if (isEmpty(mPhotoOutput)) {
console.info(TAG + "createPhotoOutput FAILED");
}
console.info(TAG + "createPhotoOutput: " + 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)) {
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;
}
}
catch {
console.info(TAG + "createVideoOutput FAILED");
if (isEmpty(mPhotoOutput)) {
console.info(TAG + "createPhotoOutput FAILED");
}
console.info(TAG + "createPhotoOutput: " + mPhotoOutput);
}
if (isEmpty(mVideoOutput)) {
console.info(TAG + "createVideoOutput FAILED");
/*
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;
}
}
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');
return true;
}
async function releaseOutput() {
console.info('Enter createOutput');
console.info('Enter releaseOutput');
if (!isEmpty(mPreviewOutput)) {
await mPreviewOutput.stop();
......@@ -480,7 +499,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
await mVideoOutput.release();
}
*/
console.info('Exit createOutput');
console.info('Exit releaseOutput');
return true;
}
......@@ -528,7 +547,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
}
})
await sleep(1000);
await sleep(100);
*/
console.info(TAG + "Exit startCameraSession");
......@@ -547,7 +566,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
}
})
await sleep(1000);
await sleep(100);
*/
if (!isEmpty(mCameraInput)) {
......@@ -649,7 +668,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
expect().assertFail();
}
})
await sleep(1000);
await sleep(100);
await stopCameraSession();
......@@ -691,7 +710,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_HAS_FLASH_PROMISE_0100 FAILED with hasFlash is: " + hasFlashPromise);
expect().assertFail();
}
await sleep(1000);
await sleep(100);
await stopCameraSession();
......@@ -742,7 +761,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
expect().assertFail();
}
})
await sleep(1000);
await sleep(100);
} else {
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_IS_FLASH_MODE_SUPPORT_CALLBACK_0100 not support");
}
......@@ -788,7 +807,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
expect().assertFail();
}
await sleep(1000);
await sleep(100);
} else {
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_IS_FLASH_MODE_SUPPORT_PROMISE_0100 not support");
}
......@@ -955,7 +974,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
expect().assertFail();
}
})
await sleep(1000);
await sleep(100);
} else {
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_IS_FLASH_MODE_SUPPORT_CALLBACK_0101 not support");
}
......@@ -1001,7 +1020,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
expect().assertFail();
}
await sleep(1000);
await sleep(100);
} else {
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_IS_FLASH_MODE_SUPPORT_PROMISE_0101 not support");
}
......@@ -1167,7 +1186,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
expect().assertFail();
}
})
await sleep(1000);
await sleep(100);
} else {
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_IS_FLASH_MODE_SUPPORT_CALLBACK_0102 not support");
}
......@@ -1213,7 +1232,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
expect().assertFail();
}
await sleep(1000);
await sleep(100);
} else {
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_IS_FLASH_MODE_SUPPORT_PROMISE_0102 not support");
}
......@@ -1379,7 +1398,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
expect().assertFail();
}
})
await sleep(1000);
await sleep(100);
} else {
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_IS_FLASH_MODE_SUPPORT_CALLBACK_0103 not support");
}
......@@ -1425,7 +1444,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
expect().assertFail();
}
await sleep(1000);
await sleep(100);
} else {
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
浏览文件 @ cde60290
......@@ -32,7 +32,7 @@ let mCameraManager;
let mCameraDevicesArray;
let mCameraSession;
let mPhoteSurface;
let mPhotoSurface;
let mVideoRecorder;
let mVideoSurface;
let mFileAsset;
......@@ -235,8 +235,8 @@ export default function cameraSessionFocusTest(surfaceId: any) {
console.log(TAG + 'before receiver check')
if (receiver !== undefined) {
console.log(TAG + 'Photo receiver is created successfully')
mPhoteSurface = await receiver.getReceivingSurfaceId()
console.log(TAG + 'Photo received id: ' + JSON.stringify(mPhoteSurface))
mPhotoSurface = await receiver.getReceivingSurfaceId()
console.log(TAG + 'Photo received id: ' + JSON.stringify(mPhotoSurface))
} else {
console.log(TAG + 'Photo receiver is created failed')
}
......@@ -408,7 +408,14 @@ export default function cameraSessionFocusTest(surfaceId: any) {
return false;
}
mCameraInput = await mCameraManager.createCameraInput(mCameraDevicesArray[idx]);
mCameraInput = null;
await mCameraManager.createCameraInput(mCameraDevicesArray[idx]).then((result) => {
console.info('createCameraInput success');
mCameraInput = result;
}).catch((err) => {
console.info('createCameraInput failed, err = ' + err.message);
});
if (isEmpty(mCameraInput)) {
console.info(TAG + "createCameraInput FAILED");
return false;
......@@ -448,68 +455,80 @@ export default function cameraSessionFocusTest(surfaceId: any) {
async function createOutput(idx:any) {
console.info('Enter createOutput');
let cameraOutputCap = await mCameraManager.getSupportedOutputCapability(mCameraDevicesArray[idx]);
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;
let cameraOutputCap = null;
await mCameraManager.getSupportedOutputCapability(mCameraDevicesArray[idx]).then((result) => {
console.info('getSupportedOutputCapability success');
cameraOutputCap = result;
}).catch((err) => {
console.info('getSupportedOutputCapability failed, err = ' + err.message);
mPreviewOutput = null;
mPhotoOutput = null;
});
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)) {
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], mPhoteSurface);
if (!isEmpty(mPhotoOutput)) {
break;
if (isEmpty(mPreviewOutput)) {
console.info(TAG + "createPreviewOutput FAILED");
}
console.info(TAG + "createPreviewOutput: " + mPreviewOutput);
}
if (isEmpty(mPhotoOutput)) {
console.info(TAG + "createPhotoOutput FAILED");
}
console.info(TAG + "createPhotoOutput: " + 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)) {
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;
}
}
catch {
console.info(TAG + "createVideoOutput FAILED");
if (isEmpty(mPhotoOutput)) {
console.info(TAG + "createPhotoOutput FAILED");
}
console.info(TAG + "createPhotoOutput: " + mPhotoOutput);
}
if (isEmpty(mVideoOutput)) {
console.info(TAG + "createVideoOutput FAILED");
/*
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;
}
}
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');
return true;
}
async function releaseOutput() {
console.info('Enter createOutput');
console.info('Enter releaseOutput');
if (!isEmpty(mPreviewOutput)) {
await mPreviewOutput.stop();
......@@ -525,7 +544,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
await mVideoOutput.release();
}
*/
console.info('Exit createOutput');
console.info('Exit releaseOutput');
return true;
}
......@@ -573,7 +592,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
}
})
await sleep(1000);
await sleep(100);
*/
console.info(TAG + "Exit startCameraSession");
......@@ -592,7 +611,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
}
})
await sleep(1000);
await sleep(100);
*/
if (!isEmpty(mCameraInput)) {
......@@ -694,7 +713,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
expect().assertFail();
}
})
await sleep(1000);
await sleep(100);
await stopCameraSession();
......@@ -736,7 +755,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
expect().assertFail();
}
await sleep(1000);
await sleep(100);
await stopCameraSession();
......@@ -898,7 +917,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
expect().assertFail();
}
})
await sleep(1000);
await sleep(100);
await stopCameraSession();
......@@ -940,7 +959,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
expect().assertFail();
}
await sleep(1000);
await sleep(100);
await stopCameraSession();
......@@ -1102,7 +1121,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
expect().assertFail();
}
})
await sleep(1000);
await sleep(100);
await stopCameraSession();
......@@ -1144,7 +1163,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
expect().assertFail();
}
await sleep(1000);
await sleep(100);
await stopCameraSession();
......@@ -1306,7 +1325,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
expect().assertFail();
}
})
await sleep(1000);
await sleep(100);
await stopCameraSession();
......@@ -1348,7 +1367,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
expect().assertFail();
}
await sleep(1000);
await sleep(100);
await stopCameraSession();
......@@ -1457,7 +1476,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);
expect().assertFail();
}
await sleep(1000);
await sleep(100);
} else {
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_FOCUS_MODE_PROMISE_0103 not support");
}
......@@ -2438,7 +2457,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
expect().assertFail();
}
})
await sleep(1000);
await sleep(100);
await stopCameraSession();
......@@ -2475,7 +2494,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 PASSED with FocalLength is: " + focalLength);
await sleep(1000);
await sleep(100);
await stopCameraSession();
......
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionZoomRatioTest.test.ets
浏览文件 @ cde60290
......@@ -32,7 +32,7 @@ let mCameraManager;
let mCameraDevicesArray;
let mCameraSession;
let mPhoteSurface;
let mPhotoSurface;
let mVideoRecorder;
let mVideoSurface;
let mFileAsset;
......@@ -190,8 +190,8 @@ export default function cameraSessionZoomRatioTest(surfaceId: any) {
console.log(TAG + 'before receiver check')
if (receiver !== undefined) {
console.log(TAG + 'Photo receiver is created successfully')
mPhoteSurface = await receiver.getReceivingSurfaceId()
console.log(TAG + 'Photo received id: ' + JSON.stringify(mPhoteSurface))
mPhotoSurface = await receiver.getReceivingSurfaceId()
console.log(TAG + 'Photo received id: ' + JSON.stringify(mPhotoSurface))
} else {
console.log(TAG + 'Photo receiver is created failed')
}
......@@ -365,7 +365,14 @@ export default function cameraSessionZoomRatioTest(surfaceId: any) {
return false;
}
mCameraInput = await mCameraManager.createCameraInput(mCameraDevicesArray[idx]);
mCameraInput = null;
await mCameraManager.createCameraInput(mCameraDevicesArray[idx]).then((result) => {
console.info('createCameraInput success');
mCameraInput = result;
}).catch((err) => {
console.info('createCameraInput failed, err = ' + err.message);
});
if (isEmpty(mCameraInput)) {
console.info(TAG + "createCameraInput FAILED");
return false;
......@@ -405,68 +412,80 @@ export default function cameraSessionZoomRatioTest(surfaceId: any) {
async function createOutput(idx:any) {
console.info('Enter createOutput');
let cameraOutputCap = await mCameraManager.getSupportedOutputCapability(mCameraDevicesArray[idx]);
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;
let cameraOutputCap = null;
await mCameraManager.getSupportedOutputCapability(mCameraDevicesArray[idx]).then((result) => {
console.info('getSupportedOutputCapability success');
cameraOutputCap = result;
}).catch((err) => {
console.info('getSupportedOutputCapability failed, err = ' + err.message);
mPreviewOutput = null;
mPhotoOutput = null;
});
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)) {
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], mPhoteSurface);
if (!isEmpty(mPhotoOutput)) {
break;
if (isEmpty(mPreviewOutput)) {
console.info(TAG + "createPreviewOutput FAILED");
}
console.info(TAG + "createPreviewOutput: " + mPreviewOutput);
}
if (isEmpty(mPhotoOutput)) {
console.info(TAG + "createPhotoOutput FAILED");
}
console.info(TAG + "createPhotoOutput: " + 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)) {
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;
}
}
catch {
console.info(TAG + "createVideoOutput FAILED");
if (isEmpty(mPhotoOutput)) {
console.info(TAG + "createPhotoOutput FAILED");
}
console.info(TAG + "createPhotoOutput: " + mPhotoOutput);
}
if (isEmpty(mVideoOutput)) {
console.info(TAG + "createVideoOutput FAILED");
/*
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;
}
}
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');
return true;
}
async function releaseOutput() {
console.info('Enter createOutput');
console.info('Enter releaseOutput');
if (!isEmpty(mPreviewOutput)) {
await mPreviewOutput.stop();
......@@ -482,7 +501,7 @@ export default function cameraSessionZoomRatioTest(surfaceId: any) {
await mVideoOutput.release();
}
*/
console.info('Exit createOutput');
console.info('Exit releaseOutput');
return true;
}
......@@ -530,7 +549,7 @@ export default function cameraSessionZoomRatioTest(surfaceId: any) {
}
})
await sleep(1000);
await sleep(100);
*/
console.info(TAG + "Exit startCameraSession");
......@@ -549,7 +568,7 @@ export default function cameraSessionZoomRatioTest(surfaceId: any) {
}
})
await sleep(1000);
await sleep(100);
*/
if (!isEmpty(mCameraInput)) {
......@@ -662,7 +681,7 @@ export default function cameraSessionZoomRatioTest(surfaceId: any) {
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_GET_ZOOM_RATIO_RANGE_CALLBACK_0100 PASSED : " + err.message);
}
})
await sleep(1000);
await sleep(100);
await stopCameraSession();
......@@ -710,10 +729,10 @@ export default function cameraSessionZoomRatioTest(surfaceId: any) {
}
}
catch {
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_GET_ZOOM_RATIO_RANGE_PROMISE_0100 PASSED");
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_GET_ZOOM_RATIO_RANGE_CALLBACK_0100 PASSED");
}
await sleep(1000);
await sleep(100);
await stopCameraSession();
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或