From d69b23ad0b5a237fba74296ca5da996559855ea9 Mon Sep 17 00:00:00 2001
From: Arne Coucheron <arco68@gmail.com>
Date: Sat, 5 Nov 2011 20:10:36 +0100
Subject: [PATCH] click: Increase video recording resolution

Also raise minSampleRate to 16000 for AAC audio, to bypass a recent
bug causing audio to only be recorded in 8000Hz.

Change-Id: I9100a751e7dafe6bbe2df789a08d2b85b3ae3c72
---
 libcamera/QualcommCameraHardware.cpp |  1 +
 media_profiles.xml                   | 18 +++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/libcamera/QualcommCameraHardware.cpp b/libcamera/QualcommCameraHardware.cpp
index f6def53..d4e5d16 100644
--- a/libcamera/QualcommCameraHardware.cpp
+++ b/libcamera/QualcommCameraHardware.cpp
@@ -97,6 +97,7 @@ struct preview_size_type {
 static preview_size_type preview_sizes[] = {
     { 480, 320 }, // HVGA
     { 432, 320 }, // 1.35-to-1, for photos. (Rounded up from 1.3333 to 1)
+    { 384, 288 }, // 4:3
     { 352, 288 }, // CIF
     { 336, 244 },
     { 320, 320 },
diff --git a/media_profiles.xml b/media_profiles.xml
index a017e1e..9ca653d 100644
--- a/media_profiles.xml
+++ b/media_profiles.xml
@@ -82,9 +82,9 @@
         <EncoderProfile quality="high" fileFormat="3gp" duration="60">
             <Video codec="h263"
                    bitRate="720000"
-                   width="352"
+                   width="384"
                    height="288"
-                   frameRate="20" />
+                   frameRate="24" />
 
             <Audio codec="aac"
                    bitRate="64000"
@@ -95,9 +95,9 @@
         <EncoderProfile quality="low" fileFormat="3gp" duration="30">
             <Video codec="h263"
                    bitRate="192000"
-                   width="176"
-                   height="144"
-                   frameRate="30" />
+                   width="240"
+                   height="160"
+                   frameRate="20" />
 
             <Audio codec="amrnb"
                    bitRate="12200"
@@ -123,25 +123,25 @@
     -->
     <VideoEncoderCap name="h264" enabled="true"
         minBitRate="64000" maxBitRate="420000"
-        minFrameWidth="176" maxFrameWidth="352"
+        minFrameWidth="176" maxFrameWidth="384"
         minFrameHeight="144" maxFrameHeight="288"
         minFrameRate="1" maxFrameRate="30" />
 
     <VideoEncoderCap name="h263" enabled="true"
         minBitRate="64000" maxBitRate="720000"
-        minFrameWidth="176" maxFrameWidth="352"
+        minFrameWidth="176" maxFrameWidth="384"
         minFrameHeight="144" maxFrameHeight="288"
         minFrameRate="1" maxFrameRate="30" />
 
     <VideoEncoderCap name="m4v" enabled="true"
         minBitRate="64000" maxBitRate="420000"
-        minFrameWidth="176" maxFrameWidth="352"
+        minFrameWidth="176" maxFrameWidth="384"
         minFrameHeight="144" maxFrameHeight="288"
         minFrameRate="1" maxFrameRate="30" />
 
     <AudioEncoderCap name="aac" enabled="true"
         minBitRate="8192" maxBitRate="96000"
-        minSampleRate="8000" maxSampleRate="16000"
+        minSampleRate="16000" maxSampleRate="16000"
         minChannels="1" maxChannels="2" />
 
     <AudioEncoderCap name="amrwb" enabled="true"