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 | 019e96a6c6228c2565d8bc172f6278b31384aca5 (patch) | |
tree | d849a9df7eefab1a0e960e8e0fab86b943361e94 /include | |
parent | 627baacc748c5e2ed68bdb256aea4d70fcfe9ce4 (diff) | |
parent | 28934a90e168291f6c77c56e8a05f272e5151bbd (diff) | |
download | frameworks_av-019e96a6c6228c2565d8bc172f6278b31384aca5.zip frameworks_av-019e96a6c6228c2565d8bc172f6278b31384aca5.tar.gz frameworks_av-019e96a6c6228c2565d8bc172f6278b31384aca5.tar.bz2 |
Merge "Use video output if necessary for timelapse video recording"
Diffstat (limited to 'include')
-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 |