diff options
| -rw-r--r-- | libcamera/SecCamera.h | 7 | ||||
| -rwxr-xr-x | libcamera/SecCameraHWInterface.cpp | 4 | ||||
| -rw-r--r-- | media_profiles.xml | 13 |
3 files changed, 19 insertions, 5 deletions
diff --git a/libcamera/SecCamera.h b/libcamera/SecCamera.h index 9c3bf2d..8b9548d 100644 --- a/libcamera/SecCamera.h +++ b/libcamera/SecCamera.h @@ -2,6 +2,7 @@ ** ** Copyright 2008, The Android Open Source Project ** Copyright 2010, Samsung Electronics Co. LTD +** Copyright 2011, The CyanogenMod Project ** ** Licensed under the Apache License, Version 2.0 (the "License"); ** you may not use this file except in compliance with the License. @@ -81,8 +82,8 @@ namespace android { #error "Please define the Camera module" #endif -#define S5K4ECGX_PREVIEW_WIDTH 720 -#define S5K4ECGX_PREVIEW_HEIGHT 480 +#define S5K4ECGX_PREVIEW_WIDTH 1280 +#define S5K4ECGX_PREVIEW_HEIGHT 720 #define S5K4ECGX_SNAPSHOT_WIDTH 2560 #define S5K4ECGX_SNAPSHOT_HEIGHT 1920 @@ -146,7 +147,7 @@ namespace android { #define BPP 2 #define MIN(x, y) (((x) < (y)) ? (x) : (y)) -#define MAX_BUFFERS 9 // 11 +#define MAX_BUFFERS 4 /* * V 4 L 2 F I M C E X T E N S I O N S * diff --git a/libcamera/SecCameraHWInterface.cpp b/libcamera/SecCameraHWInterface.cpp index 9a91ca6..ca2bedd 100755 --- a/libcamera/SecCameraHWInterface.cpp +++ b/libcamera/SecCameraHWInterface.cpp @@ -155,9 +155,9 @@ void CameraHardwareSec::initDefaultParameters(int cameraId) if (cameraId == SecCamera::CAMERA_ID_BACK) { p.set(CameraParameters::KEY_SUPPORTED_PREVIEW_SIZES, - "720x480,640x480,352x288,176x144"); + "1280x720,800x480,720x480,640x480,592x480,352x288"); p.set(CameraParameters::KEY_SUPPORTED_PICTURE_SIZES, - "2560x1920,2048x1536,1600x1200,1280x960,640x480"); + "2560x1920,2560x1536,2048x1536,2048x1232,1600x1200,1600x960,800x480,640x480"); } else { p.set(CameraParameters::KEY_SUPPORTED_PREVIEW_SIZES, "640x480,320x240,176x144"); diff --git a/media_profiles.xml b/media_profiles.xml index 985c82f..332ca21 100644 --- a/media_profiles.xml +++ b/media_profiles.xml @@ -101,6 +101,19 @@ channels="1" /> </EncoderProfile> + <EncoderProfile quality="480p" fileFormat="mp4" duration="60"> + <Video codec="h264" + bitRate="3000000" + width="720" + height="480" + frameRate="30" /> + + <Audio codec="aac" + bitRate="96000" + sampleRate="16000" + channels="1" /> + </EncoderProfile> + <EncoderProfile quality="qcif" fileFormat="3gp" duration="30"> <Video codec="h264" bitRate="256000" |