diff options
| author | James Dong <jdong@google.com> | 2011-01-05 10:27:55 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-05 10:27:55 -0800 |
| commit | 876e44dfb5aabcd34e052a6a8a9f8ba8f07744ba (patch) | |
| tree | 357f6ce2426b3e5a717c05aaa39c01e2849e7531 /include/media | |
| parent | 2cdee233125a6cc4b00a2962d5a50273d6bb5410 (diff) | |
| parent | a1d2d8f7a5fd956ab82acc641415e09ff6c00a7e (diff) | |
| download | frameworks_base-876e44dfb5aabcd34e052a6a8a9f8ba8f07744ba.zip frameworks_base-876e44dfb5aabcd34e052a6a8a9f8ba8f07744ba.tar.gz frameworks_base-876e44dfb5aabcd34e052a6a8a9f8ba8f07744ba.tar.bz2 | |
Merge "Use video output if necessary for timelapse video recording"
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/stagefright/CameraSourceTimeLapse.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/media/stagefright/CameraSourceTimeLapse.h b/include/media/stagefright/CameraSourceTimeLapse.h index afe7287..0e5d534 100644 --- a/include/media/stagefright/CameraSourceTimeLapse.h +++ b/include/media/stagefright/CameraSourceTimeLapse.h @@ -182,10 +182,10 @@ private: // buffer. void fillLastReadBufferCopy(MediaBuffer& sourceBuffer); - // If the passed in size (width x height) is a supported preview size, - // the function sets the camera's preview size to it and returns true. + // If the passed in size (width x height) is a supported video/preview size, + // the function sets the camera's video/preview size to it and returns true. // Otherwise returns false. - bool trySettingPreviewSize(int32_t width, int32_t height); + bool trySettingVideoSize(int32_t width, int32_t height); // The still camera may not support the demanded video width and height. // We look for the supported picture sizes from the still camera and |