diff --git a/test/mxc_v4l2_test/doc/FSL-UT-V4L2-003.txt b/test/mxc_v4l2_test/doc/FSL-UT-V4L2-003.txt index e4c7bdf7..bf10dda4 100644 --- a/test/mxc_v4l2_test/doc/FSL-UT-V4L2-003.txt +++ b/test/mxc_v4l2_test/doc/FSL-UT-V4L2-003.txt @@ -32,7 +32,7 @@ Check again for /dev/video0. If it is not there, the camera driver has not loade Type the following command. - mxc_v4l2_overlay.out -iw 640 -ih 480 -it 0 -il 0 -ow 160 -oh 160 -ot 20 -ol 20 -r 0 -t 50 -d 0 -fg -fr 30 + mxc_v4l2_overlay.out -iw 640 -ih 480 -it 0 -il 0 -ow 160 -oh 160 -ot 20 -ol 20 -r 0 -t 50 -do 0 -fg -fr 30 Direct preview the camera to the foreground, and set the frame rate to 30 fps, the window of interest is 640 X 480 with a starting offset of (0,0), the preview size is 160 X 160 with a starting offset of (20,20). Use mxc_v4l2_overlay.out -help to see usage. diff --git a/test/mxc_v4l2_test/doc/FSL-UT-V4L2-004.txt b/test/mxc_v4l2_test/doc/FSL-UT-V4L2-004.txt index 980e79a6..ef6a6993 100644 --- a/test/mxc_v4l2_test/doc/FSL-UT-V4L2-004.txt +++ b/test/mxc_v4l2_test/doc/FSL-UT-V4L2-004.txt @@ -31,7 +31,7 @@ Check again for /dev/video0. If it is not there, the camera driver has not loade Type the following command. - mxc_v4l2_overlay.out -iw 640 -ih 480 -it 0 -il 0 -ow 160 -oh 160 -ot 20 -ol 20 -r 4 -t 50 -d 0 -fr 30 + mxc_v4l2_overlay.out -iw 640 -ih 480 -it 0 -il 0 -ow 160 -oh 160 -ot 20 -ol 20 -r 4 -t 50 -do 0 -fr 30 Direct preview (90 degree rotation) the camera to the background, and set frame rate to 30 fps. diff --git a/test/mxc_v4l2_test/doc/FSL-UT-V4L2-008.txt b/test/mxc_v4l2_test/doc/FSL-UT-V4L2-008.txt index fb270a05..e7ea5f55 100644 --- a/test/mxc_v4l2_test/doc/FSL-UT-V4L2-008.txt +++ b/test/mxc_v4l2_test/doc/FSL-UT-V4L2-008.txt @@ -21,47 +21,47 @@ N/A ov5640 sensor and MIPI extention board are requried display screen also is needed | Test Procedure | -Check that /dev/video0 exists. If it does not exist, load the camera driver with the command: +Check that /dev/video1 exists. If it does not exist, load the camera driver with the command: modprobe mxc_v4l2_capture -modprobe CAMERA_MODULE (CAMERA_MODULE should be replaced by the camera module on the related platform, e.g. ov5640_camera_mipi should be used here on MX6Q?) +modprobe CAMERA_MODULE (CAMERA_MODULE should be replaced by the camera module on the related platform, e.g. ov5640_camera_mipi should be used here on MX6Q) -Check again for /dev/video0. If it is not there, the camera driver has not loaded successfully and the test has failed. +Check again for /dev/video1. If it is not there, the camera driver has not loaded successfully and the test has failed. Type commands to direct preview the camera to the foreground/background, and set the frame rate to 30 fps, the preview size is 640 X 480 with a starting offset of (0,0). Use mxc_v4l2_overlay.out -help to see usage. Test foreground display: -Test 1. mxc_v4l2_overlay.out -iw 640 -ih 480 -ow 640 -oh 480 -m 0 -fg +Test 1. mxc_v4l2_overlay.out -iw 640 -ih 480 -ow 640 -oh 480 -m 0 -di /dev/video1 -fg -Test 2. mxc_v4l2_overlay.out -iw 320 -ih 240 -ow 640 -oh 480 -m 1 -fg +Test 2. mxc_v4l2_overlay.out -iw 320 -ih 240 -ow 640 -oh 480 -m 1 -di /dev/video1 -fg -Test 3. mxc_v4l2_overlay.out -iw 720 -ih 480 -ow 640 -oh 480 -m 2 -fg +Test 3. mxc_v4l2_overlay.out -iw 720 -ih 480 -ow 640 -oh 480 -m 2 -di /dev/video1 -fg -Test 4. mxc_v4l2_overlay.out -iw 720 -ih 576 -ow 640 -oh 480 -m 3 -fg +Test 4. mxc_v4l2_overlay.out -iw 720 -ih 576 -ow 640 -oh 480 -m 3 -di /dev/video1 -fg -Test 5. mxc_v4l2_overlay.out -iw 1280 -ih 720 -ow 640 -oh 480 -m 4 -fg +Test 5. mxc_v4l2_overlay.out -iw 1280 -ih 720 -ow 640 -oh 480 -m 4 -di /dev/video1 -fg -Test 6. mxc_v4l2_overlay.out -iw 1920 -ih 1080 -ow 640 -oh 480 -m 5 -fg +Test 6. mxc_v4l2_overlay.out -iw 1920 -ih 1080 -ow 640 -oh 480 -m 5 -di /dev/video1 -fg -Test 7. mxc_v4l2_overlay.out -iw 2592 -ih 1944 -ow 640 -oh 480 -m 6 -fg +Test 7. mxc_v4l2_overlay.out -iw 2592 -ih 1944 -ow 640 -oh 480 -m 6 -di /dev/video1 -fg Test background display: -Test 8. mxc_v4l2_overlay.out -iw 640 -ih 480 -ow 640 -oh 480 -m 0 -bg +Test 8. mxc_v4l2_overlay.out -iw 640 -ih 480 -ow 640 -oh 480 -m 0 -di /dev/video1 -bg -Test 9. mxc_v4l2_overlay.out -iw 320 -ih 240 -ow 640 -oh 480 -m 1 -bg +Test 9. mxc_v4l2_overlay.out -iw 320 -ih 240 -ow 640 -oh 480 -m 1 -di /dev/video1 -bg -Test 10. mxc_v4l2_overlay.out -iw 720 -ih 480 -ow 640 -oh 480 -m 2 -bg +Test 10. mxc_v4l2_overlay.out -iw 720 -ih 480 -ow 640 -oh 480 -m 2 -di /dev/video1 -bg -Test 11. mxc_v4l2_overlay.out -iw 720 -ih 576 -ow 640 -oh 480 -m 3 -bg +Test 11. mxc_v4l2_overlay.out -iw 720 -ih 576 -ow 640 -oh 480 -m 3 -di /dev/video1 -bg -Test 12. mxc_v4l2_overlay.out -iw 1280 -ih 720 -ow 640 -oh 480 -m 4 -bg +Test 12. mxc_v4l2_overlay.out -iw 1280 -ih 720 -ow 640 -oh 480 -m 4 -di /dev/video1 -bg -Test 13. mxc_v4l2_overlay.out -iw 1920 -ih 1080 -ow 640 -oh 480 -m 5 -bg +Test 13. mxc_v4l2_overlay.out -iw 1920 -ih 1080 -ow 640 -oh 480 -m 5 -di /dev/video1 -bg -Test 14. mxc_v4l2_overlay.out -iw 2592 -ih 1944 -ow 640 -oh 480 -m 6 -bg +Test 14. mxc_v4l2_overlay.out -iw 2592 -ih 1944 -ow 640 -oh 480 -m 6 -di /dev/video1 -bg | Expected Result | The image from the camera is displayed on the screen. Colors and image should be correct. diff --git a/test/mxc_v4l2_test/mxc_v4l2_overlay.c b/test/mxc_v4l2_test/mxc_v4l2_overlay.c index 4950e77e..f9257dab 100644 --- a/test/mxc_v4l2_test/mxc_v4l2_overlay.c +++ b/test/mxc_v4l2_test/mxc_v4l2_overlay.c @@ -523,9 +523,12 @@ int process_cmdline(int argc, char **argv) else if (strcmp(argv[i], "-t") == 0) { g_timeout = atoi(argv[++i]); } - else if (strcmp(argv[i], "-d") == 0) { + else if (strcmp(argv[i], "-do") == 0) { g_display_lcd = atoi(argv[++i]); } + else if (strcmp(argv[i], "-di") == 0) { + strcpy(v4l_device, argv[++i]); + } else if (strcmp(argv[i], "-fg") == 0) { g_overlay = 1; } @@ -548,7 +551,8 @@ int process_cmdline(int argc, char **argv) " -ow \n -oh \n" \ " -ot \n -ol \n" \ " -r \n -t \n" \ - " -d \n" \ + " -do \n" \ + " -di \n" \ " -v 1-brightness 2-saturation" " 3-red 4-blue 5-black balance\n"\ " -m 0-low resolution 1-high resolution\n" \