tangchao0503/Payload_SDK_V2.2.1_300tc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1、注释掉通过FFmpeg推流到遥控器代码；2、更新ximea状态代码；

Browse Source
This commit is contained in:
tangchao0503
2022-06-22 19:59:47 +08:00
parent 109e0a8f2b
commit 85bc84411d
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sample/api_sample/camera_media_emu/test_payload_cam_media.c
View File

@ -201,11 +201,11 @@ T_PsdkReturnCode PsdkTest_CameraMediaInit(void)
}
//创建线程执行用户自定义函数！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！
if (PsdkOsal_TaskCreate(&s_userSendVideoThread, UserCameraMedia_SendVideoTask_tc, "user_camera_media_task", 2048,
NULL) != PSDK_ERROR_SYSTEM_MODULE_CODE_SUCCESS) {
PsdkLogger_UserLogError("user send video task create error.");
return PSDK_ERROR_SYSTEM_MODULE_CODE_UNKNOWN;
}
// if (PsdkOsal_TaskCreate(&s_userSendVideoThread, UserCameraMedia_SendVideoTask_tc, "user_camera_media_task", 2048,
// NULL) != PSDK_ERROR_SYSTEM_MODULE_CODE_SUCCESS) {
// PsdkLogger_UserLogError("user send video task create error.");
// return PSDK_ERROR_SYSTEM_MODULE_CODE_UNKNOWN;
// }
return PSDK_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
}

26
sample/api_sample/widget/test_widget.c
View File

@ -450,30 +450,30 @@ static void *PsdkTest_IrisRecordSystemChanged(void *arg)//
s_stateOfXimea = atoi(result[1]);
printf("ximea的状态为: %d\n\n", atoi(result[1]));
switch (s_stateOfXimea)
switch (s_stateOfXimea)//0-61：ximea官方错误代码；99：发生的ximea官方错误代码，没有处理；100：未打开；101：打开；102：设置帧率；103：自动曝光；104：正在采集；
{
case 0:
case 57:
s_strStateOfXimea="相机被占用";
break;
case 99:
s_strStateOfXimea="未处理错误，错误码见日志";
break;
case 100:
s_strStateOfXimea="未打开";
break;
case 1:
case 101:
s_strStateOfXimea="打开成功";
break;
case 2:
case 102:
s_strStateOfXimea="帧率设置完成";
break;
case 3:
case 103:
s_strStateOfXimea="自动曝光完成";
break;
case 4:
case 104:
s_strStateOfXimea="正在采集";
break;
case 21:
s_strStateOfXimea="未处理错误";
break;
case 22:
s_strStateOfXimea="相机被占用";
break;
default:
break;