From 4a204587b4de22903c5b87d3377d459e42e3b7eb Mon Sep 17 00:00:00 2001
From: August <mingxin.android@gmail.com>
Date: Tue, 31 Jul 2018 23:22:43 +0800
Subject: [PATCH] android camera support

Signed-off-by: August <mingxin.android@gmail.com>
---
 .../softwinner/tulip-m64/configs/camera.cfg   | 12 ++---
 .../tulip-m64/configs/media_profiles.xml      | 54 ++++++++++++++++++-
 .../softwinner/tulip-m64/init.device.rc       |  5 +-
 3 files changed, 60 insertions(+), 11 deletions(-)

diff --git a/android/device/softwinner/tulip-m64/configs/camera.cfg b/android/device/softwinner/tulip-m64/configs/camera.cfg
index c8c36f33a1..b083dd9934 100755
--- a/android/device/softwinner/tulip-m64/configs/camera.cfg
+++ b/android/device/softwinner/tulip-m64/configs/camera.cfg
@@ -18,11 +18,11 @@ key_camera_exif_model = PRODUCT_BOARD
 ;------------------------------------------------------------------------------- 
 ; 1 for single camera, 2 for double camera
 ;------------------------------------------------------------------------------- 
-number_of_camera = 2
+number_of_camera = 1
 
 ;------------------------------------------------------------------------------- 
 ; CAMERA_FACING_BACK
-; gc2035
+; ov5640
 ;------------------------------------------------------------------------------- 
 camera_id = 0
 
@@ -41,7 +41,7 @@ use_builtin_isp = 0
 ;------------------------------------------------------------------------------- 
 ; camera orientation (0, 90, 180, 270)
 ;------------------------------------------------------------------------------- 
-camera_orientation = 90
+camera_orientation = 180
 
 ;------------------------------------------------------------------------------- 
 ; driver device name
@@ -55,12 +55,12 @@ camera_device = /dev/video0
 device_id = 0
 
 used_preview_size = 1
-key_support_preview_size = 800x600,640x480,320x240,176x144
+key_support_preview_size = 1920x1080,1280x720,800x600,640x480,320x240,176x144
 key_default_preview_size = 800x600
 
 used_picture_size = 1
-key_support_picture_size = 1600x1200,1280x720,800x600,640x480,320x240
-key_default_picture_size = 1600x1200
+key_support_picture_size = 2592x1936,2048x1536,1600x1200,1920x1080,1280x720,800x600,640x480,320x240
+key_default_picture_size = 2592x1936
 
 used_flash_mode = 0
 key_support_flash_mode = on,off,auto
diff --git a/android/device/softwinner/tulip-m64/configs/media_profiles.xml b/android/device/softwinner/tulip-m64/configs/media_profiles.xml
index 94dfa61432..49e56bac6f 100755
--- a/android/device/softwinner/tulip-m64/configs/media_profiles.xml
+++ b/android/device/softwinner/tulip-m64/configs/media_profiles.xml
@@ -94,8 +94,32 @@
                    sampleRate="8000"
                    channels="1" />
         </EncoderProfile>
+
+	<EncoderProfile quality="720p" fileFormat="mp4" duration="30">
+            <Video codec="h264"
+                   bitRate="10000000"
+                   width="1280"
+                   height="720"
+                   frameRate="30" />
+            <Audio codec="aac"
+                   bitRate="128000"
+                   sampleRate="44100"
+                   channels="1" />
+        </EncoderProfile>
+
+        <EncoderProfile quality="1080p" fileFormat="mp4" duration="30">
+            <Video codec="h264"
+                   bitRate="10000000"
+                   width="1920"
+                   height="1080"
+                   frameRate="30" />
+            <Audio codec="aac"
+                   bitRate="128000"
+                   sampleRate="44100"
+                   channels="1" />
+        </EncoderProfile>
 	    	
-	    	<EncoderProfile quality="timelapse480p" fileFormat="mp4" duration="30">
+	<EncoderProfile quality="timelapse480p" fileFormat="mp4" duration="30">
             <Video codec="h264"
                    bitRate="1500000"
                    width="640"
@@ -106,7 +130,33 @@
                    bitRate="12200"
                    sampleRate="8000"
                    channels="1" />
-        </EncoderProfile>  
+        </EncoderProfile>
+
+	<EncoderProfile quality="timelapse720p" fileFormat="mp4" duration="30">
+            <Video codec="h264"
+                   bitRate="10000000"
+                   width="1280"
+                   height="720"
+                   frameRate="30" />
+            <!-- audio setting is ignored -->
+            <Audio codec="aac"
+                   bitRate="128000"
+                   sampleRate="44100"
+                   channels="1" />
+        </EncoderProfile>
+
+        <EncoderProfile quality="timelapse1080p" fileFormat="mp4" duration="30">
+            <Video codec="h264"
+                   bitRate="10000000"
+                   width="1920"
+                   height="1080"
+                   frameRate="30" />
+            <!-- audio setting is ignored -->
+            <Audio codec="aac"
+                   bitRate="128000"
+                   sampleRate="44100"
+                   channels="1" />
+        </EncoderProfile>
 
 
         <ImageEncoding quality="90" />
diff --git a/android/device/softwinner/tulip-m64/init.device.rc b/android/device/softwinner/tulip-m64/init.device.rc
index 83c45bd492..7977f5701c 100755
--- a/android/device/softwinner/tulip-m64/init.device.rc
+++ b/android/device/softwinner/tulip-m64/init.device.rc
@@ -15,7 +15,7 @@ on boot
     #insmod gsensor module
     #insmod /vendor/modules/bma250.ko
 #tp
-    chown system system /sys/devices/platform/soc/twi0/i2c-0/0-0040/input/input3/runtime_suspend
+    chown system system /sys/devices/platform/soc/twi0/i2c-0/0-0038/input/input3/runtime_suspend
 
 ### csi module
     insmod /vendor/modules/videobuf2-core.ko
@@ -23,8 +23,7 @@ on boot
     insmod /vendor/modules/videobuf2-v4l2.ko
     insmod /vendor/modules/videobuf2-dma-contig.ko
     insmod /vendor/modules/vfe_io.ko
-    insmod /vendor/modules/gc2145.ko
-    insmod /vendor/modules/gc0312.ko
+    insmod /vendor/modules/ov5640.ko
     insmod /vendor/modules/vfe_v4l2.ko
 
 on property:sys.boot_completed=1