Diff: main.cpp

Revision:

1:54a3e69f6f09

Parent:

0:b2184c2d15dd

Child:

2:8721836b639d

diff -r b2184c2d15dd -r 54a3e69f6f09 main.cpp
--- a/main.cpp	Thu Jun 30 11:05:41 2016 +0000
+++ b/main.cpp	Thu Jun 30 13:26:05 2016 +0000
@@ -9,12 +9,12 @@
 #define VIDEO_RGB565           (2)
 
 /**** User Selection *********/
-/** Camera **/
+/** Camera setting **/
 #define VIDEO_INPUT_METHOD     (VIDEO_CMOS_CAMERA) /* Select  VIDEO_CVBS or VIDEO_CMOS_CAMERA                       */
 #define VIDEO_INPUT_FORMAT     (VIDEO_YCBCR422)    /* Select  VIDEO_YCBCR422 or VIDEO_RGB888 or VIDEO_RGB565        */
 #define USE_VIDEO_CH           (0)                 /* Select  0 or 1            If selecting VIDEO_CMOS_CAMERA, should be 0.)               */
 #define VIDEO_PAL              (0)                 /* Select  0(NTSC) or 1(PAL) If selecting VIDEO_CVBS, this parameter is not referenced.) */
-/** LCD **/
+/** LCD setting **/
 #define LCD_TYPE               (0)                 /* Select  0(4.3inch) or 1(7.1inch) */
 /*****************************/
 
@@ -105,8 +105,8 @@
 static uint8_t user_frame_buffer2[FRAME_BUFFER_STRIDE * LCD_PIXEL_HEIGHT]__attribute((aligned(32)));
 static uint8_t user_frame_buffer_touch[TOUCH_BUFFER_STRIDE * LCD_PIXEL_HEIGHT]__attribute((aligned(32)));
 #endif
+static uint8_t * FrameBufferTbl[FRAME_BUFFER_NUM] = {user_frame_buffer0, user_frame_buffer1, user_frame_buffer2};
 static volatile int32_t vfield_count = 0;
-static uint8_t * FrameBufferTbl[FRAME_BUFFER_NUM] = {user_frame_buffer0, user_frame_buffer1, user_frame_buffer2};
 static int write_buff_num = 0;
 static int read_buff_num = 0;
 static bool graphics_init_end = false;
@@ -253,7 +253,7 @@
                                                                              Due to CMOS(MT9V111) output signal timing and VDC5 specification */
 #else
     ext_in_config.cap_width      = 640;                                   /* Capture width  */
-    ext_in_config.cap_height     = 468u;                                  /* Capture height Max 468[line]
+    ext_in_config.cap_height     = 468;                                   /* Capture height Max 468[line]
                                                                              Due to CMOS(MT9V111) output signal timing and VDC5 specification */
 #endif
     error = Display.Graphics_Video_init( DisplayBase::INPUT_SEL_EXT, &ext_in_config);
@@ -262,7 +262,7 @@
         mbed_die();
     }
 
-    /* MT9V111 camera input port setting */
+    /* Camera input port setting */
     error = Display.Graphics_Dvinput_Port_Init(cmos_camera_pin, 11);
     if( error != DisplayBase::GRAPHICS_OK ) {
         printf("Line %d, error %d\n", __LINE__, error);