summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/CameraSourceTimeLapse.cpp
diff options
context:
space:
mode:
authorNipun Kwatra <nkwatra@google.com>2010-07-20 21:33:31 -0700
committerNipun Kwatra <nkwatra@google.com>2010-07-22 17:02:12 -0700
commite4e0a6994d39c4a7cba09c5fff442b2dca1df8f8 (patch)
tree545e3cbc6bbd5c6b78a5adb2d00eeb5b16abb6a4 /media/libstagefright/CameraSourceTimeLapse.cpp
parent55cb2b8319e6b36e88658de121c534e95cd240b4 (diff)
downloadframeworks_av-e4e0a6994d39c4a7cba09c5fff442b2dca1df8f8.zip
frameworks_av-e4e0a6994d39c4a7cba09c5fff442b2dca1df8f8.tar.gz
frameworks_av-e4e0a6994d39c4a7cba09c5fff442b2dca1df8f8.tar.bz2
Allowing setting of time lapse parameters through MediaRecorder.java
added setTimeLapseParameters() to MediaRecorder.java and SetParameter support in StagefrightRecorder to allow enabling time lapse and setting the corresponding parameters. Change-Id: I509040aa71f8d3fc37337b0894a81d9c0fd7a40a
Diffstat (limited to 'media/libstagefright/CameraSourceTimeLapse.cpp')
-rw-r--r--media/libstagefright/CameraSourceTimeLapse.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/media/libstagefright/CameraSourceTimeLapse.cpp b/media/libstagefright/CameraSourceTimeLapse.cpp
index 30ed143..c6186f6 100644
--- a/media/libstagefright/CameraSourceTimeLapse.cpp
+++ b/media/libstagefright/CameraSourceTimeLapse.cpp
@@ -33,6 +33,7 @@ namespace android {
// static
CameraSourceTimeLapse *CameraSourceTimeLapse::Create(bool useStillCameraForTimeLapse,
int64_t timeBetweenTimeLapseFrameCaptureUs,
+ int32_t width, int32_t height,
int32_t videoFrameRate) {
sp<Camera> camera = Camera::connect(0);
@@ -41,25 +42,27 @@ CameraSourceTimeLapse *CameraSourceTimeLapse::Create(bool useStillCameraForTimeL
}
return new CameraSourceTimeLapse(camera, useStillCameraForTimeLapse,
- timeBetweenTimeLapseFrameCaptureUs, videoFrameRate);
+ timeBetweenTimeLapseFrameCaptureUs, width, height, videoFrameRate);
}
// static
CameraSourceTimeLapse *CameraSourceTimeLapse::CreateFromCamera(const sp<Camera> &camera,
bool useStillCameraForTimeLapse,
int64_t timeBetweenTimeLapseFrameCaptureUs,
+ int32_t width, int32_t height,
int32_t videoFrameRate) {
if (camera.get() == NULL) {
return NULL;
}
return new CameraSourceTimeLapse(camera, useStillCameraForTimeLapse,
- timeBetweenTimeLapseFrameCaptureUs, videoFrameRate);
+ timeBetweenTimeLapseFrameCaptureUs, width, height, videoFrameRate);
}
CameraSourceTimeLapse::CameraSourceTimeLapse(const sp<Camera> &camera,
bool useStillCameraForTimeLapse,
int64_t timeBetweenTimeLapseFrameCaptureUs,
+ int32_t width, int32_t height,
int32_t videoFrameRate)
: CameraSource(camera),
mUseStillCameraForTimeLapse(useStillCameraForTimeLapse),
@@ -70,11 +73,6 @@ CameraSourceTimeLapse::CameraSourceTimeLapse(const sp<Camera> &camera,
LOGV("starting time lapse mode");
if(mUseStillCameraForTimeLapse) {
- // Currently hardcoded the picture size. Will need to choose
- // automatically or pass in from the app.
- int32_t width, height;
- width = 1024;
- height = 768;
mMeta->setInt32(kKeyWidth, width);
mMeta->setInt32(kKeyHeight, height);
}