--- a/device/rockchip/common/ueventd.rockchip.rc
+++ b/device/rockchip/common/ueventd.rockchip.rc
@@ -20,6 +20,15 @@
/dev/video1 0660 media camera
/dev/video2 0660 media camera
/dev/video3 0660 media camera
+/dev/video4 0660 media camera
+/dev/video5 0660 media camera
+/dev/video6 0660 media camera
+/dev/video7 0660 media camera
+/dev/video8 0660 media camera
+/dev/video9 0660 media camera
+/dev/video10 0660 media camera
+/dev/video11 0660 media camera
+/dev/video12 0660 media camera
/dev/pmem_cam 0660 system camera
/dev/vpu 0660 system system
/dev/vpu_service 0666 media media
固定设备节点:
--- a/hardware/rockchip/camera/CameraHal/CameraHal_Module.cpp
+++ b/hardware/rockchip/camera/CameraHal/CameraHal_Module.cpp
@@ -843,7 +843,7 @@ int camera_get_number_of_cameras(void)
i++;
}
- for (i=0; i<10; i++) {
+ for (i=0; i<14; i++) {
cam_path[0] = 0x00;
unsigned int pix_format_tmp = V4L2_PIX_FMT_NV12;
strcat(cam_path, CAMERA_DEVICE_NAME);
@@ -1440,8 +1440,31 @@ int camera_get_camera_info(int camera_id, struct camera_info *info)
info->orientation = gCamInfos[camera_id].facing_info.orientation;
}
#else
- info->facing = gCamInfos[camera_id].facing_info.facing;
- info->orientation = gCamInfos[camera_id].facing_info.orientation;
+ /*hjh change for support dual camera*/
+ if (!strcmp(gCamInfos[camera_id].device_path, "/dev/video10")){
+ info->facing = CAMERA_FACING_FRONT;
+ info->orientation = gCamInfos[camera_id].facing_info.orientation;
+ }else if(!strcmp(gCamInfos[camera_id].device_path, "/dev/video11")){
+ info->facing = CAMERA_FACING_BACK;
+ info->orientation = gCamInfos[camera_id].facing_info.orientation;
+ }else if(!strcmp(gCamInfos[camera_id].device_path, "/dev/video8")){
+ info->facing = CAMERA_FACING_FRONT;
+ info->orientation = gCamInfos[camera_id].facing_info.orientation;
+ }else if(!strcmp(gCamInfos[camera_id].device_path, "/dev/video9")){
+ info->facing = CAMERA_FACING_BACK;
+ info->orientation = gCamInfos[camera_id].facing_info.orientation;
+ }else if(!strcmp(gCamInfos[camera_id].device_path, "/dev/video0")){
+ info->facing = CAMERA_FACING_FRONT;
+ info->orientation = gCamInfos[camera_id].facing_info.orientation;
+ }else if(!strcmp(gCamInfos[camera_id].device_path, "/dev/video1")){
+ info->facing = CAMERA_FACING_BACK;
+ info->orientation = gCamInfos[camera_id].facing_info.orientation;
+ }else{
+ info->facing = gCamInfos[camera_id].facing_info.facing;
+ info->orientation = gCamInfos[camera_id].facing_info.orientation;
+ }
+ LOGD("cameraId facing[%d]\n",info->facing);
+ LOGD("cameraDev[%s]\n",gCamInfos[camera_id].device_path);
#endif
end:
--- a/kernel/drivers/media/usb/uvc/uvc_driver.c
+++ b/kernel/drivers/media/usb/uvc/uvc_driver.c
@@ -1908,8 +1908,26 @@ int uvc_register_video_device(struct uvc_device *dev,
* the file open() handler might race us.
*/
video_set_drvdata(vdev, stream);
+ if(dev->udev->descriptor.idVendor == 0x2207 &&
+ dev->udev->descriptor.idProduct == 0x0016) {
+ printk("face camera plug in\n");
+ ret = video_register_device(vdev, VFL_TYPE_GRABBER, 10);
+ }else if(dev->udev->descriptor.idVendor == 0x0bc8 &&
+ dev->udev->descriptor.idProduct == 0x5880){
+ printk("high pixel camera plug in\n");
+ ret = video_register_device(vdev, VFL_TYPE_GRABBER, 11);
+ }else if(dev->udev->descriptor.idVendor == 0x0c45 &&
+ dev->udev->descriptor.idProduct == 0xe110){
+ printk("high pixel camera plug in\n");
+ ret = video_register_device(vdev, VFL_TYPE_GRABBER, 9);
+ }else if(dev->udev->descriptor.idVendor == 0x0c45 &&
+ dev->udev->descriptor.idProduct == 0xe120){
+ printk("high pixel camera plug in\n");
+ ret = video_register_device(vdev, VFL_TYPE_GRABBER, 8);
+ } else {
+ ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1);
+ }