diff options
author | James Dong <jdong@google.com> | 2011-06-29 16:56:52 -0700 |
---|---|---|
committer | James Dong <jdong@google.com> | 2011-07-24 10:33:54 -0700 |
commit | 3cecf640c4daf2df616b278bd9986018c8182908 (patch) | |
tree | 0a9a7306e8a13af5a7149471569ca73827449aee /media/libmedia/mediarecorder.cpp | |
parent | 77882a8deb5167235ae591e49c9dcff9abb373c1 (diff) | |
download | frameworks_av-3cecf640c4daf2df616b278bd9986018c8182908.zip frameworks_av-3cecf640c4daf2df616b278bd9986018c8182908.tar.gz frameworks_av-3cecf640c4daf2df616b278bd9986018c8182908.tar.bz2 |
Do not support still image capture mode for timelapse video recording
related-to-bug: 4973779
Change-Id: Ica665217ab10247b2242acc4e93d4fe9f83e3f45
Diffstat (limited to 'media/libmedia/mediarecorder.cpp')
-rw-r--r-- | media/libmedia/mediarecorder.cpp | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/media/libmedia/mediarecorder.cpp b/media/libmedia/mediarecorder.cpp index fab674c..11d281f 100644 --- a/media/libmedia/mediarecorder.cpp +++ b/media/libmedia/mediarecorder.cpp @@ -322,32 +322,6 @@ status_t MediaRecorder::setOutputFile(int fd, int64_t offset, int64_t length) return ret; } -status_t MediaRecorder::setOutputFileAuxiliary(int fd) -{ - LOGV("setOutputFileAuxiliary(%d)", fd); - if(mMediaRecorder == NULL) { - LOGE("media recorder is not initialized yet"); - return INVALID_OPERATION; - } - if (mIsAuxiliaryOutputFileSet) { - LOGE("output file has already been set"); - return INVALID_OPERATION; - } - if (!(mCurrentState & MEDIA_RECORDER_DATASOURCE_CONFIGURED)) { - LOGE("setOutputFile called in an invalid state(%d)", mCurrentState); - return INVALID_OPERATION; - } - - status_t ret = mMediaRecorder->setOutputFileAuxiliary(fd); - if (OK != ret) { - LOGV("setOutputFileAuxiliary failed: %d", ret); - mCurrentState = MEDIA_RECORDER_ERROR; - return ret; - } - mIsAuxiliaryOutputFileSet = true; - return ret; -} - status_t MediaRecorder::setVideoSize(int width, int height) { LOGV("setVideoSize(%d, %d)", width, height); @@ -629,7 +603,6 @@ void MediaRecorder::doCleanUp() mIsAudioEncoderSet = false; mIsVideoEncoderSet = false; mIsOutputFileSet = false; - mIsAuxiliaryOutputFileSet = false; } // Release should be OK in any state |